po/zh_CN.po

   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 object                    |  提交对象
  42 #   commit-ish (also committish)     |  提交号
  43 #   conflict                         |  冲突
  44 #   core Git                         |  核心 Git 工具
  45 #   DAG                              |  有向无环图
  46 #   dangling object                  |  摇摆对象
  47 #   detached HEAD                    |  分离头指针
  48 #   directory                        |  目录
  49 #   dirty                            |  脏（的工作区）
  50 #   dumb HTTP protocol               |  哑 HTTP 协议
  51 #   evil merge                       |  坏合并（合并引入了父提交没有的修改）
  52 #   fast-forward                     |  快进
  53 #   fetch                            |  获取
  54 #   file system                      |  文件系统
  55 #   fork                             |  派生
  56 #   Git archive                      |  仓库（对于 arch 用户）
  57 #   gitfile                          |  gitfile（仓库链接文件）
  58 #   grafts                           |  （提交）嫁接
  59 #   hash                             |  哈希值
  60 #   HEAD                             |  HEAD（头指针，亦即当前分支）
  61 #   head                             |  头、分支
  62 #   head ref                         |  分支
  63 #   header                           |  头信息
  64 #   hook                             |  钩子
  65 #   hunk                             |  补丁片段
  66 #   index                            |  索引
  67 #   index entry                      |  索引条目
  68 #   loose object                     |  松散对象
  69 #   loose refs                       |  松散引用
  70 #   master                           |  master（默认分支名）
  71 #   merge                            |  合并
  72 #   object                           |  对象
  73 #   object database                  |  对象库
  74 #   object identifier                |  对象标识符
  75 #   object name                      |  对象名称
  76 #   object type                      |  对象类型
  77 #   octopus                          |  章鱼式合并（两分支以上的合并）
  78 #   origin                           |  origin（默认的远程名称）
  79 #   pack                             |  包
  80 #   pack index                       |  包索引
  81 #   packfile                         |  包文件
  82 #   parent                           |  父提交
  83 #   patch                            |  补丁
  84 #   pathspec                         |  路径规格
  85 #   pattern                          |  模式
  86 #   pickaxe                          |  挖掘
  87 #   plumbing                         |  管件（Git 底层核心命令的别称）
  88 #   porcelain                        |  瓷件（Git 上层封装命令的别称）
  89 #   prune                            |  清除
  90 #   pull                             |  拉，拉取
  91 #   push                             |  推，推送
  92 #   reachable                        |  可达
  93 #   rebase                           |  变基
  94 #   ref                              |  引用
  95 #   reflog                           |  引用日志
  96 #   refspec                          |  引用规格
  97 #   remote                           |  远程，远程仓库
  98 #   remote-tracking branch           |  远程跟踪分支
  99 #   replay                           |  重放
 100 #   repo                             |  仓库
 101 #   repository                       |  仓库
 102 #   resolve                          |  （冲突）解决
 103 #   revert                           |  还原
 104 #   revision                         |  版本
 105 #   rewind                           |  回退
 106 #   SCM                              |  源代码管理（工具）
 107 #   SHA-1                            |  SHA-1（安全哈希算法1）
 108 #   shallow repository               |  浅（克隆）仓库
 109 #   signed tag                       |  签名标签
 110 #   smart HTTP protocol              |  智能 HTTP 协议
 111 #   squash                           |  压缩
 112 #   stage                            |  n. 暂存区（即索引）; v. 暂存
 113 #   stash                            |  n. 进度保存; v. 保存进度
 114 #   submodule                        |  子模组
 115 #   symref                           |  符号引用
 116 #   tag                              |  n. 标签; v. 打标签
 117 #   tag object                       |  标签对象
 118 #   tagger                           |  打标签者
 119 #   topic branch                     |  主题分支
 120 #   track                            |  跟踪
 121 #   tree                             |  树（工作区或树对象）
 122 #   tree object                      |  树对象
 123 #   tree-ish (also treeish)          |  树对象（或可以解析为一树对象）
 124 #   unmerged index                   |  未合并索引
 125 #   unpack                           |  解包
 126 #   unreachable object               |  不可达对象
 127 #   unstage                          |  取消暂存
 128 #   upstream                         |  上游
 129 #   upstream branch                  |  上游分支
 130 #   working tree                     |  工作区
 131 #
 132 msgid ""
 133 msgstr ""
 134 "Project-Id-Version: Git\n"
 135 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 136 "POT-Creation-Date: 2015-07-14 07:19+0800\n"
 137 "PO-Revision-Date: 2015-08-04 00:43+0800\n"
 138 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 139 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 140 "Language: zh_CN\n"
 141 "MIME-Version: 1.0\n"
 142 "Content-Type: text/plain; charset=UTF-8\n"
 143 "Content-Transfer-Encoding: 8bit\n"
 144 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 145
 146 #: advice.c:55
 147 #, c-format
 148 msgid "hint: %.*s\n"
 149 msgstr "提示：%.*s\n"
 150
 151 #: advice.c:88
 152 msgid ""
 153 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 154 "as appropriate to mark resolution and make a commit."
 155 msgstr ""
 156 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 157 "解决方案并提交。"
 158
 159 #: archive.c:11
 160 msgid "git archive [<options>] <tree-ish> [<path>...]"
 161 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 162
 163 #: archive.c:12
 164 msgid "git archive --list"
 165 msgstr "git archive --list"
 166
 167 #: archive.c:13
 168 msgid ""
 169 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 170 msgstr ""
 171 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 172
 173 #: archive.c:14
 174 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 175 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 176
 177 #: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
 178 #, c-format
 179 msgid "pathspec '%s' did not match any files"
 180 msgstr "路径规格 '%s' 未匹配任何文件"
 181
 182 #: archive.c:427
 183 msgid "fmt"
 184 msgstr "格式"
 185
 186 #: archive.c:427
 187 msgid "archive format"
 188 msgstr "归档格式"
 189
 190 #: archive.c:428 builtin/log.c:1204
 191 msgid "prefix"
 192 msgstr "前缀"
 193
 194 #: archive.c:429
 195 msgid "prepend prefix to each pathname in the archive"
 196 msgstr "为归档中每个路径名加上前缀"
 197
 198 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
 199 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
 200 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
 201 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
 202 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
 203 msgid "file"
 204 msgstr "文件"
 205
 206 #: archive.c:431 builtin/archive.c:89
 207 msgid "write the archive to this file"
 208 msgstr "归档写入此文件"
 209
 210 #: archive.c:433
 211 msgid "read .gitattributes in working directory"
 212 msgstr "读取工作区中的 .gitattributes"
 213
 214 #: archive.c:434
 215 msgid "report archived files on stderr"
 216 msgstr "在标准错误上报告归档文件"
 217
 218 #: archive.c:435
 219 msgid "store only"
 220 msgstr "只存储"
 221
 222 #: archive.c:436
 223 msgid "compress faster"
 224 msgstr "压缩速度更快"
 225
 226 #: archive.c:444
 227 msgid "compress better"
 228 msgstr "压缩效果更好"
 229
 230 #: archive.c:447
 231 msgid "list supported archive formats"
 232 msgstr "列出支持的归档格式"
 233
 234 #: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
 235 msgid "repo"
 236 msgstr "仓库"
 237
 238 #: archive.c:450 builtin/archive.c:91
 239 msgid "retrieve the archive from remote repository <repo>"
 240 msgstr "从远程仓库（<仓库>）提取归档文件"
 241
 242 #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
 243 msgid "command"
 244 msgstr "命令"
 245
 246 #: archive.c:452 builtin/archive.c:93
 247 msgid "path to the remote git-upload-archive command"
 248 msgstr "远程 git-upload-archive 命令的路径"
 249
 250 #: attr.c:265
 251 msgid ""
 252 "Negative patterns are ignored in git attributes\n"
 253 "Use '\\!' for literal leading exclamation."
 254 msgstr ""
 255 "负值模版在 git attributes 中被忽略\n"
 256 "当字符串确实要以感叹号开始时，使用 '\\!'。"
 257
 258 #: branch.c:60
 259 #, c-format
 260 msgid "Not setting branch %s as its own upstream."
 261 msgstr "未设置分支 %s 作为它自己的上游。"
 262
 263 #: branch.c:83
 264 #, c-format
 265 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 266 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 267
 268 #: branch.c:84
 269 #, c-format
 270 msgid "Branch %s set up to track remote branch %s from %s."
 271 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 272
 273 #: branch.c:88
 274 #, c-format
 275 msgid "Branch %s set up to track local branch %s by rebasing."
 276 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 277
 278 #: branch.c:89
 279 #, c-format
 280 msgid "Branch %s set up to track local branch %s."
 281 msgstr "分支 %s 设置为跟踪本地分支 %s。"
 282
 283 #: branch.c:94
 284 #, c-format
 285 msgid "Branch %s set up to track remote ref %s by rebasing."
 286 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 287
 288 #: branch.c:95
 289 #, c-format
 290 msgid "Branch %s set up to track remote ref %s."
 291 msgstr "分支 %s 设置为跟踪远程引用 %s。"
 292
 293 #: branch.c:99
 294 #, c-format
 295 msgid "Branch %s set up to track local ref %s by rebasing."
 296 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 297
 298 #: branch.c:100
 299 #, c-format
 300 msgid "Branch %s set up to track local ref %s."
 301 msgstr "分支 %s 设置为跟踪本地引用 %s。"
 302
 303 #: branch.c:133
 304 #, c-format
 305 msgid "Not tracking: ambiguous information for ref %s"
 306 msgstr "未跟踪：引用 %s 有歧义"
 307
 308 #: branch.c:162
 309 #, c-format
 310 msgid "'%s' is not a valid branch name."
 311 msgstr "'%s' 不是一个有效的分支名称。"
 312
 313 #: branch.c:167
 314 #, c-format
 315 msgid "A branch named '%s' already exists."
 316 msgstr "一个分支名 '%s' 已经存在。"
 317
 318 #: branch.c:175
 319 msgid "Cannot force update the current branch."
 320 msgstr "无法强制更新当前分支。"
 321
 322 #: branch.c:195
 323 #, c-format
 324 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 325 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
 326
 327 #: branch.c:197
 328 #, c-format
 329 msgid "the requested upstream branch '%s' does not exist"
 330 msgstr "请求的上游分支 '%s' 不存在"
 331
 332 #: branch.c:199
 333 msgid ""
 334 "\n"
 335 "If you are planning on basing your work on an upstream\n"
 336 "branch that already exists at the remote, you may need to\n"
 337 "run \"git fetch\" to retrieve it.\n"
 338 "\n"
 339 "If you are planning to push out a new local branch that\n"
 340 "will track its remote counterpart, you may want to use\n"
 341 "\"git push -u\" to set the upstream config as you push."
 342 msgstr ""
 343 "\n"
 344 "如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
 345 "您可能需要执行 \"git fetch\" 来获取分支。\n"
 346 "\n"
 347 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
 348 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 349
 350 #: branch.c:243
 351 #, c-format
 352 msgid "Not a valid object name: '%s'."
 353 msgstr "不是一个有效的对象名：'%s'。"
 354
 355 #: branch.c:263
 356 #, c-format
 357 msgid "Ambiguous object name: '%s'."
 358 msgstr "歧义的对象名：'%s'。"
 359
 360 #: branch.c:268
 361 #, c-format
 362 msgid "Not a valid branch point: '%s'."
 363 msgstr "无效的分支点：'%s'。"
 364
 365 #: bundle.c:34
 366 #, c-format
 367 msgid "'%s' does not look like a v2 bundle file"
 368 msgstr "'%s' 不像是一个 v2 版本的包文件"
 369
 370 #: bundle.c:61
 371 #, c-format
 372 msgid "unrecognized header: %s%s (%d)"
 373 msgstr "未能识别的包头：%s%s (%d)"
 374
 375 #: bundle.c:87 builtin/commit.c:766
 376 #, c-format
 377 msgid "could not open '%s'"
 378 msgstr "不能打开 '%s'"
 379
 380 #: bundle.c:139
 381 msgid "Repository lacks these prerequisite commits:"
 382 msgstr "仓库中缺少这些必备的提交："
 383
 384 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
 385 #: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
 386 #: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
 387 #: builtin/shortlog.c:158
 388 msgid "revision walk setup failed"
 389 msgstr "版本遍历设置失败"
 390
 391 #: bundle.c:185
 392 #, c-format
 393 msgid "The bundle contains this ref:"
 394 msgid_plural "The bundle contains these %d refs:"
 395 msgstr[0] "这个包中含有这个引用："
 396 msgstr[1] "这个包中含有 %d 个引用："
 397
 398 #: bundle.c:192
 399 msgid "The bundle records a complete history."
 400 msgstr "这个包记录一个完整历史。"
 401
 402 #: bundle.c:194
 403 #, c-format
 404 msgid "The bundle requires this ref:"
 405 msgid_plural "The bundle requires these %d refs:"
 406 msgstr[0] "这个包需要这个引用："
 407 msgstr[1] "这个包需要 %d 个引用："
 408
 409 #: bundle.c:251
 410 msgid "Could not spawn pack-objects"
 411 msgstr "不能生成 pack-objects 进程"
 412
 413 #: bundle.c:269
 414 msgid "pack-objects died"
 415 msgstr "pack-objects 终止"
 416
 417 #: bundle.c:309
 418 msgid "rev-list died"
 419 msgstr "rev-list 终止"
 420
 421 #: bundle.c:358
 422 #, c-format
 423 msgid "ref '%s' is excluded by the rev-list options"
 424 msgstr "引用 '%s' 被 rev-list 选项排除"
 425
 426 #: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
 427 #, c-format
 428 msgid "unrecognized argument: %s"
 429 msgstr "未能识别的参数：%s"
 430
 431 #: bundle.c:443
 432 msgid "Refusing to create empty bundle."
 433 msgstr "不能创建空包。"
 434
 435 #: bundle.c:453
 436 #, c-format
 437 msgid "cannot create '%s'"
 438 msgstr "不能创建 '%s'"
 439
 440 #: bundle.c:474
 441 msgid "index-pack died"
 442 msgstr "index-pack 终止"
 443
 444 #: color.c:260
 445 #, c-format
 446 msgid "invalid color value: %.*s"
 447 msgstr "无效的颜色值：%.*s"
 448
 449 #: commit.c:40
 450 #, c-format
 451 msgid "could not parse %s"
 452 msgstr "不能解析 %s"
 453
 454 #: commit.c:42
 455 #, c-format
 456 msgid "%s %s is not a commit!"
 457 msgstr "%s %s 不是一个提交!"
 458
 459 #: compat/obstack.c:406 compat/obstack.c:408
 460 msgid "memory exhausted"
 461 msgstr "内存耗尽"
 462
 463 #: config.c:474 config.c:476
 464 #, c-format
 465 msgid "bad config file line %d in %s"
 466 msgstr "配置文件 %2$s 出错于第 %1$d 行"
 467
 468 #: config.c:592
 469 #, c-format
 470 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 471 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
 472
 473 #: config.c:594
 474 #, c-format
 475 msgid "bad numeric config value '%s' for '%s': %s"
 476 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 477
 478 #: config.c:679
 479 #, c-format
 480 msgid "failed to expand user dir in: '%s'"
 481 msgstr "无法扩展 '%s' 中的用户目录"
 482
 483 #: config.c:757 config.c:768
 484 #, c-format
 485 msgid "bad zlib compression level %d"
 486 msgstr "错误的 zlib 压缩级别 %d"
 487
 488 #: config.c:890
 489 #, c-format
 490 msgid "invalid mode for object creation: %s"
 491 msgstr "无效的对象创建模式：%s"
 492
 493 #: config.c:1216
 494 msgid "unable to parse command-line config"
 495 msgstr "无法解析命令行中的配置"
 496
 497 #: config.c:1277
 498 msgid "unknown error occured while reading the configuration files"
 499 msgstr "在读取配置文件时遇到未知错误"
 500
 501 #: config.c:1601
 502 #, c-format
 503 msgid "unable to parse '%s' from command-line config"
 504 msgstr "无法解析命令行配置中的 '%s'"
 505
 506 #: config.c:1603
 507 #, c-format
 508 msgid "bad config variable '%s' in file '%s' at line %d"
 509 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 510
 511 #: config.c:1662
 512 #, c-format
 513 msgid "%s has multiple values"
 514 msgstr "%s 有多个取值"
 515
 516 #: connected.c:69
 517 msgid "Could not run 'git rev-list'"
 518 msgstr "不能执行 'git rev-list'"
 519
 520 #: connected.c:89
 521 #, c-format
 522 msgid "failed write to rev-list: %s"
 523 msgstr "无法写入 rev-list：%s"
 524
 525 #: connected.c:97
 526 #, c-format
 527 msgid "failed to close rev-list's stdin: %s"
 528 msgstr "无法关闭 rev-list 的标准输入：%s"
 529
 530 #: date.c:95
 531 msgid "in the future"
 532 msgstr "在将来"
 533
 534 #: date.c:101
 535 #, c-format
 536 msgid "%lu second ago"
 537 msgid_plural "%lu seconds ago"
 538 msgstr[0] "%lu 秒钟前"
 539 msgstr[1] "%lu 秒钟前"
 540
 541 #: date.c:108
 542 #, c-format
 543 msgid "%lu minute ago"
 544 msgid_plural "%lu minutes ago"
 545 msgstr[0] "%lu 分钟前"
 546 msgstr[1] "%lu 分钟前"
 547
 548 #: date.c:115
 549 #, c-format
 550 msgid "%lu hour ago"
 551 msgid_plural "%lu hours ago"
 552 msgstr[0] "%lu 小时前"
 553 msgstr[1] "%lu 小时前"
 554
 555 #: date.c:122
 556 #, c-format
 557 msgid "%lu day ago"
 558 msgid_plural "%lu days ago"
 559 msgstr[0] "%lu 天前"
 560 msgstr[1] "%lu 天前"
 561
 562 #: date.c:128
 563 #, c-format
 564 msgid "%lu week ago"
 565 msgid_plural "%lu weeks ago"
 566 msgstr[0] "%lu 周前"
 567 msgstr[1] "%lu 周前"
 568
 569 #: date.c:135
 570 #, c-format
 571 msgid "%lu month ago"
 572 msgid_plural "%lu months ago"
 573 msgstr[0] "%lu 个月前"
 574 msgstr[1] "%lu 个月前"
 575
 576 #: date.c:146
 577 #, c-format
 578 msgid "%lu year"
 579 msgid_plural "%lu years"
 580 msgstr[0] "%lu 年"
 581 msgstr[1] "%lu 年"
 582
 583 #. TRANSLATORS: "%s" is "<n> years"
 584 #: date.c:149
 585 #, c-format
 586 msgid "%s, %lu month ago"
 587 msgid_plural "%s, %lu months ago"
 588 msgstr[0] "%s %lu 个月前"
 589 msgstr[1] "%s %lu 个月前"
 590
 591 #: date.c:154 date.c:159
 592 #, c-format
 593 msgid "%lu year ago"
 594 msgid_plural "%lu years ago"
 595 msgstr[0] "%lu 年前"
 596 msgstr[1] "%lu 年前"
 597
 598 #: diffcore-order.c:24
 599 #, c-format
 600 msgid "failed to read orderfile '%s'"
 601 msgstr "无法读取排序文件 '%s'"
 602
 603 #: diffcore-rename.c:536
 604 msgid "Performing inexact rename detection"
 605 msgstr "正在进行非精确的重命名检测"
 606
 607 #  译者：注意保持前导空格
 608 #: diff.c:114
 609 #, c-format
 610 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 611 msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 612
 613 #  译者：注意保持前导空格
 614 #: diff.c:119
 615 #, c-format
 616 msgid "  Unknown dirstat parameter '%s'\n"
 617 msgstr "  未知的 dirstat 参数 '%s'\n"
 618
 619 #: diff.c:214
 620 #, c-format
 621 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 622 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
 623
 624 #: diff.c:266
 625 #, c-format
 626 msgid ""
 627 "Found errors in 'diff.dirstat' config variable:\n"
 628 "%s"
 629 msgstr ""
 630 "发现配置变量 'diff.dirstat' 中的错误：\n"
 631 "%s"
 632
 633 #: diff.c:2997
 634 #, c-format
 635 msgid "external diff died, stopping at %s"
 636 msgstr "外部 diff 退出，停止在 %s"
 637
 638 #: diff.c:3393
 639 msgid "--follow requires exactly one pathspec"
 640 msgstr "--follow 参数后只跟一个 pathspec"
 641
 642 #: diff.c:3556
 643 #, c-format
 644 msgid ""
 645 "Failed to parse --dirstat/-X option parameter:\n"
 646 "%s"
 647 msgstr ""
 648 "无法解析 --dirstat/-X 选项的参数：\n"
 649 "%s"
 650
 651 #: diff.c:3570
 652 #, c-format
 653 msgid "Failed to parse --submodule option parameter: '%s'"
 654 msgstr "无法解析 --submodule 选项的参数：'%s'"
 655
 656 #: dir.c:1852
 657 msgid "failed to get kernel name and information"
 658 msgstr "无法获得内核名称和信息"
 659
 660 #: dir.c:1945
 661 msgid "Untracked cache is disabled on this system."
 662 msgstr "缓存未跟踪文件在本系统被禁用"
 663
 664 #: gpg-interface.c:129 gpg-interface.c:200
 665 msgid "could not run gpg."
 666 msgstr "不能执行 gpg。"
 667
 668 #: gpg-interface.c:141
 669 msgid "gpg did not accept the data"
 670 msgstr "gpg 没有接受数据"
 671
 672 #: gpg-interface.c:152
 673 msgid "gpg failed to sign the data"
 674 msgstr "gpg 无法为数据签名"
 675
 676 #: gpg-interface.c:185
 677 #, c-format
 678 msgid "could not create temporary file '%s': %s"
 679 msgstr "不能创建临时文件 '%s'：%s"
 680
 681 #: gpg-interface.c:188
 682 #, c-format
 683 msgid "failed writing detached signature to '%s': %s"
 684 msgstr "无法将分离式签名写入 '%s'：%s"
 685
 686 #: grep.c:1718
 687 #, c-format
 688 msgid "'%s': unable to read %s"
 689 msgstr "'%s'：无法读取 %s"
 690
 691 #: grep.c:1735
 692 #, c-format
 693 msgid "'%s': %s"
 694 msgstr "'%s'：%s"
 695
 696 #: grep.c:1746
 697 #, c-format
 698 msgid "'%s': short read %s"
 699 msgstr "'%s'：读取不完整 %s"
 700
 701 #: help.c:207
 702 #, c-format
 703 msgid "available git commands in '%s'"
 704 msgstr "在 '%s' 下可用的 git 命令"
 705
 706 #: help.c:214
 707 msgid "git commands available from elsewhere on your $PATH"
 708 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 709
 710 #: help.c:246
 711 msgid "These are common Git commands used in various situations:"
 712 msgstr "这些是各种场合常见的 Git 命令："
 713
 714 #: help.c:311
 715 #, c-format
 716 msgid ""
 717 "'%s' appears to be a git command, but we were not\n"
 718 "able to execute it. Maybe git-%s is broken?"
 719 msgstr ""
 720 "'%s' 像是一个 git 命令，但却无法运行。\n"
 721 "可能是 git-%s 受损？"
 722
 723 #: help.c:368
 724 msgid "Uh oh. Your system reports no Git commands at all."
 725 msgstr "唉呀，您的系统中未发现 Git 命令。"
 726
 727 #: help.c:390
 728 #, c-format
 729 msgid ""
 730 "WARNING: You called a Git command named '%s', which does not exist.\n"
 731 "Continuing under the assumption that you meant '%s'"
 732 msgstr ""
 733 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 734 "是 '%s'"
 735
 736 #: help.c:395
 737 #, c-format
 738 msgid "in %0.1f seconds automatically..."
 739 msgstr "在 %0.1f 秒钟后自动运行..."
 740
 741 #: help.c:402
 742 #, c-format
 743 msgid "git: '%s' is not a git command. See 'git --help'."
 744 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 745
 746 #: help.c:406 help.c:466
 747 msgid ""
 748 "\n"
 749 "Did you mean this?"
 750 msgid_plural ""
 751 "\n"
 752 "Did you mean one of these?"
 753 msgstr[0] ""
 754 "\n"
 755 "您指的是这个么？"
 756 msgstr[1] ""
 757 "\n"
 758 "您指的是这其中的某一个么？"
 759
 760 #: help.c:462
 761 #, c-format
 762 msgid "%s: %s - %s"
 763 msgstr "%s：%s - %s"
 764
 765 #: lockfile.c:345
 766 msgid "BUG: reopen a lockfile that is still open"
 767 msgstr "BUG: 重新打开一个仍打开着的锁文件"
 768
 769 #: lockfile.c:347
 770 msgid "BUG: reopen a lockfile that has been committed"
 771 msgstr "BUG: 重新打开一个已提交的锁文件"
 772
 773 #: merge.c:41
 774 msgid "failed to read the cache"
 775 msgstr "无法读取缓存"
 776
 777 #: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
 778 #: builtin/clone.c:647
 779 msgid "unable to write new index file"
 780 msgstr "无法写新的索引文件"
 781
 782 #: merge-recursive.c:189
 783 #, c-format
 784 msgid "(bad commit)\n"
 785 msgstr "（坏提交）\n"
 786
 787 #: merge-recursive.c:209
 788 #, c-format
 789 msgid "addinfo_cache failed for path '%s'"
 790 msgstr "为路径 '%s' addinfo_cache 失败"
 791
 792 #: merge-recursive.c:270
 793 msgid "error building trees"
 794 msgstr "无法创建树"
 795
 796 #: merge-recursive.c:687
 797 #, c-format
 798 msgid "failed to create path '%s'%s"
 799 msgstr "无法创建路径 '%s'%s"
 800
 801 #: merge-recursive.c:698
 802 #, c-format
 803 msgid "Removing %s to make room for subdirectory\n"
 804 msgstr "删除 %s 以便为子目录留出空间\n"
 805
 806 #: merge-recursive.c:712 merge-recursive.c:733
 807 msgid ": perhaps a D/F conflict?"
 808 msgstr "：可能是一个目录/文件冲突？"
 809
 810 #: merge-recursive.c:723
 811 #, c-format
 812 msgid "refusing to lose untracked file at '%s'"
 813 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 814
 815 #: merge-recursive.c:763
 816 #, c-format
 817 msgid "cannot read object %s '%s'"
 818 msgstr "不能读取对象 %s '%s'"
 819
 820 #: merge-recursive.c:765
 821 #, c-format
 822 msgid "blob expected for %s '%s'"
 823 msgstr "%s '%s' 应为数据对象"
 824
 825 #: merge-recursive.c:788 builtin/clone.c:306
 826 #, c-format
 827 msgid "failed to open '%s'"
 828 msgstr "无法打开 '%s'"
 829
 830 #: merge-recursive.c:796
 831 #, c-format
 832 msgid "failed to symlink '%s'"
 833 msgstr "无法创建符号链接 '%s'"
 834
 835 #: merge-recursive.c:799
 836 #, c-format
 837 msgid "do not know what to do with %06o %s '%s'"
 838 msgstr "不知道如何处理 %06o %s '%s'"
 839
 840 #: merge-recursive.c:937
 841 msgid "Failed to execute internal merge"
 842 msgstr "无法执行内部合并"
 843
 844 #: merge-recursive.c:941
 845 #, c-format
 846 msgid "Unable to add %s to database"
 847 msgstr "不能添加 %s 至对象库"
 848
 849 #: merge-recursive.c:957
 850 msgid "unsupported object type in the tree"
 851 msgstr "在树中有不支持的对象类型"
 852
 853 #: merge-recursive.c:1032 merge-recursive.c:1046
 854 #, c-format
 855 msgid ""
 856 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 857 "in tree."
 858 msgstr ""
 859 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 860 "的版本被保留。"
 861
 862 #: merge-recursive.c:1038 merge-recursive.c:1051
 863 #, c-format
 864 msgid ""
 865 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 866 "in tree at %s."
 867 msgstr ""
 868 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 869 "的版本保留于 %8$s 中。"
 870
 871 #: merge-recursive.c:1092
 872 msgid "rename"
 873 msgstr "重命名"
 874
 875 #: merge-recursive.c:1092
 876 msgid "renamed"
 877 msgstr "重命名"
 878
 879 #: merge-recursive.c:1148
 880 #, c-format
 881 msgid "%s is a directory in %s adding as %s instead"
 882 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 883
 884 #: merge-recursive.c:1170
 885 #, c-format
 886 msgid ""
 887 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 888 "\"->\"%s\" in \"%s\"%s"
 889 msgstr ""
 890 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
 891 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 892
 893 #: merge-recursive.c:1175
 894 msgid " (left unresolved)"
 895 msgstr "（留下未解决）"
 896
 897 #: merge-recursive.c:1229
 898 #, c-format
 899 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 900 msgstr ""
 901 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
 902 "%5$s"
 903
 904 #: merge-recursive.c:1259
 905 #, c-format
 906 msgid "Renaming %s to %s and %s to %s instead"
 907 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
 908
 909 #: merge-recursive.c:1458
 910 #, c-format
 911 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 912 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 913
 914 #: merge-recursive.c:1468
 915 #, c-format
 916 msgid "Adding merged %s"
 917 msgstr "添加合并后的 %s"
 918
 919 #: merge-recursive.c:1473 merge-recursive.c:1671
 920 #, c-format
 921 msgid "Adding as %s instead"
 922 msgstr "而是以 %s 为名添加"
 923
 924 #: merge-recursive.c:1524
 925 #, c-format
 926 msgid "cannot read object %s"
 927 msgstr "不能读取对象 %s"
 928
 929 #: merge-recursive.c:1527
 930 #, c-format
 931 msgid "object %s is not a blob"
 932 msgstr "对象 %s 不是一个数据对象"
 933
 934 #: merge-recursive.c:1575
 935 msgid "modify"
 936 msgstr "修改"
 937
 938 #: merge-recursive.c:1575
 939 msgid "modified"
 940 msgstr "修改"
 941
 942 #: merge-recursive.c:1585
 943 msgid "content"
 944 msgstr "内容"
 945
 946 #: merge-recursive.c:1592
 947 msgid "add/add"
 948 msgstr "添加/添加"
 949
 950 #: merge-recursive.c:1626
 951 #, c-format
 952 msgid "Skipped %s (merged same as existing)"
 953 msgstr "略过 %s（已经做过相同合并）"
 954
 955 #: merge-recursive.c:1640
 956 #, c-format
 957 msgid "Auto-merging %s"
 958 msgstr "自动合并 %s"
 959
 960 #: merge-recursive.c:1644 git-submodule.sh:1150
 961 msgid "submodule"
 962 msgstr "子模组"
 963
 964 #: merge-recursive.c:1645
 965 #, c-format
 966 msgid "CONFLICT (%s): Merge conflict in %s"
 967 msgstr "冲突（%s）：合并冲突于 %s"
 968
 969 #: merge-recursive.c:1731
 970 #, c-format
 971 msgid "Removing %s"
 972 msgstr "删除 %s"
 973
 974 #: merge-recursive.c:1756
 975 msgid "file/directory"
 976 msgstr "文件/目录"
 977
 978 #: merge-recursive.c:1762
 979 msgid "directory/file"
 980 msgstr "目录/文件"
 981
 982 #: merge-recursive.c:1767
 983 #, c-format
 984 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 985 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 986
 987 #: merge-recursive.c:1777
 988 #, c-format
 989 msgid "Adding %s"
 990 msgstr "添加 %s"
 991
 992 #: merge-recursive.c:1794
 993 msgid "Fatal merge failure, shouldn't happen."
 994 msgstr "严重的合并错误，不应发生。"
 995
 996 #: merge-recursive.c:1813
 997 msgid "Already up-to-date!"
 998 msgstr "已经是最新的！"
 999
1000 #: merge-recursive.c:1822
1001 #, c-format
1002 msgid "merging of trees %s and %s failed"
1003 msgstr "无法合并树 %s 和 %s"
1004
1005 #: merge-recursive.c:1852
1006 #, c-format
1007 msgid "Unprocessed path??? %s"
1008 msgstr "未处理的路径??? %s"
1009
1010 #: merge-recursive.c:1900
1011 msgid "Merging:"
1012 msgstr "合并："
1013
1014 #: merge-recursive.c:1913
1015 #, c-format
1016 msgid "found %u common ancestor:"
1017 msgid_plural "found %u common ancestors:"
1018 msgstr[0] "发现 %u 个共同祖先："
1019 msgstr[1] "发现 %u 个共同祖先："
1020
1021 #: merge-recursive.c:1950
1022 msgid "merge returned no commit"
1023 msgstr "合并未返回提交"
1024
1025 #: merge-recursive.c:2007
1026 #, c-format
1027 msgid "Could not parse object '%s'"
1028 msgstr "不能解析对象 '%s'"
1029
1030 #: merge-recursive.c:2018 builtin/merge.c:645
1031 msgid "Unable to write index."
1032 msgstr "不能写入索引。"
1033
1034 #: notes-utils.c:41
1035 msgid "Cannot commit uninitialized/unreferenced notes tree"
1036 msgstr "不能提交未初始化/未引用的注解树"
1037
1038 #: notes-utils.c:82
1039 #, c-format
1040 msgid "Bad notes.rewriteMode value: '%s'"
1041 msgstr "坏的 notes.rewriteMode 值：'%s'"
1042
1043 #: notes-utils.c:92
1044 #, c-format
1045 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1046 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
1047
1048 #. TRANSLATORS: The first %s is the name of the
1049 #. environment variable, the second %s is its value
1050 #: notes-utils.c:119
1051 #, c-format
1052 msgid "Bad %s value: '%s'"
1053 msgstr "坏的 %s 值：'%s'"
1054
1055 #: object.c:242
1056 #, c-format
1057 msgid "unable to parse object: %s"
1058 msgstr "不能解析对象：%s"
1059
1060 #: parse-options.c:546
1061 msgid "..."
1062 msgstr "..."
1063
1064 #: parse-options.c:564
1065 #, c-format
1066 msgid "usage: %s"
1067 msgstr "用法：%s"
1068
1069 #. TRANSLATORS: the colon here should align with the
1070 #. one in "usage: %s" translation
1071 #: parse-options.c:568
1072 #, c-format
1073 msgid "   or: %s"
1074 msgstr "  或：%s"
1075
1076 #  译者：为保证在输出中对齐，注意调整句中空格！
1077 #: parse-options.c:571
1078 #, c-format
1079 msgid "    %s"
1080 msgstr "    %s"
1081
1082 #: parse-options.c:605
1083 msgid "-NUM"
1084 msgstr "-数字"
1085
1086 #: pathspec.c:133
1087 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1088 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1089
1090 #: pathspec.c:143
1091 msgid ""
1092 "global 'literal' pathspec setting is incompatible with all other global "
1093 "pathspec settings"
1094 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1095
1096 #: pathspec.c:177
1097 msgid "invalid parameter for pathspec magic 'prefix'"
1098 msgstr "路径规格包含无效的神奇前缀"
1099
1100 #: pathspec.c:183
1101 #, c-format
1102 msgid "Invalid pathspec magic '%.*s' in '%s'"
1103 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1104
1105 #: pathspec.c:187
1106 #, c-format
1107 msgid "Missing ')' at the end of pathspec magic in '%s'"
1108 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1109
1110 #: pathspec.c:205
1111 #, c-format
1112 msgid "Unimplemented pathspec magic '%c' in '%s'"
1113 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1114
1115 #: pathspec.c:230
1116 #, c-format
1117 msgid "%s: 'literal' and 'glob' are incompatible"
1118 msgstr "%s：'literal' 和 'glob' 不兼容"
1119
1120 #: pathspec.c:241
1121 #, c-format
1122 msgid "%s: '%s' is outside repository"
1123 msgstr "%s：'%s' 在仓库之外"
1124
1125 #: pathspec.c:291
1126 #, c-format
1127 msgid "Pathspec '%s' is in submodule '%.*s'"
1128 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1129
1130 #: pathspec.c:353
1131 #, c-format
1132 msgid "%s: pathspec magic not supported by this command: %s"
1133 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
1134
1135 #: pathspec.c:432
1136 #, c-format
1137 msgid "pathspec '%s' is beyond a symbolic link"
1138 msgstr "路径规格 '%s' 位于符号链接中"
1139
1140 #: pathspec.c:441
1141 msgid ""
1142 "There is nothing to exclude from by :(exclude) patterns.\n"
1143 "Perhaps you forgot to add either ':/' or '.' ?"
1144 msgstr ""
1145 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1146 "添加 ':/' 或 '.' ？"
1147
1148 #: pretty.c:968
1149 msgid "unable to parse --pretty format"
1150 msgstr "不能解析 --pretty 格式"
1151
1152 #: progress.c:236
1153 msgid "done"
1154 msgstr "完成"
1155
1156 #: read-cache.c:1295
1157 #, c-format
1158 msgid ""
1159 "index.version set, but the value is invalid.\n"
1160 "Using version %i"
1161 msgstr ""
1162 "设置了 index.version，但是取值无效。\n"
1163 "使用版本 %i"
1164
1165 #: read-cache.c:1305
1166 #, c-format
1167 msgid ""
1168 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1169 "Using version %i"
1170 msgstr ""
1171 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
1172 "使用版本 %i"
1173
1174 #: remote.c:792
1175 #, c-format
1176 msgid "Cannot fetch both %s and %s to %s"
1177 msgstr "不能同时获取 %s 和 %s 至 %s"
1178
1179 #: remote.c:796
1180 #, c-format
1181 msgid "%s usually tracks %s, not %s"
1182 msgstr "%s 通常跟踪 %s，而非 %s"
1183
1184 #: remote.c:800
1185 #, c-format
1186 msgid "%s tracks both %s and %s"
1187 msgstr "%s 同时跟踪 %s 和 %s"
1188
1189 #: remote.c:808
1190 msgid "Internal error"
1191 msgstr "内部错误"
1192
1193 #: remote.c:1723 remote.c:1766
1194 msgid "HEAD does not point to a branch"
1195 msgstr "HEAD 没有指向一个分支"
1196
1197 #: remote.c:1732
1198 #, c-format
1199 msgid "no such branch: '%s'"
1200 msgstr "没有此分支：'%s'"
1201
1202 #: remote.c:1735
1203 #, c-format
1204 msgid "no upstream configured for branch '%s'"
1205 msgstr "尚未给分支 '%s' 设置上游"
1206
1207 #: remote.c:1741
1208 #, c-format
1209 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1210 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1211
1212 #: remote.c:1756
1213 #, c-format
1214 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1215 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1216
1217 #: remote.c:1771
1218 #, c-format
1219 msgid "branch '%s' has no remote for pushing"
1220 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1221
1222 #: remote.c:1782
1223 #, c-format
1224 msgid "push refspecs for '%s' do not include '%s'"
1225 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1226
1227 #: remote.c:1795
1228 msgid "push has no destination (push.default is 'nothing')"
1229 msgstr "推送无目标（push.default 是 'nothing'）"
1230
1231 #: remote.c:1817
1232 msgid "cannot resolve 'simple' push to a single destination"
1233 msgstr "无法解析 'simple' 推送至一个单独的目标"
1234
1235 #: remote.c:2124
1236 #, c-format
1237 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1238 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
1239
1240 #: remote.c:2128
1241 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1242 msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
1243
1244 #: remote.c:2131
1245 #, c-format
1246 msgid "Your branch is up-to-date with '%s'.\n"
1247 msgstr "您的分支与上游分支 '%s' 一致。\n"
1248
1249 #: remote.c:2135
1250 #, c-format
1251 msgid "Your branch is ahead of '%s' by %d commit.\n"
1252 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1253 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1254 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1255
1256 #: remote.c:2141
1257 msgid "  (use \"git push\" to publish your local commits)\n"
1258 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
1259
1260 #: remote.c:2144
1261 #, c-format
1262 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1263 msgid_plural ""
1264 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1265 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
1266 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
1267
1268 #  译者：注意保持前导空格
1269 #: remote.c:2152
1270 msgid "  (use \"git pull\" to update your local branch)\n"
1271 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
1272
1273 #: remote.c:2155
1274 #, c-format
1275 msgid ""
1276 "Your branch and '%s' have diverged,\n"
1277 "and have %d and %d different commit each, respectively.\n"
1278 msgid_plural ""
1279 "Your branch and '%s' have diverged,\n"
1280 "and have %d and %d different commits each, respectively.\n"
1281 msgstr[0] ""
1282 "您的分支和 '%s' 出现了偏离，\n"
1283 "并且分别有 %d 和 %d 处不同的提交。\n"
1284 msgstr[1] ""
1285 "您的分支和 '%s' 出现了偏离，\n"
1286 "并且分别有 %d 和 %d 处不同的提交。\n"
1287
1288 #  译者：注意保持前导空格
1289 #: remote.c:2165
1290 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1291 msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
1292
1293 #: revision.c:2366
1294 msgid "--first-parent is incompatible with --bisect"
1295 msgstr "--first-parent 与 --bisect 不兼容"
1296
1297 #: run-command.c:83
1298 msgid "open /dev/null failed"
1299 msgstr "不能打开 /dev/null"
1300
1301 #: run-command.c:85
1302 #, c-format
1303 msgid "dup2(%d,%d) failed"
1304 msgstr "不能调用 dup2(%d,%d)"
1305
1306 #: send-pack.c:272
1307 msgid "failed to sign the push certificate"
1308 msgstr "无法为推送证书签名"
1309
1310 #: send-pack.c:378
1311 msgid "the receiving end does not support --signed push"
1312 msgstr "接收端不支持签名推送"
1313
1314 #: send-pack.c:389
1315 msgid "the receiving end does not support --atomic push"
1316 msgstr "接收端不支持原子推送"
1317
1318 #: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1319 #: builtin/merge.c:983
1320 #, c-format
1321 msgid "Could not open '%s' for writing"
1322 msgstr "不能为写入打开 '%s'"
1323
1324 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1325 #: builtin/merge.c:988
1326 #, c-format
1327 msgid "Could not write to '%s'"
1328 msgstr "不能写入 '%s'"
1329
1330 #: sequencer.c:195
1331 msgid ""
1332 "after resolving the conflicts, mark the corrected paths\n"
1333 "with 'git add <paths>' or 'git rm <paths>'"
1334 msgstr ""
1335 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1336 "命令标记修正后的文件"
1337
1338 #: sequencer.c:198
1339 msgid ""
1340 "after resolving the conflicts, mark the corrected paths\n"
1341 "with 'git add <paths>' or 'git rm <paths>'\n"
1342 "and commit the result with 'git commit'"
1343 msgstr ""
1344 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1345 "对修正后的文件做标记，然后用 'git commit' 提交"
1346
1347 #: sequencer.c:211 sequencer.c:861 sequencer.c:944
1348 #, c-format
1349 msgid "Could not write to %s"
1350 msgstr "不能写入 %s"
1351
1352 #: sequencer.c:214
1353 #, c-format
1354 msgid "Error wrapping up %s"
1355 msgstr "错误收尾 %s"
1356
1357 #: sequencer.c:229
1358 msgid "Your local changes would be overwritten by cherry-pick."
1359 msgstr "您的本地修改将被拣选操作覆盖。"
1360
1361 #: sequencer.c:231
1362 msgid "Your local changes would be overwritten by revert."
1363 msgstr "您的本地修改将被还原操作覆盖。"
1364
1365 #: sequencer.c:234
1366 msgid "Commit your changes or stash them to proceed."
1367 msgstr "提交您的修改或保存进度后再继续。"
1368
1369 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1370 #: sequencer.c:321
1371 #, c-format
1372 msgid "%s: Unable to write new index file"
1373 msgstr "%s：无法写入新索引文件"
1374
1375 #: sequencer.c:339
1376 msgid "Could not resolve HEAD commit\n"
1377 msgstr "不能解析 HEAD 提交\n"
1378
1379 #: sequencer.c:359
1380 msgid "Unable to update cache tree\n"
1381 msgstr "不能更新缓存\n"
1382
1383 #: sequencer.c:411
1384 #, c-format
1385 msgid "Could not parse commit %s\n"
1386 msgstr "不能解析提交 %s\n"
1387
1388 #: sequencer.c:416
1389 #, c-format
1390 msgid "Could not parse parent commit %s\n"
1391 msgstr "不能解析父提交 %s\n"
1392
1393 #: sequencer.c:482
1394 msgid "Your index file is unmerged."
1395 msgstr "您的索引文件未完成合并。"
1396
1397 #: sequencer.c:501
1398 #, c-format
1399 msgid "Commit %s is a merge but no -m option was given."
1400 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1401
1402 #: sequencer.c:509
1403 #, c-format
1404 msgid "Commit %s does not have parent %d"
1405 msgstr "提交 %s 没有父提交 %d"
1406
1407 #: sequencer.c:513
1408 #, c-format
1409 msgid "Mainline was specified but commit %s is not a merge."
1410 msgstr "指定了主线但提交 %s 不是一个合并。"
1411
1412 #. TRANSLATORS: The first %s will be "revert" or
1413 #. "cherry-pick", the second %s a SHA1
1414 #: sequencer.c:526
1415 #, c-format
1416 msgid "%s: cannot parse parent commit %s"
1417 msgstr "%s：不能解析父提交 %s"
1418
1419 #: sequencer.c:530
1420 #, c-format
1421 msgid "Cannot get commit message for %s"
1422 msgstr "不能得到 %s 的提交说明"
1423
1424 #: sequencer.c:616
1425 #, c-format
1426 msgid "could not revert %s... %s"
1427 msgstr "不能还原 %s... %s"
1428
1429 #: sequencer.c:617
1430 #, c-format
1431 msgid "could not apply %s... %s"
1432 msgstr "不能应用 %s... %s"
1433
1434 #: sequencer.c:653
1435 msgid "empty commit set passed"
1436 msgstr "提供了空的提交集"
1437
1438 #: sequencer.c:661
1439 #, c-format
1440 msgid "git %s: failed to read the index"
1441 msgstr "git %s：无法读取索引"
1442
1443 #: sequencer.c:665
1444 #, c-format
1445 msgid "git %s: failed to refresh the index"
1446 msgstr "git %s：无法刷新索引"
1447
1448 #: sequencer.c:725
1449 #, c-format
1450 msgid "Cannot %s during a %s"
1451 msgstr "无法 %s 在一个 %s 过程中"
1452
1453 #: sequencer.c:747
1454 #, c-format
1455 msgid "Could not parse line %d."
1456 msgstr "不能解析第 %d 行。"
1457
1458 #: sequencer.c:752
1459 msgid "No commits parsed."
1460 msgstr "没有提交被解析。"
1461
1462 #: sequencer.c:765
1463 #, c-format
1464 msgid "Could not open %s"
1465 msgstr "不能打开 %s"
1466
1467 #: sequencer.c:769
1468 #, c-format
1469 msgid "Could not read %s."
1470 msgstr "不能读取 %s。"
1471
1472 #: sequencer.c:776
1473 #, c-format
1474 msgid "Unusable instruction sheet: %s"
1475 msgstr "无用的指令表单：%s"
1476
1477 #: sequencer.c:806
1478 #, c-format
1479 msgid "Invalid key: %s"
1480 msgstr "无效键名：%s"
1481
1482 #: sequencer.c:809
1483 #, c-format
1484 msgid "Invalid value for %s: %s"
1485 msgstr "%s 的值无效：%s"
1486
1487 #: sequencer.c:821
1488 #, c-format
1489 msgid "Malformed options sheet: %s"
1490 msgstr "非法的选项表单：%s"
1491
1492 #: sequencer.c:842
1493 msgid "a cherry-pick or revert is already in progress"
1494 msgstr "一个拣选或还原操作已在进行"
1495
1496 #: sequencer.c:843
1497 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1498 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1499
1500 #: sequencer.c:847
1501 #, c-format
1502 msgid "Could not create sequencer directory %s"
1503 msgstr "不能创建序列目录 %s"
1504
1505 #: sequencer.c:863 sequencer.c:948
1506 #, c-format
1507 msgid "Error wrapping up %s."
1508 msgstr "错误收尾 %s。"
1509
1510 #: sequencer.c:882 sequencer.c:1018
1511 msgid "no cherry-pick or revert in progress"
1512 msgstr "拣选或还原操作并未进行"
1513
1514 #: sequencer.c:884
1515 msgid "cannot resolve HEAD"
1516 msgstr "不能解析 HEAD"
1517
1518 #: sequencer.c:886
1519 msgid "cannot abort from a branch yet to be born"
1520 msgstr "不能从尚未建立的分支终止"
1521
1522 #: sequencer.c:908 builtin/apply.c:4291
1523 #, c-format
1524 msgid "cannot open %s: %s"
1525 msgstr "不能打开 %s：%s"
1526
1527 #: sequencer.c:911
1528 #, c-format
1529 msgid "cannot read %s: %s"
1530 msgstr "不能读取 %s：%s"
1531
1532 #: sequencer.c:912
1533 msgid "unexpected end of file"
1534 msgstr "意外的文件结束"
1535
1536 #: sequencer.c:918
1537 #, c-format
1538 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1539 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1540
1541 #: sequencer.c:941
1542 #, c-format
1543 msgid "Could not format %s."
1544 msgstr "不能格式化 %s。"
1545
1546 #: sequencer.c:1086
1547 #, c-format
1548 msgid "%s: can't cherry-pick a %s"
1549 msgstr "%s：不能拣选一个%s"
1550
1551 #: sequencer.c:1089
1552 #, c-format
1553 msgid "%s: bad revision"
1554 msgstr "%s：错误的版本"
1555
1556 #: sequencer.c:1123
1557 msgid "Can't revert as initial commit"
1558 msgstr "不能作为初始提交还原"
1559
1560 #: sequencer.c:1124
1561 msgid "Can't cherry-pick into empty head"
1562 msgstr "不能拣选到空分支"
1563
1564 #: setup.c:243
1565 #, c-format
1566 msgid "failed to read %s"
1567 msgstr "无法读取 %s"
1568
1569 #: sha1_name.c:453
1570 msgid ""
1571 "Git normally never creates a ref that ends with 40 hex characters\n"
1572 "because it will be ignored when you just specify 40-hex. These refs\n"
1573 "may be created by mistake. For example,\n"
1574 "\n"
1575 "  git checkout -b $br $(git rev-parse ...)\n"
1576 "\n"
1577 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1578 "examine these refs and maybe delete them. Turn this message off by\n"
1579 "running \"git config advice.objectNameWarning false\""
1580 msgstr ""
1581 "Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
1582 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
1583 "\n"
1584 "  git checkout -b $br $(git rev-parse ...)\n"
1585 "\n"
1586 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
1587 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1588 "命令关闭本消息通知。"
1589
1590 #: submodule.c:64 submodule.c:98
1591 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1592 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
1593
1594 #: submodule.c:68 submodule.c:102
1595 #, c-format
1596 msgid "Could not find section in .gitmodules where path=%s"
1597 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1598
1599 #: submodule.c:76
1600 #, c-format
1601 msgid "Could not update .gitmodules entry %s"
1602 msgstr "不能更新 .gitmodules 条目 %s"
1603
1604 #: submodule.c:109
1605 #, c-format
1606 msgid "Could not remove .gitmodules entry for %s"
1607 msgstr "无法移除 %s 的 .gitmodules 条目"
1608
1609 #: submodule.c:120
1610 msgid "staging updated .gitmodules failed"
1611 msgstr "将更新后 .gitmodules 添加暂存区失败"
1612
1613 #: submodule.c:1115
1614 #, c-format
1615 msgid "Could not set core.worktree in %s"
1616 msgstr "不能在 %s 中设置 core.worktree"
1617
1618 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1619 #: trailer.c:561
1620 #, c-format
1621 msgid "unknown value '%s' for key '%s'"
1622 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1623
1624 #: trailer.c:543 trailer.c:548 builtin/remote.c:290
1625 #, c-format
1626 msgid "more than one %s"
1627 msgstr "多于一个 %s"
1628
1629 #: trailer.c:581
1630 #, c-format
1631 msgid "empty trailer token in trailer '%.*s'"
1632 msgstr "签名 '%.*s' 的键为空"
1633
1634 #: trailer.c:701
1635 #, c-format
1636 msgid "could not read input file '%s'"
1637 msgstr "不能读取输入文件 '%s'"
1638
1639 #: trailer.c:704
1640 msgid "could not read from stdin"
1641 msgstr "不能自标准输入读取"
1642
1643 #: unpack-trees.c:203
1644 msgid "Checking out files"
1645 msgstr "正在检出文件"
1646
1647 #: urlmatch.c:120
1648 msgid "invalid URL scheme name or missing '://' suffix"
1649 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1650
1651 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1652 #, c-format
1653 msgid "invalid %XX escape sequence"
1654 msgstr "无效的 %XX 转义序列"
1655
1656 #: urlmatch.c:172
1657 msgid "missing host and scheme is not 'file:'"
1658 msgstr "缺失主机名且 URL 方案不是 'file:'"
1659
1660 #: urlmatch.c:189
1661 msgid "a 'file:' URL may not have a port number"
1662 msgstr "一个 'file:' URL 不应该包含端口号"
1663
1664 #: urlmatch.c:199
1665 msgid "invalid characters in host name"
1666 msgstr "主机名中包含无效的字符"
1667
1668 #: urlmatch.c:244 urlmatch.c:255
1669 msgid "invalid port number"
1670 msgstr "无效的端口号"
1671
1672 #: urlmatch.c:322
1673 msgid "invalid '..' path segment"
1674 msgstr "无效的 '..' 路径片段"
1675
1676 #: wrapper.c:523
1677 #, c-format
1678 msgid "unable to access '%s': %s"
1679 msgstr "不能访问 '%s'：%s"
1680
1681 #: wrapper.c:544
1682 #, c-format
1683 msgid "unable to access '%s'"
1684 msgstr "不能访问 '%s'"
1685
1686 #: wrapper.c:555
1687 #, c-format
1688 msgid "unable to look up current user in the passwd file: %s"
1689 msgstr "无法在口令文件中查询到当前用户：%s"
1690
1691 #: wrapper.c:556
1692 msgid "no such user"
1693 msgstr "无此用户"
1694
1695 #: wrapper.c:564
1696 msgid "unable to get current working directory"
1697 msgstr "不能获取当前工作目录"
1698
1699 #: wrapper.c:575
1700 #, c-format
1701 msgid "could not open %s for writing"
1702 msgstr "不能写入 %s"
1703
1704 #: wrapper.c:587
1705 #, c-format
1706 msgid "could not write to %s"
1707 msgstr "不能写入 %s"
1708
1709 #: wrapper.c:593
1710 #, c-format
1711 msgid "could not close %s"
1712 msgstr "不能关闭 %s"
1713
1714 #: wt-status.c:150
1715 msgid "Unmerged paths:"
1716 msgstr "未合并的路径："
1717
1718 #  译者：注意保持前导空格
1719 #: wt-status.c:177 wt-status.c:204
1720 #, c-format
1721 msgid "  (use \"git reset %s <file>...\" to unstage)"
1722 msgstr "  （使用 \"git reset %s <文件>...\" 以取消暂存）"
1723
1724 #  译者：注意保持前导空格
1725 #: wt-status.c:179 wt-status.c:206
1726 msgid "  (use \"git rm --cached <file>...\" to unstage)"
1727 msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
1728
1729 #  译者：注意保持前导空格
1730 #: wt-status.c:183
1731 msgid "  (use \"git add <file>...\" to mark resolution)"
1732 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
1733
1734 #  译者：注意保持前导空格
1735 #: wt-status.c:185 wt-status.c:189
1736 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1737 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
1738
1739 #  译者：注意保持前导空格
1740 #: wt-status.c:187
1741 msgid "  (use \"git rm <file>...\" to mark resolution)"
1742 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
1743
1744 #: wt-status.c:198 wt-status.c:881
1745 msgid "Changes to be committed:"
1746 msgstr "要提交的变更："
1747
1748 #: wt-status.c:216 wt-status.c:890
1749 msgid "Changes not staged for commit:"
1750 msgstr "尚未暂存以备提交的变更："
1751
1752 #  译者：注意保持前导空格
1753 #: wt-status.c:220
1754 msgid "  (use \"git add <file>...\" to update what will be committed)"
1755 msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
1756
1757 #  译者：注意保持前导空格
1758 #: wt-status.c:222
1759 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1760 msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
1761
1762 #  译者：注意保持前导空格
1763 #: wt-status.c:223
1764 msgid ""
1765 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1766 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
1767
1768 #  译者：注意保持前导空格
1769 #: wt-status.c:225
1770 msgid "  (commit or discard the untracked or modified content in submodules)"
1771 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
1772
1773 #  译者：注意保持前导空格
1774 #: wt-status.c:237
1775 #, c-format
1776 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1777 msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
1778
1779 #: wt-status.c:252
1780 msgid "both deleted:"
1781 msgstr "双方删除："
1782
1783 #: wt-status.c:254
1784 msgid "added by us:"
1785 msgstr "由我们添加："
1786
1787 #: wt-status.c:256
1788 msgid "deleted by them:"
1789 msgstr "由他们删除："
1790
1791 #: wt-status.c:258
1792 msgid "added by them:"
1793 msgstr "由他们添加："
1794
1795 #: wt-status.c:260
1796 msgid "deleted by us:"
1797 msgstr "由我们删除："
1798
1799 #: wt-status.c:262
1800 msgid "both added:"
1801 msgstr "双方添加："
1802
1803 #: wt-status.c:264
1804 msgid "both modified:"
1805 msgstr "双方修改："
1806
1807 #: wt-status.c:266
1808 #, c-format
1809 msgid "bug: unhandled unmerged status %x"
1810 msgstr "bug：无法处理的未合并状态 %x"
1811
1812 #: wt-status.c:274
1813 msgid "new file:"
1814 msgstr "新文件："
1815
1816 #: wt-status.c:276
1817 msgid "copied:"
1818 msgstr "拷贝："
1819
1820 #: wt-status.c:278
1821 msgid "deleted:"
1822 msgstr "删除："
1823
1824 #: wt-status.c:280
1825 msgid "modified:"
1826 msgstr "修改："
1827
1828 #: wt-status.c:282
1829 msgid "renamed:"
1830 msgstr "重命名："
1831
1832 #: wt-status.c:284
1833 msgid "typechange:"
1834 msgstr "类型变更："
1835
1836 #: wt-status.c:286
1837 msgid "unknown:"
1838 msgstr "未知："
1839
1840 #: wt-status.c:288
1841 msgid "unmerged:"
1842 msgstr "未合并："
1843
1844 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1845 #: wt-status.c:370
1846 msgid "new commits, "
1847 msgstr "新提交, "
1848
1849 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1850 #: wt-status.c:372
1851 msgid "modified content, "
1852 msgstr "修改的内容, "
1853
1854 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1855 #: wt-status.c:374
1856 msgid "untracked content, "
1857 msgstr "未跟踪的内容, "
1858
1859 #: wt-status.c:391
1860 #, c-format
1861 msgid "bug: unhandled diff status %c"
1862 msgstr "bug：无法处理的差异状态 %c"
1863
1864 #: wt-status.c:755
1865 msgid "Submodules changed but not updated:"
1866 msgstr "子模组已修改但尚未更新："
1867
1868 #: wt-status.c:757
1869 msgid "Submodule changes to be committed:"
1870 msgstr "要提交的子模组变更："
1871
1872 #: wt-status.c:838
1873 msgid ""
1874 "Do not touch the line above.\n"
1875 "Everything below will be removed."
1876 msgstr ""
1877 "不要改动上面的一行。\n"
1878 "下面的所有内容均将被删除。"
1879
1880 #: wt-status.c:949
1881 msgid "You have unmerged paths."
1882 msgstr "您有尚未合并的路径。"
1883
1884 #  译者：注意保持前导空格
1885 #: wt-status.c:952
1886 msgid "  (fix conflicts and run \"git commit\")"
1887 msgstr "  （解决冲突并运行 \"git commit\"）"
1888
1889 #: wt-status.c:955
1890 msgid "All conflicts fixed but you are still merging."
1891 msgstr "所有冲突已解决但您仍处于合并中。"
1892
1893 #  译者：注意保持前导空格
1894 #: wt-status.c:958
1895 msgid "  (use \"git commit\" to conclude merge)"
1896 msgstr "  （使用 \"git commit\" 结束合并）"
1897
1898 #: wt-status.c:968
1899 msgid "You are in the middle of an am session."
1900 msgstr "您正处于 am 操作过程中。"
1901
1902 #: wt-status.c:971
1903 msgid "The current patch is empty."
1904 msgstr "当前的补丁为空。"
1905
1906 #  译者：注意保持前导空格
1907 #: wt-status.c:975
1908 msgid "  (fix conflicts and then run \"git am --continue\")"
1909 msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
1910
1911 #  译者：注意保持前导空格
1912 #: wt-status.c:977
1913 msgid "  (use \"git am --skip\" to skip this patch)"
1914 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
1915
1916 #  译者：注意保持前导空格
1917 #: wt-status.c:979
1918 msgid "  (use \"git am --abort\" to restore the original branch)"
1919 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
1920
1921 #: wt-status.c:1039 wt-status.c:1056
1922 #, c-format
1923 msgid "You are currently rebasing branch '%s' on '%s'."
1924 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1925
1926 #: wt-status.c:1044 wt-status.c:1061
1927 msgid "You are currently rebasing."
1928 msgstr "您在执行变基操作。"
1929
1930 #  译者：注意保持前导空格
1931 #: wt-status.c:1047
1932 msgid "  (fix conflicts and then run \"git rebase --continue\")"
1933 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
1934
1935 #  译者：注意保持前导空格
1936 #: wt-status.c:1049
1937 msgid "  (use \"git rebase --skip\" to skip this patch)"
1938 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
1939
1940 #  译者：注意保持前导空格
1941 #: wt-status.c:1051
1942 msgid "  (use \"git rebase --abort\" to check out the original branch)"
1943 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
1944
1945 #  译者：注意保持前导空格
1946 #: wt-status.c:1064
1947 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
1948 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
1949
1950 #: wt-status.c:1068
1951 #, c-format
1952 msgid ""
1953 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1954 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1955
1956 #: wt-status.c:1073
1957 msgid "You are currently splitting a commit during a rebase."
1958 msgstr "您在执行变基操作时拆分提交。"
1959
1960 #  译者：注意保持前导空格
1961 #: wt-status.c:1076
1962 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
1963 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
1964
1965 #: wt-status.c:1080
1966 #, c-format
1967 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1968 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1969
1970 #: wt-status.c:1085
1971 msgid "You are currently editing a commit during a rebase."
1972 msgstr "您在执行变基操作时编辑提交。"
1973
1974 #  译者：注意保持前导空格
1975 #: wt-status.c:1088
1976 msgid "  (use \"git commit --amend\" to amend the current commit)"
1977 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
1978
1979 #  译者：注意保持前导空格
1980 #: wt-status.c:1090
1981 msgid ""
1982 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
1983 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
1984
1985 #: wt-status.c:1100
1986 #, c-format
1987 msgid "You are currently cherry-picking commit %s."
1988 msgstr "您在执行拣选提交 %s 的操作。"
1989
1990 #  译者：注意保持前导空格
1991 #: wt-status.c:1105
1992 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
1993 msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
1994
1995 #  译者：注意保持前导空格
1996 #: wt-status.c:1108
1997 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
1998 msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
1999
2000 #  译者：注意保持前导空格
2001 #: wt-status.c:1110
2002 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2003 msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
2004
2005 #: wt-status.c:1119
2006 #, c-format
2007 msgid "You are currently reverting commit %s."
2008 msgstr "您在执行反转提交 %s 的操作。"
2009
2010 #  译者：注意保持前导空格
2011 #: wt-status.c:1124
2012 msgid "  (fix conflicts and run \"git revert --continue\")"
2013 msgstr "  （解决冲突并运行 \"git revert --continue\"）"
2014
2015 #  译者：注意保持前导空格
2016 #: wt-status.c:1127
2017 msgid "  (all conflicts fixed: run \"git revert --continue\")"
2018 msgstr "  （所有冲突已解决：运行 \"git revert --continue\"）"
2019
2020 #  译者：注意保持前导空格
2021 #: wt-status.c:1129
2022 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2023 msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
2024
2025 #: wt-status.c:1140
2026 #, c-format
2027 msgid "You are currently bisecting, started from branch '%s'."
2028 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2029
2030 #: wt-status.c:1144
2031 msgid "You are currently bisecting."
2032 msgstr "您在执行二分查找操作。"
2033
2034 #  译者：注意保持前导空格
2035 #: wt-status.c:1147
2036 msgid "  (use \"git bisect reset\" to get back to the original branch)"
2037 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
2038
2039 #: wt-status.c:1324
2040 msgid "On branch "
2041 msgstr "位于分支 "
2042
2043 #: wt-status.c:1331
2044 msgid "rebase in progress; onto "
2045 msgstr "变基操作正在进行中；至 "
2046
2047 #: wt-status.c:1336
2048 msgid "HEAD detached at "
2049 msgstr "头指针分离于 "
2050
2051 #: wt-status.c:1338
2052 msgid "HEAD detached from "
2053 msgstr "头指针分离自 "
2054
2055 #: wt-status.c:1341
2056 msgid "Not currently on any branch."
2057 msgstr "当前不在任何分支上。"
2058
2059 #: wt-status.c:1358
2060 msgid "Initial commit"
2061 msgstr "初始提交"
2062
2063 #: wt-status.c:1372
2064 msgid "Untracked files"
2065 msgstr "未跟踪的文件"
2066
2067 #: wt-status.c:1374
2068 msgid "Ignored files"
2069 msgstr "忽略的文件"
2070
2071 #: wt-status.c:1378
2072 #, c-format
2073 msgid ""
2074 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2075 "may speed it up, but you have to be careful not to forget to add\n"
2076 "new files yourself (see 'git help status')."
2077 msgstr ""
2078 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
2079 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"
2080
2081 #: wt-status.c:1384
2082 #, c-format
2083 msgid "Untracked files not listed%s"
2084 msgstr "未跟踪的文件没有列出%s"
2085
2086 #  译者：中文字符串拼接，可删除前导空格
2087 #: wt-status.c:1386
2088 msgid " (use -u option to show untracked files)"
2089 msgstr "（使用 -u 参数显示未跟踪的文件）"
2090
2091 #: wt-status.c:1392
2092 msgid "No changes"
2093 msgstr "没有修改"
2094
2095 #: wt-status.c:1397
2096 #, c-format
2097 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2098 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
2099
2100 #: wt-status.c:1400
2101 #, c-format
2102 msgid "no changes added to commit\n"
2103 msgstr "修改尚未加入提交\n"
2104
2105 #: wt-status.c:1403
2106 #, c-format
2107 msgid ""
2108 "nothing added to commit but untracked files present (use \"git add\" to "
2109 "track)\n"
2110 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
2111
2112 #: wt-status.c:1406
2113 #, c-format
2114 msgid "nothing added to commit but untracked files present\n"
2115 msgstr "提交为空，但是存在尚未跟踪的文件\n"
2116
2117 #  译者：中文字符串拼接，可删除前导空格
2118 #: wt-status.c:1409
2119 #, c-format
2120 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2121 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
2122
2123 #: wt-status.c:1412 wt-status.c:1417
2124 #, c-format
2125 msgid "nothing to commit\n"
2126 msgstr "无文件要提交\n"
2127
2128 #  译者：中文字符串拼接，可删除前导空格
2129 #: wt-status.c:1415
2130 #, c-format
2131 msgid "nothing to commit (use -u to show untracked files)\n"
2132 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
2133
2134 #  译者：中文字符串拼接，可删除前导空格
2135 #: wt-status.c:1419
2136 #, c-format
2137 msgid "nothing to commit, working directory clean\n"
2138 msgstr "无文件要提交，干净的工作区\n"
2139
2140 #: wt-status.c:1528
2141 msgid "HEAD (no branch)"
2142 msgstr "HEAD（非分支）"
2143
2144 #  译者：注意保持句尾空格
2145 #: wt-status.c:1534
2146 msgid "Initial commit on "
2147 msgstr "初始提交于 "
2148
2149 #: wt-status.c:1561
2150 msgid "gone"
2151 msgstr "丢失"
2152
2153 #  译者：注意保持句尾空格
2154 #: wt-status.c:1563 wt-status.c:1571
2155 msgid "behind "
2156 msgstr "落后 "
2157
2158 #: compat/precompose_utf8.c:55 builtin/clone.c:345
2159 #, c-format
2160 msgid "failed to unlink '%s'"
2161 msgstr "无法删除 '%s'"
2162
2163 #: builtin/add.c:22
2164 msgid "git add [<options>] [--] <pathspec>..."
2165 msgstr "git add [<选项>] [--] <路径规格>..."
2166
2167 #: builtin/add.c:65
2168 #, c-format
2169 msgid "unexpected diff status %c"
2170 msgstr "意外的差异状态 %c"
2171
2172 #: builtin/add.c:70 builtin/commit.c:277
2173 msgid "updating files failed"
2174 msgstr "更新文件失败"
2175
2176 #: builtin/add.c:80
2177 #, c-format
2178 msgid "remove '%s'\n"
2179 msgstr "删除 '%s'\n"
2180
2181 #: builtin/add.c:134
2182 msgid "Unstaged changes after refreshing the index:"
2183 msgstr "刷新索引之后尚未被暂存的变更："
2184
2185 #: builtin/add.c:194 builtin/rev-parse.c:796
2186 msgid "Could not read the index"
2187 msgstr "不能读取索引"
2188
2189 #: builtin/add.c:205
2190 #, c-format
2191 msgid "Could not open '%s' for writing."
2192 msgstr "不能打开 '%s' 以写入。"
2193
2194 #: builtin/add.c:209
2195 msgid "Could not write patch"
2196 msgstr "不能生成补丁"
2197
2198 #: builtin/add.c:212
2199 msgid "editing patch failed"
2200 msgstr "编辑补丁失败"
2201
2202 #: builtin/add.c:215
2203 #, c-format
2204 msgid "Could not stat '%s'"
2205 msgstr "不能查看文件状态 '%s'"
2206
2207 #: builtin/add.c:217
2208 msgid "Empty patch. Aborted."
2209 msgstr "空补丁。异常终止。"
2210
2211 #: builtin/add.c:222
2212 #, c-format
2213 msgid "Could not apply '%s'"
2214 msgstr "不能应用 '%s'"
2215
2216 #: builtin/add.c:232
2217 msgid "The following paths are ignored by one of your .gitignore files:\n"
2218 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2219
2220 #: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2221 #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2222 #: builtin/rm.c:268
2223 msgid "dry run"
2224 msgstr "演习"
2225
2226 #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2227 #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
2228 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2229 msgid "be verbose"
2230 msgstr "冗长输出"
2231
2232 #: builtin/add.c:252
2233 msgid "interactive picking"
2234 msgstr "交互式拣选"
2235
2236 #: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
2237 msgid "select hunks interactively"
2238 msgstr "交互式挑选数据块"
2239
2240 #: builtin/add.c:254
2241 msgid "edit current diff and apply"
2242 msgstr "编辑当前差异并应用"
2243
2244 #: builtin/add.c:255
2245 msgid "allow adding otherwise ignored files"
2246 msgstr "允许添加忽略的文件"
2247
2248 #: builtin/add.c:256
2249 msgid "update tracked files"
2250 msgstr "更新已跟踪的文件"
2251
2252 #: builtin/add.c:257
2253 msgid "record only the fact that the path will be added later"
2254 msgstr "只记录，该路径稍后再添加"
2255
2256 #: builtin/add.c:258
2257 msgid "add changes from all tracked and untracked files"
2258 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2259
2260 #: builtin/add.c:261
2261 msgid "ignore paths removed in the working tree (same as --no-all)"
2262 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
2263
2264 #: builtin/add.c:263
2265 msgid "don't add, only refresh the index"
2266 msgstr "不添加，只刷新索引"
2267
2268 #: builtin/add.c:264
2269 msgid "just skip files which cannot be added because of errors"
2270 msgstr "跳过因出错不能添加的文件"
2271
2272 #: builtin/add.c:265
2273 msgid "check if - even missing - files are ignored in dry run"
2274 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
2275
2276 #: builtin/add.c:287
2277 #, c-format
2278 msgid "Use -f if you really want to add them.\n"
2279 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2280
2281 #: builtin/add.c:294
2282 msgid "adding files failed"
2283 msgstr "添加文件失败"
2284
2285 #: builtin/add.c:330
2286 msgid "-A and -u are mutually incompatible"
2287 msgstr "-A 和 -u 选项互斥"
2288
2289 #: builtin/add.c:337
2290 msgid "Option --ignore-missing can only be used together with --dry-run"
2291 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2292
2293 #: builtin/add.c:358
2294 #, c-format
2295 msgid "Nothing specified, nothing added.\n"
2296 msgstr "没有指定文件，也没有文件被添加。\n"
2297
2298 #: builtin/add.c:359
2299 #, c-format
2300 msgid "Maybe you wanted to say 'git add .'?\n"
2301 msgstr "也许您想要执行 'git add .'？\n"
2302
2303 #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2304 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2305 msgid "index file corrupt"
2306 msgstr "索引文件损坏"
2307
2308 #: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2309 msgid "Unable to write new index file"
2310 msgstr "无法写入新索引文件"
2311
2312 #: builtin/apply.c:59
2313 msgid "git apply [<options>] [<patch>...]"
2314 msgstr "git apply [<选项>] [<补丁>...]"
2315
2316 #: builtin/apply.c:112
2317 #, c-format
2318 msgid "unrecognized whitespace option '%s'"
2319 msgstr "未能识别的空白字符选项 '%s'"
2320
2321 #: builtin/apply.c:127
2322 #, c-format
2323 msgid "unrecognized whitespace ignore option '%s'"
2324 msgstr "未能识别的空白字符忽略选项 '%s'"
2325
2326 #: builtin/apply.c:822
2327 #, c-format
2328 msgid "Cannot prepare timestamp regexp %s"
2329 msgstr "无法准备时间戳正则表达式 %s"
2330
2331 #: builtin/apply.c:831
2332 #, c-format
2333 msgid "regexec returned %d for input: %s"
2334 msgstr "regexec 返回 %d，输入为：%s"
2335
2336 #: builtin/apply.c:912
2337 #, c-format
2338 msgid "unable to find filename in patch at line %d"
2339 msgstr "不能在补丁的第 %d 行找到文件名"
2340
2341 #: builtin/apply.c:944
2342 #, c-format
2343 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2344 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
2345
2346 #: builtin/apply.c:948
2347 #, c-format
2348 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2349 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
2350
2351 #: builtin/apply.c:949
2352 #, c-format
2353 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2354 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
2355
2356 #: builtin/apply.c:956
2357 #, c-format
2358 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2359 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
2360
2361 #: builtin/apply.c:1419
2362 #, c-format
2363 msgid "recount: unexpected line: %.*s"
2364 msgstr "recount：意外的行：%.*s"
2365
2366 #: builtin/apply.c:1476
2367 #, c-format
2368 msgid "patch fragment without header at line %d: %.*s"
2369 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
2370
2371 #: builtin/apply.c:1493
2372 #, c-format
2373 msgid ""
2374 "git diff header lacks filename information when removing %d leading pathname "
2375 "component (line %d)"
2376 msgid_plural ""
2377 "git diff header lacks filename information when removing %d leading pathname "
2378 "components (line %d)"
2379 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2380 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2381
2382 #: builtin/apply.c:1659
2383 msgid "new file depends on old contents"
2384 msgstr "新文件依赖旧内容"
2385
2386 #: builtin/apply.c:1661
2387 msgid "deleted file still has contents"
2388 msgstr "删除的文件仍有内容"
2389
2390 #: builtin/apply.c:1687
2391 #, c-format
2392 msgid "corrupt patch at line %d"
2393 msgstr "补丁在第 %d 行损坏"
2394
2395 #: builtin/apply.c:1723
2396 #, c-format
2397 msgid "new file %s depends on old contents"
2398 msgstr "新文件 %s 依赖旧内容"
2399
2400 #: builtin/apply.c:1725
2401 #, c-format
2402 msgid "deleted file %s still has contents"
2403 msgstr "删除的文件 %s 仍有内容"
2404
2405 #: builtin/apply.c:1728
2406 #, c-format
2407 msgid "** warning: file %s becomes empty but is not deleted"
2408 msgstr "** 警告：文件 %s 成为空文件但并未删除"
2409
2410 #: builtin/apply.c:1874
2411 #, c-format
2412 msgid "corrupt binary patch at line %d: %.*s"
2413 msgstr "二进制补丁在第 %d 行损坏：%.*s"
2414
2415 #: builtin/apply.c:1903
2416 #, c-format
2417 msgid "unrecognized binary patch at line %d"
2418 msgstr "未能识别的二进制补丁位于第 %d 行"
2419
2420 #: builtin/apply.c:2054
2421 #, c-format
2422 msgid "patch with only garbage at line %d"
2423 msgstr "补丁文件的第 %d 行只有垃圾数据"
2424
2425 #: builtin/apply.c:2144
2426 #, c-format
2427 msgid "unable to read symlink %s"
2428 msgstr "无法读取符号链接 %s"
2429
2430 #: builtin/apply.c:2148
2431 #, c-format
2432 msgid "unable to open or read %s"
2433 msgstr "不能打开或读取 %s"
2434
2435 #: builtin/apply.c:2781
2436 #, c-format
2437 msgid "invalid start of line: '%c'"
2438 msgstr "无效的行首字符：'%c'"
2439
2440 #: builtin/apply.c:2900
2441 #, c-format
2442 msgid "Hunk #%d succeeded at %d (offset %d line)."
2443 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2444 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
2445 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
2446
2447 #: builtin/apply.c:2912
2448 #, c-format
2449 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2450 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
2451
2452 #: builtin/apply.c:2918
2453 #, c-format
2454 msgid ""
2455 "while searching for:\n"
2456 "%.*s"
2457 msgstr ""
2458 "当查询：\n"
2459 "%.*s"
2460
2461 #: builtin/apply.c:2938
2462 #, c-format
2463 msgid "missing binary patch data for '%s'"
2464 msgstr "缺失 '%s' 的二进制补丁数据"
2465
2466 #: builtin/apply.c:3039
2467 #, c-format
2468 msgid "binary patch does not apply to '%s'"
2469 msgstr "二进制补丁未应用到 '%s'"
2470
2471 #: builtin/apply.c:3045
2472 #, c-format
2473 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2474 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
2475
2476 #: builtin/apply.c:3066
2477 #, c-format
2478 msgid "patch failed: %s:%ld"
2479 msgstr "打补丁失败：%s:%ld"
2480
2481 #: builtin/apply.c:3190
2482 #, c-format
2483 msgid "cannot checkout %s"
2484 msgstr "不能检出 %s"
2485
2486 #: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2487 #, c-format
2488 msgid "read of %s failed"
2489 msgstr "读取 %s 失败"
2490
2491 #: builtin/apply.c:3243
2492 #, c-format
2493 msgid "reading from '%s' beyond a symbolic link"
2494 msgstr "读取位于符号链接中的 '%s'"
2495
2496 #: builtin/apply.c:3271 builtin/apply.c:3493
2497 #, c-format
2498 msgid "path %s has been renamed/deleted"
2499 msgstr "路径 %s 已经被重命名/删除"
2500
2501 #: builtin/apply.c:3352 builtin/apply.c:3507
2502 #, c-format
2503 msgid "%s: does not exist in index"
2504 msgstr "%s：不存在于索引中"
2505
2506 #: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2507 #, c-format
2508 msgid "%s: %s"
2509 msgstr "%s：%s"
2510
2511 #: builtin/apply.c:3361 builtin/apply.c:3515
2512 #, c-format
2513 msgid "%s: does not match index"
2514 msgstr "%s：和索引不匹配"
2515
2516 #: builtin/apply.c:3463
2517 msgid "removal patch leaves file contents"
2518 msgstr "移除补丁仍留下了文件内容"
2519
2520 #: builtin/apply.c:3532
2521 #, c-format
2522 msgid "%s: wrong type"
2523 msgstr "%s：错误类型"
2524
2525 #: builtin/apply.c:3534
2526 #, c-format
2527 msgid "%s has type %o, expected %o"
2528 msgstr "%s 的类型是 %o，应为 %o"
2529
2530 #: builtin/apply.c:3693 builtin/apply.c:3695
2531 #, c-format
2532 msgid "invalid path '%s'"
2533 msgstr "无效路径 '%s'"
2534
2535 #: builtin/apply.c:3750
2536 #, c-format
2537 msgid "%s: already exists in index"
2538 msgstr "%s：已经存在于索引中"
2539
2540 #: builtin/apply.c:3753
2541 #, c-format
2542 msgid "%s: already exists in working directory"
2543 msgstr "%s：已经存在于工作区中"
2544
2545 #: builtin/apply.c:3773
2546 #, c-format
2547 msgid "new mode (%o) of %s does not match old mode (%o)"
2548 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
2549
2550 #: builtin/apply.c:3778
2551 #, c-format
2552 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2553 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
2554
2555 #: builtin/apply.c:3798
2556 #, c-format
2557 msgid "affected file '%s' is beyond a symbolic link"
2558 msgstr "受影响的文件 '%s' 位于符号链接中"
2559
2560 #: builtin/apply.c:3802
2561 #, c-format
2562 msgid "%s: patch does not apply"
2563 msgstr "%s：补丁未应用"
2564
2565 #: builtin/apply.c:3816
2566 #, c-format
2567 msgid "Checking patch %s..."
2568 msgstr "检查补丁 %s..."
2569
2570 #: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
2571 #, c-format
2572 msgid "make_cache_entry failed for path '%s'"
2573 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2574
2575 #: builtin/apply.c:4052
2576 #, c-format
2577 msgid "unable to remove %s from index"
2578 msgstr "不能从索引中移除 %s"
2579
2580 #: builtin/apply.c:4081
2581 #, c-format
2582 msgid "corrupt patch for submodule %s"
2583 msgstr "子模组 %s 损坏的补丁"
2584
2585 #: builtin/apply.c:4085
2586 #, c-format
2587 msgid "unable to stat newly created file '%s'"
2588 msgstr "不能枚举新建文件 '%s' 的状态"
2589
2590 #: builtin/apply.c:4090
2591 #, c-format
2592 msgid "unable to create backing store for newly created file %s"
2593 msgstr "不能为新建文件 %s 创建后端存储"
2594
2595 #: builtin/apply.c:4093 builtin/apply.c:4201
2596 #, c-format
2597 msgid "unable to add cache entry for %s"
2598 msgstr "无法为 %s 添加缓存条目"
2599
2600 #: builtin/apply.c:4126
2601 #, c-format
2602 msgid "closing file '%s'"
2603 msgstr "关闭文件 '%s'"
2604
2605 #: builtin/apply.c:4175
2606 #, c-format
2607 msgid "unable to write file '%s' mode %o"
2608 msgstr "不能写文件 '%s' 权限 %o"
2609
2610 #: builtin/apply.c:4262
2611 #, c-format
2612 msgid "Applied patch %s cleanly."
2613 msgstr "成功应用补丁 %s。"
2614
2615 #: builtin/apply.c:4270
2616 msgid "internal error"
2617 msgstr "内部错误"
2618
2619 #: builtin/apply.c:4273
2620 #, c-format
2621 msgid "Applying patch %%s with %d reject..."
2622 msgid_plural "Applying patch %%s with %d rejects..."
2623 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2624 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2625
2626 #: builtin/apply.c:4283
2627 #, c-format
2628 msgid "truncating .rej filename to %.*s.rej"
2629 msgstr "截短 .rej 文件名为 %.*s.rej"
2630
2631 #: builtin/apply.c:4304
2632 #, c-format
2633 msgid "Hunk #%d applied cleanly."
2634 msgstr "第 #%d 个片段成功应用。"
2635
2636 #: builtin/apply.c:4307
2637 #, c-format
2638 msgid "Rejected hunk #%d."
2639 msgstr "拒绝第 #%d 个片段。"
2640
2641 #: builtin/apply.c:4397
2642 msgid "unrecognized input"
2643 msgstr "未能识别的输入"
2644
2645 #: builtin/apply.c:4408
2646 msgid "unable to read index file"
2647 msgstr "无法读取索引文件"
2648
2649 #: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2650 #: builtin/fetch.c:92
2651 msgid "path"
2652 msgstr "路径"
2653
2654 #: builtin/apply.c:4526
2655 msgid "don't apply changes matching the given path"
2656 msgstr "不要应用与给出路径向匹配的变更"
2657
2658 #: builtin/apply.c:4529
2659 msgid "apply changes matching the given path"
2660 msgstr "应用与给出路径向匹配的变更"
2661
2662 #: builtin/apply.c:4531
2663 msgid "num"
2664 msgstr "数字"
2665
2666 #: builtin/apply.c:4532
2667 msgid "remove <num> leading slashes from traditional diff paths"
2668 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2669
2670 #: builtin/apply.c:4535
2671 msgid "ignore additions made by the patch"
2672 msgstr "忽略补丁中的添加的文件"
2673
2674 #: builtin/apply.c:4537
2675 msgid "instead of applying the patch, output diffstat for the input"
2676 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
2677
2678 #: builtin/apply.c:4541
2679 msgid "show number of added and deleted lines in decimal notation"
2680 msgstr "以十进制数显示添加和删除的行数"
2681
2682 #: builtin/apply.c:4543
2683 msgid "instead of applying the patch, output a summary for the input"
2684 msgstr "不应用补丁，而是显示输入的概要"
2685
2686 #: builtin/apply.c:4545
2687 msgid "instead of applying the patch, see if the patch is applicable"
2688 msgstr "不应用补丁，而是查看补丁是否可应用"
2689
2690 #: builtin/apply.c:4547
2691 msgid "make sure the patch is applicable to the current index"
2692 msgstr "确认补丁可以应用到当前索引"
2693
2694 #: builtin/apply.c:4549
2695 msgid "apply a patch without touching the working tree"
2696 msgstr "应用补丁而不修改工作区"
2697
2698 #: builtin/apply.c:4551
2699 msgid "accept a patch that touches outside the working area"
2700 msgstr "接受修改工作区之外文件的补丁"
2701
2702 #: builtin/apply.c:4553
2703 msgid "also apply the patch (use with --stat/--summary/--check)"
2704 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
2705
2706 #: builtin/apply.c:4555
2707 msgid "attempt three-way merge if a patch does not apply"
2708 msgstr "如果一个补丁不能应用则尝试三方合并"
2709
2710 #: builtin/apply.c:4557
2711 msgid "build a temporary index based on embedded index information"
2712 msgstr "创建一个临时索引基于嵌入的索引信息"
2713
2714 #: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2715 msgid "paths are separated with NUL character"
2716 msgstr "路径以 NUL 字符分隔"
2717
2718 #: builtin/apply.c:4562
2719 msgid "ensure at least <n> lines of context match"
2720 msgstr "确保至少匹配 <n> 行上下文"
2721
2722 #: builtin/apply.c:4563
2723 msgid "action"
2724 msgstr "动作"
2725
2726 #: builtin/apply.c:4564
2727 msgid "detect new or modified lines that have whitespace errors"
2728 msgstr "检查新增和修改的行中间的空白字符滥用"
2729
2730 #: builtin/apply.c:4567 builtin/apply.c:4570
2731 msgid "ignore changes in whitespace when finding context"
2732 msgstr "查找上下文时忽略空白字符的变更"
2733
2734 #: builtin/apply.c:4573
2735 msgid "apply the patch in reverse"
2736 msgstr "反向应用补丁"
2737
2738 #: builtin/apply.c:4575
2739 msgid "don't expect at least one line of context"
2740 msgstr "无需至少一行上下文"
2741
2742 #: builtin/apply.c:4577
2743 msgid "leave the rejected hunks in corresponding *.rej files"
2744 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2745
2746 #: builtin/apply.c:4579
2747 msgid "allow overlapping hunks"
2748 msgstr "允许重叠的补丁片段"
2749
2750 #: builtin/apply.c:4582
2751 msgid "tolerate incorrectly detected missing new-line at the end of file"
2752 msgstr "允许不正确的文件末尾换行符"
2753
2754 #: builtin/apply.c:4585
2755 msgid "do not trust the line counts in the hunk headers"
2756 msgstr "不信任补丁片段的头信息中的行号"
2757
2758 #: builtin/apply.c:4587
2759 msgid "root"
2760 msgstr "根目录"
2761
2762 #: builtin/apply.c:4588
2763 msgid "prepend <root> to all filenames"
2764 msgstr "为所有文件名前添加 <根目录>"
2765
2766 #: builtin/apply.c:4610
2767 msgid "--3way outside a repository"
2768 msgstr "--3way 在一个仓库之外"
2769
2770 #: builtin/apply.c:4618
2771 msgid "--index outside a repository"
2772 msgstr "--index 在一个仓库之外"
2773
2774 #: builtin/apply.c:4621
2775 msgid "--cached outside a repository"
2776 msgstr "--cached 在一个仓库之外"
2777
2778 #: builtin/apply.c:4640
2779 #, c-format
2780 msgid "can't open patch '%s'"
2781 msgstr "不能打开补丁 '%s'"
2782
2783 #: builtin/apply.c:4654
2784 #, c-format
2785 msgid "squelched %d whitespace error"
2786 msgid_plural "squelched %d whitespace errors"
2787 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2788 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2789
2790 #: builtin/apply.c:4660 builtin/apply.c:4670
2791 #, c-format
2792 msgid "%d line adds whitespace errors."
2793 msgid_plural "%d lines add whitespace errors."
2794 msgstr[0] "%d 行有空白字符误用。"
2795 msgstr[1] "%d 行有空白字符误用。"
2796
2797 #: builtin/archive.c:17
2798 #, c-format
2799 msgid "could not create archive file '%s'"
2800 msgstr "不能创建归档文件 '%s'"
2801
2802 #: builtin/archive.c:20
2803 msgid "could not redirect output"
2804 msgstr "不能重定向输出"
2805
2806 #: builtin/archive.c:37
2807 msgid "git archive: Remote with no URL"
2808 msgstr "git archive：未提供远程 URL"
2809
2810 #: builtin/archive.c:58
2811 msgid "git archive: expected ACK/NAK, got EOF"
2812 msgstr "git archive：应为 ACK/NACK，却得到 EOF"
2813
2814 #: builtin/archive.c:61
2815 #, c-format
2816 msgid "git archive: NACK %s"
2817 msgstr "git archive：NACK %s"
2818
2819 #: builtin/archive.c:63
2820 #, c-format
2821 msgid "remote error: %s"
2822 msgstr "远程错误：%s"
2823
2824 #: builtin/archive.c:64
2825 msgid "git archive: protocol error"
2826 msgstr "git archive：协议错误"
2827
2828 #: builtin/archive.c:68
2829 msgid "git archive: expected a flush"
2830 msgstr "git archive：应为刷新"
2831
2832 #: builtin/bisect--helper.c:7
2833 msgid "git bisect--helper --next-all [--no-checkout]"
2834 msgstr "git bisect--helper --next-all [--no-checkout]"
2835
2836 #: builtin/bisect--helper.c:17
2837 msgid "perform 'git bisect next'"
2838 msgstr "执行 'git bisect next'"
2839
2840 #: builtin/bisect--helper.c:19
2841 msgid "update BISECT_HEAD instead of checking out the current commit"
2842 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2843
2844 #: builtin/blame.c:31
2845 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2846 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
2847
2848 #: builtin/blame.c:36
2849 msgid "<rev-opts> are documented in git-rev-list(1)"
2850 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2851
2852 #: builtin/blame.c:2500
2853 msgid "Show blame entries as we find them, incrementally"
2854 msgstr "增量式地显示发现的 blame 条目"
2855
2856 #: builtin/blame.c:2501
2857 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2858 msgstr "边界提交显示空的 SHA-1（默认：关闭）"
2859
2860 #: builtin/blame.c:2502
2861 msgid "Do not treat root commits as boundaries (Default: off)"
2862 msgstr "不把根提交作为边界（默认：关闭）"
2863
2864 #: builtin/blame.c:2503
2865 msgid "Show work cost statistics"
2866 msgstr "显示命令消耗统计"
2867
2868 #: builtin/blame.c:2504
2869 msgid "Show output score for blame entries"
2870 msgstr "显示判断 blame 条目位移的得分诊断信息"
2871
2872 #: builtin/blame.c:2505
2873 msgid "Show original filename (Default: auto)"
2874 msgstr "显示原始文件名（默认：自动）"
2875
2876 #: builtin/blame.c:2506
2877 msgid "Show original linenumber (Default: off)"
2878 msgstr "显示原始的行号（默认：关闭）"
2879
2880 #: builtin/blame.c:2507
2881 msgid "Show in a format designed for machine consumption"
2882 msgstr "显示为一个适合机器读取的格式"
2883
2884 #: builtin/blame.c:2508
2885 msgid "Show porcelain format with per-line commit information"
2886 msgstr "为每一行显示机器适用的提交信息"
2887
2888 #: builtin/blame.c:2509
2889 msgid "Use the same output mode as git-annotate (Default: off)"
2890 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
2891
2892 #: builtin/blame.c:2510
2893 msgid "Show raw timestamp (Default: off)"
2894 msgstr "显示原始时间戳（默认：关闭）"
2895
2896 #: builtin/blame.c:2511
2897 msgid "Show long commit SHA1 (Default: off)"
2898 msgstr "显示长的 SHA1 提交号（默认：关闭）"
2899
2900 #: builtin/blame.c:2512
2901 msgid "Suppress author name and timestamp (Default: off)"
2902 msgstr "隐藏作者名字和时间戳（默认：关闭）"
2903
2904 #: builtin/blame.c:2513
2905 msgid "Show author email instead of name (Default: off)"
2906 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
2907
2908 #: builtin/blame.c:2514
2909 msgid "Ignore whitespace differences"
2910 msgstr "忽略空白差异"
2911
2912 #: builtin/blame.c:2515
2913 msgid "Spend extra cycles to find better match"
2914 msgstr "花费额外的循环来找到更好的匹配"
2915
2916 #: builtin/blame.c:2516
2917 msgid "Use revisions from <file> instead of calling git-rev-list"
2918 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2919
2920 #: builtin/blame.c:2517
2921 msgid "Use <file>'s contents as the final image"
2922 msgstr "使用 <文件> 的内容作为最终的图片"
2923
2924 #: builtin/blame.c:2518 builtin/blame.c:2519
2925 msgid "score"
2926 msgstr "得分"
2927
2928 #: builtin/blame.c:2518
2929 msgid "Find line copies within and across files"
2930 msgstr "找到文件内及跨文件的行拷贝"
2931
2932 #: builtin/blame.c:2519
2933 msgid "Find line movements within and across files"
2934 msgstr "找到文件内及跨文件的行移动"
2935
2936 #: builtin/blame.c:2520
2937 msgid "n,m"
2938 msgstr "n,m"
2939
2940 #: builtin/blame.c:2520
2941 msgid "Process only line range n,m, counting from 1"
2942 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
2943
2944 #. TRANSLATORS: This string is used to tell us the maximum
2945 #. display width for a relative timestamp in "git blame"
2946 #. output.  For C locale, "4 years, 11 months ago", which
2947 #. takes 22 places, is the longest among various forms of
2948 #. relative timestamps, but your language may need more or
2949 #. fewer display columns.
2950 #: builtin/blame.c:2601
2951 msgid "4 years, 11 months ago"
2952 msgstr "4 年 11 个月前"
2953
2954 #: builtin/branch.c:24
2955 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2956 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2957
2958 #: builtin/branch.c:25
2959 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2960 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2961
2962 #: builtin/branch.c:26
2963 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2964 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2965
2966 #: builtin/branch.c:27
2967 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2968 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2969
2970 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
2971 #: builtin/branch.c:150
2972 #, c-format
2973 msgid ""
2974 "deleting branch '%s' that has been merged to\n"
2975 "         '%s', but not yet merged to HEAD."
2976 msgstr ""
2977 "将要删除的分支 '%s' 已经被合并到\n"
2978 "         '%s'，但未合并到 HEAD。"
2979
2980 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
2981 #: builtin/branch.c:154
2982 #, c-format
2983 msgid ""
2984 "not deleting branch '%s' that is not yet merged to\n"
2985 "         '%s', even though it is merged to HEAD."
2986 msgstr ""
2987 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
2988 "         然而却尚未被合并到分支 '%s' 。"
2989
2990 #: builtin/branch.c:168
2991 #, c-format
2992 msgid "Couldn't look up commit object for '%s'"
2993 msgstr "无法查询 '%s' 指向的提交对象"
2994
2995 #: builtin/branch.c:172
2996 #, c-format
2997 msgid ""
2998 "The branch '%s' is not fully merged.\n"
2999 "If you are sure you want to delete it, run 'git branch -D %s'."
3000 msgstr ""
3001 "分支 '%s' 没有完全合并。\n"
3002 "如果您确认要删除它，执行 'git branch -D %s'。"
3003
3004 #: builtin/branch.c:185
3005 msgid "Update of config-file failed"
3006 msgstr "无法更新 config 文件"
3007
3008 #: builtin/branch.c:213
3009 msgid "cannot use -a with -d"
3010 msgstr "不能将 -a 和 -d 同时使用"
3011
3012 #: builtin/branch.c:219
3013 msgid "Couldn't look up commit object for HEAD"
3014 msgstr "无法查询 HEAD 指向的提交对象"
3015
3016 #: builtin/branch.c:227
3017 #, c-format
3018 msgid "Cannot delete the branch '%s' which you are currently on."
3019 msgstr "无法删除您当前所在的分支 '%s'。"
3020
3021 #: builtin/branch.c:243
3022 #, c-format
3023 msgid "remote-tracking branch '%s' not found."
3024 msgstr "未能找到远程跟踪分支 '%s'。"
3025
3026 #: builtin/branch.c:244
3027 #, c-format
3028 msgid "branch '%s' not found."
3029 msgstr "分支 '%s' 未发现。"
3030
3031 #: builtin/branch.c:258
3032 #, c-format
3033 msgid "Error deleting remote-tracking branch '%s'"
3034 msgstr "无法删除远程跟踪分支 '%s'"
3035
3036 #: builtin/branch.c:259
3037 #, c-format
3038 msgid "Error deleting branch '%s'"
3039 msgstr "无法删除分支 '%s'"
3040
3041 #: builtin/branch.c:266
3042 #, c-format
3043 msgid "Deleted remote-tracking branch %s (was %s).\n"
3044 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
3045
3046 #: builtin/branch.c:267
3047 #, c-format
3048 msgid "Deleted branch %s (was %s).\n"
3049 msgstr "已删除分支 %s（曾为 %s）。\n"
3050
3051 #: builtin/branch.c:368
3052 #, c-format
3053 msgid "branch '%s' does not point at a commit"
3054 msgstr "分支 '%s' 未指向一个提交"
3055
3056 #: builtin/branch.c:451
3057 #, c-format
3058 msgid "[%s: gone]"
3059 msgstr "[%s: 丢失]"
3060
3061 #: builtin/branch.c:456
3062 #, c-format
3063 msgid "[%s]"
3064 msgstr "[%s]"
3065
3066 #: builtin/branch.c:461
3067 #, c-format
3068 msgid "[%s: behind %d]"
3069 msgstr "[%s：落后 %d]"
3070
3071 #: builtin/branch.c:463
3072 #, c-format
3073 msgid "[behind %d]"
3074 msgstr "[落后 %d]"
3075
3076 #: builtin/branch.c:467
3077 #, c-format
3078 msgid "[%s: ahead %d]"
3079 msgstr "[%s：领先 %d]"
3080
3081 #: builtin/branch.c:469
3082 #, c-format
3083 msgid "[ahead %d]"
3084 msgstr "[领先 %d]"
3085
3086 #: builtin/branch.c:472
3087 #, c-format
3088 msgid "[%s: ahead %d, behind %d]"
3089 msgstr "[%s：领先 %d，落后 %d]"
3090
3091 #: builtin/branch.c:475
3092 #, c-format
3093 msgid "[ahead %d, behind %d]"
3094 msgstr "[领先 %d，落后 %d]"
3095
3096 #: builtin/branch.c:488
3097 msgid " **** invalid ref ****"
3098 msgstr " **** 无效引用 ****"
3099
3100 #: builtin/branch.c:579
3101 #, c-format
3102 msgid "(no branch, rebasing %s)"
3103 msgstr "（非分支，正变基 %s）"
3104
3105 #: builtin/branch.c:582
3106 #, c-format
3107 msgid "(no branch, bisect started on %s)"
3108 msgstr "（非分支，二分查找开始于 %s）"
3109
3110 #: builtin/branch.c:588
3111 #, c-format
3112 msgid "(HEAD detached at %s)"
3113 msgstr "（头指针分离于 %s）"
3114
3115 #: builtin/branch.c:591
3116 #, c-format
3117 msgid "(HEAD detached from %s)"
3118 msgstr "（头指针分离自 %s）"
3119
3120 #: builtin/branch.c:595
3121 msgid "(no branch)"
3122 msgstr "（非分支）"
3123
3124 #: builtin/branch.c:642
3125 #, c-format
3126 msgid "object '%s' does not point to a commit"
3127 msgstr "对象 '%s' 没有指向一个提交"
3128
3129 #: builtin/branch.c:690
3130 msgid "some refs could not be read"
3131 msgstr "一些引用不能读取"
3132
3133 #: builtin/branch.c:703
3134 msgid "cannot rename the current branch while not on any."
3135 msgstr "无法重命名当前分支因为不处于任何分支上。"
3136
3137 #: builtin/branch.c:713
3138 #, c-format
3139 msgid "Invalid branch name: '%s'"
3140 msgstr "无效的分支名：'%s'"
3141
3142 #: builtin/branch.c:728
3143 msgid "Branch rename failed"
3144 msgstr "分支重命名失败"
3145
3146 #: builtin/branch.c:732
3147 #, c-format
3148 msgid "Renamed a misnamed branch '%s' away"
3149 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3150
3151 #: builtin/branch.c:736
3152 #, c-format
3153 msgid "Branch renamed to %s, but HEAD is not updated!"
3154 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
3155
3156 #: builtin/branch.c:743
3157 msgid "Branch is renamed, but update of config-file failed"
3158 msgstr "分支被重命名，但更新 config 文件失败"
3159
3160 #: builtin/branch.c:758
3161 #, c-format
3162 msgid "malformed object name %s"
3163 msgstr "非法的对象名 %s"
3164
3165 #: builtin/branch.c:780
3166 #, c-format
3167 msgid "could not write branch description template: %s"
3168 msgstr "不能写分支描述模版：%s"
3169
3170 #: builtin/branch.c:810
3171 msgid "Generic options"
3172 msgstr "通用选项"
3173
3174 #: builtin/branch.c:812
3175 msgid "show hash and subject, give twice for upstream branch"
3176 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
3177
3178 #: builtin/branch.c:813
3179 msgid "suppress informational messages"
3180 msgstr "不显示信息"
3181
3182 #: builtin/branch.c:814
3183 msgid "set up tracking mode (see git-pull(1))"
3184 msgstr "设置跟踪模式（参见 git-pull(1)）"
3185
3186 #: builtin/branch.c:816
3187 msgid "change upstream info"
3188 msgstr "改变上游信息"
3189
3190 #: builtin/branch.c:820
3191 msgid "use colored output"
3192 msgstr "使用彩色输出"
3193
3194 #: builtin/branch.c:821
3195 msgid "act on remote-tracking branches"
3196 msgstr "作用于远程跟踪分支"
3197
3198 #: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3199 #: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3200 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
3201 #: builtin/tag.c:622
3202 msgid "commit"
3203 msgstr "提交"
3204
3205 #: builtin/branch.c:825 builtin/branch.c:831
3206 msgid "print only branches that contain the commit"
3207 msgstr "只打印包含该提交的分支"
3208
3209 #: builtin/branch.c:837
3210 msgid "Specific git-branch actions:"
3211 msgstr "具体的 git-branch 动作："
3212
3213 #: builtin/branch.c:838
3214 msgid "list both remote-tracking and local branches"
3215 msgstr "列出远程跟踪及本地分支"
3216
3217 #: builtin/branch.c:840
3218 msgid "delete fully merged branch"
3219 msgstr "删除完全合并的分支"
3220
3221 #: builtin/branch.c:841
3222 msgid "delete branch (even if not merged)"
3223 msgstr "删除分支（即使没有合并）"
3224
3225 #: builtin/branch.c:842
3226 msgid "move/rename a branch and its reflog"
3227 msgstr "移动/重命名一个分支，以及它的引用日志"
3228
3229 #: builtin/branch.c:843
3230 msgid "move/rename a branch, even if target exists"
3231 msgstr "移动/重命名一个分支，即使目标已存在"
3232
3233 #: builtin/branch.c:844
3234 msgid "list branch names"
3235 msgstr "列出分支名"
3236
3237 #: builtin/branch.c:845
3238 msgid "create the branch's reflog"
3239 msgstr "创建分支的引用日志"
3240
3241 #: builtin/branch.c:847
3242 msgid "edit the description for the branch"
3243 msgstr "标记分支的描述"
3244
3245 #: builtin/branch.c:848
3246 msgid "force creation, move/rename, deletion"
3247 msgstr "强制创建、移动/重命名、删除"
3248
3249 #: builtin/branch.c:851
3250 msgid "print only not merged branches"
3251 msgstr "只打印没有合并的分支"
3252
3253 #: builtin/branch.c:857
3254 msgid "print only merged branches"
3255 msgstr "只打印合并的分支"
3256
3257 #: builtin/branch.c:861
3258 msgid "list branches in columns"
3259 msgstr "以列的方式显示分支"
3260
3261 #: builtin/branch.c:874
3262 msgid "Failed to resolve HEAD as a valid ref."
3263 msgstr "无法将 HEAD 解析为有效引用。"
3264
3265 #: builtin/branch.c:878 builtin/clone.c:622
3266 msgid "HEAD not found below refs/heads!"
3267 msgstr "HEAD 没有位于 /refs/heads 之下！"
3268
3269 #: builtin/branch.c:900
3270 msgid "--column and --verbose are incompatible"
3271 msgstr "--column 和 --verbose 不兼容"
3272
3273 #: builtin/branch.c:911 builtin/branch.c:950
3274 msgid "branch name required"
3275 msgstr "必须提供分支名"
3276
3277 #: builtin/branch.c:926
3278 msgid "Cannot give description to detached HEAD"
3279 msgstr "不能向分离头指针提供描述"
3280
3281 #: builtin/branch.c:931
3282 msgid "cannot edit description of more than one branch"
3283 msgstr "不能为一个以上的分支编辑描述"
3284
3285 #: builtin/branch.c:938
3286 #, c-format
3287 msgid "No commit on branch '%s' yet."
3288 msgstr "分支 '%s' 尚无提交。"
3289
3290 #: builtin/branch.c:941
3291 #, c-format
3292 msgid "No branch named '%s'."
3293 msgstr "没有分支 '%s'。"
3294
3295 #: builtin/branch.c:956
3296 msgid "too many branches for a rename operation"
3297 msgstr "为重命名操作提供了太多的分支名"
3298
3299 #: builtin/branch.c:961
3300 msgid "too many branches to set new upstream"
3301 msgstr "为设置新上游提供了太多的分支名"
3302
3303 #: builtin/branch.c:965
3304 #, c-format
3305 msgid ""
3306 "could not set upstream of HEAD to %s when it does not point to any branch."
3307 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
3308
3309 #: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
3310 #, c-format
3311 msgid "no such branch '%s'"
3312 msgstr "没有此分支 '%s'"
3313
3314 #: builtin/branch.c:972
3315 #, c-format
3316 msgid "branch '%s' does not exist"
3317 msgstr "分支 '%s' 不存在"
3318
3319 #: builtin/branch.c:984
3320 msgid "too many branches to unset upstream"
3321 msgstr "为取消上游设置操作提供了太多的分支名"
3322
3323 #: builtin/branch.c:988
3324 msgid "could not unset upstream of HEAD when it does not point to any branch."
3325 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3326
3327 #: builtin/branch.c:994
3328 #, c-format
3329 msgid "Branch '%s' has no upstream information"
3330 msgstr "分支 '%s' 没有上游信息"
3331
3332 #: builtin/branch.c:1008
3333 msgid "it does not make sense to create 'HEAD' manually"
3334 msgstr "手工创建 'HEAD' 没有意义"
3335
3336 #: builtin/branch.c:1014
3337 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3338 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3339
3340 #: builtin/branch.c:1017
3341 #, c-format
3342 msgid ""
3343 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3344 "track or --set-upstream-to\n"
3345 msgstr ""
3346 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3347
3348 #: builtin/branch.c:1034
3349 #, c-format
3350 msgid ""
3351 "\n"
3352 "If you wanted to make '%s' track '%s', do this:\n"
3353 "\n"
3354 msgstr ""
3355 "\n"
3356 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"
3357 "\n"
3358
3359 #: builtin/branch.c:1035
3360 #, c-format
3361 msgid "    git branch -d %s\n"
3362 msgstr "    git branch -d %s\n"
3363
3364 #: builtin/branch.c:1036
3365 #, c-format
3366 msgid "    git branch --set-upstream-to %s\n"
3367 msgstr "    git branch --set-upstream-to %s\n"
3368
3369 #: builtin/bundle.c:51
3370 #, c-format
3371 msgid "%s is okay\n"
3372 msgstr "%s 可以\n"
3373
3374 #: builtin/bundle.c:64
3375 msgid "Need a repository to create a bundle."
3376 msgstr "需要一个仓库来创建包。"
3377
3378 #: builtin/bundle.c:68
3379 msgid "Need a repository to unbundle."
3380 msgstr "需要一个仓库来解包。"
3381
3382 #: builtin/cat-file.c:369
3383 msgid ""
3384 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3385 "<type>|--textconv) <object>"
3386 msgstr ""
3387 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3388 ">|--textconv) <对象>"
3389
3390 #: builtin/cat-file.c:370
3391 msgid ""
3392 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3393 "objects>"
3394 msgstr ""
3395 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3396
3397 #: builtin/cat-file.c:407
3398 msgid "<type> can be one of: blob, tree, commit, tag"
3399 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
3400
3401 #: builtin/cat-file.c:408
3402 msgid "show object type"
3403 msgstr "显示对象类型"
3404
3405 #: builtin/cat-file.c:409
3406 msgid "show object size"
3407 msgstr "显示对象大小"
3408
3409 #: builtin/cat-file.c:411
3410 msgid "exit with zero when there's no error"
3411 msgstr "当没有错误时退出并返回零"
3412
3413 #: builtin/cat-file.c:412
3414 msgid "pretty-print object's content"
3415 msgstr "美观地打印对象的内容"
3416
3417 #: builtin/cat-file.c:414
3418 msgid "for blob objects, run textconv on object's content"
3419 msgstr "对于数据对象，对其内容执行 textconv"
3420
3421 #: builtin/cat-file.c:416
3422 msgid "allow -s and -t to work with broken/corrupt objects"
3423 msgstr "允许 -s 和 -t 对损坏的对象生效"
3424
3425 #: builtin/cat-file.c:418
3426 msgid "show info and content of objects fed from the standard input"
3427 msgstr "显示从标准输入提供的对象的信息和内容"
3428
3429 #: builtin/cat-file.c:421
3430 msgid "show info about objects fed from the standard input"
3431 msgstr "显示从标准输入提供的对象的信息"
3432
3433 #: builtin/cat-file.c:424
3434 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3435 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
3436
3437 #: builtin/check-attr.c:11
3438 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3439 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3440
3441 #: builtin/check-attr.c:12
3442 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3443 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3444
3445 #: builtin/check-attr.c:19
3446 msgid "report all attributes set on file"
3447 msgstr "报告设置在文件上的所有属性"
3448
3449 #: builtin/check-attr.c:20
3450 msgid "use .gitattributes only from the index"
3451 msgstr "只使用索引中的 .gitattributes"
3452
3453 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3454 msgid "read file names from stdin"
3455 msgstr "从标准输入读出文件名"
3456
3457 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3458 msgid "terminate input and output records by a NUL character"
3459 msgstr "输入和输出的记录使用 NUL 字符终结"
3460
3461 #: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
3462 msgid "suppress progress reporting"
3463 msgstr "不显示进度报告"
3464
3465 #: builtin/check-ignore.c:26
3466 msgid "show non-matching input paths"
3467 msgstr "显示未匹配的输入路径"
3468
3469 #: builtin/check-ignore.c:28
3470 msgid "ignore index when checking"
3471 msgstr "检查时忽略索引"
3472
3473 #: builtin/check-ignore.c:154
3474 msgid "cannot specify pathnames with --stdin"
3475 msgstr "不能同时提供路径及 --stdin 参数"
3476
3477 #: builtin/check-ignore.c:157
3478 msgid "-z only makes sense with --stdin"
3479 msgstr "-z 需要和 --stdin 参数共用才有意义"
3480
3481 #: builtin/check-ignore.c:159
3482 msgid "no path specified"
3483 msgstr "未指定路径"
3484
3485 #: builtin/check-ignore.c:163
3486 msgid "--quiet is only valid with a single pathname"
3487 msgstr "参数 --quiet 只在提供一个路径名时有效"
3488
3489 #: builtin/check-ignore.c:165
3490 msgid "cannot have both --quiet and --verbose"
3491 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3492
3493 #: builtin/check-ignore.c:168
3494 msgid "--non-matching is only valid with --verbose"
3495 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3496
3497 #: builtin/check-mailmap.c:8
3498 msgid "git check-mailmap [<options>] <contact>..."
3499 msgstr "git check-mailmap [<选项>] <联系地址>..."
3500
3501 #: builtin/check-mailmap.c:13
3502 msgid "also read contacts from stdin"
3503 msgstr "还从标准输入读取联系地址"
3504
3505 #: builtin/check-mailmap.c:24
3506 #, c-format
3507 msgid "unable to parse contact: %s"
3508 msgstr "不能解析联系地址：%s"
3509
3510 #: builtin/check-mailmap.c:47
3511 msgid "no contacts specified"
3512 msgstr "未指定联系地址"
3513
3514 #: builtin/checkout-index.c:126
3515 msgid "git checkout-index [<options>] [--] [<file>...]"
3516 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3517
3518 #: builtin/checkout-index.c:188
3519 msgid "check out all files in the index"
3520 msgstr "检出索引区的所有文件"
3521
3522 #: builtin/checkout-index.c:189
3523 msgid "force overwrite of existing files"
3524 msgstr "强制覆盖现有的文件"
3525
3526 #: builtin/checkout-index.c:191
3527 msgid "no warning for existing files and files not in index"
3528 msgstr "存在或不在索引中的文件都没有警告"
3529
3530 #: builtin/checkout-index.c:193
3531 msgid "don't checkout new files"
3532 msgstr "不检出新文件"
3533
3534 #: builtin/checkout-index.c:195
3535 msgid "update stat information in the index file"
3536 msgstr "更新索引中文件的状态信息"
3537
3538 #: builtin/checkout-index.c:201
3539 msgid "read list of paths from the standard input"
3540 msgstr "从标准输入读取路径列表"
3541
3542 #: builtin/checkout-index.c:203
3543 msgid "write the content to temporary files"
3544 msgstr "将内容写入临时文件"
3545
3546 #: builtin/checkout-index.c:204 builtin/column.c:30
3547 msgid "string"
3548 msgstr "字符串"
3549
3550 #: builtin/checkout-index.c:205
3551 msgid "when creating files, prepend <string>"
3552 msgstr "在创建文件时，在前面加上 <字符串>"
3553
3554 #: builtin/checkout-index.c:208
3555 msgid "copy out the files from named stage"
3556 msgstr "从指定暂存区中拷出文件"
3557
3558 #: builtin/checkout.c:24
3559 msgid "git checkout [<options>] <branch>"
3560 msgstr "git checkout [<选项>] <分支>"
3561
3562 #: builtin/checkout.c:25
3563 msgid "git checkout [<options>] [<branch>] -- <file>..."
3564 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3565
3566 #: builtin/checkout.c:134 builtin/checkout.c:167
3567 #, c-format
3568 msgid "path '%s' does not have our version"
3569 msgstr "路径 '%s' 没有我们的版本"
3570
3571 #: builtin/checkout.c:136 builtin/checkout.c:169
3572 #, c-format
3573 msgid "path '%s' does not have their version"
3574 msgstr "路径 '%s' 没有他们的版本"
3575
3576 #: builtin/checkout.c:152
3577 #, c-format
3578 msgid "path '%s' does not have all necessary versions"
3579 msgstr "路径 '%s' 没有全部必须的版本"
3580
3581 #: builtin/checkout.c:196
3582 #, c-format
3583 msgid "path '%s' does not have necessary versions"
3584 msgstr "路径 '%s' 没有必须的版本"
3585
3586 #: builtin/checkout.c:213
3587 #, c-format
3588 msgid "path '%s': cannot merge"
3589 msgstr "path '%s'：无法合并"
3590
3591 #: builtin/checkout.c:230
3592 #, c-format
3593 msgid "Unable to add merge result for '%s'"
3594 msgstr "无法为 '%s' 添加合并结果"
3595
3596 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3597 #: builtin/checkout.c:260
3598 #, c-format
3599 msgid "'%s' cannot be used with updating paths"
3600 msgstr "'%s' 不能在更新路径时使用"
3601
3602 #: builtin/checkout.c:263 builtin/checkout.c:266
3603 #, c-format
3604 msgid "'%s' cannot be used with %s"
3605 msgstr "'%s' 不能和 %s 同时使用"
3606
3607 #: builtin/checkout.c:269
3608 #, c-format
3609 msgid "Cannot update paths and switch to branch '%s' at the same time."
3610 msgstr "不能同时更新路径并切换到分支'%s'。"
3611
3612 #: builtin/checkout.c:280 builtin/checkout.c:474
3613 msgid "corrupt index file"
3614 msgstr "损坏的索引文件"
3615
3616 #: builtin/checkout.c:340 builtin/checkout.c:347
3617 #, c-format
3618 msgid "path '%s' is unmerged"
3619 msgstr "路径 '%s' 未合并"
3620
3621 #: builtin/checkout.c:496
3622 msgid "you need to resolve your current index first"
3623 msgstr "您需要先解决当前索引的冲突"
3624
3625 #: builtin/checkout.c:627
3626 #, c-format
3627 msgid "Can not do reflog for '%s'\n"
3628 msgstr "不能对 '%s' 执行 reflog 操作\n"
3629
3630 #: builtin/checkout.c:663
3631 msgid "HEAD is now at"
3632 msgstr "HEAD 目前位于"
3633
3634 #: builtin/checkout.c:670
3635 #, c-format
3636 msgid "Reset branch '%s'\n"
3637 msgstr "重置分支 '%s'\n"
3638
3639 #: builtin/checkout.c:673
3640 #, c-format
3641 msgid "Already on '%s'\n"
3642 msgstr "已经位于 '%s'\n"
3643
3644 #: builtin/checkout.c:677
3645 #, c-format
3646 msgid "Switched to and reset branch '%s'\n"
3647 msgstr "切换并重置分支 '%s'\n"
3648
3649 #: builtin/checkout.c:679 builtin/checkout.c:1134
3650 #, c-format
3651 msgid "Switched to a new branch '%s'\n"
3652 msgstr "切换到一个新分支 '%s'\n"
3653
3654 #: builtin/checkout.c:681
3655 #, c-format
3656 msgid "Switched to branch '%s'\n"
3657 msgstr "切换到分支 '%s'\n"
3658
3659 #  译者：注意保持前导空格
3660 #: builtin/checkout.c:733
3661 #, c-format
3662 msgid " ... and %d more.\n"
3663 msgstr " ... 及其它 %d 个。\n"
3664
3665 #: builtin/checkout.c:739
3666 #, c-format
3667 msgid ""
3668 "Warning: you are leaving %d commit behind, not connected to\n"
3669 "any of your branches:\n"
3670 "\n"
3671 "%s\n"
3672 msgid_plural ""
3673 "Warning: you are leaving %d commits behind, not connected to\n"
3674 "any of your branches:\n"
3675 "\n"
3676 "%s\n"
3677 msgstr[0] ""
3678 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
3679 "\n"
3680 "%s\n"
3681 msgstr[1] ""
3682 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
3683 "\n"
3684 "%s\n"
3685
3686 #: builtin/checkout.c:758
3687 #, c-format
3688 msgid ""
3689 "If you want to keep it by creating a new branch, this may be a good time\n"
3690 "to do so with:\n"
3691 "\n"
3692 " git branch <new-branch-name> %s\n"
3693 "\n"
3694 msgid_plural ""
3695 "If you want to keep them by creating a new branch, this may be a good time\n"
3696 "to do so with:\n"
3697 "\n"
3698 " git branch <new-branch-name> %s\n"
3699 "\n"
3700 msgstr[0] ""
3701 "如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
3702 "如下操作：\n"
3703 "\n"
3704 " git branch <新分支名> %s\n"
3705 "\n"
3706 msgstr[1] ""
3707 "如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
3708 "如下操作：\n"
3709 "\n"
3710 " git branch <新分支名> %s\n"
3711 "\n"
3712
3713 #: builtin/checkout.c:794
3714 msgid "internal error in revision walk"
3715 msgstr "在版本遍历时遇到内部错误"
3716
3717 #: builtin/checkout.c:798
3718 msgid "Previous HEAD position was"
3719 msgstr "之前的 HEAD 位置是"
3720
3721 #: builtin/checkout.c:825 builtin/checkout.c:1129
3722 msgid "You are on a branch yet to be born"
3723 msgstr "您位于一个尚未初始化的分支"
3724
3725 #: builtin/checkout.c:931
3726 #, c-format
3727 msgid "'%s' is already checked out at '%s'"
3728 msgstr "'%s' 已经检出到 '%s'"
3729
3730 #: builtin/checkout.c:1036
3731 #, c-format
3732 msgid "only one reference expected, %d given."
3733 msgstr "只要一个引用，却给出了 %d 个"
3734
3735 #: builtin/checkout.c:1075
3736 #, c-format
3737 msgid "invalid reference: %s"
3738 msgstr "无效引用：%s"
3739
3740 #: builtin/checkout.c:1104
3741 #, c-format
3742 msgid "reference is not a tree: %s"
3743 msgstr "引用不是一个树：%s"
3744
3745 #: builtin/checkout.c:1143
3746 msgid "paths cannot be used with switching branches"
3747 msgstr "路径不能和切换分支同时使用"
3748
3749 #: builtin/checkout.c:1146 builtin/checkout.c:1150
3750 #, c-format
3751 msgid "'%s' cannot be used with switching branches"
3752 msgstr "'%s' 不能和切换分支同时使用"
3753
3754 #: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3755 #: builtin/checkout.c:1165
3756 #, c-format
3757 msgid "'%s' cannot be used with '%s'"
3758 msgstr "'%s' 不能和 '%s' 同时使用"
3759
3760 #: builtin/checkout.c:1170
3761 #, c-format
3762 msgid "Cannot switch branch to a non-commit '%s'"
3763 msgstr "不能切换分支到一个非提交 '%s'"
3764
3765 #: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3766 #: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3767 #: builtin/worktree.c:284
3768 msgid "branch"
3769 msgstr "分支"
3770
3771 #: builtin/checkout.c:1204
3772 msgid "create and checkout a new branch"
3773 msgstr "创建并检出一个新的分支"
3774
3775 #: builtin/checkout.c:1206
3776 msgid "create/reset and checkout a branch"
3777 msgstr "创建/重置并检出一个分支"
3778
3779 #: builtin/checkout.c:1207
3780 msgid "create reflog for new branch"
3781 msgstr "为新的分支创建引用日志"
3782
3783 #: builtin/checkout.c:1208
3784 msgid "detach the HEAD at named commit"
3785 msgstr "成为指向该提交的分离头指针"
3786
3787 #: builtin/checkout.c:1209
3788 msgid "set upstream info for new branch"
3789 msgstr "为新的分支设置上游信息"
3790
3791 #: builtin/checkout.c:1211
3792 msgid "new-branch"
3793 msgstr "新分支"
3794
3795 #: builtin/checkout.c:1211
3796 msgid "new unparented branch"
3797 msgstr "新的没有父提交的分支"
3798
3799 #: builtin/checkout.c:1212
3800 msgid "checkout our version for unmerged files"
3801 msgstr "对尚未合并的文件检出我们的版本"
3802
3803 #: builtin/checkout.c:1214
3804 msgid "checkout their version for unmerged files"
3805 msgstr "对尚未合并的文件检出他们的版本"
3806
3807 #: builtin/checkout.c:1216
3808 msgid "force checkout (throw away local modifications)"
3809 msgstr "强制检出（丢弃本地修改）"
3810
3811 #: builtin/checkout.c:1217
3812 msgid "perform a 3-way merge with the new branch"
3813 msgstr "和新的分支执行三方合并"
3814
3815 #: builtin/checkout.c:1218 builtin/merge.c:227
3816 msgid "update ignored files (default)"
3817 msgstr "更新忽略的文件（默认）"
3818
3819 #: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
3820 msgid "style"
3821 msgstr "风格"
3822
3823 #: builtin/checkout.c:1220
3824 msgid "conflict style (merge or diff3)"
3825 msgstr "冲突输出风格（merge 或 diff3）"
3826
3827 #: builtin/checkout.c:1223
3828 msgid "do not limit pathspecs to sparse entries only"
3829 msgstr "对路径不做稀疏检出的限制"
3830
3831 #: builtin/checkout.c:1225
3832 msgid "second guess 'git checkout <no-such-branch>'"
3833 msgstr "二次猜测'git checkout <无此分支>'"
3834
3835 #: builtin/checkout.c:1227
3836 msgid "do not check if another worktree is holding the given ref"
3837 msgstr "不检查指定的引用是否被其他工作区所占用"
3838
3839 #: builtin/checkout.c:1252
3840 msgid "-b, -B and --orphan are mutually exclusive"
3841 msgstr "-b、-B 和 --orphan 是互斥的"
3842
3843 #: builtin/checkout.c:1269
3844 msgid "--track needs a branch name"
3845 msgstr "--track 需要一个分支名"
3846
3847 #: builtin/checkout.c:1274
3848 msgid "Missing branch name; try -b"
3849 msgstr "缺少分支名；尝试 -b"
3850
3851 #: builtin/checkout.c:1310
3852 msgid "invalid path specification"
3853 msgstr "无效的路径规格"
3854
3855 #: builtin/checkout.c:1317
3856 #, c-format
3857 msgid ""
3858 "Cannot update paths and switch to branch '%s' at the same time.\n"
3859 "Did you intend to checkout '%s' which can not be resolved as commit?"
3860 msgstr ""
3861 "不能同时更新路径并切换到分支'%s'。\n"
3862 "您是想要检出 '%s' 但其未能解析为提交么？"
3863
3864 #: builtin/checkout.c:1322
3865 #, c-format
3866 msgid "git checkout: --detach does not take a path argument '%s'"
3867 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
3868
3869 #: builtin/checkout.c:1326
3870 msgid ""
3871 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3872 "checking out of the index."
3873 msgstr ""
3874 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
3875
3876 #: builtin/clean.c:26
3877 msgid ""
3878 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3879 msgstr ""
3880 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3881
3882 #: builtin/clean.c:30
3883 #, c-format
3884 msgid "Removing %s\n"
3885 msgstr "正删除 %s\n"
3886
3887 #: builtin/clean.c:31
3888 #, c-format
3889 msgid "Would remove %s\n"
3890 msgstr "将删除 %s\n"
3891
3892 #: builtin/clean.c:32
3893 #, c-format
3894 msgid "Skipping repository %s\n"
3895 msgstr "忽略仓库 %s\n"
3896
3897 #: builtin/clean.c:33
3898 #, c-format
3899 msgid "Would skip repository %s\n"
3900 msgstr "将忽略仓库 %s\n"
3901
3902 #: builtin/clean.c:34
3903 #, c-format
3904 msgid "failed to remove %s"
3905 msgstr "无法删除 %s"
3906
3907 #: builtin/clean.c:295
3908 msgid ""
3909 "Prompt help:\n"
3910 "1          - select a numbered item\n"
3911 "foo        - select item based on unique prefix\n"
3912 "           - (empty) select nothing"
3913 msgstr ""
3914 "帮助：\n"
3915 "1          - 通过编号选择一个选项\n"
3916 "foo        - 通过标题选择一个选项\n"
3917 "           - （空）什么也不选择"
3918
3919 #: builtin/clean.c:299
3920 msgid ""
3921 "Prompt help:\n"
3922 "1          - select a single item\n"
3923 "3-5        - select a range of items\n"
3924 "2-3,6-9    - select multiple ranges\n"
3925 "foo        - select item based on unique prefix\n"
3926 "-...       - unselect specified items\n"
3927 "*          - choose all items\n"
3928 "           - (empty) finish selecting"
3929 msgstr ""
3930 "帮助：\n"
3931 "1          - 选择一个选项\n"
3932 "3-5        - 选择一个范围内的所有选项\n"
3933 "2-3,6-9    - 选择多个范围内的所有选项\n"
3934 "foo        - 通过标题选择一个选项\n"
3935 "-...       - 反选特定的选项\n"
3936 "*          - 选择所有选项\n"
3937 "           - （空）结束选择"
3938
3939 #: builtin/clean.c:515
3940 #, c-format
3941 msgid "Huh (%s)?"
3942 msgstr "嗯（%s）？"
3943
3944 #: builtin/clean.c:657
3945 #, c-format
3946 msgid "Input ignore patterns>> "
3947 msgstr "输入模版以排除条目>> "
3948
3949 #: builtin/clean.c:694
3950 #, c-format
3951 msgid "WARNING: Cannot find items matched by: %s"
3952 msgstr "警告：无法找到和 %s 匹配的条目"
3953
3954 #: builtin/clean.c:715
3955 msgid "Select items to delete"
3956 msgstr "选择要删除的条目"
3957
3958 #. TRANSLATORS: Make sure to keep [y/N] as is
3959 #: builtin/clean.c:756
3960 #, c-format
3961 msgid "Remove %s [y/N]? "
3962 msgstr "删除 %s [y/N]？"
3963
3964 #: builtin/clean.c:781
3965 msgid "Bye."
3966 msgstr "再见。"
3967
3968 #: builtin/clean.c:789
3969 msgid ""
3970 "clean               - start cleaning\n"
3971 "filter by pattern   - exclude items from deletion\n"
3972 "select by numbers   - select items to be deleted by numbers\n"
3973 "ask each            - confirm each deletion (like \"rm -i\")\n"
3974 "quit                - stop cleaning\n"
3975 "help                - this screen\n"
3976 "?                   - help for prompt selection"
3977 msgstr ""
3978 "clean               - 开始清理\n"
3979 "filter by pattern   - 通过模版排除要删除的条目\n"
3980 "select by numbers   - 通过数字选择要删除的条目\n"
3981 "ask each            - 针对删除逐一询问（就像 \"rm -i\"）\n"
3982 "quit                - 停止删除并退出\n"
3983 "help                - 显示本帮助\n"
3984 "?                   - 显示如何在提示符下选择的帮助"
3985
3986 #: builtin/clean.c:816
3987 msgid "*** Commands ***"
3988 msgstr "*** 命令 ***"
3989
3990 #: builtin/clean.c:817
3991 msgid "What now"
3992 msgstr "请选择"
3993
3994 #: builtin/clean.c:825
3995 msgid "Would remove the following item:"
3996 msgid_plural "Would remove the following items:"
3997 msgstr[0] "将删除如下条目："
3998 msgstr[1] "将删除如下条目："
3999
4000 #: builtin/clean.c:842
4001 msgid "No more files to clean, exiting."
4002 msgstr "没有要清理的文件，退出。"
4003
4004 #: builtin/clean.c:873
4005 msgid "do not print names of files removed"
4006 msgstr "不打印删除文件的名称"
4007
4008 #: builtin/clean.c:875
4009 msgid "force"
4010 msgstr "强制"
4011
4012 #: builtin/clean.c:876
4013 msgid "interactive cleaning"
4014 msgstr "交互式清除"
4015
4016 #: builtin/clean.c:878
4017 msgid "remove whole directories"
4018 msgstr "删除整个目录"
4019
4020 #: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
4021 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
4022 msgid "pattern"
4023 msgstr "模式"
4024
4025 #: builtin/clean.c:880
4026 msgid "add <pattern> to ignore rules"
4027 msgstr "添加 <模式> 到忽略规则"
4028
4029 #: builtin/clean.c:881
4030 msgid "remove ignored files, too"
4031 msgstr "也删除忽略的文件"
4032
4033 #: builtin/clean.c:883
4034 msgid "remove only ignored files"
4035 msgstr "只删除忽略的文件"
4036
4037 #: builtin/clean.c:901
4038 msgid "-x and -X cannot be used together"
4039 msgstr "-x 和 -X 不能同时使用"
4040
4041 #: builtin/clean.c:905
4042 msgid ""
4043 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4044 "clean"
4045 msgstr ""
4046 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
4047
4048 #: builtin/clean.c:908
4049 msgid ""
4050 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4051 "refusing to clean"
4052 msgstr ""
4053 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
4054
4055 #: builtin/clone.c:37
4056 msgid "git clone [<options>] [--] <repo> [<dir>]"
4057 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4058
4059 #: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
4060 #: builtin/push.c:523
4061 msgid "force progress reporting"
4062 msgstr "强制显示进度报告"
4063
4064 #: builtin/clone.c:59
4065 msgid "don't create a checkout"
4066 msgstr "不创建一个检出"
4067
4068 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
4069 msgid "create a bare repository"
4070 msgstr "创建一个纯仓库"
4071
4072 #: builtin/clone.c:64
4073 msgid "create a mirror repository (implies bare)"
4074 msgstr "创建一个镜像仓库（也是纯仓库）"
4075
4076 #: builtin/clone.c:66
4077 msgid "to clone from a local repository"
4078 msgstr "从本地仓库克隆"
4079
4080 #: builtin/clone.c:68
4081 msgid "don't use local hardlinks, always copy"
4082 msgstr "不使用本地硬链接，始终复制"
4083
4084 #: builtin/clone.c:70
4085 msgid "setup as shared repository"
4086 msgstr "设置为共享仓库"
4087
4088 #: builtin/clone.c:72 builtin/clone.c:74
4089 msgid "initialize submodules in the clone"
4090 msgstr "在克隆时初始化子模组"
4091
4092 #: builtin/clone.c:75 builtin/init-db.c:500
4093 msgid "template-directory"
4094 msgstr "模板目录"
4095
4096 #: builtin/clone.c:76 builtin/init-db.c:501
4097 msgid "directory from which templates will be used"
4098 msgstr "模板目录将被使用"
4099
4100 #: builtin/clone.c:78
4101 msgid "reference repository"
4102 msgstr "参考仓库"
4103
4104 #: builtin/clone.c:80
4105 msgid "use --reference only while cloning"
4106 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4107
4108 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4109 msgid "name"
4110 msgstr "名称"
4111
4112 #: builtin/clone.c:82
4113 msgid "use <name> instead of 'origin' to track upstream"
4114 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4115
4116 #: builtin/clone.c:84
4117 msgid "checkout <branch> instead of the remote's HEAD"
4118 msgstr "检出 <分支> 而不是远程 HEAD"
4119
4120 #: builtin/clone.c:86
4121 msgid "path to git-upload-pack on the remote"
4122 msgstr "远程 git-upload-pack 路径"
4123
4124 #: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
4125 msgid "depth"
4126 msgstr "深度"
4127
4128 #: builtin/clone.c:88
4129 msgid "create a shallow clone of that depth"
4130 msgstr "创建一个指定深度的浅克隆"
4131
4132 #: builtin/clone.c:90
4133 msgid "clone only one branch, HEAD or --branch"
4134 msgstr "只克隆一个分支、HEAD 或 --branch"
4135
4136 #: builtin/clone.c:91 builtin/init-db.c:509
4137 msgid "gitdir"
4138 msgstr "git目录"
4139
4140 #: builtin/clone.c:92 builtin/init-db.c:510
4141 msgid "separate git dir from working tree"
4142 msgstr "git目录和工作区分离"
4143
4144 #: builtin/clone.c:93
4145 msgid "key=value"
4146 msgstr "key=value"
4147
4148 #: builtin/clone.c:94
4149 msgid "set config inside the new repository"
4150 msgstr "在新仓库中设置配置信息"
4151
4152 #: builtin/clone.c:240
4153 #, c-format
4154 msgid "reference repository '%s' is not a local repository."
4155 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4156
4157 #: builtin/clone.c:244
4158 #, c-format
4159 msgid "reference repository '%s' is shallow"
4160 msgstr "参考仓库 '%s' 是一个浅克隆"
4161
4162 #: builtin/clone.c:247
4163 #, c-format
4164 msgid "reference repository '%s' is grafted"
4165 msgstr "参考仓库 '%s' 已被嫁接"
4166
4167 #: builtin/clone.c:310
4168 #, c-format
4169 msgid "failed to create directory '%s'"
4170 msgstr "无法创建目录 '%s'"
4171
4172 #: builtin/clone.c:312 builtin/diff.c:84
4173 #, c-format
4174 msgid "failed to stat '%s'"
4175 msgstr "无法枚举 '%s' 状态"
4176
4177 #: builtin/clone.c:314
4178 #, c-format
4179 msgid "%s exists and is not a directory"
4180 msgstr "%s 存在且不是一个目录"
4181
4182 #: builtin/clone.c:328
4183 #, c-format
4184 msgid "failed to stat %s\n"
4185 msgstr "无法枚举 %s 状态\n"
4186
4187 #: builtin/clone.c:350
4188 #, c-format
4189 msgid "failed to create link '%s'"
4190 msgstr "无法创建链接 '%s'"
4191
4192 #: builtin/clone.c:354
4193 #, c-format
4194 msgid "failed to copy file to '%s'"
4195 msgstr "无法拷贝文件至 '%s'"
4196
4197 #: builtin/clone.c:377 builtin/clone.c:551
4198 #, c-format
4199 msgid "done.\n"
4200 msgstr "完成。\n"
4201
4202 #: builtin/clone.c:389
4203 msgid ""
4204 "Clone succeeded, but checkout failed.\n"
4205 "You can inspect what was checked out with 'git status'\n"
4206 "and retry the checkout with 'git checkout -f HEAD'\n"
4207 msgstr ""
4208 "克隆成功，但是检出失败。\n"
4209 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
4210 "'git checkout -f HEAD' 重试\n"
4211
4212 #: builtin/clone.c:466
4213 #, c-format
4214 msgid "Could not find remote branch %s to clone."
4215 msgstr "不能发现要克隆的远程分支 %s。"
4216
4217 #: builtin/clone.c:546
4218 #, c-format
4219 msgid "Checking connectivity... "
4220 msgstr "检查连接... "
4221
4222 #: builtin/clone.c:549
4223 msgid "remote did not send all necessary objects"
4224 msgstr "远程没有发送所有必须的对象"
4225
4226 #: builtin/clone.c:613
4227 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4228 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
4229
4230 #: builtin/clone.c:644
4231 msgid "unable to checkout working tree"
4232 msgstr "不能检出工作区"
4233
4234 #: builtin/clone.c:731
4235 msgid "cannot repack to clean up"
4236 msgstr "无法执行 repack 来清理"
4237
4238 #: builtin/clone.c:733
4239 msgid "cannot unlink temporary alternates file"
4240 msgstr "无法删除临时的 alternates 文件"
4241
4242 #: builtin/clone.c:763
4243 msgid "Too many arguments."
4244 msgstr "太多参数。"
4245
4246 #: builtin/clone.c:767
4247 msgid "You must specify a repository to clone."
4248 msgstr "您必须指定一个仓库来克隆。"
4249
4250 #: builtin/clone.c:778
4251 #, c-format
4252 msgid "--bare and --origin %s options are incompatible."
4253 msgstr "--bare 和 --origin %s 选项不兼容。"
4254
4255 #: builtin/clone.c:781
4256 msgid "--bare and --separate-git-dir are incompatible."
4257 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4258
4259 #: builtin/clone.c:794
4260 #, c-format
4261 msgid "repository '%s' does not exist"
4262 msgstr "仓库 '%s' 不存在"
4263
4264 #: builtin/clone.c:800 builtin/fetch.c:1160
4265 #, c-format
4266 msgid "depth %s is not a positive number"
4267 msgstr "深度 %s 不是一个正数"
4268
4269 #: builtin/clone.c:810
4270 #, c-format
4271 msgid "destination path '%s' already exists and is not an empty directory."
4272 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
4273
4274 #: builtin/clone.c:820
4275 #, c-format
4276 msgid "working tree '%s' already exists."
4277 msgstr "工作区 '%s' 已经存在。"
4278
4279 #: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4280 #: builtin/worktree.c:220
4281 #, c-format
4282 msgid "could not create leading directories of '%s'"
4283 msgstr "不能为 '%s' 创建先导目录"
4284
4285 #: builtin/clone.c:838
4286 #, c-format
4287 msgid "could not create work tree dir '%s'"
4288 msgstr "不能创建工作区目录 '%s'"
4289
4290 #: builtin/clone.c:856
4291 #, c-format
4292 msgid "Cloning into bare repository '%s'...\n"
4293 msgstr "克隆到纯仓库 '%s'...\n"
4294
4295 #: builtin/clone.c:858
4296 #, c-format
4297 msgid "Cloning into '%s'...\n"
4298 msgstr "正克隆到 '%s'...\n"
4299
4300 #: builtin/clone.c:883
4301 msgid "--dissociate given, but there is no --reference"
4302 msgstr "提供了参数 --dissociate，但未提供 --reference"
4303
4304 #: builtin/clone.c:900
4305 msgid "--depth is ignored in local clones; use file:// instead."
4306 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
4307
4308 #: builtin/clone.c:903
4309 msgid "source repository is shallow, ignoring --local"
4310 msgstr "源仓库是浅克隆，忽略 --local"
4311
4312 #: builtin/clone.c:908
4313 msgid "--local is ignored"
4314 msgstr "--local 被忽略"
4315
4316 #: builtin/clone.c:912
4317 #, c-format
4318 msgid "Don't know how to clone %s"
4319 msgstr "不知道如何克隆 %s"
4320
4321 #: builtin/clone.c:961 builtin/clone.c:969
4322 #, c-format
4323 msgid "Remote branch %s not found in upstream %s"
4324 msgstr "远程分支 %s 在上游 %s 未发现"
4325
4326 #: builtin/clone.c:972
4327 msgid "You appear to have cloned an empty repository."
4328 msgstr "您似乎克隆了一个空仓库。"
4329
4330 #: builtin/column.c:9
4331 msgid "git column [<options>]"
4332 msgstr "git column [<选项>]"
4333
4334 #: builtin/column.c:26
4335 msgid "lookup config vars"
4336 msgstr "查找配置变量"
4337
4338 #: builtin/column.c:27 builtin/column.c:28
4339 msgid "layout to use"
4340 msgstr "要使用的布局"
4341
4342 #: builtin/column.c:29
4343 msgid "Maximum width"
4344 msgstr "最大宽度"
4345
4346 #: builtin/column.c:30
4347 msgid "Padding space on left border"
4348 msgstr "左边框的填充空间"
4349
4350 #: builtin/column.c:31
4351 msgid "Padding space on right border"
4352 msgstr "右边框的填充空间"
4353
4354 #: builtin/column.c:32
4355 msgid "Padding space between columns"
4356 msgstr "两列之间的填充空间"
4357
4358 #: builtin/column.c:51
4359 msgid "--command must be the first argument"
4360 msgstr "--command 必须是第一个参数"
4361
4362 #: builtin/commit.c:37
4363 msgid "git commit [<options>] [--] <pathspec>..."
4364 msgstr "git commit [<选项>] [--] <路径规格>..."
4365
4366 #: builtin/commit.c:42
4367 msgid "git status [<options>] [--] <pathspec>..."
4368 msgstr "git status [<选项>] [--] <路径规格>..."
4369
4370 #: builtin/commit.c:47
4371 msgid ""
4372 "Your name and email address were configured automatically based\n"
4373 "on your username and hostname. Please check that they are accurate.\n"
4374 "You can suppress this message by setting them explicitly. Run the\n"
4375 "following command and follow the instructions in your editor to edit\n"
4376 "your configuration file:\n"
4377 "\n"
4378 "    git config --global --edit\n"
4379 "\n"
4380 "After doing this, you may fix the identity used for this commit with:\n"
4381 "\n"
4382 "    git commit --amend --reset-author\n"
4383 msgstr ""
4384 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4385 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4386 "中编辑您的配置文件：\n"
4387 "\n"
4388 "    git config --global --edit\n"
4389 "\n"
4390 "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
4391 "\n"
4392 "    git commit --amend --reset-author\n"
4393
4394 #: builtin/commit.c:60
4395 msgid ""
4396 "Your name and email address were configured automatically based\n"
4397 "on your username and hostname. Please check that they are accurate.\n"
4398 "You can suppress this message by setting them explicitly:\n"
4399 "\n"
4400 "    git config --global user.name \"Your Name\"\n"
4401 "    git config --global user.email you@example.com\n"
4402 "\n"
4403 "After doing this, you may fix the identity used for this commit with:\n"
4404 "\n"
4405 "    git commit --amend --reset-author\n"
4406 msgstr ""
4407 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4408 "与否。您可以对其进行设置以免再出现本提示信息：\n"
4409 "\n"
4410 "    git config --global user.name \"Your Name\"\n"
4411 "    git config --global user.email you@example.com\n"
4412 "\n"
4413 "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
4414 "\n"
4415 "    git commit --amend --reset-author\n"
4416
4417 #: builtin/commit.c:72
4418 msgid ""
4419 "You asked to amend the most recent commit, but doing so would make\n"
4420 "it empty. You can repeat your command with --allow-empty, or you can\n"
4421 "remove the commit entirely with \"git reset HEAD^\".\n"
4422 msgstr ""
4423 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4424 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4425
4426 #: builtin/commit.c:77
4427 msgid ""
4428 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4429 "If you wish to commit it anyway, use:\n"
4430 "\n"
4431 "    git commit --allow-empty\n"
4432 "\n"
4433 msgstr ""
4434 "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
4435 "也要提交，使用命令：\n"
4436 "\n"
4437 "    git commit --allow-empty\n"
4438 "\n"
4439
4440 #: builtin/commit.c:84
4441 msgid "Otherwise, please use 'git reset'\n"
4442 msgstr "否则，请使用命令 'git reset'\n"
4443
4444 #: builtin/commit.c:87
4445 msgid ""
4446 "If you wish to skip this commit, use:\n"
4447 "\n"
4448 "    git reset\n"
4449 "\n"
4450 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4451 "the remaining commits.\n"
4452 msgstr ""
4453 "如果您想跳过这个提交，使用命令：\n"
4454 "\n"
4455 "    git reset\n"
4456 "\n"
4457 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4458 "操作。\n"
4459
4460 #: builtin/commit.c:304
4461 msgid "failed to unpack HEAD tree object"
4462 msgstr "无法解包 HEAD 树对象"
4463
4464 #: builtin/commit.c:344
4465 msgid "unable to create temporary index"
4466 msgstr "不能创建临时索引"
4467
4468 #: builtin/commit.c:350
4469 msgid "interactive add failed"
4470 msgstr "交互式添加失败"
4471
4472 #: builtin/commit.c:361
4473 msgid "unable to write index file"
4474 msgstr "无法写入索引文件"
4475
4476 #: builtin/commit.c:363
4477 msgid "unable to update temporary index"
4478 msgstr "无法更新临时索引"
4479
4480 #: builtin/commit.c:365
4481 msgid "Failed to update main cache tree"
4482 msgstr "不能更新树的主缓存"
4483
4484 #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4485 msgid "unable to write new_index file"
4486 msgstr "无法写 new_index 文件"
4487
4488 #: builtin/commit.c:445
4489 msgid "cannot do a partial commit during a merge."
4490 msgstr "在合并过程中不能做部分提交。"
4491
4492 #: builtin/commit.c:447
4493 msgid "cannot do a partial commit during a cherry-pick."
4494 msgstr "在拣选过程中不能做部分提交。"
4495
4496 #: builtin/commit.c:456
4497 msgid "cannot read the index"
4498 msgstr "无法读取索引"
4499
4500 #: builtin/commit.c:475
4501 msgid "unable to write temporary index file"
4502 msgstr "无法写临时索引文件"
4503
4504 #: builtin/commit.c:580
4505 #, c-format
4506 msgid "commit '%s' lacks author header"
4507 msgstr "提交 '%s' 缺少作者信息"
4508
4509 #: builtin/commit.c:582
4510 #, c-format
4511 msgid "commit '%s' has malformed author line"
4512 msgstr "提交 '%s' 有非法的作者信息"
4513
4514 #: builtin/commit.c:601
4515 msgid "malformed --author parameter"
4516 msgstr "非法的 --author 参数"
4517
4518 #: builtin/commit.c:609
4519 #, c-format
4520 msgid "invalid date format: %s"
4521 msgstr "无效的日期格式：%s"
4522
4523 #: builtin/commit.c:653
4524 msgid ""
4525 "unable to select a comment character that is not used\n"
4526 "in the current commit message"
4527 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4528
4529 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4530 #, c-format
4531 msgid "could not lookup commit %s"
4532 msgstr "不能查询提交 %s"
4533
4534 #: builtin/commit.c:702 builtin/shortlog.c:273
4535 #, c-format
4536 msgid "(reading log message from standard input)\n"
4537 msgstr "（正从标准输入中读取日志信息）\n"
4538
4539 #: builtin/commit.c:704
4540 msgid "could not read log from standard input"
4541 msgstr "不能从标准输入中读取日志信息"
4542
4543 #: builtin/commit.c:708
4544 #, c-format
4545 msgid "could not read log file '%s'"
4546 msgstr "不能读取日志文件 '%s'"
4547
4548 #: builtin/commit.c:730
4549 msgid "could not read MERGE_MSG"
4550 msgstr "不能读取 MERGE_MSG"
4551
4552 #: builtin/commit.c:734
4553 msgid "could not read SQUASH_MSG"
4554 msgstr "不能读取 SQUASH_MSG"
4555
4556 #: builtin/commit.c:738 builtin/merge.c:1079
4557 #, c-format
4558 msgid "could not read '%s'"
4559 msgstr "不能读取 '%s'"
4560
4561 #: builtin/commit.c:785
4562 msgid "could not write commit template"
4563 msgstr "不能写提交模版"
4564
4565 #: builtin/commit.c:803
4566 #, c-format
4567 msgid ""
4568 "\n"
4569 "It looks like you may be committing a merge.\n"
4570 "If this is not correct, please remove the file\n"
4571 "\t%s\n"
4572 "and try again.\n"
4573 msgstr ""
4574 "\n"
4575 "似乎您正在做一个合并提交。如果不对，请删除文件\n"
4576 "\t%s\n"
4577 "然后重试。\n"
4578
4579 #: builtin/commit.c:808
4580 #, c-format
4581 msgid ""
4582 "\n"
4583 "It looks like you may be committing a cherry-pick.\n"
4584 "If this is not correct, please remove the file\n"
4585 "\t%s\n"
4586 "and try again.\n"
4587 msgstr ""
4588 "\n"
4589 "似乎您正在做一个拣选提交。如果不对，请删除文件\n"
4590 "\t%s\n"
4591 "然后重试。\n"
4592
4593 #: builtin/commit.c:821
4594 #, c-format
4595 msgid ""
4596 "Please enter the commit message for your changes. Lines starting\n"
4597 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4598 msgstr ""
4599 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
4600 "说明将会终止提交。\n"
4601
4602 #: builtin/commit.c:828
4603 #, c-format
4604 msgid ""
4605 "Please enter the commit message for your changes. Lines starting\n"
4606 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4607 "An empty message aborts the commit.\n"
4608 msgstr ""
4609 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
4610 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4611
4612 #  译者：为保证在输出中对齐，注意调整句中空格！
4613 #: builtin/commit.c:848
4614 #, c-format
4615 msgid "%sAuthor:    %.*s <%.*s>"
4616 msgstr "%s作者：  %.*s <%.*s>"
4617
4618 #  译者：为保证在输出中对齐，注意调整句中空格！
4619 #: builtin/commit.c:856
4620 #, c-format
4621 msgid "%sDate:      %s"
4622 msgstr "%s日期：  %s"
4623
4624 #  译者：为保证在输出中对齐，注意调整句中空格！
4625 #: builtin/commit.c:863
4626 #, c-format
4627 msgid "%sCommitter: %.*s <%.*s>"
4628 msgstr "%s提交者：%.*s <%.*s>"
4629
4630 #: builtin/commit.c:881
4631 msgid "Cannot read index"
4632 msgstr "无法读取索引"
4633
4634 #: builtin/commit.c:938
4635 msgid "Error building trees"
4636 msgstr "无法创建树对象"
4637
4638 #: builtin/commit.c:953 builtin/tag.c:495
4639 #, c-format
4640 msgid "Please supply the message using either -m or -F option.\n"
4641 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4642
4643 #: builtin/commit.c:1055
4644 #, c-format
4645 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4646 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
4647
4648 #: builtin/commit.c:1070 builtin/commit.c:1310
4649 #, c-format
4650 msgid "Invalid untracked files mode '%s'"
4651 msgstr "无效的未追踪文件参数 '%s'"
4652
4653 #: builtin/commit.c:1107
4654 msgid "--long and -z are incompatible"
4655 msgstr "--long 和 -z 选项不兼容"
4656
4657 #: builtin/commit.c:1137
4658 msgid "Using both --reset-author and --author does not make sense"
4659 msgstr "同时使用 --reset-author 和 --author 没有意义"
4660
4661 #: builtin/commit.c:1146
4662 msgid "You have nothing to amend."
4663 msgstr "您没有可修补的提交。"
4664
4665 #: builtin/commit.c:1149
4666 msgid "You are in the middle of a merge -- cannot amend."
4667 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4668
4669 #: builtin/commit.c:1151
4670 msgid "You are in the middle of a cherry-pick -- cannot amend."
4671 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4672
4673 #: builtin/commit.c:1154
4674 msgid "Options --squash and --fixup cannot be used together"
4675 msgstr "选项 --squash 和 --fixup 不能同时使用"
4676
4677 #: builtin/commit.c:1164
4678 msgid "Only one of -c/-C/-F/--fixup can be used."
4679 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4680
4681 #: builtin/commit.c:1166
4682 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4683 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4684
4685 #: builtin/commit.c:1174
4686 msgid "--reset-author can be used only with -C, -c or --amend."
4687 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4688
4689 #: builtin/commit.c:1191
4690 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4691 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4692
4693 #: builtin/commit.c:1193
4694 msgid "No paths with --include/--only does not make sense."
4695 msgstr "参数 --include/--only 不跟路径没有意义。"
4696
4697 #: builtin/commit.c:1195
4698 msgid "Clever... amending the last one with dirty index."
4699 msgstr "聪明... 用脏索引修补最后一个提交。"
4700
4701 #: builtin/commit.c:1197
4702 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4703 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
4704
4705 #: builtin/commit.c:1209 builtin/tag.c:728
4706 #, c-format
4707 msgid "Invalid cleanup mode %s"
4708 msgstr "无效的清理模式 %s"
4709
4710 #: builtin/commit.c:1214
4711 msgid "Paths with -a does not make sense."
4712 msgstr "路径和 -a 选项同时使用没有意义。"
4713
4714 #: builtin/commit.c:1324 builtin/commit.c:1603
4715 msgid "show status concisely"
4716 msgstr "以简洁的格式显示状态"
4717
4718 #: builtin/commit.c:1326 builtin/commit.c:1605
4719 msgid "show branch information"
4720 msgstr "显示分支信息"
4721
4722 #: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4723 msgid "machine-readable output"
4724 msgstr "机器可读的输出"
4725
4726 #: builtin/commit.c:1331 builtin/commit.c:1609
4727 msgid "show status in long format (default)"
4728 msgstr "以长格式显示状态（默认）"
4729
4730 #: builtin/commit.c:1334 builtin/commit.c:1612
4731 msgid "terminate entries with NUL"
4732 msgstr "条目以 NUL 字符结尾"
4733
4734 #: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4735 #: builtin/fast-export.c:983 builtin/tag.c:603
4736 msgid "mode"
4737 msgstr "模式"
4738
4739 #: builtin/commit.c:1337 builtin/commit.c:1615
4740 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4741 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
4742
4743 #: builtin/commit.c:1340
4744 msgid "show ignored files"
4745 msgstr "显示忽略的文件"
4746
4747 #: builtin/commit.c:1341 parse-options.h:152
4748 msgid "when"
4749 msgstr "何时"
4750
4751 #: builtin/commit.c:1342
4752 msgid ""
4753 "ignore changes to submodules, optional when: all, dirty, untracked. "
4754 "(Default: all)"
4755 msgstr ""
4756 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
4757
4758 #: builtin/commit.c:1344
4759 msgid "list untracked files in columns"
4760 msgstr "以列的方式显示未跟踪的文件"
4761
4762 #: builtin/commit.c:1430
4763 msgid "couldn't look up newly created commit"
4764 msgstr "无法找到新创建的提交"
4765
4766 #: builtin/commit.c:1432
4767 msgid "could not parse newly created commit"
4768 msgstr "不能解析新创建的提交"
4769
4770 #: builtin/commit.c:1477
4771 msgid "detached HEAD"
4772 msgstr "分离头指针"
4773
4774 #  译者：中文字符串拼接，可删除前导空格
4775 #: builtin/commit.c:1480
4776 msgid " (root-commit)"
4777 msgstr "（根提交）"
4778
4779 #: builtin/commit.c:1573
4780 msgid "suppress summary after successful commit"
4781 msgstr "提交成功后不显示概述信息"
4782
4783 #: builtin/commit.c:1574
4784 msgid "show diff in commit message template"
4785 msgstr "在提交说明模板里显示差异"
4786
4787 #: builtin/commit.c:1576
4788 msgid "Commit message options"
4789 msgstr "提交说明选项"
4790
4791 #: builtin/commit.c:1577 builtin/tag.c:601
4792 msgid "read message from file"
4793 msgstr "从文件中读取提交说明"
4794
4795 #: builtin/commit.c:1578
4796 msgid "author"
4797 msgstr "作者"
4798
4799 #: builtin/commit.c:1578
4800 msgid "override author for commit"
4801 msgstr "提交时覆盖作者"
4802
4803 #: builtin/commit.c:1579 builtin/gc.c:280
4804 msgid "date"
4805 msgstr "日期"
4806
4807 #: builtin/commit.c:1579
4808 msgid "override date for commit"
4809 msgstr "提交时覆盖日期"
4810
4811 #: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4812 #: builtin/notes.c:554 builtin/tag.c:599
4813 msgid "message"
4814 msgstr "说明"
4815
4816 #: builtin/commit.c:1580
4817 msgid "commit message"
4818 msgstr "提交说明"
4819
4820 #: builtin/commit.c:1581
4821 msgid "reuse and edit message from specified commit"
4822 msgstr "重用并编辑指定提交的提交说明"
4823
4824 #: builtin/commit.c:1582
4825 msgid "reuse message from specified commit"
4826 msgstr "重用指定提交的提交说明"
4827
4828 #: builtin/commit.c:1583
4829 msgid "use autosquash formatted message to fixup specified commit"
4830 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4831
4832 #: builtin/commit.c:1584
4833 msgid "use autosquash formatted message to squash specified commit"
4834 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4835
4836 #: builtin/commit.c:1585
4837 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4838 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
4839
4840 #: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4841 msgid "add Signed-off-by:"
4842 msgstr "添加 Signed-off-by: 签名"
4843
4844 #: builtin/commit.c:1587
4845 msgid "use specified template file"
4846 msgstr "使用指定的模板文件"
4847
4848 #: builtin/commit.c:1588
4849 msgid "force edit of commit"
4850 msgstr "强制编辑提交"
4851
4852 #  译者：可选值，不能翻译（或是原文中笔误，应为 mode）
4853 #: builtin/commit.c:1589
4854 msgid "default"
4855 msgstr "default"
4856
4857 #: builtin/commit.c:1589 builtin/tag.c:604
4858 msgid "how to strip spaces and #comments from message"
4859 msgstr "设置如何删除提交说明里的空格和#注释"
4860
4861 #: builtin/commit.c:1590
4862 msgid "include status in commit message template"
4863 msgstr "在提交说明模板里包含状态信息"
4864
4865 #: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
4866 #: builtin/tag.c:605
4867 msgid "key-id"
4868 msgstr "key-id"
4869
4870 #: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
4871 msgid "GPG sign commit"
4872 msgstr "GPG 提交签名"
4873
4874 #: builtin/commit.c:1595
4875 msgid "Commit contents options"
4876 msgstr "提交内容选项"
4877
4878 #: builtin/commit.c:1596
4879 msgid "commit all changed files"
4880 msgstr "提交所有改动的文件"
4881
4882 #: builtin/commit.c:1597
4883 msgid "add specified files to index for commit"
4884 msgstr "添加指定的文件到索引区等待提交"
4885
4886 #: builtin/commit.c:1598
4887 msgid "interactively add files"
4888 msgstr "交互式添加文件"
4889
4890 #: builtin/commit.c:1599
4891 msgid "interactively add changes"
4892 msgstr "交互式添加变更"
4893
4894 #: builtin/commit.c:1600
4895 msgid "commit only specified files"
4896 msgstr "只提交指定的文件"
4897
4898 #: builtin/commit.c:1601
4899 msgid "bypass pre-commit hook"
4900 msgstr "绕过 pre-commit 钩子"
4901
4902 #: builtin/commit.c:1602
4903 msgid "show what would be committed"
4904 msgstr "显示将要提交的内容"
4905
4906 #: builtin/commit.c:1613
4907 msgid "amend previous commit"
4908 msgstr "修改先前的提交"
4909
4910 #: builtin/commit.c:1614
4911 msgid "bypass post-rewrite hook"
4912 msgstr "绕过 post-rewrite 钩子"
4913
4914 #: builtin/commit.c:1619
4915 msgid "ok to record an empty change"
4916 msgstr "允许一个空提交"
4917
4918 #: builtin/commit.c:1621
4919 msgid "ok to record a change with an empty message"
4920 msgstr "允许空的提交说明"
4921
4922 #: builtin/commit.c:1650
4923 msgid "could not parse HEAD commit"
4924 msgstr "不能解析 HEAD 提交"
4925
4926 #: builtin/commit.c:1689 builtin/merge.c:1076
4927 #, c-format
4928 msgid "could not open '%s' for reading"
4929 msgstr "不能为读入打开 '%s'"
4930
4931 #: builtin/commit.c:1696
4932 #, c-format
4933 msgid "Corrupt MERGE_HEAD file (%s)"
4934 msgstr "损坏的 MERGE_HEAD 文件（%s）"
4935
4936 #: builtin/commit.c:1703
4937 msgid "could not read MERGE_MODE"
4938 msgstr "不能读取 MERGE_MODE"
4939
4940 #: builtin/commit.c:1722
4941 #, c-format
4942 msgid "could not read commit message: %s"
4943 msgstr "不能读取提交说明：%s"
4944
4945 #: builtin/commit.c:1733
4946 #, c-format
4947 msgid "Aborting commit; you did not edit the message.\n"
4948 msgstr "终止提交；您未更改来自模版的提交说明。\n"
4949
4950 #: builtin/commit.c:1738
4951 #, c-format
4952 msgid "Aborting commit due to empty commit message.\n"
4953 msgstr "终止提交因为提交说明为空。\n"
4954
4955 #: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
4956 msgid "failed to write commit object"
4957 msgstr "无法写提交对象"
4958
4959 #: builtin/commit.c:1786
4960 msgid ""
4961 "Repository has been updated, but unable to write\n"
4962 "new_index file. Check that disk is not full and quota is\n"
4963 "not exceeded, and then \"git reset HEAD\" to recover."
4964 msgstr ""
4965 "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
4966 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
4967
4968 #: builtin/config.c:8
4969 msgid "git config [<options>]"
4970 msgstr "git config [<选项>]"
4971
4972 #: builtin/config.c:53
4973 msgid "Config file location"
4974 msgstr "配置文件位置"
4975
4976 #: builtin/config.c:54
4977 msgid "use global config file"
4978 msgstr "使用全局配置文件"
4979
4980 #: builtin/config.c:55
4981 msgid "use system config file"
4982 msgstr "使用系统级配置文件"
4983
4984 #: builtin/config.c:56
4985 msgid "use repository config file"
4986 msgstr "使用仓库级配置文件"
4987
4988 #: builtin/config.c:57
4989 msgid "use given config file"
4990 msgstr "使用指定的配置文件"
4991
4992 #: builtin/config.c:58
4993 msgid "blob-id"
4994 msgstr "数据对象 ID"
4995
4996 #: builtin/config.c:58
4997 msgid "read config from given blob object"
4998 msgstr "从给定的数据对象读取配置"
4999
5000 #: builtin/config.c:59
5001 msgid "Action"
5002 msgstr "操作"
5003
5004 #: builtin/config.c:60
5005 msgid "get value: name [value-regex]"
5006 msgstr "获取值：name [value-regex]"
5007
5008 #: builtin/config.c:61
5009 msgid "get all values: key [value-regex]"
5010 msgstr "获得所有的值：key [value-regex]"
5011
5012 #: builtin/config.c:62
5013 msgid "get values for regexp: name-regex [value-regex]"
5014 msgstr "根据正则表达式获得值：name-regex [value-regex]"
5015
5016 #: builtin/config.c:63
5017 msgid "get value specific for the URL: section[.var] URL"
5018 msgstr "获得 URL 取值：section[.var] URL"
5019
5020 #: builtin/config.c:64
5021 msgid "replace all matching variables: name value [value_regex]"
5022 msgstr "替换所有匹配的变量：name value [value_regex]"
5023
5024 #: builtin/config.c:65
5025 msgid "add a new variable: name value"
5026 msgstr "添加一个新的变量：name value"
5027
5028 #: builtin/config.c:66
5029 msgid "remove a variable: name [value-regex]"
5030 msgstr "删除一个变量：name [value-regex]"
5031
5032 #: builtin/config.c:67
5033 msgid "remove all matches: name [value-regex]"
5034 msgstr "删除所有匹配项：name [value-regex]"
5035
5036 #: builtin/config.c:68
5037 msgid "rename section: old-name new-name"
5038 msgstr "重命名小节：old-name new-name"
5039
5040 #: builtin/config.c:69
5041 msgid "remove a section: name"
5042 msgstr "删除一个小节：name"
5043
5044 #: builtin/config.c:70
5045 msgid "list all"
5046 msgstr "列出所有"
5047
5048 #: builtin/config.c:71
5049 msgid "open an editor"
5050 msgstr "打开一个编辑器"
5051
5052 #: builtin/config.c:72
5053 msgid "find the color configured: slot [default]"
5054 msgstr "获得配置的颜色：配置 [默认]"
5055
5056 #: builtin/config.c:73
5057 msgid "find the color setting: slot [stdout-is-tty]"
5058 msgstr "获得颜色设置：配置 [stdout-is-tty]"
5059
5060 #: builtin/config.c:74
5061 msgid "Type"
5062 msgstr "类型"
5063
5064 #: builtin/config.c:75
5065 msgid "value is \"true\" or \"false\""
5066 msgstr "值是 \"true\" 或 \"false\""
5067
5068 #: builtin/config.c:76
5069 msgid "value is decimal number"
5070 msgstr "值是十进制数"
5071
5072 #: builtin/config.c:77
5073 msgid "value is --bool or --int"
5074 msgstr "值是 --bool or --int"
5075
5076 #: builtin/config.c:78
5077 msgid "value is a path (file or directory name)"
5078 msgstr "值是一个路径（文件或目录名）"
5079
5080 #: builtin/config.c:79
5081 msgid "Other"
5082 msgstr "其它"
5083
5084 #: builtin/config.c:80
5085 msgid "terminate values with NUL byte"
5086 msgstr "终止值是 NUL 字节"
5087
5088 #: builtin/config.c:81
5089 msgid "respect include directives on lookup"
5090 msgstr "查询时参照 include 指令递归查找"
5091
5092 #: builtin/config.c:316
5093 msgid "unable to parse default color value"
5094 msgstr "不能解析默认颜色值"
5095
5096 #: builtin/config.c:457
5097 #, c-format
5098 msgid ""
5099 "# This is Git's per-user configuration file.\n"
5100 "[user]\n"
5101 "# Please adapt and uncomment the following lines:\n"
5102 "#\tname = %s\n"
5103 "#\temail = %s\n"
5104 msgstr ""
5105 "# This is Git's per-user configuration file.\n"
5106 "[user]\n"
5107 "# Please adapt and uncomment the following lines:\n"
5108 "#\tname = %s\n"
5109 "#\temail = %s\n"
5110
5111 #: builtin/config.c:587
5112 #, c-format
5113 msgid "cannot create configuration file %s"
5114 msgstr "不能创建配置文件 %s"
5115
5116 #: builtin/count-objects.c:55
5117 msgid "git count-objects [-v] [-H | --human-readable]"
5118 msgstr "git count-objects [-v] [-H | --human-readable]"
5119
5120 #: builtin/count-objects.c:65
5121 msgid "print sizes in human readable format"
5122 msgstr "以用户可读的格式显示大小"
5123
5124 #: builtin/describe.c:17
5125 msgid "git describe [<options>] [<commit-ish>...]"
5126 msgstr "git describe [<选项>] [<提交号>...]"
5127
5128 #: builtin/describe.c:18
5129 msgid "git describe [<options>] --dirty"
5130 msgstr "git describe [<选项>] --dirty"
5131
5132 #: builtin/describe.c:217
5133 #, c-format
5134 msgid "annotated tag %s not available"
5135 msgstr "附注标签 %s 无效"
5136
5137 #: builtin/describe.c:221
5138 #, c-format
5139 msgid "annotated tag %s has no embedded name"
5140 msgstr "附注标签 %s 没有嵌入名称"
5141
5142 #: builtin/describe.c:223
5143 #, c-format
5144 msgid "tag '%s' is really '%s' here"
5145 msgstr "标签 '%s' 的确是在 '%s'"
5146
5147 #: builtin/describe.c:250 builtin/log.c:452
5148 #, c-format
5149 msgid "Not a valid object name %s"
5150 msgstr "不是一个有效的对象名 %s"
5151
5152 #: builtin/describe.c:253
5153 #, c-format
5154 msgid "%s is not a valid '%s' object"
5155 msgstr "%s 不是一个有效的 '%s' 对象"
5156
5157 #: builtin/describe.c:270
5158 #, c-format
5159 msgid "no tag exactly matches '%s'"
5160 msgstr "没有标签准确匹配 '%s'"
5161
5162 #: builtin/describe.c:272
5163 #, c-format
5164 msgid "searching to describe %s\n"
5165 msgstr "搜索描述 %s\n"
5166
5167 #: builtin/describe.c:319
5168 #, c-format
5169 msgid "finished search at %s\n"
5170 msgstr "完成搜索 %s\n"
5171
5172 #: builtin/describe.c:346
5173 #, c-format
5174 msgid ""
5175 "No annotated tags can describe '%s'.\n"
5176 "However, there were unannotated tags: try --tags."
5177 msgstr ""
5178 "没有附注标签能描述 '%s'。\n"
5179 "然而，存在未附注标签：尝试 --tags。"
5180
5181 #: builtin/describe.c:350
5182 #, c-format
5183 msgid ""
5184 "No tags can describe '%s'.\n"
5185 "Try --always, or create some tags."
5186 msgstr ""
5187 "没有标签能描述 '%s'。\n"
5188 "尝试 --always，或者创建一些标签。"
5189
5190 #: builtin/describe.c:371
5191 #, c-format
5192 msgid "traversed %lu commits\n"
5193 msgstr "已遍历 %lu 个提交\n"
5194
5195 #: builtin/describe.c:374
5196 #, c-format
5197 msgid ""
5198 "more than %i tags found; listed %i most recent\n"
5199 "gave up search at %s\n"
5200 msgstr ""
5201 "发现多于 %i 个标签，列出最近的 %i 个\n"
5202 "在 %s 放弃搜索\n"
5203
5204 #: builtin/describe.c:396
5205 msgid "find the tag that comes after the commit"
5206 msgstr "寻找该提交之后的标签"
5207
5208 #: builtin/describe.c:397
5209 msgid "debug search strategy on stderr"
5210 msgstr "在标准错误上调试搜索策略"
5211
5212 #: builtin/describe.c:398
5213 msgid "use any ref"
5214 msgstr "使用任意引用"
5215
5216 #: builtin/describe.c:399
5217 msgid "use any tag, even unannotated"
5218 msgstr "使用任意标签，即使未附带注释"
5219
5220 #: builtin/describe.c:400
5221 msgid "always use long format"
5222 msgstr "始终使用长提交号格式"
5223
5224 #: builtin/describe.c:401
5225 msgid "only follow first parent"
5226 msgstr "只跟随第一个父提交"
5227
5228 #: builtin/describe.c:404
5229 msgid "only output exact matches"
5230 msgstr "只输出精确匹配"
5231
5232 #: builtin/describe.c:406
5233 msgid "consider <n> most recent tags (default: 10)"
5234 msgstr "考虑最近 <n> 个标签（默认：10）"
5235
5236 #: builtin/describe.c:408
5237 msgid "only consider tags matching <pattern>"
5238 msgstr "只考虑匹配 <模式> 的标签"
5239
5240 #: builtin/describe.c:410 builtin/name-rev.c:318
5241 msgid "show abbreviated commit object as fallback"
5242 msgstr "显示简写的提交号作为后备"
5243
5244 #: builtin/describe.c:411
5245 msgid "mark"
5246 msgstr "标记"
5247
5248 #: builtin/describe.c:412
5249 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5250 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
5251
5252 #: builtin/describe.c:430
5253 msgid "--long is incompatible with --abbrev=0"
5254 msgstr "--long 与 --abbrev=0 不兼容"
5255
5256 #: builtin/describe.c:456
5257 msgid "No names found, cannot describe anything."
5258 msgstr "没有发现名称，无法描述任何东西。"
5259
5260 #: builtin/describe.c:476
5261 msgid "--dirty is incompatible with commit-ishes"
5262 msgstr "--dirty 不能与提交同时使用"
5263
5264 #: builtin/diff.c:86
5265 #, c-format
5266 msgid "'%s': not a regular file or symlink"
5267 msgstr "'%s'：不是一个正规文件或符号链接"
5268
5269 #: builtin/diff.c:237
5270 #, c-format
5271 msgid "invalid option: %s"
5272 msgstr "无效选项：%s"
5273
5274 #: builtin/diff.c:358
5275 msgid "Not a git repository"
5276 msgstr "不是一个 git 仓库"
5277
5278 #: builtin/diff.c:401
5279 #, c-format
5280 msgid "invalid object '%s' given."
5281 msgstr "提供了无效对象 '%s'。"
5282
5283 #: builtin/diff.c:410
5284 #, c-format
5285 msgid "more than two blobs given: '%s'"
5286 msgstr "提供了超过两个数据对象：'%s'"
5287
5288 #: builtin/diff.c:417
5289 #, c-format
5290 msgid "unhandled object '%s' given."
5291 msgstr "无法处理的对象 '%s'。"
5292
5293 #: builtin/fast-export.c:24
5294 msgid "git fast-export [rev-list-opts]"
5295 msgstr "git fast-export [rev-list-opts]"
5296
5297 #: builtin/fast-export.c:979
5298 msgid "show progress after <n> objects"
5299 msgstr "在 <n> 个对象之后显示进度"
5300
5301 #: builtin/fast-export.c:981
5302 msgid "select handling of signed tags"
5303 msgstr "选择如何处理签名标签"
5304
5305 #: builtin/fast-export.c:984
5306 msgid "select handling of tags that tag filtered objects"
5307 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5308
5309 #: builtin/fast-export.c:987
5310 msgid "Dump marks to this file"
5311 msgstr "把标记存储到这个文件"
5312
5313 #: builtin/fast-export.c:989
5314 msgid "Import marks from this file"
5315 msgstr "从这个文件导入标记"
5316
5317 #: builtin/fast-export.c:991
5318 msgid "Fake a tagger when tags lack one"
5319 msgstr "当标签缺少标记者字段时，假装提供一个"
5320
5321 #: builtin/fast-export.c:993
5322 msgid "Output full tree for each commit"
5323 msgstr "每次提交都输出整个树"
5324
5325 #: builtin/fast-export.c:995
5326 msgid "Use the done feature to terminate the stream"
5327 msgstr "使用 done 功能来终止流"
5328
5329 #: builtin/fast-export.c:996
5330 msgid "Skip output of blob data"
5331 msgstr "跳过数据对象的输出"
5332
5333 #: builtin/fast-export.c:997
5334 msgid "refspec"
5335 msgstr "引用规格"
5336
5337 #: builtin/fast-export.c:998
5338 msgid "Apply refspec to exported refs"
5339 msgstr "对导出的引用应用引用规格"
5340
5341 #: builtin/fast-export.c:999
5342 msgid "anonymize output"
5343 msgstr "匿名输出"
5344
5345 #: builtin/fetch.c:19
5346 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5347 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5348
5349 #: builtin/fetch.c:20
5350 msgid "git fetch [<options>] <group>"
5351 msgstr "git fetch [<选项>] <组>"
5352
5353 #: builtin/fetch.c:21
5354 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5355 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5356
5357 #: builtin/fetch.c:22
5358 msgid "git fetch --all [<options>]"
5359 msgstr "git fetch --all [<选项>]"
5360
5361 #: builtin/fetch.c:89
5362 msgid "fetch from all remotes"
5363 msgstr "从所有的远程抓取"
5364
5365 #: builtin/fetch.c:91
5366 msgid "append to .git/FETCH_HEAD instead of overwriting"
5367 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5368
5369 #: builtin/fetch.c:93
5370 msgid "path to upload pack on remote end"
5371 msgstr "上传包到远程的路径"
5372
5373 #: builtin/fetch.c:94
5374 msgid "force overwrite of local branch"
5375 msgstr "强制覆盖本地分支"
5376
5377 #: builtin/fetch.c:96
5378 msgid "fetch from multiple remotes"
5379 msgstr "从多个远程抓取"
5380
5381 #: builtin/fetch.c:98
5382 msgid "fetch all tags and associated objects"
5383 msgstr "抓取所有的标签和关联对象"
5384
5385 #: builtin/fetch.c:100
5386 msgid "do not fetch all tags (--no-tags)"
5387 msgstr "不抓取任何标签(--no-tags)"
5388
5389 #: builtin/fetch.c:102
5390 msgid "prune remote-tracking branches no longer on remote"
5391 msgstr "清除远程已经不存在的分支的跟踪分支"
5392
5393 #  译者：可选值，不能翻译
5394 #: builtin/fetch.c:103
5395 msgid "on-demand"
5396 msgstr "on-demand"
5397
5398 #: builtin/fetch.c:104
5399 msgid "control recursive fetching of submodules"
5400 msgstr "控制子模组的递归抓取"
5401
5402 #: builtin/fetch.c:108
5403 msgid "keep downloaded pack"
5404 msgstr "保持下载包"
5405
5406 #: builtin/fetch.c:110
5407 msgid "allow updating of HEAD ref"
5408 msgstr "允许更新 HEAD 引用"
5409
5410 #: builtin/fetch.c:113
5411 msgid "deepen history of shallow clone"
5412 msgstr "深化浅克隆的历史"
5413
5414 #: builtin/fetch.c:115
5415 msgid "convert to a complete repository"
5416 msgstr "转换为一个完整的仓库"
5417
5418 #: builtin/fetch.c:117 builtin/log.c:1208
5419 msgid "dir"
5420 msgstr "目录"
5421
5422 #: builtin/fetch.c:118
5423 msgid "prepend this to submodule path output"
5424 msgstr "在子模组路径输出的前面加上此目录"
5425
5426 #: builtin/fetch.c:121
5427 msgid "default mode for recursion"
5428 msgstr "递归的默认模式"
5429
5430 #: builtin/fetch.c:123
5431 msgid "accept refs that update .git/shallow"
5432 msgstr "接受更新 .git/shallow 的引用"
5433
5434 #: builtin/fetch.c:124
5435 msgid "refmap"
5436 msgstr "引用映射"
5437
5438 #: builtin/fetch.c:125
5439 msgid "specify fetch refmap"
5440 msgstr "指定获取操作的引用映射"
5441
5442 #: builtin/fetch.c:377
5443 msgid "Couldn't find remote ref HEAD"
5444 msgstr "无法发现远程 HEAD 引用"
5445
5446 #: builtin/fetch.c:457
5447 #, c-format
5448 msgid "object %s not found"
5449 msgstr "对象 %s 未发现"
5450
5451 #: builtin/fetch.c:462
5452 msgid "[up to date]"
5453 msgstr "[最新]"
5454
5455 #: builtin/fetch.c:476
5456 #, c-format
5457 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5458 msgstr "! %-*s %-*s -> %s  （在当前分支下不能获取）"
5459
5460 #: builtin/fetch.c:477 builtin/fetch.c:563
5461 msgid "[rejected]"
5462 msgstr "[已拒绝]"
5463
5464 #: builtin/fetch.c:488
5465 msgid "[tag update]"
5466 msgstr "[标签更新]"
5467
5468 #  译者：注意保持前导空格
5469 #: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
5470 msgid "  (unable to update local ref)"
5471 msgstr "  （不能更新本地引用）"
5472
5473 #: builtin/fetch.c:508
5474 msgid "[new tag]"
5475 msgstr "[新标签]"
5476
5477 #: builtin/fetch.c:511
5478 msgid "[new branch]"
5479 msgstr "[新分支]"
5480
5481 #: builtin/fetch.c:514
5482 msgid "[new ref]"
5483 msgstr "[新引用]"
5484
5485 #: builtin/fetch.c:559
5486 msgid "unable to update local ref"
5487 msgstr "不能更新本地引用"
5488
5489 #: builtin/fetch.c:559
5490 msgid "forced update"
5491 msgstr "强制更新"
5492
5493 #: builtin/fetch.c:565
5494 msgid "(non-fast-forward)"
5495 msgstr "（非快进式）"
5496
5497 #: builtin/fetch.c:599 builtin/fetch.c:832
5498 #, c-format
5499 msgid "cannot open %s: %s\n"
5500 msgstr "无法打开 %s：%s\n"
5501
5502 #: builtin/fetch.c:608
5503 #, c-format
5504 msgid "%s did not send all necessary objects\n"
5505 msgstr "%s 未发送所有必须的对象\n"
5506
5507 #: builtin/fetch.c:626
5508 #, c-format
5509 msgid "reject %s because shallow roots are not allowed to be updated"
5510 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5511
5512 #: builtin/fetch.c:714 builtin/fetch.c:797
5513 #, c-format
5514 msgid "From %.*s\n"
5515 msgstr "来自 %.*s\n"
5516
5517 #: builtin/fetch.c:725
5518 #, c-format
5519 msgid ""
5520 "some local refs could not be updated; try running\n"
5521 " 'git remote prune %s' to remove any old, conflicting branches"
5522 msgstr ""
5523 "一些本地引用不能被更新；尝试运行\n"
5524 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5525
5526 #  译者：注意保持前导空格
5527 #: builtin/fetch.c:777
5528 #, c-format
5529 msgid "   (%s will become dangling)"
5530 msgstr "   （%s 将成为摇摆状态）"
5531
5532 #  译者：注意保持前导空格
5533 #: builtin/fetch.c:778
5534 #, c-format
5535 msgid "   (%s has become dangling)"
5536 msgstr "   （%s 已成为摇摆状态）"
5537
5538 #: builtin/fetch.c:802
5539 msgid "[deleted]"
5540 msgstr "[已删除]"
5541
5542 #: builtin/fetch.c:803 builtin/remote.c:1057
5543 msgid "(none)"
5544 msgstr "（无）"
5545
5546 #: builtin/fetch.c:822
5547 #, c-format
5548 msgid "Refusing to fetch into current branch %s of non-bare repository"
5549 msgstr "拒绝获取到非纯仓库的当前分支 %s"
5550
5551 #: builtin/fetch.c:841
5552 #, c-format
5553 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5554 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5555
5556 #: builtin/fetch.c:844
5557 #, c-format
5558 msgid "Option \"%s\" is ignored for %s\n"
5559 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5560
5561 #: builtin/fetch.c:900
5562 #, c-format
5563 msgid "Don't know how to fetch from %s"
5564 msgstr "不知道如何从 %s 获取"
5565
5566 #: builtin/fetch.c:1063
5567 #, c-format
5568 msgid "Fetching %s\n"
5569 msgstr "正在获取 %s\n"
5570
5571 #: builtin/fetch.c:1065 builtin/remote.c:90
5572 #, c-format
5573 msgid "Could not fetch %s"
5574 msgstr "不能获取 %s"
5575
5576 #: builtin/fetch.c:1083
5577 msgid ""
5578 "No remote repository specified.  Please, specify either a URL or a\n"
5579 "remote name from which new revisions should be fetched."
5580 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
5581
5582 #: builtin/fetch.c:1106
5583 msgid "You need to specify a tag name."
5584 msgstr "您需要指定一个标签名称。"
5585
5586 #: builtin/fetch.c:1148
5587 msgid "--depth and --unshallow cannot be used together"
5588 msgstr "--depth 和 --unshallow 不能同时使用"
5589
5590 #: builtin/fetch.c:1150
5591 msgid "--unshallow on a complete repository does not make sense"
5592 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
5593
5594 #: builtin/fetch.c:1173
5595 msgid "fetch --all does not take a repository argument"
5596 msgstr "fetch --all 不能带一个仓库参数"
5597
5598 #: builtin/fetch.c:1175
5599 msgid "fetch --all does not make sense with refspecs"
5600 msgstr "fetch --all 带引用规格没有任何意义"
5601
5602 #: builtin/fetch.c:1186
5603 #, c-format
5604 msgid "No such remote or remote group: %s"
5605 msgstr "没有这样的远程或远程组：%s"
5606
5607 #: builtin/fetch.c:1194
5608 msgid "Fetching a group and specifying refspecs does not make sense"
5609 msgstr "获取组并指定引用规格没有意义"
5610
5611 #: builtin/fmt-merge-msg.c:13
5612 msgid ""
5613 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5614 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5615
5616 #: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
5617 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5618 #: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5619 #: parse-options.h:131 parse-options.h:238
5620 msgid "n"
5621 msgstr "n"
5622
5623 #: builtin/fmt-merge-msg.c:669
5624 msgid "populate log with at most <n> entries from shortlog"
5625 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
5626
5627 #: builtin/fmt-merge-msg.c:672
5628 msgid "alias for --log (deprecated)"
5629 msgstr "参数 --log 的别名（已弃用）"
5630
5631 #: builtin/fmt-merge-msg.c:675
5632 msgid "text"
5633 msgstr "文本"
5634
5635 #: builtin/fmt-merge-msg.c:676
5636 msgid "use <text> as start of message"
5637 msgstr "使用 <文本> 作为提交说明的开始"
5638
5639 #: builtin/fmt-merge-msg.c:677
5640 msgid "file to read from"
5641 msgstr "从文件中读取"
5642
5643 #: builtin/for-each-ref.c:687
5644 msgid "unable to parse format"
5645 msgstr "不能解析格式"
5646
5647 #: builtin/for-each-ref.c:1083
5648 msgid "git for-each-ref [<options>] [<pattern>]"
5649 msgstr "git for-each-ref [<选项>] [<模式>]"
5650
5651 #: builtin/for-each-ref.c:1098
5652 msgid "quote placeholders suitably for shells"
5653 msgstr "引用占位符适用于 shells"
5654
5655 #: builtin/for-each-ref.c:1100
5656 msgid "quote placeholders suitably for perl"
5657 msgstr "引用占位符适用于 perl"
5658
5659 #: builtin/for-each-ref.c:1102
5660 msgid "quote placeholders suitably for python"
5661 msgstr "引用占位符适用于 python"
5662
5663 #: builtin/for-each-ref.c:1104
5664 msgid "quote placeholders suitably for Tcl"
5665 msgstr "引用占位符适用于 Tcl"
5666
5667 #: builtin/for-each-ref.c:1107
5668 msgid "show only <n> matched refs"
5669 msgstr "只显示 <n> 个匹配的引用"
5670
5671 #: builtin/for-each-ref.c:1108 builtin/replace.c:438
5672 msgid "format"
5673 msgstr "格式"
5674
5675 #: builtin/for-each-ref.c:1108
5676 msgid "format to use for the output"
5677 msgstr "输出格式"
5678
5679 #: builtin/for-each-ref.c:1109
5680 msgid "key"
5681 msgstr "key"
5682
5683 #: builtin/for-each-ref.c:1110
5684 msgid "field name to sort on"
5685 msgstr "排序的字段名"
5686
5687 #: builtin/fsck.c:147 builtin/prune.c:137
5688 msgid "Checking connectivity"
5689 msgstr "检查连接中"
5690
5691 #: builtin/fsck.c:548
5692 msgid "Checking object directories"
5693 msgstr "检查对象目录中"
5694
5695 #: builtin/fsck.c:611
5696 msgid "git fsck [<options>] [<object>...]"
5697 msgstr "git fsck [<选项>] [<对象>...]"
5698
5699 #: builtin/fsck.c:617
5700 msgid "show unreachable objects"
5701 msgstr "显示不可达的对象"
5702
5703 #: builtin/fsck.c:618
5704 msgid "show dangling objects"
5705 msgstr "显示摇摆的对象"
5706
5707 #: builtin/fsck.c:619
5708 msgid "report tags"
5709 msgstr "报告标签"
5710
5711 #: builtin/fsck.c:620
5712 msgid "report root nodes"
5713 msgstr "报告根节点"
5714
5715 #: builtin/fsck.c:621
5716 msgid "make index objects head nodes"
5717 msgstr "将索引亦作为检查的头节点"
5718
5719 #: builtin/fsck.c:622
5720 msgid "make reflogs head nodes (default)"
5721 msgstr "将引用日志作为检查的头节点（默认）"
5722
5723 #: builtin/fsck.c:623
5724 msgid "also consider packs and alternate objects"
5725 msgstr "也考虑包和备用对象"
5726
5727 #: builtin/fsck.c:624
5728 msgid "enable more strict checking"
5729 msgstr "启用更严格的检查"
5730
5731 #: builtin/fsck.c:626
5732 msgid "write dangling objects in .git/lost-found"
5733 msgstr "将摇摆对象写入 .git/lost-found 中"
5734
5735 #: builtin/fsck.c:627 builtin/prune.c:107
5736 msgid "show progress"
5737 msgstr "显示进度"
5738
5739 #: builtin/fsck.c:677
5740 msgid "Checking objects"
5741 msgstr "检查对象中"
5742
5743 #: builtin/gc.c:24
5744 msgid "git gc [<options>]"
5745 msgstr "git gc [<选项>]"
5746
5747 #: builtin/gc.c:67
5748 #, c-format
5749 msgid "Invalid %s: '%s'"
5750 msgstr "无效 %s：'%s'"
5751
5752 #: builtin/gc.c:112
5753 #, c-format
5754 msgid "insanely long object directory %.*s"
5755 msgstr "不正常的长对象目录 %.*s"
5756
5757 #: builtin/gc.c:281
5758 msgid "prune unreferenced objects"
5759 msgstr "清除未引用的对象"
5760
5761 #: builtin/gc.c:283
5762 msgid "be more thorough (increased runtime)"
5763 msgstr "更彻底（增加运行时间）"
5764
5765 #: builtin/gc.c:284
5766 msgid "enable auto-gc mode"
5767 msgstr "启用自动垃圾回收模式"
5768
5769 #: builtin/gc.c:285
5770 msgid "force running gc even if there may be another gc running"
5771 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5772
5773 #: builtin/gc.c:327
5774 #, c-format
5775 msgid "Auto packing the repository in background for optimum performance.\n"
5776 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
5777
5778 #: builtin/gc.c:329
5779 #, c-format
5780 msgid "Auto packing the repository for optimum performance.\n"
5781 msgstr "自动打包仓库以求最佳性能。\n"
5782
5783 #: builtin/gc.c:330
5784 #, c-format
5785 msgid "See \"git help gc\" for manual housekeeping.\n"
5786 msgstr "手工维护参见 \"git help gc\"。\n"
5787
5788 #: builtin/gc.c:348
5789 #, c-format
5790 msgid ""
5791 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5792 msgstr ""
5793 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
5794
5795 #: builtin/gc.c:376
5796 msgid ""
5797 "There are too many unreachable loose objects; run 'git prune' to remove them."
5798 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
5799
5800 #: builtin/grep.c:23
5801 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5802 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5803
5804 #: builtin/grep.c:218
5805 #, c-format
5806 msgid "grep: failed to create thread: %s"
5807 msgstr "grep：无法创建线程：%s"
5808
5809 #: builtin/grep.c:441 builtin/grep.c:476
5810 #, c-format
5811 msgid "unable to read tree (%s)"
5812 msgstr "无法读取树（%s）"
5813
5814 #: builtin/grep.c:491
5815 #, c-format
5816 msgid "unable to grep from object of type %s"
5817 msgstr "无法抓取来自于 %s 类型的对象"
5818
5819 #: builtin/grep.c:547
5820 #, c-format
5821 msgid "switch `%c' expects a numerical value"
5822 msgstr "开关 `%c' 期望一个数字值"
5823
5824 #: builtin/grep.c:564
5825 #, c-format
5826 msgid "cannot open '%s'"
5827 msgstr "不能打开 '%s'"
5828
5829 #: builtin/grep.c:638
5830 msgid "search in index instead of in the work tree"
5831 msgstr "在索引区搜索而不是在工作区"
5832
5833 #: builtin/grep.c:640
5834 msgid "find in contents not managed by git"
5835 msgstr "在未被 git 管理的内容中查找"
5836
5837 #  译者：中文字符串拼接，可删除前导空格
5838 #: builtin/grep.c:642
5839 msgid "search in both tracked and untracked files"
5840 msgstr "在跟踪和未跟踪的文件中搜索"
5841
5842 #: builtin/grep.c:644
5843 msgid "ignore files specified via '.gitignore'"
5844 msgstr "忽略 '.gitignore' 包含的文件"
5845
5846 #: builtin/grep.c:647
5847 msgid "show non-matching lines"
5848 msgstr "显示未匹配的行"
5849
5850 #: builtin/grep.c:649
5851 msgid "case insensitive matching"
5852 msgstr "不区分大小写匹配"
5853
5854 #: builtin/grep.c:651
5855 msgid "match patterns only at word boundaries"
5856 msgstr "只在单词边界匹配模式"
5857
5858 #: builtin/grep.c:653
5859 msgid "process binary files as text"
5860 msgstr "把二进制文件当做文本处理"
5861
5862 #: builtin/grep.c:655
5863 msgid "don't match patterns in binary files"
5864 msgstr "不在二进制文件中匹配模式"
5865
5866 #: builtin/grep.c:658
5867 msgid "process binary files with textconv filters"
5868 msgstr "用 textconv 过滤器处理二进制文件"
5869
5870 #: builtin/grep.c:660
5871 msgid "descend at most <depth> levels"
5872 msgstr "最多以指定的深度向下寻找"
5873
5874 #: builtin/grep.c:664
5875 msgid "use extended POSIX regular expressions"
5876 msgstr "使用扩展的 POSIX 正则表达式"
5877
5878 #: builtin/grep.c:667
5879 msgid "use basic POSIX regular expressions (default)"
5880 msgstr "使用基本的 POSIX 正则表达式（默认）"
5881
5882 #: builtin/grep.c:670
5883 msgid "interpret patterns as fixed strings"
5884 msgstr "把模式解析为固定的字符串"
5885
5886 #: builtin/grep.c:673
5887 msgid "use Perl-compatible regular expressions"
5888 msgstr "使用 Perl 兼容的正则表达式"
5889
5890 #: builtin/grep.c:676
5891 msgid "show line numbers"
5892 msgstr "显示行号"
5893
5894 #: builtin/grep.c:677
5895 msgid "don't show filenames"
5896 msgstr "不显示文件名"
5897
5898 #: builtin/grep.c:678
5899 msgid "show filenames"
5900 msgstr "显示文件名"
5901
5902 #: builtin/grep.c:680
5903 msgid "show filenames relative to top directory"
5904 msgstr "显示相对于顶级目录的文件名"
5905
5906 #: builtin/grep.c:682
5907 msgid "show only filenames instead of matching lines"
5908 msgstr "只显示文件名而不显示匹配的行"
5909
5910 #: builtin/grep.c:684
5911 msgid "synonym for --files-with-matches"
5912 msgstr "和 --files-with-matches 同义"
5913
5914 #: builtin/grep.c:687
5915 msgid "show only the names of files without match"
5916 msgstr "只显示未匹配的文件名"
5917
5918 #: builtin/grep.c:689
5919 msgid "print NUL after filenames"
5920 msgstr "在文件名后输出 NUL 字符"
5921
5922 #: builtin/grep.c:691
5923 msgid "show the number of matches instead of matching lines"
5924 msgstr "显示总匹配行数，而不显示匹配的行"
5925
5926 #: builtin/grep.c:692
5927 msgid "highlight matches"
5928 msgstr "高亮显示匹配项"
5929
5930 #: builtin/grep.c:694
5931 msgid "print empty line between matches from different files"
5932 msgstr "在不同文件的匹配项之间打印空行"
5933
5934 #: builtin/grep.c:696
5935 msgid "show filename only once above matches from same file"
5936 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5937
5938 #: builtin/grep.c:699
5939 msgid "show <n> context lines before and after matches"
5940 msgstr "显示匹配项前后的 <n> 行上下文"
5941
5942 #: builtin/grep.c:702
5943 msgid "show <n> context lines before matches"
5944 msgstr "显示匹配项前 <n> 行上下文"
5945
5946 #: builtin/grep.c:704
5947 msgid "show <n> context lines after matches"
5948 msgstr "显示匹配项后 <n> 行上下文"
5949
5950 #: builtin/grep.c:705
5951 msgid "shortcut for -C NUM"
5952 msgstr "快捷键 -C 数字"
5953
5954 #: builtin/grep.c:708
5955 msgid "show a line with the function name before matches"
5956 msgstr "在匹配的前面显示一行函数名"
5957
5958 #: builtin/grep.c:710
5959 msgid "show the surrounding function"
5960 msgstr "显示所在函数的前后内容"
5961
5962 #: builtin/grep.c:713
5963 msgid "read patterns from file"
5964 msgstr "从文件读取模式"
5965
5966 #: builtin/grep.c:715
5967 msgid "match <pattern>"
5968 msgstr "匹配 <模式>"
5969
5970 #: builtin/grep.c:717
5971 msgid "combine patterns specified with -e"
5972 msgstr "组合用 -e 参数设定的模式"
5973
5974 #: builtin/grep.c:729
5975 msgid "indicate hit with exit status without output"
5976 msgstr "不输出，而用退出码标识命中状态"
5977
5978 #: builtin/grep.c:731
5979 msgid "show only matches from files that match all patterns"
5980 msgstr "只显示匹配所有模式的文件中的匹配"
5981
5982 #: builtin/grep.c:733
5983 msgid "show parse tree for grep expression"
5984 msgstr "显示 grep 表达式的解析树"
5985
5986 #: builtin/grep.c:737
5987 msgid "pager"
5988 msgstr "分页"
5989
5990 #: builtin/grep.c:737
5991 msgid "show matching files in the pager"
5992 msgstr "分页显示匹配的文件"
5993
5994 #: builtin/grep.c:740
5995 msgid "allow calling of grep(1) (ignored by this build)"
5996 msgstr "允许调用 grep(1)（本次构建忽略）"
5997
5998 #: builtin/grep.c:741 builtin/show-ref.c:189
5999 msgid "show usage"
6000 msgstr "显示用法"
6001
6002 #: builtin/grep.c:808
6003 msgid "no pattern given."
6004 msgstr "未提供模式匹配。"
6005
6006 #: builtin/grep.c:866
6007 msgid "--open-files-in-pager only works on the worktree"
6008 msgstr "--open-files-in-pager 仅用于工作区"
6009
6010 #: builtin/grep.c:892
6011 msgid "--cached or --untracked cannot be used with --no-index."
6012 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6013
6014 #: builtin/grep.c:897
6015 msgid "--no-index or --untracked cannot be used with revs."
6016 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6017
6018 #: builtin/grep.c:900
6019 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6020 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6021
6022 #: builtin/grep.c:908
6023 msgid "both --cached and trees are given."
6024 msgstr "同时给出了 --cached 和树对象。"
6025
6026 #: builtin/hash-object.c:80
6027 msgid ""
6028 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6029 "[--] <file>..."
6030 msgstr ""
6031 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6032 "[--] <文件>..."
6033
6034 #: builtin/hash-object.c:81
6035 msgid "git hash-object  --stdin-paths < <list-of-paths>"
6036 msgstr "git hash-object  --stdin-paths < <路径列表>"
6037
6038 #: builtin/hash-object.c:92 builtin/tag.c:612
6039 msgid "type"
6040 msgstr "类型"
6041
6042 #: builtin/hash-object.c:92
6043 msgid "object type"
6044 msgstr "对象类型"
6045
6046 #: builtin/hash-object.c:93
6047 msgid "write the object into the object database"
6048 msgstr "将对象写入对象数据库"
6049
6050 #: builtin/hash-object.c:95
6051 msgid "read the object from stdin"
6052 msgstr "从标准输入读取对象"
6053
6054 #: builtin/hash-object.c:97
6055 msgid "store file as is without filters"
6056 msgstr "原样存储文件不使用过滤器"
6057
6058 #: builtin/hash-object.c:98
6059 msgid ""
6060 "just hash any random garbage to create corrupt objects for debugging Git"
6061 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6062
6063 #: builtin/hash-object.c:99
6064 msgid "process file as it were from this path"
6065 msgstr "处理文件并假设其来自于此路径"
6066
6067 #: builtin/help.c:41
6068 msgid "print all available commands"
6069 msgstr "打印所有可用的命令"
6070
6071 #: builtin/help.c:42
6072 msgid "print list of useful guides"
6073 msgstr "显示有用的指南列表"
6074
6075 #: builtin/help.c:43
6076 msgid "show man page"
6077 msgstr "显示 man 手册"
6078
6079 #: builtin/help.c:44
6080 msgid "show manual in web browser"
6081 msgstr "在 web 浏览器中显示手册"
6082
6083 #: builtin/help.c:46
6084 msgid "show info page"
6085 msgstr "显示 info 手册"
6086
6087 #: builtin/help.c:52
6088 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6089 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6090
6091 #: builtin/help.c:64
6092 #, c-format
6093 msgid "unrecognized help format '%s'"
6094 msgstr "未能识别的帮助格式 '%s'"
6095
6096 #: builtin/help.c:91
6097 msgid "Failed to start emacsclient."
6098 msgstr "无法启动 emacsclient。"
6099
6100 #: builtin/help.c:104
6101 msgid "Failed to parse emacsclient version."
6102 msgstr "无法解析 emacsclient 版本。"
6103
6104 #: builtin/help.c:112
6105 #, c-format
6106 msgid "emacsclient version '%d' too old (< 22)."
6107 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
6108
6109 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
6110 #, c-format
6111 msgid "failed to exec '%s': %s"
6112 msgstr "无法执行 '%s'：%s"
6113
6114 #: builtin/help.c:215
6115 #, c-format
6116 msgid ""
6117 "'%s': path for unsupported man viewer.\n"
6118 "Please consider using 'man.<tool>.cmd' instead."
6119 msgstr ""
6120 "'%s'：不支持的 man 手册查看器的路径。\n"
6121 "请使用 'man.<工具>.cmd'。"
6122
6123 #: builtin/help.c:227
6124 #, c-format
6125 msgid ""
6126 "'%s': cmd for supported man viewer.\n"
6127 "Please consider using 'man.<tool>.path' instead."
6128 msgstr ""
6129 "'%s': 支持的 man 手册查看器命令。\n"
6130 "请使用 'man.<工具>.path'。"
6131
6132 #: builtin/help.c:354
6133 #, c-format
6134 msgid "'%s': unknown man viewer."
6135 msgstr "'%s'：未知的 man 查看器。"
6136
6137 #: builtin/help.c:371
6138 msgid "no man viewer handled the request"
6139 msgstr "没有 man 查看器处理此请求"
6140
6141 #: builtin/help.c:379
6142 msgid "no info viewer handled the request"
6143 msgstr "没有 info 查看器处理此请求"
6144
6145 #: builtin/help.c:428
6146 msgid "Defining attributes per path"
6147 msgstr "定义路径的属性"
6148
6149 #: builtin/help.c:429
6150 msgid "Everyday Git With 20 Commands Or So"
6151 msgstr "每一天 Git 常用的约 20 条命令"
6152
6153 #: builtin/help.c:430
6154 msgid "A Git glossary"
6155 msgstr "Git 词汇表"
6156
6157 #: builtin/help.c:431
6158 msgid "Specifies intentionally untracked files to ignore"
6159 msgstr "忽略指定的未跟踪文件"
6160
6161 #: builtin/help.c:432
6162 msgid "Defining submodule properties"
6163 msgstr "定义子模组属性"
6164
6165 #: builtin/help.c:433
6166 msgid "Specifying revisions and ranges for Git"
6167 msgstr "指定 Git 的版本和版本范围"
6168
6169 #: builtin/help.c:434
6170 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6171 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
6172
6173 #: builtin/help.c:435
6174 msgid "An overview of recommended workflows with Git"
6175 msgstr "Git 推荐的工作流概览"
6176
6177 #: builtin/help.c:447
6178 msgid "The common Git guides are:\n"
6179 msgstr "最常用的 Git 向导有：\n"
6180
6181 #: builtin/help.c:468 builtin/help.c:485
6182 #, c-format
6183 msgid "usage: %s%s"
6184 msgstr "用法：%s%s"
6185
6186 #: builtin/help.c:501
6187 #, c-format
6188 msgid "`git %s' is aliased to `%s'"
6189 msgstr "`git %s' 是 `%s' 的别名"
6190
6191 #: builtin/index-pack.c:151
6192 #, c-format
6193 msgid "unable to open %s"
6194 msgstr "不能打开 %s"
6195
6196 #: builtin/index-pack.c:201
6197 #, c-format
6198 msgid "object type mismatch at %s"
6199 msgstr "%s 的对象类型不匹配"
6200
6201 #: builtin/index-pack.c:221
6202 #, c-format
6203 msgid "did not receive expected object %s"
6204 msgstr "未能获取期望的对象 %s"
6205
6206 #: builtin/index-pack.c:224
6207 #, c-format
6208 msgid "object %s: expected type %s, found %s"
6209 msgstr "对象 %s：期待类型 %s，却是 %s"
6210
6211 #: builtin/index-pack.c:266
6212 #, c-format
6213 msgid "cannot fill %d byte"
6214 msgid_plural "cannot fill %d bytes"
6215 msgstr[0] "无法填充 %d 字节"
6216 msgstr[1] "无法填充 %d 字节"
6217
6218 #: builtin/index-pack.c:276
6219 msgid "early EOF"
6220 msgstr "过早的文件结束符（EOF）"
6221
6222 #: builtin/index-pack.c:277
6223 msgid "read error on input"
6224 msgstr "输入上的读错误"
6225
6226 #: builtin/index-pack.c:289
6227 msgid "used more bytes than were available"
6228 msgstr "用掉了超过可用的字节"
6229
6230 #: builtin/index-pack.c:296
6231 msgid "pack too large for current definition of off_t"
6232 msgstr "包太大超过了当前 off_t 的定义"
6233
6234 #: builtin/index-pack.c:312
6235 #, c-format
6236 msgid "unable to create '%s'"
6237 msgstr "不能创建 '%s'"
6238
6239 #: builtin/index-pack.c:317
6240 #, c-format
6241 msgid "cannot open packfile '%s'"
6242 msgstr "无法打开包文件 '%s'"
6243
6244 #: builtin/index-pack.c:331
6245 msgid "pack signature mismatch"
6246 msgstr "包签名不匹配"
6247
6248 #: builtin/index-pack.c:333
6249 #, c-format
6250 msgid "pack version %<PRIu32> unsupported"
6251 msgstr "不支持包版本 %<PRIu32>"
6252
6253 #: builtin/index-pack.c:351
6254 #, c-format
6255 msgid "pack has bad object at offset %lu: %s"
6256 msgstr "包中有错误的对象位于 %lu：%s"
6257
6258 #: builtin/index-pack.c:472
6259 #, c-format
6260 msgid "inflate returned %d"
6261 msgstr "解压缩返回 %d"
6262
6263 #: builtin/index-pack.c:521
6264 msgid "offset value overflow for delta base object"
6265 msgstr "偏移值覆盖了 delta 基准对象"
6266
6267 #: builtin/index-pack.c:529
6268 msgid "delta base offset is out of bound"
6269 msgstr "delta 基准偏移越界"
6270
6271 #: builtin/index-pack.c:537
6272 #, c-format
6273 msgid "unknown object type %d"
6274 msgstr "未知对象类型 %d"
6275
6276 #: builtin/index-pack.c:568
6277 msgid "cannot pread pack file"
6278 msgstr "无法读取包文件"
6279
6280 #: builtin/index-pack.c:570
6281 #, c-format
6282 msgid "premature end of pack file, %lu byte missing"
6283 msgid_plural "premature end of pack file, %lu bytes missing"
6284 msgstr[0] "包文件过早结束，缺少 %lu 字节"
6285 msgstr[1] "包文件过早结束，缺少 %lu 字节"
6286
6287 #: builtin/index-pack.c:596
6288 msgid "serious inflate inconsistency"
6289 msgstr "解压缩严重的不一致"
6290
6291 #: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6292 #: builtin/index-pack.c:805 builtin/index-pack.c:814
6293 #, c-format
6294 msgid "SHA1 COLLISION FOUND WITH %s !"
6295 msgstr "发现 %s 出现 SHA1 冲突！"
6296
6297 #: builtin/index-pack.c:745 builtin/pack-objects.c:162
6298 #: builtin/pack-objects.c:254
6299 #, c-format
6300 msgid "unable to read %s"
6301 msgstr "不能读 %s"
6302
6303 #: builtin/index-pack.c:811
6304 #, c-format
6305 msgid "cannot read existing object %s"
6306 msgstr "不能读取现存对象 %s"
6307
6308 #: builtin/index-pack.c:825
6309 #, c-format
6310 msgid "invalid blob object %s"
6311 msgstr "无效的数据对象 %s"
6312
6313 #: builtin/index-pack.c:839
6314 #, c-format
6315 msgid "invalid %s"
6316 msgstr "无效的 %s"
6317
6318 #: builtin/index-pack.c:843
6319 msgid "Error in object"
6320 msgstr "对象中出错"
6321
6322 #: builtin/index-pack.c:845
6323 #, c-format
6324 msgid "Not all child objects of %s are reachable"
6325 msgstr "%s 的所有子对象并非都可达"
6326
6327 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6328 msgid "failed to apply delta"
6329 msgstr "无法应用 delta"
6330
6331 #: builtin/index-pack.c:1118
6332 msgid "Receiving objects"
6333 msgstr "接收对象中"
6334
6335 #: builtin/index-pack.c:1118
6336 msgid "Indexing objects"
6337 msgstr "索引对象中"
6338
6339 #: builtin/index-pack.c:1150
6340 msgid "pack is corrupted (SHA1 mismatch)"
6341 msgstr "包冲突（SHA1 不匹配）"
6342
6343 #: builtin/index-pack.c:1155
6344 msgid "cannot fstat packfile"
6345 msgstr "不能枚举包文件状态"
6346
6347 #: builtin/index-pack.c:1158
6348 msgid "pack has junk at the end"
6349 msgstr "包的结尾有垃圾数据"
6350
6351 #: builtin/index-pack.c:1169
6352 msgid "confusion beyond insanity in parse_pack_objects()"
6353 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6354
6355 #: builtin/index-pack.c:1194
6356 msgid "Resolving deltas"
6357 msgstr "处理 delta 中"
6358
6359 #: builtin/index-pack.c:1205
6360 #, c-format
6361 msgid "unable to create thread: %s"
6362 msgstr "不能创建线程：%s"
6363
6364 #: builtin/index-pack.c:1247
6365 msgid "confusion beyond insanity"
6366 msgstr "不可理喻"
6367
6368 #: builtin/index-pack.c:1253
6369 #, c-format
6370 msgid "completed with %d local objects"
6371 msgstr "完成 %d 个本地对象"
6372
6373 #: builtin/index-pack.c:1263
6374 #, c-format
6375 msgid "Unexpected tail checksum for %s (disk corruption?)"
6376 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
6377
6378 #: builtin/index-pack.c:1267
6379 #, c-format
6380 msgid "pack has %d unresolved delta"
6381 msgid_plural "pack has %d unresolved deltas"
6382 msgstr[0] "包有 %d 个未解决的 delta"
6383 msgstr[1] "包有 %d 个未解决的 delta"
6384
6385 #: builtin/index-pack.c:1291
6386 #, c-format
6387 msgid "unable to deflate appended object (%d)"
6388 msgstr "不能压缩附加对象（%d）"
6389
6390 #: builtin/index-pack.c:1367
6391 #, c-format
6392 msgid "local object %s is corrupt"
6393 msgstr "本地对象 %s 已损坏"
6394
6395 #: builtin/index-pack.c:1391
6396 msgid "error while closing pack file"
6397 msgstr "关闭包文件时出错"
6398
6399 #: builtin/index-pack.c:1404
6400 #, c-format
6401 msgid "cannot write keep file '%s'"
6402 msgstr "无法写保留文件 '%s'"
6403
6404 #: builtin/index-pack.c:1412
6405 #, c-format
6406 msgid "cannot close written keep file '%s'"
6407 msgstr "无法关闭保留文件 '%s'"
6408
6409 #: builtin/index-pack.c:1425
6410 msgid "cannot store pack file"
6411 msgstr "无法存储包文件"
6412
6413 #: builtin/index-pack.c:1436
6414 msgid "cannot store index file"
6415 msgstr "无法存储索引文件"
6416
6417 #: builtin/index-pack.c:1469
6418 #, c-format
6419 msgid "bad pack.indexversion=%<PRIu32>"
6420 msgstr "坏的 pack.indexversion=%<PRIu32>"
6421
6422 #: builtin/index-pack.c:1475
6423 #, c-format
6424 msgid "invalid number of threads specified (%d)"
6425 msgstr "指定的线程数无效（%d）"
6426
6427 #: builtin/index-pack.c:1479 builtin/index-pack.c:1658
6428 #, c-format
6429 msgid "no threads support, ignoring %s"
6430 msgstr "没有线程支持，忽略 %s"
6431
6432 #: builtin/index-pack.c:1537
6433 #, c-format
6434 msgid "Cannot open existing pack file '%s'"
6435 msgstr "无法打开现存包文件 '%s'"
6436
6437 #: builtin/index-pack.c:1539
6438 #, c-format
6439 msgid "Cannot open existing pack idx file for '%s'"
6440 msgstr "无法为 %s 打开包索引文件"
6441
6442 #: builtin/index-pack.c:1586
6443 #, c-format
6444 msgid "non delta: %d object"
6445 msgid_plural "non delta: %d objects"
6446 msgstr[0] "非 delta：%d 个对象"
6447 msgstr[1] "非 delta：%d 个对象"
6448
6449 #: builtin/index-pack.c:1593
6450 #, c-format
6451 msgid "chain length = %d: %lu object"
6452 msgid_plural "chain length = %d: %lu objects"
6453 msgstr[0] "链长 = %d: %lu 对象"
6454 msgstr[1] "链长 = %d: %lu 对象"
6455
6456 #: builtin/index-pack.c:1622
6457 msgid "Cannot come back to cwd"
6458 msgstr "无法返回当前工作目录"
6459
6460 #: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6461 #: builtin/index-pack.c:1685 builtin/index-pack.c:1689
6462 #, c-format
6463 msgid "bad %s"
6464 msgstr "错误选项 %s"
6465
6466 #: builtin/index-pack.c:1703
6467 msgid "--fix-thin cannot be used without --stdin"
6468 msgstr "--fix-thin 不能和 --stdin 同时使用"
6469
6470 #: builtin/index-pack.c:1707 builtin/index-pack.c:1716
6471 #, c-format
6472 msgid "packfile name '%s' does not end with '.pack'"
6473 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
6474
6475 #: builtin/index-pack.c:1724
6476 msgid "--verify with no packfile name given"
6477 msgstr "--verify 没有提供包文件名参数"
6478
6479 #: builtin/init-db.c:35
6480 #, c-format
6481 msgid "Could not make %s writable by group"
6482 msgstr "不能设置 %s 为组可写"
6483
6484 #: builtin/init-db.c:62
6485 #, c-format
6486 msgid "insanely long template name %s"
6487 msgstr "太长的模版名 %s"
6488
6489 #: builtin/init-db.c:67
6490 #, c-format
6491 msgid "cannot stat '%s'"
6492 msgstr "不能枚举 '%s' 状态"
6493
6494 #: builtin/init-db.c:73
6495 #, c-format
6496 msgid "cannot stat template '%s'"
6497 msgstr "不能枚举模版 '%s' 状态"
6498
6499 #: builtin/init-db.c:80
6500 #, c-format
6501 msgid "cannot opendir '%s'"
6502 msgstr "不能打开目录 '%s'"
6503
6504 #: builtin/init-db.c:97
6505 #, c-format
6506 msgid "cannot readlink '%s'"
6507 msgstr "不能读取链接 '%s'"
6508
6509 #: builtin/init-db.c:99
6510 #, c-format
6511 msgid "insanely long symlink %s"
6512 msgstr "太长的符号链接 %s"
6513
6514 #: builtin/init-db.c:102
6515 #, c-format
6516 msgid "cannot symlink '%s' '%s'"
6517 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6518
6519 #: builtin/init-db.c:106
6520 #, c-format
6521 msgid "cannot copy '%s' to '%s'"
6522 msgstr "不能拷贝 '%s' 至 '%s'"
6523
6524 #: builtin/init-db.c:110
6525 #, c-format
6526 msgid "ignoring template %s"
6527 msgstr "忽略模版 %s"
6528
6529 #: builtin/init-db.c:136
6530 #, c-format
6531 msgid "insanely long template path %s"
6532 msgstr "太长的模版路径 %s"
6533
6534 #: builtin/init-db.c:144
6535 #, c-format
6536 msgid "templates not found %s"
6537 msgstr "模版未找到 %s"
6538
6539 #: builtin/init-db.c:157
6540 #, c-format
6541 msgid "not copying templates of a wrong format version %d from '%s'"
6542 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6543
6544 #: builtin/init-db.c:211
6545 #, c-format
6546 msgid "insane git directory %s"
6547 msgstr "不正常的 git 目录 %s"
6548
6549 #: builtin/init-db.c:343 builtin/init-db.c:346
6550 #, c-format
6551 msgid "%s already exists"
6552 msgstr "%s 已经存在"
6553
6554 #: builtin/init-db.c:374
6555 #, c-format
6556 msgid "unable to handle file type %d"
6557 msgstr "不能处理 %d 类型的文件"
6558
6559 #: builtin/init-db.c:377
6560 #, c-format
6561 msgid "unable to move %s to %s"
6562 msgstr "不能移动 %s 至 %s"
6563
6564 #. TRANSLATORS: The first '%s' is either "Reinitialized
6565 #. existing" or "Initialized empty", the second " shared" or
6566 #. "", and the last '%s%s' is the verbatim directory name.
6567 #: builtin/init-db.c:433
6568 #, c-format
6569 msgid "%s%s Git repository in %s%s\n"
6570 msgstr "%s%s Git 仓库于 %s%s\n"
6571
6572 #: builtin/init-db.c:434
6573 msgid "Reinitialized existing"
6574 msgstr "重新初始化现存的"
6575
6576 #: builtin/init-db.c:434
6577 msgid "Initialized empty"
6578 msgstr "初始化空的"
6579
6580 #  译者：中文字符串拼接，可删除前导空格
6581 #: builtin/init-db.c:435
6582 msgid " shared"
6583 msgstr "共享"
6584
6585 #: builtin/init-db.c:482
6586 msgid ""
6587 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6588 "shared[=<permissions>]] [<directory>]"
6589 msgstr ""
6590 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6591 "[<目录>]"
6592
6593 #: builtin/init-db.c:505
6594 msgid "permissions"
6595 msgstr "权限"
6596
6597 #: builtin/init-db.c:506
6598 msgid "specify that the git repository is to be shared amongst several users"
6599 msgstr "指定 git 仓库是多个用户之间共享的"
6600
6601 #: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
6602 msgid "be quiet"
6603 msgstr "保持安静"
6604
6605 #: builtin/init-db.c:540 builtin/init-db.c:545
6606 #, c-format
6607 msgid "cannot mkdir %s"
6608 msgstr "不能创建目录 %s"
6609
6610 #: builtin/init-db.c:549
6611 #, c-format
6612 msgid "cannot chdir to %s"
6613 msgstr "不能切换目录到 %s"
6614
6615 #: builtin/init-db.c:570
6616 #, c-format
6617 msgid ""
6618 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6619 "dir=<directory>)"
6620 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
6621
6622 #: builtin/init-db.c:598
6623 #, c-format
6624 msgid "Cannot access work tree '%s'"
6625 msgstr "不能访问工作区 '%s'"
6626
6627 #: builtin/interpret-trailers.c:15
6628 msgid ""
6629 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6630 "[<file>...]"
6631 msgstr ""
6632 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6633 ">...]"
6634
6635 #: builtin/interpret-trailers.c:25
6636 msgid "trim empty trailers"
6637 msgstr "删除空签名"
6638
6639 #: builtin/interpret-trailers.c:26
6640 msgid "trailer"
6641 msgstr "签名"
6642
6643 #: builtin/interpret-trailers.c:27
6644 msgid "trailer(s) to add"
6645 msgstr "要添加的签名"
6646
6647 #: builtin/log.c:41
6648 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6649 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6650
6651 #: builtin/log.c:42
6652 msgid "git show [<options>] <object>..."
6653 msgstr "git show [<选项>] <对象>..."
6654
6655 #: builtin/log.c:81
6656 #, c-format
6657 msgid "invalid --decorate option: %s"
6658 msgstr "无效的 --decorate 选项：%s"
6659
6660 #: builtin/log.c:127
6661 msgid "suppress diff output"
6662 msgstr "不显示差异输出"
6663
6664 #: builtin/log.c:128
6665 msgid "show source"
6666 msgstr "显示源"
6667
6668 #: builtin/log.c:129
6669 msgid "Use mail map file"
6670 msgstr "使用邮件映射文件"
6671
6672 #: builtin/log.c:130
6673 msgid "decorate options"
6674 msgstr "修饰选项"
6675
6676 #: builtin/log.c:133
6677 msgid "Process line range n,m in file, counting from 1"
6678 msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
6679
6680 #: builtin/log.c:229
6681 #, c-format
6682 msgid "Final output: %d %s\n"
6683 msgstr "最终输出：%d %s\n"
6684
6685 #: builtin/log.c:458
6686 #, c-format
6687 msgid "git show %s: bad file"
6688 msgstr "git show %s: 损坏的文件"
6689
6690 #: builtin/log.c:472 builtin/log.c:564
6691 #, c-format
6692 msgid "Could not read object %s"
6693 msgstr "不能读取对象 %s"
6694
6695 #: builtin/log.c:588
6696 #, c-format
6697 msgid "Unknown type: %d"
6698 msgstr "未知类型：%d"
6699
6700 #: builtin/log.c:689
6701 msgid "format.headers without value"
6702 msgstr "format.headers 没有值"
6703
6704 #: builtin/log.c:773
6705 msgid "name of output directory is too long"
6706 msgstr "输出目录名太长"
6707
6708 #: builtin/log.c:789
6709 #, c-format
6710 msgid "Cannot open patch file %s"
6711 msgstr "无法打开补丁文件 %s"
6712
6713 #: builtin/log.c:803
6714 msgid "Need exactly one range."
6715 msgstr "只需要一个范围。"
6716
6717 #: builtin/log.c:813
6718 msgid "Not a range."
6719 msgstr "不是一个范围。"
6720
6721 #: builtin/log.c:919
6722 msgid "Cover letter needs email format"
6723 msgstr "信封需要邮件地址格式"
6724
6725 #: builtin/log.c:998
6726 #, c-format
6727 msgid "insane in-reply-to: %s"
6728 msgstr "不正常的 in-reply-to：%s"
6729
6730 #: builtin/log.c:1026
6731 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6732 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6733
6734 #: builtin/log.c:1071
6735 msgid "Two output directories?"
6736 msgstr "两个输出目录？"
6737
6738 #: builtin/log.c:1186
6739 msgid "use [PATCH n/m] even with a single patch"
6740 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
6741
6742 #: builtin/log.c:1189
6743 msgid "use [PATCH] even with multiple patches"
6744 msgstr "使用 [PATCH]，即使有多个补丁"
6745
6746 #: builtin/log.c:1193
6747 msgid "print patches to standard out"
6748 msgstr "打印补丁到标准输出"
6749
6750 #: builtin/log.c:1195
6751 msgid "generate a cover letter"
6752 msgstr "生成一封附信"
6753
6754 #: builtin/log.c:1197
6755 msgid "use simple number sequence for output file names"
6756 msgstr "使用简单的数字序列作为输出文件名"
6757
6758 #: builtin/log.c:1198
6759 msgid "sfx"
6760 msgstr "后缀"
6761
6762 #: builtin/log.c:1199
6763 msgid "use <sfx> instead of '.patch'"
6764 msgstr "使用 <后缀> 代替 '.patch'"
6765
6766 #: builtin/log.c:1201
6767 msgid "start numbering patches at <n> instead of 1"
6768 msgstr "补丁以 <n> 开始编号，而不是1"
6769
6770 #: builtin/log.c:1203
6771 msgid "mark the series as Nth re-roll"
6772 msgstr "标记补丁系列是第几次重制"
6773
6774 #: builtin/log.c:1205
6775 msgid "Use [<prefix>] instead of [PATCH]"
6776 msgstr "使用 [<前缀>] 代替 [PATCH]"
6777
6778 #: builtin/log.c:1208
6779 msgid "store resulting files in <dir>"
6780 msgstr "把结果文件存储在 <目录>"
6781
6782 #: builtin/log.c:1211
6783 msgid "don't strip/add [PATCH]"
6784 msgstr "不删除/添加 [PATCH]"
6785
6786 #: builtin/log.c:1214
6787 msgid "don't output binary diffs"
6788 msgstr "不输出二进制差异"
6789
6790 #: builtin/log.c:1216
6791 msgid "don't include a patch matching a commit upstream"
6792 msgstr "不包含已在上游提交中的补丁"
6793
6794 #: builtin/log.c:1218
6795 msgid "show patch format instead of default (patch + stat)"
6796 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
6797
6798 #: builtin/log.c:1220
6799 msgid "Messaging"
6800 msgstr "邮件发送"
6801
6802 #: builtin/log.c:1221
6803 msgid "header"
6804 msgstr "header"
6805
6806 #: builtin/log.c:1222
6807 msgid "add email header"
6808 msgstr "添加邮件头"
6809
6810 #: builtin/log.c:1223 builtin/log.c:1225
6811 msgid "email"
6812 msgstr "邮件地址"
6813
6814 #: builtin/log.c:1223
6815 msgid "add To: header"
6816 msgstr "添加收件人"
6817
6818 #: builtin/log.c:1225
6819 msgid "add Cc: header"
6820 msgstr "添加抄送"
6821
6822 #: builtin/log.c:1227
6823 msgid "ident"
6824 msgstr "标识"
6825
6826 #: builtin/log.c:1228
6827 msgid "set From address to <ident> (or committer ident if absent)"
6828 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
6829
6830 #: builtin/log.c:1230
6831 msgid "message-id"
6832 msgstr "邮件标识"
6833
6834 #: builtin/log.c:1231
6835 msgid "make first mail a reply to <message-id>"
6836 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6837
6838 #: builtin/log.c:1232 builtin/log.c:1235
6839 msgid "boundary"
6840 msgstr "边界"
6841
6842 #: builtin/log.c:1233
6843 msgid "attach the patch"
6844 msgstr "附件方式添加补丁"
6845
6846 #: builtin/log.c:1236
6847 msgid "inline the patch"
6848 msgstr "内联显示补丁"
6849
6850 #: builtin/log.c:1240
6851 msgid "enable message threading, styles: shallow, deep"
6852 msgstr "启用邮件线索，风格：浅，深"
6853
6854 #: builtin/log.c:1242
6855 msgid "signature"
6856 msgstr "签名"
6857
6858 #: builtin/log.c:1243
6859 msgid "add a signature"
6860 msgstr "添加一个签名"
6861
6862 #: builtin/log.c:1245
6863 msgid "add a signature from a file"
6864 msgstr "从文件添加一个签名"
6865
6866 #: builtin/log.c:1246
6867 msgid "don't print the patch filenames"
6868 msgstr "不要打印补丁文件名"
6869
6870 #: builtin/log.c:1320
6871 #, c-format
6872 msgid "invalid ident line: %s"
6873 msgstr "包含无效的身份标识：%s"
6874
6875 #: builtin/log.c:1335
6876 msgid "-n and -k are mutually exclusive."
6877 msgstr "-n 和 -k 互斥。"
6878
6879 #: builtin/log.c:1337
6880 msgid "--subject-prefix and -k are mutually exclusive."
6881 msgstr "--subject-prefix 和 -k 互斥。"
6882
6883 #: builtin/log.c:1345
6884 msgid "--name-only does not make sense"
6885 msgstr "--name-only 无意义"
6886
6887 #: builtin/log.c:1347
6888 msgid "--name-status does not make sense"
6889 msgstr "--name-status 无意义"
6890
6891 #: builtin/log.c:1349
6892 msgid "--check does not make sense"
6893 msgstr "--check 无意义"
6894
6895 #: builtin/log.c:1372
6896 msgid "standard output, or directory, which one?"
6897 msgstr "标准输出或目录，哪一个？"
6898
6899 #: builtin/log.c:1374
6900 #, c-format
6901 msgid "Could not create directory '%s'"
6902 msgstr "不能创建目录 '%s'"
6903
6904 #: builtin/log.c:1472
6905 #, c-format
6906 msgid "unable to read signature file '%s'"
6907 msgstr "无法读取签名文件 '%s'"
6908
6909 #: builtin/log.c:1535
6910 msgid "Failed to create output files"
6911 msgstr "无法创建输出文件"
6912
6913 #: builtin/log.c:1583
6914 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6915 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6916
6917 #: builtin/log.c:1637
6918 #, c-format
6919 msgid ""
6920 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6921 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
6922
6923 #: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6924 #, c-format
6925 msgid "Unknown commit %s"
6926 msgstr "未知提交 %s"
6927
6928 #: builtin/ls-files.c:358
6929 msgid "git ls-files [<options>] [<file>...]"
6930 msgstr "git ls-files [<选项>] [<文件>...]"
6931
6932 #: builtin/ls-files.c:415
6933 msgid "identify the file status with tags"
6934 msgstr "用标签标识文件的状态"
6935
6936 #: builtin/ls-files.c:417
6937 msgid "use lowercase letters for 'assume unchanged' files"
6938 msgstr "使用小写字母表示 '假设未改变的' 文件"
6939
6940 #: builtin/ls-files.c:419
6941 msgid "show cached files in the output (default)"
6942 msgstr "显示缓存的文件（默认）"
6943
6944 #: builtin/ls-files.c:421
6945 msgid "show deleted files in the output"
6946 msgstr "显示已删除的文件"
6947
6948 #: builtin/ls-files.c:423
6949 msgid "show modified files in the output"
6950 msgstr "显示已修改的文件"
6951
6952 #: builtin/ls-files.c:425
6953 msgid "show other files in the output"
6954 msgstr "显示其它文件"
6955
6956 #: builtin/ls-files.c:427
6957 msgid "show ignored files in the output"
6958 msgstr "显示忽略的文件"
6959
6960 #: builtin/ls-files.c:430
6961 msgid "show staged contents' object name in the output"
6962 msgstr "显示暂存区内容的对象名称"
6963
6964 #: builtin/ls-files.c:432
6965 msgid "show files on the filesystem that need to be removed"
6966 msgstr "显示文件系统需要删除的文件"
6967
6968 #: builtin/ls-files.c:434
6969 msgid "show 'other' directories' names only"
6970 msgstr "只显示“其他”目录的名称"
6971
6972 #: builtin/ls-files.c:437
6973 msgid "don't show empty directories"
6974 msgstr "不显示空目录"
6975
6976 #: builtin/ls-files.c:440
6977 msgid "show unmerged files in the output"
6978 msgstr "显示未合并的文件"
6979
6980 #: builtin/ls-files.c:442
6981 msgid "show resolve-undo information"
6982 msgstr "显示 resolve-undo 信息"
6983
6984 #: builtin/ls-files.c:444
6985 msgid "skip files matching pattern"
6986 msgstr "匹配排除文件的模式"
6987
6988 #: builtin/ls-files.c:447
6989 msgid "exclude patterns are read from <file>"
6990 msgstr "从 <文件> 中读取排除模式"
6991
6992 #: builtin/ls-files.c:450
6993 msgid "read additional per-directory exclude patterns in <file>"
6994 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6995
6996 #: builtin/ls-files.c:452
6997 msgid "add the standard git exclusions"
6998 msgstr "添加标准的 git 排除"
6999
7000 #: builtin/ls-files.c:455
7001 msgid "make the output relative to the project top directory"
7002 msgstr "显示相对于顶级目录的文件名"
7003
7004 #: builtin/ls-files.c:458
7005 msgid "if any <file> is not in the index, treat this as an error"
7006 msgstr "如果任何 <文件> 都不在索引区，视为错误"
7007
7008 #: builtin/ls-files.c:459
7009 msgid "tree-ish"
7010 msgstr "树或提交"
7011
7012 #: builtin/ls-files.c:460
7013 msgid "pretend that paths removed since <tree-ish> are still present"
7014 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7015
7016 #: builtin/ls-files.c:462
7017 msgid "show debugging data"
7018 msgstr "显示调试数据"
7019
7020 #: builtin/ls-tree.c:28
7021 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7022 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7023
7024 #: builtin/ls-tree.c:127
7025 msgid "only show trees"
7026 msgstr "只显示树"
7027
7028 #: builtin/ls-tree.c:129
7029 msgid "recurse into subtrees"
7030 msgstr "递归到子树"
7031
7032 #: builtin/ls-tree.c:131
7033 msgid "show trees when recursing"
7034 msgstr "当递归时显示树"
7035
7036 #: builtin/ls-tree.c:134
7037 msgid "terminate entries with NUL byte"
7038 msgstr "条目以 NUL 字符终止"
7039
7040 #: builtin/ls-tree.c:135
7041 msgid "include object size"
7042 msgstr "包括对象大小"
7043
7044 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
7045 msgid "list only filenames"
7046 msgstr "只列出文件名"
7047
7048 #: builtin/ls-tree.c:142
7049 msgid "use full path names"
7050 msgstr "使用文件的全路径"
7051
7052 #: builtin/ls-tree.c:144
7053 msgid "list entire tree; not just current directory (implies --full-name)"
7054 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
7055
7056 #: builtin/merge.c:45
7057 msgid "git merge [<options>] [<commit>...]"
7058 msgstr "git merge [<选项>] [<提交>...]"
7059
7060 #: builtin/merge.c:46
7061 msgid "git merge [<options>] <msg> HEAD <commit>"
7062 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7063
7064 #: builtin/merge.c:47
7065 msgid "git merge --abort"
7066 msgstr "git merge --abort"
7067
7068 #: builtin/merge.c:100
7069 msgid "switch `m' requires a value"
7070 msgstr "开关 `m' 需要一个值"
7071
7072 #: builtin/merge.c:137
7073 #, c-format
7074 msgid "Could not find merge strategy '%s'.\n"
7075 msgstr "不能找到合并策略 '%s'。\n"
7076
7077 #: builtin/merge.c:138
7078 #, c-format
7079 msgid "Available strategies are:"
7080 msgstr "可用的策略有："
7081
7082 #: builtin/merge.c:143
7083 #, c-format
7084 msgid "Available custom strategies are:"
7085 msgstr "可用的自定义策略有："
7086
7087 #: builtin/merge.c:193
7088 msgid "do not show a diffstat at the end of the merge"
7089 msgstr "在合并的最后不显示差异统计"
7090
7091 #: builtin/merge.c:196
7092 msgid "show a diffstat at the end of the merge"
7093 msgstr "在合并的最后显示差异统计"
7094
7095 #: builtin/merge.c:197
7096 msgid "(synonym to --stat)"
7097 msgstr "（和 --stat 同义）"
7098
7099 #: builtin/merge.c:199
7100 msgid "add (at most <n>) entries from shortlog to merge commit message"
7101 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
7102
7103 #: builtin/merge.c:202
7104 msgid "create a single commit instead of doing a merge"
7105 msgstr "创建一个单独的提交而不是做一次合并"
7106
7107 #: builtin/merge.c:204
7108 msgid "perform a commit if the merge succeeds (default)"
7109 msgstr "如果合并成功，执行一次提交（默认）"
7110
7111 #: builtin/merge.c:206
7112 msgid "edit message before committing"
7113 msgstr "在提交前编辑提交说明"
7114
7115 #: builtin/merge.c:207
7116 msgid "allow fast-forward (default)"
7117 msgstr "允许快进（默认）"
7118
7119 #: builtin/merge.c:209
7120 msgid "abort if fast-forward is not possible"
7121 msgstr "如果不能快进就放弃合并"
7122
7123 #: builtin/merge.c:213
7124 msgid "Verify that the named commit has a valid GPG signature"
7125 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7126
7127 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
7128 msgid "strategy"
7129 msgstr "策略"
7130
7131 #: builtin/merge.c:215
7132 msgid "merge strategy to use"
7133 msgstr "要使用的合并策略"
7134
7135 #: builtin/merge.c:216
7136 msgid "option=value"
7137 msgstr "option=value"
7138
7139 #: builtin/merge.c:217
7140 msgid "option for selected merge strategy"
7141 msgstr "所选的合并策略的选项"
7142
7143 #: builtin/merge.c:219
7144 msgid "merge commit message (for a non-fast-forward merge)"
7145 msgstr "合并的提交说明（针对非快进式合并）"
7146
7147 #: builtin/merge.c:223
7148 msgid "abort the current in-progress merge"
7149 msgstr "放弃当前正在进行的合并"
7150
7151 #: builtin/merge.c:251
7152 msgid "could not run stash."
7153 msgstr "不能进行进度保存。"
7154
7155 #: builtin/merge.c:256
7156 msgid "stash failed"
7157 msgstr "进度保存失败"
7158
7159 #: builtin/merge.c:261
7160 #, c-format
7161 msgid "not a valid object: %s"
7162 msgstr "不是一个有效对象：%s"
7163
7164 #: builtin/merge.c:280 builtin/merge.c:297
7165 msgid "read-tree failed"
7166 msgstr "读取树失败"
7167
7168 #  译者：注意保持前导空格
7169 #: builtin/merge.c:327
7170 msgid " (nothing to squash)"
7171 msgstr " （无可压缩）"
7172
7173 #: builtin/merge.c:340
7174 #, c-format
7175 msgid "Squash commit -- not updating HEAD\n"
7176 msgstr "压缩提交 -- 未更新 HEAD\n"
7177
7178 #: builtin/merge.c:372
7179 msgid "Writing SQUASH_MSG"
7180 msgstr "写入 SQUASH_MSG"
7181
7182 #: builtin/merge.c:374
7183 msgid "Finishing SQUASH_MSG"
7184 msgstr "完成 SQUASH_MSG"
7185
7186 #: builtin/merge.c:397
7187 #, c-format
7188 msgid "No merge message -- not updating HEAD\n"
7189 msgstr "无合并信息 -- 未更新 HEAD\n"
7190
7191 #: builtin/merge.c:447
7192 #, c-format
7193 msgid "'%s' does not point to a commit"
7194 msgstr "'%s' 没有指向一个提交"
7195
7196 #: builtin/merge.c:537
7197 #, c-format
7198 msgid "Bad branch.%s.mergeoptions string: %s"
7199 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
7200
7201 #: builtin/merge.c:632
7202 msgid "git write-tree failed to write a tree"
7203 msgstr "git write-tree 无法写入一树对象"
7204
7205 #: builtin/merge.c:656
7206 msgid "Not handling anything other than two heads merge."
7207 msgstr "不能处理两个头合并之外的任何操作。"
7208
7209 #: builtin/merge.c:670
7210 #, c-format
7211 msgid "Unknown option for merge-recursive: -X%s"
7212 msgstr "merge-recursive 的未知选项：-X%s"
7213
7214 #: builtin/merge.c:683
7215 #, c-format
7216 msgid "unable to write %s"
7217 msgstr "不能写 %s"
7218
7219 #: builtin/merge.c:772
7220 #, c-format
7221 msgid "Could not read from '%s'"
7222 msgstr "不能从 '%s' 读取"
7223
7224 #: builtin/merge.c:781
7225 #, c-format
7226 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7227 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
7228
7229 #: builtin/merge.c:787
7230 #, c-format
7231 msgid ""
7232 "Please enter a commit message to explain why this merge is necessary,\n"
7233 "especially if it merges an updated upstream into a topic branch.\n"
7234 "\n"
7235 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7236 "the commit.\n"
7237 msgstr ""
7238 "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
7239 "合并到主题分支。\n"
7240 "\n"
7241 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
7242
7243 #: builtin/merge.c:811
7244 msgid "Empty commit message."
7245 msgstr "空提交信息。"
7246
7247 #: builtin/merge.c:823
7248 #, c-format
7249 msgid "Wonderful.\n"
7250 msgstr "太棒了。\n"
7251
7252 #: builtin/merge.c:878
7253 #, c-format
7254 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7255 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
7256
7257 #: builtin/merge.c:894
7258 #, c-format
7259 msgid "'%s' is not a commit"
7260 msgstr "'%s' 不是一个提交"
7261
7262 #: builtin/merge.c:935
7263 msgid "No current branch."
7264 msgstr "没有当前分支。"
7265
7266 #: builtin/merge.c:937
7267 msgid "No remote for the current branch."
7268 msgstr "当前分支没有对应的远程仓库。"
7269
7270 #: builtin/merge.c:939
7271 msgid "No default upstream defined for the current branch."
7272 msgstr "当前分支没有定义默认的上游分支。"
7273
7274 #: builtin/merge.c:944
7275 #, c-format
7276 msgid "No remote-tracking branch for %s from %s"
7277 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7278
7279 #: builtin/merge.c:1081
7280 #, c-format
7281 msgid "could not close '%s'"
7282 msgstr "不能关闭 '%s'"
7283
7284 #: builtin/merge.c:1208
7285 msgid "There is no merge to abort (MERGE_HEAD missing)."
7286 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
7287
7288 #: builtin/merge.c:1224
7289 msgid ""
7290 "You have not concluded your merge (MERGE_HEAD exists).\n"
7291 "Please, commit your changes before you merge."
7292 msgstr ""
7293 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
7294 "请在合并前先提交您的修改。"
7295
7296 #: builtin/merge.c:1227 git-pull.sh:74
7297 msgid "You have not concluded your merge (MERGE_HEAD exists)."
7298 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
7299
7300 #: builtin/merge.c:1231
7301 msgid ""
7302 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7303 "Please, commit your changes before you merge."
7304 msgstr ""
7305 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
7306 "请在合并前先提交您的修改。"
7307
7308 #: builtin/merge.c:1234
7309 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7310 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
7311
7312 #: builtin/merge.c:1243
7313 msgid "You cannot combine --squash with --no-ff."
7314 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7315
7316 #: builtin/merge.c:1251
7317 msgid "No commit specified and merge.defaultToUpstream not set."
7318 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7319
7320 #: builtin/merge.c:1268
7321 msgid "Squash commit into empty head not supported yet"
7322 msgstr "尚不支持到空分支的压缩提交"
7323
7324 #: builtin/merge.c:1270
7325 msgid "Non-fast-forward commit does not make sense into an empty head"
7326 msgstr "到空分支的非快进式提交没有意义"
7327
7328 #: builtin/merge.c:1276
7329 #, c-format
7330 msgid "%s - not something we can merge"
7331 msgstr "%s - 不能被合并"
7332
7333 #: builtin/merge.c:1278
7334 msgid "Can merge only exactly one commit into empty head"
7335 msgstr "只能将一个提交合并到空分支上"
7336
7337 #: builtin/merge.c:1333
7338 #, c-format
7339 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7340 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7341
7342 #: builtin/merge.c:1336
7343 #, c-format
7344 msgid "Commit %s has a bad GPG signature allegedly by %s."
7345 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7346
7347 #: builtin/merge.c:1339
7348 #, c-format
7349 msgid "Commit %s does not have a GPG signature."
7350 msgstr "提交 %s 没有一个 GPG 签名。"
7351
7352 #: builtin/merge.c:1342
7353 #, c-format
7354 msgid "Commit %s has a good GPG signature by %s\n"
7355 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7356
7357 #: builtin/merge.c:1423
7358 #, c-format
7359 msgid "Updating %s..%s\n"
7360 msgstr "更新 %s..%s\n"
7361
7362 #: builtin/merge.c:1462
7363 #, c-format
7364 msgid "Trying really trivial in-index merge...\n"
7365 msgstr "尝试非常小的索引内合并...\n"
7366
7367 #: builtin/merge.c:1469
7368 #, c-format
7369 msgid "Nope.\n"
7370 msgstr "无。\n"
7371
7372 #: builtin/merge.c:1501
7373 msgid "Not possible to fast-forward, aborting."
7374 msgstr "无法快进，终止。"
7375
7376 #: builtin/merge.c:1524 builtin/merge.c:1603
7377 #, c-format
7378 msgid "Rewinding the tree to pristine...\n"
7379 msgstr "将树回滚至原始状态...\n"
7380
7381 #: builtin/merge.c:1528
7382 #, c-format
7383 msgid "Trying merge strategy %s...\n"
7384 msgstr "尝试合并策略 %s...\n"
7385
7386 #: builtin/merge.c:1594
7387 #, c-format
7388 msgid "No merge strategy handled the merge.\n"
7389 msgstr "没有合并策略处理此合并。\n"
7390
7391 #: builtin/merge.c:1596
7392 #, c-format
7393 msgid "Merge with strategy %s failed.\n"
7394 msgstr "使用策略 %s 合并失败。\n"
7395
7396 #: builtin/merge.c:1605
7397 #, c-format
7398 msgid "Using the %s to prepare resolving by hand.\n"
7399 msgstr "使用 %s 以准备手工解决。\n"
7400
7401 #: builtin/merge.c:1617
7402 #, c-format
7403 msgid "Automatic merge went well; stopped before committing as requested\n"
7404 msgstr "自动合并进展顺利，按要求在提交前停止\n"
7405
7406 #: builtin/merge-base.c:29
7407 msgid "git merge-base [-a | --all] <commit> <commit>..."
7408 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7409
7410 #: builtin/merge-base.c:30
7411 msgid "git merge-base [-a | --all] --octopus <commit>..."
7412 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7413
7414 #: builtin/merge-base.c:31
7415 msgid "git merge-base --independent <commit>..."
7416 msgstr "git merge-base --independent <提交>..."
7417
7418 #: builtin/merge-base.c:32
7419 msgid "git merge-base --is-ancestor <commit> <commit>"
7420 msgstr "git merge-base --is-ancestor <提交> <提交>"
7421
7422 #: builtin/merge-base.c:33
7423 msgid "git merge-base --fork-point <ref> [<commit>]"
7424 msgstr "git merge-base --fork-point <引用> [<提交>]"
7425
7426 #: builtin/merge-base.c:214
7427 msgid "output all common ancestors"
7428 msgstr "输出所有共同的祖先"
7429
7430 #: builtin/merge-base.c:216
7431 msgid "find ancestors for a single n-way merge"
7432 msgstr "查找一个多路合并的祖先提交"
7433
7434 #: builtin/merge-base.c:218
7435 msgid "list revs not reachable from others"
7436 msgstr "显示不能被其他访问到的版本"
7437
7438 #: builtin/merge-base.c:220
7439 msgid "is the first one ancestor of the other?"
7440 msgstr "第一个是其他的祖先提交么？"
7441
7442 #: builtin/merge-base.c:222
7443 msgid "find where <commit> forked from reflog of <ref>"
7444 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7445
7446 #: builtin/merge-file.c:8
7447 msgid ""
7448 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7449 "<orig-file> <file2>"
7450 msgstr ""
7451 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7452 "件> <文件2>"
7453
7454 #: builtin/merge-file.c:33
7455 msgid "send results to standard output"
7456 msgstr "将结果发送到标准输出"
7457
7458 #: builtin/merge-file.c:34
7459 msgid "use a diff3 based merge"
7460 msgstr "使用基于 diff3 的合并"
7461
7462 #: builtin/merge-file.c:35
7463 msgid "for conflicts, use our version"
7464 msgstr "如果冲突，使用我们的版本"
7465
7466 #: builtin/merge-file.c:37
7467 msgid "for conflicts, use their version"
7468 msgstr "如果冲突，使用他们的版本"
7469
7470 #: builtin/merge-file.c:39
7471 msgid "for conflicts, use a union version"
7472 msgstr "如果冲突，使用联合版本"
7473
7474 #: builtin/merge-file.c:42
7475 msgid "for conflicts, use this marker size"
7476 msgstr "如果冲突，使用指定长度的标记"
7477
7478 #: builtin/merge-file.c:43
7479 msgid "do not warn about conflicts"
7480 msgstr "不要警告冲突"
7481
7482 #: builtin/merge-file.c:45
7483 msgid "set labels for file1/orig-file/file2"
7484 msgstr "为 文件1/初始文件/文件2 设置标签"
7485
7486 #: builtin/mktree.c:64
7487 msgid "git mktree [-z] [--missing] [--batch]"
7488 msgstr "git mktree [-z] [--missing] [--batch]"
7489
7490 #: builtin/mktree.c:150
7491 msgid "input is NUL terminated"
7492 msgstr "输入以 NUL 字符终止"
7493
7494 #: builtin/mktree.c:151 builtin/write-tree.c:24
7495 msgid "allow missing objects"
7496 msgstr "允许丢失的对象"
7497
7498 #: builtin/mktree.c:152
7499 msgid "allow creation of more than one tree"
7500 msgstr "允许创建一个以上的树"
7501
7502 #: builtin/mv.c:15
7503 msgid "git mv [<options>] <source>... <destination>"
7504 msgstr "git mv [<选项>] <源>... <目标>"
7505
7506 #: builtin/mv.c:69
7507 #, c-format
7508 msgid "Directory %s is in index and no submodule?"
7509 msgstr "目录 %s 在索引中并且不是子模组？"
7510
7511 #: builtin/mv.c:71
7512 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7513 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
7514
7515 #: builtin/mv.c:89
7516 #, c-format
7517 msgid "%.*s is in index"
7518 msgstr "%.*s 在索引中"
7519
7520 #: builtin/mv.c:111
7521 msgid "force move/rename even if target exists"
7522 msgstr "强制移动/重命令，即使目标存在"
7523
7524 #: builtin/mv.c:112
7525 msgid "skip move/rename errors"
7526 msgstr "跳过移动/重命名错误"
7527
7528 #: builtin/mv.c:151
7529 #, c-format
7530 msgid "destination '%s' is not a directory"
7531 msgstr "目标 '%s' 不是一个目录"
7532
7533 #: builtin/mv.c:162
7534 #, c-format
7535 msgid "Checking rename of '%s' to '%s'\n"
7536 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7537
7538 #: builtin/mv.c:166
7539 msgid "bad source"
7540 msgstr "坏的源"
7541
7542 #: builtin/mv.c:169
7543 msgid "can not move directory into itself"
7544 msgstr "不能将目录移动到自身"
7545
7546 #: builtin/mv.c:172
7547 msgid "cannot move directory over file"
7548 msgstr "不能将目录移动到文件"
7549
7550 #: builtin/mv.c:181
7551 msgid "source directory is empty"
7552 msgstr "源目录为空"
7553
7554 #: builtin/mv.c:206
7555 msgid "not under version control"
7556 msgstr "不在版本控制之下"
7557
7558 #: builtin/mv.c:209
7559 msgid "destination exists"
7560 msgstr "目标已存在"
7561
7562 #: builtin/mv.c:217
7563 #, c-format
7564 msgid "overwriting '%s'"
7565 msgstr "覆盖 '%s'"
7566
7567 #: builtin/mv.c:220
7568 msgid "Cannot overwrite"
7569 msgstr "不能覆盖"
7570
7571 #: builtin/mv.c:223
7572 msgid "multiple sources for the same target"
7573 msgstr "同一目标具有多个源"
7574
7575 #: builtin/mv.c:225
7576 msgid "destination directory does not exist"
7577 msgstr "目标目录不存在"
7578
7579 #: builtin/mv.c:232
7580 #, c-format
7581 msgid "%s, source=%s, destination=%s"
7582 msgstr "%s，源=%s，目标=%s"
7583
7584 #: builtin/mv.c:253
7585 #, c-format
7586 msgid "Renaming %s to %s\n"
7587 msgstr "重命名 %s 至 %s\n"
7588
7589 #: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
7590 #, c-format
7591 msgid "renaming '%s' failed"
7592 msgstr "重命名 '%s' 失败"
7593
7594 #: builtin/name-rev.c:255
7595 msgid "git name-rev [<options>] <commit>..."
7596 msgstr "git name-rev [<选项>] <提交>..."
7597
7598 #: builtin/name-rev.c:256
7599 msgid "git name-rev [<options>] --all"
7600 msgstr "git name-rev [<选项>] --all"
7601
7602 #: builtin/name-rev.c:257
7603 msgid "git name-rev [<options>] --stdin"
7604 msgstr "git name-rev [<选项>] --stdin"
7605
7606 #: builtin/name-rev.c:309
7607 msgid "print only names (no SHA-1)"
7608 msgstr "只打印名称（无 SHA-1）"
7609
7610 #: builtin/name-rev.c:310
7611 msgid "only use tags to name the commits"
7612 msgstr "只使用标签来命名提交"
7613
7614 #: builtin/name-rev.c:312
7615 msgid "only use refs matching <pattern>"
7616 msgstr "只使用和 <模式> 相匹配的引用"
7617
7618 #: builtin/name-rev.c:314
7619 msgid "list all commits reachable from all refs"
7620 msgstr "列出可以从所有引用访问的提交"
7621
7622 #: builtin/name-rev.c:315
7623 msgid "read from stdin"
7624 msgstr "从标准输入读取"
7625
7626 #: builtin/name-rev.c:316
7627 msgid "allow to print `undefined` names (default)"
7628 msgstr "允许打印 `未定义` 的名称（默认）"
7629
7630 #: builtin/name-rev.c:322
7631 msgid "dereference tags in the input (internal use)"
7632 msgstr "反向解析输入中的标签（内部使用）"
7633
7634 #: builtin/notes.c:24
7635 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7636 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7637
7638 #: builtin/notes.c:25
7639 msgid ""
7640 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7641 "| (-c | -C) <object>] [<object>]"
7642 msgstr ""
7643 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7644 "| (-c | -C) <对象>] [<对象>]"
7645
7646 #: builtin/notes.c:26
7647 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7648 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7649
7650 #: builtin/notes.c:27
7651 msgid ""
7652 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7653 "(-c | -C) <object>] [<object>]"
7654 msgstr ""
7655 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7656 "(-c | -C) <对象>] [<对象>]"
7657
7658 #: builtin/notes.c:28
7659 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7660 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7661
7662 #: builtin/notes.c:29
7663 msgid "git notes [--ref <notes-ref>] show [<object>]"
7664 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7665
7666 #: builtin/notes.c:30
7667 msgid ""
7668 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7669 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7670
7671 #: builtin/notes.c:31
7672 msgid "git notes merge --commit [-v | -q]"
7673 msgstr "git notes merge --commit [-v | -q]"
7674
7675 #: builtin/notes.c:32
7676 msgid "git notes merge --abort [-v | -q]"
7677 msgstr "git notes merge --abort [-v | -q]"
7678
7679 #: builtin/notes.c:33
7680 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7681 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7682
7683 #: builtin/notes.c:34
7684 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7685 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7686
7687 #: builtin/notes.c:35
7688 msgid "git notes [--ref <notes-ref>] get-ref"
7689 msgstr "git notes [--ref <注解引用>] get-ref"
7690
7691 #: builtin/notes.c:40
7692 msgid "git notes [list [<object>]]"
7693 msgstr "git notes [list [<对象>]]"
7694
7695 #: builtin/notes.c:45
7696 msgid "git notes add [<options>] [<object>]"
7697 msgstr "git notes add [<选项>] [<对象>]"
7698
7699 #: builtin/notes.c:50
7700 msgid "git notes copy [<options>] <from-object> <to-object>"
7701 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7702
7703 #: builtin/notes.c:51
7704 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7705 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7706
7707 #: builtin/notes.c:56
7708 msgid "git notes append [<options>] [<object>]"
7709 msgstr "git notes append [<选项>] [<对象>]"
7710
7711 #: builtin/notes.c:61
7712 msgid "git notes edit [<object>]"
7713 msgstr "git notes edit [<对象>]"
7714
7715 #: builtin/notes.c:66
7716 msgid "git notes show [<object>]"
7717 msgstr "git notes show [<对象>]"
7718
7719 #: builtin/notes.c:71
7720 msgid "git notes merge [<options>] <notes-ref>"
7721 msgstr "git notes merge [<选项>] <注解引用>"
7722
7723 #: builtin/notes.c:72
7724 msgid "git notes merge --commit [<options>]"
7725 msgstr "git notes merge --commit [<选项>]"
7726
7727 #: builtin/notes.c:73
7728 msgid "git notes merge --abort [<options>]"
7729 msgstr "git notes merge --abort [<选项>]"
7730
7731 #: builtin/notes.c:78
7732 msgid "git notes remove [<object>]"
7733 msgstr "git notes remove [<对象>]"
7734
7735 #: builtin/notes.c:83
7736 msgid "git notes prune [<options>]"
7737 msgstr "git notes prune [<选项>]"
7738
7739 #: builtin/notes.c:88
7740 msgid "git notes get-ref"
7741 msgstr "git notes get-ref"
7742
7743 #: builtin/notes.c:146
7744 #, c-format
7745 msgid "unable to start 'show' for object '%s'"
7746 msgstr "不能为对象 '%s' 开始 'show'"
7747
7748 #: builtin/notes.c:150
7749 msgid "could not read 'show' output"
7750 msgstr "不能读取 'show' 的输出"
7751
7752 #: builtin/notes.c:158
7753 #, c-format
7754 msgid "failed to finish 'show' for object '%s'"
7755 msgstr "无法为对象 '%s' 完成 'show'"
7756
7757 #: builtin/notes.c:173 builtin/tag.c:477
7758 #, c-format
7759 msgid "could not create file '%s'"
7760 msgstr "不能创建文件 '%s'"
7761
7762 #: builtin/notes.c:192
7763 msgid "Please supply the note contents using either -m or -F option"
7764 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7765
7766 #: builtin/notes.c:201
7767 msgid "unable to write note object"
7768 msgstr "不能写注解对象"
7769
7770 #: builtin/notes.c:203
7771 #, c-format
7772 msgid "The note contents have been left in %s"
7773 msgstr "注解内容被留在 %s 中"
7774
7775 #: builtin/notes.c:231 builtin/tag.c:693
7776 #, c-format
7777 msgid "cannot read '%s'"
7778 msgstr "不能读取 '%s'"
7779
7780 #: builtin/notes.c:233 builtin/tag.c:696
7781 #, c-format
7782 msgid "could not open or read '%s'"
7783 msgstr "不能打开或读取 '%s'"
7784
7785 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7786 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7787 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7788 #: builtin/notes.c:854 builtin/tag.c:709
7789 #, c-format
7790 msgid "Failed to resolve '%s' as a valid ref."
7791 msgstr "无法解析 '%s' 为一个有效引用。"
7792
7793 #: builtin/notes.c:255
7794 #, c-format
7795 msgid "Failed to read object '%s'."
7796 msgstr "无法读取对象 '%s'。"
7797
7798 #: builtin/notes.c:259
7799 #, c-format
7800 msgid "Cannot read note data from non-blob object '%s'."
7801 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7802
7803 #: builtin/notes.c:299
7804 #, c-format
7805 msgid "Malformed input line: '%s'."
7806 msgstr "非法的输入行：'%s'。"
7807
7808 #: builtin/notes.c:314
7809 #, c-format
7810 msgid "Failed to copy notes from '%s' to '%s'"
7811 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7812
7813 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7814 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7815 #: builtin/notes.c:919
7816 msgid "too many parameters"
7817 msgstr "参数太多"
7818
7819 #: builtin/notes.c:371 builtin/notes.c:658
7820 #, c-format
7821 msgid "No note found for object %s."
7822 msgstr "未发现对象 %s 的注解。"
7823
7824 #: builtin/notes.c:392 builtin/notes.c:555
7825 msgid "note contents as a string"
7826 msgstr "注解内容作为一个字符串"
7827
7828 #: builtin/notes.c:395 builtin/notes.c:558
7829 msgid "note contents in a file"
7830 msgstr "注解内容到一个文件中"
7831
7832 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7833 #: builtin/notes.c:563 builtin/tag.c:628
7834 msgid "object"
7835 msgstr "对象"
7836
7837 #: builtin/notes.c:398 builtin/notes.c:561
7838 msgid "reuse and edit specified note object"
7839 msgstr "重用和编辑指定的注解对象"
7840
7841 #: builtin/notes.c:401 builtin/notes.c:564
7842 msgid "reuse specified note object"
7843 msgstr "重用指定的注解对象"
7844
7845 #: builtin/notes.c:404 builtin/notes.c:567
7846 msgid "allow storing empty note"
7847 msgstr "允许保存空白注释"
7848
7849 #: builtin/notes.c:405 builtin/notes.c:476
7850 msgid "replace existing notes"
7851 msgstr "替换已存在的注解"
7852
7853 #: builtin/notes.c:430
7854 #, c-format
7855 msgid ""
7856 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7857 "existing notes"
7858 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7859
7860 #: builtin/notes.c:445 builtin/notes.c:524
7861 #, c-format
7862 msgid "Overwriting existing notes for object %s\n"
7863 msgstr "覆盖对象 %s 现存注解\n"
7864
7865 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7866 #, c-format
7867 msgid "Removing note for object %s\n"
7868 msgstr "删除对象 %s 的注解\n"
7869
7870 #: builtin/notes.c:477
7871 msgid "read objects from stdin"
7872 msgstr "从标准输入读取对象"
7873
7874 #: builtin/notes.c:479
7875 msgid "load rewriting config for <command> (implies --stdin)"
7876 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
7877
7878 #: builtin/notes.c:497
7879 msgid "too few parameters"
7880 msgstr "参数太少"
7881
7882 #: builtin/notes.c:518
7883 #, c-format
7884 msgid ""
7885 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7886 "existing notes"
7887 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7888
7889 #: builtin/notes.c:530
7890 #, c-format
7891 msgid "Missing notes on source object %s. Cannot copy."
7892 msgstr "源对象 %s 缺少注解。不能拷贝。"
7893
7894 #: builtin/notes.c:582
7895 #, c-format
7896 msgid ""
7897 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7898 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7899 msgstr ""
7900 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7901 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7902
7903 #: builtin/notes.c:750
7904 msgid "General options"
7905 msgstr "通用选项"
7906
7907 #: builtin/notes.c:752
7908 msgid "Merge options"
7909 msgstr "合并选项"
7910
7911 #: builtin/notes.c:754
7912 msgid ""
7913 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7914 "cat_sort_uniq)"
7915 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7916
7917 #: builtin/notes.c:756
7918 msgid "Committing unmerged notes"
7919 msgstr "提交未合并的注解"
7920
7921 #: builtin/notes.c:758
7922 msgid "finalize notes merge by committing unmerged notes"
7923 msgstr "通过提交未合并的注解来完成注解合并"
7924
7925 #: builtin/notes.c:760
7926 msgid "Aborting notes merge resolution"
7927 msgstr "中止注解合并的方案"
7928
7929 #: builtin/notes.c:762
7930 msgid "abort notes merge"
7931 msgstr "中止注解合并"
7932
7933 #: builtin/notes.c:857
7934 #, c-format
7935 msgid "Object %s has no note\n"
7936 msgstr "对象 %s 没有注解\n"
7937
7938 #: builtin/notes.c:869
7939 msgid "attempt to remove non-existent note is not an error"
7940 msgstr "尝试删除不存在的注解不是一个错误"
7941
7942 #: builtin/notes.c:872
7943 msgid "read object names from the standard input"
7944 msgstr "从标准输入读取对象名称"
7945
7946 #: builtin/notes.c:953
7947 msgid "notes-ref"
7948 msgstr "注解引用"
7949
7950 #: builtin/notes.c:954
7951 msgid "use notes from <notes-ref>"
7952 msgstr "从 <注解引用> 使用注解"
7953
7954 #: builtin/notes.c:989 builtin/remote.c:1618
7955 #, c-format
7956 msgid "Unknown subcommand: %s"
7957 msgstr "未知子命令：%s"
7958
7959 #: builtin/pack-objects.c:28
7960 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7961 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7962
7963 #: builtin/pack-objects.c:29
7964 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7965 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7966
7967 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7968 #, c-format
7969 msgid "deflate error (%d)"
7970 msgstr "压缩错误 (%d)"
7971
7972 #: builtin/pack-objects.c:771
7973 msgid "Writing objects"
7974 msgstr "写入对象中"
7975
7976 #: builtin/pack-objects.c:1011
7977 msgid "disabling bitmap writing, as some objects are not being packed"
7978 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
7979
7980 #: builtin/pack-objects.c:2171
7981 msgid "Compressing objects"
7982 msgstr "压缩对象中"
7983
7984 #: builtin/pack-objects.c:2568
7985 #, c-format
7986 msgid "unsupported index version %s"
7987 msgstr "不支持的索引版本 %s"
7988
7989 #: builtin/pack-objects.c:2572
7990 #, c-format
7991 msgid "bad index version '%s'"
7992 msgstr "坏的索引版本 '%s'"
7993
7994 #: builtin/pack-objects.c:2595
7995 #, c-format
7996 msgid "option %s does not accept negative form"
7997 msgstr "选项 %s 不接受否定格式"
7998
7999 #: builtin/pack-objects.c:2599
8000 #, c-format
8001 msgid "unable to parse value '%s' for option %s"
8002 msgstr "不能解析选项 %1$s 的值 '%2$s'"
8003
8004 #: builtin/pack-objects.c:2619
8005 msgid "do not show progress meter"
8006 msgstr "不显示进度表"
8007
8008 #: builtin/pack-objects.c:2621
8009 msgid "show progress meter"
8010 msgstr "显示进度表"
8011
8012 #: builtin/pack-objects.c:2623
8013 msgid "show progress meter during object writing phase"
8014 msgstr "在对象写入阶段显示进度表"
8015
8016 #: builtin/pack-objects.c:2626
8017 msgid "similar to --all-progress when progress meter is shown"
8018 msgstr "当进度表显示时类似于 --all-progress"
8019
8020 #: builtin/pack-objects.c:2627
8021 msgid "version[,offset]"
8022 msgstr "版本[,偏移]"
8023
8024 #: builtin/pack-objects.c:2628
8025 msgid "write the pack index file in the specified idx format version"
8026 msgstr "用指定的 idx 格式版本来写包索引文件"
8027
8028 #: builtin/pack-objects.c:2631
8029 msgid "maximum size of each output pack file"
8030 msgstr "每个输出包的最大尺寸"
8031
8032 #: builtin/pack-objects.c:2633
8033 msgid "ignore borrowed objects from alternate object store"
8034 msgstr "忽略从备用对象存储里借用对象"
8035
8036 #: builtin/pack-objects.c:2635
8037 msgid "ignore packed objects"
8038 msgstr "忽略包对象"
8039
8040 #: builtin/pack-objects.c:2637
8041 msgid "limit pack window by objects"
8042 msgstr "限制打包窗口的对象数"
8043
8044 #: builtin/pack-objects.c:2639
8045 msgid "limit pack window by memory in addition to object limit"
8046 msgstr "除对象数量限制外设置打包窗口的内存限制"
8047
8048 #: builtin/pack-objects.c:2641
8049 msgid "maximum length of delta chain allowed in the resulting pack"
8050 msgstr "打包允许的 delta 链的最大长度"
8051
8052 #: builtin/pack-objects.c:2643
8053 msgid "reuse existing deltas"
8054 msgstr "重用已存在的 deltas"
8055
8056 #: builtin/pack-objects.c:2645
8057 msgid "reuse existing objects"
8058 msgstr "重用已存在的对象"
8059
8060 #: builtin/pack-objects.c:2647
8061 msgid "use OFS_DELTA objects"
8062 msgstr "使用 OFS_DELTA 对象"
8063
8064 #: builtin/pack-objects.c:2649
8065 msgid "use threads when searching for best delta matches"
8066 msgstr "使用线程查询最佳 delta 匹配"
8067
8068 #: builtin/pack-objects.c:2651
8069 msgid "do not create an empty pack output"
8070 msgstr "不创建空的包输出"
8071
8072 #: builtin/pack-objects.c:2653
8073 msgid "read revision arguments from standard input"
8074 msgstr "从标准输入读取版本号参数"
8075
8076 #: builtin/pack-objects.c:2655
8077 msgid "limit the objects to those that are not yet packed"
8078 msgstr "限制那些尚未打包的对象"
8079
8080 #: builtin/pack-objects.c:2658
8081 msgid "include objects reachable from any reference"
8082 msgstr "包括可以从任何引用访问到的对象"
8083
8084 #: builtin/pack-objects.c:2661
8085 msgid "include objects referred by reflog entries"
8086 msgstr "包括被引用日志引用到的对象"
8087
8088 #: builtin/pack-objects.c:2664
8089 msgid "include objects referred to by the index"
8090 msgstr "包括被索引引用到的对象"
8091
8092 #: builtin/pack-objects.c:2667
8093 msgid "output pack to stdout"
8094 msgstr "输出包到标准输出"
8095
8096 #: builtin/pack-objects.c:2669
8097 msgid "include tag objects that refer to objects to be packed"
8098 msgstr "包括那些引用了待打包对象的标签对象"
8099
8100 #: builtin/pack-objects.c:2671
8101 msgid "keep unreachable objects"
8102 msgstr "维持不可达的对象"
8103
8104 #: builtin/pack-objects.c:2672 parse-options.h:139
8105 msgid "time"
8106 msgstr "时间"
8107
8108 #: builtin/pack-objects.c:2673
8109 msgid "unpack unreachable objects newer than <time>"
8110 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8111
8112 #: builtin/pack-objects.c:2676
8113 msgid "create thin packs"
8114 msgstr "创建精简包"
8115
8116 #: builtin/pack-objects.c:2678
8117 msgid "create packs suitable for shallow fetches"
8118 msgstr "创建适合浅克隆仓库获取的包"
8119
8120 #: builtin/pack-objects.c:2680
8121 msgid "ignore packs that have companion .keep file"
8122 msgstr "忽略配有 .keep 文件的包"
8123
8124 #: builtin/pack-objects.c:2682
8125 msgid "pack compression level"
8126 msgstr "打包压缩级别"
8127
8128 #: builtin/pack-objects.c:2684
8129 msgid "do not hide commits by grafts"
8130 msgstr "显示被嫁接隐藏的提交"
8131
8132 #: builtin/pack-objects.c:2686
8133 msgid "use a bitmap index if available to speed up counting objects"
8134 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
8135
8136 #: builtin/pack-objects.c:2688
8137 msgid "write a bitmap index together with the pack index"
8138 msgstr "在建立包索引的同时创建 bitmap 索引"
8139
8140 #: builtin/pack-objects.c:2779
8141 msgid "Counting objects"
8142 msgstr "对象计数中"
8143
8144 #: builtin/pack-refs.c:6
8145 msgid "git pack-refs [<options>]"
8146 msgstr "git pack-refs [<选项>]"
8147
8148 #: builtin/pack-refs.c:14
8149 msgid "pack everything"
8150 msgstr "打包一切"
8151
8152 #: builtin/pack-refs.c:15
8153 msgid "prune loose refs (default)"
8154 msgstr "清除松散的引用（默认）"
8155
8156 #: builtin/prune-packed.c:7
8157 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8158 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8159
8160 #: builtin/prune-packed.c:40
8161 msgid "Removing duplicate objects"
8162 msgstr "正在删除重复对象"
8163
8164 #: builtin/prune.c:11
8165 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8166 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8167
8168 #: builtin/prune.c:105 builtin/worktree.c:112
8169 msgid "do not remove, show only"
8170 msgstr "不删除，只显示"
8171
8172 #: builtin/prune.c:106 builtin/worktree.c:113
8173 msgid "report pruned objects"
8174 msgstr "报告清除的对象"
8175
8176 #: builtin/prune.c:109 builtin/worktree.c:115
8177 msgid "expire objects older than <time>"
8178 msgstr "使早于给定时间的对象过期"
8179
8180 #: builtin/push.c:14
8181 msgid "git push [<options>] [<repository> [<refspec>...]]"
8182 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8183
8184 #: builtin/push.c:85
8185 msgid "tag shorthand without <tag>"
8186 msgstr "标签后面未提供 <标签> 参数"
8187
8188 #: builtin/push.c:95
8189 msgid "--delete only accepts plain target ref names"
8190 msgstr "--delete 只接受简单的目标引用名"
8191
8192 #: builtin/push.c:139
8193 msgid ""
8194 "\n"
8195 "To choose either option permanently, see push.default in 'git help config'."
8196 msgstr ""
8197 "\n"
8198 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
8199
8200 #: builtin/push.c:142
8201 #, c-format
8202 msgid ""
8203 "The upstream branch of your current branch does not match\n"
8204 "the name of your current branch.  To push to the upstream branch\n"
8205 "on the remote, use\n"
8206 "\n"
8207 "    git push %s HEAD:%s\n"
8208 "\n"
8209 "To push to the branch of the same name on the remote, use\n"
8210 "\n"
8211 "    git push %s %s\n"
8212 "%s"
8213 msgstr ""
8214 "如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
8215 "上游分支，使用\n"
8216 "\n"
8217 "    git push %s HEAD:%s\n"
8218 "\n"
8219 "为推送至远程同名分支，使用\n"
8220 "\n"
8221 "    git push %s %s\n"
8222 "%s"
8223
8224 #: builtin/push.c:157
8225 #, c-format
8226 msgid ""
8227 "You are not currently on a branch.\n"
8228 "To push the history leading to the current (detached HEAD)\n"
8229 "state now, use\n"
8230 "\n"
8231 "    git push %s HEAD:<name-of-remote-branch>\n"
8232 msgstr ""
8233 "您当前不在一个分支上。\n"
8234 "现在为推送当前（分离头指针）的历史，使用\n"
8235 "\n"
8236 "    git push %s HEAD:<远程分支名字>\n"
8237
8238 #: builtin/push.c:171
8239 #, c-format
8240 msgid ""
8241 "The current branch %s has no upstream branch.\n"
8242 "To push the current branch and set the remote as upstream, use\n"
8243 "\n"
8244 "    git push --set-upstream %s %s\n"
8245 msgstr ""
8246 "当前分支 %s 没有对应的上游分支。\n"
8247 "为推送当前分支并建立与远程上游的跟踪，使用\n"
8248 "\n"
8249 "    git push --set-upstream %s %s\n"
8250
8251 #: builtin/push.c:179
8252 #, c-format
8253 msgid "The current branch %s has multiple upstream branches, refusing to push."
8254 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
8255
8256 #: builtin/push.c:182
8257 #, c-format
8258 msgid ""
8259 "You are pushing to remote '%s', which is not the upstream of\n"
8260 "your current branch '%s', without telling me what to push\n"
8261 "to update which remote branch."
8262 msgstr ""
8263 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
8264 "而没有告诉我要推送什么、更新哪个远程分支。"
8265
8266 #  译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
8267 #: builtin/push.c:205
8268 msgid ""
8269 "push.default is unset; its implicit value has changed in\n"
8270 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8271 "and maintain the traditional behavior, use:\n"
8272 "\n"
8273 "  git config --global push.default matching\n"
8274 "\n"
8275 "To squelch this message and adopt the new behavior now, use:\n"
8276 "\n"
8277 "  git config --global push.default simple\n"
8278 "\n"
8279 "When push.default is set to 'matching', git will push local branches\n"
8280 "to the remote branches that already exist with the same name.\n"
8281 "\n"
8282 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8283 "behavior, which only pushes the current branch to the corresponding\n"
8284 "remote branch that 'git pull' uses to update the current branch.\n"
8285 "\n"
8286 "See 'git help config' and search for 'push.default' for further "
8287 "information.\n"
8288 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8289 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8290 msgstr ""
8291 "push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n"
8292 "变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"
8293 "\n"
8294 "  git config --global push.default matching\n"
8295 "\n"
8296 "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
8297 "\n"
8298 "  git config --global push.default simple\n"
8299 "\n"
8300 "当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n"
8301 "本地分支。\n"
8302 "\n"
8303 "从 Git 2.0 开始，Git 默认采用更为保守的 'simple' 模式，只推送当前\n"
8304 "分支到远程关联的同名分支，即 'git push' 推送当前分支。\n"
8305 "\n"
8306 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8307 "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
8308 "为保持兼容，请用 'current' 代替 'simple'）"
8309
8310 #: builtin/push.c:272
8311 msgid ""
8312 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8313 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
8314
8315 #: builtin/push.c:279
8316 msgid ""
8317 "Updates were rejected because the tip of your current branch is behind\n"
8318 "its remote counterpart. Integrate the remote changes (e.g.\n"
8319 "'git pull ...') before pushing again.\n"
8320 "See the 'Note about fast-forwards' in 'git push --help' for details."
8321 msgstr ""
8322 "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
8323 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
8324 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8325
8326 #: builtin/push.c:285
8327 msgid ""
8328 "Updates were rejected because a pushed branch tip is behind its remote\n"
8329 "counterpart. Check out this branch and integrate the remote changes\n"
8330 "(e.g. 'git pull ...') before pushing again.\n"
8331 "See the 'Note about fast-forwards' in 'git push --help' for details."
8332 msgstr ""
8333 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8334 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
8335 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8336
8337 #: builtin/push.c:291
8338 msgid ""
8339 "Updates were rejected because the remote contains work that you do\n"
8340 "not have locally. This is usually caused by another repository pushing\n"
8341 "to the same ref. You may want to first integrate the remote changes\n"
8342 "(e.g., 'git pull ...') before pushing again.\n"
8343 "See the 'Note about fast-forwards' in 'git push --help' for details."
8344 msgstr ""
8345 "更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8346 "一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
8347 "（如 'git pull ...'）。\n"
8348 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8349
8350 #: builtin/push.c:298
8351 msgid "Updates were rejected because the tag already exists in the remote."
8352 msgstr "更新被拒绝，因为该标签在远程已经存在。"
8353
8354 #: builtin/push.c:301
8355 msgid ""
8356 "You cannot update a remote ref that points at a non-commit object,\n"
8357 "or update a remote ref to make it point at a non-commit object,\n"
8358 "without using the '--force' option.\n"
8359 msgstr ""
8360 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
8361 "也不能更新远程引用让其指向一个非提交对象。\n"
8362
8363 #: builtin/push.c:360
8364 #, c-format
8365 msgid "Pushing to %s\n"
8366 msgstr "推送到 %s\n"
8367
8368 #: builtin/push.c:364
8369 #, c-format
8370 msgid "failed to push some refs to '%s'"
8371 msgstr "无法推送一些引用到 '%s'"
8372
8373 #: builtin/push.c:394
8374 #, c-format
8375 msgid "bad repository '%s'"
8376 msgstr "坏的仓库 '%s'"
8377
8378 #: builtin/push.c:395
8379 msgid ""
8380 "No configured push destination.\n"
8381 "Either specify the URL from the command-line or configure a remote "
8382 "repository using\n"
8383 "\n"
8384 "    git remote add <name> <url>\n"
8385 "\n"
8386 "and then push using the remote name\n"
8387 "\n"
8388 "    git push <name>\n"
8389 msgstr ""
8390 "没有配置推送目标。\n"
8391 "或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
8392 "\n"
8393 "    git remote add <名称> <地址>\n"
8394 "\n"
8395 "然后使用该远程仓库名执行推送\n"
8396 "\n"
8397 "    git push <名称>\n"
8398
8399 #: builtin/push.c:410
8400 msgid "--all and --tags are incompatible"
8401 msgstr "--all 和 --tags 不兼容"
8402
8403 #: builtin/push.c:411
8404 msgid "--all can't be combined with refspecs"
8405 msgstr "--all 不能和引用规格同时使用"
8406
8407 #: builtin/push.c:416
8408 msgid "--mirror and --tags are incompatible"
8409 msgstr "--mirror 和 --tags 不兼容"
8410
8411 #: builtin/push.c:417
8412 msgid "--mirror can't be combined with refspecs"
8413 msgstr "--mirror 不能和引用规格同时使用"
8414
8415 #: builtin/push.c:422
8416 msgid "--all and --mirror are incompatible"
8417 msgstr "--all 和 --mirror 不兼容"
8418
8419 #: builtin/push.c:502
8420 msgid "repository"
8421 msgstr "仓库"
8422
8423 #: builtin/push.c:503
8424 msgid "push all refs"
8425 msgstr "推送所有引用"
8426
8427 #: builtin/push.c:504
8428 msgid "mirror all refs"
8429 msgstr "镜像所有引用"
8430
8431 #: builtin/push.c:506
8432 msgid "delete refs"
8433 msgstr "删除引用"
8434
8435 #: builtin/push.c:507
8436 msgid "push tags (can't be used with --all or --mirror)"
8437 msgstr "推送标签（不能使用 --all or --mirror）"
8438
8439 #: builtin/push.c:510
8440 msgid "force updates"
8441 msgstr "强制更新"
8442
8443 #: builtin/push.c:512
8444 msgid "refname>:<expect"
8445 msgstr "引用名>:<期望值"
8446
8447 #: builtin/push.c:513
8448 msgid "require old value of ref to be at this value"
8449 msgstr "要求引用旧的取值为设定值"
8450
8451 #: builtin/push.c:516
8452 msgid "control recursive pushing of submodules"
8453 msgstr "控制子模组的递归推送"
8454
8455 #: builtin/push.c:518
8456 msgid "use thin pack"
8457 msgstr "使用精简打包"
8458
8459 #: builtin/push.c:519 builtin/push.c:520
8460 msgid "receive pack program"
8461 msgstr "接收包程序"
8462
8463 #: builtin/push.c:521
8464 msgid "set upstream for git pull/status"
8465 msgstr "设置 git pull/status 的上游"
8466
8467 #: builtin/push.c:524
8468 msgid "prune locally removed refs"
8469 msgstr "清除本地删除的引用"
8470
8471 #: builtin/push.c:526
8472 msgid "bypass pre-push hook"
8473 msgstr "绕过 pre-push 钩子"
8474
8475 #: builtin/push.c:527
8476 msgid "push missing but relevant tags"
8477 msgstr "推送缺失但有关的标签"
8478
8479 #: builtin/push.c:529
8480 msgid "GPG sign the push"
8481 msgstr "用 GPG 为推送签名"
8482
8483 #: builtin/push.c:530
8484 msgid "request atomic transaction on remote side"
8485 msgstr "需要远端支持原子事务"
8486
8487 #: builtin/push.c:539
8488 msgid "--delete is incompatible with --all, --mirror and --tags"
8489 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8490
8491 #: builtin/push.c:541
8492 msgid "--delete doesn't make sense without any refs"
8493 msgstr "--delete 未接任何引用没有意义"
8494
8495 #: builtin/read-tree.c:37
8496 msgid ""
8497 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8498 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8499 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8500 msgstr ""
8501 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8502 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8503 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8504
8505 #: builtin/read-tree.c:110
8506 msgid "write resulting index to <file>"
8507 msgstr "将索引结果写入 <文件>"
8508
8509 #: builtin/read-tree.c:113
8510 msgid "only empty the index"
8511 msgstr "只是清空索引"
8512
8513 #: builtin/read-tree.c:115
8514 msgid "Merging"
8515 msgstr "合并"
8516
8517 #: builtin/read-tree.c:117
8518 msgid "perform a merge in addition to a read"
8519 msgstr "读取之余再执行一个合并"
8520
8521 #: builtin/read-tree.c:119
8522 msgid "3-way merge if no file level merging required"
8523 msgstr "如果没有文件级合并需要，执行三方合并"
8524
8525 #: builtin/read-tree.c:121
8526 msgid "3-way merge in presence of adds and removes"
8527 msgstr "存在添加和删除时，也执行三方合并"
8528
8529 #: builtin/read-tree.c:123
8530 msgid "same as -m, but discard unmerged entries"
8531 msgstr "类似于 -m，但丢弃未合并的条目"
8532
8533 #: builtin/read-tree.c:124
8534 msgid "<subdirectory>/"
8535 msgstr "<子目录>/"
8536
8537 #: builtin/read-tree.c:125
8538 msgid "read the tree into the index under <subdirectory>/"
8539 msgstr "读取树对象到索引的 <子目录>/ 下"
8540
8541 #: builtin/read-tree.c:128
8542 msgid "update working tree with merge result"
8543 msgstr "用合并的结果更新工作区"
8544
8545 #: builtin/read-tree.c:130
8546 msgid "gitignore"
8547 msgstr "gitignore"
8548
8549 #: builtin/read-tree.c:131
8550 msgid "allow explicitly ignored files to be overwritten"
8551 msgstr "允许忽略文件中设定的文件可以被覆盖"
8552
8553 #: builtin/read-tree.c:134
8554 msgid "don't check the working tree after merging"
8555 msgstr "合并后不检查工作区"
8556
8557 #: builtin/read-tree.c:135
8558 msgid "don't update the index or the work tree"
8559 msgstr "不更新索引区和工作区"
8560
8561 #: builtin/read-tree.c:137
8562 msgid "skip applying sparse checkout filter"
8563 msgstr "跳过应用稀疏检出过滤器"
8564
8565 #: builtin/read-tree.c:139
8566 msgid "debug unpack-trees"
8567 msgstr "调试 unpack-trees"
8568
8569 #: builtin/reflog.c:430
8570 #, c-format
8571 msgid "%s' for '%s' is not a valid timestamp"
8572 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8573
8574 #: builtin/reflog.c:547 builtin/reflog.c:552
8575 #, c-format
8576 msgid "'%s' is not a valid timestamp"
8577 msgstr "'%s' 不是一个有效的时间戳"
8578
8579 #: builtin/remote.c:12
8580 msgid "git remote [-v | --verbose]"
8581 msgstr "git remote [-v | --verbose]"
8582
8583 #: builtin/remote.c:13
8584 msgid ""
8585 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8586 "mirror=<fetch|push>] <name> <url>"
8587 msgstr ""
8588 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8589 "mirror=<fetch|push>] <名称> <地址>"
8590
8591 #: builtin/remote.c:14 builtin/remote.c:33
8592 msgid "git remote rename <old> <new>"
8593 msgstr "git remote rename <旧名称> <新名称>"
8594
8595 #: builtin/remote.c:15 builtin/remote.c:38
8596 msgid "git remote remove <name>"
8597 msgstr "git remote remove <名称>"
8598
8599 #: builtin/remote.c:16 builtin/remote.c:43
8600 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8601 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8602
8603 #: builtin/remote.c:17
8604 msgid "git remote [-v | --verbose] show [-n] <name>"
8605 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8606
8607 #: builtin/remote.c:18
8608 msgid "git remote prune [-n | --dry-run] <name>"
8609 msgstr "git remote prune [-n | --dry-run] <名称>"
8610
8611 #: builtin/remote.c:19
8612 msgid ""
8613 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8614 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8615
8616 #: builtin/remote.c:20
8617 msgid "git remote set-branches [--add] <name> <branch>..."
8618 msgstr "git remote set-branches [--add] <名称> <分支>..."
8619
8620 #: builtin/remote.c:21 builtin/remote.c:69
8621 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8622 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8623
8624 #: builtin/remote.c:22 builtin/remote.c:70
8625 msgid "git remote set-url --add <name> <newurl>"
8626 msgstr "git remote set-url --add <名称> <新的地址>"
8627
8628 #: builtin/remote.c:23 builtin/remote.c:71
8629 msgid "git remote set-url --delete <name> <url>"
8630 msgstr "git remote set-url --delete <名称> <地址>"
8631
8632 #: builtin/remote.c:28
8633 msgid "git remote add [<options>] <name> <url>"
8634 msgstr "git remote add [<选项>] <名称> <地址>"
8635
8636 #: builtin/remote.c:48
8637 msgid "git remote set-branches <name> <branch>..."
8638 msgstr "git remote set-branches <名称> <分支>..."
8639
8640 #: builtin/remote.c:49
8641 msgid "git remote set-branches --add <name> <branch>..."
8642 msgstr "git remote set-branches --add <名称> <分支>..."
8643
8644 #: builtin/remote.c:54
8645 msgid "git remote show [<options>] <name>"
8646 msgstr "git remote show [<选项>] <名称>"
8647
8648 #: builtin/remote.c:59
8649 msgid "git remote prune [<options>] <name>"
8650 msgstr "git remote prune [<选项>] <名称>"
8651
8652 #: builtin/remote.c:64
8653 msgid "git remote update [<options>] [<group> | <remote>]..."
8654 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8655
8656 #: builtin/remote.c:88
8657 #, c-format
8658 msgid "Updating %s"
8659 msgstr "更新 %s 中"
8660
8661 #: builtin/remote.c:120
8662 msgid ""
8663 "--mirror is dangerous and deprecated; please\n"
8664 "\t use --mirror=fetch or --mirror=push instead"
8665 msgstr ""
8666 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
8667 "\t 或 --mirror=push"
8668
8669 #: builtin/remote.c:137
8670 #, c-format
8671 msgid "unknown mirror argument: %s"
8672 msgstr "未知的镜像参数：%s"
8673
8674 #: builtin/remote.c:153
8675 msgid "fetch the remote branches"
8676 msgstr "抓取远程的分支"
8677
8678 #: builtin/remote.c:155
8679 msgid "import all tags and associated objects when fetching"
8680 msgstr "抓取时导入所有的标签和关联对象"
8681
8682 #: builtin/remote.c:158
8683 msgid "or do not fetch any tag at all (--no-tags)"
8684 msgstr "或不抓取任何标签（--no-tags）"
8685
8686 #: builtin/remote.c:160
8687 msgid "branch(es) to track"
8688 msgstr "跟踪的分支"
8689
8690 #: builtin/remote.c:161
8691 msgid "master branch"
8692 msgstr "主线分支"
8693
8694 #: builtin/remote.c:162
8695 msgid "push|fetch"
8696 msgstr "push|fetch"
8697
8698 #: builtin/remote.c:163
8699 msgid "set up remote as a mirror to push to or fetch from"
8700 msgstr "把远程设置为用以推送或抓取的镜像"
8701
8702 #: builtin/remote.c:175
8703 msgid "specifying a master branch makes no sense with --mirror"
8704 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8705
8706 #: builtin/remote.c:177
8707 msgid "specifying branches to track makes sense only with fetch mirrors"
8708 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8709
8710 #: builtin/remote.c:187 builtin/remote.c:640
8711 #, c-format
8712 msgid "remote %s already exists."
8713 msgstr "远程 %s 已经存在。"
8714
8715 #: builtin/remote.c:191 builtin/remote.c:644
8716 #, c-format
8717 msgid "'%s' is not a valid remote name"
8718 msgstr "'%s' 不是一个有效的远程名称"
8719
8720 #: builtin/remote.c:235
8721 #, c-format
8722 msgid "Could not setup master '%s'"
8723 msgstr "无法设置 master '%s'"
8724
8725 #: builtin/remote.c:335
8726 #, c-format
8727 msgid "Could not get fetch map for refspec %s"
8728 msgstr "无法得到引用规格 %s 的获取列表"
8729
8730 #: builtin/remote.c:436 builtin/remote.c:444
8731 msgid "(matching)"
8732 msgstr "（匹配）"
8733
8734 #: builtin/remote.c:448
8735 msgid "(delete)"
8736 msgstr "（删除）"
8737
8738 #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8739 #, c-format
8740 msgid "Could not append '%s' to '%s'"
8741 msgstr "不能添加 '%s' 至 '%s'"
8742
8743 #: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
8744 #, c-format
8745 msgid "No such remote: %s"
8746 msgstr "没有这样的远程：%s"
8747
8748 #: builtin/remote.c:650
8749 #, c-format
8750 msgid "Could not rename config section '%s' to '%s'"
8751 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8752
8753 #: builtin/remote.c:656 builtin/remote.c:844
8754 #, c-format
8755 msgid "Could not remove config section '%s'"
8756 msgstr "不能移除配置小节 '%s'"
8757
8758 #: builtin/remote.c:671
8759 #, c-format
8760 msgid ""
8761 "Not updating non-default fetch refspec\n"
8762 "\t%s\n"
8763 "\tPlease update the configuration manually if necessary."
8764 msgstr ""
8765 "没有更新非默认的获取引用规格\n"
8766 "\t%s\n"
8767 "\t如果必要请手动更新配置。"
8768
8769 #: builtin/remote.c:677
8770 #, c-format
8771 msgid "Could not append '%s'"
8772 msgstr "不能追加 '%s'"
8773
8774 #: builtin/remote.c:688
8775 #, c-format
8776 msgid "Could not set '%s'"
8777 msgstr "不能设置 '%s'"
8778
8779 #: builtin/remote.c:710
8780 #, c-format
8781 msgid "deleting '%s' failed"
8782 msgstr "删除 '%s' 失败"
8783
8784 #: builtin/remote.c:744
8785 #, c-format
8786 msgid "creating '%s' failed"
8787 msgstr "创建 '%s' 失败"
8788
8789 #: builtin/remote.c:763
8790 #, c-format
8791 msgid "Could not remove branch %s"
8792 msgstr "无法移除分支 %s"
8793
8794 #: builtin/remote.c:830
8795 msgid ""
8796 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8797 "to delete it, use:"
8798 msgid_plural ""
8799 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8800 "to delete them, use:"
8801 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
8802 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
8803
8804 #: builtin/remote.c:945
8805 #, c-format
8806 msgid " new (next fetch will store in remotes/%s)"
8807 msgstr " 新的（下一次获取将存储于 remotes/%s）"
8808
8809 #: builtin/remote.c:948
8810 msgid " tracked"
8811 msgstr " 已跟踪"
8812
8813 #: builtin/remote.c:950
8814 msgid " stale (use 'git remote prune' to remove)"
8815 msgstr " 过时（使用 'git remote prune' 来移除）"
8816
8817 #: builtin/remote.c:952
8818 msgid " ???"
8819 msgstr " ???"
8820
8821 #: builtin/remote.c:993
8822 #, c-format
8823 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8824 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
8825
8826 #: builtin/remote.c:1000
8827 #, c-format
8828 msgid "rebases onto remote %s"
8829 msgstr "变基到远程 %s"
8830
8831 #: builtin/remote.c:1003
8832 #, c-format
8833 msgid " merges with remote %s"
8834 msgstr " 与远程 %s 合并"
8835
8836 #: builtin/remote.c:1004
8837 msgid "    and with remote"
8838 msgstr "    且有远程"
8839
8840 #: builtin/remote.c:1006
8841 #, c-format
8842 msgid "merges with remote %s"
8843 msgstr "与远程 %s 合并"
8844
8845 #: builtin/remote.c:1007
8846 msgid "   and with remote"
8847 msgstr "   且有远程"
8848
8849 #: builtin/remote.c:1053
8850 msgid "create"
8851 msgstr "创建"
8852
8853 #: builtin/remote.c:1056
8854 msgid "delete"
8855 msgstr "删除"
8856
8857 #: builtin/remote.c:1060
8858 msgid "up to date"
8859 msgstr "最新"
8860
8861 #: builtin/remote.c:1063
8862 msgid "fast-forwardable"
8863 msgstr "可快进"
8864
8865 #: builtin/remote.c:1066
8866 msgid "local out of date"
8867 msgstr "本地已过时"
8868
8869 #: builtin/remote.c:1073
8870 #, c-format
8871 msgid "    %-*s forces to %-*s (%s)"
8872 msgstr "    %-*s 强制推送至 %-*s (%s)"
8873
8874 #: builtin/remote.c:1076
8875 #, c-format
8876 msgid "    %-*s pushes to %-*s (%s)"
8877 msgstr "    %-*s 推送至 %-*s (%s)"
8878
8879 #: builtin/remote.c:1080
8880 #, c-format
8881 msgid "    %-*s forces to %s"
8882 msgstr "    %-*s 强制推送至 %s"
8883
8884 #: builtin/remote.c:1083
8885 #, c-format
8886 msgid "    %-*s pushes to %s"
8887 msgstr "    %-*s 推送至 %s"
8888
8889 #: builtin/remote.c:1151
8890 msgid "do not query remotes"
8891 msgstr "不查询远程"
8892
8893 #: builtin/remote.c:1178
8894 #, c-format
8895 msgid "* remote %s"
8896 msgstr "* 远程 %s"
8897
8898 #: builtin/remote.c:1179
8899 #, c-format
8900 msgid "  Fetch URL: %s"
8901 msgstr "  获取地址：%s"
8902
8903 #: builtin/remote.c:1180 builtin/remote.c:1331
8904 msgid "(no URL)"
8905 msgstr "(无 URL)"
8906
8907 #: builtin/remote.c:1189 builtin/remote.c:1191
8908 #, c-format
8909 msgid "  Push  URL: %s"
8910 msgstr "  推送地址：%s"
8911
8912 #: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8913 #, c-format
8914 msgid "  HEAD branch: %s"
8915 msgstr "  HEAD 分支：%s"
8916
8917 #: builtin/remote.c:1199
8918 #, c-format
8919 msgid ""
8920 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8921 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
8922
8923 #: builtin/remote.c:1211
8924 #, c-format
8925 msgid "  Remote branch:%s"
8926 msgid_plural "  Remote branches:%s"
8927 msgstr[0] "  远程分支：%s"
8928 msgstr[1] "  远程分支：%s"
8929
8930 #  译者：中文字符串拼接，可删除前导空格
8931 #: builtin/remote.c:1214 builtin/remote.c:1241
8932 msgid " (status not queried)"
8933 msgstr "（状态未查询）"
8934
8935 #: builtin/remote.c:1223
8936 msgid "  Local branch configured for 'git pull':"
8937 msgid_plural "  Local branches configured for 'git pull':"
8938 msgstr[0] "  为 'git pull' 配置的本地分支："
8939 msgstr[1] "  为 'git pull' 配置的本地分支："
8940
8941 #: builtin/remote.c:1231
8942 msgid "  Local refs will be mirrored by 'git push'"
8943 msgstr "  本地引用将在 'git push' 时被镜像"
8944
8945 #: builtin/remote.c:1238
8946 #, c-format
8947 msgid "  Local ref configured for 'git push'%s:"
8948 msgid_plural "  Local refs configured for 'git push'%s:"
8949 msgstr[0] "  为 'git push' 配置的本地引用%s："
8950 msgstr[1] "  为 'git push' 配置的本地引用%s："
8951
8952 #: builtin/remote.c:1259
8953 msgid "set refs/remotes/<name>/HEAD according to remote"
8954 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8955
8956 #: builtin/remote.c:1261
8957 msgid "delete refs/remotes/<name>/HEAD"
8958 msgstr "删除 refs/remotes/<名称>/HEAD"
8959
8960 #: builtin/remote.c:1276
8961 msgid "Cannot determine remote HEAD"
8962 msgstr "无法确定远程 HEAD"
8963
8964 #: builtin/remote.c:1278
8965 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8966 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
8967
8968 #: builtin/remote.c:1288
8969 #, c-format
8970 msgid "Could not delete %s"
8971 msgstr "无法删除 %s"
8972
8973 #: builtin/remote.c:1296
8974 #, c-format
8975 msgid "Not a valid ref: %s"
8976 msgstr "不是一个有效引用：%s"
8977
8978 #: builtin/remote.c:1298
8979 #, c-format
8980 msgid "Could not setup %s"
8981 msgstr "不能设置 %s"
8982
8983 #  译者：注意保持前导空格
8984 #: builtin/remote.c:1316
8985 #, c-format
8986 msgid " %s will become dangling!"
8987 msgstr " %s 将成为摇摆状态！"
8988
8989 #  译者：注意保持前导空格
8990 #: builtin/remote.c:1317
8991 #, c-format
8992 msgid " %s has become dangling!"
8993 msgstr " %s 已成为摇摆状态！"
8994
8995 #: builtin/remote.c:1327
8996 #, c-format
8997 msgid "Pruning %s"
8998 msgstr "修剪 %s"
8999
9000 #: builtin/remote.c:1328
9001 #, c-format
9002 msgid "URL: %s"
9003 msgstr "URL：%s"
9004
9005 #: builtin/remote.c:1351
9006 #, c-format
9007 msgid " * [would prune] %s"
9008 msgstr " * [将删除] %s"
9009
9010 #: builtin/remote.c:1354
9011 #, c-format
9012 msgid " * [pruned] %s"
9013 msgstr " * [已删除] %s"
9014
9015 #: builtin/remote.c:1399
9016 msgid "prune remotes after fetching"
9017 msgstr "抓取后清除远程"
9018
9019 #: builtin/remote.c:1465 builtin/remote.c:1539
9020 #, c-format
9021 msgid "No such remote '%s'"
9022 msgstr "没有此远程 '%s'"
9023
9024 #: builtin/remote.c:1485
9025 msgid "add branch"
9026 msgstr "添加分支"
9027
9028 #: builtin/remote.c:1492
9029 msgid "no remote specified"
9030 msgstr "未指定远程"
9031
9032 #: builtin/remote.c:1514
9033 msgid "manipulate push URLs"
9034 msgstr "操作推送 URLS"
9035
9036 #: builtin/remote.c:1516
9037 msgid "add URL"
9038 msgstr "添加 URL"
9039
9040 #: builtin/remote.c:1518
9041 msgid "delete URLs"
9042 msgstr "删除 URLS"
9043
9044 #: builtin/remote.c:1525
9045 msgid "--add --delete doesn't make sense"
9046 msgstr "--add --delete 无意义"
9047
9048 #: builtin/remote.c:1565
9049 #, c-format
9050 msgid "Invalid old URL pattern: %s"
9051 msgstr "无效的旧 URL 匹配模版：%s"
9052
9053 #: builtin/remote.c:1573
9054 #, c-format
9055 msgid "No such URL found: %s"
9056 msgstr "未找到此 URL：%s"
9057
9058 #: builtin/remote.c:1575
9059 msgid "Will not delete all non-push URLs"
9060 msgstr "将不会删除所有非推送 URL 地址"
9061
9062 #: builtin/remote.c:1589
9063 msgid "be verbose; must be placed before a subcommand"
9064 msgstr "冗长输出；必须置于子命令之前"
9065
9066 #: builtin/repack.c:17
9067 msgid "git repack [<options>]"
9068 msgstr "git repack [<选项>]"
9069
9070 #: builtin/repack.c:159
9071 msgid "pack everything in a single pack"
9072 msgstr "所有内容打包到一个包文件中"
9073
9074 #: builtin/repack.c:161
9075 msgid "same as -a, and turn unreachable objects loose"
9076 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
9077
9078 #: builtin/repack.c:164
9079 msgid "remove redundant packs, and run git-prune-packed"
9080 msgstr "删除多余的包，运行 git-prune-packed"
9081
9082 #: builtin/repack.c:166
9083 msgid "pass --no-reuse-delta to git-pack-objects"
9084 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9085
9086 #: builtin/repack.c:168
9087 msgid "pass --no-reuse-object to git-pack-objects"
9088 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9089
9090 #: builtin/repack.c:170
9091 msgid "do not run git-update-server-info"
9092 msgstr "不运行 git-update-server-info"
9093
9094 #: builtin/repack.c:173
9095 msgid "pass --local to git-pack-objects"
9096 msgstr "向 git-pack-objects 传递参数 --local"
9097
9098 #: builtin/repack.c:175
9099 msgid "write bitmap index"
9100 msgstr "写 bitmap 索引"
9101
9102 #: builtin/repack.c:176
9103 msgid "approxidate"
9104 msgstr "近似日期"
9105
9106 #: builtin/repack.c:177
9107 msgid "with -A, do not loosen objects older than this"
9108 msgstr "使用 -A，不要将早于给定时间的对象过期"
9109
9110 #: builtin/repack.c:179
9111 msgid "size of the window used for delta compression"
9112 msgstr "用于增量压缩的窗口值"
9113
9114 #: builtin/repack.c:180 builtin/repack.c:184
9115 msgid "bytes"
9116 msgstr "字节"
9117
9118 #: builtin/repack.c:181
9119 msgid "same as the above, but limit memory size instead of entries count"
9120 msgstr "和上面的相似，但限制内存大小而非条目数"
9121
9122 #: builtin/repack.c:183
9123 msgid "limits the maximum delta depth"
9124 msgstr "限制最大增量深度"
9125
9126 #: builtin/repack.c:185
9127 msgid "maximum size of each packfile"
9128 msgstr "每个包文件的最大尺寸"
9129
9130 #: builtin/repack.c:187
9131 msgid "repack objects in packs marked with .keep"
9132 msgstr "对标记为 .keep 的包中的对象重新打包"
9133
9134 #: builtin/repack.c:377
9135 #, c-format
9136 msgid "removing '%s' failed"
9137 msgstr "删除 '%s' 失败"
9138
9139 #: builtin/replace.c:19
9140 msgid "git replace [-f] <object> <replacement>"
9141 msgstr "git replace [-f] <对象> <替换物>"
9142
9143 #: builtin/replace.c:20
9144 msgid "git replace [-f] --edit <object>"
9145 msgstr "git replace [-f] --edit <对象>"
9146
9147 #: builtin/replace.c:21
9148 msgid "git replace [-f] --graft <commit> [<parent>...]"
9149 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9150
9151 #: builtin/replace.c:22
9152 msgid "git replace -d <object>..."
9153 msgstr "git replace -d <对象>..."
9154
9155 #: builtin/replace.c:23
9156 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9157 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9158
9159 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9160 #, c-format
9161 msgid "Not a valid object name: '%s'"
9162 msgstr "不是一个有效的对象名：'%s'"
9163
9164 #: builtin/replace.c:355
9165 #, c-format
9166 msgid "bad mergetag in commit '%s'"
9167 msgstr "提交 '%s' 中含有损坏的合并标签"
9168
9169 #: builtin/replace.c:357
9170 #, c-format
9171 msgid "malformed mergetag in commit '%s'"
9172 msgstr "提交 '%s' 中含有非法的合并标签"
9173
9174 #: builtin/replace.c:368
9175 #, c-format
9176 msgid ""
9177 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9178 "instead of --graft"
9179 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
9180
9181 #: builtin/replace.c:401
9182 #, c-format
9183 msgid "the original commit '%s' has a gpg signature."
9184 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9185
9186 #: builtin/replace.c:402
9187 msgid "the signature will be removed in the replacement commit!"
9188 msgstr "在替换的提交中签名将被移除！"
9189
9190 #: builtin/replace.c:408
9191 #, c-format
9192 msgid "could not write replacement commit for: '%s'"
9193 msgstr "不能为 '%s' 写替换提交"
9194
9195 #: builtin/replace.c:432
9196 msgid "list replace refs"
9197 msgstr "列出替换的引用"
9198
9199 #: builtin/replace.c:433
9200 msgid "delete replace refs"
9201 msgstr "删除替换的引用"
9202
9203 #: builtin/replace.c:434
9204 msgid "edit existing object"
9205 msgstr "编辑现存的对象"
9206
9207 #: builtin/replace.c:435
9208 msgid "change a commit's parents"
9209 msgstr "修改一个提交的父提交"
9210
9211 #: builtin/replace.c:436
9212 msgid "replace the ref if it exists"
9213 msgstr "如果存在则替换引用"
9214
9215 #: builtin/replace.c:437
9216 msgid "do not pretty-print contents for --edit"
9217 msgstr "不要为 --edit 操作美观显示内容"
9218
9219 #: builtin/replace.c:438
9220 msgid "use this format"
9221 msgstr "使用此格式"
9222
9223 #: builtin/rerere.c:12
9224 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9225 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9226
9227 #: builtin/rerere.c:57
9228 msgid "register clean resolutions in index"
9229 msgstr "在索引中注册干净的解决方案"
9230
9231 #: builtin/reset.c:26
9232 msgid ""
9233 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9234 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9235
9236 #: builtin/reset.c:27
9237 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9238 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9239
9240 #: builtin/reset.c:28
9241 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9242 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9243
9244 #: builtin/reset.c:34
9245 msgid "mixed"
9246 msgstr "混杂"
9247
9248 #: builtin/reset.c:34
9249 msgid "soft"
9250 msgstr "软性"
9251
9252 #: builtin/reset.c:34
9253 msgid "hard"
9254 msgstr "硬性"
9255
9256 #: builtin/reset.c:34
9257 msgid "merge"
9258 msgstr "合并"
9259
9260 #: builtin/reset.c:34
9261 msgid "keep"
9262 msgstr "保持"
9263
9264 #: builtin/reset.c:74
9265 msgid "You do not have a valid HEAD."
9266 msgstr "您没有一个有效的 HEAD。"
9267
9268 #: builtin/reset.c:76
9269 msgid "Failed to find tree of HEAD."
9270 msgstr "无法找到 HEAD 指向的树。"
9271
9272 #: builtin/reset.c:82
9273 #, c-format
9274 msgid "Failed to find tree of %s."
9275 msgstr "无法找到 %s 指向的树。"
9276
9277 #: builtin/reset.c:100
9278 #, c-format
9279 msgid "HEAD is now at %s"
9280 msgstr "HEAD 现在位于 %s"
9281
9282 #  译者：汉字之间无空格，故删除%s前后空格
9283 #: builtin/reset.c:183
9284 #, c-format
9285 msgid "Cannot do a %s reset in the middle of a merge."
9286 msgstr "在合并过程中不能做%s重置操作。"
9287
9288 #: builtin/reset.c:276
9289 msgid "be quiet, only report errors"
9290 msgstr "安静模式，只报告错误"
9291
9292 #: builtin/reset.c:278
9293 msgid "reset HEAD and index"
9294 msgstr "重置 HEAD 和索引"
9295
9296 #: builtin/reset.c:279
9297 msgid "reset only HEAD"
9298 msgstr "只重置 HEAD"
9299
9300 #: builtin/reset.c:281 builtin/reset.c:283
9301 msgid "reset HEAD, index and working tree"
9302 msgstr "重置 HEAD、索引和工作区"
9303
9304 #: builtin/reset.c:285
9305 msgid "reset HEAD but keep local changes"
9306 msgstr "重置 HEAD 但保存本地变更"
9307
9308 #: builtin/reset.c:288
9309 msgid "record only the fact that removed paths will be added later"
9310 msgstr "将删除的路径标记为稍后添加"
9311
9312 #: builtin/reset.c:305
9313 #, c-format
9314 msgid "Failed to resolve '%s' as a valid revision."
9315 msgstr "无法将 '%s' 解析为一个有效的版本。"
9316
9317 #: builtin/reset.c:308 builtin/reset.c:316
9318 #, c-format
9319 msgid "Could not parse object '%s'."
9320 msgstr "不能解析对象 '%s'。"
9321
9322 #: builtin/reset.c:313
9323 #, c-format
9324 msgid "Failed to resolve '%s' as a valid tree."
9325 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9326
9327 #: builtin/reset.c:322
9328 msgid "--patch is incompatible with --{hard,mixed,soft}"
9329 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9330
9331 #: builtin/reset.c:331
9332 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9333 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
9334
9335 #  译者：汉字之间无空格，故删除%s前后空格
9336 #: builtin/reset.c:333
9337 #, c-format
9338 msgid "Cannot do %s reset with paths."
9339 msgstr "不能带路径进行%s重置。"
9340
9341 #  译者：汉字之间无空格，故删除%s前后空格
9342 #: builtin/reset.c:343
9343 #, c-format
9344 msgid "%s reset is not allowed in a bare repository"
9345 msgstr "不能对纯仓库进行%s重置"
9346
9347 #: builtin/reset.c:347
9348 msgid "-N can only be used with --mixed"
9349 msgstr "-N 只能和 --mixed 同时使用"
9350
9351 #: builtin/reset.c:364
9352 msgid "Unstaged changes after reset:"
9353 msgstr "重置后取消暂存的变更："
9354
9355 #: builtin/reset.c:370
9356 #, c-format
9357 msgid "Could not reset index file to revision '%s'."
9358 msgstr "不能重置索引文件至版本 '%s'。"
9359
9360 #: builtin/reset.c:374
9361 msgid "Could not write new index file."
9362 msgstr "不能写入新的索引文件。"
9363
9364 #: builtin/rev-parse.c:361
9365 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9366 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9367
9368 #: builtin/rev-parse.c:366
9369 msgid "keep the `--` passed as an arg"
9370 msgstr "保持 `--` 作为一个参数传递"
9371
9372 #: builtin/rev-parse.c:368
9373 msgid "stop parsing after the first non-option argument"
9374 msgstr "遇到第一个非选项参数后停止解析"
9375
9376 #: builtin/rev-parse.c:371
9377 msgid "output in stuck long form"
9378 msgstr "以固定长格式输出"
9379
9380 #: builtin/rev-parse.c:499
9381 msgid ""
9382 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9383 "   or: git rev-parse --sq-quote [<arg>...]\n"
9384 "   or: git rev-parse [<options>] [<arg>...]\n"
9385 "\n"
9386 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9387 msgstr ""
9388 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9389 "   或者：git rev-parse --sq-quote [<参数>...]\n"
9390 "   或者：git rev-parse [<选项>] [<参数>...]\n"
9391 "\n"
9392 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9393
9394 #: builtin/revert.c:22
9395 msgid "git revert [<options>] <commit-ish>..."
9396 msgstr "git revert [<选项>] <提交号>..."
9397
9398 #: builtin/revert.c:23
9399 msgid "git revert <subcommand>"
9400 msgstr "git revert <子命令>"
9401
9402 #: builtin/revert.c:28
9403 msgid "git cherry-pick [<options>] <commit-ish>..."
9404 msgstr "git cherry-pick [<选项>] <提交号>..."
9405
9406 #: builtin/revert.c:29
9407 msgid "git cherry-pick <subcommand>"
9408 msgstr "git cherry-pick <子命令>"
9409
9410 #: builtin/revert.c:71
9411 #, c-format
9412 msgid "%s: %s cannot be used with %s"
9413 msgstr "%s：%s 不能和 %s 同时使用"
9414
9415 #: builtin/revert.c:80
9416 msgid "end revert or cherry-pick sequence"
9417 msgstr "终止反转或拣选操作"
9418
9419 #: builtin/revert.c:81
9420 msgid "resume revert or cherry-pick sequence"
9421 msgstr "继续反转或拣选操作"
9422
9423 #: builtin/revert.c:82
9424 msgid "cancel revert or cherry-pick sequence"
9425 msgstr "取消反转或拣选操作"
9426
9427 #: builtin/revert.c:83
9428 msgid "don't automatically commit"
9429 msgstr "不要自动提交"
9430
9431 #: builtin/revert.c:84
9432 msgid "edit the commit message"
9433 msgstr "编辑提交说明"
9434
9435 #: builtin/revert.c:87
9436 msgid "parent number"
9437 msgstr "父编号"
9438
9439 #: builtin/revert.c:89
9440 msgid "merge strategy"
9441 msgstr "合并策略"
9442
9443 #: builtin/revert.c:90
9444 msgid "option"
9445 msgstr "选项"
9446
9447 #: builtin/revert.c:91
9448 msgid "option for merge strategy"
9449 msgstr "合并策略的选项"
9450
9451 #: builtin/revert.c:104
9452 msgid "append commit name"
9453 msgstr "追加提交名称"
9454
9455 #: builtin/revert.c:105
9456 msgid "allow fast-forward"
9457 msgstr "允许快进式"
9458
9459 #: builtin/revert.c:106
9460 msgid "preserve initially empty commits"
9461 msgstr "保留初始化的空提交"
9462
9463 #: builtin/revert.c:107
9464 msgid "allow commits with empty messages"
9465 msgstr "允许提交说明为空"
9466
9467 #: builtin/revert.c:108
9468 msgid "keep redundant, empty commits"
9469 msgstr "保持多余的、空的提交"
9470
9471 #: builtin/revert.c:112
9472 msgid "program error"
9473 msgstr "程序错误"
9474
9475 #: builtin/revert.c:197
9476 msgid "revert failed"
9477 msgstr "还原失败"
9478
9479 #: builtin/revert.c:212
9480 msgid "cherry-pick failed"
9481 msgstr "拣选失败"
9482
9483 #: builtin/rm.c:17
9484 msgid "git rm [<options>] [--] <file>..."
9485 msgstr "git rm [<选项>] [--] <文件>..."
9486
9487 #: builtin/rm.c:65
9488 msgid ""
9489 "the following submodule (or one of its nested submodules)\n"
9490 "uses a .git directory:"
9491 msgid_plural ""
9492 "the following submodules (or one of their nested submodules)\n"
9493 "use a .git directory:"
9494 msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
9495 msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
9496
9497 #: builtin/rm.c:71
9498 msgid ""
9499 "\n"
9500 "(use 'rm -rf' if you really want to remove it including all of its history)"
9501 msgstr ""
9502 "\n"
9503 "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
9504
9505 #: builtin/rm.c:230
9506 msgid ""
9507 "the following file has staged content different from both the\n"
9508 "file and the HEAD:"
9509 msgid_plural ""
9510 "the following files have staged content different from both the\n"
9511 "file and the HEAD:"
9512 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
9513 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
9514
9515 #: builtin/rm.c:235
9516 msgid ""
9517 "\n"
9518 "(use -f to force removal)"
9519 msgstr ""
9520 "\n"
9521 "（使用 -f 强制删除）"
9522
9523 #: builtin/rm.c:239
9524 msgid "the following file has changes staged in the index:"
9525 msgid_plural "the following files have changes staged in the index:"
9526 msgstr[0] "下列文件索引中有变更"
9527 msgstr[1] "下列文件索引中有变更"
9528
9529 #: builtin/rm.c:243 builtin/rm.c:254
9530 msgid ""
9531 "\n"
9532 "(use --cached to keep the file, or -f to force removal)"
9533 msgstr ""
9534 "\n"
9535 "（使用 --cached 保留本地文件，或用 -f 强制删除）"
9536
9537 #: builtin/rm.c:251
9538 msgid "the following file has local modifications:"
9539 msgid_plural "the following files have local modifications:"
9540 msgstr[0] "如下文件有本地修改："
9541 msgstr[1] "如下文件有本地修改："
9542
9543 #: builtin/rm.c:269
9544 msgid "do not list removed files"
9545 msgstr "不列出删除的文件"
9546
9547 #: builtin/rm.c:270
9548 msgid "only remove from the index"
9549 msgstr "只从索引区删除"
9550
9551 #: builtin/rm.c:271
9552 msgid "override the up-to-date check"
9553 msgstr "忽略文件更新状态检查"
9554
9555 #: builtin/rm.c:272
9556 msgid "allow recursive removal"
9557 msgstr "允许递归删除"
9558
9559 #: builtin/rm.c:274
9560 msgid "exit with a zero status even if nothing matched"
9561 msgstr "即使没有匹配，也以零状态退出"
9562
9563 #: builtin/rm.c:317
9564 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9565 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9566
9567 #: builtin/rm.c:335
9568 #, c-format
9569 msgid "not removing '%s' recursively without -r"
9570 msgstr "未提供 -r 选项不会递归删除 '%s'"
9571
9572 #: builtin/rm.c:374
9573 #, c-format
9574 msgid "git rm: unable to remove %s"
9575 msgstr "git rm：不能删除 %s"
9576
9577 #: builtin/shortlog.c:13
9578 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9579 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9580
9581 #: builtin/shortlog.c:131
9582 #, c-format
9583 msgid "Missing author: %s"
9584 msgstr "缺少作者：%s"
9585
9586 #: builtin/shortlog.c:230
9587 msgid "sort output according to the number of commits per author"
9588 msgstr "根据每个作者的提交数量排序"
9589
9590 #: builtin/shortlog.c:232
9591 msgid "Suppress commit descriptions, only provides commit count"
9592 msgstr "隐藏提交说明，只提供提交数量"
9593
9594 #: builtin/shortlog.c:234
9595 msgid "Show the email address of each author"
9596 msgstr "显示每个作者的电子邮件地址"
9597
9598 #: builtin/shortlog.c:235
9599 msgid "w[,i1[,i2]]"
9600 msgstr "w[,i1[,i2]]"
9601
9602 #: builtin/shortlog.c:236
9603 msgid "Linewrap output"
9604 msgstr "折行输出"
9605
9606 #: builtin/show-branch.c:9
9607 msgid ""
9608 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9609 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9610 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9611 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9612 msgstr ""
9613 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9614 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9615 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9616 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9617
9618 #: builtin/show-branch.c:13
9619 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9620 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9621
9622 #: builtin/show-branch.c:659
9623 msgid "show remote-tracking and local branches"
9624 msgstr "显示远程跟踪的和本地的分支"
9625
9626 #: builtin/show-branch.c:661
9627 msgid "show remote-tracking branches"
9628 msgstr "显示远程跟踪的分支"
9629
9630 #: builtin/show-branch.c:663
9631 msgid "color '*!+-' corresponding to the branch"
9632 msgstr "着色 '*!+-' 到相应的分支"
9633
9634 #: builtin/show-branch.c:665
9635 msgid "show <n> more commits after the common ancestor"
9636 msgstr "显示共同祖先后的 <n> 个提交"
9637
9638 #: builtin/show-branch.c:667
9639 msgid "synonym to more=-1"
9640 msgstr "和 more=-1 同义"
9641
9642 #: builtin/show-branch.c:668
9643 msgid "suppress naming strings"
9644 msgstr "不显示字符串命名"
9645
9646 #: builtin/show-branch.c:670
9647 msgid "include the current branch"
9648 msgstr "包括当前分支"
9649
9650 #: builtin/show-branch.c:672
9651 msgid "name commits with their object names"
9652 msgstr "以对象名字命名提交"
9653
9654 #: builtin/show-branch.c:674
9655 msgid "show possible merge bases"
9656 msgstr "显示可能合并的基线"
9657
9658 #: builtin/show-branch.c:676
9659 msgid "show refs unreachable from any other ref"
9660 msgstr "显示没有任何引用的的引用"
9661
9662 #: builtin/show-branch.c:678
9663 msgid "show commits in topological order"
9664 msgstr "以拓扑顺序显示提交"
9665
9666 #: builtin/show-branch.c:681
9667 msgid "show only commits not on the first branch"
9668 msgstr "只显示不在第一个分支上的提交"
9669
9670 #: builtin/show-branch.c:683
9671 msgid "show merges reachable from only one tip"
9672 msgstr "显示仅一个分支可访问的合并提交"
9673
9674 #: builtin/show-branch.c:685
9675 msgid "topologically sort, maintaining date order where possible"
9676 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
9677
9678 #: builtin/show-branch.c:688
9679 msgid "<n>[,<base>]"
9680 msgstr "<n>[,<base>]"
9681
9682 #: builtin/show-branch.c:689
9683 msgid "show <n> most recent ref-log entries starting at base"
9684 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9685
9686 #: builtin/show-ref.c:10
9687 msgid ""
9688 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9689 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9690 msgstr ""
9691 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9692 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9693
9694 #: builtin/show-ref.c:11
9695 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9696 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9697
9698 #: builtin/show-ref.c:170
9699 msgid "only show tags (can be combined with heads)"
9700 msgstr "只显示标签（可以和头共用）"
9701
9702 #: builtin/show-ref.c:171
9703 msgid "only show heads (can be combined with tags)"
9704 msgstr "只显示头（可以和标签共用）"
9705
9706 #: builtin/show-ref.c:172
9707 msgid "stricter reference checking, requires exact ref path"
9708 msgstr "更严格的引用检测，需要精确的引用路径"
9709
9710 #: builtin/show-ref.c:175 builtin/show-ref.c:177
9711 msgid "show the HEAD reference, even if it would be filtered out"
9712 msgstr "显示 HEAD 引用，即使被过滤掉"
9713
9714 #: builtin/show-ref.c:179
9715 msgid "dereference tags into object IDs"
9716 msgstr "转换标签到对象 ID"
9717
9718 #: builtin/show-ref.c:181
9719 msgid "only show SHA1 hash using <n> digits"
9720 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9721
9722 #: builtin/show-ref.c:185
9723 msgid "do not print results to stdout (useful with --verify)"
9724 msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
9725
9726 #: builtin/show-ref.c:187
9727 msgid "show refs from stdin that aren't in local repository"
9728 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
9729
9730 #: builtin/symbolic-ref.c:7
9731 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9732 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9733
9734 #: builtin/symbolic-ref.c:8
9735 msgid "git symbolic-ref -d [-q] <name>"
9736 msgstr "git symbolic-ref -d [-q] <名称>"
9737
9738 #: builtin/symbolic-ref.c:40
9739 msgid "suppress error message for non-symbolic (detached) refs"
9740 msgstr "不显示非符号（分离的）引用的错误信息"
9741
9742 #: builtin/symbolic-ref.c:41
9743 msgid "delete symbolic ref"
9744 msgstr "删除符号引用"
9745
9746 #: builtin/symbolic-ref.c:42
9747 msgid "shorten ref output"
9748 msgstr "简短的引用输出"
9749
9750 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9751 msgid "reason"
9752 msgstr "原因"
9753
9754 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9755 msgid "reason of the update"
9756 msgstr "更新的原因"
9757
9758 #: builtin/tag.c:22
9759 msgid ""
9760 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9761 "[<head>]"
9762 msgstr ""
9763 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9764
9765 #: builtin/tag.c:23
9766 msgid "git tag -d <tagname>..."
9767 msgstr "git tag -d <标签名>..."
9768
9769 #: builtin/tag.c:24
9770 msgid ""
9771 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9772 "\t\t[<pattern>...]"
9773 msgstr ""
9774 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9775
9776 #: builtin/tag.c:26
9777 msgid "git tag -v <tagname>..."
9778 msgstr "git tag -v <标签名>..."
9779
9780 #: builtin/tag.c:69
9781 #, c-format
9782 msgid "malformed object at '%s'"
9783 msgstr "非法的对象于 '%s'"
9784
9785 #: builtin/tag.c:301
9786 #, c-format
9787 msgid "tag name too long: %.*s..."
9788 msgstr "标签名称太长：%.*s..."
9789
9790 #: builtin/tag.c:306
9791 #, c-format
9792 msgid "tag '%s' not found."
9793 msgstr "未发现标签 '%s'。"
9794
9795 #: builtin/tag.c:321
9796 #, c-format
9797 msgid "Deleted tag '%s' (was %s)\n"
9798 msgstr "已删除标签 '%s'（曾为 %s）\n"
9799
9800 #: builtin/tag.c:333
9801 #, c-format
9802 msgid "could not verify the tag '%s'"
9803 msgstr "不能校验该标签 '%s'"
9804
9805 #: builtin/tag.c:343
9806 #, c-format
9807 msgid ""
9808 "\n"
9809 "Write a message for tag:\n"
9810 "  %s\n"
9811 "Lines starting with '%c' will be ignored.\n"
9812 msgstr ""
9813 "\n"
9814 "输入一个标签说明：\n"
9815 "  %s\n"
9816 "以 '%c' 开头的行将被忽略。\n"
9817
9818 #: builtin/tag.c:347
9819 #, c-format
9820 msgid ""
9821 "\n"
9822 "Write a message for tag:\n"
9823 "  %s\n"
9824 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9825 "want to.\n"
9826 msgstr ""
9827 "\n"
9828 "输入一个标签说明：\n"
9829 "  %s\n"
9830 "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
9831
9832 #: builtin/tag.c:371
9833 #, c-format
9834 msgid "unsupported sort specification '%s'"
9835 msgstr "不支持的排序规格 '%s'"
9836
9837 #: builtin/tag.c:373
9838 #, c-format
9839 msgid "unsupported sort specification '%s' in variable '%s'"
9840 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9841
9842 #: builtin/tag.c:428
9843 msgid "unable to sign the tag"
9844 msgstr "无法签署标签"
9845
9846 #: builtin/tag.c:430
9847 msgid "unable to write tag file"
9848 msgstr "无法写标签文件"
9849
9850 #: builtin/tag.c:455
9851 msgid "bad object type."
9852 msgstr "坏的对象类型。"
9853
9854 #: builtin/tag.c:468
9855 msgid "tag header too big."
9856 msgstr "标签头信息太大。"
9857
9858 #: builtin/tag.c:504
9859 msgid "no tag message?"
9860 msgstr "无标签说明？"
9861
9862 #: builtin/tag.c:510
9863 #, c-format
9864 msgid "The tag message has been left in %s\n"
9865 msgstr "标签说明被保留在 %s\n"
9866
9867 #: builtin/tag.c:559
9868 msgid "switch 'points-at' requires an object"
9869 msgstr "开关 'points-at' 需要一个对象"
9870
9871 #: builtin/tag.c:561
9872 #, c-format
9873 msgid "malformed object name '%s'"
9874 msgstr "非法的对象名 '%s'"
9875
9876 #: builtin/tag.c:589
9877 msgid "list tag names"
9878 msgstr "列出标签名称"
9879
9880 #: builtin/tag.c:591
9881 msgid "print <n> lines of each tag message"
9882 msgstr "每个标签信息打印 <n> 行"
9883
9884 #: builtin/tag.c:593
9885 msgid "delete tags"
9886 msgstr "删除标签"
9887
9888 #: builtin/tag.c:594
9889 msgid "verify tags"
9890 msgstr "验证标签"
9891
9892 #: builtin/tag.c:596
9893 msgid "Tag creation options"
9894 msgstr "标签创建选项"
9895
9896 #: builtin/tag.c:598
9897 msgid "annotated tag, needs a message"
9898 msgstr "附注标签，需要一个说明"
9899
9900 #: builtin/tag.c:600
9901 msgid "tag message"
9902 msgstr "标签说明"
9903
9904 #: builtin/tag.c:602
9905 msgid "annotated and GPG-signed tag"
9906 msgstr "附注并附加 GPG 签名的标签"
9907
9908 #: builtin/tag.c:606
9909 msgid "use another key to sign the tag"
9910 msgstr "使用另外的私钥签名该标签"
9911
9912 #: builtin/tag.c:607
9913 msgid "replace the tag if exists"
9914 msgstr "如果存在，替换现有的标签"
9915
9916 #: builtin/tag.c:609
9917 msgid "Tag listing options"
9918 msgstr "标签列表选项"
9919
9920 #: builtin/tag.c:610
9921 msgid "show tag list in columns"
9922 msgstr "以列的方式显示标签列表"
9923
9924 #: builtin/tag.c:612
9925 msgid "sort tags"
9926 msgstr "排序标签"
9927
9928 #: builtin/tag.c:617 builtin/tag.c:623
9929 msgid "print only tags that contain the commit"
9930 msgstr "只打印包含提交的标签"
9931
9932 #: builtin/tag.c:629
9933 msgid "print only tags of the object"
9934 msgstr "只打印对象的标签"
9935
9936 #: builtin/tag.c:655
9937 msgid "--column and -n are incompatible"
9938 msgstr "--column 和 -n 不兼容"
9939
9940 #: builtin/tag.c:667
9941 msgid "--sort and -n are incompatible"
9942 msgstr "--sort 和 -n 不兼容"
9943
9944 #: builtin/tag.c:674
9945 msgid "-n option is only allowed with -l."
9946 msgstr "-n 选项只允许和 -l 同时使用。"
9947
9948 #: builtin/tag.c:676
9949 msgid "--contains option is only allowed with -l."
9950 msgstr "--contains 选项只允许和 -l 同时使用。"
9951
9952 #: builtin/tag.c:678
9953 msgid "--points-at option is only allowed with -l."
9954 msgstr "--points-at 选项只允许和 -l 同时使用。"
9955
9956 #: builtin/tag.c:686
9957 msgid "only one -F or -m option is allowed."
9958 msgstr "只允许一个 -F 或 -m 选项。"
9959
9960 #: builtin/tag.c:706
9961 msgid "too many params"
9962 msgstr "太多参数"
9963
9964 #: builtin/tag.c:712
9965 #, c-format
9966 msgid "'%s' is not a valid tag name."
9967 msgstr "'%s' 不是一个有效的标签名称。"
9968
9969 #: builtin/tag.c:717
9970 #, c-format
9971 msgid "tag '%s' already exists"
9972 msgstr "标签 '%s' 已存在"
9973
9974 #: builtin/tag.c:741
9975 #, c-format
9976 msgid "Updated tag '%s' (was %s)\n"
9977 msgstr "已更新标签 '%s'（曾为 %s）\n"
9978
9979 #: builtin/unpack-objects.c:489
9980 msgid "Unpacking objects"
9981 msgstr "展开对象中"
9982
9983 #: builtin/update-index.c:70
9984 #, c-format
9985 msgid "failed to create directory %s"
9986 msgstr "无法创建目录 %s"
9987
9988 #: builtin/update-index.c:76
9989 #, c-format
9990 msgid "failed to stat %s"
9991 msgstr "无法枚举 %s 状态"
9992
9993 #: builtin/update-index.c:86
9994 #, c-format
9995 msgid "failed to create file %s"
9996 msgstr "无法创建文件 %s"
9997
9998 #: builtin/update-index.c:94
9999 #, c-format
10000 msgid "failed to delete file %s"
10001 msgstr "无法删除文件 %s"
10002
10003 #: builtin/update-index.c:101 builtin/update-index.c:203
10004 #, c-format
10005 msgid "failed to delete directory %s"
10006 msgstr "无法删除目录 %s"
10007
10008 #: builtin/update-index.c:124
10009 #, c-format
10010 msgid "Testing "
10011 msgstr "正在测试 "
10012
10013 #: builtin/update-index.c:136
10014 msgid "directory stat info does not change after adding a new file"
10015 msgstr "添加一个新文件后，目录的状态信息未改变"
10016
10017 #: builtin/update-index.c:149
10018 msgid "directory stat info does not change after adding a new directory"
10019 msgstr "添加一个新目录后，目录的状态信息未改变"
10020
10021 #: builtin/update-index.c:162
10022 msgid "directory stat info changes after updating a file"
10023 msgstr "更新一个文件后，目录的状态信息被修改"
10024
10025 #: builtin/update-index.c:173
10026 msgid "directory stat info changes after adding a file inside subdirectory"
10027 msgstr "在子目录中添加文件后，目录的状态信息被修改"
10028
10029 #: builtin/update-index.c:184
10030 msgid "directory stat info does not change after deleting a file"
10031 msgstr "删除一个文件后，目录的状态信息未改变"
10032
10033 #: builtin/update-index.c:197
10034 msgid "directory stat info does not change after deleting a directory"
10035 msgstr "删除一个目录后，目录的状态信息未改变"
10036
10037 #: builtin/update-index.c:204
10038 msgid " OK"
10039 msgstr " OK"
10040
10041 #: builtin/update-index.c:564
10042 msgid "git update-index [<options>] [--] [<file>...]"
10043 msgstr "git update-index [<选项>] [--] [<文件>...]"
10044
10045 #: builtin/update-index.c:918
10046 msgid "continue refresh even when index needs update"
10047 msgstr "当索引需要更新时继续刷新"
10048
10049 #: builtin/update-index.c:921
10050 msgid "refresh: ignore submodules"
10051 msgstr "刷新：忽略子模组"
10052
10053 #: builtin/update-index.c:924
10054 msgid "do not ignore new files"
10055 msgstr "不忽略新的文件"
10056
10057 #: builtin/update-index.c:926
10058 msgid "let files replace directories and vice-versa"
10059 msgstr "让文件替换目录（反之亦然）"
10060
10061 #: builtin/update-index.c:928
10062 msgid "notice files missing from worktree"
10063 msgstr "通知文件从工作区丢失"
10064
10065 #: builtin/update-index.c:930
10066 msgid "refresh even if index contains unmerged entries"
10067 msgstr "即使索引区包含未合并的条目也执行刷新"
10068
10069 #: builtin/update-index.c:933
10070 msgid "refresh stat information"
10071 msgstr "刷新统计信息"
10072
10073 #: builtin/update-index.c:937
10074 msgid "like --refresh, but ignore assume-unchanged setting"
10075 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
10076
10077 #: builtin/update-index.c:941
10078 msgid "<mode>,<object>,<path>"
10079 msgstr "<存取模式>,<对象>,<路径>"
10080
10081 #: builtin/update-index.c:942
10082 msgid "add the specified entry to the index"
10083 msgstr "添加指定的条目到索引区"
10084
10085 #: builtin/update-index.c:946
10086 msgid "(+/-)x"
10087 msgstr "(+/-)x"
10088
10089 #: builtin/update-index.c:947
10090 msgid "override the executable bit of the listed files"
10091 msgstr "覆盖列表里文件的可执行位"
10092
10093 #: builtin/update-index.c:951
10094 msgid "mark files as \"not changing\""
10095 msgstr "把文件标记为 \"没有变更\""
10096
10097 #: builtin/update-index.c:954
10098 msgid "clear assumed-unchanged bit"
10099 msgstr "清除 assumed-unchanged 位"
10100
10101 #: builtin/update-index.c:957
10102 msgid "mark files as \"index-only\""
10103 msgstr "把文件标记为 \"仅索引\""
10104
10105 #: builtin/update-index.c:960
10106 msgid "clear skip-worktree bit"
10107 msgstr "清除 skip-worktree 位"
10108
10109 #: builtin/update-index.c:963
10110 msgid "add to index only; do not add content to object database"
10111 msgstr "只添加到索引区；不添加对象到对象库"
10112
10113 #: builtin/update-index.c:965
10114 msgid "remove named paths even if present in worktree"
10115 msgstr "即使存在工作区里，也删除路径"
10116
10117 #: builtin/update-index.c:967
10118 msgid "with --stdin: input lines are terminated by null bytes"
10119 msgstr "携带 --stdin：输入的行以 null 字符终止"
10120
10121 #: builtin/update-index.c:969
10122 msgid "read list of paths to be updated from standard input"
10123 msgstr "从标准输入中读取需要更新的路径列表"
10124
10125 #: builtin/update-index.c:973
10126 msgid "add entries from standard input to the index"
10127 msgstr "从标准输入添加条目到索引区"
10128
10129 #: builtin/update-index.c:977
10130 msgid "repopulate stages #2 and #3 for the listed paths"
10131 msgstr "为指定文件重新生成第2和第3暂存区"
10132
10133 #: builtin/update-index.c:981
10134 msgid "only update entries that differ from HEAD"
10135 msgstr "只更新与 HEAD 不同的条目"
10136
10137 #: builtin/update-index.c:985
10138 msgid "ignore files missing from worktree"
10139 msgstr "忽略工作区丢失的文件"
10140
10141 #: builtin/update-index.c:988
10142 msgid "report actions to standard output"
10143 msgstr "在标准输出显示操作"
10144
10145 #: builtin/update-index.c:990
10146 msgid "(for porcelains) forget saved unresolved conflicts"
10147 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10148
10149 #: builtin/update-index.c:994
10150 msgid "write index in this format"
10151 msgstr "以这种格式写入索引区"
10152
10153 #: builtin/update-index.c:996
10154 msgid "enable or disable split index"
10155 msgstr "启用或禁用索引拆分"
10156
10157 #: builtin/update-index.c:998
10158 msgid "enable/disable untracked cache"
10159 msgstr "启用/禁用对未跟踪文件的缓存"
10160
10161 #: builtin/update-index.c:1000
10162 msgid "enable untracked cache without testing the filesystem"
10163 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
10164
10165 #: builtin/update-ref.c:9
10166 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10167 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10168
10169 #: builtin/update-ref.c:10
10170 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
10171 msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
10172
10173 #: builtin/update-ref.c:11
10174 msgid "git update-ref [<options>] --stdin [-z]"
10175 msgstr "git update-ref [<选项>] --stdin [-z]"
10176
10177 #: builtin/update-ref.c:359
10178 msgid "delete the reference"
10179 msgstr "删除引用"
10180
10181 #: builtin/update-ref.c:361
10182 msgid "update <refname> not the one it points to"
10183 msgstr "更新 <引用名> 本身而不是它指向的引用"
10184
10185 #: builtin/update-ref.c:362
10186 msgid "stdin has NUL-terminated arguments"
10187 msgstr "标准输入有以 NUL 字符终止的参数"
10188
10189 #: builtin/update-ref.c:363
10190 msgid "read updates from stdin"
10191 msgstr "从标准输入读取更新"
10192
10193 #: builtin/update-server-info.c:6
10194 msgid "git update-server-info [--force]"
10195 msgstr "git update-server-info [--force]"
10196
10197 #: builtin/update-server-info.c:14
10198 msgid "update the info files from scratch"
10199 msgstr "从头开始更新文件信息"
10200
10201 #: builtin/verify-commit.c:17
10202 msgid "git verify-commit [-v | --verbose] <commit>..."
10203 msgstr "git verify-commit [-v | --verbose] <提交>..."
10204
10205 #: builtin/verify-commit.c:75
10206 msgid "print commit contents"
10207 msgstr "打印提交内容"
10208
10209 #: builtin/verify-pack.c:54
10210 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10211 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10212
10213 #: builtin/verify-pack.c:64
10214 msgid "verbose"
10215 msgstr "冗长输出"
10216
10217 #: builtin/verify-pack.c:66
10218 msgid "show statistics only"
10219 msgstr "只显示统计"
10220
10221 #: builtin/verify-tag.c:17
10222 msgid "git verify-tag [-v | --verbose] <tag>..."
10223 msgstr "git verify-tag [-v | --verbose] <标签>..."
10224
10225 #: builtin/verify-tag.c:73
10226 msgid "print tag contents"
10227 msgstr "打印标签内容"
10228
10229 #: builtin/worktree.c:11
10230 msgid "git worktree add [<options>] <path> <branch>"
10231 msgstr "git worktree add [<选项>] <路径> <分支>"
10232
10233 #: builtin/worktree.c:12
10234 msgid "git worktree prune [<options>]"
10235 msgstr "git worktree prune [<选项>]"
10236
10237 #: builtin/worktree.c:27
10238 #, c-format
10239 msgid "Removing worktrees/%s: not a valid directory"
10240 msgstr "删除工作区/%s：不是一个有效的目录"
10241
10242 #: builtin/worktree.c:33
10243 #, c-format
10244 msgid "Removing worktrees/%s: gitdir file does not exist"
10245 msgstr "删除 worktrees/%s：gitdir 文件不存在"
10246
10247 #: builtin/worktree.c:38
10248 #, c-format
10249 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10250 msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
10251
10252 #: builtin/worktree.c:49
10253 #, c-format
10254 msgid "Removing worktrees/%s: invalid gitdir file"
10255 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
10256
10257 #: builtin/worktree.c:65
10258 #, c-format
10259 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10260 msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
10261
10262 #: builtin/worktree.c:100
10263 #, c-format
10264 msgid "failed to remove: %s"
10265 msgstr "无法删除：%s"
10266
10267 #: builtin/worktree.c:186
10268 #, c-format
10269 msgid "'%s' already exists"
10270 msgstr "'%s' 已经存在"
10271
10272 #: builtin/worktree.c:207
10273 #, c-format
10274 msgid "could not create directory of '%s'"
10275 msgstr "不能创建目录 '%s'"
10276
10277 #: builtin/worktree.c:241
10278 msgid "unable to resolve HEAD"
10279 msgstr "不能解析 HEAD"
10280
10281 #: builtin/worktree.c:249
10282 #, c-format
10283 msgid "Enter %s (identifier %s)"
10284 msgstr "输入 %s （标识符 %s）"
10285
10286 #: builtin/worktree.c:281
10287 msgid "checkout <branch> even if already checked out in other worktree"
10288 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10289
10290 #: builtin/worktree.c:283
10291 msgid "create a new branch"
10292 msgstr "创建一个新分支"
10293
10294 #: builtin/worktree.c:285
10295 msgid "create or reset a branch"
10296 msgstr "创建或重置一个分支"
10297
10298 #: builtin/worktree.c:286
10299 msgid "detach HEAD at named commit"
10300 msgstr "HEAD 从指定的提交分离"
10301
10302 #: builtin/worktree.c:292
10303 msgid "-b and -B are mutually exclusive"
10304 msgstr "-b 和 -B 互斥"
10305
10306 #: builtin/write-tree.c:13
10307 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10308 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10309
10310 #: builtin/write-tree.c:26
10311 msgid "<prefix>/"
10312 msgstr "<前缀>/"
10313
10314 #: builtin/write-tree.c:27
10315 msgid "write tree object for a subdirectory <prefix>"
10316 msgstr "将 <前缀> 子目录内容写到一个树对象"
10317
10318 #: builtin/write-tree.c:30
10319 msgid "only useful for debugging"
10320 msgstr "只对调试有用"
10321
10322 #: credential-cache--daemon.c:267
10323 msgid "print debugging messages to stderr"
10324 msgstr "调试信息输出到标准错误"
10325
10326 #: git.c:14
10327 msgid ""
10328 "'git help -a' and 'git help -g' list available subcommands and some\n"
10329 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10330 "to read about a specific subcommand or concept."
10331 msgstr ""
10332 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10333 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10334 "帮助。"
10335
10336 #: common-cmds.h:10
10337 msgid "start a working area (see also: git help tutorial)"
10338 msgstr "开始一个工作区（参见：git help tutorial）"
10339
10340 #: common-cmds.h:11
10341 msgid "work on the current change (see also: git help everyday)"
10342 msgstr "在当前变更上工作（参见：git help everyday）"
10343
10344 #: common-cmds.h:12
10345 msgid "examine the history and state (see also: git help revisions)"
10346 msgstr "检查历史和状态（参见：git help revisions）"
10347
10348 #: common-cmds.h:13
10349 msgid "grow, mark and tweak your common history"
10350 msgstr "扩展、标记和调校您的历史记录"
10351
10352 #: common-cmds.h:14
10353 msgid "collaborate (see also: git help workflows)"
10354 msgstr "协同（参见：git help workflows）"
10355
10356 #: common-cmds.h:18
10357 msgid "Add file contents to the index"
10358 msgstr "添加文件内容至索引"
10359
10360 #: common-cmds.h:19
10361 msgid "Find by binary search the change that introduced a bug"
10362 msgstr "通过二分查找定位引入 bug 的变更"
10363
10364 #: common-cmds.h:20
10365 msgid "List, create, or delete branches"
10366 msgstr "列出、创建或删除分支"
10367
10368 #: common-cmds.h:21
10369 msgid "Switch branches or restore working tree files"
10370 msgstr "切换分支或恢复工作区文件"
10371
10372 #: common-cmds.h:22
10373 msgid "Clone a repository into a new directory"
10374 msgstr "克隆一个仓库到一个新目录"
10375
10376 #: common-cmds.h:23
10377 msgid "Record changes to the repository"
10378 msgstr "记录变更到仓库"
10379
10380 #: common-cmds.h:24
10381 msgid "Show changes between commits, commit and working tree, etc"
10382 msgstr "显示提交之间、提交和工作区之间等的差异"
10383
10384 #: common-cmds.h:25
10385 msgid "Download objects and refs from another repository"
10386 msgstr "从另外一个仓库下载对象和引用"
10387
10388 #: common-cmds.h:26
10389 msgid "Print lines matching a pattern"
10390 msgstr "输出和模式匹配的行"
10391
10392 #: common-cmds.h:27
10393 msgid "Create an empty Git repository or reinitialize an existing one"
10394 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
10395
10396 #: common-cmds.h:28
10397 msgid "Show commit logs"
10398 msgstr "显示提交日志"
10399
10400 #: common-cmds.h:29
10401 msgid "Join two or more development histories together"
10402 msgstr "合并两个或更多开发历史"
10403
10404 #: common-cmds.h:30
10405 msgid "Move or rename a file, a directory, or a symlink"
10406 msgstr "移动或重命名一个文件、目录或符号链接"
10407
10408 #: common-cmds.h:31
10409 msgid "Fetch from and integrate with another repository or a local branch"
10410 msgstr "获取并整合另外的仓库或一个本地分支"
10411
10412 #: common-cmds.h:32
10413 msgid "Update remote refs along with associated objects"
10414 msgstr "更新远程引用和相关的对象"
10415
10416 #: common-cmds.h:33
10417 msgid "Forward-port local commits to the updated upstream head"
10418 msgstr "本地提交转移至更新后的上游分支中"
10419
10420 #: common-cmds.h:34
10421 msgid "Reset current HEAD to the specified state"
10422 msgstr "重置当前 HEAD 到指定状态"
10423
10424 #: common-cmds.h:35
10425 msgid "Remove files from the working tree and from the index"
10426 msgstr "从工作区和索引中删除文件"
10427
10428 #: common-cmds.h:36
10429 msgid "Show various types of objects"
10430 msgstr "显示各种类型的对象"
10431
10432 #: common-cmds.h:37
10433 msgid "Show the working tree status"
10434 msgstr "显示工作区状态"
10435
10436 #: common-cmds.h:38
10437 msgid "Create, list, delete or verify a tag object signed with GPG"
10438 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
10439
10440 #: parse-options.h:142
10441 msgid "expiry-date"
10442 msgstr "到期时间"
10443
10444 #: parse-options.h:157
10445 msgid "no-op (backward compatibility)"
10446 msgstr "空操作（向后兼容）"
10447
10448 #: parse-options.h:231
10449 msgid "be more verbose"
10450 msgstr "更加详细"
10451
10452 #: parse-options.h:233
10453 msgid "be more quiet"
10454 msgstr "更加安静"
10455
10456 #: parse-options.h:239
10457 msgid "use <n> digits to display SHA-1s"
10458 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10459
10460 #: rerere.h:27
10461 msgid "update the index with reused conflict resolution if possible"
10462 msgstr "如果可能，重用冲突解决更新索引"
10463
10464 #: git-am.sh:53
10465 msgid "You need to set your committer info first"
10466 msgstr "您需要先设置你的提交者信息"
10467
10468 #: git-am.sh:100
10469 msgid ""
10470 "You seem to have moved HEAD since the last 'am' failure.\n"
10471 "Not rewinding to ORIG_HEAD"
10472 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10473
10474 #: git-am.sh:110
10475 #, sh-format
10476 msgid ""
10477 "When you have resolved this problem, run \"$cmdline --continue\".\n"
10478 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10479 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
10480 msgstr ""
10481 "当您解决了此问题后，执行 \"$cmdline --continue\"。\n"
10482 "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
10483 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
10484
10485 #: git-am.sh:126
10486 msgid "Cannot fall back to three-way merge."
10487 msgstr "无法求助于三方合并。"
10488
10489 #: git-am.sh:142
10490 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10491 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
10492
10493 #: git-am.sh:144
10494 msgid "Using index info to reconstruct a base tree..."
10495 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
10496
10497 #: git-am.sh:159
10498 msgid ""
10499 "Did you hand edit your patch?\n"
10500 "It does not apply to blobs recorded in its index."
10501 msgstr ""
10502 "您是否曾手动编辑过您的补丁？\n"
10503 "无法应用补丁到索引中的数据对象上。"
10504
10505 #: git-am.sh:168
10506 msgid "Falling back to patching base and 3-way merge..."
10507 msgstr "转而在基础版本上打补丁及进行三方合并..."
10508
10509 #: git-am.sh:185
10510 msgid "Failed to merge in the changes."
10511 msgstr "无法合并变更。"
10512
10513 #: git-am.sh:280
10514 msgid "Only one StGIT patch series can be applied at once"
10515 msgstr "一次只能有一个 StGIT 补丁队列被应用"
10516
10517 #: git-am.sh:367
10518 #, sh-format
10519 msgid "Patch format $patch_format is not supported."
10520 msgstr "不支持 $patch_format 补丁格式。"
10521
10522 #: git-am.sh:369
10523 msgid "Patch format detection failed."
10524 msgstr "补丁格式检测失败。"
10525
10526 #: git-am.sh:407
10527 msgid ""
10528 "The -b/--binary option has been a no-op for long time, and\n"
10529 "it will be removed. Please do not use it anymore."
10530 msgstr ""
10531 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n"
10532 "请不要再使用它了。"
10533
10534 #: git-am.sh:507
10535 #, sh-format
10536 msgid "previous rebase directory $dotest still exists but mbox given."
10537 msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"
10538
10539 #: git-am.sh:512
10540 msgid "Please make up your mind. --skip or --abort?"
10541 msgstr "请下决心。--skip 或是 --abort ？"
10542
10543 #: git-am.sh:560
10544 #, sh-format
10545 msgid ""
10546 "Stray $dotest directory found.\n"
10547 "Use \"git am --abort\" to remove it."
10548 msgstr ""
10549 "发现了错误的 $dotest 目录。\n"
10550 "使用 \"git am --abort\" 删除它。"
10551
10552 #: git-am.sh:568
10553 msgid "Resolve operation not in progress, we are not resuming."
10554 msgstr "解决操作未进行，我们不会继续。"
10555
10556 #: git-am.sh:635
10557 #, sh-format
10558 msgid "Dirty index: cannot apply patches (dirty: $files)"
10559 msgstr "脏索引：不能应用补丁（脏文件：$files）"
10560
10561 #: git-am.sh:747
10562 #, sh-format
10563 msgid ""
10564 "Patch is empty.  Was it split wrong?\n"
10565 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10566 "To restore the original branch and stop patching run \"$cmdline --abort\"."
10567 msgstr ""
10568 "补丁为空。是不是切分错误？\n"
10569 "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
10570 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
10571
10572 #: git-am.sh:774
10573 msgid "Patch does not have a valid e-mail address."
10574 msgstr "补丁中没有一个有效的邮件地址。"
10575
10576 #: git-am.sh:821
10577 msgid "cannot be interactive without stdin connected to a terminal."
10578 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
10579
10580 #: git-am.sh:825
10581 msgid "Commit Body is:"
10582 msgstr "提交内容为："
10583
10584 #  译者：注意保持句尾空格
10585 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10586 #. in your translation. The program will only accept English
10587 #. input at this point.
10588 #: git-am.sh:832
10589 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10590 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10591
10592 #: git-am.sh:868
10593 #, sh-format
10594 msgid "Applying: $FIRSTLINE"
10595 msgstr "正应用：$FIRSTLINE"
10596
10597 #: git-am.sh:889
10598 msgid ""
10599 "No changes - did you forget to use 'git add'?\n"
10600 "If there is nothing left to stage, chances are that something else\n"
10601 "already introduced the same changes; you might want to skip this patch."
10602 msgstr ""
10603 "没有变更 —— 您是不是忘了执行 'git add'？\n"
10604 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
10605 "您也许想要跳过这个补丁。"
10606
10607 #: git-am.sh:897
10608 msgid ""
10609 "You still have unmerged paths in your index\n"
10610 "did you forget to use 'git add'?"
10611 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
10612
10613 #: git-am.sh:913
10614 msgid "No changes -- Patch already applied."
10615 msgstr "没有变更 —— 补丁已经应用过。"
10616
10617 #: git-am.sh:923
10618 #, sh-format
10619 msgid "Patch failed at $msgnum $FIRSTLINE"
10620 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10621
10622 #: git-am.sh:926
10623 #, sh-format
10624 msgid ""
10625 "The copy of the patch that failed is found in:\n"
10626 "   $dotest/patch"
10627 msgstr ""
10628 "失败的补丁文件副本位于：\n"
10629 "   $dotest/patch"
10630
10631 #: git-am.sh:945
10632 msgid "applying to an empty history"
10633 msgstr "正应用到一个空历史上"
10634
10635 #: git-bisect.sh:48
10636 msgid "You need to start by \"git bisect start\""
10637 msgstr "您需要执行 \"git bisect start\" 来开始"
10638
10639 #  译者：注意保持句尾空格
10640 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10641 #. translation. The program will only accept English input
10642 #. at this point.
10643 #: git-bisect.sh:54
10644 msgid "Do you want me to do it for you [Y/n]? "
10645 msgstr "您想让我为您这样做么[Y/n]？ "
10646
10647 #: git-bisect.sh:95
10648 #, sh-format
10649 msgid "unrecognised option: '$arg'"
10650 msgstr "未能识别的选项：'$arg'"
10651
10652 #: git-bisect.sh:99
10653 #, sh-format
10654 msgid "'$arg' does not appear to be a valid revision"
10655 msgstr "'$arg' 看起来不像是一个有效的版本"
10656
10657 #: git-bisect.sh:117
10658 msgid "Bad HEAD - I need a HEAD"
10659 msgstr "坏的 HEAD - 我需要一个 HEAD"
10660
10661 #: git-bisect.sh:130
10662 #, sh-format
10663 msgid ""
10664 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10665 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10666
10667 #: git-bisect.sh:140
10668 msgid "won't bisect on cg-seek'ed tree"
10669 msgstr "不会在做了 cg-seek 的树上做二分查找"
10670
10671 #: git-bisect.sh:144
10672 msgid "Bad HEAD - strange symbolic ref"
10673 msgstr "坏的 HEAD - 奇怪的符号引用"
10674
10675 #: git-bisect.sh:189
10676 #, sh-format
10677 msgid "Bad bisect_write argument: $state"
10678 msgstr "坏的 bisect_write 参数：$state"
10679
10680 #: git-bisect.sh:218
10681 #, sh-format
10682 msgid "Bad rev input: $arg"
10683 msgstr "输入坏的版本：$arg"
10684
10685 #: git-bisect.sh:232
10686 msgid "Please call 'bisect_state' with at least one argument."
10687 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10688
10689 #: git-bisect.sh:244
10690 #, sh-format
10691 msgid "Bad rev input: $rev"
10692 msgstr "输入坏的版本：$rev"
10693
10694 #: git-bisect.sh:253
10695 msgid "'git bisect bad' can take only one argument."
10696 msgstr "'git bisect bad' 只能带一个参数。"
10697
10698 #: git-bisect.sh:276
10699 msgid "Warning: bisecting only with a bad commit."
10700 msgstr "警告：在仅有一个坏提交下进行二分查找。"
10701
10702 #  译者：注意保持句尾空格
10703 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10704 #. translation. The program will only accept English input
10705 #. at this point.
10706 #: git-bisect.sh:282
10707 msgid "Are you sure [Y/n]? "
10708 msgstr "您确认么[Y/n]？ "
10709
10710 #: git-bisect.sh:292
10711 msgid ""
10712 "You need to give me at least one good and one bad revision.\n"
10713 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10714 msgstr ""
10715 "您需要给我至少一个好版本和一个坏版本。\n"
10716 "（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"
10717
10718 #: git-bisect.sh:295
10719 msgid ""
10720 "You need to start by \"git bisect start\".\n"
10721 "You then need to give me at least one good and one bad revision.\n"
10722 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10723 msgstr ""
10724 "您需要执行 \"git bisect start\" 来开始。\n"
10725 "然后需要提供我至少一个好版本和一个坏版本。\n"
10726 "（为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。）"
10727
10728 #: git-bisect.sh:366 git-bisect.sh:493
10729 msgid "We are not bisecting."
10730 msgstr "我们没有在二分查找。"
10731
10732 #: git-bisect.sh:373
10733 #, sh-format
10734 msgid "'$invalid' is not a valid commit"
10735 msgstr "'$invalid' 不是一个有效的提交"
10736
10737 #: git-bisect.sh:382
10738 #, sh-format
10739 msgid ""
10740 "Could not check out original HEAD '$branch'.\n"
10741 "Try 'git bisect reset <commit>'."
10742 msgstr ""
10743 "不能检出原始 HEAD '$branch'。\n"
10744 "尝试 'git bisect reset <提交>'。"
10745
10746 #: git-bisect.sh:409
10747 msgid "No logfile given"
10748 msgstr "未提供日志文件"
10749
10750 #: git-bisect.sh:410
10751 #, sh-format
10752 msgid "cannot read $file for replaying"
10753 msgstr "不能读取 $file 来重放"
10754
10755 #: git-bisect.sh:427
10756 msgid "?? what are you talking about?"
10757 msgstr "?? 您在说什么?"
10758
10759 #: git-bisect.sh:439
10760 #, sh-format
10761 msgid "running $command"
10762 msgstr "运行 $command"
10763
10764 #: git-bisect.sh:446
10765 #, sh-format
10766 msgid ""
10767 "bisect run failed:\n"
10768 "exit code $res from '$command' is < 0 or >= 128"
10769 msgstr ""
10770 "二分查找运行失败：\n"
10771 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10772
10773 #: git-bisect.sh:472
10774 msgid "bisect run cannot continue any more"
10775 msgstr "二分查找不能继续运行"
10776
10777 #: git-bisect.sh:478
10778 #, sh-format
10779 msgid ""
10780 "bisect run failed:\n"
10781 "'bisect_state $state' exited with error code $res"
10782 msgstr ""
10783 "二分查找运行失败：\n"
10784 "'bisect_state $state' 退出码为 $res"
10785
10786 #: git-bisect.sh:485
10787 msgid "bisect run success"
10788 msgstr "二分查找运行成功"
10789
10790 #: git-pull.sh:61
10791 msgid ""
10792 "Pull is not possible because you have unmerged files.\n"
10793 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10794 "as appropriate to mark resolution and make a commit."
10795 msgstr ""
10796 "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
10797 "然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。"
10798
10799 #: git-pull.sh:65
10800 msgid "Pull is not possible because you have unmerged files."
10801 msgstr "Pull 不可用，因为您尚有未合并的文件。"
10802
10803 #: git-pull.sh:71
10804 msgid ""
10805 "You have not concluded your merge (MERGE_HEAD exists).\n"
10806 "Please, commit your changes before you can merge."
10807 msgstr ""
10808 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
10809 "请在合并前先提交您的修改。"
10810
10811 #: git-pull.sh:285
10812 msgid "updating an unborn branch with changes added to the index"
10813 msgstr "更新尚未诞生的分支，变更添加至索引"
10814
10815 #: git-pull.sh:311
10816 #, sh-format
10817 msgid ""
10818 "Warning: fetch updated the current branch head.\n"
10819 "Warning: fast-forwarding your working tree from\n"
10820 "Warning: commit $orig_head."
10821 msgstr ""
10822 "警告：fetch 更新了当前的分支。您的工作区\n"
10823 "警告：从原提交 $orig_head 快进。"
10824
10825 #: git-pull.sh:336
10826 msgid "Cannot merge multiple branches into empty head"
10827 msgstr "无法将多个分支合并到空分支"
10828
10829 #: git-pull.sh:340
10830 msgid "Cannot rebase onto multiple branches"
10831 msgstr "无法变基到多个分支"
10832
10833 #: git-rebase.sh:57
10834 msgid ""
10835 "When you have resolved this problem, run \"git rebase --continue\".\n"
10836 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10837 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10838 "\"."
10839 msgstr ""
10840 "当您解决了此问题后，执行 \"git rebase --continue\"。\n"
10841 "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
10842 "要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
10843
10844 #: git-rebase.sh:165
10845 msgid "Applied autostash."
10846 msgstr "成功应用 autostash。"
10847
10848 #: git-rebase.sh:168
10849 #, sh-format
10850 msgid "Cannot store $stash_sha1"
10851 msgstr "无法保存 $stash_sha1"
10852
10853 #: git-rebase.sh:169
10854 msgid ""
10855 "Applying autostash resulted in conflicts.\n"
10856 "Your changes are safe in the stash.\n"
10857 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10858 msgstr ""
10859 "应用 autostash 导致冲突。\n"
10860 "您的修改安全地保存在 stash 中。\n"
10861 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10862
10863 #: git-rebase.sh:208
10864 msgid "The pre-rebase hook refused to rebase."
10865 msgstr "钩子 pre-rebase 拒绝变基操作。"
10866
10867 #: git-rebase.sh:213
10868 msgid "It looks like git-am is in progress. Cannot rebase."
10869 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10870
10871 #: git-rebase.sh:351
10872 msgid "The --exec option must be used with the --interactive option"
10873 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10874
10875 #: git-rebase.sh:356
10876 msgid "No rebase in progress?"
10877 msgstr "没有正在进行的变基？"
10878
10879 #: git-rebase.sh:367
10880 msgid "The --edit-todo action can only be used during interactive rebase."
10881 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10882
10883 #: git-rebase.sh:374
10884 msgid "Cannot read HEAD"
10885 msgstr "不能读取 HEAD"
10886
10887 #: git-rebase.sh:377
10888 msgid ""
10889 "You must edit all merge conflicts and then\n"
10890 "mark them as resolved using git add"
10891 msgstr ""
10892 "您必须编辑所有的合并冲突，然后通过 git add\n"
10893 "命令将它们标记为已解决"
10894
10895 #: git-rebase.sh:395
10896 #, sh-format
10897 msgid "Could not move back to $head_name"
10898 msgstr "无法移回 $head_name"
10899
10900 #: git-rebase.sh:414
10901 #, sh-format
10902 msgid ""
10903 "It seems that there is already a $state_dir_base directory, and\n"
10904 "I wonder if you are in the middle of another rebase.  If that is the\n"
10905 "case, please try\n"
10906 "\t$cmd_live_rebase\n"
10907 "If that is not the case, please\n"
10908 "\t$cmd_clear_stale_rebase\n"
10909 "and run me again.  I am stopping in case you still have something\n"
10910 "valuable there."
10911 msgstr ""
10912 "好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
10913 "过程中。 如果是这样，请执行\n"
10914 "\t$cmd_live_rebase\n"
10915 "如果不是这样，请执行\n"
10916 "\t$cmd_clear_stale_rebase\n"
10917 "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
10918
10919 #: git-rebase.sh:465
10920 #, sh-format
10921 msgid "invalid upstream $upstream_name"
10922 msgstr "无效的上游 $upstream_name"
10923
10924 #: git-rebase.sh:489
10925 #, sh-format
10926 msgid "$onto_name: there are more than one merge bases"
10927 msgstr "$onto_name: 有一个以上的合并基准"
10928
10929 #: git-rebase.sh:492 git-rebase.sh:496
10930 #, sh-format
10931 msgid "$onto_name: there is no merge base"
10932 msgstr "$onto_name: 没有合并基准"
10933
10934 #: git-rebase.sh:501
10935 #, sh-format
10936 msgid "Does not point to a valid commit: $onto_name"
10937 msgstr "没有指向一个有效的提交：$onto_name"
10938
10939 #: git-rebase.sh:524
10940 #, sh-format
10941 msgid "fatal: no such branch: $branch_name"
10942 msgstr "严重错误：无此分支：$branch_name"
10943
10944 #: git-rebase.sh:557
10945 msgid "Cannot autostash"
10946 msgstr "无法 autostash"
10947
10948 #: git-rebase.sh:562
10949 #, sh-format
10950 msgid "Created autostash: $stash_abbrev"
10951 msgstr "创建了 autostash: $stash_abbrev"
10952
10953 #: git-rebase.sh:566
10954 msgid "Please commit or stash them."
10955 msgstr "请提交或为它们保存进度。"
10956
10957 #: git-rebase.sh:586
10958 #, sh-format
10959 msgid "Current branch $branch_name is up to date."
10960 msgstr "当前分支 $branch_name 是最新的。"
10961
10962 #: git-rebase.sh:590
10963 #, sh-format
10964 msgid "Current branch $branch_name is up to date, rebase forced."
10965 msgstr "当前分支 $branch_name 是最新的，强制变基。"
10966
10967 #: git-rebase.sh:601
10968 #, sh-format
10969 msgid "Changes from $mb to $onto:"
10970 msgstr "变更从 $mb 到 $onto："
10971
10972 #: git-rebase.sh:610
10973 msgid "First, rewinding head to replay your work on top of it..."
10974 msgstr "首先，回退分支以便在上面重放您的工作..."
10975
10976 #: git-rebase.sh:620
10977 #, sh-format
10978 msgid "Fast-forwarded $branch_name to $onto_name."
10979 msgstr "快进 $branch_name 至 $onto_name。"
10980
10981 #: git-stash.sh:51
10982 msgid "git stash clear with parameters is unimplemented"
10983 msgstr "git stash clear 不支持参数"
10984
10985 #: git-stash.sh:74
10986 msgid "You do not have the initial commit yet"
10987 msgstr "您尚未建立初始提交"
10988
10989 #: git-stash.sh:89
10990 msgid "Cannot save the current index state"
10991 msgstr "无法保存当前索引状态"
10992
10993 #: git-stash.sh:124 git-stash.sh:137
10994 msgid "Cannot save the current worktree state"
10995 msgstr "无法保存当前工作区状态"
10996
10997 #: git-stash.sh:141
10998 msgid "No changes selected"
10999 msgstr "没有选择变更"
11000
11001 #: git-stash.sh:144
11002 msgid "Cannot remove temporary index (can't happen)"
11003 msgstr "无法删除临时索引（不应发生）"
11004
11005 #: git-stash.sh:157
11006 msgid "Cannot record working tree state"
11007 msgstr "不能记录工作区状态"
11008
11009 #: git-stash.sh:191
11010 #, sh-format
11011 msgid "Cannot update $ref_stash with $w_commit"
11012 msgstr "无法用 $w_commit 更新 $ref_stash"
11013
11014 #. TRANSLATORS: $option is an invalid option, like
11015 #. `--blah-blah'. The 7 spaces at the beginning of the
11016 #. second line correspond to "error: ". So you should line
11017 #. up the second line with however many characters the
11018 #. translation of "error: " takes in your language. E.g. in
11019 #. English this is:
11020 #.
11021 #. $ git stash save --blah-blah 2>&1 | head -n 2
11022 #. error: unknown option for 'stash save': --blah-blah
11023 #. To provide a message, use git stash save -- '--blah-blah'
11024 #: git-stash.sh:241
11025 #, sh-format
11026 msgid ""
11027 "error: unknown option for 'stash save': $option\n"
11028 "       To provide a message, use git stash save -- '$option'"
11029 msgstr ""
11030 "错误：'stash save' 的未知选项：$option\n"
11031 "      要提供一个描述信息，使用 git stash save -- '$option'"
11032
11033 #: git-stash.sh:262
11034 msgid "No local changes to save"
11035 msgstr "没有要保存的本地修改"
11036
11037 #: git-stash.sh:266
11038 msgid "Cannot initialize stash"
11039 msgstr "无法初始化 stash"
11040
11041 #: git-stash.sh:270
11042 msgid "Cannot save the current status"
11043 msgstr "无法保存当前状态"
11044
11045 #: git-stash.sh:288
11046 msgid "Cannot remove worktree changes"
11047 msgstr "无法删除工作区变更"
11048
11049 #: git-stash.sh:389
11050 #, sh-format
11051 msgid "unknown option: $opt"
11052 msgstr "未知选项: $opt"
11053
11054 #: git-stash.sh:399
11055 msgid "No stash found."
11056 msgstr "未发现 stash。"
11057
11058 #: git-stash.sh:406
11059 #, sh-format
11060 msgid "Too many revisions specified: $REV"
11061 msgstr "指定了太多的版本：$REV"
11062
11063 #: git-stash.sh:412
11064 #, sh-format
11065 msgid "$reference is not a valid reference"
11066 msgstr "$reference 不是一个有效的引用"
11067
11068 #: git-stash.sh:440
11069 #, sh-format
11070 msgid "'$args' is not a stash-like commit"
11071 msgstr "'$args' 不是 stash 样提交"
11072
11073 #: git-stash.sh:451
11074 #, sh-format
11075 msgid "'$args' is not a stash reference"
11076 msgstr "'$args' 不是一个 stash 引用"
11077
11078 #: git-stash.sh:459
11079 msgid "unable to refresh index"
11080 msgstr "无法刷新索引"
11081
11082 #: git-stash.sh:463
11083 msgid "Cannot apply a stash in the middle of a merge"
11084 msgstr "无法在合并过程中恢复进度"
11085
11086 #: git-stash.sh:471
11087 msgid "Conflicts in index. Try without --index."
11088 msgstr "索引中有冲突。尝试不使用 --index。"
11089
11090 #: git-stash.sh:473
11091 msgid "Could not save index tree"
11092 msgstr "不能保存索引树"
11093
11094 #: git-stash.sh:507
11095 msgid "Cannot unstage modified files"
11096 msgstr "无法将修改的文件取消暂存"
11097
11098 #: git-stash.sh:522
11099 msgid "Index was not unstashed."
11100 msgstr "索引的进度没有被恢复。"
11101
11102 #: git-stash.sh:545
11103 #, sh-format
11104 msgid "Dropped ${REV} ($s)"
11105 msgstr "丢弃了 ${REV} ($s)"
11106
11107 #: git-stash.sh:546
11108 #, sh-format
11109 msgid "${REV}: Could not drop stash entry"
11110 msgstr "${REV}：不能丢弃进度条目"
11111
11112 #: git-stash.sh:554
11113 msgid "No branch name specified"
11114 msgstr "未指定分支名"
11115
11116 #: git-stash.sh:626
11117 msgid "(To restore them type \"git stash apply\")"
11118 msgstr "（为恢复数据输入 \"git stash apply\"）"
11119
11120 #: git-submodule.sh:95
11121 #, sh-format
11122 msgid "cannot strip one component off url '$remoteurl'"
11123 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11124
11125 #: git-submodule.sh:237
11126 #, sh-format
11127 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11128 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
11129
11130 #: git-submodule.sh:287
11131 #, sh-format
11132 msgid "Clone of '$url' into submodule path '$sm_path' failed"
11133 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
11134
11135 #: git-submodule.sh:296
11136 #, sh-format
11137 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11138 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11139
11140 #: git-submodule.sh:406
11141 msgid "Relative path can only be used from the toplevel of the working tree"
11142 msgstr "只能在工作区的顶级目录中使用相对路径"
11143
11144 #: git-submodule.sh:416
11145 #, sh-format
11146 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11147 msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
11148
11149 #: git-submodule.sh:433
11150 #, sh-format
11151 msgid "'$sm_path' already exists in the index"
11152 msgstr "'$sm_path' 已经存在于索引中"
11153
11154 #: git-submodule.sh:437
11155 #, sh-format
11156 msgid ""
11157 "The following path is ignored by one of your .gitignore files:\n"
11158 "$sm_path\n"
11159 "Use -f if you really want to add it."
11160 msgstr ""
11161 "以下路径被您的一个 .gitignore 文件所忽略：\n"
11162 "$sm_path\n"
11163 "如果您确实想添加它，使用 -f 参数。"
11164
11165 #: git-submodule.sh:455
11166 #, sh-format
11167 msgid "Adding existing repo at '$sm_path' to the index"
11168 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11169
11170 #: git-submodule.sh:457
11171 #, sh-format
11172 msgid "'$sm_path' already exists and is not a valid git repo"
11173 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11174
11175 #: git-submodule.sh:465
11176 #, sh-format
11177 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11178 msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
11179
11180 #: git-submodule.sh:467
11181 #, sh-format
11182 msgid ""
11183 "If you want to reuse this local git directory instead of cloning again from"
11184 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11185
11186 #: git-submodule.sh:469
11187 #, sh-format
11188 msgid ""
11189 "use the '--force' option. If the local git directory is not the correct repo"
11190 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11191
11192 #: git-submodule.sh:470
11193 #, sh-format
11194 msgid ""
11195 "or you are unsure what this means choose another name with the '--name' "
11196 "option."
11197 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11198
11199 #: git-submodule.sh:472
11200 #, sh-format
11201 msgid "Reactivating local git directory for submodule '$sm_name'."
11202 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11203
11204 #: git-submodule.sh:484
11205 #, sh-format
11206 msgid "Unable to checkout submodule '$sm_path'"
11207 msgstr "不能检出子模组 '$sm_path'"
11208
11209 #: git-submodule.sh:489
11210 #, sh-format
11211 msgid "Failed to add submodule '$sm_path'"
11212 msgstr "无法添加子模组 '$sm_path'"
11213
11214 #: git-submodule.sh:498
11215 #, sh-format
11216 msgid "Failed to register submodule '$sm_path'"
11217 msgstr "无法注册子模组 '$sm_path'"
11218
11219 #: git-submodule.sh:542
11220 #, sh-format
11221 msgid "Entering '$prefix$displaypath'"
11222 msgstr "正在进入 '$prefix$displaypath'"
11223
11224 #: git-submodule.sh:562
11225 #, sh-format
11226 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11227 msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
11228
11229 #: git-submodule.sh:608
11230 #, sh-format
11231 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11232 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11233
11234 #: git-submodule.sh:617
11235 #, sh-format
11236 msgid "Failed to register url for submodule path '$displaypath'"
11237 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11238
11239 #: git-submodule.sh:619
11240 #, sh-format
11241 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11242 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11243
11244 #: git-submodule.sh:636
11245 #, sh-format
11246 msgid "Failed to register update mode for submodule path '$displaypath'"
11247 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11248
11249 #: git-submodule.sh:674
11250 #, sh-format
11251 msgid "Use '.' if you really want to deinitialize all submodules"
11252 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11253
11254 #: git-submodule.sh:691
11255 #, sh-format
11256 msgid "Submodule work tree '$displaypath' contains a .git directory"
11257 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11258
11259 #: git-submodule.sh:692
11260 #, sh-format
11261 msgid ""
11262 "(use 'rm -rf' if you really want to remove it including all of its history)"
11263 msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
11264
11265 #: git-submodule.sh:698
11266 #, sh-format
11267 msgid ""
11268 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11269 "discard them"
11270 msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
11271
11272 #: git-submodule.sh:701
11273 #, sh-format
11274 msgid "Cleared directory '$displaypath'"
11275 msgstr "已清除目录 '$displaypath'"
11276
11277 #: git-submodule.sh:702
11278 #, sh-format
11279 msgid "Could not remove submodule work tree '$displaypath'"
11280 msgstr "无法移除子模组工作区 '$displaypath'"
11281
11282 #: git-submodule.sh:705
11283 #, sh-format
11284 msgid "Could not create empty submodule directory '$displaypath'"
11285 msgstr "不能创建空的子模组目录 '$displaypath'"
11286
11287 #: git-submodule.sh:714
11288 #, sh-format
11289 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11290 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11291
11292 #: git-submodule.sh:830
11293 #, sh-format
11294 msgid ""
11295 "Submodule path '$displaypath' not initialized\n"
11296 "Maybe you want to use 'update --init'?"
11297 msgstr ""
11298 "子模组路径 '$displaypath' 没有初始化\n"
11299 "也许您想用 'update --init'？"
11300
11301 #: git-submodule.sh:843
11302 #, sh-format
11303 msgid "Unable to find current revision in submodule path '$displaypath'"
11304 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11305
11306 #: git-submodule.sh:852
11307 #, sh-format
11308 msgid "Unable to fetch in submodule path '$sm_path'"
11309 msgstr "无法在子模组路径 '$sm_path' 中获取"
11310
11311 #: git-submodule.sh:876
11312 #, sh-format
11313 msgid "Unable to fetch in submodule path '$displaypath'"
11314 msgstr "无法在子模组路径 '$displaypath' 中获取"
11315
11316 #: git-submodule.sh:890
11317 #, sh-format
11318 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11319 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11320
11321 #: git-submodule.sh:891
11322 #, sh-format
11323 msgid "Submodule path '$displaypath': checked out '$sha1'"
11324 msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
11325
11326 #: git-submodule.sh:895
11327 #, sh-format
11328 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11329 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11330
11331 #: git-submodule.sh:896
11332 #, sh-format
11333 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11334 msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
11335
11336 #: git-submodule.sh:901
11337 #, sh-format
11338 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11339 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11340
11341 #: git-submodule.sh:902
11342 #, sh-format
11343 msgid "Submodule path '$displaypath': merged in '$sha1'"
11344 msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
11345
11346 #: git-submodule.sh:907
11347 #, sh-format
11348 msgid ""
11349 "Execution of '$command $sha1' failed in submodule  path '$prefix$sm_path'"
11350 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11351
11352 #: git-submodule.sh:908
11353 #, sh-format
11354 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11355 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11356
11357 #: git-submodule.sh:938
11358 #, sh-format
11359 msgid "Failed to recurse into submodule path '$displaypath'"
11360 msgstr "无法递归进子模组路径 '$displaypath'"
11361
11362 #: git-submodule.sh:1046
11363 msgid "The --cached option cannot be used with the --files option"
11364 msgstr "选项 --cached 不能和选项 --files 同时使用"
11365
11366 #: git-submodule.sh:1098
11367 #, sh-format
11368 msgid "unexpected mode $mod_dst"
11369 msgstr "意外的模式 $mod_dst"
11370
11371 #  译者：注意保持前导空格
11372 #: git-submodule.sh:1118
11373 #, sh-format
11374 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
11375 msgstr "  警告：$display_name 未包含提交 $sha1_src"
11376
11377 #  译者：注意保持前导空格
11378 #: git-submodule.sh:1121
11379 #, sh-format
11380 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
11381 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
11382
11383 #  译者：注意保持前导空格
11384 #: git-submodule.sh:1124
11385 #, sh-format
11386 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11387 msgstr "  警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11388
11389 #: git-submodule.sh:1149
11390 msgid "blob"
11391 msgstr "数据对象"
11392
11393 #: git-submodule.sh:1267
11394 #, sh-format
11395 msgid "Failed to recurse into submodule path '$sm_path'"
11396 msgstr "无法递归进子模组路径 '$sm_path'"
11397
11398 #: git-submodule.sh:1331
11399 #, sh-format
11400 msgid "Synchronizing submodule url for '$displaypath'"
11401 msgstr "为 '$displaypath' 同步子模组 url"