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 message                   |  提交说明
  42 #   commit object                    |  提交对象
  43 #   commit-ish (also committish)     |  提交号
  44 #   conflict                         |  冲突
  45 #   core Git                         |  核心 Git 工具
  46 #   DAG                              |  有向无环图
  47 #   dangling object                  |  摇摆对象
  48 #   detached HEAD                    |  分离头指针
  49 #   directory                        |  目录
  50 #   dirty                            |  脏（的工作区）
  51 #   dumb HTTP protocol               |  哑 HTTP 协议
  52 #   evil merge                       |  坏合并（合并引入了父提交没有的修改）
  53 #   fast-forward                     |  快进
  54 #   fetch                            |  获取
  55 #   file system                      |  文件系统
  56 #   fork                             |  派生
  57 #   Git archive                      |  仓库（对于 arch 用户）
  58 #   gitfile                          |  gitfile（仓库链接文件）
  59 #   grafts                           |  （提交）嫁接
  60 #   hash                             |  哈希值
  61 #   HEAD                             |  HEAD（头指针，亦即当前分支）
  62 #   head                             |  头、分支
  63 #   head ref                         |  分支
  64 #   header                           |  头信息
  65 #   hook                             |  钩子
  66 #   hunk                             |  补丁片段
  67 #   index                            |  索引
  68 #   index entry                      |  索引条目
  69 #   loose object                     |  松散对象
  70 #   loose refs                       |  松散引用
  71 #   master                           |  master（默认分支名）
  72 #   merge                            |  合并
  73 #   object                           |  对象
  74 #   object database                  |  对象库
  75 #   object identifier                |  对象标识符
  76 #   object name                      |  对象名称
  77 #   object type                      |  对象类型
  78 #   octopus                          |  章鱼式合并（两分支以上的合并）
  79 #   origin                           |  origin（默认的远程名称）
  80 #   pack                             |  包
  81 #   pack index                       |  包索引
  82 #   packfile                         |  包文件
  83 #   parent                           |  父提交
  84 #   patch                            |  补丁
  85 #   pathspec                         |  路径规格
  86 #   pattern                          |  模式
  87 #   pickaxe                          |  挖掘
  88 #   plumbing                         |  管件（Git 底层核心命令的别称）
  89 #   porcelain                        |  瓷件（Git 上层封装命令的别称）
  90 #   precious-objects repo            |  珍品仓库
  91 #   prune                            |  清除
  92 #   pull                             |  拉，拉取
  93 #   push                             |  推，推送
  94 #   reachable                        |  可达
  95 #   rebase                           |  变基
  96 #   ref                              |  引用
  97 #   reflog                           |  引用日志
  98 #   refspec                          |  引用规格
  99 #   remote                           |  远程，远程仓库
 100 #   remote-tracking branch           |  远程跟踪分支
 101 #   replay                           |  重放
 102 #   repo                             |  仓库
 103 #   repository                       |  仓库
 104 #   resolve                          |  （冲突）解决
 105 #   revert                           |  还原
 106 #   revision                         |  版本
 107 #   rewind                           |  回退
 108 #   SCM                              |  源代码管理（工具）
 109 #   SHA-1                            |  SHA-1（安全哈希算法1）
 110 #   shallow repository               |  浅（克隆）仓库
 111 #   signed tag                       |  签名标签
 112 #   smart HTTP protocol              |  智能 HTTP 协议
 113 #   squash                           |  压缩
 114 #   stage                            |  n. 暂存区（即索引）; v. 暂存
 115 #   stash                            |  n. 进度保存; v. 保存进度
 116 #   submodule                        |  子模组
 117 #   symref                           |  符号引用
 118 #   tag                              |  n. 标签; v. 打标签
 119 #   tag object                       |  标签对象
 120 #   tagger                           |  打标签者
 121 #   topic branch                     |  主题分支
 122 #   track                            |  跟踪
 123 #   tree                             |  树（工作区或树对象）
 124 #   tree object                      |  树对象
 125 #   tree-ish (also treeish)          |  树对象（或可以解析为一树对象）
 126 #   unmerged index                   |  未合并索引
 127 #   unpack                           |  解包
 128 #   unreachable object               |  不可达对象
 129 #   unstage                          |  取消暂存
 130 #   upstream                         |  上游
 131 #   upstream branch                  |  上游分支
 132 #   working tree                     |  工作区
 133 #
 134 msgid ""
 135 msgstr ""
 136 "Project-Id-Version: Git\n"
 137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 138 "POT-Creation-Date: 2015-12-22 22:50+0800\n"
 139 "PO-Revision-Date: 2015-12-22 23:06+0800\n"
 140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 142 "Language: zh_CN\n"
 143 "MIME-Version: 1.0\n"
 144 "Content-Type: text/plain; charset=UTF-8\n"
 145 "Content-Transfer-Encoding: 8bit\n"
 146 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 147
 148 #: advice.c:55
 149 #, c-format
 150 msgid "hint: %.*s\n"
 151 msgstr "提示：%.*s\n"
 152
 153 #: advice.c:88
 154 msgid ""
 155 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 156 "as appropriate to mark resolution and make a commit."
 157 msgstr ""
 158 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 159 "解决方案并提交。"
 160
 161 #: advice.c:101 builtin/merge.c:1225
 162 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 163 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
 164
 165 #: advice.c:103
 166 msgid "Please, commit your changes before merging."
 167 msgstr "请在合并前先提交您的修改。"
 168
 169 #: advice.c:104
 170 msgid "Exiting because of unfinished merge."
 171 msgstr "因为存在未完成的合并而退出。"
 172
 173 #: archive.c:12
 174 msgid "git archive [<options>] <tree-ish> [<path>...]"
 175 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 176
 177 #: archive.c:13
 178 msgid "git archive --list"
 179 msgstr "git archive --list"
 180
 181 #: archive.c:14
 182 msgid ""
 183 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 184 msgstr ""
 185 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 186
 187 #: archive.c:15
 188 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 189 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 190
 191 #: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
 192 #, c-format
 193 msgid "pathspec '%s' did not match any files"
 194 msgstr "路径规格 '%s' 未匹配任何文件"
 195
 196 #: archive.c:429
 197 msgid "fmt"
 198 msgstr "格式"
 199
 200 #: archive.c:429
 201 msgid "archive format"
 202 msgstr "归档格式"
 203
 204 #: archive.c:430 builtin/log.c:1229
 205 msgid "prefix"
 206 msgstr "前缀"
 207
 208 #: archive.c:431
 209 msgid "prepend prefix to each pathname in the archive"
 210 msgstr "为归档中每个路径名加上前缀"
 211
 212 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535
 213 #: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
 214 #: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
 215 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
 216 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
 217 msgid "file"
 218 msgstr "文件"
 219
 220 #: archive.c:433 builtin/archive.c:89
 221 msgid "write the archive to this file"
 222 msgstr "归档写入此文件"
 223
 224 #: archive.c:435
 225 msgid "read .gitattributes in working directory"
 226 msgstr "读取工作区中的 .gitattributes"
 227
 228 #: archive.c:436
 229 msgid "report archived files on stderr"
 230 msgstr "在标准错误上报告归档文件"
 231
 232 #: archive.c:437
 233 msgid "store only"
 234 msgstr "只存储"
 235
 236 #: archive.c:438
 237 msgid "compress faster"
 238 msgstr "压缩速度更快"
 239
 240 #: archive.c:446
 241 msgid "compress better"
 242 msgstr "压缩效果更好"
 243
 244 #: archive.c:449
 245 msgid "list supported archive formats"
 246 msgstr "列出支持的归档格式"
 247
 248 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:77
 249 msgid "repo"
 250 msgstr "仓库"
 251
 252 #: archive.c:452 builtin/archive.c:91
 253 msgid "retrieve the archive from remote repository <repo>"
 254 msgstr "从远程仓库（<仓库>）提取归档文件"
 255
 256 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:479
 257 msgid "command"
 258 msgstr "命令"
 259
 260 #: archive.c:454 builtin/archive.c:93
 261 msgid "path to the remote git-upload-archive command"
 262 msgstr "远程 git-upload-archive 命令的路径"
 263
 264 #: attr.c:265
 265 msgid ""
 266 "Negative patterns are ignored in git attributes\n"
 267 "Use '\\!' for literal leading exclamation."
 268 msgstr ""
 269 "负值模版在 git attributes 中被忽略\n"
 270 "当字符串确实要以感叹号开始时，使用 '\\!'。"
 271
 272 #: branch.c:61
 273 #, c-format
 274 msgid "Not setting branch %s as its own upstream."
 275 msgstr "未设置分支 %s 作为它自己的上游。"
 276
 277 #: branch.c:84
 278 #, c-format
 279 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
 280 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
 281
 282 #: branch.c:85
 283 #, c-format
 284 msgid "Branch %s set up to track remote branch %s from %s."
 285 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
 286
 287 #: branch.c:89
 288 #, c-format
 289 msgid "Branch %s set up to track local branch %s by rebasing."
 290 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
 291
 292 #: branch.c:90
 293 #, c-format
 294 msgid "Branch %s set up to track local branch %s."
 295 msgstr "分支 %s 设置为跟踪本地分支 %s。"
 296
 297 #: branch.c:95
 298 #, c-format
 299 msgid "Branch %s set up to track remote ref %s by rebasing."
 300 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
 301
 302 #: branch.c:96
 303 #, c-format
 304 msgid "Branch %s set up to track remote ref %s."
 305 msgstr "分支 %s 设置为跟踪远程引用 %s。"
 306
 307 #: branch.c:100
 308 #, c-format
 309 msgid "Branch %s set up to track local ref %s by rebasing."
 310 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
 311
 312 #: branch.c:101
 313 #, c-format
 314 msgid "Branch %s set up to track local ref %s."
 315 msgstr "分支 %s 设置为跟踪本地引用 %s。"
 316
 317 #: branch.c:134
 318 #, c-format
 319 msgid "Not tracking: ambiguous information for ref %s"
 320 msgstr "未跟踪：引用 %s 有歧义"
 321
 322 #: branch.c:163
 323 #, c-format
 324 msgid "'%s' is not a valid branch name."
 325 msgstr "'%s' 不是一个有效的分支名称。"
 326
 327 #: branch.c:168
 328 #, c-format
 329 msgid "A branch named '%s' already exists."
 330 msgstr "一个分支名 '%s' 已经存在。"
 331
 332 #: branch.c:176
 333 msgid "Cannot force update the current branch."
 334 msgstr "无法强制更新当前分支。"
 335
 336 #: branch.c:196
 337 #, c-format
 338 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 339 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
 340
 341 #: branch.c:198
 342 #, c-format
 343 msgid "the requested upstream branch '%s' does not exist"
 344 msgstr "请求的上游分支 '%s' 不存在"
 345
 346 #: branch.c:200
 347 msgid ""
 348 "\n"
 349 "If you are planning on basing your work on an upstream\n"
 350 "branch that already exists at the remote, you may need to\n"
 351 "run \"git fetch\" to retrieve it.\n"
 352 "\n"
 353 "If you are planning to push out a new local branch that\n"
 354 "will track its remote counterpart, you may want to use\n"
 355 "\"git push -u\" to set the upstream config as you push."
 356 msgstr ""
 357 "\n"
 358 "如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
 359 "您可能需要执行 \"git fetch\" 来获取分支。\n"
 360 "\n"
 361 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
 362 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 363
 364 #: branch.c:244
 365 #, c-format
 366 msgid "Not a valid object name: '%s'."
 367 msgstr "不是一个有效的对象名：'%s'。"
 368
 369 #: branch.c:264
 370 #, c-format
 371 msgid "Ambiguous object name: '%s'."
 372 msgstr "歧义的对象名：'%s'。"
 373
 374 #: branch.c:269
 375 #, c-format
 376 msgid "Not a valid branch point: '%s'."
 377 msgstr "无效的分支点：'%s'。"
 378
 379 #: branch.c:322
 380 #, c-format
 381 msgid "'%s' is already checked out at '%s'"
 382 msgstr "'%s' 已经检出到 '%s'"
 383
 384 #: bundle.c:34
 385 #, c-format
 386 msgid "'%s' does not look like a v2 bundle file"
 387 msgstr "'%s' 不像是一个 v2 版本的包文件"
 388
 389 #: bundle.c:61
 390 #, c-format
 391 msgid "unrecognized header: %s%s (%d)"
 392 msgstr "未能识别的包头：%s%s (%d)"
 393
 394 #: bundle.c:87 builtin/commit.c:766
 395 #, c-format
 396 msgid "could not open '%s'"
 397 msgstr "不能打开 '%s'"
 398
 399 #: bundle.c:139
 400 msgid "Repository lacks these prerequisite commits:"
 401 msgstr "仓库中缺少这些必备的提交："
 402
 403 #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
 404 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
 405 #: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
 406 #: builtin/shortlog.c:158
 407 msgid "revision walk setup failed"
 408 msgstr "版本遍历设置失败"
 409
 410 #: bundle.c:185
 411 #, c-format
 412 msgid "The bundle contains this ref:"
 413 msgid_plural "The bundle contains these %d refs:"
 414 msgstr[0] "这个包中含有这个引用："
 415 msgstr[1] "这个包中含有 %d 个引用："
 416
 417 #: bundle.c:192
 418 msgid "The bundle records a complete history."
 419 msgstr "这个包记录一个完整历史。"
 420
 421 #: bundle.c:194
 422 #, c-format
 423 msgid "The bundle requires this ref:"
 424 msgid_plural "The bundle requires these %d refs:"
 425 msgstr[0] "这个包需要这个引用："
 426 msgstr[1] "这个包需要 %d 个引用："
 427
 428 #: bundle.c:253
 429 msgid "Could not spawn pack-objects"
 430 msgstr "不能生成 pack-objects 进程"
 431
 432 #: bundle.c:264
 433 msgid "pack-objects died"
 434 msgstr "pack-objects 终止"
 435
 436 #: bundle.c:304
 437 msgid "rev-list died"
 438 msgstr "rev-list 终止"
 439
 440 #: bundle.c:353
 441 #, c-format
 442 msgid "ref '%s' is excluded by the rev-list options"
 443 msgstr "引用 '%s' 被 rev-list 选项排除"
 444
 445 #: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
 446 #, c-format
 447 msgid "unrecognized argument: %s"
 448 msgstr "未能识别的参数：%s"
 449
 450 #: bundle.c:449
 451 msgid "Refusing to create empty bundle."
 452 msgstr "不能创建空包。"
 453
 454 #: bundle.c:459
 455 #, c-format
 456 msgid "cannot create '%s'"
 457 msgstr "不能创建 '%s'"
 458
 459 #: bundle.c:480
 460 msgid "index-pack died"
 461 msgstr "index-pack 终止"
 462
 463 #: color.c:275
 464 #, c-format
 465 msgid "invalid color value: %.*s"
 466 msgstr "无效的颜色值：%.*s"
 467
 468 #: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
 469 #: builtin/am.c:2149
 470 #, c-format
 471 msgid "could not parse %s"
 472 msgstr "不能解析 %s"
 473
 474 #: commit.c:42
 475 #, c-format
 476 msgid "%s %s is not a commit!"
 477 msgstr "%s %s 不是一个提交!"
 478
 479 #: compat/obstack.c:406 compat/obstack.c:408
 480 msgid "memory exhausted"
 481 msgstr "内存耗尽"
 482
 483 #: config.c:474 config.c:476
 484 #, c-format
 485 msgid "bad config file line %d in %s"
 486 msgstr "配置文件 %2$s 出错于第 %1$d 行"
 487
 488 #: config.c:592
 489 #, c-format
 490 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 491 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
 492
 493 #: config.c:594
 494 #, c-format
 495 msgid "bad numeric config value '%s' for '%s': %s"
 496 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
 497
 498 #: config.c:679
 499 #, c-format
 500 msgid "failed to expand user dir in: '%s'"
 501 msgstr "无法扩展 '%s' 中的用户目录"
 502
 503 #: config.c:757 config.c:768
 504 #, c-format
 505 msgid "bad zlib compression level %d"
 506 msgstr "错误的 zlib 压缩级别 %d"
 507
 508 #: config.c:890
 509 #, c-format
 510 msgid "invalid mode for object creation: %s"
 511 msgstr "无效的对象创建模式：%s"
 512
 513 #: config.c:1216
 514 msgid "unable to parse command-line config"
 515 msgstr "无法解析命令行中的配置"
 516
 517 #: config.c:1277
 518 msgid "unknown error occured while reading the configuration files"
 519 msgstr "在读取配置文件时遇到未知错误"
 520
 521 #: config.c:1601
 522 #, c-format
 523 msgid "unable to parse '%s' from command-line config"
 524 msgstr "无法解析命令行配置中的 '%s'"
 525
 526 #: config.c:1603
 527 #, c-format
 528 msgid "bad config variable '%s' in file '%s' at line %d"
 529 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 530
 531 #: config.c:1662
 532 #, c-format
 533 msgid "%s has multiple values"
 534 msgstr "%s 有多个取值"
 535
 536 #: connected.c:69
 537 msgid "Could not run 'git rev-list'"
 538 msgstr "不能执行 'git rev-list'"
 539
 540 #: connected.c:89
 541 #, c-format
 542 msgid "failed write to rev-list: %s"
 543 msgstr "无法写入 rev-list：%s"
 544
 545 #: connected.c:97
 546 #, c-format
 547 msgid "failed to close rev-list's stdin: %s"
 548 msgstr "无法关闭 rev-list 的标准输入：%s"
 549
 550 #: date.c:95
 551 msgid "in the future"
 552 msgstr "在将来"
 553
 554 #: date.c:101
 555 #, c-format
 556 msgid "%lu second ago"
 557 msgid_plural "%lu seconds ago"
 558 msgstr[0] "%lu 秒钟前"
 559 msgstr[1] "%lu 秒钟前"
 560
 561 #: date.c:108
 562 #, c-format
 563 msgid "%lu minute ago"
 564 msgid_plural "%lu minutes ago"
 565 msgstr[0] "%lu 分钟前"
 566 msgstr[1] "%lu 分钟前"
 567
 568 #: date.c:115
 569 #, c-format
 570 msgid "%lu hour ago"
 571 msgid_plural "%lu hours ago"
 572 msgstr[0] "%lu 小时前"
 573 msgstr[1] "%lu 小时前"
 574
 575 #: date.c:122
 576 #, c-format
 577 msgid "%lu day ago"
 578 msgid_plural "%lu days ago"
 579 msgstr[0] "%lu 天前"
 580 msgstr[1] "%lu 天前"
 581
 582 #: date.c:128
 583 #, c-format
 584 msgid "%lu week ago"
 585 msgid_plural "%lu weeks ago"
 586 msgstr[0] "%lu 周前"
 587 msgstr[1] "%lu 周前"
 588
 589 #: date.c:135
 590 #, c-format
 591 msgid "%lu month ago"
 592 msgid_plural "%lu months ago"
 593 msgstr[0] "%lu 个月前"
 594 msgstr[1] "%lu 个月前"
 595
 596 #: date.c:146
 597 #, c-format
 598 msgid "%lu year"
 599 msgid_plural "%lu years"
 600 msgstr[0] "%lu 年"
 601 msgstr[1] "%lu 年"
 602
 603 #. TRANSLATORS: "%s" is "<n> years"
 604 #: date.c:149
 605 #, c-format
 606 msgid "%s, %lu month ago"
 607 msgid_plural "%s, %lu months ago"
 608 msgstr[0] "%s %lu 个月前"
 609 msgstr[1] "%s %lu 个月前"
 610
 611 #: date.c:154 date.c:159
 612 #, c-format
 613 msgid "%lu year ago"
 614 msgid_plural "%lu years ago"
 615 msgstr[0] "%lu 年前"
 616 msgstr[1] "%lu 年前"
 617
 618 #: diffcore-order.c:24
 619 #, c-format
 620 msgid "failed to read orderfile '%s'"
 621 msgstr "无法读取排序文件 '%s'"
 622
 623 #: diffcore-rename.c:536
 624 msgid "Performing inexact rename detection"
 625 msgstr "正在进行非精确的重命名检测"
 626
 627 #  译者：注意保持前导空格
 628 #: diff.c:115
 629 #, c-format
 630 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 631 msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 632
 633 #  译者：注意保持前导空格
 634 #: diff.c:120
 635 #, c-format
 636 msgid "  Unknown dirstat parameter '%s'\n"
 637 msgstr "  未知的 dirstat 参数 '%s'\n"
 638
 639 #: diff.c:215
 640 #, c-format
 641 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 642 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
 643
 644 #: diff.c:267
 645 #, c-format
 646 msgid ""
 647 "Found errors in 'diff.dirstat' config variable:\n"
 648 "%s"
 649 msgstr ""
 650 "发现配置变量 'diff.dirstat' 中的错误：\n"
 651 "%s"
 652
 653 #: diff.c:3000
 654 #, c-format
 655 msgid "external diff died, stopping at %s"
 656 msgstr "外部 diff 退出，停止在 %s"
 657
 658 #: diff.c:3396
 659 msgid "--follow requires exactly one pathspec"
 660 msgstr "--follow 参数后只跟一个 pathspec"
 661
 662 #: diff.c:3559
 663 #, c-format
 664 msgid ""
 665 "Failed to parse --dirstat/-X option parameter:\n"
 666 "%s"
 667 msgstr ""
 668 "无法解析 --dirstat/-X 选项的参数：\n"
 669 "%s"
 670
 671 #: diff.c:3573
 672 #, c-format
 673 msgid "Failed to parse --submodule option parameter: '%s'"
 674 msgstr "无法解析 --submodule 选项的参数：'%s'"
 675
 676 #: dir.c:1915
 677 msgid "failed to get kernel name and information"
 678 msgstr "无法获得内核名称和信息"
 679
 680 #: dir.c:1998
 681 msgid "Untracked cache is disabled on this system."
 682 msgstr "缓存未跟踪文件在本系统被禁用"
 683
 684 #: gpg-interface.c:166 gpg-interface.c:237
 685 msgid "could not run gpg."
 686 msgstr "不能执行 gpg。"
 687
 688 #: gpg-interface.c:178
 689 msgid "gpg did not accept the data"
 690 msgstr "gpg 没有接受数据"
 691
 692 #: gpg-interface.c:189
 693 msgid "gpg failed to sign the data"
 694 msgstr "gpg 无法为数据签名"
 695
 696 #: gpg-interface.c:222
 697 #, c-format
 698 msgid "could not create temporary file '%s': %s"
 699 msgstr "不能创建临时文件 '%s'：%s"
 700
 701 #: gpg-interface.c:225
 702 #, c-format
 703 msgid "failed writing detached signature to '%s': %s"
 704 msgstr "无法将分离式签名写入 '%s'：%s"
 705
 706 #: grep.c:1718
 707 #, c-format
 708 msgid "'%s': unable to read %s"
 709 msgstr "'%s'：无法读取 %s"
 710
 711 #: grep.c:1735
 712 #, c-format
 713 msgid "'%s': %s"
 714 msgstr "'%s'：%s"
 715
 716 #: grep.c:1746
 717 #, c-format
 718 msgid "'%s': short read %s"
 719 msgstr "'%s'：读取不完整 %s"
 720
 721 #: help.c:207
 722 #, c-format
 723 msgid "available git commands in '%s'"
 724 msgstr "在 '%s' 下可用的 git 命令"
 725
 726 #: help.c:214
 727 msgid "git commands available from elsewhere on your $PATH"
 728 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 729
 730 #: help.c:246
 731 msgid "These are common Git commands used in various situations:"
 732 msgstr "这些是各种场合常见的 Git 命令："
 733
 734 #: help.c:311
 735 #, c-format
 736 msgid ""
 737 "'%s' appears to be a git command, but we were not\n"
 738 "able to execute it. Maybe git-%s is broken?"
 739 msgstr ""
 740 "'%s' 像是一个 git 命令，但却无法运行。\n"
 741 "可能是 git-%s 受损？"
 742
 743 #: help.c:368
 744 msgid "Uh oh. Your system reports no Git commands at all."
 745 msgstr "唉呀，您的系统中未发现 Git 命令。"
 746
 747 #: help.c:390
 748 #, c-format
 749 msgid ""
 750 "WARNING: You called a Git command named '%s', which does not exist.\n"
 751 "Continuing under the assumption that you meant '%s'"
 752 msgstr ""
 753 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 754 "是 '%s'"
 755
 756 #: help.c:395
 757 #, c-format
 758 msgid "in %0.1f seconds automatically..."
 759 msgstr "在 %0.1f 秒钟后自动运行..."
 760
 761 #: help.c:402
 762 #, c-format
 763 msgid "git: '%s' is not a git command. See 'git --help'."
 764 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 765
 766 #: help.c:406 help.c:466
 767 msgid ""
 768 "\n"
 769 "Did you mean this?"
 770 msgid_plural ""
 771 "\n"
 772 "Did you mean one of these?"
 773 msgstr[0] ""
 774 "\n"
 775 "您指的是这个么？"
 776 msgstr[1] ""
 777 "\n"
 778 "您指的是这其中的某一个么？"
 779
 780 #: help.c:462
 781 #, c-format
 782 msgid "%s: %s - %s"
 783 msgstr "%s：%s - %s"
 784
 785 #: merge.c:41
 786 msgid "failed to read the cache"
 787 msgstr "无法读取缓存"
 788
 789 #: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
 790 #: builtin/checkout.c:587 builtin/clone.c:722
 791 msgid "unable to write new index file"
 792 msgstr "无法写新的索引文件"
 793
 794 #: merge-recursive.c:189
 795 #, c-format
 796 msgid "(bad commit)\n"
 797 msgstr "（坏提交）\n"
 798
 799 #: merge-recursive.c:209
 800 #, c-format
 801 msgid "addinfo_cache failed for path '%s'"
 802 msgstr "为路径 '%s' addinfo_cache 失败"
 803
 804 #: merge-recursive.c:270
 805 msgid "error building trees"
 806 msgstr "无法创建树"
 807
 808 #: merge-recursive.c:686
 809 #, c-format
 810 msgid "failed to create path '%s'%s"
 811 msgstr "无法创建路径 '%s'%s"
 812
 813 #: merge-recursive.c:697
 814 #, c-format
 815 msgid "Removing %s to make room for subdirectory\n"
 816 msgstr "删除 %s 以便为子目录留出空间\n"
 817
 818 #: merge-recursive.c:711 merge-recursive.c:732
 819 msgid ": perhaps a D/F conflict?"
 820 msgstr "：可能是一个目录/文件冲突？"
 821
 822 #: merge-recursive.c:722
 823 #, c-format
 824 msgid "refusing to lose untracked file at '%s'"
 825 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 826
 827 #: merge-recursive.c:762
 828 #, c-format
 829 msgid "cannot read object %s '%s'"
 830 msgstr "不能读取对象 %s '%s'"
 831
 832 #: merge-recursive.c:764
 833 #, c-format
 834 msgid "blob expected for %s '%s'"
 835 msgstr "%s '%s' 应为数据对象"
 836
 837 #: merge-recursive.c:787 builtin/clone.c:369
 838 #, c-format
 839 msgid "failed to open '%s'"
 840 msgstr "无法打开 '%s'"
 841
 842 #: merge-recursive.c:795
 843 #, c-format
 844 msgid "failed to symlink '%s'"
 845 msgstr "无法创建符号链接 '%s'"
 846
 847 #: merge-recursive.c:798
 848 #, c-format
 849 msgid "do not know what to do with %06o %s '%s'"
 850 msgstr "不知道如何处理 %06o %s '%s'"
 851
 852 #: merge-recursive.c:936
 853 msgid "Failed to execute internal merge"
 854 msgstr "无法执行内部合并"
 855
 856 #: merge-recursive.c:940
 857 #, c-format
 858 msgid "Unable to add %s to database"
 859 msgstr "不能添加 %s 至对象库"
 860
 861 #: merge-recursive.c:956
 862 msgid "unsupported object type in the tree"
 863 msgstr "在树中有不支持的对象类型"
 864
 865 #: merge-recursive.c:1031 merge-recursive.c:1045
 866 #, c-format
 867 msgid ""
 868 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 869 "in tree."
 870 msgstr ""
 871 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 872 "的版本被保留。"
 873
 874 #: merge-recursive.c:1037 merge-recursive.c:1050
 875 #, c-format
 876 msgid ""
 877 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 878 "in tree at %s."
 879 msgstr ""
 880 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
 881 "的版本保留于 %8$s 中。"
 882
 883 #: merge-recursive.c:1091
 884 msgid "rename"
 885 msgstr "重命名"
 886
 887 #: merge-recursive.c:1091
 888 msgid "renamed"
 889 msgstr "重命名"
 890
 891 #: merge-recursive.c:1147
 892 #, c-format
 893 msgid "%s is a directory in %s adding as %s instead"
 894 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 895
 896 #: merge-recursive.c:1169
 897 #, c-format
 898 msgid ""
 899 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 900 "\"->\"%s\" in \"%s\"%s"
 901 msgstr ""
 902 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
 903 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 904
 905 #: merge-recursive.c:1174
 906 msgid " (left unresolved)"
 907 msgstr "（留下未解决）"
 908
 909 #: merge-recursive.c:1228
 910 #, c-format
 911 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 912 msgstr ""
 913 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
 914 "%5$s"
 915
 916 #: merge-recursive.c:1258
 917 #, c-format
 918 msgid "Renaming %s to %s and %s to %s instead"
 919 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
 920
 921 #: merge-recursive.c:1457
 922 #, c-format
 923 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 924 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 925
 926 #: merge-recursive.c:1467
 927 #, c-format
 928 msgid "Adding merged %s"
 929 msgstr "添加合并后的 %s"
 930
 931 #: merge-recursive.c:1472 merge-recursive.c:1674
 932 #, c-format
 933 msgid "Adding as %s instead"
 934 msgstr "而是以 %s 为名添加"
 935
 936 #: merge-recursive.c:1523
 937 #, c-format
 938 msgid "cannot read object %s"
 939 msgstr "不能读取对象 %s"
 940
 941 #: merge-recursive.c:1526
 942 #, c-format
 943 msgid "object %s is not a blob"
 944 msgstr "对象 %s 不是一个数据对象"
 945
 946 #: merge-recursive.c:1578
 947 msgid "modify"
 948 msgstr "修改"
 949
 950 #: merge-recursive.c:1578
 951 msgid "modified"
 952 msgstr "修改"
 953
 954 #: merge-recursive.c:1588
 955 msgid "content"
 956 msgstr "内容"
 957
 958 #: merge-recursive.c:1595
 959 msgid "add/add"
 960 msgstr "添加/添加"
 961
 962 #: merge-recursive.c:1629
 963 #, c-format
 964 msgid "Skipped %s (merged same as existing)"
 965 msgstr "略过 %s（已经做过相同合并）"
 966
 967 #: merge-recursive.c:1643
 968 #, c-format
 969 msgid "Auto-merging %s"
 970 msgstr "自动合并 %s"
 971
 972 #: merge-recursive.c:1647 git-submodule.sh:1025
 973 msgid "submodule"
 974 msgstr "子模组"
 975
 976 #: merge-recursive.c:1648
 977 #, c-format
 978 msgid "CONFLICT (%s): Merge conflict in %s"
 979 msgstr "冲突（%s）：合并冲突于 %s"
 980
 981 #: merge-recursive.c:1734
 982 #, c-format
 983 msgid "Removing %s"
 984 msgstr "删除 %s"
 985
 986 #: merge-recursive.c:1759
 987 msgid "file/directory"
 988 msgstr "文件/目录"
 989
 990 #: merge-recursive.c:1765
 991 msgid "directory/file"
 992 msgstr "目录/文件"
 993
 994 #: merge-recursive.c:1770
 995 #, c-format
 996 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 997 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 998
 999 #: merge-recursive.c:1780
1000 #, c-format
1001 msgid "Adding %s"
1002 msgstr "添加 %s"
1003
1004 #: merge-recursive.c:1797
1005 msgid "Fatal merge failure, shouldn't happen."
1006 msgstr "严重的合并错误，不应发生。"
1007
1008 #: merge-recursive.c:1816
1009 msgid "Already up-to-date!"
1010 msgstr "已经是最新的！"
1011
1012 #: merge-recursive.c:1825
1013 #, c-format
1014 msgid "merging of trees %s and %s failed"
1015 msgstr "无法合并树 %s 和 %s"
1016
1017 #: merge-recursive.c:1855
1018 #, c-format
1019 msgid "Unprocessed path??? %s"
1020 msgstr "未处理的路径??? %s"
1021
1022 #: merge-recursive.c:1903
1023 msgid "Merging:"
1024 msgstr "合并："
1025
1026 #: merge-recursive.c:1916
1027 #, c-format
1028 msgid "found %u common ancestor:"
1029 msgid_plural "found %u common ancestors:"
1030 msgstr[0] "发现 %u 个共同祖先："
1031 msgstr[1] "发现 %u 个共同祖先："
1032
1033 #: merge-recursive.c:1953
1034 msgid "merge returned no commit"
1035 msgstr "合并未返回提交"
1036
1037 #: merge-recursive.c:2010
1038 #, c-format
1039 msgid "Could not parse object '%s'"
1040 msgstr "不能解析对象 '%s'"
1041
1042 #: merge-recursive.c:2021 builtin/merge.c:645
1043 msgid "Unable to write index."
1044 msgstr "不能写入索引。"
1045
1046 #: notes-utils.c:41
1047 msgid "Cannot commit uninitialized/unreferenced notes tree"
1048 msgstr "不能提交未初始化/未引用的注解树"
1049
1050 #: notes-utils.c:100
1051 #, c-format
1052 msgid "Bad notes.rewriteMode value: '%s'"
1053 msgstr "坏的 notes.rewriteMode 值：'%s'"
1054
1055 #: notes-utils.c:110
1056 #, c-format
1057 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1058 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
1059
1060 #. TRANSLATORS: The first %s is the name of the
1061 #. environment variable, the second %s is its value
1062 #: notes-utils.c:137
1063 #, c-format
1064 msgid "Bad %s value: '%s'"
1065 msgstr "坏的 %s 值：'%s'"
1066
1067 #: object.c:242
1068 #, c-format
1069 msgid "unable to parse object: %s"
1070 msgstr "不能解析对象：%s"
1071
1072 #: parse-options.c:570
1073 msgid "..."
1074 msgstr "..."
1075
1076 #: parse-options.c:588
1077 #, c-format
1078 msgid "usage: %s"
1079 msgstr "用法：%s"
1080
1081 #. TRANSLATORS: the colon here should align with the
1082 #. one in "usage: %s" translation
1083 #: parse-options.c:592
1084 #, c-format
1085 msgid "   or: %s"
1086 msgstr "  或：%s"
1087
1088 #  译者：为保证在输出中对齐，注意调整句中空格！
1089 #: parse-options.c:595
1090 #, c-format
1091 msgid "    %s"
1092 msgstr "    %s"
1093
1094 #: parse-options.c:629
1095 msgid "-NUM"
1096 msgstr "-数字"
1097
1098 #: parse-options-cb.c:108
1099 #, c-format
1100 msgid "malformed object name '%s'"
1101 msgstr "非法的对象名 '%s'"
1102
1103 #: path.c:752
1104 #, c-format
1105 msgid "Could not make %s writable by group"
1106 msgstr "不能设置 %s 为组可写"
1107
1108 #: pathspec.c:133
1109 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1110 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1111
1112 #: pathspec.c:143
1113 msgid ""
1114 "global 'literal' pathspec setting is incompatible with all other global "
1115 "pathspec settings"
1116 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1117
1118 #: pathspec.c:177
1119 msgid "invalid parameter for pathspec magic 'prefix'"
1120 msgstr "路径规格包含无效的神奇前缀"
1121
1122 #: pathspec.c:183
1123 #, c-format
1124 msgid "Invalid pathspec magic '%.*s' in '%s'"
1125 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1126
1127 #: pathspec.c:187
1128 #, c-format
1129 msgid "Missing ')' at the end of pathspec magic in '%s'"
1130 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1131
1132 #: pathspec.c:205
1133 #, c-format
1134 msgid "Unimplemented pathspec magic '%c' in '%s'"
1135 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1136
1137 #: pathspec.c:230
1138 #, c-format
1139 msgid "%s: 'literal' and 'glob' are incompatible"
1140 msgstr "%s：'literal' 和 'glob' 不兼容"
1141
1142 #: pathspec.c:241
1143 #, c-format
1144 msgid "%s: '%s' is outside repository"
1145 msgstr "%s：'%s' 在仓库之外"
1146
1147 #: pathspec.c:291
1148 #, c-format
1149 msgid "Pathspec '%s' is in submodule '%.*s'"
1150 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1151
1152 #: pathspec.c:353
1153 #, c-format
1154 msgid "%s: pathspec magic not supported by this command: %s"
1155 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
1156
1157 #: pathspec.c:432
1158 #, c-format
1159 msgid "pathspec '%s' is beyond a symbolic link"
1160 msgstr "路径规格 '%s' 位于符号链接中"
1161
1162 #: pathspec.c:441
1163 msgid ""
1164 "There is nothing to exclude from by :(exclude) patterns.\n"
1165 "Perhaps you forgot to add either ':/' or '.' ?"
1166 msgstr ""
1167 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1168 "添加 ':/' 或 '.' ？"
1169
1170 #: pretty.c:969
1171 msgid "unable to parse --pretty format"
1172 msgstr "不能解析 --pretty 格式"
1173
1174 #: progress.c:235
1175 msgid "done"
1176 msgstr "完成"
1177
1178 #: read-cache.c:1281
1179 #, c-format
1180 msgid ""
1181 "index.version set, but the value is invalid.\n"
1182 "Using version %i"
1183 msgstr ""
1184 "设置了 index.version，但是取值无效。\n"
1185 "使用版本 %i"
1186
1187 #: read-cache.c:1291
1188 #, c-format
1189 msgid ""
1190 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1191 "Using version %i"
1192 msgstr ""
1193 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
1194 "使用版本 %i"
1195
1196 #: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1197 #: builtin/merge.c:983
1198 #, c-format
1199 msgid "Could not open '%s' for writing"
1200 msgstr "无法打开 '%s' 进行写入"
1201
1202 #: refs/files-backend.c:2359
1203 #, c-format
1204 msgid "could not delete reference %s: %s"
1205 msgstr "无法删除引用 %s：%s"
1206
1207 #: refs/files-backend.c:2362
1208 #, c-format
1209 msgid "could not delete references: %s"
1210 msgstr "无法删除引用：%s"
1211
1212 #: refs/files-backend.c:2371
1213 #, c-format
1214 msgid "could not remove reference %s"
1215 msgstr "无法删除引用 %s"
1216
1217 #: ref-filter.c:245
1218 #, c-format
1219 msgid "format: %%(end) atom used without corresponding atom"
1220 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
1221
1222 #: ref-filter.c:704
1223 #, c-format
1224 msgid "positive value expected contents:lines=%s"
1225 msgstr "要为 contents:lines=%s 提供一个正数"
1226
1227 #: ref-filter.c:833
1228 #, c-format
1229 msgid "expected format: %%(color:<color>)"
1230 msgstr "期望的格式：%%(color:<color>)"
1231
1232 #: ref-filter.c:835
1233 msgid "unable to parse format"
1234 msgstr "不能解析格式"
1235
1236 #: ref-filter.c:870
1237 #, c-format
1238 msgid "expected format: %%(align:<width>,<position>)"
1239 msgstr "期望的格式：%%(align:<width>,<position>)"
1240
1241 #: ref-filter.c:893
1242 #, c-format
1243 msgid "improper format entered align:%s"
1244 msgstr "输入了不正确的格式 align:%s"
1245
1246 #: ref-filter.c:898
1247 #, c-format
1248 msgid "positive width expected with the %%(align) atom"
1249 msgstr "元素 %%(align) 需要一个正数的宽度"
1250
1251 #: ref-filter.c:1219
1252 #, c-format
1253 msgid "malformed object at '%s'"
1254 msgstr "非法的对象于 '%s'"
1255
1256 #: ref-filter.c:1561
1257 #, c-format
1258 msgid "format: %%(end) atom missing"
1259 msgstr "格式：缺少 %%(end) 元素"
1260
1261 #: ref-filter.c:1615
1262 #, c-format
1263 msgid "malformed object name %s"
1264 msgstr "非法的对象名 %s"
1265
1266 #: remote.c:756
1267 #, c-format
1268 msgid "Cannot fetch both %s and %s to %s"
1269 msgstr "不能同时获取 %s 和 %s 至 %s"
1270
1271 #: remote.c:760
1272 #, c-format
1273 msgid "%s usually tracks %s, not %s"
1274 msgstr "%s 通常跟踪 %s，而非 %s"
1275
1276 #: remote.c:764
1277 #, c-format
1278 msgid "%s tracks both %s and %s"
1279 msgstr "%s 同时跟踪 %s 和 %s"
1280
1281 #: remote.c:772
1282 msgid "Internal error"
1283 msgstr "内部错误"
1284
1285 #: remote.c:1687 remote.c:1730
1286 msgid "HEAD does not point to a branch"
1287 msgstr "HEAD 没有指向一个分支"
1288
1289 #: remote.c:1696
1290 #, c-format
1291 msgid "no such branch: '%s'"
1292 msgstr "没有此分支：'%s'"
1293
1294 #: remote.c:1699
1295 #, c-format
1296 msgid "no upstream configured for branch '%s'"
1297 msgstr "尚未给分支 '%s' 设置上游"
1298
1299 #: remote.c:1705
1300 #, c-format
1301 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1302 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1303
1304 #: remote.c:1720
1305 #, c-format
1306 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1307 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1308
1309 #: remote.c:1735
1310 #, c-format
1311 msgid "branch '%s' has no remote for pushing"
1312 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1313
1314 #: remote.c:1746
1315 #, c-format
1316 msgid "push refspecs for '%s' do not include '%s'"
1317 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1318
1319 #: remote.c:1759
1320 msgid "push has no destination (push.default is 'nothing')"
1321 msgstr "推送无目标（push.default 是 'nothing'）"
1322
1323 #: remote.c:1781
1324 msgid "cannot resolve 'simple' push to a single destination"
1325 msgstr "无法解析 'simple' 推送至一个单独的目标"
1326
1327 #: remote.c:2083
1328 #, c-format
1329 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1330 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
1331
1332 #: remote.c:2087
1333 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
1334 msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
1335
1336 #: remote.c:2090
1337 #, c-format
1338 msgid "Your branch is up-to-date with '%s'.\n"
1339 msgstr "您的分支与上游分支 '%s' 一致。\n"
1340
1341 #: remote.c:2094
1342 #, c-format
1343 msgid "Your branch is ahead of '%s' by %d commit.\n"
1344 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1345 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1346 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1347
1348 #: remote.c:2100
1349 msgid "  (use \"git push\" to publish your local commits)\n"
1350 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
1351
1352 #: remote.c:2103
1353 #, c-format
1354 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1355 msgid_plural ""
1356 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1357 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
1358 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
1359
1360 #  译者：注意保持前导空格
1361 #: remote.c:2111
1362 msgid "  (use \"git pull\" to update your local branch)\n"
1363 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
1364
1365 #: remote.c:2114
1366 #, c-format
1367 msgid ""
1368 "Your branch and '%s' have diverged,\n"
1369 "and have %d and %d different commit each, respectively.\n"
1370 msgid_plural ""
1371 "Your branch and '%s' have diverged,\n"
1372 "and have %d and %d different commits each, respectively.\n"
1373 msgstr[0] ""
1374 "您的分支和 '%s' 出现了偏离，\n"
1375 "并且分别有 %d 和 %d 处不同的提交。\n"
1376 msgstr[1] ""
1377 "您的分支和 '%s' 出现了偏离，\n"
1378 "并且分别有 %d 和 %d 处不同的提交。\n"
1379
1380 #  译者：注意保持前导空格
1381 #: remote.c:2124
1382 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
1383 msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
1384
1385 #: revision.c:2193
1386 msgid "your current branch appears to be broken"
1387 msgstr "您的当前分支好像被损坏"
1388
1389 #: revision.c:2196
1390 #, c-format
1391 msgid "your current branch '%s' does not have any commits yet"
1392 msgstr "您的当前分支 '%s' 尚无任何提交"
1393
1394 #: revision.c:2390
1395 msgid "--first-parent is incompatible with --bisect"
1396 msgstr "--first-parent 与 --bisect 不兼容"
1397
1398 #: run-command.c:90
1399 msgid "open /dev/null failed"
1400 msgstr "不能打开 /dev/null"
1401
1402 #: run-command.c:92
1403 #, c-format
1404 msgid "dup2(%d,%d) failed"
1405 msgstr "不能调用 dup2(%d,%d)"
1406
1407 #: send-pack.c:295
1408 msgid "failed to sign the push certificate"
1409 msgstr "无法为推送证书签名"
1410
1411 #: send-pack.c:404
1412 msgid "the receiving end does not support --signed push"
1413 msgstr "接收端不支持签名推送"
1414
1415 #: send-pack.c:406
1416 msgid ""
1417 "not sending a push certificate since the receiving end does not support --"
1418 "signed push"
1419 msgstr "未发送推送证书，因为接收端不支持签名推送"
1420
1421 #: send-pack.c:418
1422 msgid "the receiving end does not support --atomic push"
1423 msgstr "接收端不支持原子推送"
1424
1425 #: sequencer.c:183
1426 msgid ""
1427 "after resolving the conflicts, mark the corrected paths\n"
1428 "with 'git add <paths>' or 'git rm <paths>'"
1429 msgstr ""
1430 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1431 "命令标记修正后的文件"
1432
1433 #: sequencer.c:186
1434 msgid ""
1435 "after resolving the conflicts, mark the corrected paths\n"
1436 "with 'git add <paths>' or 'git rm <paths>'\n"
1437 "and commit the result with 'git commit'"
1438 msgstr ""
1439 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1440 "对修正后的文件做标记，然后用 'git commit' 提交"
1441
1442 #: sequencer.c:199 sequencer.c:842 sequencer.c:922
1443 #, c-format
1444 msgid "Could not write to %s"
1445 msgstr "不能写入 %s"
1446
1447 #: sequencer.c:202
1448 #, c-format
1449 msgid "Error wrapping up %s"
1450 msgstr "错误收尾 %s"
1451
1452 #: sequencer.c:217
1453 msgid "Your local changes would be overwritten by cherry-pick."
1454 msgstr "您的本地修改将被拣选操作覆盖。"
1455
1456 #: sequencer.c:219
1457 msgid "Your local changes would be overwritten by revert."
1458 msgstr "您的本地修改将被还原操作覆盖。"
1459
1460 #: sequencer.c:222
1461 msgid "Commit your changes or stash them to proceed."
1462 msgstr "提交您的修改或保存进度后再继续。"
1463
1464 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1465 #: sequencer.c:309
1466 #, c-format
1467 msgid "%s: Unable to write new index file"
1468 msgstr "%s：无法写入新索引文件"
1469
1470 #: sequencer.c:327
1471 msgid "Could not resolve HEAD commit\n"
1472 msgstr "不能解析 HEAD 提交\n"
1473
1474 #: sequencer.c:347
1475 msgid "Unable to update cache tree\n"
1476 msgstr "不能更新缓存\n"
1477
1478 #: sequencer.c:399
1479 #, c-format
1480 msgid "Could not parse commit %s\n"
1481 msgstr "不能解析提交 %s\n"
1482
1483 #: sequencer.c:404
1484 #, c-format
1485 msgid "Could not parse parent commit %s\n"
1486 msgstr "不能解析父提交 %s\n"
1487
1488 #: sequencer.c:469
1489 msgid "Your index file is unmerged."
1490 msgstr "您的索引文件未完成合并。"
1491
1492 #: sequencer.c:488
1493 #, c-format
1494 msgid "Commit %s is a merge but no -m option was given."
1495 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1496
1497 #: sequencer.c:496
1498 #, c-format
1499 msgid "Commit %s does not have parent %d"
1500 msgstr "提交 %s 没有父提交 %d"
1501
1502 #: sequencer.c:500
1503 #, c-format
1504 msgid "Mainline was specified but commit %s is not a merge."
1505 msgstr "指定了主线但提交 %s 不是一个合并。"
1506
1507 #. TRANSLATORS: The first %s will be "revert" or
1508 #. "cherry-pick", the second %s a SHA1
1509 #: sequencer.c:513
1510 #, c-format
1511 msgid "%s: cannot parse parent commit %s"
1512 msgstr "%s：不能解析父提交 %s"
1513
1514 #: sequencer.c:517
1515 #, c-format
1516 msgid "Cannot get commit message for %s"
1517 msgstr "不能得到 %s 的提交说明"
1518
1519 #: sequencer.c:603
1520 #, c-format
1521 msgid "could not revert %s... %s"
1522 msgstr "不能还原 %s... %s"
1523
1524 #: sequencer.c:604
1525 #, c-format
1526 msgid "could not apply %s... %s"
1527 msgstr "不能应用 %s... %s"
1528
1529 #: sequencer.c:639
1530 msgid "empty commit set passed"
1531 msgstr "提供了空的提交集"
1532
1533 #: sequencer.c:647
1534 #, c-format
1535 msgid "git %s: failed to read the index"
1536 msgstr "git %s：无法读取索引"
1537
1538 #: sequencer.c:651
1539 #, c-format
1540 msgid "git %s: failed to refresh the index"
1541 msgstr "git %s：无法刷新索引"
1542
1543 #: sequencer.c:711
1544 #, c-format
1545 msgid "Cannot %s during a %s"
1546 msgstr "无法 %s 在一个 %s 过程中"
1547
1548 #: sequencer.c:733
1549 #, c-format
1550 msgid "Could not parse line %d."
1551 msgstr "不能解析第 %d 行。"
1552
1553 #: sequencer.c:738
1554 msgid "No commits parsed."
1555 msgstr "没有提交被解析。"
1556
1557 #: sequencer.c:750
1558 #, c-format
1559 msgid "Could not open %s"
1560 msgstr "不能打开 %s"
1561
1562 #: sequencer.c:754
1563 #, c-format
1564 msgid "Could not read %s."
1565 msgstr "不能读取 %s。"
1566
1567 #: sequencer.c:761
1568 #, c-format
1569 msgid "Unusable instruction sheet: %s"
1570 msgstr "无用的指令表单：%s"
1571
1572 #: sequencer.c:791
1573 #, c-format
1574 msgid "Invalid key: %s"
1575 msgstr "无效键名：%s"
1576
1577 #: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
1578 #, c-format
1579 msgid "Invalid value for %s: %s"
1580 msgstr "%s 的值无效：%s"
1581
1582 #: sequencer.c:804
1583 #, c-format
1584 msgid "Malformed options sheet: %s"
1585 msgstr "非法的选项表单：%s"
1586
1587 #: sequencer.c:823
1588 msgid "a cherry-pick or revert is already in progress"
1589 msgstr "一个拣选或还原操作已在进行"
1590
1591 #: sequencer.c:824
1592 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1593 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1594
1595 #: sequencer.c:828
1596 #, c-format
1597 msgid "Could not create sequencer directory %s"
1598 msgstr "不能创建序列目录 %s"
1599
1600 #: sequencer.c:844 sequencer.c:926
1601 #, c-format
1602 msgid "Error wrapping up %s."
1603 msgstr "错误收尾 %s。"
1604
1605 #: sequencer.c:863 sequencer.c:996
1606 msgid "no cherry-pick or revert in progress"
1607 msgstr "拣选或还原操作并未进行"
1608
1609 #: sequencer.c:865
1610 msgid "cannot resolve HEAD"
1611 msgstr "不能解析 HEAD"
1612
1613 #: sequencer.c:867
1614 msgid "cannot abort from a branch yet to be born"
1615 msgstr "不能从尚未建立的分支终止"
1616
1617 #: sequencer.c:887 builtin/apply.c:4287
1618 #, c-format
1619 msgid "cannot open %s: %s"
1620 msgstr "不能打开 %s：%s"
1621
1622 #: sequencer.c:890
1623 #, c-format
1624 msgid "cannot read %s: %s"
1625 msgstr "不能读取 %s：%s"
1626
1627 #: sequencer.c:891
1628 msgid "unexpected end of file"
1629 msgstr "意外的文件结束"
1630
1631 #: sequencer.c:897
1632 #, c-format
1633 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1634 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1635
1636 #: sequencer.c:919
1637 #, c-format
1638 msgid "Could not format %s."
1639 msgstr "不能格式化 %s。"
1640
1641 #: sequencer.c:1064
1642 #, c-format
1643 msgid "%s: can't cherry-pick a %s"
1644 msgstr "%s：不能拣选一个%s"
1645
1646 #: sequencer.c:1067
1647 #, c-format
1648 msgid "%s: bad revision"
1649 msgstr "%s：错误的版本"
1650
1651 #: sequencer.c:1101
1652 msgid "Can't revert as initial commit"
1653 msgstr "不能作为初始提交还原"
1654
1655 #: sequencer.c:1102
1656 msgid "Can't cherry-pick into empty head"
1657 msgstr "不能拣选到空分支"
1658
1659 #: setup.c:248
1660 #, c-format
1661 msgid "failed to read %s"
1662 msgstr "无法读取 %s"
1663
1664 #: sha1_name.c:463
1665 msgid ""
1666 "Git normally never creates a ref that ends with 40 hex characters\n"
1667 "because it will be ignored when you just specify 40-hex. These refs\n"
1668 "may be created by mistake. For example,\n"
1669 "\n"
1670 "  git checkout -b $br $(git rev-parse ...)\n"
1671 "\n"
1672 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1673 "examine these refs and maybe delete them. Turn this message off by\n"
1674 "running \"git config advice.objectNameWarning false\""
1675 msgstr ""
1676 "Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
1677 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
1678 "\n"
1679 "  git checkout -b $br $(git rev-parse ...)\n"
1680 "\n"
1681 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
1682 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1683 "命令关闭本消息通知。"
1684
1685 #: submodule.c:61 submodule.c:95
1686 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1687 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
1688
1689 #: submodule.c:65 submodule.c:99
1690 #, c-format
1691 msgid "Could not find section in .gitmodules where path=%s"
1692 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1693
1694 #: submodule.c:73
1695 #, c-format
1696 msgid "Could not update .gitmodules entry %s"
1697 msgstr "不能更新 .gitmodules 条目 %s"
1698
1699 #: submodule.c:106
1700 #, c-format
1701 msgid "Could not remove .gitmodules entry for %s"
1702 msgstr "无法移除 %s 的 .gitmodules 条目"
1703
1704 #: submodule.c:117
1705 msgid "staging updated .gitmodules failed"
1706 msgstr "将更新后 .gitmodules 添加暂存区失败"
1707
1708 #: submodule.c:1040
1709 #, c-format
1710 msgid "Could not set core.worktree in %s"
1711 msgstr "不能在 %s 中设置 core.worktree"
1712
1713 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1714 #: trailer.c:561
1715 #, c-format
1716 msgid "unknown value '%s' for key '%s'"
1717 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1718
1719 #: trailer.c:543 trailer.c:548 builtin/remote.c:296
1720 #, c-format
1721 msgid "more than one %s"
1722 msgstr "多于一个 %s"
1723
1724 #: trailer.c:581
1725 #, c-format
1726 msgid "empty trailer token in trailer '%.*s'"
1727 msgstr "签名 '%.*s' 的键为空"
1728
1729 #: trailer.c:701
1730 #, c-format
1731 msgid "could not read input file '%s'"
1732 msgstr "不能读取输入文件 '%s'"
1733
1734 #: trailer.c:704
1735 msgid "could not read from stdin"
1736 msgstr "不能自标准输入读取"
1737
1738 #: transport-helper.c:1025
1739 #, c-format
1740 msgid "Could not read ref %s"
1741 msgstr "不能读取引用 %s"
1742
1743 #: unpack-trees.c:203
1744 msgid "Checking out files"
1745 msgstr "正在检出文件"
1746
1747 #: urlmatch.c:120
1748 msgid "invalid URL scheme name or missing '://' suffix"
1749 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1750
1751 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1752 #, c-format
1753 msgid "invalid %XX escape sequence"
1754 msgstr "无效的 %XX 转义序列"
1755
1756 #: urlmatch.c:172
1757 msgid "missing host and scheme is not 'file:'"
1758 msgstr "缺失主机名且 URL 方案不是 'file:'"
1759
1760 #: urlmatch.c:189
1761 msgid "a 'file:' URL may not have a port number"
1762 msgstr "一个 'file:' URL 不应该包含端口号"
1763
1764 #: urlmatch.c:199
1765 msgid "invalid characters in host name"
1766 msgstr "主机名中包含无效的字符"
1767
1768 #: urlmatch.c:244 urlmatch.c:255
1769 msgid "invalid port number"
1770 msgstr "无效的端口号"
1771
1772 #: urlmatch.c:322
1773 msgid "invalid '..' path segment"
1774 msgstr "无效的 '..' 路径片段"
1775
1776 #: wrapper.c:219 wrapper.c:362
1777 #, c-format
1778 msgid "could not open '%s' for reading and writing"
1779 msgstr "无法打开 '%s' 进行读写"
1780
1781 #: wrapper.c:221 wrapper.c:364
1782 #, c-format
1783 msgid "could not open '%s' for writing"
1784 msgstr "无法打开 '%s' 进行写入"
1785
1786 #: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
1787 #: builtin/merge.c:1074 builtin/pull.c:380
1788 #, c-format
1789 msgid "could not open '%s' for reading"
1790 msgstr "无法打开 '%s' 进行读取"
1791
1792 #: wrapper.c:579
1793 #, c-format
1794 msgid "unable to access '%s': %s"
1795 msgstr "不能访问 '%s'：%s"
1796
1797 #: wrapper.c:600
1798 #, c-format
1799 msgid "unable to access '%s'"
1800 msgstr "不能访问 '%s'"
1801
1802 #: wrapper.c:608
1803 msgid "unable to get current working directory"
1804 msgstr "不能获取当前工作目录"
1805
1806 #: wrapper.c:635
1807 #, c-format
1808 msgid "could not open %s for writing"
1809 msgstr "不能写入 %s"
1810
1811 #: wrapper.c:646 builtin/am.c:425
1812 #, c-format
1813 msgid "could not write to %s"
1814 msgstr "不能写入 %s"
1815
1816 #: wrapper.c:652
1817 #, c-format
1818 msgid "could not close %s"
1819 msgstr "不能关闭 %s"
1820
1821 #: wt-status.c:149
1822 msgid "Unmerged paths:"
1823 msgstr "未合并的路径："
1824
1825 #  译者：注意保持前导空格
1826 #: wt-status.c:176 wt-status.c:203
1827 #, c-format
1828 msgid "  (use \"git reset %s <file>...\" to unstage)"
1829 msgstr "  （使用 \"git reset %s <文件>...\" 以取消暂存）"
1830
1831 #  译者：注意保持前导空格
1832 #: wt-status.c:178 wt-status.c:205
1833 msgid "  (use \"git rm --cached <file>...\" to unstage)"
1834 msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
1835
1836 #  译者：注意保持前导空格
1837 #: wt-status.c:182
1838 msgid "  (use \"git add <file>...\" to mark resolution)"
1839 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
1840
1841 #  译者：注意保持前导空格
1842 #: wt-status.c:184 wt-status.c:188
1843 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1844 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
1845
1846 #  译者：注意保持前导空格
1847 #: wt-status.c:186
1848 msgid "  (use \"git rm <file>...\" to mark resolution)"
1849 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
1850
1851 #: wt-status.c:197 wt-status.c:880
1852 msgid "Changes to be committed:"
1853 msgstr "要提交的变更："
1854
1855 #: wt-status.c:215 wt-status.c:889
1856 msgid "Changes not staged for commit:"
1857 msgstr "尚未暂存以备提交的变更："
1858
1859 #  译者：注意保持前导空格
1860 #: wt-status.c:219
1861 msgid "  (use \"git add <file>...\" to update what will be committed)"
1862 msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
1863
1864 #  译者：注意保持前导空格
1865 #: wt-status.c:221
1866 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
1867 msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
1868
1869 #  译者：注意保持前导空格
1870 #: wt-status.c:222
1871 msgid ""
1872 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
1873 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
1874
1875 #  译者：注意保持前导空格
1876 #: wt-status.c:224
1877 msgid "  (commit or discard the untracked or modified content in submodules)"
1878 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
1879
1880 #  译者：注意保持前导空格
1881 #: wt-status.c:236
1882 #, c-format
1883 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
1884 msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
1885
1886 #: wt-status.c:251
1887 msgid "both deleted:"
1888 msgstr "双方删除："
1889
1890 #: wt-status.c:253
1891 msgid "added by us:"
1892 msgstr "由我们添加："
1893
1894 #: wt-status.c:255
1895 msgid "deleted by them:"
1896 msgstr "由他们删除："
1897
1898 #: wt-status.c:257
1899 msgid "added by them:"
1900 msgstr "由他们添加："
1901
1902 #: wt-status.c:259
1903 msgid "deleted by us:"
1904 msgstr "由我们删除："
1905
1906 #: wt-status.c:261
1907 msgid "both added:"
1908 msgstr "双方添加："
1909
1910 #: wt-status.c:263
1911 msgid "both modified:"
1912 msgstr "双方修改："
1913
1914 #: wt-status.c:265
1915 #, c-format
1916 msgid "bug: unhandled unmerged status %x"
1917 msgstr "bug：无法处理的未合并状态 %x"
1918
1919 #: wt-status.c:273
1920 msgid "new file:"
1921 msgstr "新文件："
1922
1923 #: wt-status.c:275
1924 msgid "copied:"
1925 msgstr "拷贝："
1926
1927 #: wt-status.c:277
1928 msgid "deleted:"
1929 msgstr "删除："
1930
1931 #: wt-status.c:279
1932 msgid "modified:"
1933 msgstr "修改："
1934
1935 #: wt-status.c:281
1936 msgid "renamed:"
1937 msgstr "重命名："
1938
1939 #: wt-status.c:283
1940 msgid "typechange:"
1941 msgstr "类型变更："
1942
1943 #: wt-status.c:285
1944 msgid "unknown:"
1945 msgstr "未知："
1946
1947 #: wt-status.c:287
1948 msgid "unmerged:"
1949 msgstr "未合并："
1950
1951 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1952 #: wt-status.c:369
1953 msgid "new commits, "
1954 msgstr "新提交, "
1955
1956 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1957 #: wt-status.c:371
1958 msgid "modified content, "
1959 msgstr "修改的内容, "
1960
1961 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
1962 #: wt-status.c:373
1963 msgid "untracked content, "
1964 msgstr "未跟踪的内容, "
1965
1966 #: wt-status.c:390
1967 #, c-format
1968 msgid "bug: unhandled diff status %c"
1969 msgstr "bug：无法处理的差异状态 %c"
1970
1971 #: wt-status.c:754
1972 msgid "Submodules changed but not updated:"
1973 msgstr "子模组已修改但尚未更新："
1974
1975 #: wt-status.c:756
1976 msgid "Submodule changes to be committed:"
1977 msgstr "要提交的子模组变更："
1978
1979 #: wt-status.c:837
1980 msgid ""
1981 "Do not touch the line above.\n"
1982 "Everything below will be removed."
1983 msgstr ""
1984 "不要改动上面的一行。\n"
1985 "下面的所有内容均将被删除。"
1986
1987 #: wt-status.c:948
1988 msgid "You have unmerged paths."
1989 msgstr "您有尚未合并的路径。"
1990
1991 #  译者：注意保持前导空格
1992 #: wt-status.c:951
1993 msgid "  (fix conflicts and run \"git commit\")"
1994 msgstr "  （解决冲突并运行 \"git commit\"）"
1995
1996 #: wt-status.c:954
1997 msgid "All conflicts fixed but you are still merging."
1998 msgstr "所有冲突已解决但您仍处于合并中。"
1999
2000 #  译者：注意保持前导空格
2001 #: wt-status.c:957
2002 msgid "  (use \"git commit\" to conclude merge)"
2003 msgstr "  （使用 \"git commit\" 结束合并）"
2004
2005 #: wt-status.c:967
2006 msgid "You are in the middle of an am session."
2007 msgstr "您正处于 am 操作过程中。"
2008
2009 #: wt-status.c:970
2010 msgid "The current patch is empty."
2011 msgstr "当前的补丁为空。"
2012
2013 #  译者：注意保持前导空格
2014 #: wt-status.c:974
2015 msgid "  (fix conflicts and then run \"git am --continue\")"
2016 msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
2017
2018 #  译者：注意保持前导空格
2019 #: wt-status.c:976
2020 msgid "  (use \"git am --skip\" to skip this patch)"
2021 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
2022
2023 #  译者：注意保持前导空格
2024 #: wt-status.c:978
2025 msgid "  (use \"git am --abort\" to restore the original branch)"
2026 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
2027
2028 #: wt-status.c:1105
2029 msgid "No commands done."
2030 msgstr "没有命令被执行。"
2031
2032 #: wt-status.c:1108
2033 #, c-format
2034 msgid "Last command done (%d command done):"
2035 msgid_plural "Last commands done (%d commands done):"
2036 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
2037 msgstr[1] "最后的命令已完成（%d 条命令被执行）："
2038
2039 #: wt-status.c:1119
2040 #, c-format
2041 msgid "  (see more in file %s)"
2042 msgstr "  （更多参见文件 %s）"
2043
2044 #: wt-status.c:1124
2045 msgid "No commands remaining."
2046 msgstr "未剩下任何命令。"
2047
2048 #: wt-status.c:1127
2049 #, c-format
2050 msgid "Next command to do (%d remaining command):"
2051 msgid_plural "Next commands to do (%d remaining commands):"
2052 msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
2053 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
2054
2055 #  译者：注意保持前导空格
2056 #: wt-status.c:1135
2057 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
2058 msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
2059
2060 #: wt-status.c:1148
2061 #, c-format
2062 msgid "You are currently rebasing branch '%s' on '%s'."
2063 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2064
2065 #: wt-status.c:1153
2066 msgid "You are currently rebasing."
2067 msgstr "您在执行变基操作。"
2068
2069 #  译者：注意保持前导空格
2070 #: wt-status.c:1167
2071 msgid "  (fix conflicts and then run \"git rebase --continue\")"
2072 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
2073
2074 #  译者：注意保持前导空格
2075 #: wt-status.c:1169
2076 msgid "  (use \"git rebase --skip\" to skip this patch)"
2077 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
2078
2079 #  译者：注意保持前导空格
2080 #: wt-status.c:1171
2081 msgid "  (use \"git rebase --abort\" to check out the original branch)"
2082 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
2083
2084 #  译者：注意保持前导空格
2085 #: wt-status.c:1177
2086 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
2087 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
2088
2089 #: wt-status.c:1181
2090 #, c-format
2091 msgid ""
2092 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2093 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2094
2095 #: wt-status.c:1186
2096 msgid "You are currently splitting a commit during a rebase."
2097 msgstr "您在执行变基操作时拆分提交。"
2098
2099 #  译者：注意保持前导空格
2100 #: wt-status.c:1189
2101 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
2102 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
2103
2104 #: wt-status.c:1193
2105 #, c-format
2106 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2107 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2108
2109 #: wt-status.c:1198
2110 msgid "You are currently editing a commit during a rebase."
2111 msgstr "您在执行变基操作时编辑提交。"
2112
2113 #  译者：注意保持前导空格
2114 #: wt-status.c:1201
2115 msgid "  (use \"git commit --amend\" to amend the current commit)"
2116 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
2117
2118 #  译者：注意保持前导空格
2119 #: wt-status.c:1203
2120 msgid ""
2121 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
2122 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
2123
2124 #: wt-status.c:1213
2125 #, c-format
2126 msgid "You are currently cherry-picking commit %s."
2127 msgstr "您在执行拣选提交 %s 的操作。"
2128
2129 #  译者：注意保持前导空格
2130 #: wt-status.c:1218
2131 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
2132 msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
2133
2134 #  译者：注意保持前导空格
2135 #: wt-status.c:1221
2136 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
2137 msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
2138
2139 #  译者：注意保持前导空格
2140 #: wt-status.c:1223
2141 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2142 msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
2143
2144 #: wt-status.c:1232
2145 #, c-format
2146 msgid "You are currently reverting commit %s."
2147 msgstr "您在执行反转提交 %s 的操作。"
2148
2149 #  译者：注意保持前导空格
2150 #: wt-status.c:1237
2151 msgid "  (fix conflicts and run \"git revert --continue\")"
2152 msgstr "  （解决冲突并运行 \"git revert --continue\"）"
2153
2154 #  译者：注意保持前导空格
2155 #: wt-status.c:1240
2156 msgid "  (all conflicts fixed: run \"git revert --continue\")"
2157 msgstr "  （所有冲突已解决：运行 \"git revert --continue\"）"
2158
2159 #  译者：注意保持前导空格
2160 #: wt-status.c:1242
2161 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
2162 msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
2163
2164 #: wt-status.c:1253
2165 #, c-format
2166 msgid "You are currently bisecting, started from branch '%s'."
2167 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2168
2169 #: wt-status.c:1257
2170 msgid "You are currently bisecting."
2171 msgstr "您在执行二分查找操作。"
2172
2173 #  译者：注意保持前导空格
2174 #: wt-status.c:1260
2175 msgid "  (use \"git bisect reset\" to get back to the original branch)"
2176 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
2177
2178 #: wt-status.c:1438
2179 msgid "On branch "
2180 msgstr "位于分支 "
2181
2182 #: wt-status.c:1444
2183 msgid "interactive rebase in progress; onto "
2184 msgstr "交互式变基操作正在进行中；至 "
2185
2186 #: wt-status.c:1446
2187 msgid "rebase in progress; onto "
2188 msgstr "变基操作正在进行中；至 "
2189
2190 #: wt-status.c:1451
2191 msgid "HEAD detached at "
2192 msgstr "头指针分离于 "
2193
2194 #: wt-status.c:1453
2195 msgid "HEAD detached from "
2196 msgstr "头指针分离自 "
2197
2198 #: wt-status.c:1456
2199 msgid "Not currently on any branch."
2200 msgstr "当前不在任何分支上。"
2201
2202 #: wt-status.c:1474
2203 msgid "Initial commit"
2204 msgstr "初始提交"
2205
2206 #: wt-status.c:1488
2207 msgid "Untracked files"
2208 msgstr "未跟踪的文件"
2209
2210 #: wt-status.c:1490
2211 msgid "Ignored files"
2212 msgstr "忽略的文件"
2213
2214 #: wt-status.c:1494
2215 #, c-format
2216 msgid ""
2217 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2218 "may speed it up, but you have to be careful not to forget to add\n"
2219 "new files yourself (see 'git help status')."
2220 msgstr ""
2221 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
2222 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"
2223
2224 #: wt-status.c:1500
2225 #, c-format
2226 msgid "Untracked files not listed%s"
2227 msgstr "未跟踪的文件没有列出%s"
2228
2229 #  译者：中文字符串拼接，可删除前导空格
2230 #: wt-status.c:1502
2231 msgid " (use -u option to show untracked files)"
2232 msgstr "（使用 -u 参数显示未跟踪的文件）"
2233
2234 #: wt-status.c:1508
2235 msgid "No changes"
2236 msgstr "没有修改"
2237
2238 #: wt-status.c:1513
2239 #, c-format
2240 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2241 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
2242
2243 #: wt-status.c:1516
2244 #, c-format
2245 msgid "no changes added to commit\n"
2246 msgstr "修改尚未加入提交\n"
2247
2248 #: wt-status.c:1519
2249 #, c-format
2250 msgid ""
2251 "nothing added to commit but untracked files present (use \"git add\" to "
2252 "track)\n"
2253 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
2254
2255 #: wt-status.c:1522
2256 #, c-format
2257 msgid "nothing added to commit but untracked files present\n"
2258 msgstr "提交为空，但是存在尚未跟踪的文件\n"
2259
2260 #  译者：中文字符串拼接，可删除前导空格
2261 #: wt-status.c:1525
2262 #, c-format
2263 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2264 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
2265
2266 #: wt-status.c:1528 wt-status.c:1533
2267 #, c-format
2268 msgid "nothing to commit\n"
2269 msgstr "无文件要提交\n"
2270
2271 #  译者：中文字符串拼接，可删除前导空格
2272 #: wt-status.c:1531
2273 #, c-format
2274 msgid "nothing to commit (use -u to show untracked files)\n"
2275 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
2276
2277 #  译者：中文字符串拼接，可删除前导空格
2278 #: wt-status.c:1535
2279 #, c-format
2280 msgid "nothing to commit, working directory clean\n"
2281 msgstr "无文件要提交，干净的工作区\n"
2282
2283 #  译者：注意保持句尾空格
2284 #: wt-status.c:1642
2285 msgid "Initial commit on "
2286 msgstr "初始提交于 "
2287
2288 #: wt-status.c:1646
2289 msgid "HEAD (no branch)"
2290 msgstr "HEAD（非分支）"
2291
2292 #: wt-status.c:1675
2293 msgid "gone"
2294 msgstr "丢失"
2295
2296 #  译者：注意保持句尾空格
2297 #: wt-status.c:1677 wt-status.c:1685
2298 msgid "behind "
2299 msgstr "落后 "
2300
2301 #: compat/precompose_utf8.c:56 builtin/clone.c:408
2302 #, c-format
2303 msgid "failed to unlink '%s'"
2304 msgstr "无法删除 '%s'"
2305
2306 #: builtin/add.c:22
2307 msgid "git add [<options>] [--] <pathspec>..."
2308 msgstr "git add [<选项>] [--] <路径规格>..."
2309
2310 #: builtin/add.c:65
2311 #, c-format
2312 msgid "unexpected diff status %c"
2313 msgstr "意外的差异状态 %c"
2314
2315 #: builtin/add.c:70 builtin/commit.c:278
2316 msgid "updating files failed"
2317 msgstr "更新文件失败"
2318
2319 #: builtin/add.c:80
2320 #, c-format
2321 msgid "remove '%s'\n"
2322 msgstr "删除 '%s'\n"
2323
2324 #: builtin/add.c:134
2325 msgid "Unstaged changes after refreshing the index:"
2326 msgstr "刷新索引之后尚未被暂存的变更："
2327
2328 #: builtin/add.c:194 builtin/rev-parse.c:796
2329 msgid "Could not read the index"
2330 msgstr "不能读取索引"
2331
2332 #: builtin/add.c:205
2333 #, c-format
2334 msgid "Could not open '%s' for writing."
2335 msgstr "无法打开 '%s' 进行写入。"
2336
2337 #: builtin/add.c:209
2338 msgid "Could not write patch"
2339 msgstr "不能生成补丁"
2340
2341 #: builtin/add.c:212
2342 msgid "editing patch failed"
2343 msgstr "编辑补丁失败"
2344
2345 #: builtin/add.c:215
2346 #, c-format
2347 msgid "Could not stat '%s'"
2348 msgstr "不能查看文件状态 '%s'"
2349
2350 #: builtin/add.c:217
2351 msgid "Empty patch. Aborted."
2352 msgstr "空补丁。异常终止。"
2353
2354 #: builtin/add.c:222
2355 #, c-format
2356 msgid "Could not apply '%s'"
2357 msgstr "不能应用 '%s'"
2358
2359 #: builtin/add.c:232
2360 msgid "The following paths are ignored by one of your .gitignore files:\n"
2361 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2362
2363 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
2364 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
2365 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
2366 msgid "dry run"
2367 msgstr "演习"
2368
2369 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2370 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2371 #: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
2372 msgid "be verbose"
2373 msgstr "冗长输出"
2374
2375 #: builtin/add.c:252
2376 msgid "interactive picking"
2377 msgstr "交互式拣选"
2378
2379 #: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
2380 msgid "select hunks interactively"
2381 msgstr "交互式挑选数据块"
2382
2383 #: builtin/add.c:254
2384 msgid "edit current diff and apply"
2385 msgstr "编辑当前差异并应用"
2386
2387 #: builtin/add.c:255
2388 msgid "allow adding otherwise ignored files"
2389 msgstr "允许添加忽略的文件"
2390
2391 #: builtin/add.c:256
2392 msgid "update tracked files"
2393 msgstr "更新已跟踪的文件"
2394
2395 #: builtin/add.c:257
2396 msgid "record only the fact that the path will be added later"
2397 msgstr "只记录，该路径稍后再添加"
2398
2399 #: builtin/add.c:258
2400 msgid "add changes from all tracked and untracked files"
2401 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2402
2403 #: builtin/add.c:261
2404 msgid "ignore paths removed in the working tree (same as --no-all)"
2405 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
2406
2407 #: builtin/add.c:263
2408 msgid "don't add, only refresh the index"
2409 msgstr "不添加，只刷新索引"
2410
2411 #: builtin/add.c:264
2412 msgid "just skip files which cannot be added because of errors"
2413 msgstr "跳过因出错不能添加的文件"
2414
2415 #: builtin/add.c:265
2416 msgid "check if - even missing - files are ignored in dry run"
2417 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
2418
2419 #: builtin/add.c:287
2420 #, c-format
2421 msgid "Use -f if you really want to add them.\n"
2422 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2423
2424 #: builtin/add.c:294
2425 msgid "adding files failed"
2426 msgstr "添加文件失败"
2427
2428 #: builtin/add.c:330
2429 msgid "-A and -u are mutually incompatible"
2430 msgstr "-A 和 -u 选项互斥"
2431
2432 #: builtin/add.c:337
2433 msgid "Option --ignore-missing can only be used together with --dry-run"
2434 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2435
2436 #: builtin/add.c:352
2437 #, c-format
2438 msgid "Nothing specified, nothing added.\n"
2439 msgstr "没有指定文件，也没有文件被添加。\n"
2440
2441 #: builtin/add.c:353
2442 #, c-format
2443 msgid "Maybe you wanted to say 'git add .'?\n"
2444 msgstr "也许您想要执行 'git add .'？\n"
2445
2446 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2447 #: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2448 #: builtin/submodule--helper.c:40
2449 msgid "index file corrupt"
2450 msgstr "索引文件损坏"
2451
2452 #: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
2453 msgid "Unable to write new index file"
2454 msgstr "无法写入新索引文件"
2455
2456 #: builtin/am.c:42
2457 #, c-format
2458 msgid "could not stat %s"
2459 msgstr "不能获取 %s 的文件状态"
2460
2461 #: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
2462 #, c-format
2463 msgid "could not read '%s'"
2464 msgstr "不能读取 '%s'"
2465
2466 #: builtin/am.c:445
2467 msgid "could not parse author script"
2468 msgstr "不能解析作者脚本"
2469
2470 #: builtin/am.c:522
2471 #, c-format
2472 msgid "'%s' was deleted by the applypatch-msg hook"
2473 msgstr "'%s' 被 applypatch-msg 钩子删除"
2474
2475 #: builtin/am.c:563 builtin/notes.c:300
2476 #, c-format
2477 msgid "Malformed input line: '%s'."
2478 msgstr "非法的输入行：'%s'。"
2479
2480 #: builtin/am.c:600 builtin/notes.c:315
2481 #, c-format
2482 msgid "Failed to copy notes from '%s' to '%s'"
2483 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2484
2485 #: builtin/am.c:626
2486 msgid "fseek failed"
2487 msgstr "fseek 失败"
2488
2489 #: builtin/am.c:787 builtin/am.c:875
2490 #, c-format
2491 msgid "could not open '%s' for reading: %s"
2492 msgstr "无法打开 '%s' 进行读取：%s"
2493
2494 #: builtin/am.c:794
2495 #, c-format
2496 msgid "could not open '%s' for writing: %s"
2497 msgstr "无法打开 '%s' 进行写入：%s"
2498
2499 #: builtin/am.c:803
2500 #, c-format
2501 msgid "could not parse patch '%s'"
2502 msgstr "无法解析补丁 '%s'"
2503
2504 #: builtin/am.c:868
2505 msgid "Only one StGIT patch series can be applied at once"
2506 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2507
2508 #: builtin/am.c:916
2509 msgid "invalid timestamp"
2510 msgstr "无效的时间戳"
2511
2512 #: builtin/am.c:919 builtin/am.c:927
2513 msgid "invalid Date line"
2514 msgstr "无效的日期行"
2515
2516 #: builtin/am.c:924
2517 msgid "invalid timezone offset"
2518 msgstr "无效的时区偏移值"
2519
2520 #: builtin/am.c:1011
2521 msgid "Patch format detection failed."
2522 msgstr "补丁格式检测失败。"
2523
2524 #: builtin/am.c:1016 builtin/clone.c:373
2525 #, c-format
2526 msgid "failed to create directory '%s'"
2527 msgstr "无法创建目录 '%s'"
2528
2529 #: builtin/am.c:1020
2530 msgid "Failed to split patches."
2531 msgstr "无法拆分补丁。"
2532
2533 #: builtin/am.c:1152 builtin/commit.c:363
2534 msgid "unable to write index file"
2535 msgstr "无法写入索引文件"
2536
2537 #: builtin/am.c:1203
2538 #, c-format
2539 msgid "When you have resolved this problem, run \"%s --continue\"."
2540 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
2541
2542 #: builtin/am.c:1204
2543 #, c-format
2544 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2545 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
2546
2547 #: builtin/am.c:1205
2548 #, c-format
2549 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2550 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
2551
2552 #: builtin/am.c:1343
2553 msgid "Patch is empty. Was it split wrong?"
2554 msgstr "补丁为空。是不是切分错误？"
2555
2556 #: builtin/am.c:1417 builtin/log.c:1347
2557 #, c-format
2558 msgid "invalid ident line: %s"
2559 msgstr "包含无效的身份标识：%s"
2560
2561 #: builtin/am.c:1444
2562 #, c-format
2563 msgid "unable to parse commit %s"
2564 msgstr "不能解析提交 %s"
2565
2566 #: builtin/am.c:1646
2567 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2568 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2569
2570 #: builtin/am.c:1648
2571 msgid "Using index info to reconstruct a base tree..."
2572 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
2573
2574 #: builtin/am.c:1667
2575 msgid ""
2576 "Did you hand edit your patch?\n"
2577 "It does not apply to blobs recorded in its index."
2578 msgstr ""
2579 "您是否曾手动编辑过您的补丁？\n"
2580 "无法应用补丁到索引中的数据对象上。"
2581
2582 #: builtin/am.c:1673
2583 msgid "Falling back to patching base and 3-way merge..."
2584 msgstr "回落到基础版本上打补丁及进行三方合并..."
2585
2586 #: builtin/am.c:1688
2587 msgid "Failed to merge in the changes."
2588 msgstr "无法合并变更。"
2589
2590 #: builtin/am.c:1712 builtin/merge.c:632
2591 msgid "git write-tree failed to write a tree"
2592 msgstr "git write-tree 无法写入一树对象"
2593
2594 #: builtin/am.c:1719
2595 msgid "applying to an empty history"
2596 msgstr "正应用到一个空历史上"
2597
2598 #: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
2599 #: builtin/merge.c:854
2600 msgid "failed to write commit object"
2601 msgstr "无法写提交对象"
2602
2603 #: builtin/am.c:1764 builtin/am.c:1768
2604 #, c-format
2605 msgid "cannot resume: %s does not exist."
2606 msgstr "无法继续：%s 不存在。"
2607
2608 #: builtin/am.c:1784
2609 msgid "cannot be interactive without stdin connected to a terminal."
2610 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
2611
2612 #: builtin/am.c:1789
2613 msgid "Commit Body is:"
2614 msgstr "提交内容为："
2615
2616 #  译者：注意保持句尾空格
2617 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2618 #. in your translation. The program will only accept English
2619 #. input at this point.
2620 #.
2621 #: builtin/am.c:1799
2622 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2623 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
2624
2625 #: builtin/am.c:1849
2626 #, c-format
2627 msgid "Dirty index: cannot apply patches (dirty: %s)"
2628 msgstr "脏索引：不能应用补丁（脏文件：%s）"
2629
2630 #: builtin/am.c:1884 builtin/am.c:1955
2631 #, c-format
2632 msgid "Applying: %.*s"
2633 msgstr "应用：%.*s"
2634
2635 #: builtin/am.c:1900
2636 msgid "No changes -- Patch already applied."
2637 msgstr "没有变更 —— 补丁已经应用过。"
2638
2639 #: builtin/am.c:1908
2640 #, c-format
2641 msgid "Patch failed at %s %.*s"
2642 msgstr "打补丁失败于 %s %.*s"
2643
2644 #: builtin/am.c:1914
2645 #, c-format
2646 msgid "The copy of the patch that failed is found in: %s"
2647 msgstr "失败的补丁文件副本位于：%s"
2648
2649 #: builtin/am.c:1958
2650 msgid ""
2651 "No changes - did you forget to use 'git add'?\n"
2652 "If there is nothing left to stage, chances are that something else\n"
2653 "already introduced the same changes; you might want to skip this patch."
2654 msgstr ""
2655 "没有变更 —— 您是不是忘了执行 'git add'？\n"
2656 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
2657 "您也许想要跳过这个补丁。"
2658
2659 #: builtin/am.c:1965
2660 msgid ""
2661 "You still have unmerged paths in your index.\n"
2662 "Did you forget to use 'git add'?"
2663 msgstr ""
2664 "您的索引中仍有未合并的路径。\n"
2665 "您是否忘了执行 'git add'？"
2666
2667 #: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
2668 #: builtin/reset.c:316
2669 #, c-format
2670 msgid "Could not parse object '%s'."
2671 msgstr "不能解析对象 '%s'。"
2672
2673 #: builtin/am.c:2125
2674 msgid "failed to clean index"
2675 msgstr "无法清空索引"
2676
2677 #: builtin/am.c:2159
2678 msgid ""
2679 "You seem to have moved HEAD since the last 'am' failure.\n"
2680 "Not rewinding to ORIG_HEAD"
2681 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2682
2683 #: builtin/am.c:2220
2684 #, c-format
2685 msgid "Invalid value for --patch-format: %s"
2686 msgstr "无效的 --patch-format 值：%s"
2687
2688 #: builtin/am.c:2253
2689 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2690 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2691
2692 #: builtin/am.c:2254
2693 msgid "git am [<options>] (--continue | --skip | --abort)"
2694 msgstr "git am [<选项>] (--continue | --skip | --abort)"
2695
2696 #: builtin/am.c:2260
2697 msgid "run interactively"
2698 msgstr "以交互式方式运行"
2699
2700 #: builtin/am.c:2262
2701 msgid "historical option -- no-op"
2702 msgstr "老的参数 —— 无作用"
2703
2704 #: builtin/am.c:2264
2705 msgid "allow fall back on 3way merging if needed"
2706 msgstr "如果必要，允许使用三方合并。"
2707
2708 #: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
2709 #: builtin/repack.c:171
2710 msgid "be quiet"
2711 msgstr "静默模式"
2712
2713 #: builtin/am.c:2267
2714 msgid "add a Signed-off-by line to the commit message"
2715 msgstr "在提交说明中添加一个 Signed-off-by 签名"
2716
2717 #: builtin/am.c:2270
2718 msgid "recode into utf8 (default)"
2719 msgstr "使用 utf8 字符集（默认）"
2720
2721 #: builtin/am.c:2272
2722 msgid "pass -k flag to git-mailinfo"
2723 msgstr "向 git-mailinfo 传递 -k 参数"
2724
2725 #: builtin/am.c:2274
2726 msgid "pass -b flag to git-mailinfo"
2727 msgstr "向 git-mailinfo 传递 -b 参数"
2728
2729 #: builtin/am.c:2276
2730 msgid "pass -m flag to git-mailinfo"
2731 msgstr "向 git-mailinfo 传递 -m 参数"
2732
2733 #: builtin/am.c:2278
2734 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2735 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
2736
2737 #: builtin/am.c:2281
2738 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2739 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
2740
2741 #: builtin/am.c:2284
2742 msgid "strip everything before a scissors line"
2743 msgstr "丢弃裁切线前的所有内容"
2744
2745 #: builtin/am.c:2285 builtin/apply.c:4554
2746 msgid "action"
2747 msgstr "动作"
2748
2749 #: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2750 #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2751 #: builtin/am.c:2313
2752 msgid "pass it through git-apply"
2753 msgstr "传递给 git-apply"
2754
2755 #: builtin/am.c:2294 builtin/apply.c:4578
2756 msgid "root"
2757 msgstr "根目录"
2758
2759 #: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2760 #: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2761 #: builtin/pull.c:167 builtin/submodule--helper.c:78
2762 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
2763 msgid "path"
2764 msgstr "路径"
2765
2766 #: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2767 #: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2768 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2769 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2770 #: parse-options.h:134 parse-options.h:244
2771 msgid "n"
2772 msgstr "n"
2773
2774 #: builtin/am.c:2306 builtin/apply.c:4522
2775 msgid "num"
2776 msgstr "数字"
2777
2778 #: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2779 #: builtin/tag.c:372
2780 msgid "format"
2781 msgstr "格式"
2782
2783 #: builtin/am.c:2310
2784 msgid "format the patch(es) are in"
2785 msgstr "补丁的格式"
2786
2787 #: builtin/am.c:2316
2788 msgid "override error message when patch failure occurs"
2789 msgstr "打补丁失败时显示的错误信息"
2790
2791 #: builtin/am.c:2318
2792 msgid "continue applying patches after resolving a conflict"
2793 msgstr "冲突解决后继续应用补丁"
2794
2795 #: builtin/am.c:2321
2796 msgid "synonyms for --continue"
2797 msgstr "和 --continue 同义"
2798
2799 #: builtin/am.c:2324
2800 msgid "skip the current patch"
2801 msgstr "跳过当前补丁"
2802
2803 #: builtin/am.c:2327
2804 msgid "restore the original branch and abort the patching operation."
2805 msgstr "恢复原始分支并终止打补丁操作。"
2806
2807 #: builtin/am.c:2331
2808 msgid "lie about committer date"
2809 msgstr "将作者日期作为提交日期"
2810
2811 #: builtin/am.c:2333
2812 msgid "use current timestamp for author date"
2813 msgstr "用当前时间作为作者日期"
2814
2815 #: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2816 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
2817 msgid "key-id"
2818 msgstr "key-id"
2819
2820 #: builtin/am.c:2336
2821 msgid "GPG-sign commits"
2822 msgstr "使用 GPG 签名提交"
2823
2824 #: builtin/am.c:2339
2825 msgid "(internal use for git-rebase)"
2826 msgstr "（内部使用，用于 git-rebase）"
2827
2828 #: builtin/am.c:2354
2829 msgid ""
2830 "The -b/--binary option has been a no-op for long time, and\n"
2831 "it will be removed. Please do not use it anymore."
2832 msgstr ""
2833 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
2834 "请不要再使用它了。"
2835
2836 #: builtin/am.c:2361
2837 msgid "failed to read the index"
2838 msgstr "无法读取索引"
2839
2840 #: builtin/am.c:2376
2841 #, c-format
2842 msgid "previous rebase directory %s still exists but mbox given."
2843 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
2844
2845 #: builtin/am.c:2400
2846 #, c-format
2847 msgid ""
2848 "Stray %s directory found.\n"
2849 "Use \"git am --abort\" to remove it."
2850 msgstr ""
2851 "发现了错误的 %s 目录。\n"
2852 "使用 \"git am --abort\" 删除它。"
2853
2854 #: builtin/am.c:2406
2855 msgid "Resolve operation not in progress, we are not resuming."
2856 msgstr "解决操作未进行，我们不会继续。"
2857
2858 #: builtin/apply.c:59
2859 msgid "git apply [<options>] [<patch>...]"
2860 msgstr "git apply [<选项>] [<补丁>...]"
2861
2862 #: builtin/apply.c:111
2863 #, c-format
2864 msgid "unrecognized whitespace option '%s'"
2865 msgstr "未能识别的空白字符选项 '%s'"
2866
2867 #: builtin/apply.c:126
2868 #, c-format
2869 msgid "unrecognized whitespace ignore option '%s'"
2870 msgstr "未能识别的空白字符忽略选项 '%s'"
2871
2872 #: builtin/apply.c:818
2873 #, c-format
2874 msgid "Cannot prepare timestamp regexp %s"
2875 msgstr "无法准备时间戳正则表达式 %s"
2876
2877 #: builtin/apply.c:827
2878 #, c-format
2879 msgid "regexec returned %d for input: %s"
2880 msgstr "regexec 返回 %d，输入为：%s"
2881
2882 #: builtin/apply.c:908
2883 #, c-format
2884 msgid "unable to find filename in patch at line %d"
2885 msgstr "不能在补丁的第 %d 行找到文件名"
2886
2887 #: builtin/apply.c:940
2888 #, c-format
2889 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2890 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
2891
2892 #: builtin/apply.c:944
2893 #, c-format
2894 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2895 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
2896
2897 #: builtin/apply.c:945
2898 #, c-format
2899 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2900 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
2901
2902 #: builtin/apply.c:952
2903 #, c-format
2904 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2905 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
2906
2907 #: builtin/apply.c:1415
2908 #, c-format
2909 msgid "recount: unexpected line: %.*s"
2910 msgstr "recount：意外的行：%.*s"
2911
2912 #: builtin/apply.c:1472
2913 #, c-format
2914 msgid "patch fragment without header at line %d: %.*s"
2915 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
2916
2917 #: builtin/apply.c:1489
2918 #, c-format
2919 msgid ""
2920 "git diff header lacks filename information when removing %d leading pathname "
2921 "component (line %d)"
2922 msgid_plural ""
2923 "git diff header lacks filename information when removing %d leading pathname "
2924 "components (line %d)"
2925 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2926 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2927
2928 #: builtin/apply.c:1655
2929 msgid "new file depends on old contents"
2930 msgstr "新文件依赖旧内容"
2931
2932 #: builtin/apply.c:1657
2933 msgid "deleted file still has contents"
2934 msgstr "删除的文件仍有内容"
2935
2936 #: builtin/apply.c:1683
2937 #, c-format
2938 msgid "corrupt patch at line %d"
2939 msgstr "补丁在第 %d 行损坏"
2940
2941 #: builtin/apply.c:1719
2942 #, c-format
2943 msgid "new file %s depends on old contents"
2944 msgstr "新文件 %s 依赖旧内容"
2945
2946 #: builtin/apply.c:1721
2947 #, c-format
2948 msgid "deleted file %s still has contents"
2949 msgstr "删除的文件 %s 仍有内容"
2950
2951 #: builtin/apply.c:1724
2952 #, c-format
2953 msgid "** warning: file %s becomes empty but is not deleted"
2954 msgstr "** 警告：文件 %s 成为空文件但并未删除"
2955
2956 #: builtin/apply.c:1870
2957 #, c-format
2958 msgid "corrupt binary patch at line %d: %.*s"
2959 msgstr "二进制补丁在第 %d 行损坏：%.*s"
2960
2961 #: builtin/apply.c:1899
2962 #, c-format
2963 msgid "unrecognized binary patch at line %d"
2964 msgstr "未能识别的二进制补丁位于第 %d 行"
2965
2966 #: builtin/apply.c:2050
2967 #, c-format
2968 msgid "patch with only garbage at line %d"
2969 msgstr "补丁文件的第 %d 行只有垃圾数据"
2970
2971 #: builtin/apply.c:2140
2972 #, c-format
2973 msgid "unable to read symlink %s"
2974 msgstr "无法读取符号链接 %s"
2975
2976 #: builtin/apply.c:2144
2977 #, c-format
2978 msgid "unable to open or read %s"
2979 msgstr "不能打开或读取 %s"
2980
2981 #: builtin/apply.c:2777
2982 #, c-format
2983 msgid "invalid start of line: '%c'"
2984 msgstr "无效的行首字符：'%c'"
2985
2986 #: builtin/apply.c:2896
2987 #, c-format
2988 msgid "Hunk #%d succeeded at %d (offset %d line)."
2989 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2990 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
2991 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
2992
2993 #: builtin/apply.c:2908
2994 #, c-format
2995 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2996 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
2997
2998 #: builtin/apply.c:2914
2999 #, c-format
3000 msgid ""
3001 "while searching for:\n"
3002 "%.*s"
3003 msgstr ""
3004 "当查询：\n"
3005 "%.*s"
3006
3007 #: builtin/apply.c:2934
3008 #, c-format
3009 msgid "missing binary patch data for '%s'"
3010 msgstr "缺失 '%s' 的二进制补丁数据"
3011
3012 #: builtin/apply.c:3035
3013 #, c-format
3014 msgid "binary patch does not apply to '%s'"
3015 msgstr "二进制补丁未应用到 '%s'"
3016
3017 #: builtin/apply.c:3041
3018 #, c-format
3019 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3020 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
3021
3022 #: builtin/apply.c:3062
3023 #, c-format
3024 msgid "patch failed: %s:%ld"
3025 msgstr "打补丁失败：%s:%ld"
3026
3027 #: builtin/apply.c:3186
3028 #, c-format
3029 msgid "cannot checkout %s"
3030 msgstr "不能检出 %s"
3031
3032 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3033 #, c-format
3034 msgid "read of %s failed"
3035 msgstr "读取 %s 失败"
3036
3037 #: builtin/apply.c:3239
3038 #, c-format
3039 msgid "reading from '%s' beyond a symbolic link"
3040 msgstr "读取位于符号链接中的 '%s'"
3041
3042 #: builtin/apply.c:3267 builtin/apply.c:3489
3043 #, c-format
3044 msgid "path %s has been renamed/deleted"
3045 msgstr "路径 %s 已经被重命名/删除"
3046
3047 #: builtin/apply.c:3348 builtin/apply.c:3503
3048 #, c-format
3049 msgid "%s: does not exist in index"
3050 msgstr "%s：不存在于索引中"
3051
3052 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3053 #, c-format
3054 msgid "%s: %s"
3055 msgstr "%s：%s"
3056
3057 #: builtin/apply.c:3357 builtin/apply.c:3511
3058 #, c-format
3059 msgid "%s: does not match index"
3060 msgstr "%s：和索引不匹配"
3061
3062 #: builtin/apply.c:3459
3063 msgid "removal patch leaves file contents"
3064 msgstr "移除补丁仍留下了文件内容"
3065
3066 #: builtin/apply.c:3528
3067 #, c-format
3068 msgid "%s: wrong type"
3069 msgstr "%s：错误类型"
3070
3071 #: builtin/apply.c:3530
3072 #, c-format
3073 msgid "%s has type %o, expected %o"
3074 msgstr "%s 的类型是 %o，应为 %o"
3075
3076 #: builtin/apply.c:3689 builtin/apply.c:3691
3077 #, c-format
3078 msgid "invalid path '%s'"
3079 msgstr "无效路径 '%s'"
3080
3081 #: builtin/apply.c:3746
3082 #, c-format
3083 msgid "%s: already exists in index"
3084 msgstr "%s：已经存在于索引中"
3085
3086 #: builtin/apply.c:3749
3087 #, c-format
3088 msgid "%s: already exists in working directory"
3089 msgstr "%s：已经存在于工作区中"
3090
3091 #: builtin/apply.c:3769
3092 #, c-format
3093 msgid "new mode (%o) of %s does not match old mode (%o)"
3094 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
3095
3096 #: builtin/apply.c:3774
3097 #, c-format
3098 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3099 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
3100
3101 #: builtin/apply.c:3794
3102 #, c-format
3103 msgid "affected file '%s' is beyond a symbolic link"
3104 msgstr "受影响的文件 '%s' 位于符号链接中"
3105
3106 #: builtin/apply.c:3798
3107 #, c-format
3108 msgid "%s: patch does not apply"
3109 msgstr "%s：补丁未应用"
3110
3111 #: builtin/apply.c:3812
3112 #, c-format
3113 msgid "Checking patch %s..."
3114 msgstr "检查补丁 %s..."
3115
3116 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3117 #, c-format
3118 msgid "make_cache_entry failed for path '%s'"
3119 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3120
3121 #: builtin/apply.c:4048
3122 #, c-format
3123 msgid "unable to remove %s from index"
3124 msgstr "不能从索引中移除 %s"
3125
3126 #: builtin/apply.c:4077
3127 #, c-format
3128 msgid "corrupt patch for submodule %s"
3129 msgstr "子模组 %s 损坏的补丁"
3130
3131 #: builtin/apply.c:4081
3132 #, c-format
3133 msgid "unable to stat newly created file '%s'"
3134 msgstr "不能枚举新建文件 '%s' 的状态"
3135
3136 #: builtin/apply.c:4086
3137 #, c-format
3138 msgid "unable to create backing store for newly created file %s"
3139 msgstr "不能为新建文件 %s 创建后端存储"
3140
3141 #: builtin/apply.c:4089 builtin/apply.c:4197
3142 #, c-format
3143 msgid "unable to add cache entry for %s"
3144 msgstr "无法为 %s 添加缓存条目"
3145
3146 #: builtin/apply.c:4122
3147 #, c-format
3148 msgid "closing file '%s'"
3149 msgstr "关闭文件 '%s'"
3150
3151 #: builtin/apply.c:4171
3152 #, c-format
3153 msgid "unable to write file '%s' mode %o"
3154 msgstr "不能写文件 '%s' 权限 %o"
3155
3156 #: builtin/apply.c:4258
3157 #, c-format
3158 msgid "Applied patch %s cleanly."
3159 msgstr "成功应用补丁 %s。"
3160
3161 #: builtin/apply.c:4266
3162 msgid "internal error"
3163 msgstr "内部错误"
3164
3165 #: builtin/apply.c:4269
3166 #, c-format
3167 msgid "Applying patch %%s with %d reject..."
3168 msgid_plural "Applying patch %%s with %d rejects..."
3169 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
3170 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
3171
3172 #: builtin/apply.c:4279
3173 #, c-format
3174 msgid "truncating .rej filename to %.*s.rej"
3175 msgstr "截短 .rej 文件名为 %.*s.rej"
3176
3177 #: builtin/apply.c:4300
3178 #, c-format
3179 msgid "Hunk #%d applied cleanly."
3180 msgstr "第 #%d 个片段成功应用。"
3181
3182 #: builtin/apply.c:4303
3183 #, c-format
3184 msgid "Rejected hunk #%d."
3185 msgstr "拒绝第 #%d 个片段。"
3186
3187 #: builtin/apply.c:4393
3188 msgid "unrecognized input"
3189 msgstr "未能识别的输入"
3190
3191 #: builtin/apply.c:4404
3192 msgid "unable to read index file"
3193 msgstr "无法读取索引文件"
3194
3195 #: builtin/apply.c:4517
3196 msgid "don't apply changes matching the given path"
3197 msgstr "不要应用与给出路径向匹配的变更"
3198
3199 #: builtin/apply.c:4520
3200 msgid "apply changes matching the given path"
3201 msgstr "应用与给出路径向匹配的变更"
3202
3203 #: builtin/apply.c:4523
3204 msgid "remove <num> leading slashes from traditional diff paths"
3205 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3206
3207 #: builtin/apply.c:4526
3208 msgid "ignore additions made by the patch"
3209 msgstr "忽略补丁中的添加的文件"
3210
3211 #: builtin/apply.c:4528
3212 msgid "instead of applying the patch, output diffstat for the input"
3213 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
3214
3215 #: builtin/apply.c:4532
3216 msgid "show number of added and deleted lines in decimal notation"
3217 msgstr "以十进制数显示添加和删除的行数"
3218
3219 #: builtin/apply.c:4534
3220 msgid "instead of applying the patch, output a summary for the input"
3221 msgstr "不应用补丁，而是显示输入的概要"
3222
3223 #: builtin/apply.c:4536
3224 msgid "instead of applying the patch, see if the patch is applicable"
3225 msgstr "不应用补丁，而是查看补丁是否可应用"
3226
3227 #: builtin/apply.c:4538
3228 msgid "make sure the patch is applicable to the current index"
3229 msgstr "确认补丁可以应用到当前索引"
3230
3231 #: builtin/apply.c:4540
3232 msgid "apply a patch without touching the working tree"
3233 msgstr "应用补丁而不修改工作区"
3234
3235 #: builtin/apply.c:4542
3236 msgid "accept a patch that touches outside the working area"
3237 msgstr "接受修改工作区之外文件的补丁"
3238
3239 #: builtin/apply.c:4544
3240 msgid "also apply the patch (use with --stat/--summary/--check)"
3241 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
3242
3243 #: builtin/apply.c:4546
3244 msgid "attempt three-way merge if a patch does not apply"
3245 msgstr "如果一个补丁不能应用则尝试三方合并"
3246
3247 #: builtin/apply.c:4548
3248 msgid "build a temporary index based on embedded index information"
3249 msgstr "创建一个临时索引基于嵌入的索引信息"
3250
3251 #: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
3252 msgid "paths are separated with NUL character"
3253 msgstr "路径以 NUL 字符分隔"
3254
3255 #: builtin/apply.c:4553
3256 msgid "ensure at least <n> lines of context match"
3257 msgstr "确保至少匹配 <n> 行上下文"
3258
3259 #: builtin/apply.c:4555
3260 msgid "detect new or modified lines that have whitespace errors"
3261 msgstr "检查新增和修改的行中间的空白字符滥用"
3262
3263 #: builtin/apply.c:4558 builtin/apply.c:4561
3264 msgid "ignore changes in whitespace when finding context"
3265 msgstr "查找上下文时忽略空白字符的变更"
3266
3267 #: builtin/apply.c:4564
3268 msgid "apply the patch in reverse"
3269 msgstr "反向应用补丁"
3270
3271 #: builtin/apply.c:4566
3272 msgid "don't expect at least one line of context"
3273 msgstr "无需至少一行上下文"
3274
3275 #: builtin/apply.c:4568
3276 msgid "leave the rejected hunks in corresponding *.rej files"
3277 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3278
3279 #: builtin/apply.c:4570
3280 msgid "allow overlapping hunks"
3281 msgstr "允许重叠的补丁片段"
3282
3283 #: builtin/apply.c:4573
3284 msgid "tolerate incorrectly detected missing new-line at the end of file"
3285 msgstr "允许不正确的文件末尾换行符"
3286
3287 #: builtin/apply.c:4576
3288 msgid "do not trust the line counts in the hunk headers"
3289 msgstr "不信任补丁片段的头信息中的行号"
3290
3291 #: builtin/apply.c:4579
3292 msgid "prepend <root> to all filenames"
3293 msgstr "为所有文件名前添加 <根目录>"
3294
3295 #: builtin/apply.c:4601
3296 msgid "--3way outside a repository"
3297 msgstr "--3way 在一个仓库之外"
3298
3299 #: builtin/apply.c:4609
3300 msgid "--index outside a repository"
3301 msgstr "--index 在一个仓库之外"
3302
3303 #: builtin/apply.c:4612
3304 msgid "--cached outside a repository"
3305 msgstr "--cached 在一个仓库之外"
3306
3307 #: builtin/apply.c:4631
3308 #, c-format
3309 msgid "can't open patch '%s'"
3310 msgstr "不能打开补丁 '%s'"
3311
3312 #: builtin/apply.c:4645
3313 #, c-format
3314 msgid "squelched %d whitespace error"
3315 msgid_plural "squelched %d whitespace errors"
3316 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3317 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3318
3319 #: builtin/apply.c:4651 builtin/apply.c:4661
3320 #, c-format
3321 msgid "%d line adds whitespace errors."
3322 msgid_plural "%d lines add whitespace errors."
3323 msgstr[0] "%d 行有空白字符误用。"
3324 msgstr[1] "%d 行有空白字符误用。"
3325
3326 #: builtin/archive.c:17
3327 #, c-format
3328 msgid "could not create archive file '%s'"
3329 msgstr "不能创建归档文件 '%s'"
3330
3331 #: builtin/archive.c:20
3332 msgid "could not redirect output"
3333 msgstr "不能重定向输出"
3334
3335 #: builtin/archive.c:37
3336 msgid "git archive: Remote with no URL"
3337 msgstr "git archive：未提供远程 URL"
3338
3339 #: builtin/archive.c:58
3340 msgid "git archive: expected ACK/NAK, got EOF"
3341 msgstr "git archive：应为 ACK/NACK，却得到 EOF"
3342
3343 #: builtin/archive.c:61
3344 #, c-format
3345 msgid "git archive: NACK %s"
3346 msgstr "git archive：NACK %s"
3347
3348 #: builtin/archive.c:63
3349 #, c-format
3350 msgid "remote error: %s"
3351 msgstr "远程错误：%s"
3352
3353 #: builtin/archive.c:64
3354 msgid "git archive: protocol error"
3355 msgstr "git archive：协议错误"
3356
3357 #: builtin/archive.c:68
3358 msgid "git archive: expected a flush"
3359 msgstr "git archive：应为刷新"
3360
3361 #: builtin/bisect--helper.c:7
3362 msgid "git bisect--helper --next-all [--no-checkout]"
3363 msgstr "git bisect--helper --next-all [--no-checkout]"
3364
3365 #: builtin/bisect--helper.c:17
3366 msgid "perform 'git bisect next'"
3367 msgstr "执行 'git bisect next'"
3368
3369 #: builtin/bisect--helper.c:19
3370 msgid "update BISECT_HEAD instead of checking out the current commit"
3371 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3372
3373 #: builtin/blame.c:32
3374 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3375 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3376
3377 #: builtin/blame.c:37
3378 msgid "<rev-opts> are documented in git-rev-list(1)"
3379 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3380
3381 #: builtin/blame.c:2519
3382 msgid "Show blame entries as we find them, incrementally"
3383 msgstr "增量式地显示发现的 blame 条目"
3384
3385 #: builtin/blame.c:2520
3386 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3387 msgstr "边界提交显示空的 SHA-1（默认：关闭）"
3388
3389 #: builtin/blame.c:2521
3390 msgid "Do not treat root commits as boundaries (Default: off)"
3391 msgstr "不把根提交作为边界（默认：关闭）"
3392
3393 #: builtin/blame.c:2522
3394 msgid "Show work cost statistics"
3395 msgstr "显示命令消耗统计"
3396
3397 #: builtin/blame.c:2523
3398 msgid "Show output score for blame entries"
3399 msgstr "显示判断 blame 条目位移的得分诊断信息"
3400
3401 #: builtin/blame.c:2524
3402 msgid "Show original filename (Default: auto)"
3403 msgstr "显示原始文件名（默认：自动）"
3404
3405 #: builtin/blame.c:2525
3406 msgid "Show original linenumber (Default: off)"
3407 msgstr "显示原始的行号（默认：关闭）"
3408
3409 #: builtin/blame.c:2526
3410 msgid "Show in a format designed for machine consumption"
3411 msgstr "显示为一个适合机器读取的格式"
3412
3413 #: builtin/blame.c:2527
3414 msgid "Show porcelain format with per-line commit information"
3415 msgstr "为每一行显示机器适用的提交信息"
3416
3417 #: builtin/blame.c:2528
3418 msgid "Use the same output mode as git-annotate (Default: off)"
3419 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
3420
3421 #: builtin/blame.c:2529
3422 msgid "Show raw timestamp (Default: off)"
3423 msgstr "显示原始时间戳（默认：关闭）"
3424
3425 #: builtin/blame.c:2530
3426 msgid "Show long commit SHA1 (Default: off)"
3427 msgstr "显示长的 SHA1 提交号（默认：关闭）"
3428
3429 #: builtin/blame.c:2531
3430 msgid "Suppress author name and timestamp (Default: off)"
3431 msgstr "隐藏作者名字和时间戳（默认：关闭）"
3432
3433 #: builtin/blame.c:2532
3434 msgid "Show author email instead of name (Default: off)"
3435 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
3436
3437 #: builtin/blame.c:2533
3438 msgid "Ignore whitespace differences"
3439 msgstr "忽略空白差异"
3440
3441 #: builtin/blame.c:2534
3442 msgid "Spend extra cycles to find better match"
3443 msgstr "花费额外的循环来找到更好的匹配"
3444
3445 #: builtin/blame.c:2535
3446 msgid "Use revisions from <file> instead of calling git-rev-list"
3447 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3448
3449 #: builtin/blame.c:2536
3450 msgid "Use <file>'s contents as the final image"
3451 msgstr "使用 <文件> 的内容作为最终的图片"
3452
3453 #: builtin/blame.c:2537 builtin/blame.c:2538
3454 msgid "score"
3455 msgstr "得分"
3456
3457 #: builtin/blame.c:2537
3458 msgid "Find line copies within and across files"
3459 msgstr "找到文件内及跨文件的行拷贝"
3460
3461 #: builtin/blame.c:2538
3462 msgid "Find line movements within and across files"
3463 msgstr "找到文件内及跨文件的行移动"
3464
3465 #: builtin/blame.c:2539
3466 msgid "n,m"
3467 msgstr "n,m"
3468
3469 #: builtin/blame.c:2539
3470 msgid "Process only line range n,m, counting from 1"
3471 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
3472
3473 #. TRANSLATORS: This string is used to tell us the maximum
3474 #. display width for a relative timestamp in "git blame"
3475 #. output.  For C locale, "4 years, 11 months ago", which
3476 #. takes 22 places, is the longest among various forms of
3477 #. relative timestamps, but your language may need more or
3478 #. fewer display columns.
3479 #: builtin/blame.c:2620
3480 msgid "4 years, 11 months ago"
3481 msgstr "4 年 11 个月前"
3482
3483 #: builtin/branch.c:25
3484 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3485 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3486
3487 #: builtin/branch.c:26
3488 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3489 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3490
3491 #: builtin/branch.c:27
3492 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3493 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3494
3495 #: builtin/branch.c:28
3496 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3497 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3498
3499 #: builtin/branch.c:29
3500 msgid "git branch [<options>] [-r | -a] [--points-at]"
3501 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3502
3503 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
3504 #: builtin/branch.c:142
3505 #, c-format
3506 msgid ""
3507 "deleting branch '%s' that has been merged to\n"
3508 "         '%s', but not yet merged to HEAD."
3509 msgstr ""
3510 "将要删除的分支 '%s' 已经被合并到\n"
3511 "         '%s'，但未合并到 HEAD。"
3512
3513 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
3514 #: builtin/branch.c:146
3515 #, c-format
3516 msgid ""
3517 "not deleting branch '%s' that is not yet merged to\n"
3518 "         '%s', even though it is merged to HEAD."
3519 msgstr ""
3520 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
3521 "         然而却尚未被合并到分支 '%s' 。"
3522
3523 #: builtin/branch.c:160
3524 #, c-format
3525 msgid "Couldn't look up commit object for '%s'"
3526 msgstr "无法查询 '%s' 指向的提交对象"
3527
3528 #: builtin/branch.c:164
3529 #, c-format
3530 msgid ""
3531 "The branch '%s' is not fully merged.\n"
3532 "If you are sure you want to delete it, run 'git branch -D %s'."
3533 msgstr ""
3534 "分支 '%s' 没有完全合并。\n"
3535 "如果您确认要删除它，执行 'git branch -D %s'。"
3536
3537 #: builtin/branch.c:177
3538 msgid "Update of config-file failed"
3539 msgstr "无法更新 config 文件"
3540
3541 #: builtin/branch.c:205
3542 msgid "cannot use -a with -d"
3543 msgstr "不能将 -a 和 -d 同时使用"
3544
3545 #: builtin/branch.c:211
3546 msgid "Couldn't look up commit object for HEAD"
3547 msgstr "无法查询 HEAD 指向的提交对象"
3548
3549 #: builtin/branch.c:219
3550 #, c-format
3551 msgid "Cannot delete the branch '%s' which you are currently on."
3552 msgstr "无法删除您当前所在的分支 '%s'。"
3553
3554 #: builtin/branch.c:235
3555 #, c-format
3556 msgid "remote-tracking branch '%s' not found."
3557 msgstr "未能找到远程跟踪分支 '%s'。"
3558
3559 #: builtin/branch.c:236
3560 #, c-format
3561 msgid "branch '%s' not found."
3562 msgstr "分支 '%s' 未发现。"
3563
3564 #: builtin/branch.c:251
3565 #, c-format
3566 msgid "Error deleting remote-tracking branch '%s'"
3567 msgstr "无法删除远程跟踪分支 '%s'"
3568
3569 #: builtin/branch.c:252
3570 #, c-format
3571 msgid "Error deleting branch '%s'"
3572 msgstr "无法删除分支 '%s'"
3573
3574 #: builtin/branch.c:259
3575 #, c-format
3576 msgid "Deleted remote-tracking branch %s (was %s).\n"
3577 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
3578
3579 #: builtin/branch.c:260
3580 #, c-format
3581 msgid "Deleted branch %s (was %s).\n"
3582 msgstr "已删除分支 %s（曾为 %s）。\n"
3583
3584 #: builtin/branch.c:303
3585 #, c-format
3586 msgid "[%s: gone]"
3587 msgstr "[%s: 丢失]"
3588
3589 #: builtin/branch.c:308
3590 #, c-format
3591 msgid "[%s]"
3592 msgstr "[%s]"
3593
3594 #: builtin/branch.c:313
3595 #, c-format
3596 msgid "[%s: behind %d]"
3597 msgstr "[%s：落后 %d]"
3598
3599 #: builtin/branch.c:315
3600 #, c-format
3601 msgid "[behind %d]"
3602 msgstr "[落后 %d]"
3603
3604 #: builtin/branch.c:319
3605 #, c-format
3606 msgid "[%s: ahead %d]"
3607 msgstr "[%s：领先 %d]"
3608
3609 #: builtin/branch.c:321
3610 #, c-format
3611 msgid "[ahead %d]"
3612 msgstr "[领先 %d]"
3613
3614 #: builtin/branch.c:324
3615 #, c-format
3616 msgid "[%s: ahead %d, behind %d]"
3617 msgstr "[%s：领先 %d，落后 %d]"
3618
3619 #: builtin/branch.c:327
3620 #, c-format
3621 msgid "[ahead %d, behind %d]"
3622 msgstr "[领先 %d，落后 %d]"
3623
3624 #: builtin/branch.c:340
3625 msgid " **** invalid ref ****"
3626 msgstr " **** 无效引用 ****"
3627
3628 #: builtin/branch.c:366
3629 #, c-format
3630 msgid "(no branch, rebasing %s)"
3631 msgstr "（非分支，正变基 %s）"
3632
3633 #: builtin/branch.c:369
3634 #, c-format
3635 msgid "(no branch, bisect started on %s)"
3636 msgstr "（非分支，二分查找开始于 %s）"
3637
3638 #: builtin/branch.c:375
3639 #, c-format
3640 msgid "(HEAD detached at %s)"
3641 msgstr "（头指针分离于 %s）"
3642
3643 #: builtin/branch.c:378
3644 #, c-format
3645 msgid "(HEAD detached from %s)"
3646 msgstr "（头指针分离自 %s）"
3647
3648 #: builtin/branch.c:382
3649 msgid "(no branch)"
3650 msgstr "（非分支）"
3651
3652 #: builtin/branch.c:524
3653 msgid "cannot rename the current branch while not on any."
3654 msgstr "无法重命名当前分支因为不处于任何分支上。"
3655
3656 #: builtin/branch.c:534
3657 #, c-format
3658 msgid "Invalid branch name: '%s'"
3659 msgstr "无效的分支名：'%s'"
3660
3661 #: builtin/branch.c:549
3662 msgid "Branch rename failed"
3663 msgstr "分支重命名失败"
3664
3665 #: builtin/branch.c:553
3666 #, c-format
3667 msgid "Renamed a misnamed branch '%s' away"
3668 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3669
3670 #: builtin/branch.c:557
3671 #, c-format
3672 msgid "Branch renamed to %s, but HEAD is not updated!"
3673 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
3674
3675 #: builtin/branch.c:564
3676 msgid "Branch is renamed, but update of config-file failed"
3677 msgstr "分支被重命名，但更新 config 文件失败"
3678
3679 #: builtin/branch.c:587
3680 #, c-format
3681 msgid "could not write branch description template: %s"
3682 msgstr "不能写分支描述模版：%s"
3683
3684 #: builtin/branch.c:616
3685 msgid "Generic options"
3686 msgstr "通用选项"
3687
3688 #: builtin/branch.c:618
3689 msgid "show hash and subject, give twice for upstream branch"
3690 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
3691
3692 #: builtin/branch.c:619
3693 msgid "suppress informational messages"
3694 msgstr "不显示信息"
3695
3696 #: builtin/branch.c:620
3697 msgid "set up tracking mode (see git-pull(1))"
3698 msgstr "设置跟踪模式（参见 git-pull(1)）"
3699
3700 #: builtin/branch.c:622
3701 msgid "change upstream info"
3702 msgstr "改变上游信息"
3703
3704 #: builtin/branch.c:626
3705 msgid "use colored output"
3706 msgstr "使用彩色输出"
3707
3708 #: builtin/branch.c:627
3709 msgid "act on remote-tracking branches"
3710 msgstr "作用于远程跟踪分支"
3711
3712 #: builtin/branch.c:629 builtin/branch.c:630
3713 msgid "print only branches that contain the commit"
3714 msgstr "只打印包含该提交的分支"
3715
3716 #: builtin/branch.c:633
3717 msgid "Specific git-branch actions:"
3718 msgstr "具体的 git-branch 动作："
3719
3720 #: builtin/branch.c:634
3721 msgid "list both remote-tracking and local branches"
3722 msgstr "列出远程跟踪及本地分支"
3723
3724 #: builtin/branch.c:636
3725 msgid "delete fully merged branch"
3726 msgstr "删除完全合并的分支"
3727
3728 #: builtin/branch.c:637
3729 msgid "delete branch (even if not merged)"
3730 msgstr "删除分支（即使没有合并）"
3731
3732 #: builtin/branch.c:638
3733 msgid "move/rename a branch and its reflog"
3734 msgstr "移动/重命名一个分支，以及它的引用日志"
3735
3736 #: builtin/branch.c:639
3737 msgid "move/rename a branch, even if target exists"
3738 msgstr "移动/重命名一个分支，即使目标已存在"
3739
3740 #: builtin/branch.c:640
3741 msgid "list branch names"
3742 msgstr "列出分支名"
3743
3744 #: builtin/branch.c:641
3745 msgid "create the branch's reflog"
3746 msgstr "创建分支的引用日志"
3747
3748 #: builtin/branch.c:643
3749 msgid "edit the description for the branch"
3750 msgstr "标记分支的描述"
3751
3752 #: builtin/branch.c:644
3753 msgid "force creation, move/rename, deletion"
3754 msgstr "强制创建、移动/重命名、删除"
3755
3756 #: builtin/branch.c:645
3757 msgid "print only branches that are merged"
3758 msgstr "只打印已经合并的分支"
3759
3760 #: builtin/branch.c:646
3761 msgid "print only branches that are not merged"
3762 msgstr "只打印尚未合并的分支"
3763
3764 #: builtin/branch.c:647
3765 msgid "list branches in columns"
3766 msgstr "以列的方式显示分支"
3767
3768 #: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3769 msgid "key"
3770 msgstr "key"
3771
3772 #: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3773 msgid "field name to sort on"
3774 msgstr "排序的字段名"
3775
3776 #: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3777 #: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3778 #: builtin/tag.c:369
3779 msgid "object"
3780 msgstr "对象"
3781
3782 #: builtin/branch.c:652
3783 msgid "print only branches of the object"
3784 msgstr "只打印指向该对象的分支"
3785
3786 #: builtin/branch.c:670
3787 msgid "Failed to resolve HEAD as a valid ref."
3788 msgstr "无法将 HEAD 解析为有效引用。"
3789
3790 #: builtin/branch.c:674 builtin/clone.c:697
3791 msgid "HEAD not found below refs/heads!"
3792 msgstr "HEAD 没有位于 /refs/heads 之下！"
3793
3794 #: builtin/branch.c:694
3795 msgid "--column and --verbose are incompatible"
3796 msgstr "--column 和 --verbose 不兼容"
3797
3798 #: builtin/branch.c:705 builtin/branch.c:747
3799 msgid "branch name required"
3800 msgstr "必须提供分支名"
3801
3802 #: builtin/branch.c:723
3803 msgid "Cannot give description to detached HEAD"
3804 msgstr "不能向分离头指针提供描述"
3805
3806 #: builtin/branch.c:728
3807 msgid "cannot edit description of more than one branch"
3808 msgstr "不能为一个以上的分支编辑描述"
3809
3810 #: builtin/branch.c:735
3811 #, c-format
3812 msgid "No commit on branch '%s' yet."
3813 msgstr "分支 '%s' 尚无提交。"
3814
3815 #: builtin/branch.c:738
3816 #, c-format
3817 msgid "No branch named '%s'."
3818 msgstr "没有分支 '%s'。"
3819
3820 #: builtin/branch.c:753
3821 msgid "too many branches for a rename operation"
3822 msgstr "为重命名操作提供了太多的分支名"
3823
3824 #: builtin/branch.c:758
3825 msgid "too many branches to set new upstream"
3826 msgstr "为设置新上游提供了太多的分支名"
3827
3828 #: builtin/branch.c:762
3829 #, c-format
3830 msgid ""
3831 "could not set upstream of HEAD to %s when it does not point to any branch."
3832 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
3833
3834 #: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
3835 #, c-format
3836 msgid "no such branch '%s'"
3837 msgstr "没有此分支 '%s'"
3838
3839 #: builtin/branch.c:769
3840 #, c-format
3841 msgid "branch '%s' does not exist"
3842 msgstr "分支 '%s' 不存在"
3843
3844 #: builtin/branch.c:781
3845 msgid "too many branches to unset upstream"
3846 msgstr "为取消上游设置操作提供了太多的分支名"
3847
3848 #: builtin/branch.c:785
3849 msgid "could not unset upstream of HEAD when it does not point to any branch."
3850 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3851
3852 #: builtin/branch.c:791
3853 #, c-format
3854 msgid "Branch '%s' has no upstream information"
3855 msgstr "分支 '%s' 没有上游信息"
3856
3857 #: builtin/branch.c:805
3858 msgid "it does not make sense to create 'HEAD' manually"
3859 msgstr "手工创建 'HEAD' 没有意义"
3860
3861 #: builtin/branch.c:811
3862 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3863 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3864
3865 #: builtin/branch.c:814
3866 #, c-format
3867 msgid ""
3868 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3869 "track or --set-upstream-to\n"
3870 msgstr ""
3871 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3872
3873 #: builtin/branch.c:831
3874 #, c-format
3875 msgid ""
3876 "\n"
3877 "If you wanted to make '%s' track '%s', do this:\n"
3878 "\n"
3879 msgstr ""
3880 "\n"
3881 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"
3882 "\n"
3883
3884 #: builtin/branch.c:832
3885 #, c-format
3886 msgid "    git branch -d %s\n"
3887 msgstr "    git branch -d %s\n"
3888
3889 #: builtin/branch.c:833
3890 #, c-format
3891 msgid "    git branch --set-upstream-to %s\n"
3892 msgstr "    git branch --set-upstream-to %s\n"
3893
3894 #: builtin/bundle.c:51
3895 #, c-format
3896 msgid "%s is okay\n"
3897 msgstr "%s 可以\n"
3898
3899 #: builtin/bundle.c:64
3900 msgid "Need a repository to create a bundle."
3901 msgstr "需要一个仓库来创建包。"
3902
3903 #: builtin/bundle.c:68
3904 msgid "Need a repository to unbundle."
3905 msgstr "需要一个仓库来解包。"
3906
3907 #: builtin/cat-file.c:428
3908 msgid ""
3909 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3910 "<type>|--textconv) <object>"
3911 msgstr ""
3912 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3913 ">|--textconv) <对象>"
3914
3915 #: builtin/cat-file.c:429
3916 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3917 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3918
3919 #: builtin/cat-file.c:466
3920 msgid "<type> can be one of: blob, tree, commit, tag"
3921 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
3922
3923 #: builtin/cat-file.c:467
3924 msgid "show object type"
3925 msgstr "显示对象类型"
3926
3927 #: builtin/cat-file.c:468
3928 msgid "show object size"
3929 msgstr "显示对象大小"
3930
3931 #: builtin/cat-file.c:470
3932 msgid "exit with zero when there's no error"
3933 msgstr "当没有错误时退出并返回零"
3934
3935 #: builtin/cat-file.c:471
3936 msgid "pretty-print object's content"
3937 msgstr "美观地打印对象的内容"
3938
3939 #: builtin/cat-file.c:473
3940 msgid "for blob objects, run textconv on object's content"
3941 msgstr "对于数据对象，对其内容执行 textconv"
3942
3943 #: builtin/cat-file.c:475
3944 msgid "allow -s and -t to work with broken/corrupt objects"
3945 msgstr "允许 -s 和 -t 对损坏的对象生效"
3946
3947 #: builtin/cat-file.c:476
3948 msgid "buffer --batch output"
3949 msgstr "缓冲 --batch 的输出"
3950
3951 #: builtin/cat-file.c:478
3952 msgid "show info and content of objects fed from the standard input"
3953 msgstr "显示从标准输入提供的对象的信息和内容"
3954
3955 #: builtin/cat-file.c:481
3956 msgid "show info about objects fed from the standard input"
3957 msgstr "显示从标准输入提供的对象的信息"
3958
3959 #: builtin/cat-file.c:484
3960 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3961 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
3962
3963 #: builtin/cat-file.c:486
3964 msgid "show all objects with --batch or --batch-check"
3965 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3966
3967 #: builtin/check-attr.c:11
3968 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3969 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3970
3971 #: builtin/check-attr.c:12
3972 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3973 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
3974
3975 #: builtin/check-attr.c:19
3976 msgid "report all attributes set on file"
3977 msgstr "报告设置在文件上的所有属性"
3978
3979 #: builtin/check-attr.c:20
3980 msgid "use .gitattributes only from the index"
3981 msgstr "只使用索引中的 .gitattributes"
3982
3983 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3984 msgid "read file names from stdin"
3985 msgstr "从标准输入读出文件名"
3986
3987 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3988 msgid "terminate input and output records by a NUL character"
3989 msgstr "输入和输出的记录使用 NUL 字符终结"
3990
3991 #: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
3992 msgid "suppress progress reporting"
3993 msgstr "不显示进度报告"
3994
3995 #: builtin/check-ignore.c:26
3996 msgid "show non-matching input paths"
3997 msgstr "显示未匹配的输入路径"
3998
3999 #: builtin/check-ignore.c:28
4000 msgid "ignore index when checking"
4001 msgstr "检查时忽略索引"
4002
4003 #: builtin/check-ignore.c:154
4004 msgid "cannot specify pathnames with --stdin"
4005 msgstr "不能同时指定路径及 --stdin 参数"
4006
4007 #: builtin/check-ignore.c:157
4008 msgid "-z only makes sense with --stdin"
4009 msgstr "-z 需要和 --stdin 参数共用才有意义"
4010
4011 #: builtin/check-ignore.c:159
4012 msgid "no path specified"
4013 msgstr "未指定路径"
4014
4015 #: builtin/check-ignore.c:163
4016 msgid "--quiet is only valid with a single pathname"
4017 msgstr "参数 --quiet 只在提供一个路径名时有效"
4018
4019 #: builtin/check-ignore.c:165
4020 msgid "cannot have both --quiet and --verbose"
4021 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4022
4023 #: builtin/check-ignore.c:168
4024 msgid "--non-matching is only valid with --verbose"
4025 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4026
4027 #: builtin/check-mailmap.c:8
4028 msgid "git check-mailmap [<options>] <contact>..."
4029 msgstr "git check-mailmap [<选项>] <联系地址>..."
4030
4031 #: builtin/check-mailmap.c:13
4032 msgid "also read contacts from stdin"
4033 msgstr "还从标准输入读取联系地址"
4034
4035 #: builtin/check-mailmap.c:24
4036 #, c-format
4037 msgid "unable to parse contact: %s"
4038 msgstr "不能解析联系地址：%s"
4039
4040 #: builtin/check-mailmap.c:47
4041 msgid "no contacts specified"
4042 msgstr "未指定联系地址"
4043
4044 #: builtin/checkout-index.c:126
4045 msgid "git checkout-index [<options>] [--] [<file>...]"
4046 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4047
4048 #: builtin/checkout-index.c:188
4049 msgid "check out all files in the index"
4050 msgstr "检出索引区的所有文件"
4051
4052 #: builtin/checkout-index.c:189
4053 msgid "force overwrite of existing files"
4054 msgstr "强制覆盖现有的文件"
4055
4056 #: builtin/checkout-index.c:191
4057 msgid "no warning for existing files and files not in index"
4058 msgstr "存在或不在索引中的文件都没有警告"
4059
4060 #: builtin/checkout-index.c:193
4061 msgid "don't checkout new files"
4062 msgstr "不检出新文件"
4063
4064 #: builtin/checkout-index.c:195
4065 msgid "update stat information in the index file"
4066 msgstr "更新索引中文件的状态信息"
4067
4068 #: builtin/checkout-index.c:201
4069 msgid "read list of paths from the standard input"
4070 msgstr "从标准输入读取路径列表"
4071
4072 #: builtin/checkout-index.c:203
4073 msgid "write the content to temporary files"
4074 msgstr "将内容写入临时文件"
4075
4076 #: builtin/checkout-index.c:204 builtin/column.c:30
4077 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4078 #: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
4079 msgid "string"
4080 msgstr "字符串"
4081
4082 #: builtin/checkout-index.c:205
4083 msgid "when creating files, prepend <string>"
4084 msgstr "在创建文件时，在前面加上 <字符串>"
4085
4086 #: builtin/checkout-index.c:208
4087 msgid "copy out the files from named stage"
4088 msgstr "从指定暂存区中拷出文件"
4089
4090 #: builtin/checkout.c:25
4091 msgid "git checkout [<options>] <branch>"
4092 msgstr "git checkout [<选项>] <分支>"
4093
4094 #: builtin/checkout.c:26
4095 msgid "git checkout [<options>] [<branch>] -- <file>..."
4096 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4097
4098 #: builtin/checkout.c:134 builtin/checkout.c:167
4099 #, c-format
4100 msgid "path '%s' does not have our version"
4101 msgstr "路径 '%s' 没有我们的版本"
4102
4103 #: builtin/checkout.c:136 builtin/checkout.c:169
4104 #, c-format
4105 msgid "path '%s' does not have their version"
4106 msgstr "路径 '%s' 没有他们的版本"
4107
4108 #: builtin/checkout.c:152
4109 #, c-format
4110 msgid "path '%s' does not have all necessary versions"
4111 msgstr "路径 '%s' 没有全部必须的版本"
4112
4113 #: builtin/checkout.c:196
4114 #, c-format
4115 msgid "path '%s' does not have necessary versions"
4116 msgstr "路径 '%s' 没有必须的版本"
4117
4118 #: builtin/checkout.c:213
4119 #, c-format
4120 msgid "path '%s': cannot merge"
4121 msgstr "path '%s'：无法合并"
4122
4123 #: builtin/checkout.c:230
4124 #, c-format
4125 msgid "Unable to add merge result for '%s'"
4126 msgstr "无法为 '%s' 添加合并结果"
4127
4128 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4129 #: builtin/checkout.c:260
4130 #, c-format
4131 msgid "'%s' cannot be used with updating paths"
4132 msgstr "'%s' 不能在更新路径时使用"
4133
4134 #: builtin/checkout.c:263 builtin/checkout.c:266
4135 #, c-format
4136 msgid "'%s' cannot be used with %s"
4137 msgstr "'%s' 不能和 %s 同时使用"
4138
4139 #: builtin/checkout.c:269
4140 #, c-format
4141 msgid "Cannot update paths and switch to branch '%s' at the same time."
4142 msgstr "不能同时更新路径并切换到分支'%s'。"
4143
4144 #: builtin/checkout.c:280 builtin/checkout.c:474
4145 msgid "corrupt index file"
4146 msgstr "损坏的索引文件"
4147
4148 #: builtin/checkout.c:340 builtin/checkout.c:347
4149 #, c-format
4150 msgid "path '%s' is unmerged"
4151 msgstr "路径 '%s' 未合并"
4152
4153 #: builtin/checkout.c:496
4154 msgid "you need to resolve your current index first"
4155 msgstr "您需要先解决当前索引的冲突"
4156
4157 #: builtin/checkout.c:623
4158 #, c-format
4159 msgid "Can not do reflog for '%s': %s\n"
4160 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
4161
4162 #: builtin/checkout.c:661
4163 msgid "HEAD is now at"
4164 msgstr "HEAD 目前位于"
4165
4166 #: builtin/checkout.c:668
4167 #, c-format
4168 msgid "Reset branch '%s'\n"
4169 msgstr "重置分支 '%s'\n"
4170
4171 #: builtin/checkout.c:671
4172 #, c-format
4173 msgid "Already on '%s'\n"
4174 msgstr "已经位于 '%s'\n"
4175
4176 #: builtin/checkout.c:675
4177 #, c-format
4178 msgid "Switched to and reset branch '%s'\n"
4179 msgstr "切换并重置分支 '%s'\n"
4180
4181 #: builtin/checkout.c:677 builtin/checkout.c:1066
4182 #, c-format
4183 msgid "Switched to a new branch '%s'\n"
4184 msgstr "切换到一个新分支 '%s'\n"
4185
4186 #: builtin/checkout.c:679
4187 #, c-format
4188 msgid "Switched to branch '%s'\n"
4189 msgstr "切换到分支 '%s'\n"
4190
4191 #  译者：注意保持前导空格
4192 #: builtin/checkout.c:731
4193 #, c-format
4194 msgid " ... and %d more.\n"
4195 msgstr " ... 及其它 %d 个。\n"
4196
4197 #: builtin/checkout.c:737
4198 #, c-format
4199 msgid ""
4200 "Warning: you are leaving %d commit behind, not connected to\n"
4201 "any of your branches:\n"
4202 "\n"
4203 "%s\n"
4204 msgid_plural ""
4205 "Warning: you are leaving %d commits behind, not connected to\n"
4206 "any of your branches:\n"
4207 "\n"
4208 "%s\n"
4209 msgstr[0] ""
4210 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
4211 "\n"
4212 "%s\n"
4213 msgstr[1] ""
4214 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
4215 "\n"
4216 "%s\n"
4217
4218 #: builtin/checkout.c:756
4219 #, c-format
4220 msgid ""
4221 "If you want to keep it by creating a new branch, this may be a good time\n"
4222 "to do so with:\n"
4223 "\n"
4224 " git branch <new-branch-name> %s\n"
4225 "\n"
4226 msgid_plural ""
4227 "If you want to keep them by creating a new branch, this may be a good time\n"
4228 "to do so with:\n"
4229 "\n"
4230 " git branch <new-branch-name> %s\n"
4231 "\n"
4232 msgstr[0] ""
4233 "如果您想要通过创建新分支保存它，这可能是一个好时候。\n"
4234 "如下操作：\n"
4235 "\n"
4236 " git branch <新分支名> %s\n"
4237 "\n"
4238 msgstr[1] ""
4239 "如果您想要通过创建新分支保存它们，这可能是一个好时候。\n"
4240 "如下操作：\n"
4241 "\n"
4242 " git branch <新分支名> %s\n"
4243 "\n"
4244
4245 #: builtin/checkout.c:792
4246 msgid "internal error in revision walk"
4247 msgstr "在版本遍历时遇到内部错误"
4248
4249 #: builtin/checkout.c:796
4250 msgid "Previous HEAD position was"
4251 msgstr "之前的 HEAD 位置是"
4252
4253 #: builtin/checkout.c:823 builtin/checkout.c:1061
4254 msgid "You are on a branch yet to be born"
4255 msgstr "您位于一个尚未初始化的分支"
4256
4257 #: builtin/checkout.c:968
4258 #, c-format
4259 msgid "only one reference expected, %d given."
4260 msgstr "只要一个引用，却给出了 %d 个"
4261
4262 #: builtin/checkout.c:1007 builtin/worktree.c:213
4263 #, c-format
4264 msgid "invalid reference: %s"
4265 msgstr "无效引用：%s"
4266
4267 #: builtin/checkout.c:1036
4268 #, c-format
4269 msgid "reference is not a tree: %s"
4270 msgstr "引用不是一个树：%s"
4271
4272 #: builtin/checkout.c:1075
4273 msgid "paths cannot be used with switching branches"
4274 msgstr "路径不能和切换分支同时使用"
4275
4276 #: builtin/checkout.c:1078 builtin/checkout.c:1082
4277 #, c-format
4278 msgid "'%s' cannot be used with switching branches"
4279 msgstr "'%s' 不能和切换分支同时使用"
4280
4281 #: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4282 #: builtin/checkout.c:1097
4283 #, c-format
4284 msgid "'%s' cannot be used with '%s'"
4285 msgstr "'%s' 不能和 '%s' 同时使用"
4286
4287 #: builtin/checkout.c:1102
4288 #, c-format
4289 msgid "Cannot switch branch to a non-commit '%s'"
4290 msgstr "不能切换分支到一个非提交 '%s'"
4291
4292 #: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4293 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4294 #: builtin/worktree.c:322
4295 msgid "branch"
4296 msgstr "分支"
4297
4298 #: builtin/checkout.c:1136
4299 msgid "create and checkout a new branch"
4300 msgstr "创建并检出一个新的分支"
4301
4302 #: builtin/checkout.c:1138
4303 msgid "create/reset and checkout a branch"
4304 msgstr "创建/重置并检出一个分支"
4305
4306 #: builtin/checkout.c:1139
4307 msgid "create reflog for new branch"
4308 msgstr "为新的分支创建引用日志"
4309
4310 #: builtin/checkout.c:1140
4311 msgid "detach the HEAD at named commit"
4312 msgstr "成为指向该提交的分离头指针"
4313
4314 #: builtin/checkout.c:1141
4315 msgid "set upstream info for new branch"
4316 msgstr "为新的分支设置上游信息"
4317
4318 #: builtin/checkout.c:1143
4319 msgid "new-branch"
4320 msgstr "新分支"
4321
4322 #: builtin/checkout.c:1143
4323 msgid "new unparented branch"
4324 msgstr "新的没有父提交的分支"
4325
4326 #: builtin/checkout.c:1144
4327 msgid "checkout our version for unmerged files"
4328 msgstr "对尚未合并的文件检出我们的版本"
4329
4330 #: builtin/checkout.c:1146
4331 msgid "checkout their version for unmerged files"
4332 msgstr "对尚未合并的文件检出他们的版本"
4333
4334 #: builtin/checkout.c:1148
4335 msgid "force checkout (throw away local modifications)"
4336 msgstr "强制检出（丢弃本地修改）"
4337
4338 #: builtin/checkout.c:1149
4339 msgid "perform a 3-way merge with the new branch"
4340 msgstr "和新的分支执行三方合并"
4341
4342 #: builtin/checkout.c:1150 builtin/merge.c:227
4343 msgid "update ignored files (default)"
4344 msgstr "更新忽略的文件（默认）"
4345
4346 #: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
4347 msgid "style"
4348 msgstr "风格"
4349
4350 #: builtin/checkout.c:1152
4351 msgid "conflict style (merge or diff3)"
4352 msgstr "冲突输出风格（merge 或 diff3）"
4353
4354 #: builtin/checkout.c:1155
4355 msgid "do not limit pathspecs to sparse entries only"
4356 msgstr "对路径不做稀疏检出的限制"
4357
4358 #: builtin/checkout.c:1157
4359 msgid "second guess 'git checkout <no-such-branch>'"
4360 msgstr "二次猜测'git checkout <无此分支>'"
4361
4362 #: builtin/checkout.c:1159
4363 msgid "do not check if another worktree is holding the given ref"
4364 msgstr "不检查指定的引用是否被其他工作区所占用"
4365
4366 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4367 #: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
4368 #: builtin/send-pack.c:168
4369 msgid "force progress reporting"
4370 msgstr "强制显示进度报告"
4371
4372 #: builtin/checkout.c:1191
4373 msgid "-b, -B and --orphan are mutually exclusive"
4374 msgstr "-b、-B 和 --orphan 是互斥的"
4375
4376 #: builtin/checkout.c:1208
4377 msgid "--track needs a branch name"
4378 msgstr "--track 需要一个分支名"
4379
4380 #: builtin/checkout.c:1213
4381 msgid "Missing branch name; try -b"
4382 msgstr "缺少分支名；尝试 -b"
4383
4384 #: builtin/checkout.c:1249
4385 msgid "invalid path specification"
4386 msgstr "无效的路径规格"
4387
4388 #: builtin/checkout.c:1256
4389 #, c-format
4390 msgid ""
4391 "Cannot update paths and switch to branch '%s' at the same time.\n"
4392 "Did you intend to checkout '%s' which can not be resolved as commit?"
4393 msgstr ""
4394 "不能同时更新路径并切换到分支'%s'。\n"
4395 "您是想要检出 '%s' 但其未能解析为提交么？"
4396
4397 #: builtin/checkout.c:1261
4398 #, c-format
4399 msgid "git checkout: --detach does not take a path argument '%s'"
4400 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
4401
4402 #: builtin/checkout.c:1265
4403 msgid ""
4404 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4405 "checking out of the index."
4406 msgstr ""
4407 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
4408
4409 #: builtin/clean.c:25
4410 msgid ""
4411 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4412 msgstr ""
4413 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4414
4415 #: builtin/clean.c:29
4416 #, c-format
4417 msgid "Removing %s\n"
4418 msgstr "正删除 %s\n"
4419
4420 #: builtin/clean.c:30
4421 #, c-format
4422 msgid "Would remove %s\n"
4423 msgstr "将删除 %s\n"
4424
4425 #: builtin/clean.c:31
4426 #, c-format
4427 msgid "Skipping repository %s\n"
4428 msgstr "忽略仓库 %s\n"
4429
4430 #: builtin/clean.c:32
4431 #, c-format
4432 msgid "Would skip repository %s\n"
4433 msgstr "将忽略仓库 %s\n"
4434
4435 #: builtin/clean.c:33
4436 #, c-format
4437 msgid "failed to remove %s"
4438 msgstr "无法删除 %s"
4439
4440 #: builtin/clean.c:315
4441 msgid ""
4442 "Prompt help:\n"
4443 "1          - select a numbered item\n"
4444 "foo        - select item based on unique prefix\n"
4445 "           - (empty) select nothing"
4446 msgstr ""
4447 "帮助：\n"
4448 "1          - 通过编号选择一个选项\n"
4449 "foo        - 通过标题选择一个选项\n"
4450 "           - （空）什么也不选择"
4451
4452 #: builtin/clean.c:319
4453 msgid ""
4454 "Prompt help:\n"
4455 "1          - select a single item\n"
4456 "3-5        - select a range of items\n"
4457 "2-3,6-9    - select multiple ranges\n"
4458 "foo        - select item based on unique prefix\n"
4459 "-...       - unselect specified items\n"
4460 "*          - choose all items\n"
4461 "           - (empty) finish selecting"
4462 msgstr ""
4463 "帮助：\n"
4464 "1          - 选择一个选项\n"
4465 "3-5        - 选择一个范围内的所有选项\n"
4466 "2-3,6-9    - 选择多个范围内的所有选项\n"
4467 "foo        - 通过标题选择一个选项\n"
4468 "-...       - 反选特定的选项\n"
4469 "*          - 选择所有选项\n"
4470 "           - （空）结束选择"
4471
4472 #: builtin/clean.c:535
4473 #, c-format
4474 msgid "Huh (%s)?"
4475 msgstr "嗯（%s）？"
4476
4477 #: builtin/clean.c:677
4478 #, c-format
4479 msgid "Input ignore patterns>> "
4480 msgstr "输入模版以排除条目>> "
4481
4482 #: builtin/clean.c:714
4483 #, c-format
4484 msgid "WARNING: Cannot find items matched by: %s"
4485 msgstr "警告：无法找到和 %s 匹配的条目"
4486
4487 #: builtin/clean.c:735
4488 msgid "Select items to delete"
4489 msgstr "选择要删除的条目"
4490
4491 #. TRANSLATORS: Make sure to keep [y/N] as is
4492 #: builtin/clean.c:776
4493 #, c-format
4494 msgid "Remove %s [y/N]? "
4495 msgstr "删除 %s [y/N]？"
4496
4497 #: builtin/clean.c:801
4498 msgid "Bye."
4499 msgstr "再见。"
4500
4501 #: builtin/clean.c:809
4502 msgid ""
4503 "clean               - start cleaning\n"
4504 "filter by pattern   - exclude items from deletion\n"
4505 "select by numbers   - select items to be deleted by numbers\n"
4506 "ask each            - confirm each deletion (like \"rm -i\")\n"
4507 "quit                - stop cleaning\n"
4508 "help                - this screen\n"
4509 "?                   - help for prompt selection"
4510 msgstr ""
4511 "clean               - 开始清理\n"
4512 "filter by pattern   - 通过模版排除要删除的条目\n"
4513 "select by numbers   - 通过数字选择要删除的条目\n"
4514 "ask each            - 针对删除逐一询问（就像 \"rm -i\"）\n"
4515 "quit                - 停止删除并退出\n"
4516 "help                - 显示本帮助\n"
4517 "?                   - 显示如何在提示符下选择的帮助"
4518
4519 #: builtin/clean.c:836
4520 msgid "*** Commands ***"
4521 msgstr "*** 命令 ***"
4522
4523 #: builtin/clean.c:837
4524 msgid "What now"
4525 msgstr "请选择"
4526
4527 #: builtin/clean.c:845
4528 msgid "Would remove the following item:"
4529 msgid_plural "Would remove the following items:"
4530 msgstr[0] "将删除如下条目："
4531 msgstr[1] "将删除如下条目："
4532
4533 #: builtin/clean.c:862
4534 msgid "No more files to clean, exiting."
4535 msgstr "没有要清理的文件，退出。"
4536
4537 #: builtin/clean.c:893
4538 msgid "do not print names of files removed"
4539 msgstr "不打印删除文件的名称"
4540
4541 #: builtin/clean.c:895
4542 msgid "force"
4543 msgstr "强制"
4544
4545 #: builtin/clean.c:896
4546 msgid "interactive cleaning"
4547 msgstr "交互式清除"
4548
4549 #: builtin/clean.c:898
4550 msgid "remove whole directories"
4551 msgstr "删除整个目录"
4552
4553 #: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4554 #: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
4555 msgid "pattern"
4556 msgstr "模式"
4557
4558 #: builtin/clean.c:900
4559 msgid "add <pattern> to ignore rules"
4560 msgstr "添加 <模式> 到忽略规则"
4561
4562 #: builtin/clean.c:901
4563 msgid "remove ignored files, too"
4564 msgstr "也删除忽略的文件"
4565
4566 #: builtin/clean.c:903
4567 msgid "remove only ignored files"
4568 msgstr "只删除忽略的文件"
4569
4570 #: builtin/clean.c:921
4571 msgid "-x and -X cannot be used together"
4572 msgstr "-x 和 -X 不能同时使用"
4573
4574 #: builtin/clean.c:925
4575 msgid ""
4576 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4577 "clean"
4578 msgstr ""
4579 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
4580
4581 #: builtin/clean.c:928
4582 msgid ""
4583 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4584 "refusing to clean"
4585 msgstr ""
4586 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
4587
4588 #: builtin/clone.c:37
4589 msgid "git clone [<options>] [--] <repo> [<dir>]"
4590 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4591
4592 #: builtin/clone.c:59
4593 msgid "don't create a checkout"
4594 msgstr "不创建一个检出"
4595
4596 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
4597 msgid "create a bare repository"
4598 msgstr "创建一个纯仓库"
4599
4600 #: builtin/clone.c:64
4601 msgid "create a mirror repository (implies bare)"
4602 msgstr "创建一个镜像仓库（也是纯仓库）"
4603
4604 #: builtin/clone.c:66
4605 msgid "to clone from a local repository"
4606 msgstr "从本地仓库克隆"
4607
4608 #: builtin/clone.c:68
4609 msgid "don't use local hardlinks, always copy"
4610 msgstr "不使用本地硬链接，始终复制"
4611
4612 #: builtin/clone.c:70
4613 msgid "setup as shared repository"
4614 msgstr "设置为共享仓库"
4615
4616 #: builtin/clone.c:72 builtin/clone.c:74
4617 msgid "initialize submodules in the clone"
4618 msgstr "在克隆时初始化子模组"
4619
4620 #: builtin/clone.c:75 builtin/init-db.c:466
4621 msgid "template-directory"
4622 msgstr "模板目录"
4623
4624 #: builtin/clone.c:76 builtin/init-db.c:467
4625 msgid "directory from which templates will be used"
4626 msgstr "模板目录将被使用"
4627
4628 #: builtin/clone.c:78 builtin/submodule--helper.c:179
4629 msgid "reference repository"
4630 msgstr "参考仓库"
4631
4632 #: builtin/clone.c:80
4633 msgid "use --reference only while cloning"
4634 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4635
4636 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4637 msgid "name"
4638 msgstr "名称"
4639
4640 #: builtin/clone.c:82
4641 msgid "use <name> instead of 'origin' to track upstream"
4642 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4643
4644 #: builtin/clone.c:84
4645 msgid "checkout <branch> instead of the remote's HEAD"
4646 msgstr "检出 <分支> 而不是远程 HEAD"
4647
4648 #: builtin/clone.c:86
4649 msgid "path to git-upload-pack on the remote"
4650 msgstr "远程 git-upload-pack 路径"
4651
4652 #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
4653 #: builtin/pull.c:186
4654 msgid "depth"
4655 msgstr "深度"
4656
4657 #: builtin/clone.c:88
4658 msgid "create a shallow clone of that depth"
4659 msgstr "创建一个指定深度的浅克隆"
4660
4661 #: builtin/clone.c:90
4662 msgid "clone only one branch, HEAD or --branch"
4663 msgstr "只克隆一个分支、HEAD 或 --branch"
4664
4665 #: builtin/clone.c:91 builtin/init-db.c:475
4666 msgid "gitdir"
4667 msgstr "git目录"
4668
4669 #: builtin/clone.c:92 builtin/init-db.c:476
4670 msgid "separate git dir from working tree"
4671 msgstr "git目录和工作区分离"
4672
4673 #: builtin/clone.c:93
4674 msgid "key=value"
4675 msgstr "key=value"
4676
4677 #: builtin/clone.c:94
4678 msgid "set config inside the new repository"
4679 msgstr "在新仓库中设置配置信息"
4680
4681 #: builtin/clone.c:300
4682 #, c-format
4683 msgid "reference repository '%s' as a linked checkout is not supported yet."
4684 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4685
4686 #: builtin/clone.c:302
4687 #, c-format
4688 msgid "reference repository '%s' is not a local repository."
4689 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4690
4691 #: builtin/clone.c:307
4692 #, c-format
4693 msgid "reference repository '%s' is shallow"
4694 msgstr "参考仓库 '%s' 是一个浅克隆"
4695
4696 #: builtin/clone.c:310
4697 #, c-format
4698 msgid "reference repository '%s' is grafted"
4699 msgstr "参考仓库 '%s' 已被嫁接"
4700
4701 #: builtin/clone.c:375 builtin/diff.c:84
4702 #, c-format
4703 msgid "failed to stat '%s'"
4704 msgstr "无法枚举 '%s' 状态"
4705
4706 #: builtin/clone.c:377
4707 #, c-format
4708 msgid "%s exists and is not a directory"
4709 msgstr "%s 存在且不是一个目录"
4710
4711 #: builtin/clone.c:391
4712 #, c-format
4713 msgid "failed to stat %s\n"
4714 msgstr "无法枚举 %s 状态\n"
4715
4716 #: builtin/clone.c:413
4717 #, c-format
4718 msgid "failed to create link '%s'"
4719 msgstr "无法创建链接 '%s'"
4720
4721 #: builtin/clone.c:417
4722 #, c-format
4723 msgid "failed to copy file to '%s'"
4724 msgstr "无法拷贝文件至 '%s'"
4725
4726 #: builtin/clone.c:442 builtin/clone.c:626
4727 #, c-format
4728 msgid "done.\n"
4729 msgstr "完成。\n"
4730
4731 #: builtin/clone.c:454
4732 msgid ""
4733 "Clone succeeded, but checkout failed.\n"
4734 "You can inspect what was checked out with 'git status'\n"
4735 "and retry the checkout with 'git checkout -f HEAD'\n"
4736 msgstr ""
4737 "克隆成功，但是检出失败。\n"
4738 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
4739 "'git checkout -f HEAD' 重试\n"
4740
4741 #: builtin/clone.c:531
4742 #, c-format
4743 msgid "Could not find remote branch %s to clone."
4744 msgstr "不能发现要克隆的远程分支 %s。"
4745
4746 #: builtin/clone.c:621
4747 #, c-format
4748 msgid "Checking connectivity... "
4749 msgstr "检查连接... "
4750
4751 #: builtin/clone.c:624
4752 msgid "remote did not send all necessary objects"
4753 msgstr "远程没有发送所有必须的对象"
4754
4755 #: builtin/clone.c:688
4756 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4757 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
4758
4759 #: builtin/clone.c:719
4760 msgid "unable to checkout working tree"
4761 msgstr "不能检出工作区"
4762
4763 #: builtin/clone.c:808
4764 msgid "cannot repack to clean up"
4765 msgstr "无法执行 repack 来清理"
4766
4767 #: builtin/clone.c:810
4768 msgid "cannot unlink temporary alternates file"
4769 msgstr "无法删除临时的 alternates 文件"
4770
4771 #: builtin/clone.c:842
4772 msgid "Too many arguments."
4773 msgstr "太多参数。"
4774
4775 #: builtin/clone.c:846
4776 msgid "You must specify a repository to clone."
4777 msgstr "您必须指定一个仓库来克隆。"
4778
4779 #: builtin/clone.c:857
4780 #, c-format
4781 msgid "--bare and --origin %s options are incompatible."
4782 msgstr "--bare 和 --origin %s 选项不兼容。"
4783
4784 #: builtin/clone.c:860
4785 msgid "--bare and --separate-git-dir are incompatible."
4786 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4787
4788 #: builtin/clone.c:873
4789 #, c-format
4790 msgid "repository '%s' does not exist"
4791 msgstr "仓库 '%s' 不存在"
4792
4793 #: builtin/clone.c:879 builtin/fetch.c:1166
4794 #, c-format
4795 msgid "depth %s is not a positive number"
4796 msgstr "深度 %s 不是一个正数"
4797
4798 #: builtin/clone.c:889
4799 #, c-format
4800 msgid "destination path '%s' already exists and is not an empty directory."
4801 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
4802
4803 #: builtin/clone.c:899
4804 #, c-format
4805 msgid "working tree '%s' already exists."
4806 msgstr "工作区 '%s' 已经存在。"
4807
4808 #: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4809 #: builtin/worktree.c:221 builtin/worktree.c:248
4810 #, c-format
4811 msgid "could not create leading directories of '%s'"
4812 msgstr "不能为 '%s' 创建先导目录"
4813
4814 #: builtin/clone.c:917
4815 #, c-format
4816 msgid "could not create work tree dir '%s'"
4817 msgstr "不能创建工作区目录 '%s'"
4818
4819 #: builtin/clone.c:935
4820 #, c-format
4821 msgid "Cloning into bare repository '%s'...\n"
4822 msgstr "克隆到纯仓库 '%s'...\n"
4823
4824 #: builtin/clone.c:937
4825 #, c-format
4826 msgid "Cloning into '%s'...\n"
4827 msgstr "正克隆到 '%s'...\n"
4828
4829 #: builtin/clone.c:975
4830 msgid "--depth is ignored in local clones; use file:// instead."
4831 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
4832
4833 #: builtin/clone.c:978
4834 msgid "source repository is shallow, ignoring --local"
4835 msgstr "源仓库是浅克隆，忽略 --local"
4836
4837 #: builtin/clone.c:983
4838 msgid "--local is ignored"
4839 msgstr "--local 被忽略"
4840
4841 #: builtin/clone.c:987
4842 #, c-format
4843 msgid "Don't know how to clone %s"
4844 msgstr "不知道如何克隆 %s"
4845
4846 #: builtin/clone.c:1036 builtin/clone.c:1044
4847 #, c-format
4848 msgid "Remote branch %s not found in upstream %s"
4849 msgstr "远程分支 %s 在上游 %s 未发现"
4850
4851 #: builtin/clone.c:1047
4852 msgid "You appear to have cloned an empty repository."
4853 msgstr "您似乎克隆了一个空仓库。"
4854
4855 #: builtin/column.c:9
4856 msgid "git column [<options>]"
4857 msgstr "git column [<选项>]"
4858
4859 #: builtin/column.c:26
4860 msgid "lookup config vars"
4861 msgstr "查找配置变量"
4862
4863 #: builtin/column.c:27 builtin/column.c:28
4864 msgid "layout to use"
4865 msgstr "要使用的布局"
4866
4867 #: builtin/column.c:29
4868 msgid "Maximum width"
4869 msgstr "最大宽度"
4870
4871 #: builtin/column.c:30
4872 msgid "Padding space on left border"
4873 msgstr "左边框的填充空间"
4874
4875 #: builtin/column.c:31
4876 msgid "Padding space on right border"
4877 msgstr "右边框的填充空间"
4878
4879 #: builtin/column.c:32
4880 msgid "Padding space between columns"
4881 msgstr "两列之间的填充空间"
4882
4883 #: builtin/column.c:51
4884 msgid "--command must be the first argument"
4885 msgstr "--command 必须是第一个参数"
4886
4887 #: builtin/commit.c:38
4888 msgid "git commit [<options>] [--] <pathspec>..."
4889 msgstr "git commit [<选项>] [--] <路径规格>..."
4890
4891 #: builtin/commit.c:43
4892 msgid "git status [<options>] [--] <pathspec>..."
4893 msgstr "git status [<选项>] [--] <路径规格>..."
4894
4895 #: builtin/commit.c:48
4896 msgid ""
4897 "Your name and email address were configured automatically based\n"
4898 "on your username and hostname. Please check that they are accurate.\n"
4899 "You can suppress this message by setting them explicitly. Run the\n"
4900 "following command and follow the instructions in your editor to edit\n"
4901 "your configuration file:\n"
4902 "\n"
4903 "    git config --global --edit\n"
4904 "\n"
4905 "After doing this, you may fix the identity used for this commit with:\n"
4906 "\n"
4907 "    git commit --amend --reset-author\n"
4908 msgstr ""
4909 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4910 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4911 "中编辑您的配置文件：\n"
4912 "\n"
4913 "    git config --global --edit\n"
4914 "\n"
4915 "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
4916 "\n"
4917 "    git commit --amend --reset-author\n"
4918
4919 #: builtin/commit.c:61
4920 msgid ""
4921 "Your name and email address were configured automatically based\n"
4922 "on your username and hostname. Please check that they are accurate.\n"
4923 "You can suppress this message by setting them explicitly:\n"
4924 "\n"
4925 "    git config --global user.name \"Your Name\"\n"
4926 "    git config --global user.email you@example.com\n"
4927 "\n"
4928 "After doing this, you may fix the identity used for this commit with:\n"
4929 "\n"
4930 "    git commit --amend --reset-author\n"
4931 msgstr ""
4932 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4933 "与否。您可以对其进行设置以免再出现本提示信息：\n"
4934 "\n"
4935 "    git config --global user.name \"Your Name\"\n"
4936 "    git config --global user.email you@example.com\n"
4937 "\n"
4938 "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
4939 "\n"
4940 "    git commit --amend --reset-author\n"
4941
4942 #: builtin/commit.c:73
4943 msgid ""
4944 "You asked to amend the most recent commit, but doing so would make\n"
4945 "it empty. You can repeat your command with --allow-empty, or you can\n"
4946 "remove the commit entirely with \"git reset HEAD^\".\n"
4947 msgstr ""
4948 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4949 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4950
4951 #: builtin/commit.c:78
4952 msgid ""
4953 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4954 "If you wish to commit it anyway, use:\n"
4955 "\n"
4956 "    git commit --allow-empty\n"
4957 "\n"
4958 msgstr ""
4959 "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
4960 "也要提交，使用命令：\n"
4961 "\n"
4962 "    git commit --allow-empty\n"
4963 "\n"
4964
4965 #: builtin/commit.c:85
4966 msgid "Otherwise, please use 'git reset'\n"
4967 msgstr "否则，请使用命令 'git reset'\n"
4968
4969 #: builtin/commit.c:88
4970 msgid ""
4971 "If you wish to skip this commit, use:\n"
4972 "\n"
4973 "    git reset\n"
4974 "\n"
4975 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4976 "the remaining commits.\n"
4977 msgstr ""
4978 "如果您想跳过这个提交，使用命令：\n"
4979 "\n"
4980 "    git reset\n"
4981 "\n"
4982 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4983 "操作。\n"
4984
4985 #: builtin/commit.c:305
4986 msgid "failed to unpack HEAD tree object"
4987 msgstr "无法解包 HEAD 树对象"
4988
4989 #: builtin/commit.c:346
4990 msgid "unable to create temporary index"
4991 msgstr "不能创建临时索引"
4992
4993 #: builtin/commit.c:352
4994 msgid "interactive add failed"
4995 msgstr "交互式添加失败"
4996
4997 #: builtin/commit.c:365
4998 msgid "unable to update temporary index"
4999 msgstr "无法更新临时索引"
5000
5001 #: builtin/commit.c:367
5002 msgid "Failed to update main cache tree"
5003 msgstr "不能更新树的主缓存"
5004
5005 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5006 msgid "unable to write new_index file"
5007 msgstr "无法写 new_index 文件"
5008
5009 #: builtin/commit.c:445
5010 msgid "cannot do a partial commit during a merge."
5011 msgstr "在合并过程中不能做部分提交。"
5012
5013 #: builtin/commit.c:447
5014 msgid "cannot do a partial commit during a cherry-pick."
5015 msgstr "在拣选过程中不能做部分提交。"
5016
5017 #: builtin/commit.c:456
5018 msgid "cannot read the index"
5019 msgstr "无法读取索引"
5020
5021 #: builtin/commit.c:475
5022 msgid "unable to write temporary index file"
5023 msgstr "无法写临时索引文件"
5024
5025 #: builtin/commit.c:580
5026 #, c-format
5027 msgid "commit '%s' lacks author header"
5028 msgstr "提交 '%s' 缺少作者信息"
5029
5030 #: builtin/commit.c:582
5031 #, c-format
5032 msgid "commit '%s' has malformed author line"
5033 msgstr "提交 '%s' 有非法的作者信息"
5034
5035 #: builtin/commit.c:601
5036 msgid "malformed --author parameter"
5037 msgstr "非法的 --author 参数"
5038
5039 #: builtin/commit.c:609
5040 #, c-format
5041 msgid "invalid date format: %s"
5042 msgstr "无效的日期格式：%s"
5043
5044 #: builtin/commit.c:653
5045 msgid ""
5046 "unable to select a comment character that is not used\n"
5047 "in the current commit message"
5048 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5049
5050 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5051 #, c-format
5052 msgid "could not lookup commit %s"
5053 msgstr "不能查询提交 %s"
5054
5055 #: builtin/commit.c:702 builtin/shortlog.c:273
5056 #, c-format
5057 msgid "(reading log message from standard input)\n"
5058 msgstr "（正从标准输入中读取日志信息）\n"
5059
5060 #: builtin/commit.c:704
5061 msgid "could not read log from standard input"
5062 msgstr "不能从标准输入中读取日志信息"
5063
5064 #: builtin/commit.c:708
5065 #, c-format
5066 msgid "could not read log file '%s'"
5067 msgstr "不能读取日志文件 '%s'"
5068
5069 #: builtin/commit.c:730
5070 msgid "could not read MERGE_MSG"
5071 msgstr "不能读取 MERGE_MSG"
5072
5073 #: builtin/commit.c:734
5074 msgid "could not read SQUASH_MSG"
5075 msgstr "不能读取 SQUASH_MSG"
5076
5077 #: builtin/commit.c:785
5078 msgid "could not write commit template"
5079 msgstr "不能写提交模版"
5080
5081 #: builtin/commit.c:803
5082 #, c-format
5083 msgid ""
5084 "\n"
5085 "It looks like you may be committing a merge.\n"
5086 "If this is not correct, please remove the file\n"
5087 "\t%s\n"
5088 "and try again.\n"
5089 msgstr ""
5090 "\n"
5091 "似乎您正在做一个合并提交。如果不对，请删除文件\n"
5092 "\t%s\n"
5093 "然后重试。\n"
5094
5095 #: builtin/commit.c:808
5096 #, c-format
5097 msgid ""
5098 "\n"
5099 "It looks like you may be committing a cherry-pick.\n"
5100 "If this is not correct, please remove the file\n"
5101 "\t%s\n"
5102 "and try again.\n"
5103 msgstr ""
5104 "\n"
5105 "似乎您正在做一个拣选提交。如果不对，请删除文件\n"
5106 "\t%s\n"
5107 "然后重试。\n"
5108
5109 #: builtin/commit.c:821
5110 #, c-format
5111 msgid ""
5112 "Please enter the commit message for your changes. Lines starting\n"
5113 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5114 msgstr ""
5115 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
5116 "说明将会终止提交。\n"
5117
5118 #: builtin/commit.c:828
5119 #, c-format
5120 msgid ""
5121 "Please enter the commit message for your changes. Lines starting\n"
5122 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5123 "An empty message aborts the commit.\n"
5124 msgstr ""
5125 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"
5126 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5127
5128 #  译者：为保证在输出中对齐，注意调整句中空格！
5129 #: builtin/commit.c:848
5130 #, c-format
5131 msgid "%sAuthor:    %.*s <%.*s>"
5132 msgstr "%s作者：  %.*s <%.*s>"
5133
5134 #  译者：为保证在输出中对齐，注意调整句中空格！
5135 #: builtin/commit.c:856
5136 #, c-format
5137 msgid "%sDate:      %s"
5138 msgstr "%s日期：  %s"
5139
5140 #  译者：为保证在输出中对齐，注意调整句中空格！
5141 #: builtin/commit.c:863
5142 #, c-format
5143 msgid "%sCommitter: %.*s <%.*s>"
5144 msgstr "%s提交者：%.*s <%.*s>"
5145
5146 #: builtin/commit.c:881
5147 msgid "Cannot read index"
5148 msgstr "无法读取索引"
5149
5150 #: builtin/commit.c:938
5151 msgid "Error building trees"
5152 msgstr "无法创建树对象"
5153
5154 #: builtin/commit.c:953 builtin/tag.c:266
5155 #, c-format
5156 msgid "Please supply the message using either -m or -F option.\n"
5157 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5158
5159 #: builtin/commit.c:1055
5160 #, c-format
5161 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5162 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
5163
5164 #: builtin/commit.c:1070 builtin/commit.c:1310
5165 #, c-format
5166 msgid "Invalid untracked files mode '%s'"
5167 msgstr "无效的未追踪文件参数 '%s'"
5168
5169 #: builtin/commit.c:1107
5170 msgid "--long and -z are incompatible"
5171 msgstr "--long 和 -z 选项不兼容"
5172
5173 #: builtin/commit.c:1137
5174 msgid "Using both --reset-author and --author does not make sense"
5175 msgstr "同时使用 --reset-author 和 --author 没有意义"
5176
5177 #: builtin/commit.c:1146
5178 msgid "You have nothing to amend."
5179 msgstr "您没有可修补的提交。"
5180
5181 #: builtin/commit.c:1149
5182 msgid "You are in the middle of a merge -- cannot amend."
5183 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5184
5185 #: builtin/commit.c:1151
5186 msgid "You are in the middle of a cherry-pick -- cannot amend."
5187 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5188
5189 #: builtin/commit.c:1154
5190 msgid "Options --squash and --fixup cannot be used together"
5191 msgstr "选项 --squash 和 --fixup 不能同时使用"
5192
5193 #: builtin/commit.c:1164
5194 msgid "Only one of -c/-C/-F/--fixup can be used."
5195 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5196
5197 #: builtin/commit.c:1166
5198 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5199 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5200
5201 #: builtin/commit.c:1174
5202 msgid "--reset-author can be used only with -C, -c or --amend."
5203 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5204
5205 #: builtin/commit.c:1191
5206 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5207 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5208
5209 #: builtin/commit.c:1193
5210 msgid "No paths with --include/--only does not make sense."
5211 msgstr "参数 --include/--only 不跟路径没有意义。"
5212
5213 #: builtin/commit.c:1195
5214 msgid "Clever... amending the last one with dirty index."
5215 msgstr "聪明... 用脏索引修补最后一个提交。"
5216
5217 #: builtin/commit.c:1197
5218 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5219 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
5220
5221 #: builtin/commit.c:1209 builtin/tag.c:475
5222 #, c-format
5223 msgid "Invalid cleanup mode %s"
5224 msgstr "无效的清理模式 %s"
5225
5226 #: builtin/commit.c:1214
5227 msgid "Paths with -a does not make sense."
5228 msgstr "路径和 -a 选项同时使用没有意义。"
5229
5230 #: builtin/commit.c:1324 builtin/commit.c:1605
5231 msgid "show status concisely"
5232 msgstr "以简洁的格式显示状态"
5233
5234 #: builtin/commit.c:1326 builtin/commit.c:1607
5235 msgid "show branch information"
5236 msgstr "显示分支信息"
5237
5238 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
5239 #: builtin/worktree.c:423
5240 msgid "machine-readable output"
5241 msgstr "机器可读的输出"
5242
5243 #: builtin/commit.c:1331 builtin/commit.c:1611
5244 msgid "show status in long format (default)"
5245 msgstr "以长格式显示状态（默认）"
5246
5247 #: builtin/commit.c:1334 builtin/commit.c:1614
5248 msgid "terminate entries with NUL"
5249 msgstr "条目以 NUL 字符结尾"
5250
5251 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5252 #: builtin/fast-export.c:984 builtin/tag.c:353
5253 msgid "mode"
5254 msgstr "模式"
5255
5256 #: builtin/commit.c:1337 builtin/commit.c:1617
5257 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5258 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
5259
5260 #: builtin/commit.c:1340
5261 msgid "show ignored files"
5262 msgstr "显示忽略的文件"
5263
5264 #: builtin/commit.c:1341 parse-options.h:155
5265 msgid "when"
5266 msgstr "何时"
5267
5268 #: builtin/commit.c:1342
5269 msgid ""
5270 "ignore changes to submodules, optional when: all, dirty, untracked. "
5271 "(Default: all)"
5272 msgstr ""
5273 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
5274
5275 #: builtin/commit.c:1344
5276 msgid "list untracked files in columns"
5277 msgstr "以列的方式显示未跟踪的文件"
5278
5279 #: builtin/commit.c:1430
5280 msgid "couldn't look up newly created commit"
5281 msgstr "无法找到新创建的提交"
5282
5283 #: builtin/commit.c:1432
5284 msgid "could not parse newly created commit"
5285 msgstr "不能解析新创建的提交"
5286
5287 #: builtin/commit.c:1477
5288 msgid "detached HEAD"
5289 msgstr "分离头指针"
5290
5291 #  译者：中文字符串拼接，可删除前导空格
5292 #: builtin/commit.c:1480
5293 msgid " (root-commit)"
5294 msgstr "（根提交）"
5295
5296 #: builtin/commit.c:1575
5297 msgid "suppress summary after successful commit"
5298 msgstr "提交成功后不显示概述信息"
5299
5300 #: builtin/commit.c:1576
5301 msgid "show diff in commit message template"
5302 msgstr "在提交说明模板里显示差异"
5303
5304 #: builtin/commit.c:1578
5305 msgid "Commit message options"
5306 msgstr "提交说明选项"
5307
5308 #: builtin/commit.c:1579 builtin/tag.c:351
5309 msgid "read message from file"
5310 msgstr "从文件中读取提交说明"
5311
5312 #: builtin/commit.c:1580
5313 msgid "author"
5314 msgstr "作者"
5315
5316 #: builtin/commit.c:1580
5317 msgid "override author for commit"
5318 msgstr "提交时覆盖作者"
5319
5320 #: builtin/commit.c:1581 builtin/gc.c:326
5321 msgid "date"
5322 msgstr "日期"
5323
5324 #: builtin/commit.c:1581
5325 msgid "override date for commit"
5326 msgstr "提交时覆盖日期"
5327
5328 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
5329 #: builtin/notes.c:555 builtin/tag.c:349
5330 msgid "message"
5331 msgstr "说明"
5332
5333 #: builtin/commit.c:1582
5334 msgid "commit message"
5335 msgstr "提交说明"
5336
5337 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5338 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5339 msgid "commit"
5340 msgstr "提交"
5341
5342 #: builtin/commit.c:1583
5343 msgid "reuse and edit message from specified commit"
5344 msgstr "重用并编辑指定提交的提交说明"
5345
5346 #: builtin/commit.c:1584
5347 msgid "reuse message from specified commit"
5348 msgstr "重用指定提交的提交说明"
5349
5350 #: builtin/commit.c:1585
5351 msgid "use autosquash formatted message to fixup specified commit"
5352 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5353
5354 #: builtin/commit.c:1586
5355 msgid "use autosquash formatted message to squash specified commit"
5356 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5357
5358 #: builtin/commit.c:1587
5359 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5360 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
5361
5362 #: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
5363 msgid "add Signed-off-by:"
5364 msgstr "添加 Signed-off-by: 签名"
5365
5366 #: builtin/commit.c:1589
5367 msgid "use specified template file"
5368 msgstr "使用指定的模板文件"
5369
5370 #: builtin/commit.c:1590
5371 msgid "force edit of commit"
5372 msgstr "强制编辑提交"
5373
5374 #  译者：可选值，不能翻译（或是原文中笔误，应为 mode）
5375 #: builtin/commit.c:1591
5376 msgid "default"
5377 msgstr "default"
5378
5379 #: builtin/commit.c:1591 builtin/tag.c:354
5380 msgid "how to strip spaces and #comments from message"
5381 msgstr "设置如何删除提交说明里的空格和#注释"
5382
5383 #: builtin/commit.c:1592
5384 msgid "include status in commit message template"
5385 msgstr "在提交说明模板里包含状态信息"
5386
5387 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
5388 #: builtin/revert.c:93
5389 msgid "GPG sign commit"
5390 msgstr "GPG 提交签名"
5391
5392 #: builtin/commit.c:1597
5393 msgid "Commit contents options"
5394 msgstr "提交内容选项"
5395
5396 #: builtin/commit.c:1598
5397 msgid "commit all changed files"
5398 msgstr "提交所有改动的文件"
5399
5400 #: builtin/commit.c:1599
5401 msgid "add specified files to index for commit"
5402 msgstr "添加指定的文件到索引区等待提交"
5403
5404 #: builtin/commit.c:1600
5405 msgid "interactively add files"
5406 msgstr "交互式添加文件"
5407
5408 #: builtin/commit.c:1601
5409 msgid "interactively add changes"
5410 msgstr "交互式添加变更"
5411
5412 #: builtin/commit.c:1602
5413 msgid "commit only specified files"
5414 msgstr "只提交指定的文件"
5415
5416 #: builtin/commit.c:1603
5417 msgid "bypass pre-commit hook"
5418 msgstr "绕过 pre-commit 钩子"
5419
5420 #: builtin/commit.c:1604
5421 msgid "show what would be committed"
5422 msgstr "显示将要提交的内容"
5423
5424 #: builtin/commit.c:1615
5425 msgid "amend previous commit"
5426 msgstr "修改先前的提交"
5427
5428 #: builtin/commit.c:1616
5429 msgid "bypass post-rewrite hook"
5430 msgstr "绕过 post-rewrite 钩子"
5431
5432 #: builtin/commit.c:1621
5433 msgid "ok to record an empty change"
5434 msgstr "允许一个空提交"
5435
5436 #: builtin/commit.c:1623
5437 msgid "ok to record a change with an empty message"
5438 msgstr "允许空的提交说明"
5439
5440 #: builtin/commit.c:1652
5441 msgid "could not parse HEAD commit"
5442 msgstr "不能解析 HEAD 提交"
5443
5444 #: builtin/commit.c:1698
5445 #, c-format
5446 msgid "Corrupt MERGE_HEAD file (%s)"
5447 msgstr "损坏的 MERGE_HEAD 文件（%s）"
5448
5449 #: builtin/commit.c:1705
5450 msgid "could not read MERGE_MODE"
5451 msgstr "不能读取 MERGE_MODE"
5452
5453 #: builtin/commit.c:1724
5454 #, c-format
5455 msgid "could not read commit message: %s"
5456 msgstr "不能读取提交说明：%s"
5457
5458 #: builtin/commit.c:1735
5459 #, c-format
5460 msgid "Aborting commit; you did not edit the message.\n"
5461 msgstr "终止提交；您未更改来自模版的提交说明。\n"
5462
5463 #: builtin/commit.c:1740
5464 #, c-format
5465 msgid "Aborting commit due to empty commit message.\n"
5466 msgstr "终止提交因为提交说明为空。\n"
5467
5468 #: builtin/commit.c:1788
5469 msgid ""
5470 "Repository has been updated, but unable to write\n"
5471 "new_index file. Check that disk is not full and quota is\n"
5472 "not exceeded, and then \"git reset HEAD\" to recover."
5473 msgstr ""
5474 "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
5475 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
5476
5477 #: builtin/config.c:8
5478 msgid "git config [<options>]"
5479 msgstr "git config [<选项>]"
5480
5481 #: builtin/config.c:54
5482 msgid "Config file location"
5483 msgstr "配置文件位置"
5484
5485 #: builtin/config.c:55
5486 msgid "use global config file"
5487 msgstr "使用全局配置文件"
5488
5489 #: builtin/config.c:56
5490 msgid "use system config file"
5491 msgstr "使用系统级配置文件"
5492
5493 #: builtin/config.c:57
5494 msgid "use repository config file"
5495 msgstr "使用仓库级配置文件"
5496
5497 #: builtin/config.c:58
5498 msgid "use given config file"
5499 msgstr "使用指定的配置文件"
5500
5501 #: builtin/config.c:59
5502 msgid "blob-id"
5503 msgstr "数据对象 ID"
5504
5505 #: builtin/config.c:59
5506 msgid "read config from given blob object"
5507 msgstr "从给定的数据对象读取配置"
5508
5509 #: builtin/config.c:60
5510 msgid "Action"
5511 msgstr "操作"
5512
5513 #: builtin/config.c:61
5514 msgid "get value: name [value-regex]"
5515 msgstr "获取值：name [value-regex]"
5516
5517 #: builtin/config.c:62
5518 msgid "get all values: key [value-regex]"
5519 msgstr "获得所有的值：key [value-regex]"
5520
5521 #: builtin/config.c:63
5522 msgid "get values for regexp: name-regex [value-regex]"
5523 msgstr "根据正则表达式获得值：name-regex [value-regex]"
5524
5525 #: builtin/config.c:64
5526 msgid "get value specific for the URL: section[.var] URL"
5527 msgstr "获得 URL 取值：section[.var] URL"
5528
5529 #: builtin/config.c:65
5530 msgid "replace all matching variables: name value [value_regex]"
5531 msgstr "替换所有匹配的变量：name value [value_regex]"
5532
5533 #: builtin/config.c:66
5534 msgid "add a new variable: name value"
5535 msgstr "添加一个新的变量：name value"
5536
5537 #: builtin/config.c:67
5538 msgid "remove a variable: name [value-regex]"
5539 msgstr "删除一个变量：name [value-regex]"
5540
5541 #: builtin/config.c:68
5542 msgid "remove all matches: name [value-regex]"
5543 msgstr "删除所有匹配项：name [value-regex]"
5544
5545 #: builtin/config.c:69
5546 msgid "rename section: old-name new-name"
5547 msgstr "重命名小节：old-name new-name"
5548
5549 #: builtin/config.c:70
5550 msgid "remove a section: name"
5551 msgstr "删除一个小节：name"
5552
5553 #: builtin/config.c:71
5554 msgid "list all"
5555 msgstr "列出所有"
5556
5557 #: builtin/config.c:72
5558 msgid "open an editor"
5559 msgstr "打开一个编辑器"
5560
5561 #: builtin/config.c:73
5562 msgid "find the color configured: slot [default]"
5563 msgstr "获得配置的颜色：配置 [默认]"
5564
5565 #: builtin/config.c:74
5566 msgid "find the color setting: slot [stdout-is-tty]"
5567 msgstr "获得颜色设置：配置 [stdout-is-tty]"
5568
5569 #: builtin/config.c:75
5570 msgid "Type"
5571 msgstr "类型"
5572
5573 #: builtin/config.c:76
5574 msgid "value is \"true\" or \"false\""
5575 msgstr "值是 \"true\" 或 \"false\""
5576
5577 #: builtin/config.c:77
5578 msgid "value is decimal number"
5579 msgstr "值是十进制数"
5580
5581 #: builtin/config.c:78
5582 msgid "value is --bool or --int"
5583 msgstr "值是 --bool or --int"
5584
5585 #: builtin/config.c:79
5586 msgid "value is a path (file or directory name)"
5587 msgstr "值是一个路径（文件或目录名）"
5588
5589 #: builtin/config.c:80
5590 msgid "Other"
5591 msgstr "其它"
5592
5593 #: builtin/config.c:81
5594 msgid "terminate values with NUL byte"
5595 msgstr "终止值是 NUL 字节"
5596
5597 #: builtin/config.c:82
5598 msgid "show variable names only"
5599 msgstr "只显示变量名"
5600
5601 #: builtin/config.c:83
5602 msgid "respect include directives on lookup"
5603 msgstr "查询时参照 include 指令递归查找"
5604
5605 #: builtin/config.c:303
5606 msgid "unable to parse default color value"
5607 msgstr "不能解析默认颜色值"
5608
5609 #: builtin/config.c:441
5610 #, c-format
5611 msgid ""
5612 "# This is Git's per-user configuration file.\n"
5613 "[user]\n"
5614 "# Please adapt and uncomment the following lines:\n"
5615 "#\tname = %s\n"
5616 "#\temail = %s\n"
5617 msgstr ""
5618 "# This is Git's per-user configuration file.\n"
5619 "[user]\n"
5620 "# Please adapt and uncomment the following lines:\n"
5621 "#\tname = %s\n"
5622 "#\temail = %s\n"
5623
5624 #: builtin/config.c:575
5625 #, c-format
5626 msgid "cannot create configuration file %s"
5627 msgstr "不能创建配置文件 %s"
5628
5629 #: builtin/count-objects.c:77
5630 msgid "git count-objects [-v] [-H | --human-readable]"
5631 msgstr "git count-objects [-v] [-H | --human-readable]"
5632
5633 #: builtin/count-objects.c:87
5634 msgid "print sizes in human readable format"
5635 msgstr "以用户可读的格式显示大小"
5636
5637 #: builtin/describe.c:17
5638 msgid "git describe [<options>] [<commit-ish>...]"
5639 msgstr "git describe [<选项>] [<提交号>...]"
5640
5641 #: builtin/describe.c:18
5642 msgid "git describe [<options>] --dirty"
5643 msgstr "git describe [<选项>] --dirty"
5644
5645 #: builtin/describe.c:217
5646 #, c-format
5647 msgid "annotated tag %s not available"
5648 msgstr "附注标签 %s 无效"
5649
5650 #: builtin/describe.c:221
5651 #, c-format
5652 msgid "annotated tag %s has no embedded name"
5653 msgstr "附注标签 %s 没有嵌入名称"
5654
5655 #: builtin/describe.c:223
5656 #, c-format
5657 msgid "tag '%s' is really '%s' here"
5658 msgstr "标签 '%s' 的确是在 '%s'"
5659
5660 #: builtin/describe.c:250 builtin/log.c:459
5661 #, c-format
5662 msgid "Not a valid object name %s"
5663 msgstr "不是一个有效的对象名 %s"
5664
5665 #: builtin/describe.c:253
5666 #, c-format
5667 msgid "%s is not a valid '%s' object"
5668 msgstr "%s 不是一个有效的 '%s' 对象"
5669
5670 #: builtin/describe.c:270
5671 #, c-format
5672 msgid "no tag exactly matches '%s'"
5673 msgstr "没有标签准确匹配 '%s'"
5674
5675 #: builtin/describe.c:272
5676 #, c-format
5677 msgid "searching to describe %s\n"
5678 msgstr "搜索描述 %s\n"
5679
5680 #: builtin/describe.c:319
5681 #, c-format
5682 msgid "finished search at %s\n"
5683 msgstr "完成搜索 %s\n"
5684
5685 #: builtin/describe.c:346
5686 #, c-format
5687 msgid ""
5688 "No annotated tags can describe '%s'.\n"
5689 "However, there were unannotated tags: try --tags."
5690 msgstr ""
5691 "没有附注标签能描述 '%s'。\n"
5692 "然而，存在未附注标签：尝试 --tags。"
5693
5694 #: builtin/describe.c:350
5695 #, c-format
5696 msgid ""
5697 "No tags can describe '%s'.\n"
5698 "Try --always, or create some tags."
5699 msgstr ""
5700 "没有标签能描述 '%s'。\n"
5701 "尝试 --always，或者创建一些标签。"
5702
5703 #: builtin/describe.c:371
5704 #, c-format
5705 msgid "traversed %lu commits\n"
5706 msgstr "已遍历 %lu 个提交\n"
5707
5708 #: builtin/describe.c:374
5709 #, c-format
5710 msgid ""
5711 "more than %i tags found; listed %i most recent\n"
5712 "gave up search at %s\n"
5713 msgstr ""
5714 "发现多于 %i 个标签，列出最近的 %i 个\n"
5715 "在 %s 放弃搜索\n"
5716
5717 #: builtin/describe.c:396
5718 msgid "find the tag that comes after the commit"
5719 msgstr "寻找该提交之后的标签"
5720
5721 #: builtin/describe.c:397
5722 msgid "debug search strategy on stderr"
5723 msgstr "在标准错误上调试搜索策略"
5724
5725 #: builtin/describe.c:398
5726 msgid "use any ref"
5727 msgstr "使用任意引用"
5728
5729 #: builtin/describe.c:399
5730 msgid "use any tag, even unannotated"
5731 msgstr "使用任意标签，即使未附带注释"
5732
5733 #: builtin/describe.c:400
5734 msgid "always use long format"
5735 msgstr "始终使用长提交号格式"
5736
5737 #: builtin/describe.c:401
5738 msgid "only follow first parent"
5739 msgstr "只跟随第一个父提交"
5740
5741 #: builtin/describe.c:404
5742 msgid "only output exact matches"
5743 msgstr "只输出精确匹配"
5744
5745 #: builtin/describe.c:406
5746 msgid "consider <n> most recent tags (default: 10)"
5747 msgstr "考虑最近 <n> 个标签（默认：10）"
5748
5749 #: builtin/describe.c:408
5750 msgid "only consider tags matching <pattern>"
5751 msgstr "只考虑匹配 <模式> 的标签"
5752
5753 #: builtin/describe.c:410 builtin/name-rev.c:314
5754 msgid "show abbreviated commit object as fallback"
5755 msgstr "显示简写的提交号作为后备"
5756
5757 #: builtin/describe.c:411
5758 msgid "mark"
5759 msgstr "标记"
5760
5761 #: builtin/describe.c:412
5762 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5763 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
5764
5765 #: builtin/describe.c:430
5766 msgid "--long is incompatible with --abbrev=0"
5767 msgstr "--long 与 --abbrev=0 不兼容"
5768
5769 #: builtin/describe.c:456
5770 msgid "No names found, cannot describe anything."
5771 msgstr "没有发现名称，无法描述任何东西。"
5772
5773 #: builtin/describe.c:476
5774 msgid "--dirty is incompatible with commit-ishes"
5775 msgstr "--dirty 不能与提交同时使用"
5776
5777 #: builtin/diff.c:86
5778 #, c-format
5779 msgid "'%s': not a regular file or symlink"
5780 msgstr "'%s'：不是一个正规文件或符号链接"
5781
5782 #: builtin/diff.c:237
5783 #, c-format
5784 msgid "invalid option: %s"
5785 msgstr "无效选项：%s"
5786
5787 #: builtin/diff.c:358
5788 msgid "Not a git repository"
5789 msgstr "不是一个 git 仓库"
5790
5791 #: builtin/diff.c:401
5792 #, c-format
5793 msgid "invalid object '%s' given."
5794 msgstr "提供了无效对象 '%s'。"
5795
5796 #: builtin/diff.c:410
5797 #, c-format
5798 msgid "more than two blobs given: '%s'"
5799 msgstr "提供了超过两个数据对象：'%s'"
5800
5801 #: builtin/diff.c:417
5802 #, c-format
5803 msgid "unhandled object '%s' given."
5804 msgstr "无法处理的对象 '%s'。"
5805
5806 #: builtin/fast-export.c:25
5807 msgid "git fast-export [rev-list-opts]"
5808 msgstr "git fast-export [rev-list-opts]"
5809
5810 #: builtin/fast-export.c:980
5811 msgid "show progress after <n> objects"
5812 msgstr "在 <n> 个对象之后显示进度"
5813
5814 #: builtin/fast-export.c:982
5815 msgid "select handling of signed tags"
5816 msgstr "选择如何处理签名标签"
5817
5818 #: builtin/fast-export.c:985
5819 msgid "select handling of tags that tag filtered objects"
5820 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5821
5822 #: builtin/fast-export.c:988
5823 msgid "Dump marks to this file"
5824 msgstr "把标记存储到这个文件"
5825
5826 #: builtin/fast-export.c:990
5827 msgid "Import marks from this file"
5828 msgstr "从这个文件导入标记"
5829
5830 #: builtin/fast-export.c:992
5831 msgid "Fake a tagger when tags lack one"
5832 msgstr "当标签缺少标记者字段时，假装提供一个"
5833
5834 #: builtin/fast-export.c:994
5835 msgid "Output full tree for each commit"
5836 msgstr "每次提交都输出整个树"
5837
5838 #: builtin/fast-export.c:996
5839 msgid "Use the done feature to terminate the stream"
5840 msgstr "使用 done 功能来终止流"
5841
5842 #: builtin/fast-export.c:997
5843 msgid "Skip output of blob data"
5844 msgstr "跳过数据对象的输出"
5845
5846 #: builtin/fast-export.c:998
5847 msgid "refspec"
5848 msgstr "引用规格"
5849
5850 #: builtin/fast-export.c:999
5851 msgid "Apply refspec to exported refs"
5852 msgstr "对导出的引用应用引用规格"
5853
5854 #: builtin/fast-export.c:1000
5855 msgid "anonymize output"
5856 msgstr "匿名输出"
5857
5858 #: builtin/fetch.c:20
5859 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5860 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5861
5862 #: builtin/fetch.c:21
5863 msgid "git fetch [<options>] <group>"
5864 msgstr "git fetch [<选项>] <组>"
5865
5866 #: builtin/fetch.c:22
5867 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5868 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5869
5870 #: builtin/fetch.c:23
5871 msgid "git fetch --all [<options>]"
5872 msgstr "git fetch --all [<选项>]"
5873
5874 #: builtin/fetch.c:90 builtin/pull.c:162
5875 msgid "fetch from all remotes"
5876 msgstr "从所有的远程抓取"
5877
5878 #: builtin/fetch.c:92 builtin/pull.c:165
5879 msgid "append to .git/FETCH_HEAD instead of overwriting"
5880 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5881
5882 #: builtin/fetch.c:94 builtin/pull.c:168
5883 msgid "path to upload pack on remote end"
5884 msgstr "上传包到远程的路径"
5885
5886 #: builtin/fetch.c:95 builtin/pull.c:170
5887 msgid "force overwrite of local branch"
5888 msgstr "强制覆盖本地分支"
5889
5890 #: builtin/fetch.c:97
5891 msgid "fetch from multiple remotes"
5892 msgstr "从多个远程抓取"
5893
5894 #: builtin/fetch.c:99 builtin/pull.c:172
5895 msgid "fetch all tags and associated objects"
5896 msgstr "抓取所有的标签和关联对象"
5897
5898 #: builtin/fetch.c:101
5899 msgid "do not fetch all tags (--no-tags)"
5900 msgstr "不抓取任何标签(--no-tags)"
5901
5902 #: builtin/fetch.c:103 builtin/pull.c:175
5903 msgid "prune remote-tracking branches no longer on remote"
5904 msgstr "清除远程已经不存在的分支的跟踪分支"
5905
5906 #  译者：可选值，不能翻译
5907 #: builtin/fetch.c:104 builtin/pull.c:178
5908 msgid "on-demand"
5909 msgstr "on-demand"
5910
5911 #: builtin/fetch.c:105 builtin/pull.c:179
5912 msgid "control recursive fetching of submodules"
5913 msgstr "控制子模组的递归抓取"
5914
5915 #: builtin/fetch.c:109 builtin/pull.c:184
5916 msgid "keep downloaded pack"
5917 msgstr "保持下载包"
5918
5919 #: builtin/fetch.c:111
5920 msgid "allow updating of HEAD ref"
5921 msgstr "允许更新 HEAD 引用"
5922
5923 #: builtin/fetch.c:114 builtin/pull.c:187
5924 msgid "deepen history of shallow clone"
5925 msgstr "深化浅克隆的历史"
5926
5927 #: builtin/fetch.c:116 builtin/pull.c:190
5928 msgid "convert to a complete repository"
5929 msgstr "转换为一个完整的仓库"
5930
5931 #: builtin/fetch.c:118 builtin/log.c:1233
5932 msgid "dir"
5933 msgstr "目录"
5934
5935 #: builtin/fetch.c:119
5936 msgid "prepend this to submodule path output"
5937 msgstr "在子模组路径输出的前面加上此目录"
5938
5939 #: builtin/fetch.c:122
5940 msgid "default mode for recursion"
5941 msgstr "递归的默认模式"
5942
5943 #: builtin/fetch.c:124 builtin/pull.c:193
5944 msgid "accept refs that update .git/shallow"
5945 msgstr "接受更新 .git/shallow 的引用"
5946
5947 #: builtin/fetch.c:125 builtin/pull.c:195
5948 msgid "refmap"
5949 msgstr "引用映射"
5950
5951 #: builtin/fetch.c:126 builtin/pull.c:196
5952 msgid "specify fetch refmap"
5953 msgstr "指定获取操作的引用映射"
5954
5955 #: builtin/fetch.c:378
5956 msgid "Couldn't find remote ref HEAD"
5957 msgstr "无法发现远程 HEAD 引用"
5958
5959 #: builtin/fetch.c:458
5960 #, c-format
5961 msgid "object %s not found"
5962 msgstr "对象 %s 未发现"
5963
5964 #: builtin/fetch.c:463
5965 msgid "[up to date]"
5966 msgstr "[最新]"
5967
5968 #: builtin/fetch.c:477
5969 #, c-format
5970 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
5971 msgstr "! %-*s %-*s -> %s  （在当前分支下不能获取）"
5972
5973 #: builtin/fetch.c:478 builtin/fetch.c:566
5974 msgid "[rejected]"
5975 msgstr "[已拒绝]"
5976
5977 #: builtin/fetch.c:489
5978 msgid "[tag update]"
5979 msgstr "[标签更新]"
5980
5981 #  译者：注意保持前导空格
5982 #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5983 msgid "  (unable to update local ref)"
5984 msgstr "  （不能更新本地引用）"
5985
5986 #: builtin/fetch.c:509
5987 msgid "[new tag]"
5988 msgstr "[新标签]"
5989
5990 #: builtin/fetch.c:512
5991 msgid "[new branch]"
5992 msgstr "[新分支]"
5993
5994 #: builtin/fetch.c:515
5995 msgid "[new ref]"
5996 msgstr "[新引用]"
5997
5998 #: builtin/fetch.c:561
5999 msgid "unable to update local ref"
6000 msgstr "不能更新本地引用"
6001
6002 #: builtin/fetch.c:561
6003 msgid "forced update"
6004 msgstr "强制更新"
6005
6006 #: builtin/fetch.c:568
6007 msgid "(non-fast-forward)"
6008 msgstr "（非快进式）"
6009
6010 #: builtin/fetch.c:602 builtin/fetch.c:843
6011 #, c-format
6012 msgid "cannot open %s: %s\n"
6013 msgstr "无法打开 %s：%s\n"
6014
6015 #: builtin/fetch.c:611
6016 #, c-format
6017 msgid "%s did not send all necessary objects\n"
6018 msgstr "%s 未发送所有必须的对象\n"
6019
6020 #: builtin/fetch.c:629
6021 #, c-format
6022 msgid "reject %s because shallow roots are not allowed to be updated"
6023 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6024
6025 #: builtin/fetch.c:716 builtin/fetch.c:808
6026 #, c-format
6027 msgid "From %.*s\n"
6028 msgstr "来自 %.*s\n"
6029
6030 #: builtin/fetch.c:727
6031 #, c-format
6032 msgid ""
6033 "some local refs could not be updated; try running\n"
6034 " 'git remote prune %s' to remove any old, conflicting branches"
6035 msgstr ""
6036 "一些本地引用不能被更新；尝试运行\n"
6037 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6038
6039 #  译者：注意保持前导空格
6040 #: builtin/fetch.c:779
6041 #, c-format
6042 msgid "   (%s will become dangling)"
6043 msgstr "   （%s 将成为摇摆状态）"
6044
6045 #  译者：注意保持前导空格
6046 #: builtin/fetch.c:780
6047 #, c-format
6048 msgid "   (%s has become dangling)"
6049 msgstr "   （%s 已成为摇摆状态）"
6050
6051 #: builtin/fetch.c:812
6052 msgid "[deleted]"
6053 msgstr "[已删除]"
6054
6055 #: builtin/fetch.c:813 builtin/remote.c:1040
6056 msgid "(none)"
6057 msgstr "（无）"
6058
6059 #: builtin/fetch.c:833
6060 #, c-format
6061 msgid "Refusing to fetch into current branch %s of non-bare repository"
6062 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6063
6064 #: builtin/fetch.c:852
6065 #, c-format
6066 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6067 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6068
6069 #: builtin/fetch.c:855
6070 #, c-format
6071 msgid "Option \"%s\" is ignored for %s\n"
6072 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6073
6074 #: builtin/fetch.c:911
6075 #, c-format
6076 msgid "Don't know how to fetch from %s"
6077 msgstr "不知道如何从 %s 获取"
6078
6079 #: builtin/fetch.c:1072
6080 #, c-format
6081 msgid "Fetching %s\n"
6082 msgstr "正在获取 %s\n"
6083
6084 #: builtin/fetch.c:1074 builtin/remote.c:96
6085 #, c-format
6086 msgid "Could not fetch %s"
6087 msgstr "不能获取 %s"
6088
6089 #: builtin/fetch.c:1092
6090 msgid ""
6091 "No remote repository specified.  Please, specify either a URL or a\n"
6092 "remote name from which new revisions should be fetched."
6093 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
6094
6095 #: builtin/fetch.c:1115
6096 msgid "You need to specify a tag name."
6097 msgstr "您需要指定一个标签名称。"
6098
6099 #: builtin/fetch.c:1157
6100 msgid "--depth and --unshallow cannot be used together"
6101 msgstr "--depth 和 --unshallow 不能同时使用"
6102
6103 #: builtin/fetch.c:1159
6104 msgid "--unshallow on a complete repository does not make sense"
6105 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
6106
6107 #: builtin/fetch.c:1179
6108 msgid "fetch --all does not take a repository argument"
6109 msgstr "fetch --all 不能带一个仓库参数"
6110
6111 #: builtin/fetch.c:1181
6112 msgid "fetch --all does not make sense with refspecs"
6113 msgstr "fetch --all 带引用规格没有任何意义"
6114
6115 #: builtin/fetch.c:1192
6116 #, c-format
6117 msgid "No such remote or remote group: %s"
6118 msgstr "没有这样的远程或远程组：%s"
6119
6120 #: builtin/fetch.c:1200
6121 msgid "Fetching a group and specifying refspecs does not make sense"
6122 msgstr "获取组并指定引用规格没有意义"
6123
6124 #: builtin/fmt-merge-msg.c:14
6125 msgid ""
6126 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6127 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6128
6129 #: builtin/fmt-merge-msg.c:667
6130 msgid "populate log with at most <n> entries from shortlog"
6131 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
6132
6133 #: builtin/fmt-merge-msg.c:670
6134 msgid "alias for --log (deprecated)"
6135 msgstr "参数 --log 的别名（已弃用）"
6136
6137 #: builtin/fmt-merge-msg.c:673
6138 msgid "text"
6139 msgstr "文本"
6140
6141 #: builtin/fmt-merge-msg.c:674
6142 msgid "use <text> as start of message"
6143 msgstr "使用 <文本> 作为提交说明的开始"
6144
6145 #: builtin/fmt-merge-msg.c:675
6146 msgid "file to read from"
6147 msgstr "从文件中读取"
6148
6149 #: builtin/for-each-ref.c:9
6150 msgid "git for-each-ref [<options>] [<pattern>]"
6151 msgstr "git for-each-ref [<选项>] [<模式>]"
6152
6153 #: builtin/for-each-ref.c:10
6154 msgid "git for-each-ref [--points-at <object>]"
6155 msgstr "git for-each-ref [--points-at <对象>]"
6156
6157 #: builtin/for-each-ref.c:11
6158 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6159 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6160
6161 #: builtin/for-each-ref.c:12
6162 msgid "git for-each-ref [--contains [<object>]]"
6163 msgstr "git for-each-ref [--contains [<对象>]]"
6164
6165 #: builtin/for-each-ref.c:27
6166 msgid "quote placeholders suitably for shells"
6167 msgstr "引用占位符适用于 shells"
6168
6169 #: builtin/for-each-ref.c:29
6170 msgid "quote placeholders suitably for perl"
6171 msgstr "引用占位符适用于 perl"
6172
6173 #: builtin/for-each-ref.c:31
6174 msgid "quote placeholders suitably for python"
6175 msgstr "引用占位符适用于 python"
6176
6177 #: builtin/for-each-ref.c:33
6178 msgid "quote placeholders suitably for Tcl"
6179 msgstr "引用占位符适用于 Tcl"
6180
6181 #: builtin/for-each-ref.c:36
6182 msgid "show only <n> matched refs"
6183 msgstr "只显示 <n> 个匹配的引用"
6184
6185 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6186 msgid "format to use for the output"
6187 msgstr "输出格式"
6188
6189 #: builtin/for-each-ref.c:41
6190 msgid "print only refs which points at the given object"
6191 msgstr "只打印指向给定对象的引用"
6192
6193 #: builtin/for-each-ref.c:43
6194 msgid "print only refs that are merged"
6195 msgstr "只打印已经合并的引用"
6196
6197 #: builtin/for-each-ref.c:44
6198 msgid "print only refs that are not merged"
6199 msgstr "只打印没有合并的引用"
6200
6201 #: builtin/for-each-ref.c:45
6202 msgid "print only refs which contain the commit"
6203 msgstr "只打印包含该提交的引用"
6204
6205 #: builtin/fsck.c:156 builtin/prune.c:140
6206 msgid "Checking connectivity"
6207 msgstr "检查连接中"
6208
6209 #: builtin/fsck.c:486
6210 msgid "Checking object directories"
6211 msgstr "检查对象目录中"
6212
6213 #: builtin/fsck.c:553
6214 msgid "git fsck [<options>] [<object>...]"
6215 msgstr "git fsck [<选项>] [<对象>...]"
6216
6217 #: builtin/fsck.c:559
6218 msgid "show unreachable objects"
6219 msgstr "显示不可达的对象"
6220
6221 #: builtin/fsck.c:560
6222 msgid "show dangling objects"
6223 msgstr "显示摇摆的对象"
6224
6225 #: builtin/fsck.c:561
6226 msgid "report tags"
6227 msgstr "报告标签"
6228
6229 #: builtin/fsck.c:562
6230 msgid "report root nodes"
6231 msgstr "报告根节点"
6232
6233 #: builtin/fsck.c:563
6234 msgid "make index objects head nodes"
6235 msgstr "将索引亦作为检查的头节点"
6236
6237 #: builtin/fsck.c:564
6238 msgid "make reflogs head nodes (default)"
6239 msgstr "将引用日志作为检查的头节点（默认）"
6240
6241 #: builtin/fsck.c:565
6242 msgid "also consider packs and alternate objects"
6243 msgstr "也考虑包和备用对象"
6244
6245 #: builtin/fsck.c:566
6246 msgid "check only connectivity"
6247 msgstr "仅检查连通性"
6248
6249 #: builtin/fsck.c:567
6250 msgid "enable more strict checking"
6251 msgstr "启用更严格的检查"
6252
6253 #: builtin/fsck.c:569
6254 msgid "write dangling objects in .git/lost-found"
6255 msgstr "将摇摆对象写入 .git/lost-found 中"
6256
6257 #: builtin/fsck.c:570 builtin/prune.c:107
6258 msgid "show progress"
6259 msgstr "显示进度"
6260
6261 #: builtin/fsck.c:631
6262 msgid "Checking objects"
6263 msgstr "检查对象中"
6264
6265 #: builtin/gc.c:25
6266 msgid "git gc [<options>]"
6267 msgstr "git gc [<选项>]"
6268
6269 #: builtin/gc.c:72
6270 #, c-format
6271 msgid "Invalid %s: '%s'"
6272 msgstr "无效 %s：'%s'"
6273
6274 #: builtin/gc.c:139
6275 #, c-format
6276 msgid "insanely long object directory %.*s"
6277 msgstr "不正常的长对象目录 %.*s"
6278
6279 #: builtin/gc.c:290
6280 #, c-format
6281 msgid ""
6282 "The last gc run reported the following. Please correct the root cause\n"
6283 "and remove %s.\n"
6284 "Automatic cleanup will not be performed until the file is removed.\n"
6285 "\n"
6286 "%s"
6287 msgstr ""
6288 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6289 "在该文件被删除之前，自动清理将不会执行。\n"
6290 "\n"
6291 "%s"
6292
6293 #: builtin/gc.c:327
6294 msgid "prune unreferenced objects"
6295 msgstr "清除未引用的对象"
6296
6297 #: builtin/gc.c:329
6298 msgid "be more thorough (increased runtime)"
6299 msgstr "更彻底（增加运行时间）"
6300
6301 #: builtin/gc.c:330
6302 msgid "enable auto-gc mode"
6303 msgstr "启用自动垃圾回收模式"
6304
6305 #: builtin/gc.c:331
6306 msgid "force running gc even if there may be another gc running"
6307 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6308
6309 #: builtin/gc.c:373
6310 #, c-format
6311 msgid "Auto packing the repository in background for optimum performance.\n"
6312 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6313
6314 #: builtin/gc.c:375
6315 #, c-format
6316 msgid "Auto packing the repository for optimum performance.\n"
6317 msgstr "自动打包仓库以求最佳性能。\n"
6318
6319 #: builtin/gc.c:376
6320 #, c-format
6321 msgid "See \"git help gc\" for manual housekeeping.\n"
6322 msgstr "手工维护参见 \"git help gc\"。\n"
6323
6324 #: builtin/gc.c:397
6325 #, c-format
6326 msgid ""
6327 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6328 msgstr ""
6329 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
6330
6331 #: builtin/gc.c:441
6332 msgid ""
6333 "There are too many unreachable loose objects; run 'git prune' to remove them."
6334 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
6335
6336 #: builtin/grep.c:23
6337 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6338 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6339
6340 #: builtin/grep.c:218
6341 #, c-format
6342 msgid "grep: failed to create thread: %s"
6343 msgstr "grep：无法创建线程：%s"
6344
6345 #: builtin/grep.c:441 builtin/grep.c:476
6346 #, c-format
6347 msgid "unable to read tree (%s)"
6348 msgstr "无法读取树（%s）"
6349
6350 #: builtin/grep.c:491
6351 #, c-format
6352 msgid "unable to grep from object of type %s"
6353 msgstr "无法抓取来自于 %s 类型的对象"
6354
6355 #: builtin/grep.c:547
6356 #, c-format
6357 msgid "switch `%c' expects a numerical value"
6358 msgstr "开关 `%c' 期望一个数字值"
6359
6360 #: builtin/grep.c:564
6361 #, c-format
6362 msgid "cannot open '%s'"
6363 msgstr "不能打开 '%s'"
6364
6365 #: builtin/grep.c:633
6366 msgid "search in index instead of in the work tree"
6367 msgstr "在索引区搜索而不是在工作区"
6368
6369 #: builtin/grep.c:635
6370 msgid "find in contents not managed by git"
6371 msgstr "在未被 git 管理的内容中查找"
6372
6373 #  译者：中文字符串拼接，可删除前导空格
6374 #: builtin/grep.c:637
6375 msgid "search in both tracked and untracked files"
6376 msgstr "在跟踪和未跟踪的文件中搜索"
6377
6378 #: builtin/grep.c:639
6379 msgid "ignore files specified via '.gitignore'"
6380 msgstr "忽略 '.gitignore' 包含的文件"
6381
6382 #: builtin/grep.c:642
6383 msgid "show non-matching lines"
6384 msgstr "显示未匹配的行"
6385
6386 #: builtin/grep.c:644
6387 msgid "case insensitive matching"
6388 msgstr "不区分大小写匹配"
6389
6390 #: builtin/grep.c:646
6391 msgid "match patterns only at word boundaries"
6392 msgstr "只在单词边界匹配模式"
6393
6394 #: builtin/grep.c:648
6395 msgid "process binary files as text"
6396 msgstr "把二进制文件当做文本处理"
6397
6398 #: builtin/grep.c:650
6399 msgid "don't match patterns in binary files"
6400 msgstr "不在二进制文件中匹配模式"
6401
6402 #: builtin/grep.c:653
6403 msgid "process binary files with textconv filters"
6404 msgstr "用 textconv 过滤器处理二进制文件"
6405
6406 #: builtin/grep.c:655
6407 msgid "descend at most <depth> levels"
6408 msgstr "最多以指定的深度向下寻找"
6409
6410 #: builtin/grep.c:659
6411 msgid "use extended POSIX regular expressions"
6412 msgstr "使用扩展的 POSIX 正则表达式"
6413
6414 #: builtin/grep.c:662
6415 msgid "use basic POSIX regular expressions (default)"
6416 msgstr "使用基本的 POSIX 正则表达式（默认）"
6417
6418 #: builtin/grep.c:665
6419 msgid "interpret patterns as fixed strings"
6420 msgstr "把模式解析为固定的字符串"
6421
6422 #: builtin/grep.c:668
6423 msgid "use Perl-compatible regular expressions"
6424 msgstr "使用 Perl 兼容的正则表达式"
6425
6426 #: builtin/grep.c:671
6427 msgid "show line numbers"
6428 msgstr "显示行号"
6429
6430 #: builtin/grep.c:672
6431 msgid "don't show filenames"
6432 msgstr "不显示文件名"
6433
6434 #: builtin/grep.c:673
6435 msgid "show filenames"
6436 msgstr "显示文件名"
6437
6438 #: builtin/grep.c:675
6439 msgid "show filenames relative to top directory"
6440 msgstr "显示相对于顶级目录的文件名"
6441
6442 #: builtin/grep.c:677
6443 msgid "show only filenames instead of matching lines"
6444 msgstr "只显示文件名而不显示匹配的行"
6445
6446 #: builtin/grep.c:679
6447 msgid "synonym for --files-with-matches"
6448 msgstr "和 --files-with-matches 同义"
6449
6450 #: builtin/grep.c:682
6451 msgid "show only the names of files without match"
6452 msgstr "只显示未匹配的文件名"
6453
6454 #: builtin/grep.c:684
6455 msgid "print NUL after filenames"
6456 msgstr "在文件名后输出 NUL 字符"
6457
6458 #: builtin/grep.c:686
6459 msgid "show the number of matches instead of matching lines"
6460 msgstr "显示总匹配行数，而不显示匹配的行"
6461
6462 #: builtin/grep.c:687
6463 msgid "highlight matches"
6464 msgstr "高亮显示匹配项"
6465
6466 #: builtin/grep.c:689
6467 msgid "print empty line between matches from different files"
6468 msgstr "在不同文件的匹配项之间打印空行"
6469
6470 #: builtin/grep.c:691
6471 msgid "show filename only once above matches from same file"
6472 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6473
6474 #: builtin/grep.c:694
6475 msgid "show <n> context lines before and after matches"
6476 msgstr "显示匹配项前后的 <n> 行上下文"
6477
6478 #: builtin/grep.c:697
6479 msgid "show <n> context lines before matches"
6480 msgstr "显示匹配项前 <n> 行上下文"
6481
6482 #: builtin/grep.c:699
6483 msgid "show <n> context lines after matches"
6484 msgstr "显示匹配项后 <n> 行上下文"
6485
6486 #: builtin/grep.c:700
6487 msgid "shortcut for -C NUM"
6488 msgstr "快捷键 -C 数字"
6489
6490 #: builtin/grep.c:703
6491 msgid "show a line with the function name before matches"
6492 msgstr "在匹配的前面显示一行函数名"
6493
6494 #: builtin/grep.c:705
6495 msgid "show the surrounding function"
6496 msgstr "显示所在函数的前后内容"
6497
6498 #: builtin/grep.c:708
6499 msgid "read patterns from file"
6500 msgstr "从文件读取模式"
6501
6502 #: builtin/grep.c:710
6503 msgid "match <pattern>"
6504 msgstr "匹配 <模式>"
6505
6506 #: builtin/grep.c:712
6507 msgid "combine patterns specified with -e"
6508 msgstr "组合用 -e 参数设定的模式"
6509
6510 #: builtin/grep.c:724
6511 msgid "indicate hit with exit status without output"
6512 msgstr "不输出，而用退出码标识命中状态"
6513
6514 #: builtin/grep.c:726
6515 msgid "show only matches from files that match all patterns"
6516 msgstr "只显示匹配所有模式的文件中的匹配"
6517
6518 #: builtin/grep.c:728
6519 msgid "show parse tree for grep expression"
6520 msgstr "显示 grep 表达式的解析树"
6521
6522 #: builtin/grep.c:732
6523 msgid "pager"
6524 msgstr "分页"
6525
6526 #: builtin/grep.c:732
6527 msgid "show matching files in the pager"
6528 msgstr "分页显示匹配的文件"
6529
6530 #: builtin/grep.c:735
6531 msgid "allow calling of grep(1) (ignored by this build)"
6532 msgstr "允许调用 grep(1)（本次构建忽略）"
6533
6534 #: builtin/grep.c:793
6535 msgid "no pattern given."
6536 msgstr "未提供模式匹配。"
6537
6538 #: builtin/grep.c:851
6539 msgid "--open-files-in-pager only works on the worktree"
6540 msgstr "--open-files-in-pager 仅用于工作区"
6541
6542 #: builtin/grep.c:877
6543 msgid "--cached or --untracked cannot be used with --no-index."
6544 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6545
6546 #: builtin/grep.c:882
6547 msgid "--no-index or --untracked cannot be used with revs."
6548 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6549
6550 #: builtin/grep.c:885
6551 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6552 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6553
6554 #: builtin/grep.c:893
6555 msgid "both --cached and trees are given."
6556 msgstr "同时给出了 --cached 和树对象。"
6557
6558 #: builtin/hash-object.c:80
6559 msgid ""
6560 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6561 "[--] <file>..."
6562 msgstr ""
6563 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6564 "[--] <文件>..."
6565
6566 #: builtin/hash-object.c:81
6567 msgid "git hash-object  --stdin-paths"
6568 msgstr "git hash-object  --stdin-paths"
6569
6570 #: builtin/hash-object.c:92
6571 msgid "type"
6572 msgstr "类型"
6573
6574 #: builtin/hash-object.c:92
6575 msgid "object type"
6576 msgstr "对象类型"
6577
6578 #: builtin/hash-object.c:93
6579 msgid "write the object into the object database"
6580 msgstr "将对象写入对象数据库"
6581
6582 #: builtin/hash-object.c:95
6583 msgid "read the object from stdin"
6584 msgstr "从标准输入读取对象"
6585
6586 #: builtin/hash-object.c:97
6587 msgid "store file as is without filters"
6588 msgstr "原样存储文件不使用过滤器"
6589
6590 #: builtin/hash-object.c:98
6591 msgid ""
6592 "just hash any random garbage to create corrupt objects for debugging Git"
6593 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6594
6595 #: builtin/hash-object.c:99
6596 msgid "process file as it were from this path"
6597 msgstr "处理文件并假设其来自于此路径"
6598
6599 #: builtin/help.c:41
6600 msgid "print all available commands"
6601 msgstr "打印所有可用的命令"
6602
6603 #: builtin/help.c:42
6604 msgid "print list of useful guides"
6605 msgstr "显示有用的指南列表"
6606
6607 #: builtin/help.c:43
6608 msgid "show man page"
6609 msgstr "显示 man 手册"
6610
6611 #: builtin/help.c:44
6612 msgid "show manual in web browser"
6613 msgstr "在 web 浏览器中显示手册"
6614
6615 #: builtin/help.c:46
6616 msgid "show info page"
6617 msgstr "显示 info 手册"
6618
6619 #: builtin/help.c:52
6620 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6621 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6622
6623 #: builtin/help.c:64
6624 #, c-format
6625 msgid "unrecognized help format '%s'"
6626 msgstr "未能识别的帮助格式 '%s'"
6627
6628 #: builtin/help.c:91
6629 msgid "Failed to start emacsclient."
6630 msgstr "无法启动 emacsclient。"
6631
6632 #: builtin/help.c:104
6633 msgid "Failed to parse emacsclient version."
6634 msgstr "无法解析 emacsclient 版本。"
6635
6636 #: builtin/help.c:112
6637 #, c-format
6638 msgid "emacsclient version '%d' too old (< 22)."
6639 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
6640
6641 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6642 #, c-format
6643 msgid "failed to exec '%s': %s"
6644 msgstr "无法执行 '%s'：%s"
6645
6646 #: builtin/help.c:208
6647 #, c-format
6648 msgid ""
6649 "'%s': path for unsupported man viewer.\n"
6650 "Please consider using 'man.<tool>.cmd' instead."
6651 msgstr ""
6652 "'%s'：不支持的 man 手册查看器的路径。\n"
6653 "请使用 'man.<工具>.cmd'。"
6654
6655 #: builtin/help.c:220
6656 #, c-format
6657 msgid ""
6658 "'%s': cmd for supported man viewer.\n"
6659 "Please consider using 'man.<tool>.path' instead."
6660 msgstr ""
6661 "'%s': 支持的 man 手册查看器命令。\n"
6662 "请使用 'man.<工具>.path'。"
6663
6664 #: builtin/help.c:337
6665 #, c-format
6666 msgid "'%s': unknown man viewer."
6667 msgstr "'%s'：未知的 man 查看器。"
6668
6669 #: builtin/help.c:354
6670 msgid "no man viewer handled the request"
6671 msgstr "没有 man 查看器处理此请求"
6672
6673 #: builtin/help.c:362
6674 msgid "no info viewer handled the request"
6675 msgstr "没有 info 查看器处理此请求"
6676
6677 #: builtin/help.c:411
6678 msgid "Defining attributes per path"
6679 msgstr "定义路径的属性"
6680
6681 #: builtin/help.c:412
6682 msgid "Everyday Git With 20 Commands Or So"
6683 msgstr "每一天 Git 常用的约 20 条命令"
6684
6685 #: builtin/help.c:413
6686 msgid "A Git glossary"
6687 msgstr "Git 词汇表"
6688
6689 #: builtin/help.c:414
6690 msgid "Specifies intentionally untracked files to ignore"
6691 msgstr "忽略指定的未跟踪文件"
6692
6693 #: builtin/help.c:415
6694 msgid "Defining submodule properties"
6695 msgstr "定义子模组属性"
6696
6697 #: builtin/help.c:416
6698 msgid "Specifying revisions and ranges for Git"
6699 msgstr "指定 Git 的版本和版本范围"
6700
6701 #: builtin/help.c:417
6702 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6703 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
6704
6705 #: builtin/help.c:418
6706 msgid "An overview of recommended workflows with Git"
6707 msgstr "Git 推荐的工作流概览"
6708
6709 #: builtin/help.c:430
6710 msgid "The common Git guides are:\n"
6711 msgstr "最常用的 Git 向导有：\n"
6712
6713 #: builtin/help.c:451 builtin/help.c:468
6714 #, c-format
6715 msgid "usage: %s%s"
6716 msgstr "用法：%s%s"
6717
6718 #: builtin/help.c:484
6719 #, c-format
6720 msgid "`git %s' is aliased to `%s'"
6721 msgstr "`git %s' 是 `%s' 的别名"
6722
6723 #: builtin/index-pack.c:152
6724 #, c-format
6725 msgid "unable to open %s"
6726 msgstr "不能打开 %s"
6727
6728 #: builtin/index-pack.c:202
6729 #, c-format
6730 msgid "object type mismatch at %s"
6731 msgstr "%s 的对象类型不匹配"
6732
6733 #: builtin/index-pack.c:222
6734 #, c-format
6735 msgid "did not receive expected object %s"
6736 msgstr "未能获取期望的对象 %s"
6737
6738 #: builtin/index-pack.c:225
6739 #, c-format
6740 msgid "object %s: expected type %s, found %s"
6741 msgstr "对象 %s：期待类型 %s，却是 %s"
6742
6743 #: builtin/index-pack.c:267
6744 #, c-format
6745 msgid "cannot fill %d byte"
6746 msgid_plural "cannot fill %d bytes"
6747 msgstr[0] "无法填充 %d 字节"
6748 msgstr[1] "无法填充 %d 字节"
6749
6750 #: builtin/index-pack.c:277
6751 msgid "early EOF"
6752 msgstr "过早的文件结束符（EOF）"
6753
6754 #: builtin/index-pack.c:278
6755 msgid "read error on input"
6756 msgstr "输入上的读错误"
6757
6758 #: builtin/index-pack.c:290
6759 msgid "used more bytes than were available"
6760 msgstr "用掉了超过可用的字节"
6761
6762 #: builtin/index-pack.c:297
6763 msgid "pack too large for current definition of off_t"
6764 msgstr "包太大超过了当前 off_t 的定义"
6765
6766 #: builtin/index-pack.c:313
6767 #, c-format
6768 msgid "unable to create '%s'"
6769 msgstr "不能创建 '%s'"
6770
6771 #: builtin/index-pack.c:318
6772 #, c-format
6773 msgid "cannot open packfile '%s'"
6774 msgstr "无法打开包文件 '%s'"
6775
6776 #: builtin/index-pack.c:332
6777 msgid "pack signature mismatch"
6778 msgstr "包签名不匹配"
6779
6780 #: builtin/index-pack.c:334
6781 #, c-format
6782 msgid "pack version %<PRIu32> unsupported"
6783 msgstr "不支持包版本 %<PRIu32>"
6784
6785 #: builtin/index-pack.c:352
6786 #, c-format
6787 msgid "pack has bad object at offset %lu: %s"
6788 msgstr "包中有错误的对象位于 %lu：%s"
6789
6790 #: builtin/index-pack.c:473
6791 #, c-format
6792 msgid "inflate returned %d"
6793 msgstr "解压缩返回 %d"
6794
6795 #: builtin/index-pack.c:522
6796 msgid "offset value overflow for delta base object"
6797 msgstr "偏移值覆盖了 delta 基准对象"
6798
6799 #: builtin/index-pack.c:530
6800 msgid "delta base offset is out of bound"
6801 msgstr "delta 基准偏移越界"
6802
6803 #: builtin/index-pack.c:538
6804 #, c-format
6805 msgid "unknown object type %d"
6806 msgstr "未知对象类型 %d"
6807
6808 #: builtin/index-pack.c:569
6809 msgid "cannot pread pack file"
6810 msgstr "无法读取包文件"
6811
6812 #: builtin/index-pack.c:571
6813 #, c-format
6814 msgid "premature end of pack file, %lu byte missing"
6815 msgid_plural "premature end of pack file, %lu bytes missing"
6816 msgstr[0] "包文件过早结束，缺少 %lu 字节"
6817 msgstr[1] "包文件过早结束，缺少 %lu 字节"
6818
6819 #: builtin/index-pack.c:597
6820 msgid "serious inflate inconsistency"
6821 msgstr "解压缩严重的不一致"
6822
6823 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6824 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6825 #, c-format
6826 msgid "SHA1 COLLISION FOUND WITH %s !"
6827 msgstr "发现 %s 出现 SHA1 冲突！"
6828
6829 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6830 #: builtin/pack-objects.c:254
6831 #, c-format
6832 msgid "unable to read %s"
6833 msgstr "不能读 %s"
6834
6835 #: builtin/index-pack.c:812
6836 #, c-format
6837 msgid "cannot read existing object %s"
6838 msgstr "不能读取现存对象 %s"
6839
6840 #: builtin/index-pack.c:826
6841 #, c-format
6842 msgid "invalid blob object %s"
6843 msgstr "无效的数据对象 %s"
6844
6845 #: builtin/index-pack.c:840
6846 #, c-format
6847 msgid "invalid %s"
6848 msgstr "无效的 %s"
6849
6850 #: builtin/index-pack.c:843
6851 msgid "Error in object"
6852 msgstr "对象中出错"
6853
6854 #: builtin/index-pack.c:845
6855 #, c-format
6856 msgid "Not all child objects of %s are reachable"
6857 msgstr "%s 的所有子对象并非都可达"
6858
6859 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6860 msgid "failed to apply delta"
6861 msgstr "无法应用 delta"
6862
6863 #: builtin/index-pack.c:1118
6864 msgid "Receiving objects"
6865 msgstr "接收对象中"
6866
6867 #: builtin/index-pack.c:1118
6868 msgid "Indexing objects"
6869 msgstr "索引对象中"
6870
6871 #: builtin/index-pack.c:1150
6872 msgid "pack is corrupted (SHA1 mismatch)"
6873 msgstr "包冲突（SHA1 不匹配）"
6874
6875 #: builtin/index-pack.c:1155
6876 msgid "cannot fstat packfile"
6877 msgstr "不能枚举包文件状态"
6878
6879 #: builtin/index-pack.c:1158
6880 msgid "pack has junk at the end"
6881 msgstr "包的结尾有垃圾数据"
6882
6883 #: builtin/index-pack.c:1169
6884 msgid "confusion beyond insanity in parse_pack_objects()"
6885 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6886
6887 #: builtin/index-pack.c:1194
6888 msgid "Resolving deltas"
6889 msgstr "处理 delta 中"
6890
6891 #: builtin/index-pack.c:1205
6892 #, c-format
6893 msgid "unable to create thread: %s"
6894 msgstr "不能创建线程：%s"
6895
6896 #: builtin/index-pack.c:1247
6897 msgid "confusion beyond insanity"
6898 msgstr "不可理喻"
6899
6900 #: builtin/index-pack.c:1253
6901 #, c-format
6902 msgid "completed with %d local objects"
6903 msgstr "完成 %d 个本地对象"
6904
6905 #: builtin/index-pack.c:1263
6906 #, c-format
6907 msgid "Unexpected tail checksum for %s (disk corruption?)"
6908 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
6909
6910 #: builtin/index-pack.c:1267
6911 #, c-format
6912 msgid "pack has %d unresolved delta"
6913 msgid_plural "pack has %d unresolved deltas"
6914 msgstr[0] "包有 %d 个未解决的 delta"
6915 msgstr[1] "包有 %d 个未解决的 delta"
6916
6917 #: builtin/index-pack.c:1291
6918 #, c-format
6919 msgid "unable to deflate appended object (%d)"
6920 msgstr "不能压缩附加对象（%d）"
6921
6922 #: builtin/index-pack.c:1367
6923 #, c-format
6924 msgid "local object %s is corrupt"
6925 msgstr "本地对象 %s 已损坏"
6926
6927 #: builtin/index-pack.c:1391
6928 msgid "error while closing pack file"
6929 msgstr "关闭包文件时出错"
6930
6931 #: builtin/index-pack.c:1404
6932 #, c-format
6933 msgid "cannot write keep file '%s'"
6934 msgstr "无法写保留文件 '%s'"
6935
6936 #: builtin/index-pack.c:1412
6937 #, c-format
6938 msgid "cannot close written keep file '%s'"
6939 msgstr "无法关闭保留文件 '%s'"
6940
6941 #: builtin/index-pack.c:1425
6942 msgid "cannot store pack file"
6943 msgstr "无法存储包文件"
6944
6945 #: builtin/index-pack.c:1436
6946 msgid "cannot store index file"
6947 msgstr "无法存储索引文件"
6948
6949 #: builtin/index-pack.c:1469
6950 #, c-format
6951 msgid "bad pack.indexversion=%<PRIu32>"
6952 msgstr "坏的 pack.indexversion=%<PRIu32>"
6953
6954 #: builtin/index-pack.c:1475
6955 #, c-format
6956 msgid "invalid number of threads specified (%d)"
6957 msgstr "指定的线程数无效（%d）"
6958
6959 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6960 #, c-format
6961 msgid "no threads support, ignoring %s"
6962 msgstr "没有线程支持，忽略 %s"
6963
6964 #: builtin/index-pack.c:1537
6965 #, c-format
6966 msgid "Cannot open existing pack file '%s'"
6967 msgstr "无法打开现存包文件 '%s'"
6968
6969 #: builtin/index-pack.c:1539
6970 #, c-format
6971 msgid "Cannot open existing pack idx file for '%s'"
6972 msgstr "无法为 %s 打开包索引文件"
6973
6974 #: builtin/index-pack.c:1586
6975 #, c-format
6976 msgid "non delta: %d object"
6977 msgid_plural "non delta: %d objects"
6978 msgstr[0] "非 delta：%d 个对象"
6979 msgstr[1] "非 delta：%d 个对象"
6980
6981 #: builtin/index-pack.c:1593
6982 #, c-format
6983 msgid "chain length = %d: %lu object"
6984 msgid_plural "chain length = %d: %lu objects"
6985 msgstr[0] "链长 = %d: %lu 对象"
6986 msgstr[1] "链长 = %d: %lu 对象"
6987
6988 #: builtin/index-pack.c:1623
6989 msgid "Cannot come back to cwd"
6990 msgstr "无法返回当前工作目录"
6991
6992 #: builtin/index-pack.c:1675 builtin/index-pack.c:1678
6993 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694
6994 #, c-format
6995 msgid "bad %s"
6996 msgstr "错误选项 %s"
6997
6998 #: builtin/index-pack.c:1708
6999 msgid "--fix-thin cannot be used without --stdin"
7000 msgstr "--fix-thin 不能和 --stdin 同时使用"
7001
7002 #: builtin/index-pack.c:1712 builtin/index-pack.c:1721
7003 #, c-format
7004 msgid "packfile name '%s' does not end with '.pack'"
7005 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7006
7007 #: builtin/index-pack.c:1729
7008 msgid "--verify with no packfile name given"
7009 msgstr "--verify 没有提供包文件名参数"
7010
7011 #: builtin/init-db.c:55
7012 #, c-format
7013 msgid "cannot stat '%s'"
7014 msgstr "不能枚举 '%s' 状态"
7015
7016 #: builtin/init-db.c:61
7017 #, c-format
7018 msgid "cannot stat template '%s'"
7019 msgstr "不能枚举模版 '%s' 状态"
7020
7021 #: builtin/init-db.c:66
7022 #, c-format
7023 msgid "cannot opendir '%s'"
7024 msgstr "不能打开目录 '%s'"
7025
7026 #: builtin/init-db.c:77
7027 #, c-format
7028 msgid "cannot readlink '%s'"
7029 msgstr "不能读取链接 '%s'"
7030
7031 #: builtin/init-db.c:79
7032 #, c-format
7033 msgid "cannot symlink '%s' '%s'"
7034 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7035
7036 #: builtin/init-db.c:85
7037 #, c-format
7038 msgid "cannot copy '%s' to '%s'"
7039 msgstr "不能拷贝 '%s' 至 '%s'"
7040
7041 #: builtin/init-db.c:89
7042 #, c-format
7043 msgid "ignoring template %s"
7044 msgstr "忽略模版 %s"
7045
7046 #: builtin/init-db.c:118
7047 #, c-format
7048 msgid "templates not found %s"
7049 msgstr "模版未找到 %s"
7050
7051 #: builtin/init-db.c:131
7052 #, c-format
7053 msgid "not copying templates of a wrong format version %d from '%s'"
7054 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7055
7056 #: builtin/init-db.c:309 builtin/init-db.c:312
7057 #, c-format
7058 msgid "%s already exists"
7059 msgstr "%s 已经存在"
7060
7061 #: builtin/init-db.c:340
7062 #, c-format
7063 msgid "unable to handle file type %d"
7064 msgstr "不能处理 %d 类型的文件"
7065
7066 #: builtin/init-db.c:343
7067 #, c-format
7068 msgid "unable to move %s to %s"
7069 msgstr "不能移动 %s 至 %s"
7070
7071 #. TRANSLATORS: The first '%s' is either "Reinitialized
7072 #. existing" or "Initialized empty", the second " shared" or
7073 #. "", and the last '%s%s' is the verbatim directory name.
7074 #: builtin/init-db.c:399
7075 #, c-format
7076 msgid "%s%s Git repository in %s%s\n"
7077 msgstr "%s%s Git 仓库于 %s%s\n"
7078
7079 #: builtin/init-db.c:400
7080 msgid "Reinitialized existing"
7081 msgstr "重新初始化现存的"
7082
7083 #: builtin/init-db.c:400
7084 msgid "Initialized empty"
7085 msgstr "初始化空的"
7086
7087 #  译者：中文字符串拼接，可删除前导空格
7088 #: builtin/init-db.c:401
7089 msgid " shared"
7090 msgstr "共享"
7091
7092 #: builtin/init-db.c:448
7093 msgid ""
7094 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7095 "shared[=<permissions>]] [<directory>]"
7096 msgstr ""
7097 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7098 "[<目录>]"
7099
7100 #: builtin/init-db.c:471
7101 msgid "permissions"
7102 msgstr "权限"
7103
7104 #: builtin/init-db.c:472
7105 msgid "specify that the git repository is to be shared amongst several users"
7106 msgstr "指定 git 仓库是多个用户之间共享的"
7107
7108 #: builtin/init-db.c:506 builtin/init-db.c:511
7109 #, c-format
7110 msgid "cannot mkdir %s"
7111 msgstr "不能创建目录 %s"
7112
7113 #: builtin/init-db.c:515
7114 #, c-format
7115 msgid "cannot chdir to %s"
7116 msgstr "不能切换目录到 %s"
7117
7118 #: builtin/init-db.c:536
7119 #, c-format
7120 msgid ""
7121 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7122 "dir=<directory>)"
7123 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
7124
7125 #: builtin/init-db.c:564
7126 #, c-format
7127 msgid "Cannot access work tree '%s'"
7128 msgstr "不能访问工作区 '%s'"
7129
7130 #: builtin/interpret-trailers.c:15
7131 msgid ""
7132 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7133 "[<file>...]"
7134 msgstr ""
7135 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7136 ">...]"
7137
7138 #: builtin/interpret-trailers.c:25
7139 msgid "trim empty trailers"
7140 msgstr "删除空签名"
7141
7142 #: builtin/interpret-trailers.c:26
7143 msgid "trailer"
7144 msgstr "签名"
7145
7146 #: builtin/interpret-trailers.c:27
7147 msgid "trailer(s) to add"
7148 msgstr "要添加的签名"
7149
7150 #: builtin/log.c:43
7151 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7152 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7153
7154 #: builtin/log.c:44
7155 msgid "git show [<options>] <object>..."
7156 msgstr "git show [<选项>] <对象>..."
7157
7158 #: builtin/log.c:83
7159 #, c-format
7160 msgid "invalid --decorate option: %s"
7161 msgstr "无效的 --decorate 选项：%s"
7162
7163 #: builtin/log.c:131
7164 msgid "suppress diff output"
7165 msgstr "不显示差异输出"
7166
7167 #: builtin/log.c:132
7168 msgid "show source"
7169 msgstr "显示源"
7170
7171 #: builtin/log.c:133
7172 msgid "Use mail map file"
7173 msgstr "使用邮件映射文件"
7174
7175 #: builtin/log.c:134
7176 msgid "decorate options"
7177 msgstr "修饰选项"
7178
7179 #: builtin/log.c:137
7180 msgid "Process line range n,m in file, counting from 1"
7181 msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
7182
7183 #: builtin/log.c:233
7184 #, c-format
7185 msgid "Final output: %d %s\n"
7186 msgstr "最终输出：%d %s\n"
7187
7188 #: builtin/log.c:465
7189 #, c-format
7190 msgid "git show %s: bad file"
7191 msgstr "git show %s: 损坏的文件"
7192
7193 #: builtin/log.c:479 builtin/log.c:572
7194 #, c-format
7195 msgid "Could not read object %s"
7196 msgstr "不能读取对象 %s"
7197
7198 #: builtin/log.c:596
7199 #, c-format
7200 msgid "Unknown type: %d"
7201 msgstr "未知类型：%d"
7202
7203 #: builtin/log.c:714
7204 msgid "format.headers without value"
7205 msgstr "format.headers 没有值"
7206
7207 #: builtin/log.c:798
7208 msgid "name of output directory is too long"
7209 msgstr "输出目录名太长"
7210
7211 #: builtin/log.c:813
7212 #, c-format
7213 msgid "Cannot open patch file %s"
7214 msgstr "无法打开补丁文件 %s"
7215
7216 #: builtin/log.c:827
7217 msgid "Need exactly one range."
7218 msgstr "只需要一个范围。"
7219
7220 #: builtin/log.c:837
7221 msgid "Not a range."
7222 msgstr "不是一个范围。"
7223
7224 #: builtin/log.c:943
7225 msgid "Cover letter needs email format"
7226 msgstr "信封需要邮件地址格式"
7227
7228 #: builtin/log.c:1022
7229 #, c-format
7230 msgid "insane in-reply-to: %s"
7231 msgstr "不正常的 in-reply-to：%s"
7232
7233 #: builtin/log.c:1050
7234 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7235 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7236
7237 #: builtin/log.c:1095
7238 msgid "Two output directories?"
7239 msgstr "两个输出目录？"
7240
7241 #: builtin/log.c:1211
7242 msgid "use [PATCH n/m] even with a single patch"
7243 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
7244
7245 #: builtin/log.c:1214
7246 msgid "use [PATCH] even with multiple patches"
7247 msgstr "使用 [PATCH]，即使有多个补丁"
7248
7249 #: builtin/log.c:1218
7250 msgid "print patches to standard out"
7251 msgstr "打印补丁到标准输出"
7252
7253 #: builtin/log.c:1220
7254 msgid "generate a cover letter"
7255 msgstr "生成一封附信"
7256
7257 #: builtin/log.c:1222
7258 msgid "use simple number sequence for output file names"
7259 msgstr "使用简单的数字序列作为输出文件名"
7260
7261 #: builtin/log.c:1223
7262 msgid "sfx"
7263 msgstr "后缀"
7264
7265 #: builtin/log.c:1224
7266 msgid "use <sfx> instead of '.patch'"
7267 msgstr "使用 <后缀> 代替 '.patch'"
7268
7269 #: builtin/log.c:1226
7270 msgid "start numbering patches at <n> instead of 1"
7271 msgstr "补丁以 <n> 开始编号，而不是1"
7272
7273 #: builtin/log.c:1228
7274 msgid "mark the series as Nth re-roll"
7275 msgstr "标记补丁系列是第几次重制"
7276
7277 #: builtin/log.c:1230
7278 msgid "Use [<prefix>] instead of [PATCH]"
7279 msgstr "使用 [<前缀>] 代替 [PATCH]"
7280
7281 #: builtin/log.c:1233
7282 msgid "store resulting files in <dir>"
7283 msgstr "把结果文件存储在 <目录>"
7284
7285 #: builtin/log.c:1236
7286 msgid "don't strip/add [PATCH]"
7287 msgstr "不删除/添加 [PATCH]"
7288
7289 #: builtin/log.c:1239
7290 msgid "don't output binary diffs"
7291 msgstr "不输出二进制差异"
7292
7293 #: builtin/log.c:1241
7294 msgid "output all-zero hash in From header"
7295 msgstr "在 From 头信息中输出全为零的哈希值"
7296
7297 #: builtin/log.c:1243
7298 msgid "don't include a patch matching a commit upstream"
7299 msgstr "不包含已在上游提交中的补丁"
7300
7301 #: builtin/log.c:1245
7302 msgid "show patch format instead of default (patch + stat)"
7303 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
7304
7305 #: builtin/log.c:1247
7306 msgid "Messaging"
7307 msgstr "邮件发送"
7308
7309 #: builtin/log.c:1248
7310 msgid "header"
7311 msgstr "header"
7312
7313 #: builtin/log.c:1249
7314 msgid "add email header"
7315 msgstr "添加邮件头"
7316
7317 #: builtin/log.c:1250 builtin/log.c:1252
7318 msgid "email"
7319 msgstr "邮件地址"
7320
7321 #: builtin/log.c:1250
7322 msgid "add To: header"
7323 msgstr "添加收件人"
7324
7325 #: builtin/log.c:1252
7326 msgid "add Cc: header"
7327 msgstr "添加抄送"
7328
7329 #: builtin/log.c:1254
7330 msgid "ident"
7331 msgstr "标识"
7332
7333 #: builtin/log.c:1255
7334 msgid "set From address to <ident> (or committer ident if absent)"
7335 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
7336
7337 #: builtin/log.c:1257
7338 msgid "message-id"
7339 msgstr "邮件标识"
7340
7341 #: builtin/log.c:1258
7342 msgid "make first mail a reply to <message-id>"
7343 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7344
7345 #: builtin/log.c:1259 builtin/log.c:1262
7346 msgid "boundary"
7347 msgstr "边界"
7348
7349 #: builtin/log.c:1260
7350 msgid "attach the patch"
7351 msgstr "附件方式添加补丁"
7352
7353 #: builtin/log.c:1263
7354 msgid "inline the patch"
7355 msgstr "内联显示补丁"
7356
7357 #: builtin/log.c:1267
7358 msgid "enable message threading, styles: shallow, deep"
7359 msgstr "启用邮件线索，风格：浅，深"
7360
7361 #: builtin/log.c:1269
7362 msgid "signature"
7363 msgstr "签名"
7364
7365 #: builtin/log.c:1270
7366 msgid "add a signature"
7367 msgstr "添加一个签名"
7368
7369 #: builtin/log.c:1272
7370 msgid "add a signature from a file"
7371 msgstr "从文件添加一个签名"
7372
7373 #: builtin/log.c:1273
7374 msgid "don't print the patch filenames"
7375 msgstr "不要打印补丁文件名"
7376
7377 #: builtin/log.c:1362
7378 msgid "-n and -k are mutually exclusive."
7379 msgstr "-n 和 -k 互斥。"
7380
7381 #: builtin/log.c:1364
7382 msgid "--subject-prefix and -k are mutually exclusive."
7383 msgstr "--subject-prefix 和 -k 互斥。"
7384
7385 #: builtin/log.c:1372
7386 msgid "--name-only does not make sense"
7387 msgstr "--name-only 无意义"
7388
7389 #: builtin/log.c:1374
7390 msgid "--name-status does not make sense"
7391 msgstr "--name-status 无意义"
7392
7393 #: builtin/log.c:1376
7394 msgid "--check does not make sense"
7395 msgstr "--check 无意义"
7396
7397 #: builtin/log.c:1401
7398 msgid "standard output, or directory, which one?"
7399 msgstr "标准输出或目录，哪一个？"
7400
7401 #: builtin/log.c:1403
7402 #, c-format
7403 msgid "Could not create directory '%s'"
7404 msgstr "不能创建目录 '%s'"
7405
7406 #: builtin/log.c:1500
7407 #, c-format
7408 msgid "unable to read signature file '%s'"
7409 msgstr "无法读取签名文件 '%s'"
7410
7411 #: builtin/log.c:1563
7412 msgid "Failed to create output files"
7413 msgstr "无法创建输出文件"
7414
7415 #: builtin/log.c:1611
7416 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7417 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7418
7419 #: builtin/log.c:1665
7420 #, c-format
7421 msgid ""
7422 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7423 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
7424
7425 #: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
7426 #, c-format
7427 msgid "Unknown commit %s"
7428 msgstr "未知提交 %s"
7429
7430 #: builtin/ls-files.c:358
7431 msgid "git ls-files [<options>] [<file>...]"
7432 msgstr "git ls-files [<选项>] [<文件>...]"
7433
7434 #: builtin/ls-files.c:415
7435 msgid "identify the file status with tags"
7436 msgstr "用标签标识文件的状态"
7437
7438 #: builtin/ls-files.c:417
7439 msgid "use lowercase letters for 'assume unchanged' files"
7440 msgstr "使用小写字母表示 '假设未改变的' 文件"
7441
7442 #: builtin/ls-files.c:419
7443 msgid "show cached files in the output (default)"
7444 msgstr "显示缓存的文件（默认）"
7445
7446 #: builtin/ls-files.c:421
7447 msgid "show deleted files in the output"
7448 msgstr "显示已删除的文件"
7449
7450 #: builtin/ls-files.c:423
7451 msgid "show modified files in the output"
7452 msgstr "显示已修改的文件"
7453
7454 #: builtin/ls-files.c:425
7455 msgid "show other files in the output"
7456 msgstr "显示其它文件"
7457
7458 #: builtin/ls-files.c:427
7459 msgid "show ignored files in the output"
7460 msgstr "显示忽略的文件"
7461
7462 #: builtin/ls-files.c:430
7463 msgid "show staged contents' object name in the output"
7464 msgstr "显示暂存区内容的对象名称"
7465
7466 #: builtin/ls-files.c:432
7467 msgid "show files on the filesystem that need to be removed"
7468 msgstr "显示文件系统需要删除的文件"
7469
7470 #: builtin/ls-files.c:434
7471 msgid "show 'other' directories' names only"
7472 msgstr "只显示“其他”目录的名称"
7473
7474 #: builtin/ls-files.c:437
7475 msgid "don't show empty directories"
7476 msgstr "不显示空目录"
7477
7478 #: builtin/ls-files.c:440
7479 msgid "show unmerged files in the output"
7480 msgstr "显示未合并的文件"
7481
7482 #: builtin/ls-files.c:442
7483 msgid "show resolve-undo information"
7484 msgstr "显示 resolve-undo 信息"
7485
7486 #: builtin/ls-files.c:444
7487 msgid "skip files matching pattern"
7488 msgstr "匹配排除文件的模式"
7489
7490 #: builtin/ls-files.c:447
7491 msgid "exclude patterns are read from <file>"
7492 msgstr "从 <文件> 中读取排除模式"
7493
7494 #: builtin/ls-files.c:450
7495 msgid "read additional per-directory exclude patterns in <file>"
7496 msgstr "从 <文件> 读取额外的每个目录的排除模式"
7497
7498 #: builtin/ls-files.c:452
7499 msgid "add the standard git exclusions"
7500 msgstr "添加标准的 git 排除"
7501
7502 #: builtin/ls-files.c:455
7503 msgid "make the output relative to the project top directory"
7504 msgstr "显示相对于顶级目录的文件名"
7505
7506 #: builtin/ls-files.c:458
7507 msgid "if any <file> is not in the index, treat this as an error"
7508 msgstr "如果任何 <文件> 都不在索引区，视为错误"
7509
7510 #: builtin/ls-files.c:459
7511 msgid "tree-ish"
7512 msgstr "树或提交"
7513
7514 #: builtin/ls-files.c:460
7515 msgid "pretend that paths removed since <tree-ish> are still present"
7516 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7517
7518 #: builtin/ls-files.c:462
7519 msgid "show debugging data"
7520 msgstr "显示调试数据"
7521
7522 #: builtin/ls-tree.c:28
7523 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7524 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7525
7526 #: builtin/ls-tree.c:128
7527 msgid "only show trees"
7528 msgstr "只显示树"
7529
7530 #: builtin/ls-tree.c:130
7531 msgid "recurse into subtrees"
7532 msgstr "递归到子树"
7533
7534 #: builtin/ls-tree.c:132
7535 msgid "show trees when recursing"
7536 msgstr "当递归时显示树"
7537
7538 #: builtin/ls-tree.c:135
7539 msgid "terminate entries with NUL byte"
7540 msgstr "条目以 NUL 字符终止"
7541
7542 #: builtin/ls-tree.c:136
7543 msgid "include object size"
7544 msgstr "包括对象大小"
7545
7546 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7547 msgid "list only filenames"
7548 msgstr "只列出文件名"
7549
7550 #: builtin/ls-tree.c:143
7551 msgid "use full path names"
7552 msgstr "使用文件的全路径"
7553
7554 #: builtin/ls-tree.c:145
7555 msgid "list entire tree; not just current directory (implies --full-name)"
7556 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
7557
7558 #: builtin/merge.c:45
7559 msgid "git merge [<options>] [<commit>...]"
7560 msgstr "git merge [<选项>] [<提交>...]"
7561
7562 #: builtin/merge.c:46
7563 msgid "git merge [<options>] <msg> HEAD <commit>"
7564 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7565
7566 #: builtin/merge.c:47
7567 msgid "git merge --abort"
7568 msgstr "git merge --abort"
7569
7570 #: builtin/merge.c:100
7571 msgid "switch `m' requires a value"
7572 msgstr "开关 `m' 需要一个值"
7573
7574 #: builtin/merge.c:137
7575 #, c-format
7576 msgid "Could not find merge strategy '%s'.\n"
7577 msgstr "不能找到合并策略 '%s'。\n"
7578
7579 #: builtin/merge.c:138
7580 #, c-format
7581 msgid "Available strategies are:"
7582 msgstr "可用的策略有："
7583
7584 #: builtin/merge.c:143
7585 #, c-format
7586 msgid "Available custom strategies are:"
7587 msgstr "可用的自定义策略有："
7588
7589 #: builtin/merge.c:193 builtin/pull.c:119
7590 msgid "do not show a diffstat at the end of the merge"
7591 msgstr "在合并的最后不显示差异统计"
7592
7593 #: builtin/merge.c:196 builtin/pull.c:122
7594 msgid "show a diffstat at the end of the merge"
7595 msgstr "在合并的最后显示差异统计"
7596
7597 #: builtin/merge.c:197 builtin/pull.c:125
7598 msgid "(synonym to --stat)"
7599 msgstr "（和 --stat 同义）"
7600
7601 #: builtin/merge.c:199 builtin/pull.c:128
7602 msgid "add (at most <n>) entries from shortlog to merge commit message"
7603 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
7604
7605 #: builtin/merge.c:202 builtin/pull.c:131
7606 msgid "create a single commit instead of doing a merge"
7607 msgstr "创建一个单独的提交而不是做一次合并"
7608
7609 #: builtin/merge.c:204 builtin/pull.c:134
7610 msgid "perform a commit if the merge succeeds (default)"
7611 msgstr "如果合并成功，执行一次提交（默认）"
7612
7613 #: builtin/merge.c:206 builtin/pull.c:137
7614 msgid "edit message before committing"
7615 msgstr "在提交前编辑提交说明"
7616
7617 #: builtin/merge.c:207
7618 msgid "allow fast-forward (default)"
7619 msgstr "允许快进（默认）"
7620
7621 #: builtin/merge.c:209 builtin/pull.c:143
7622 msgid "abort if fast-forward is not possible"
7623 msgstr "如果不能快进就放弃合并"
7624
7625 #: builtin/merge.c:213
7626 msgid "Verify that the named commit has a valid GPG signature"
7627 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7628
7629 #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7630 #: builtin/revert.c:89
7631 msgid "strategy"
7632 msgstr "策略"
7633
7634 #: builtin/merge.c:215 builtin/pull.c:149
7635 msgid "merge strategy to use"
7636 msgstr "要使用的合并策略"
7637
7638 #: builtin/merge.c:216 builtin/pull.c:152
7639 msgid "option=value"
7640 msgstr "option=value"
7641
7642 #: builtin/merge.c:217 builtin/pull.c:153
7643 msgid "option for selected merge strategy"
7644 msgstr "所选的合并策略的选项"
7645
7646 #: builtin/merge.c:219
7647 msgid "merge commit message (for a non-fast-forward merge)"
7648 msgstr "合并的提交说明（针对非快进式合并）"
7649
7650 #: builtin/merge.c:223
7651 msgid "abort the current in-progress merge"
7652 msgstr "放弃当前正在进行的合并"
7653
7654 #: builtin/merge.c:251
7655 msgid "could not run stash."
7656 msgstr "不能进行进度保存。"
7657
7658 #: builtin/merge.c:256
7659 msgid "stash failed"
7660 msgstr "进度保存失败"
7661
7662 #: builtin/merge.c:261
7663 #, c-format
7664 msgid "not a valid object: %s"
7665 msgstr "不是一个有效对象：%s"
7666
7667 #: builtin/merge.c:280 builtin/merge.c:297
7668 msgid "read-tree failed"
7669 msgstr "读取树失败"
7670
7671 #  译者：注意保持前导空格
7672 #: builtin/merge.c:327
7673 msgid " (nothing to squash)"
7674 msgstr " （无可压缩）"
7675
7676 #: builtin/merge.c:340
7677 #, c-format
7678 msgid "Squash commit -- not updating HEAD\n"
7679 msgstr "压缩提交 -- 未更新 HEAD\n"
7680
7681 #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7682 #: builtin/merge.c:988
7683 #, c-format
7684 msgid "Could not write to '%s'"
7685 msgstr "不能写入 '%s'"
7686
7687 #: builtin/merge.c:372
7688 msgid "Writing SQUASH_MSG"
7689 msgstr "写入 SQUASH_MSG"
7690
7691 #: builtin/merge.c:374
7692 msgid "Finishing SQUASH_MSG"
7693 msgstr "完成 SQUASH_MSG"
7694
7695 #: builtin/merge.c:397
7696 #, c-format
7697 msgid "No merge message -- not updating HEAD\n"
7698 msgstr "无合并信息 -- 未更新 HEAD\n"
7699
7700 #: builtin/merge.c:447
7701 #, c-format
7702 msgid "'%s' does not point to a commit"
7703 msgstr "'%s' 没有指向一个提交"
7704
7705 #: builtin/merge.c:537
7706 #, c-format
7707 msgid "Bad branch.%s.mergeoptions string: %s"
7708 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
7709
7710 #: builtin/merge.c:656
7711 msgid "Not handling anything other than two heads merge."
7712 msgstr "不能处理两个头合并之外的任何操作。"
7713
7714 #: builtin/merge.c:670
7715 #, c-format
7716 msgid "Unknown option for merge-recursive: -X%s"
7717 msgstr "merge-recursive 的未知选项：-X%s"
7718
7719 #: builtin/merge.c:683
7720 #, c-format
7721 msgid "unable to write %s"
7722 msgstr "不能写 %s"
7723
7724 #: builtin/merge.c:772
7725 #, c-format
7726 msgid "Could not read from '%s'"
7727 msgstr "不能从 '%s' 读取"
7728
7729 #: builtin/merge.c:781
7730 #, c-format
7731 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7732 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
7733
7734 #: builtin/merge.c:787
7735 #, c-format
7736 msgid ""
7737 "Please enter a commit message to explain why this merge is necessary,\n"
7738 "especially if it merges an updated upstream into a topic branch.\n"
7739 "\n"
7740 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7741 "the commit.\n"
7742 msgstr ""
7743 "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
7744 "合并到主题分支。\n"
7745 "\n"
7746 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
7747
7748 #: builtin/merge.c:811
7749 msgid "Empty commit message."
7750 msgstr "空提交信息。"
7751
7752 #: builtin/merge.c:823
7753 #, c-format
7754 msgid "Wonderful.\n"
7755 msgstr "太棒了。\n"
7756
7757 #: builtin/merge.c:878
7758 #, c-format
7759 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7760 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
7761
7762 #: builtin/merge.c:894
7763 #, c-format
7764 msgid "'%s' is not a commit"
7765 msgstr "'%s' 不是一个提交"
7766
7767 #: builtin/merge.c:935
7768 msgid "No current branch."
7769 msgstr "没有当前分支。"
7770
7771 #: builtin/merge.c:937
7772 msgid "No remote for the current branch."
7773 msgstr "当前分支没有对应的远程仓库。"
7774
7775 #: builtin/merge.c:939
7776 msgid "No default upstream defined for the current branch."
7777 msgstr "当前分支没有定义默认的上游分支。"
7778
7779 #: builtin/merge.c:944
7780 #, c-format
7781 msgid "No remote-tracking branch for %s from %s"
7782 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7783
7784 #: builtin/merge.c:1079
7785 #, c-format
7786 msgid "could not close '%s'"
7787 msgstr "不能关闭 '%s'"
7788
7789 #: builtin/merge.c:1206
7790 msgid "There is no merge to abort (MERGE_HEAD missing)."
7791 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
7792
7793 #: builtin/merge.c:1222
7794 msgid ""
7795 "You have not concluded your merge (MERGE_HEAD exists).\n"
7796 "Please, commit your changes before you merge."
7797 msgstr ""
7798 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
7799 "请在合并前先提交您的修改。"
7800
7801 #: builtin/merge.c:1229
7802 msgid ""
7803 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7804 "Please, commit your changes before you merge."
7805 msgstr ""
7806 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
7807 "请在合并前先提交您的修改。"
7808
7809 #: builtin/merge.c:1232
7810 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7811 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
7812
7813 #: builtin/merge.c:1241
7814 msgid "You cannot combine --squash with --no-ff."
7815 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7816
7817 #: builtin/merge.c:1249
7818 msgid "No commit specified and merge.defaultToUpstream not set."
7819 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7820
7821 #: builtin/merge.c:1266
7822 msgid "Squash commit into empty head not supported yet"
7823 msgstr "尚不支持到空分支的压缩提交"
7824
7825 #: builtin/merge.c:1268
7826 msgid "Non-fast-forward commit does not make sense into an empty head"
7827 msgstr "到空分支的非快进式提交没有意义"
7828
7829 #: builtin/merge.c:1274
7830 #, c-format
7831 msgid "%s - not something we can merge"
7832 msgstr "%s - 不能被合并"
7833
7834 #: builtin/merge.c:1276
7835 msgid "Can merge only exactly one commit into empty head"
7836 msgstr "只能将一个提交合并到空分支上"
7837
7838 #: builtin/merge.c:1331
7839 #, c-format
7840 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7841 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7842
7843 #: builtin/merge.c:1334
7844 #, c-format
7845 msgid "Commit %s has a bad GPG signature allegedly by %s."
7846 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7847
7848 #: builtin/merge.c:1337
7849 #, c-format
7850 msgid "Commit %s does not have a GPG signature."
7851 msgstr "提交 %s 没有一个 GPG 签名。"
7852
7853 #: builtin/merge.c:1340
7854 #, c-format
7855 msgid "Commit %s has a good GPG signature by %s\n"
7856 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7857
7858 #: builtin/merge.c:1423
7859 #, c-format
7860 msgid "Updating %s..%s\n"
7861 msgstr "更新 %s..%s\n"
7862
7863 #: builtin/merge.c:1460
7864 #, c-format
7865 msgid "Trying really trivial in-index merge...\n"
7866 msgstr "尝试非常小的索引内合并...\n"
7867
7868 #: builtin/merge.c:1467
7869 #, c-format
7870 msgid "Nope.\n"
7871 msgstr "无。\n"
7872
7873 #: builtin/merge.c:1499
7874 msgid "Not possible to fast-forward, aborting."
7875 msgstr "无法快进，终止。"
7876
7877 #: builtin/merge.c:1522 builtin/merge.c:1601
7878 #, c-format
7879 msgid "Rewinding the tree to pristine...\n"
7880 msgstr "将树回滚至原始状态...\n"
7881
7882 #: builtin/merge.c:1526
7883 #, c-format
7884 msgid "Trying merge strategy %s...\n"
7885 msgstr "尝试合并策略 %s...\n"
7886
7887 #: builtin/merge.c:1592
7888 #, c-format
7889 msgid "No merge strategy handled the merge.\n"
7890 msgstr "没有合并策略处理此合并。\n"
7891
7892 #: builtin/merge.c:1594
7893 #, c-format
7894 msgid "Merge with strategy %s failed.\n"
7895 msgstr "使用策略 %s 合并失败。\n"
7896
7897 #: builtin/merge.c:1603
7898 #, c-format
7899 msgid "Using the %s to prepare resolving by hand.\n"
7900 msgstr "使用 %s 以准备手工解决。\n"
7901
7902 #: builtin/merge.c:1615
7903 #, c-format
7904 msgid "Automatic merge went well; stopped before committing as requested\n"
7905 msgstr "自动合并进展顺利，按要求在提交前停止\n"
7906
7907 #: builtin/merge-base.c:29
7908 msgid "git merge-base [-a | --all] <commit> <commit>..."
7909 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7910
7911 #: builtin/merge-base.c:30
7912 msgid "git merge-base [-a | --all] --octopus <commit>..."
7913 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7914
7915 #: builtin/merge-base.c:31
7916 msgid "git merge-base --independent <commit>..."
7917 msgstr "git merge-base --independent <提交>..."
7918
7919 #: builtin/merge-base.c:32
7920 msgid "git merge-base --is-ancestor <commit> <commit>"
7921 msgstr "git merge-base --is-ancestor <提交> <提交>"
7922
7923 #: builtin/merge-base.c:33
7924 msgid "git merge-base --fork-point <ref> [<commit>]"
7925 msgstr "git merge-base --fork-point <引用> [<提交>]"
7926
7927 #: builtin/merge-base.c:214
7928 msgid "output all common ancestors"
7929 msgstr "输出所有共同的祖先"
7930
7931 #: builtin/merge-base.c:216
7932 msgid "find ancestors for a single n-way merge"
7933 msgstr "查找一个多路合并的祖先提交"
7934
7935 #: builtin/merge-base.c:218
7936 msgid "list revs not reachable from others"
7937 msgstr "显示不能被其他访问到的版本"
7938
7939 #: builtin/merge-base.c:220
7940 msgid "is the first one ancestor of the other?"
7941 msgstr "第一个是其他的祖先提交么？"
7942
7943 #: builtin/merge-base.c:222
7944 msgid "find where <commit> forked from reflog of <ref>"
7945 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7946
7947 #: builtin/merge-file.c:8
7948 msgid ""
7949 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7950 "<orig-file> <file2>"
7951 msgstr ""
7952 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7953 "件> <文件2>"
7954
7955 #: builtin/merge-file.c:33
7956 msgid "send results to standard output"
7957 msgstr "将结果发送到标准输出"
7958
7959 #: builtin/merge-file.c:34
7960 msgid "use a diff3 based merge"
7961 msgstr "使用基于 diff3 的合并"
7962
7963 #: builtin/merge-file.c:35
7964 msgid "for conflicts, use our version"
7965 msgstr "如果冲突，使用我们的版本"
7966
7967 #: builtin/merge-file.c:37
7968 msgid "for conflicts, use their version"
7969 msgstr "如果冲突，使用他们的版本"
7970
7971 #: builtin/merge-file.c:39
7972 msgid "for conflicts, use a union version"
7973 msgstr "如果冲突，使用联合版本"
7974
7975 #: builtin/merge-file.c:42
7976 msgid "for conflicts, use this marker size"
7977 msgstr "如果冲突，使用指定长度的标记"
7978
7979 #: builtin/merge-file.c:43
7980 msgid "do not warn about conflicts"
7981 msgstr "不要警告冲突"
7982
7983 #: builtin/merge-file.c:45
7984 msgid "set labels for file1/orig-file/file2"
7985 msgstr "为 文件1/初始文件/文件2 设置标签"
7986
7987 #: builtin/mktree.c:64
7988 msgid "git mktree [-z] [--missing] [--batch]"
7989 msgstr "git mktree [-z] [--missing] [--batch]"
7990
7991 #: builtin/mktree.c:150
7992 msgid "input is NUL terminated"
7993 msgstr "输入以 NUL 字符终止"
7994
7995 #: builtin/mktree.c:151 builtin/write-tree.c:24
7996 msgid "allow missing objects"
7997 msgstr "允许丢失的对象"
7998
7999 #: builtin/mktree.c:152
8000 msgid "allow creation of more than one tree"
8001 msgstr "允许创建一个以上的树"
8002
8003 #: builtin/mv.c:15
8004 msgid "git mv [<options>] <source>... <destination>"
8005 msgstr "git mv [<选项>] <源>... <目标>"
8006
8007 #: builtin/mv.c:69
8008 #, c-format
8009 msgid "Directory %s is in index and no submodule?"
8010 msgstr "目录 %s 在索引中并且不是子模组？"
8011
8012 #: builtin/mv.c:71
8013 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8014 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8015
8016 #: builtin/mv.c:89
8017 #, c-format
8018 msgid "%.*s is in index"
8019 msgstr "%.*s 在索引中"
8020
8021 #: builtin/mv.c:111
8022 msgid "force move/rename even if target exists"
8023 msgstr "强制移动/重命令，即使目标存在"
8024
8025 #: builtin/mv.c:112
8026 msgid "skip move/rename errors"
8027 msgstr "跳过移动/重命名错误"
8028
8029 #: builtin/mv.c:151
8030 #, c-format
8031 msgid "destination '%s' is not a directory"
8032 msgstr "目标 '%s' 不是一个目录"
8033
8034 #: builtin/mv.c:162
8035 #, c-format
8036 msgid "Checking rename of '%s' to '%s'\n"
8037 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8038
8039 #: builtin/mv.c:166
8040 msgid "bad source"
8041 msgstr "坏的源"
8042
8043 #: builtin/mv.c:169
8044 msgid "can not move directory into itself"
8045 msgstr "不能将目录移动到自身"
8046
8047 #: builtin/mv.c:172
8048 msgid "cannot move directory over file"
8049 msgstr "不能将目录移动到文件"
8050
8051 #: builtin/mv.c:181
8052 msgid "source directory is empty"
8053 msgstr "源目录为空"
8054
8055 #: builtin/mv.c:206
8056 msgid "not under version control"
8057 msgstr "不在版本控制之下"
8058
8059 #: builtin/mv.c:209
8060 msgid "destination exists"
8061 msgstr "目标已存在"
8062
8063 #: builtin/mv.c:217
8064 #, c-format
8065 msgid "overwriting '%s'"
8066 msgstr "覆盖 '%s'"
8067
8068 #: builtin/mv.c:220
8069 msgid "Cannot overwrite"
8070 msgstr "不能覆盖"
8071
8072 #: builtin/mv.c:223
8073 msgid "multiple sources for the same target"
8074 msgstr "同一目标具有多个源"
8075
8076 #: builtin/mv.c:225
8077 msgid "destination directory does not exist"
8078 msgstr "目标目录不存在"
8079
8080 #: builtin/mv.c:232
8081 #, c-format
8082 msgid "%s, source=%s, destination=%s"
8083 msgstr "%s，源=%s，目标=%s"
8084
8085 #: builtin/mv.c:253
8086 #, c-format
8087 msgid "Renaming %s to %s\n"
8088 msgstr "重命名 %s 至 %s\n"
8089
8090 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
8091 #, c-format
8092 msgid "renaming '%s' failed"
8093 msgstr "重命名 '%s' 失败"
8094
8095 #: builtin/name-rev.c:251
8096 msgid "git name-rev [<options>] <commit>..."
8097 msgstr "git name-rev [<选项>] <提交>..."
8098
8099 #: builtin/name-rev.c:252
8100 msgid "git name-rev [<options>] --all"
8101 msgstr "git name-rev [<选项>] --all"
8102
8103 #: builtin/name-rev.c:253
8104 msgid "git name-rev [<options>] --stdin"
8105 msgstr "git name-rev [<选项>] --stdin"
8106
8107 #: builtin/name-rev.c:305
8108 msgid "print only names (no SHA-1)"
8109 msgstr "只打印名称（无 SHA-1）"
8110
8111 #: builtin/name-rev.c:306
8112 msgid "only use tags to name the commits"
8113 msgstr "只使用标签来命名提交"
8114
8115 #: builtin/name-rev.c:308
8116 msgid "only use refs matching <pattern>"
8117 msgstr "只使用和 <模式> 相匹配的引用"
8118
8119 #: builtin/name-rev.c:310
8120 msgid "list all commits reachable from all refs"
8121 msgstr "列出可以从所有引用访问的提交"
8122
8123 #: builtin/name-rev.c:311
8124 msgid "read from stdin"
8125 msgstr "从标准输入读取"
8126
8127 #: builtin/name-rev.c:312
8128 msgid "allow to print `undefined` names (default)"
8129 msgstr "允许打印 `未定义` 的名称（默认）"
8130
8131 #: builtin/name-rev.c:318
8132 msgid "dereference tags in the input (internal use)"
8133 msgstr "反向解析输入中的标签（内部使用）"
8134
8135 #: builtin/notes.c:25
8136 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8137 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8138
8139 #: builtin/notes.c:26
8140 msgid ""
8141 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8142 "| (-c | -C) <object>] [<object>]"
8143 msgstr ""
8144 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8145 "| (-c | -C) <对象>] [<对象>]"
8146
8147 #: builtin/notes.c:27
8148 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8149 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8150
8151 #: builtin/notes.c:28
8152 msgid ""
8153 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8154 "(-c | -C) <object>] [<object>]"
8155 msgstr ""
8156 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8157 "(-c | -C) <对象>] [<对象>]"
8158
8159 #: builtin/notes.c:29
8160 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8161 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8162
8163 #: builtin/notes.c:30
8164 msgid "git notes [--ref <notes-ref>] show [<object>]"
8165 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8166
8167 #: builtin/notes.c:31
8168 msgid ""
8169 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8170 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8171
8172 #: builtin/notes.c:32
8173 msgid "git notes merge --commit [-v | -q]"
8174 msgstr "git notes merge --commit [-v | -q]"
8175
8176 #: builtin/notes.c:33
8177 msgid "git notes merge --abort [-v | -q]"
8178 msgstr "git notes merge --abort [-v | -q]"
8179
8180 #: builtin/notes.c:34
8181 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8182 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8183
8184 #: builtin/notes.c:35
8185 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8186 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8187
8188 #: builtin/notes.c:36
8189 msgid "git notes [--ref <notes-ref>] get-ref"
8190 msgstr "git notes [--ref <注解引用>] get-ref"
8191
8192 #: builtin/notes.c:41
8193 msgid "git notes [list [<object>]]"
8194 msgstr "git notes [list [<对象>]]"
8195
8196 #: builtin/notes.c:46
8197 msgid "git notes add [<options>] [<object>]"
8198 msgstr "git notes add [<选项>] [<对象>]"
8199
8200 #: builtin/notes.c:51
8201 msgid "git notes copy [<options>] <from-object> <to-object>"
8202 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8203
8204 #: builtin/notes.c:52
8205 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8206 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8207
8208 #: builtin/notes.c:57
8209 msgid "git notes append [<options>] [<object>]"
8210 msgstr "git notes append [<选项>] [<对象>]"
8211
8212 #: builtin/notes.c:62
8213 msgid "git notes edit [<object>]"
8214 msgstr "git notes edit [<对象>]"
8215
8216 #: builtin/notes.c:67
8217 msgid "git notes show [<object>]"
8218 msgstr "git notes show [<对象>]"
8219
8220 #: builtin/notes.c:72
8221 msgid "git notes merge [<options>] <notes-ref>"
8222 msgstr "git notes merge [<选项>] <注解引用>"
8223
8224 #: builtin/notes.c:73
8225 msgid "git notes merge --commit [<options>]"
8226 msgstr "git notes merge --commit [<选项>]"
8227
8228 #: builtin/notes.c:74
8229 msgid "git notes merge --abort [<options>]"
8230 msgstr "git notes merge --abort [<选项>]"
8231
8232 #: builtin/notes.c:79
8233 msgid "git notes remove [<object>]"
8234 msgstr "git notes remove [<对象>]"
8235
8236 #: builtin/notes.c:84
8237 msgid "git notes prune [<options>]"
8238 msgstr "git notes prune [<选项>]"
8239
8240 #: builtin/notes.c:89
8241 msgid "git notes get-ref"
8242 msgstr "git notes get-ref"
8243
8244 #: builtin/notes.c:147
8245 #, c-format
8246 msgid "unable to start 'show' for object '%s'"
8247 msgstr "不能为对象 '%s' 开始 'show'"
8248
8249 #: builtin/notes.c:151
8250 msgid "could not read 'show' output"
8251 msgstr "不能读取 'show' 的输出"
8252
8253 #: builtin/notes.c:159
8254 #, c-format
8255 msgid "failed to finish 'show' for object '%s'"
8256 msgstr "无法为对象 '%s' 完成 'show'"
8257
8258 #: builtin/notes.c:174 builtin/tag.c:248
8259 #, c-format
8260 msgid "could not create file '%s'"
8261 msgstr "不能创建文件 '%s'"
8262
8263 #: builtin/notes.c:193
8264 msgid "Please supply the note contents using either -m or -F option"
8265 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8266
8267 #: builtin/notes.c:202
8268 msgid "unable to write note object"
8269 msgstr "不能写注解对象"
8270
8271 #: builtin/notes.c:204
8272 #, c-format
8273 msgid "The note contents have been left in %s"
8274 msgstr "注解内容被留在 %s 中"
8275
8276 #: builtin/notes.c:232 builtin/tag.c:440
8277 #, c-format
8278 msgid "cannot read '%s'"
8279 msgstr "不能读取 '%s'"
8280
8281 #: builtin/notes.c:234 builtin/tag.c:443
8282 #, c-format
8283 msgid "could not open or read '%s'"
8284 msgstr "不能打开或读取 '%s'"
8285
8286 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8287 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8288 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
8289 #: builtin/notes.c:877 builtin/tag.c:456
8290 #, c-format
8291 msgid "Failed to resolve '%s' as a valid ref."
8292 msgstr "无法解析 '%s' 为一个有效引用。"
8293
8294 #: builtin/notes.c:256
8295 #, c-format
8296 msgid "Failed to read object '%s'."
8297 msgstr "无法读取对象 '%s'。"
8298
8299 #: builtin/notes.c:260
8300 #, c-format
8301 msgid "Cannot read note data from non-blob object '%s'."
8302 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8303
8304 #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8305 #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8306 #: builtin/notes.c:942
8307 msgid "too many parameters"
8308 msgstr "参数太多"
8309
8310 #: builtin/notes.c:372 builtin/notes.c:659
8311 #, c-format
8312 msgid "No note found for object %s."
8313 msgstr "未发现对象 %s 的注解。"
8314
8315 #: builtin/notes.c:393 builtin/notes.c:556
8316 msgid "note contents as a string"
8317 msgstr "注解内容作为一个字符串"
8318
8319 #: builtin/notes.c:396 builtin/notes.c:559
8320 msgid "note contents in a file"
8321 msgstr "注解内容到一个文件中"
8322
8323 #: builtin/notes.c:399 builtin/notes.c:562
8324 msgid "reuse and edit specified note object"
8325 msgstr "重用和编辑指定的注解对象"
8326
8327 #: builtin/notes.c:402 builtin/notes.c:565
8328 msgid "reuse specified note object"
8329 msgstr "重用指定的注解对象"
8330
8331 #: builtin/notes.c:405 builtin/notes.c:568
8332 msgid "allow storing empty note"
8333 msgstr "允许保存空白注释"
8334
8335 #: builtin/notes.c:406 builtin/notes.c:477
8336 msgid "replace existing notes"
8337 msgstr "替换已存在的注解"
8338
8339 #: builtin/notes.c:431
8340 #, c-format
8341 msgid ""
8342 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8343 "existing notes"
8344 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8345
8346 #: builtin/notes.c:446 builtin/notes.c:525
8347 #, c-format
8348 msgid "Overwriting existing notes for object %s\n"
8349 msgstr "覆盖对象 %s 现存注解\n"
8350
8351 #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
8352 #, c-format
8353 msgid "Removing note for object %s\n"
8354 msgstr "删除对象 %s 的注解\n"
8355
8356 #: builtin/notes.c:478
8357 msgid "read objects from stdin"
8358 msgstr "从标准输入读取对象"
8359
8360 #: builtin/notes.c:480
8361 msgid "load rewriting config for <command> (implies --stdin)"
8362 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
8363
8364 #: builtin/notes.c:498
8365 msgid "too few parameters"
8366 msgstr "参数太少"
8367
8368 #: builtin/notes.c:519
8369 #, c-format
8370 msgid ""
8371 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8372 "existing notes"
8373 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8374
8375 #: builtin/notes.c:531
8376 #, c-format
8377 msgid "Missing notes on source object %s. Cannot copy."
8378 msgstr "源对象 %s 缺少注解。不能拷贝。"
8379
8380 #: builtin/notes.c:583
8381 #, c-format
8382 msgid ""
8383 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8384 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8385 msgstr ""
8386 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8387 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8388
8389 #: builtin/notes.c:764
8390 msgid "General options"
8391 msgstr "通用选项"
8392
8393 #: builtin/notes.c:766
8394 msgid "Merge options"
8395 msgstr "合并选项"
8396
8397 #: builtin/notes.c:768
8398 msgid ""
8399 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8400 "cat_sort_uniq)"
8401 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8402
8403 #: builtin/notes.c:770
8404 msgid "Committing unmerged notes"
8405 msgstr "提交未合并的注解"
8406
8407 #: builtin/notes.c:772
8408 msgid "finalize notes merge by committing unmerged notes"
8409 msgstr "通过提交未合并的注解来完成注解合并"
8410
8411 #: builtin/notes.c:774
8412 msgid "Aborting notes merge resolution"
8413 msgstr "中止注解合并的方案"
8414
8415 #: builtin/notes.c:776
8416 msgid "abort notes merge"
8417 msgstr "中止注解合并"
8418
8419 #: builtin/notes.c:853
8420 #, c-format
8421 msgid "A notes merge into %s is already in-progress at %s"
8422 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8423
8424 #: builtin/notes.c:880
8425 #, c-format
8426 msgid "Object %s has no note\n"
8427 msgstr "对象 %s 没有注解\n"
8428
8429 #: builtin/notes.c:892
8430 msgid "attempt to remove non-existent note is not an error"
8431 msgstr "尝试删除不存在的注解不是一个错误"
8432
8433 #: builtin/notes.c:895
8434 msgid "read object names from the standard input"
8435 msgstr "从标准输入读取对象名称"
8436
8437 #: builtin/notes.c:976
8438 msgid "notes-ref"
8439 msgstr "注解引用"
8440
8441 #: builtin/notes.c:977
8442 msgid "use notes from <notes-ref>"
8443 msgstr "从 <注解引用> 使用注解"
8444
8445 #: builtin/notes.c:1012 builtin/remote.c:1647
8446 #, c-format
8447 msgid "Unknown subcommand: %s"
8448 msgstr "未知子命令：%s"
8449
8450 #: builtin/pack-objects.c:28
8451 msgid ""
8452 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8453 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8454
8455 #: builtin/pack-objects.c:29
8456 msgid ""
8457 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8458 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8459
8460 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8461 #, c-format
8462 msgid "deflate error (%d)"
8463 msgstr "压缩错误 (%d)"
8464
8465 #: builtin/pack-objects.c:771
8466 msgid "Writing objects"
8467 msgstr "写入对象中"
8468
8469 #: builtin/pack-objects.c:1011
8470 msgid "disabling bitmap writing, as some objects are not being packed"
8471 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
8472
8473 #: builtin/pack-objects.c:2171
8474 msgid "Compressing objects"
8475 msgstr "压缩对象中"
8476
8477 #: builtin/pack-objects.c:2568
8478 #, c-format
8479 msgid "unsupported index version %s"
8480 msgstr "不支持的索引版本 %s"
8481
8482 #: builtin/pack-objects.c:2572
8483 #, c-format
8484 msgid "bad index version '%s'"
8485 msgstr "坏的索引版本 '%s'"
8486
8487 #: builtin/pack-objects.c:2602
8488 msgid "do not show progress meter"
8489 msgstr "不显示进度表"
8490
8491 #: builtin/pack-objects.c:2604
8492 msgid "show progress meter"
8493 msgstr "显示进度表"
8494
8495 #: builtin/pack-objects.c:2606
8496 msgid "show progress meter during object writing phase"
8497 msgstr "在对象写入阶段显示进度表"
8498
8499 #: builtin/pack-objects.c:2609
8500 msgid "similar to --all-progress when progress meter is shown"
8501 msgstr "当进度表显示时类似于 --all-progress"
8502
8503 #: builtin/pack-objects.c:2610
8504 msgid "version[,offset]"
8505 msgstr "版本[,偏移]"
8506
8507 #: builtin/pack-objects.c:2611
8508 msgid "write the pack index file in the specified idx format version"
8509 msgstr "用指定的 idx 格式版本来写包索引文件"
8510
8511 #: builtin/pack-objects.c:2614
8512 msgid "maximum size of each output pack file"
8513 msgstr "每个输出包的最大尺寸"
8514
8515 #: builtin/pack-objects.c:2616
8516 msgid "ignore borrowed objects from alternate object store"
8517 msgstr "忽略从备用对象存储里借用对象"
8518
8519 #: builtin/pack-objects.c:2618
8520 msgid "ignore packed objects"
8521 msgstr "忽略包对象"
8522
8523 #: builtin/pack-objects.c:2620
8524 msgid "limit pack window by objects"
8525 msgstr "限制打包窗口的对象数"
8526
8527 #: builtin/pack-objects.c:2622
8528 msgid "limit pack window by memory in addition to object limit"
8529 msgstr "除对象数量限制外设置打包窗口的内存限制"
8530
8531 #: builtin/pack-objects.c:2624
8532 msgid "maximum length of delta chain allowed in the resulting pack"
8533 msgstr "打包允许的 delta 链的最大长度"
8534
8535 #: builtin/pack-objects.c:2626
8536 msgid "reuse existing deltas"
8537 msgstr "重用已存在的 deltas"
8538
8539 #: builtin/pack-objects.c:2628
8540 msgid "reuse existing objects"
8541 msgstr "重用已存在的对象"
8542
8543 #: builtin/pack-objects.c:2630
8544 msgid "use OFS_DELTA objects"
8545 msgstr "使用 OFS_DELTA 对象"
8546
8547 #: builtin/pack-objects.c:2632
8548 msgid "use threads when searching for best delta matches"
8549 msgstr "使用线程查询最佳 delta 匹配"
8550
8551 #: builtin/pack-objects.c:2634
8552 msgid "do not create an empty pack output"
8553 msgstr "不创建空的包输出"
8554
8555 #: builtin/pack-objects.c:2636
8556 msgid "read revision arguments from standard input"
8557 msgstr "从标准输入读取版本号参数"
8558
8559 #: builtin/pack-objects.c:2638
8560 msgid "limit the objects to those that are not yet packed"
8561 msgstr "限制那些尚未打包的对象"
8562
8563 #: builtin/pack-objects.c:2641
8564 msgid "include objects reachable from any reference"
8565 msgstr "包括可以从任何引用访问到的对象"
8566
8567 #: builtin/pack-objects.c:2644
8568 msgid "include objects referred by reflog entries"
8569 msgstr "包括被引用日志引用到的对象"
8570
8571 #: builtin/pack-objects.c:2647
8572 msgid "include objects referred to by the index"
8573 msgstr "包括被索引引用到的对象"
8574
8575 #: builtin/pack-objects.c:2650
8576 msgid "output pack to stdout"
8577 msgstr "输出包到标准输出"
8578
8579 #: builtin/pack-objects.c:2652
8580 msgid "include tag objects that refer to objects to be packed"
8581 msgstr "包括那些引用了待打包对象的标签对象"
8582
8583 #: builtin/pack-objects.c:2654
8584 msgid "keep unreachable objects"
8585 msgstr "维持不可达的对象"
8586
8587 #: builtin/pack-objects.c:2655 parse-options.h:142
8588 msgid "time"
8589 msgstr "时间"
8590
8591 #: builtin/pack-objects.c:2656
8592 msgid "unpack unreachable objects newer than <time>"
8593 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8594
8595 #: builtin/pack-objects.c:2659
8596 msgid "create thin packs"
8597 msgstr "创建精简包"
8598
8599 #: builtin/pack-objects.c:2661
8600 msgid "create packs suitable for shallow fetches"
8601 msgstr "创建适合浅克隆仓库获取的包"
8602
8603 #: builtin/pack-objects.c:2663
8604 msgid "ignore packs that have companion .keep file"
8605 msgstr "忽略配有 .keep 文件的包"
8606
8607 #: builtin/pack-objects.c:2665
8608 msgid "pack compression level"
8609 msgstr "打包压缩级别"
8610
8611 #: builtin/pack-objects.c:2667
8612 msgid "do not hide commits by grafts"
8613 msgstr "显示被嫁接隐藏的提交"
8614
8615 #: builtin/pack-objects.c:2669
8616 msgid "use a bitmap index if available to speed up counting objects"
8617 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
8618
8619 #: builtin/pack-objects.c:2671
8620 msgid "write a bitmap index together with the pack index"
8621 msgstr "在建立包索引的同时创建 bitmap 索引"
8622
8623 #: builtin/pack-objects.c:2762
8624 msgid "Counting objects"
8625 msgstr "对象计数中"
8626
8627 #: builtin/pack-refs.c:6
8628 msgid "git pack-refs [<options>]"
8629 msgstr "git pack-refs [<选项>]"
8630
8631 #: builtin/pack-refs.c:14
8632 msgid "pack everything"
8633 msgstr "打包一切"
8634
8635 #: builtin/pack-refs.c:15
8636 msgid "prune loose refs (default)"
8637 msgstr "清除松散的引用（默认）"
8638
8639 #: builtin/prune-packed.c:7
8640 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8641 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8642
8643 #: builtin/prune-packed.c:40
8644 msgid "Removing duplicate objects"
8645 msgstr "正在删除重复对象"
8646
8647 #: builtin/prune.c:11
8648 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8649 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8650
8651 #: builtin/prune.c:105 builtin/worktree.c:124
8652 msgid "do not remove, show only"
8653 msgstr "不删除，只显示"
8654
8655 #: builtin/prune.c:106 builtin/worktree.c:125
8656 msgid "report pruned objects"
8657 msgstr "报告清除的对象"
8658
8659 #: builtin/prune.c:109 builtin/worktree.c:127
8660 msgid "expire objects older than <time>"
8661 msgstr "使早于给定时间的对象过期"
8662
8663 #: builtin/prune.c:123
8664 msgid "cannot prune in a precious-objects repo"
8665 msgstr "不能在珍品仓库中执行清理操作"
8666
8667 #: builtin/pull.c:69
8668 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8669 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8670
8671 #: builtin/pull.c:113
8672 msgid "Options related to merging"
8673 msgstr "和合并相关的选项"
8674
8675 #: builtin/pull.c:116
8676 msgid "incorporate changes by rebasing rather than merging"
8677 msgstr "使用变基操作取代合并操作以合入修改"
8678
8679 #: builtin/pull.c:140 builtin/revert.c:105
8680 msgid "allow fast-forward"
8681 msgstr "允许快进式"
8682
8683 #: builtin/pull.c:146
8684 msgid "verify that the named commit has a valid GPG signature"
8685 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8686
8687 #: builtin/pull.c:160
8688 msgid "Options related to fetching"
8689 msgstr "和获取相关的参数"
8690
8691 #: builtin/pull.c:268
8692 #, c-format
8693 msgid "Invalid value for pull.ff: %s"
8694 msgstr "pull.ff 的取值无效：%s"
8695
8696 #: builtin/pull.c:352
8697 msgid "Cannot pull with rebase: You have unstaged changes."
8698 msgstr "无法通过变基方式拉取：您有未暂存的变更。"
8699
8700 #: builtin/pull.c:358
8701 msgid "Additionally, your index contains uncommitted changes."
8702 msgstr "而且您的索引中包含未提交的变更。"
8703
8704 #: builtin/pull.c:360
8705 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8706 msgstr "无法通过变基方式拉取：您的索引中包含未提交的变更。"
8707
8708 #: builtin/pull.c:436
8709 msgid ""
8710 "There is no candidate for rebasing against among the refs that you just "
8711 "fetched."
8712 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8713
8714 #: builtin/pull.c:438
8715 msgid ""
8716 "There are no candidates for merging among the refs that you just fetched."
8717 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8718
8719 #: builtin/pull.c:439
8720 msgid ""
8721 "Generally this means that you provided a wildcard refspec which had no\n"
8722 "matches on the remote end."
8723 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8724
8725 #: builtin/pull.c:442
8726 #, c-format
8727 msgid ""
8728 "You asked to pull from the remote '%s', but did not specify\n"
8729 "a branch. Because this is not the default configured remote\n"
8730 "for your current branch, you must specify a branch on the command line."
8731 msgstr ""
8732 "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
8733 "分支默认的远程仓库，您必须在命令行中指定一个分支名。"
8734
8735 #: builtin/pull.c:447
8736 msgid "You are not currently on a branch."
8737 msgstr "您当前不在一个分支上。"
8738
8739 #: builtin/pull.c:449 builtin/pull.c:464
8740 msgid "Please specify which branch you want to rebase against."
8741 msgstr "请指定您要变基到哪一个分支。"
8742
8743 #: builtin/pull.c:451 builtin/pull.c:466
8744 msgid "Please specify which branch you want to merge with."
8745 msgstr "请指定您要合并哪一个分支。"
8746
8747 #: builtin/pull.c:452 builtin/pull.c:467
8748 msgid "See git-pull(1) for details."
8749 msgstr "详见 git-pull(1)。"
8750
8751 #: builtin/pull.c:462
8752 msgid "There is no tracking information for the current branch."
8753 msgstr "当前分支没有跟踪信息。"
8754
8755 #: builtin/pull.c:471
8756 #, c-format
8757 msgid ""
8758 "If you wish to set tracking information for this branch you can do so with:\n"
8759 "\n"
8760 "    git branch --set-upstream-to=%s/<branch> %s\n"
8761 msgstr ""
8762 "如果您想要为此分支创建跟踪信息，您可以执行：\n"
8763 "\n"
8764 "    git branch --set-upstream-to=%s/<branch> %s\n"
8765
8766 #: builtin/pull.c:476
8767 #, c-format
8768 msgid ""
8769 "Your configuration specifies to merge with the ref '%s'\n"
8770 "from the remote, but no such ref was fetched."
8771 msgstr ""
8772 "您的配置中指定要合并远程的引用 '%s'，\n"
8773 "但是没有获取到这个引用。"
8774
8775 #: builtin/pull.c:830
8776 msgid "Updating an unborn branch with changes added to the index."
8777 msgstr "更新尚未诞生的分支，变更添加至索引。"
8778
8779 #: builtin/pull.c:859
8780 #, c-format
8781 msgid ""
8782 "fetch updated the current branch head.\n"
8783 "fast-forwarding your working tree from\n"
8784 "commit %s."
8785 msgstr ""
8786 "fetch 更新了当前的分支。快进您的工作区\n"
8787 "至提交 %s。"
8788
8789 #: builtin/pull.c:864
8790 #, c-format
8791 msgid ""
8792 "Cannot fast-forward your working tree.\n"
8793 "After making sure that you saved anything precious from\n"
8794 "$ git diff %s\n"
8795 "output, run\n"
8796 "$ git reset --hard\n"
8797 "to recover."
8798 msgstr ""
8799 "您当前的工作区无法执行快进操作。\n"
8800 "首先执行如下命令：\n"
8801 "$ git diff %s\n"
8802 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
8803 "$ git reset --hard\n"
8804 "恢复之前的状态。"
8805
8806 #: builtin/pull.c:879
8807 msgid "Cannot merge multiple branches into empty head."
8808 msgstr "无法将多个分支合并到空分支。"
8809
8810 #: builtin/pull.c:883
8811 msgid "Cannot rebase onto multiple branches."
8812 msgstr "无法变基到多个分支。"
8813
8814 #: builtin/push.c:16
8815 msgid "git push [<options>] [<repository> [<refspec>...]]"
8816 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8817
8818 #: builtin/push.c:88
8819 msgid "tag shorthand without <tag>"
8820 msgstr "标签后面未提供 <标签> 参数"
8821
8822 #: builtin/push.c:98
8823 msgid "--delete only accepts plain target ref names"
8824 msgstr "--delete 只接受简单的目标引用名"
8825
8826 #: builtin/push.c:142
8827 msgid ""
8828 "\n"
8829 "To choose either option permanently, see push.default in 'git help config'."
8830 msgstr ""
8831 "\n"
8832 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
8833
8834 #: builtin/push.c:145
8835 #, c-format
8836 msgid ""
8837 "The upstream branch of your current branch does not match\n"
8838 "the name of your current branch.  To push to the upstream branch\n"
8839 "on the remote, use\n"
8840 "\n"
8841 "    git push %s HEAD:%s\n"
8842 "\n"
8843 "To push to the branch of the same name on the remote, use\n"
8844 "\n"
8845 "    git push %s %s\n"
8846 "%s"
8847 msgstr ""
8848 "如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
8849 "上游分支，使用\n"
8850 "\n"
8851 "    git push %s HEAD:%s\n"
8852 "\n"
8853 "为推送至远程同名分支，使用\n"
8854 "\n"
8855 "    git push %s %s\n"
8856 "%s"
8857
8858 #: builtin/push.c:160
8859 #, c-format
8860 msgid ""
8861 "You are not currently on a branch.\n"
8862 "To push the history leading to the current (detached HEAD)\n"
8863 "state now, use\n"
8864 "\n"
8865 "    git push %s HEAD:<name-of-remote-branch>\n"
8866 msgstr ""
8867 "您当前不在一个分支上。\n"
8868 "现在为推送当前（分离头指针）的历史，使用\n"
8869 "\n"
8870 "    git push %s HEAD:<远程分支名字>\n"
8871
8872 #: builtin/push.c:174
8873 #, c-format
8874 msgid ""
8875 "The current branch %s has no upstream branch.\n"
8876 "To push the current branch and set the remote as upstream, use\n"
8877 "\n"
8878 "    git push --set-upstream %s %s\n"
8879 msgstr ""
8880 "当前分支 %s 没有对应的上游分支。\n"
8881 "为推送当前分支并建立与远程上游的跟踪，使用\n"
8882 "\n"
8883 "    git push --set-upstream %s %s\n"
8884
8885 #: builtin/push.c:182
8886 #, c-format
8887 msgid "The current branch %s has multiple upstream branches, refusing to push."
8888 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
8889
8890 #: builtin/push.c:185
8891 #, c-format
8892 msgid ""
8893 "You are pushing to remote '%s', which is not the upstream of\n"
8894 "your current branch '%s', without telling me what to push\n"
8895 "to update which remote branch."
8896 msgstr ""
8897 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
8898 "而没有告诉我要推送什么、更新哪个远程分支。"
8899
8900 #  译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
8901 #: builtin/push.c:208
8902 msgid ""
8903 "push.default is unset; its implicit value has changed in\n"
8904 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8905 "and maintain the traditional behavior, use:\n"
8906 "\n"
8907 "  git config --global push.default matching\n"
8908 "\n"
8909 "To squelch this message and adopt the new behavior now, use:\n"
8910 "\n"
8911 "  git config --global push.default simple\n"
8912 "\n"
8913 "When push.default is set to 'matching', git will push local branches\n"
8914 "to the remote branches that already exist with the same name.\n"
8915 "\n"
8916 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8917 "behavior, which only pushes the current branch to the corresponding\n"
8918 "remote branch that 'git pull' uses to update the current branch.\n"
8919 "\n"
8920 "See 'git help config' and search for 'push.default' for further "
8921 "information.\n"
8922 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8923 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8924 msgstr ""
8925 "push.default 尚未设置，它的默认值在 Git 2.0 已从 'matching'\n"
8926 "变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"
8927 "\n"
8928 "  git config --global push.default matching\n"
8929 "\n"
8930 "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
8931 "\n"
8932 "  git config --global push.default simple\n"
8933 "\n"
8934 "当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n"
8935 "本地分支。\n"
8936 "\n"
8937 "从 Git 2.0 开始，Git 默认采用更为保守的 'simple' 模式，只推送当前\n"
8938 "分支到远程关联的同名分支，即 'git push' 推送当前分支。\n"
8939 "\n"
8940 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8941 "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
8942 "为保持兼容，请用 'current' 代替 'simple'）"
8943
8944 #: builtin/push.c:275
8945 msgid ""
8946 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8947 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
8948
8949 #: builtin/push.c:282
8950 msgid ""
8951 "Updates were rejected because the tip of your current branch is behind\n"
8952 "its remote counterpart. Integrate the remote changes (e.g.\n"
8953 "'git pull ...') before pushing again.\n"
8954 "See the 'Note about fast-forwards' in 'git push --help' for details."
8955 msgstr ""
8956 "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
8957 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
8958 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8959
8960 #: builtin/push.c:288
8961 msgid ""
8962 "Updates were rejected because a pushed branch tip is behind its remote\n"
8963 "counterpart. Check out this branch and integrate the remote changes\n"
8964 "(e.g. 'git pull ...') before pushing again.\n"
8965 "See the 'Note about fast-forwards' in 'git push --help' for details."
8966 msgstr ""
8967 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8968 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
8969 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8970
8971 #: builtin/push.c:294
8972 msgid ""
8973 "Updates were rejected because the remote contains work that you do\n"
8974 "not have locally. This is usually caused by another repository pushing\n"
8975 "to the same ref. You may want to first integrate the remote changes\n"
8976 "(e.g., 'git pull ...') before pushing again.\n"
8977 "See the 'Note about fast-forwards' in 'git push --help' for details."
8978 msgstr ""
8979 "更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8980 "一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
8981 "（如 'git pull ...'）。\n"
8982 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8983
8984 #: builtin/push.c:301
8985 msgid "Updates were rejected because the tag already exists in the remote."
8986 msgstr "更新被拒绝，因为该标签在远程已经存在。"
8987
8988 #: builtin/push.c:304
8989 msgid ""
8990 "You cannot update a remote ref that points at a non-commit object,\n"
8991 "or update a remote ref to make it point at a non-commit object,\n"
8992 "without using the '--force' option.\n"
8993 msgstr ""
8994 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
8995 "也不能更新远程引用让其指向一个非提交对象。\n"
8996
8997 #: builtin/push.c:363
8998 #, c-format
8999 msgid "Pushing to %s\n"
9000 msgstr "推送到 %s\n"
9001
9002 #: builtin/push.c:367
9003 #, c-format
9004 msgid "failed to push some refs to '%s'"
9005 msgstr "无法推送一些引用到 '%s'"
9006
9007 #: builtin/push.c:397
9008 #, c-format
9009 msgid "bad repository '%s'"
9010 msgstr "坏的仓库 '%s'"
9011
9012 #: builtin/push.c:398
9013 msgid ""
9014 "No configured push destination.\n"
9015 "Either specify the URL from the command-line or configure a remote "
9016 "repository using\n"
9017 "\n"
9018 "    git remote add <name> <url>\n"
9019 "\n"
9020 "and then push using the remote name\n"
9021 "\n"
9022 "    git push <name>\n"
9023 msgstr ""
9024 "没有配置推送目标。\n"
9025 "或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
9026 "\n"
9027 "    git remote add <名称> <地址>\n"
9028 "\n"
9029 "然后使用该远程仓库名执行推送\n"
9030 "\n"
9031 "    git push <名称>\n"
9032
9033 #: builtin/push.c:413
9034 msgid "--all and --tags are incompatible"
9035 msgstr "--all 和 --tags 不兼容"
9036
9037 #: builtin/push.c:414
9038 msgid "--all can't be combined with refspecs"
9039 msgstr "--all 不能和引用规格同时使用"
9040
9041 #: builtin/push.c:419
9042 msgid "--mirror and --tags are incompatible"
9043 msgstr "--mirror 和 --tags 不兼容"
9044
9045 #: builtin/push.c:420
9046 msgid "--mirror can't be combined with refspecs"
9047 msgstr "--mirror 不能和引用规格同时使用"
9048
9049 #: builtin/push.c:425
9050 msgid "--all and --mirror are incompatible"
9051 msgstr "--all 和 --mirror 不兼容"
9052
9053 #: builtin/push.c:537
9054 msgid "repository"
9055 msgstr "仓库"
9056
9057 #: builtin/push.c:538 builtin/send-pack.c:161
9058 msgid "push all refs"
9059 msgstr "推送所有引用"
9060
9061 #: builtin/push.c:539 builtin/send-pack.c:163
9062 msgid "mirror all refs"
9063 msgstr "镜像所有引用"
9064
9065 #: builtin/push.c:541
9066 msgid "delete refs"
9067 msgstr "删除引用"
9068
9069 #: builtin/push.c:542
9070 msgid "push tags (can't be used with --all or --mirror)"
9071 msgstr "推送标签（不能使用 --all or --mirror）"
9072
9073 #: builtin/push.c:545 builtin/send-pack.c:164
9074 msgid "force updates"
9075 msgstr "强制更新"
9076
9077 #: builtin/push.c:547 builtin/send-pack.c:175
9078 msgid "refname>:<expect"
9079 msgstr "引用名>:<期望值"
9080
9081 #: builtin/push.c:548 builtin/send-pack.c:176
9082 msgid "require old value of ref to be at this value"
9083 msgstr "要求引用旧的取值为设定值"
9084
9085 #  译者：可选值，不能翻译
9086 #: builtin/push.c:550
9087 msgid "check|on-demand|no"
9088 msgstr "check|on-demand|no"
9089
9090 #: builtin/push.c:551
9091 msgid "control recursive pushing of submodules"
9092 msgstr "控制子模组的递归推送"
9093
9094 #: builtin/push.c:553 builtin/send-pack.c:169
9095 msgid "use thin pack"
9096 msgstr "使用精简打包"
9097
9098 #: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
9099 #: builtin/send-pack.c:159
9100 msgid "receive pack program"
9101 msgstr "接收包程序"
9102
9103 #: builtin/push.c:556
9104 msgid "set upstream for git pull/status"
9105 msgstr "设置 git pull/status 的上游"
9106
9107 #: builtin/push.c:559
9108 msgid "prune locally removed refs"
9109 msgstr "清除本地删除的引用"
9110
9111 #: builtin/push.c:561
9112 msgid "bypass pre-push hook"
9113 msgstr "绕过 pre-push 钩子"
9114
9115 #: builtin/push.c:562
9116 msgid "push missing but relevant tags"
9117 msgstr "推送缺失但有关的标签"
9118
9119 #: builtin/push.c:565 builtin/send-pack.c:166
9120 msgid "GPG sign the push"
9121 msgstr "用 GPG 为推送签名"
9122
9123 #: builtin/push.c:567 builtin/send-pack.c:170
9124 msgid "request atomic transaction on remote side"
9125 msgstr "需要远端支持原子事务"
9126
9127 #: builtin/push.c:577
9128 msgid "--delete is incompatible with --all, --mirror and --tags"
9129 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9130
9131 #: builtin/push.c:579
9132 msgid "--delete doesn't make sense without any refs"
9133 msgstr "--delete 未接任何引用没有意义"
9134
9135 #: builtin/read-tree.c:37
9136 msgid ""
9137 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9138 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9139 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9140 msgstr ""
9141 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9142 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9143 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9144
9145 #: builtin/read-tree.c:110
9146 msgid "write resulting index to <file>"
9147 msgstr "将索引结果写入 <文件>"
9148
9149 #: builtin/read-tree.c:113
9150 msgid "only empty the index"
9151 msgstr "只是清空索引"
9152
9153 #: builtin/read-tree.c:115
9154 msgid "Merging"
9155 msgstr "合并"
9156
9157 #: builtin/read-tree.c:117
9158 msgid "perform a merge in addition to a read"
9159 msgstr "读取之余再执行一个合并"
9160
9161 #: builtin/read-tree.c:119
9162 msgid "3-way merge if no file level merging required"
9163 msgstr "如果没有文件级合并需要，执行三方合并"
9164
9165 #: builtin/read-tree.c:121
9166 msgid "3-way merge in presence of adds and removes"
9167 msgstr "存在添加和删除时，也执行三方合并"
9168
9169 #: builtin/read-tree.c:123
9170 msgid "same as -m, but discard unmerged entries"
9171 msgstr "类似于 -m，但丢弃未合并的条目"
9172
9173 #: builtin/read-tree.c:124
9174 msgid "<subdirectory>/"
9175 msgstr "<子目录>/"
9176
9177 #: builtin/read-tree.c:125
9178 msgid "read the tree into the index under <subdirectory>/"
9179 msgstr "读取树对象到索引的 <子目录>/ 下"
9180
9181 #: builtin/read-tree.c:128
9182 msgid "update working tree with merge result"
9183 msgstr "用合并的结果更新工作区"
9184
9185 #: builtin/read-tree.c:130
9186 msgid "gitignore"
9187 msgstr "gitignore"
9188
9189 #: builtin/read-tree.c:131
9190 msgid "allow explicitly ignored files to be overwritten"
9191 msgstr "允许忽略文件中设定的文件可以被覆盖"
9192
9193 #: builtin/read-tree.c:134
9194 msgid "don't check the working tree after merging"
9195 msgstr "合并后不检查工作区"
9196
9197 #: builtin/read-tree.c:135
9198 msgid "don't update the index or the work tree"
9199 msgstr "不更新索引区和工作区"
9200
9201 #: builtin/read-tree.c:137
9202 msgid "skip applying sparse checkout filter"
9203 msgstr "跳过应用稀疏检出过滤器"
9204
9205 #: builtin/read-tree.c:139
9206 msgid "debug unpack-trees"
9207 msgstr "调试 unpack-trees"
9208
9209 #: builtin/reflog.c:428
9210 #, c-format
9211 msgid "'%s' for '%s' is not a valid timestamp"
9212 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9213
9214 #: builtin/reflog.c:545 builtin/reflog.c:550
9215 #, c-format
9216 msgid "'%s' is not a valid timestamp"
9217 msgstr "'%s' 不是一个有效的时间戳"
9218
9219 #: builtin/remote.c:12
9220 msgid "git remote [-v | --verbose]"
9221 msgstr "git remote [-v | --verbose]"
9222
9223 #: builtin/remote.c:13
9224 msgid ""
9225 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9226 "mirror=<fetch|push>] <name> <url>"
9227 msgstr ""
9228 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9229 "mirror=<fetch|push>] <名称> <地址>"
9230
9231 #: builtin/remote.c:14 builtin/remote.c:34
9232 msgid "git remote rename <old> <new>"
9233 msgstr "git remote rename <旧名称> <新名称>"
9234
9235 #: builtin/remote.c:15 builtin/remote.c:39
9236 msgid "git remote remove <name>"
9237 msgstr "git remote remove <名称>"
9238
9239 #: builtin/remote.c:16 builtin/remote.c:44
9240 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9241 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9242
9243 #: builtin/remote.c:17
9244 msgid "git remote [-v | --verbose] show [-n] <name>"
9245 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9246
9247 #: builtin/remote.c:18
9248 msgid "git remote prune [-n | --dry-run] <name>"
9249 msgstr "git remote prune [-n | --dry-run] <名称>"
9250
9251 #: builtin/remote.c:19
9252 msgid ""
9253 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9254 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9255
9256 #: builtin/remote.c:20
9257 msgid "git remote set-branches [--add] <name> <branch>..."
9258 msgstr "git remote set-branches [--add] <名称> <分支>..."
9259
9260 #: builtin/remote.c:21 builtin/remote.c:70
9261 msgid "git remote get-url [--push] [--all] <name>"
9262 msgstr "git remote get-url [--push] [--all] <名称>"
9263
9264 #: builtin/remote.c:22 builtin/remote.c:75
9265 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9266 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9267
9268 #: builtin/remote.c:23 builtin/remote.c:76
9269 msgid "git remote set-url --add <name> <newurl>"
9270 msgstr "git remote set-url --add <名称> <新的地址>"
9271
9272 #: builtin/remote.c:24 builtin/remote.c:77
9273 msgid "git remote set-url --delete <name> <url>"
9274 msgstr "git remote set-url --delete <名称> <地址>"
9275
9276 #: builtin/remote.c:29
9277 msgid "git remote add [<options>] <name> <url>"
9278 msgstr "git remote add [<选项>] <名称> <地址>"
9279
9280 #: builtin/remote.c:49
9281 msgid "git remote set-branches <name> <branch>..."
9282 msgstr "git remote set-branches <名称> <分支>..."
9283
9284 #: builtin/remote.c:50
9285 msgid "git remote set-branches --add <name> <branch>..."
9286 msgstr "git remote set-branches --add <名称> <分支>..."
9287
9288 #: builtin/remote.c:55
9289 msgid "git remote show [<options>] <name>"
9290 msgstr "git remote show [<选项>] <名称>"
9291
9292 #: builtin/remote.c:60
9293 msgid "git remote prune [<options>] <name>"
9294 msgstr "git remote prune [<选项>] <名称>"
9295
9296 #: builtin/remote.c:65
9297 msgid "git remote update [<options>] [<group> | <remote>]..."
9298 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9299
9300 #: builtin/remote.c:94
9301 #, c-format
9302 msgid "Updating %s"
9303 msgstr "更新 %s 中"
9304
9305 #: builtin/remote.c:126
9306 msgid ""
9307 "--mirror is dangerous and deprecated; please\n"
9308 "\t use --mirror=fetch or --mirror=push instead"
9309 msgstr ""
9310 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
9311 "\t 或 --mirror=push"
9312
9313 #: builtin/remote.c:143
9314 #, c-format
9315 msgid "unknown mirror argument: %s"
9316 msgstr "未知的镜像参数：%s"
9317
9318 #: builtin/remote.c:159
9319 msgid "fetch the remote branches"
9320 msgstr "抓取远程的分支"
9321
9322 #: builtin/remote.c:161
9323 msgid "import all tags and associated objects when fetching"
9324 msgstr "抓取时导入所有的标签和关联对象"
9325
9326 #: builtin/remote.c:164
9327 msgid "or do not fetch any tag at all (--no-tags)"
9328 msgstr "或不抓取任何标签（--no-tags）"
9329
9330 #: builtin/remote.c:166
9331 msgid "branch(es) to track"
9332 msgstr "跟踪的分支"
9333
9334 #: builtin/remote.c:167
9335 msgid "master branch"
9336 msgstr "主线分支"
9337
9338 #: builtin/remote.c:168
9339 msgid "push|fetch"
9340 msgstr "push|fetch"
9341
9342 #: builtin/remote.c:169
9343 msgid "set up remote as a mirror to push to or fetch from"
9344 msgstr "把远程设置为用以推送或抓取的镜像"
9345
9346 #: builtin/remote.c:181
9347 msgid "specifying a master branch makes no sense with --mirror"
9348 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9349
9350 #: builtin/remote.c:183
9351 msgid "specifying branches to track makes sense only with fetch mirrors"
9352 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9353
9354 #: builtin/remote.c:193 builtin/remote.c:643
9355 #, c-format
9356 msgid "remote %s already exists."
9357 msgstr "远程 %s 已经存在。"
9358
9359 #: builtin/remote.c:197 builtin/remote.c:647
9360 #, c-format
9361 msgid "'%s' is not a valid remote name"
9362 msgstr "'%s' 不是一个有效的远程名称"
9363
9364 #: builtin/remote.c:241
9365 #, c-format
9366 msgid "Could not setup master '%s'"
9367 msgstr "无法设置 master '%s'"
9368
9369 #: builtin/remote.c:341
9370 #, c-format
9371 msgid "Could not get fetch map for refspec %s"
9372 msgstr "无法得到引用规格 %s 的获取列表"
9373
9374 #: builtin/remote.c:442 builtin/remote.c:450
9375 msgid "(matching)"
9376 msgstr "（匹配）"
9377
9378 #: builtin/remote.c:454
9379 msgid "(delete)"
9380 msgstr "（删除）"
9381
9382 #: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
9383 #, c-format
9384 msgid "Could not append '%s' to '%s'"
9385 msgstr "不能添加 '%s' 至 '%s'"
9386
9387 #: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
9388 #, c-format
9389 msgid "No such remote: %s"
9390 msgstr "没有这样的远程：%s"
9391
9392 #: builtin/remote.c:653
9393 #, c-format
9394 msgid "Could not rename config section '%s' to '%s'"
9395 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9396
9397 #: builtin/remote.c:659 builtin/remote.c:827
9398 #, c-format
9399 msgid "Could not remove config section '%s'"
9400 msgstr "不能移除配置小节 '%s'"
9401
9402 #: builtin/remote.c:674
9403 #, c-format
9404 msgid ""
9405 "Not updating non-default fetch refspec\n"
9406 "\t%s\n"
9407 "\tPlease update the configuration manually if necessary."
9408 msgstr ""
9409 "没有更新非默认的获取引用规格\n"
9410 "\t%s\n"
9411 "\t如果必要请手动更新配置。"
9412
9413 #: builtin/remote.c:680
9414 #, c-format
9415 msgid "Could not append '%s'"
9416 msgstr "不能追加 '%s'"
9417
9418 #: builtin/remote.c:691
9419 #, c-format
9420 msgid "Could not set '%s'"
9421 msgstr "不能设置 '%s'"
9422
9423 #: builtin/remote.c:713
9424 #, c-format
9425 msgid "deleting '%s' failed"
9426 msgstr "删除 '%s' 失败"
9427
9428 #: builtin/remote.c:747
9429 #, c-format
9430 msgid "creating '%s' failed"
9431 msgstr "创建 '%s' 失败"
9432
9433 #: builtin/remote.c:813
9434 msgid ""
9435 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9436 "to delete it, use:"
9437 msgid_plural ""
9438 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9439 "to delete them, use:"
9440 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
9441 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
9442
9443 #: builtin/remote.c:928
9444 #, c-format
9445 msgid " new (next fetch will store in remotes/%s)"
9446 msgstr " 新的（下一次获取将存储于 remotes/%s）"
9447
9448 #: builtin/remote.c:931
9449 msgid " tracked"
9450 msgstr " 已跟踪"
9451
9452 #: builtin/remote.c:933
9453 msgid " stale (use 'git remote prune' to remove)"
9454 msgstr " 过时（使用 'git remote prune' 来移除）"
9455
9456 #: builtin/remote.c:935
9457 msgid " ???"
9458 msgstr " ???"
9459
9460 #: builtin/remote.c:976
9461 #, c-format
9462 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9463 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
9464
9465 #: builtin/remote.c:983
9466 #, c-format
9467 msgid "rebases onto remote %s"
9468 msgstr "变基到远程 %s"
9469
9470 #: builtin/remote.c:986
9471 #, c-format
9472 msgid " merges with remote %s"
9473 msgstr " 与远程 %s 合并"
9474
9475 #: builtin/remote.c:987
9476 msgid "    and with remote"
9477 msgstr "    且有远程"
9478
9479 #: builtin/remote.c:989
9480 #, c-format
9481 msgid "merges with remote %s"
9482 msgstr "与远程 %s 合并"
9483
9484 #: builtin/remote.c:990
9485 msgid "   and with remote"
9486 msgstr "   且有远程"
9487
9488 #: builtin/remote.c:1036
9489 msgid "create"
9490 msgstr "创建"
9491
9492 #: builtin/remote.c:1039
9493 msgid "delete"
9494 msgstr "删除"
9495
9496 #: builtin/remote.c:1043
9497 msgid "up to date"
9498 msgstr "最新"
9499
9500 #: builtin/remote.c:1046
9501 msgid "fast-forwardable"
9502 msgstr "可快进"
9503
9504 #: builtin/remote.c:1049
9505 msgid "local out of date"
9506 msgstr "本地已过时"
9507
9508 #: builtin/remote.c:1056
9509 #, c-format
9510 msgid "    %-*s forces to %-*s (%s)"
9511 msgstr "    %-*s 强制推送至 %-*s (%s)"
9512
9513 #: builtin/remote.c:1059
9514 #, c-format
9515 msgid "    %-*s pushes to %-*s (%s)"
9516 msgstr "    %-*s 推送至 %-*s (%s)"
9517
9518 #: builtin/remote.c:1063
9519 #, c-format
9520 msgid "    %-*s forces to %s"
9521 msgstr "    %-*s 强制推送至 %s"
9522
9523 #: builtin/remote.c:1066
9524 #, c-format
9525 msgid "    %-*s pushes to %s"
9526 msgstr "    %-*s 推送至 %s"
9527
9528 #: builtin/remote.c:1134
9529 msgid "do not query remotes"
9530 msgstr "不查询远程"
9531
9532 #: builtin/remote.c:1161
9533 #, c-format
9534 msgid "* remote %s"
9535 msgstr "* 远程 %s"
9536
9537 #: builtin/remote.c:1162
9538 #, c-format
9539 msgid "  Fetch URL: %s"
9540 msgstr "  获取地址：%s"
9541
9542 #: builtin/remote.c:1163 builtin/remote.c:1314
9543 msgid "(no URL)"
9544 msgstr "(无 URL)"
9545
9546 #: builtin/remote.c:1172 builtin/remote.c:1174
9547 #, c-format
9548 msgid "  Push  URL: %s"
9549 msgstr "  推送地址：%s"
9550
9551 #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
9552 #, c-format
9553 msgid "  HEAD branch: %s"
9554 msgstr "  HEAD 分支：%s"
9555
9556 #: builtin/remote.c:1182
9557 #, c-format
9558 msgid ""
9559 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9560 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
9561
9562 #: builtin/remote.c:1194
9563 #, c-format
9564 msgid "  Remote branch:%s"
9565 msgid_plural "  Remote branches:%s"
9566 msgstr[0] "  远程分支：%s"
9567 msgstr[1] "  远程分支：%s"
9568
9569 #  译者：中文字符串拼接，可删除前导空格
9570 #: builtin/remote.c:1197 builtin/remote.c:1224
9571 msgid " (status not queried)"
9572 msgstr "（状态未查询）"
9573
9574 #: builtin/remote.c:1206
9575 msgid "  Local branch configured for 'git pull':"
9576 msgid_plural "  Local branches configured for 'git pull':"
9577 msgstr[0] "  为 'git pull' 配置的本地分支："
9578 msgstr[1] "  为 'git pull' 配置的本地分支："
9579
9580 #: builtin/remote.c:1214
9581 msgid "  Local refs will be mirrored by 'git push'"
9582 msgstr "  本地引用将在 'git push' 时被镜像"
9583
9584 #: builtin/remote.c:1221
9585 #, c-format
9586 msgid "  Local ref configured for 'git push'%s:"
9587 msgid_plural "  Local refs configured for 'git push'%s:"
9588 msgstr[0] "  为 'git push' 配置的本地引用%s："
9589 msgstr[1] "  为 'git push' 配置的本地引用%s："
9590
9591 #: builtin/remote.c:1242
9592 msgid "set refs/remotes/<name>/HEAD according to remote"
9593 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9594
9595 #: builtin/remote.c:1244
9596 msgid "delete refs/remotes/<name>/HEAD"
9597 msgstr "删除 refs/remotes/<名称>/HEAD"
9598
9599 #: builtin/remote.c:1259
9600 msgid "Cannot determine remote HEAD"
9601 msgstr "无法确定远程 HEAD"
9602
9603 #: builtin/remote.c:1261
9604 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9605 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
9606
9607 #: builtin/remote.c:1271
9608 #, c-format
9609 msgid "Could not delete %s"
9610 msgstr "无法删除 %s"
9611
9612 #: builtin/remote.c:1279
9613 #, c-format
9614 msgid "Not a valid ref: %s"
9615 msgstr "不是一个有效引用：%s"
9616
9617 #: builtin/remote.c:1281
9618 #, c-format
9619 msgid "Could not setup %s"
9620 msgstr "不能设置 %s"
9621
9622 #  译者：注意保持前导空格
9623 #: builtin/remote.c:1299
9624 #, c-format
9625 msgid " %s will become dangling!"
9626 msgstr " %s 将成为摇摆状态！"
9627
9628 #  译者：注意保持前导空格
9629 #: builtin/remote.c:1300
9630 #, c-format
9631 msgid " %s has become dangling!"
9632 msgstr " %s 已成为摇摆状态！"
9633
9634 #: builtin/remote.c:1310
9635 #, c-format
9636 msgid "Pruning %s"
9637 msgstr "修剪 %s"
9638
9639 #: builtin/remote.c:1311
9640 #, c-format
9641 msgid "URL: %s"
9642 msgstr "URL：%s"
9643
9644 #: builtin/remote.c:1327
9645 #, c-format
9646 msgid " * [would prune] %s"
9647 msgstr " * [将删除] %s"
9648
9649 #: builtin/remote.c:1330
9650 #, c-format
9651 msgid " * [pruned] %s"
9652 msgstr " * [已删除] %s"
9653
9654 #: builtin/remote.c:1375
9655 msgid "prune remotes after fetching"
9656 msgstr "抓取后清除远程"
9657
9658 #: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
9659 #, c-format
9660 msgid "No such remote '%s'"
9661 msgstr "没有此远程 '%s'"
9662
9663 #: builtin/remote.c:1461
9664 msgid "add branch"
9665 msgstr "添加分支"
9666
9667 #: builtin/remote.c:1468
9668 msgid "no remote specified"
9669 msgstr "未指定远程"
9670
9671 #: builtin/remote.c:1485
9672 msgid "query push URLs rather than fetch URLs"
9673 msgstr "查询推送 URL 地址，而非获取 URL 地址"
9674
9675 #: builtin/remote.c:1487
9676 msgid "return all URLs"
9677 msgstr "返回所有 URL 地址"
9678
9679 #: builtin/remote.c:1515
9680 #, c-format
9681 msgid "no URLs configured for remote '%s'"
9682 msgstr "没有给远程仓库 '%s' 设定 URL"
9683
9684 #: builtin/remote.c:1541
9685 msgid "manipulate push URLs"
9686 msgstr "操作推送 URLS"
9687
9688 #: builtin/remote.c:1543
9689 msgid "add URL"
9690 msgstr "添加 URL"
9691
9692 #: builtin/remote.c:1545
9693 msgid "delete URLs"
9694 msgstr "删除 URLS"
9695
9696 #: builtin/remote.c:1552
9697 msgid "--add --delete doesn't make sense"
9698 msgstr "--add --delete 无意义"
9699
9700 #: builtin/remote.c:1592
9701 #, c-format
9702 msgid "Invalid old URL pattern: %s"
9703 msgstr "无效的旧 URL 匹配模版：%s"
9704
9705 #: builtin/remote.c:1600
9706 #, c-format
9707 msgid "No such URL found: %s"
9708 msgstr "未找到此 URL：%s"
9709
9710 #: builtin/remote.c:1602
9711 msgid "Will not delete all non-push URLs"
9712 msgstr "将不会删除所有非推送 URL 地址"
9713
9714 #: builtin/remote.c:1616
9715 msgid "be verbose; must be placed before a subcommand"
9716 msgstr "冗长输出；必须置于子命令之前"
9717
9718 #: builtin/repack.c:17
9719 msgid "git repack [<options>]"
9720 msgstr "git repack [<选项>]"
9721
9722 #: builtin/repack.c:159
9723 msgid "pack everything in a single pack"
9724 msgstr "所有内容打包到一个包文件中"
9725
9726 #: builtin/repack.c:161
9727 msgid "same as -a, and turn unreachable objects loose"
9728 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
9729
9730 #: builtin/repack.c:164
9731 msgid "remove redundant packs, and run git-prune-packed"
9732 msgstr "删除多余的包，运行 git-prune-packed"
9733
9734 #: builtin/repack.c:166
9735 msgid "pass --no-reuse-delta to git-pack-objects"
9736 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9737
9738 #: builtin/repack.c:168
9739 msgid "pass --no-reuse-object to git-pack-objects"
9740 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9741
9742 #: builtin/repack.c:170
9743 msgid "do not run git-update-server-info"
9744 msgstr "不运行 git-update-server-info"
9745
9746 #: builtin/repack.c:173
9747 msgid "pass --local to git-pack-objects"
9748 msgstr "向 git-pack-objects 传递参数 --local"
9749
9750 #: builtin/repack.c:175
9751 msgid "write bitmap index"
9752 msgstr "写 bitmap 索引"
9753
9754 #: builtin/repack.c:176
9755 msgid "approxidate"
9756 msgstr "近似日期"
9757
9758 #: builtin/repack.c:177
9759 msgid "with -A, do not loosen objects older than this"
9760 msgstr "使用 -A，不要将早于给定时间的对象过期"
9761
9762 #: builtin/repack.c:179
9763 msgid "size of the window used for delta compression"
9764 msgstr "用于增量压缩的窗口值"
9765
9766 #: builtin/repack.c:180 builtin/repack.c:184
9767 msgid "bytes"
9768 msgstr "字节"
9769
9770 #: builtin/repack.c:181
9771 msgid "same as the above, but limit memory size instead of entries count"
9772 msgstr "和上面的相似，但限制内存大小而非条目数"
9773
9774 #: builtin/repack.c:183
9775 msgid "limits the maximum delta depth"
9776 msgstr "限制最大增量深度"
9777
9778 #: builtin/repack.c:185
9779 msgid "maximum size of each packfile"
9780 msgstr "每个包文件的最大尺寸"
9781
9782 #: builtin/repack.c:187
9783 msgid "repack objects in packs marked with .keep"
9784 msgstr "对标记为 .keep 的包中的对象重新打包"
9785
9786 #: builtin/repack.c:197
9787 msgid "cannot delete packs in a precious-objects repo"
9788 msgstr "不能删除珍品仓库中的打包文件"
9789
9790 #: builtin/repack.c:381
9791 #, c-format
9792 msgid "removing '%s' failed"
9793 msgstr "删除 '%s' 失败"
9794
9795 #: builtin/replace.c:19
9796 msgid "git replace [-f] <object> <replacement>"
9797 msgstr "git replace [-f] <对象> <替换物>"
9798
9799 #: builtin/replace.c:20
9800 msgid "git replace [-f] --edit <object>"
9801 msgstr "git replace [-f] --edit <对象>"
9802
9803 #: builtin/replace.c:21
9804 msgid "git replace [-f] --graft <commit> [<parent>...]"
9805 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9806
9807 #: builtin/replace.c:22
9808 msgid "git replace -d <object>..."
9809 msgstr "git replace -d <对象>..."
9810
9811 #: builtin/replace.c:23
9812 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9813 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9814
9815 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9816 #, c-format
9817 msgid "Not a valid object name: '%s'"
9818 msgstr "不是一个有效的对象名：'%s'"
9819
9820 #: builtin/replace.c:355
9821 #, c-format
9822 msgid "bad mergetag in commit '%s'"
9823 msgstr "提交 '%s' 中含有损坏的合并标签"
9824
9825 #: builtin/replace.c:357
9826 #, c-format
9827 msgid "malformed mergetag in commit '%s'"
9828 msgstr "提交 '%s' 中含有非法的合并标签"
9829
9830 #: builtin/replace.c:368
9831 #, c-format
9832 msgid ""
9833 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9834 "instead of --graft"
9835 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
9836
9837 #: builtin/replace.c:401
9838 #, c-format
9839 msgid "the original commit '%s' has a gpg signature."
9840 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9841
9842 #: builtin/replace.c:402
9843 msgid "the signature will be removed in the replacement commit!"
9844 msgstr "在替换的提交中签名将被移除！"
9845
9846 #: builtin/replace.c:408
9847 #, c-format
9848 msgid "could not write replacement commit for: '%s'"
9849 msgstr "不能为 '%s' 写替换提交"
9850
9851 #: builtin/replace.c:432
9852 msgid "list replace refs"
9853 msgstr "列出替换的引用"
9854
9855 #: builtin/replace.c:433
9856 msgid "delete replace refs"
9857 msgstr "删除替换的引用"
9858
9859 #: builtin/replace.c:434
9860 msgid "edit existing object"
9861 msgstr "编辑现存的对象"
9862
9863 #: builtin/replace.c:435
9864 msgid "change a commit's parents"
9865 msgstr "修改一个提交的父提交"
9866
9867 #: builtin/replace.c:436
9868 msgid "replace the ref if it exists"
9869 msgstr "如果存在则替换引用"
9870
9871 #: builtin/replace.c:437
9872 msgid "do not pretty-print contents for --edit"
9873 msgstr "不要为 --edit 操作美观显示内容"
9874
9875 #: builtin/replace.c:438
9876 msgid "use this format"
9877 msgstr "使用此格式"
9878
9879 #: builtin/rerere.c:12
9880 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9881 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9882
9883 #: builtin/rerere.c:58
9884 msgid "register clean resolutions in index"
9885 msgstr "在索引中注册干净的解决方案"
9886
9887 #: builtin/reset.c:26
9888 msgid ""
9889 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9890 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9891
9892 #: builtin/reset.c:27
9893 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9894 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9895
9896 #: builtin/reset.c:28
9897 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9898 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9899
9900 #: builtin/reset.c:34
9901 msgid "mixed"
9902 msgstr "混杂"
9903
9904 #: builtin/reset.c:34
9905 msgid "soft"
9906 msgstr "软性"
9907
9908 #: builtin/reset.c:34
9909 msgid "hard"
9910 msgstr "硬性"
9911
9912 #: builtin/reset.c:34
9913 msgid "merge"
9914 msgstr "合并"
9915
9916 #: builtin/reset.c:34
9917 msgid "keep"
9918 msgstr "保持"
9919
9920 #: builtin/reset.c:74
9921 msgid "You do not have a valid HEAD."
9922 msgstr "您没有一个有效的 HEAD。"
9923
9924 #: builtin/reset.c:76
9925 msgid "Failed to find tree of HEAD."
9926 msgstr "无法找到 HEAD 指向的树。"
9927
9928 #: builtin/reset.c:82
9929 #, c-format
9930 msgid "Failed to find tree of %s."
9931 msgstr "无法找到 %s 指向的树。"
9932
9933 #: builtin/reset.c:100
9934 #, c-format
9935 msgid "HEAD is now at %s"
9936 msgstr "HEAD 现在位于 %s"
9937
9938 #  译者：汉字之间无空格，故删除%s前后空格
9939 #: builtin/reset.c:183
9940 #, c-format
9941 msgid "Cannot do a %s reset in the middle of a merge."
9942 msgstr "在合并过程中不能做%s重置操作。"
9943
9944 #: builtin/reset.c:276
9945 msgid "be quiet, only report errors"
9946 msgstr "安静模式，只报告错误"
9947
9948 #: builtin/reset.c:278
9949 msgid "reset HEAD and index"
9950 msgstr "重置 HEAD 和索引"
9951
9952 #: builtin/reset.c:279
9953 msgid "reset only HEAD"
9954 msgstr "只重置 HEAD"
9955
9956 #: builtin/reset.c:281 builtin/reset.c:283
9957 msgid "reset HEAD, index and working tree"
9958 msgstr "重置 HEAD、索引和工作区"
9959
9960 #: builtin/reset.c:285
9961 msgid "reset HEAD but keep local changes"
9962 msgstr "重置 HEAD 但保存本地变更"
9963
9964 #: builtin/reset.c:288
9965 msgid "record only the fact that removed paths will be added later"
9966 msgstr "将删除的路径标记为稍后添加"
9967
9968 #: builtin/reset.c:305
9969 #, c-format
9970 msgid "Failed to resolve '%s' as a valid revision."
9971 msgstr "无法将 '%s' 解析为一个有效的版本。"
9972
9973 #: builtin/reset.c:313
9974 #, c-format
9975 msgid "Failed to resolve '%s' as a valid tree."
9976 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9977
9978 #: builtin/reset.c:322
9979 msgid "--patch is incompatible with --{hard,mixed,soft}"
9980 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9981
9982 #: builtin/reset.c:331
9983 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9984 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
9985
9986 #  译者：汉字之间无空格，故删除%s前后空格
9987 #: builtin/reset.c:333
9988 #, c-format
9989 msgid "Cannot do %s reset with paths."
9990 msgstr "不能带路径进行%s重置。"
9991
9992 #  译者：汉字之间无空格，故删除%s前后空格
9993 #: builtin/reset.c:343
9994 #, c-format
9995 msgid "%s reset is not allowed in a bare repository"
9996 msgstr "不能对纯仓库进行%s重置"
9997
9998 #: builtin/reset.c:347
9999 msgid "-N can only be used with --mixed"
10000 msgstr "-N 只能和 --mixed 同时使用"
10001
10002 #: builtin/reset.c:364
10003 msgid "Unstaged changes after reset:"
10004 msgstr "重置后取消暂存的变更："
10005
10006 #: builtin/reset.c:370
10007 #, c-format
10008 msgid "Could not reset index file to revision '%s'."
10009 msgstr "不能重置索引文件至版本 '%s'。"
10010
10011 #: builtin/reset.c:374
10012 msgid "Could not write new index file."
10013 msgstr "不能写入新的索引文件。"
10014
10015 #: builtin/rev-list.c:354
10016 msgid "rev-list does not support display of notes"
10017 msgstr "rev-list 不支持显示注解"
10018
10019 #: builtin/rev-parse.c:358
10020 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10021 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10022
10023 #: builtin/rev-parse.c:363
10024 msgid "keep the `--` passed as an arg"
10025 msgstr "保持 `--` 作为一个参数传递"
10026
10027 #: builtin/rev-parse.c:365
10028 msgid "stop parsing after the first non-option argument"
10029 msgstr "遇到第一个非选项参数后停止解析"
10030
10031 #: builtin/rev-parse.c:368
10032 msgid "output in stuck long form"
10033 msgstr "以固定长格式输出"
10034
10035 #: builtin/rev-parse.c:499
10036 msgid ""
10037 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10038 "   or: git rev-parse --sq-quote [<arg>...]\n"
10039 "   or: git rev-parse [<options>] [<arg>...]\n"
10040 "\n"
10041 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10042 msgstr ""
10043 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10044 "   或者：git rev-parse --sq-quote [<参数>...]\n"
10045 "   或者：git rev-parse [<选项>] [<参数>...]\n"
10046 "\n"
10047 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10048
10049 #: builtin/revert.c:22
10050 msgid "git revert [<options>] <commit-ish>..."
10051 msgstr "git revert [<选项>] <提交号>..."
10052
10053 #: builtin/revert.c:23
10054 msgid "git revert <subcommand>"
10055 msgstr "git revert <子命令>"
10056
10057 #: builtin/revert.c:28
10058 msgid "git cherry-pick [<options>] <commit-ish>..."
10059 msgstr "git cherry-pick [<选项>] <提交号>..."
10060
10061 #: builtin/revert.c:29
10062 msgid "git cherry-pick <subcommand>"
10063 msgstr "git cherry-pick <子命令>"
10064
10065 #: builtin/revert.c:71
10066 #, c-format
10067 msgid "%s: %s cannot be used with %s"
10068 msgstr "%s：%s 不能和 %s 同时使用"
10069
10070 #: builtin/revert.c:80
10071 msgid "end revert or cherry-pick sequence"
10072 msgstr "终止反转或拣选操作"
10073
10074 #: builtin/revert.c:81
10075 msgid "resume revert or cherry-pick sequence"
10076 msgstr "继续反转或拣选操作"
10077
10078 #: builtin/revert.c:82
10079 msgid "cancel revert or cherry-pick sequence"
10080 msgstr "取消反转或拣选操作"
10081
10082 #: builtin/revert.c:83
10083 msgid "don't automatically commit"
10084 msgstr "不要自动提交"
10085
10086 #: builtin/revert.c:84
10087 msgid "edit the commit message"
10088 msgstr "编辑提交说明"
10089
10090 #: builtin/revert.c:87
10091 msgid "parent number"
10092 msgstr "父编号"
10093
10094 #: builtin/revert.c:89
10095 msgid "merge strategy"
10096 msgstr "合并策略"
10097
10098 #: builtin/revert.c:90
10099 msgid "option"
10100 msgstr "选项"
10101
10102 #: builtin/revert.c:91
10103 msgid "option for merge strategy"
10104 msgstr "合并策略的选项"
10105
10106 #: builtin/revert.c:104
10107 msgid "append commit name"
10108 msgstr "追加提交名称"
10109
10110 #: builtin/revert.c:106
10111 msgid "preserve initially empty commits"
10112 msgstr "保留初始化的空提交"
10113
10114 #: builtin/revert.c:107
10115 msgid "allow commits with empty messages"
10116 msgstr "允许提交说明为空"
10117
10118 #: builtin/revert.c:108
10119 msgid "keep redundant, empty commits"
10120 msgstr "保持多余的、空的提交"
10121
10122 #: builtin/revert.c:112
10123 msgid "program error"
10124 msgstr "程序错误"
10125
10126 #: builtin/revert.c:197
10127 msgid "revert failed"
10128 msgstr "还原失败"
10129
10130 #: builtin/revert.c:212
10131 msgid "cherry-pick failed"
10132 msgstr "拣选失败"
10133
10134 #: builtin/rm.c:17
10135 msgid "git rm [<options>] [--] <file>..."
10136 msgstr "git rm [<选项>] [--] <文件>..."
10137
10138 #: builtin/rm.c:65
10139 msgid ""
10140 "the following submodule (or one of its nested submodules)\n"
10141 "uses a .git directory:"
10142 msgid_plural ""
10143 "the following submodules (or one of their nested submodules)\n"
10144 "use a .git directory:"
10145 msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
10146 msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
10147
10148 #: builtin/rm.c:71
10149 msgid ""
10150 "\n"
10151 "(use 'rm -rf' if you really want to remove it including all of its history)"
10152 msgstr ""
10153 "\n"
10154 "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
10155
10156 #: builtin/rm.c:230
10157 msgid ""
10158 "the following file has staged content different from both the\n"
10159 "file and the HEAD:"
10160 msgid_plural ""
10161 "the following files have staged content different from both the\n"
10162 "file and the HEAD:"
10163 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
10164 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
10165
10166 #: builtin/rm.c:235
10167 msgid ""
10168 "\n"
10169 "(use -f to force removal)"
10170 msgstr ""
10171 "\n"
10172 "（使用 -f 强制删除）"
10173
10174 #: builtin/rm.c:239
10175 msgid "the following file has changes staged in the index:"
10176 msgid_plural "the following files have changes staged in the index:"
10177 msgstr[0] "下列文件索引中有变更"
10178 msgstr[1] "下列文件索引中有变更"
10179
10180 #: builtin/rm.c:243 builtin/rm.c:254
10181 msgid ""
10182 "\n"
10183 "(use --cached to keep the file, or -f to force removal)"
10184 msgstr ""
10185 "\n"
10186 "（使用 --cached 保留本地文件，或用 -f 强制删除）"
10187
10188 #: builtin/rm.c:251
10189 msgid "the following file has local modifications:"
10190 msgid_plural "the following files have local modifications:"
10191 msgstr[0] "如下文件有本地修改："
10192 msgstr[1] "如下文件有本地修改："
10193
10194 #: builtin/rm.c:269
10195 msgid "do not list removed files"
10196 msgstr "不列出删除的文件"
10197
10198 #: builtin/rm.c:270
10199 msgid "only remove from the index"
10200 msgstr "只从索引区删除"
10201
10202 #: builtin/rm.c:271
10203 msgid "override the up-to-date check"
10204 msgstr "忽略文件更新状态检查"
10205
10206 #: builtin/rm.c:272
10207 msgid "allow recursive removal"
10208 msgstr "允许递归删除"
10209
10210 #: builtin/rm.c:274
10211 msgid "exit with a zero status even if nothing matched"
10212 msgstr "即使没有匹配，也以零状态退出"
10213
10214 #: builtin/rm.c:317
10215 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10216 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10217
10218 #: builtin/rm.c:335
10219 #, c-format
10220 msgid "not removing '%s' recursively without -r"
10221 msgstr "未提供 -r 选项不会递归删除 '%s'"
10222
10223 #: builtin/rm.c:374
10224 #, c-format
10225 msgid "git rm: unable to remove %s"
10226 msgstr "git rm：不能删除 %s"
10227
10228 #: builtin/send-pack.c:18
10229 msgid ""
10230 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10231 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10232 "[<ref>...]\n"
10233 "  --all and explicit <ref> specification are mutually exclusive."
10234 msgstr ""
10235 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10236 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10237 "  --all 和明确的 <引用> 互斥。"
10238
10239 #: builtin/send-pack.c:160
10240 msgid "remote name"
10241 msgstr "远程名称"
10242
10243 #: builtin/send-pack.c:171
10244 msgid "use stateless RPC protocol"
10245 msgstr "使用无状态的 RPC 协议"
10246
10247 #: builtin/send-pack.c:172
10248 msgid "read refs from stdin"
10249 msgstr "从标准输入读取引用"
10250
10251 #: builtin/send-pack.c:173
10252 msgid "print status from remote helper"
10253 msgstr "打印来自远程 helper 的状态"
10254
10255 #: builtin/shortlog.c:13
10256 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10257 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10258
10259 #: builtin/shortlog.c:131
10260 #, c-format
10261 msgid "Missing author: %s"
10262 msgstr "缺少作者：%s"
10263
10264 #: builtin/shortlog.c:230
10265 msgid "sort output according to the number of commits per author"
10266 msgstr "根据每个作者的提交数量排序"
10267
10268 #: builtin/shortlog.c:232
10269 msgid "Suppress commit descriptions, only provides commit count"
10270 msgstr "隐藏提交说明，只提供提交数量"
10271
10272 #: builtin/shortlog.c:234
10273 msgid "Show the email address of each author"
10274 msgstr "显示每个作者的电子邮件地址"
10275
10276 #: builtin/shortlog.c:235
10277 msgid "w[,i1[,i2]]"
10278 msgstr "w[,i1[,i2]]"
10279
10280 #: builtin/shortlog.c:236
10281 msgid "Linewrap output"
10282 msgstr "折行输出"
10283
10284 #: builtin/show-branch.c:10
10285 msgid ""
10286 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10287 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10288 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10289 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10290 msgstr ""
10291 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10292 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10293 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10294 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10295
10296 #: builtin/show-branch.c:14
10297 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10298 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10299
10300 #: builtin/show-branch.c:640
10301 msgid "show remote-tracking and local branches"
10302 msgstr "显示远程跟踪的和本地的分支"
10303
10304 #: builtin/show-branch.c:642
10305 msgid "show remote-tracking branches"
10306 msgstr "显示远程跟踪的分支"
10307
10308 #: builtin/show-branch.c:644
10309 msgid "color '*!+-' corresponding to the branch"
10310 msgstr "着色 '*!+-' 到相应的分支"
10311
10312 #: builtin/show-branch.c:646
10313 msgid "show <n> more commits after the common ancestor"
10314 msgstr "显示共同祖先后的 <n> 个提交"
10315
10316 #: builtin/show-branch.c:648
10317 msgid "synonym to more=-1"
10318 msgstr "和 more=-1 同义"
10319
10320 #: builtin/show-branch.c:649
10321 msgid "suppress naming strings"
10322 msgstr "不显示字符串命名"
10323
10324 #: builtin/show-branch.c:651
10325 msgid "include the current branch"
10326 msgstr "包括当前分支"
10327
10328 #: builtin/show-branch.c:653
10329 msgid "name commits with their object names"
10330 msgstr "以对象名字命名提交"
10331
10332 #: builtin/show-branch.c:655
10333 msgid "show possible merge bases"
10334 msgstr "显示可能合并的基线"
10335
10336 #: builtin/show-branch.c:657
10337 msgid "show refs unreachable from any other ref"
10338 msgstr "显示没有任何引用的的引用"
10339
10340 #: builtin/show-branch.c:659
10341 msgid "show commits in topological order"
10342 msgstr "以拓扑顺序显示提交"
10343
10344 #: builtin/show-branch.c:662
10345 msgid "show only commits not on the first branch"
10346 msgstr "只显示不在第一个分支上的提交"
10347
10348 #: builtin/show-branch.c:664
10349 msgid "show merges reachable from only one tip"
10350 msgstr "显示仅一个分支可访问的合并提交"
10351
10352 #: builtin/show-branch.c:666
10353 msgid "topologically sort, maintaining date order where possible"
10354 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
10355
10356 #: builtin/show-branch.c:669
10357 msgid "<n>[,<base>]"
10358 msgstr "<n>[,<base>]"
10359
10360 #: builtin/show-branch.c:670
10361 msgid "show <n> most recent ref-log entries starting at base"
10362 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10363
10364 #: builtin/show-ref.c:10
10365 msgid ""
10366 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10367 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10368 msgstr ""
10369 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10370 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10371
10372 #: builtin/show-ref.c:11
10373 msgid "git show-ref --exclude-existing[=<pattern>]"
10374 msgstr "git show-ref --exclude-existing[=<模式>]"
10375
10376 #: builtin/show-ref.c:165
10377 msgid "only show tags (can be combined with heads)"
10378 msgstr "只显示标签（可以和头共用）"
10379
10380 #: builtin/show-ref.c:166
10381 msgid "only show heads (can be combined with tags)"
10382 msgstr "只显示头（可以和标签共用）"
10383
10384 #: builtin/show-ref.c:167
10385 msgid "stricter reference checking, requires exact ref path"
10386 msgstr "更严格的引用检测，需要精确的引用路径"
10387
10388 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10389 msgid "show the HEAD reference, even if it would be filtered out"
10390 msgstr "显示 HEAD 引用，即使被过滤掉"
10391
10392 #: builtin/show-ref.c:174
10393 msgid "dereference tags into object IDs"
10394 msgstr "转换标签到对象 ID"
10395
10396 #: builtin/show-ref.c:176
10397 msgid "only show SHA1 hash using <n> digits"
10398 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10399
10400 #: builtin/show-ref.c:180
10401 msgid "do not print results to stdout (useful with --verify)"
10402 msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
10403
10404 #: builtin/show-ref.c:182
10405 msgid "show refs from stdin that aren't in local repository"
10406 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10407
10408 #: builtin/stripspace.c:17
10409 msgid "git stripspace [-s | --strip-comments]"
10410 msgstr "git stripspace [-s | --strip-comments]"
10411
10412 #: builtin/stripspace.c:18
10413 msgid "git stripspace [-c | --comment-lines]"
10414 msgstr "git stripspace [-c | --comment-lines]"
10415
10416 #: builtin/stripspace.c:35
10417 msgid "skip and remove all lines starting with comment character"
10418 msgstr "跳过和移除所有的注释行"
10419
10420 #: builtin/stripspace.c:38
10421 msgid "prepend comment character and blank to each line"
10422 msgstr "为每一行的行首添加注释符和空格"
10423
10424 #: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
10425 msgid "alternative anchor for relative paths"
10426 msgstr "相对路径的替代锚记（anchor）"
10427
10428 #: builtin/submodule--helper.c:84
10429 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10430 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10431
10432 #: builtin/submodule--helper.c:114
10433 msgid "git submodule--helper name <path>"
10434 msgstr "git submodule--helper name <路径>"
10435
10436 #: builtin/submodule--helper.c:120
10437 #, c-format
10438 msgid "no submodule mapping found in .gitmodules for path '%s'"
10439 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10440
10441 #: builtin/submodule--helper.c:170
10442 msgid "where the new submodule will be cloned to"
10443 msgstr "新的子模组将要克隆的路径"
10444
10445 #: builtin/submodule--helper.c:173
10446 msgid "name of the new submodule"
10447 msgstr "新子模组的名称"
10448
10449 #: builtin/submodule--helper.c:176
10450 msgid "url where to clone the submodule from"
10451 msgstr "克隆子模组的 url 地址"
10452
10453 #: builtin/submodule--helper.c:182
10454 msgid "depth for shallow clones"
10455 msgstr "浅克隆的深度"
10456
10457 #: builtin/submodule--helper.c:188
10458 msgid ""
10459 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10460 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10461 msgstr ""
10462 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10463 "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10464
10465 #: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
10466 #: builtin/submodule--helper.c:216
10467 #, c-format
10468 msgid "could not create directory '%s'"
10469 msgstr "不能创建目录 '%s'"
10470
10471 #: builtin/submodule--helper.c:204
10472 #, c-format
10473 msgid "clone of '%s' into submodule path '%s' failed"
10474 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10475
10476 #: builtin/submodule--helper.c:227
10477 #, c-format
10478 msgid "cannot open file '%s'"
10479 msgstr "无法打开文件 '%s'"
10480
10481 #: builtin/submodule--helper.c:232
10482 #, c-format
10483 msgid "could not close file %s"
10484 msgstr "无法关闭文件 %s"
10485
10486 #: builtin/submodule--helper.c:247
10487 #, c-format
10488 msgid "could not get submodule directory for '%s'"
10489 msgstr "无法得到 '%s' 的子模组目录"
10490
10491 #: builtin/submodule--helper.c:273
10492 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10493 msgstr "严重错误：submodule-helper 子命令必须由另外的子命令调用"
10494
10495 #: builtin/submodule--helper.c:280
10496 #, c-format
10497 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10498 msgstr "严重错误：'%s' 不是一个有效的 submodule--helper 子命令"
10499
10500 #: builtin/symbolic-ref.c:7
10501 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10502 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10503
10504 #: builtin/symbolic-ref.c:8
10505 msgid "git symbolic-ref -d [-q] <name>"
10506 msgstr "git symbolic-ref -d [-q] <名称>"
10507
10508 #: builtin/symbolic-ref.c:40
10509 msgid "suppress error message for non-symbolic (detached) refs"
10510 msgstr "不显示非符号（分离的）引用的错误信息"
10511
10512 #: builtin/symbolic-ref.c:41
10513 msgid "delete symbolic ref"
10514 msgstr "删除符号引用"
10515
10516 #: builtin/symbolic-ref.c:42
10517 msgid "shorten ref output"
10518 msgstr "简短的引用输出"
10519
10520 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10521 msgid "reason"
10522 msgstr "原因"
10523
10524 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10525 msgid "reason of the update"
10526 msgstr "更新的原因"
10527
10528 #: builtin/tag.c:23
10529 msgid ""
10530 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10531 "[<head>]"
10532 msgstr ""
10533 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10534
10535 #: builtin/tag.c:24
10536 msgid "git tag -d <tagname>..."
10537 msgstr "git tag -d <标签名>..."
10538
10539 #: builtin/tag.c:25
10540 msgid ""
10541 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10542 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10543 msgstr ""
10544 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10545 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10546
10547 #: builtin/tag.c:27
10548 msgid "git tag -v <tagname>..."
10549 msgstr "git tag -v <标签名>..."
10550
10551 #: builtin/tag.c:80
10552 #, c-format
10553 msgid "tag name too long: %.*s..."
10554 msgstr "标签名称太长：%.*s..."
10555
10556 #: builtin/tag.c:85
10557 #, c-format
10558 msgid "tag '%s' not found."
10559 msgstr "未发现标签 '%s'。"
10560
10561 #: builtin/tag.c:100
10562 #, c-format
10563 msgid "Deleted tag '%s' (was %s)\n"
10564 msgstr "已删除标签 '%s'（曾为 %s）\n"
10565
10566 #: builtin/tag.c:112
10567 #, c-format
10568 msgid "could not verify the tag '%s'"
10569 msgstr "不能校验该标签 '%s'"
10570
10571 #: builtin/tag.c:122
10572 #, c-format
10573 msgid ""
10574 "\n"
10575 "Write a message for tag:\n"
10576 "  %s\n"
10577 "Lines starting with '%c' will be ignored.\n"
10578 msgstr ""
10579 "\n"
10580 "输入一个标签说明：\n"
10581 "  %s\n"
10582 "以 '%c' 开头的行将被忽略。\n"
10583
10584 #: builtin/tag.c:126
10585 #, c-format
10586 msgid ""
10587 "\n"
10588 "Write a message for tag:\n"
10589 "  %s\n"
10590 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10591 "want to.\n"
10592 msgstr ""
10593 "\n"
10594 "输入一个标签说明：\n"
10595 "  %s\n"
10596 "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
10597
10598 #: builtin/tag.c:199
10599 msgid "unable to sign the tag"
10600 msgstr "无法签署标签"
10601
10602 #: builtin/tag.c:201
10603 msgid "unable to write tag file"
10604 msgstr "无法写标签文件"
10605
10606 #: builtin/tag.c:226
10607 msgid "bad object type."
10608 msgstr "坏的对象类型。"
10609
10610 #: builtin/tag.c:239
10611 msgid "tag header too big."
10612 msgstr "标签头信息太大。"
10613
10614 #: builtin/tag.c:275
10615 msgid "no tag message?"
10616 msgstr "无标签说明？"
10617
10618 #: builtin/tag.c:281
10619 #, c-format
10620 msgid "The tag message has been left in %s\n"
10621 msgstr "标签说明被保留在 %s\n"
10622
10623 #: builtin/tag.c:339
10624 msgid "list tag names"
10625 msgstr "列出标签名称"
10626
10627 #: builtin/tag.c:341
10628 msgid "print <n> lines of each tag message"
10629 msgstr "每个标签信息打印 <n> 行"
10630
10631 #: builtin/tag.c:343
10632 msgid "delete tags"
10633 msgstr "删除标签"
10634
10635 #: builtin/tag.c:344
10636 msgid "verify tags"
10637 msgstr "验证标签"
10638
10639 #: builtin/tag.c:346
10640 msgid "Tag creation options"
10641 msgstr "标签创建选项"
10642
10643 #: builtin/tag.c:348
10644 msgid "annotated tag, needs a message"
10645 msgstr "附注标签，需要一个说明"
10646
10647 #: builtin/tag.c:350
10648 msgid "tag message"
10649 msgstr "标签说明"
10650
10651 #: builtin/tag.c:352
10652 msgid "annotated and GPG-signed tag"
10653 msgstr "附注并附加 GPG 签名的标签"
10654
10655 #: builtin/tag.c:356
10656 msgid "use another key to sign the tag"
10657 msgstr "使用另外的私钥签名该标签"
10658
10659 #: builtin/tag.c:357
10660 msgid "replace the tag if exists"
10661 msgstr "如果存在，替换现有的标签"
10662
10663 #: builtin/tag.c:358 builtin/update-ref.c:368
10664 msgid "create a reflog"
10665 msgstr "创建引用日志"
10666
10667 #: builtin/tag.c:360
10668 msgid "Tag listing options"
10669 msgstr "标签列表选项"
10670
10671 #: builtin/tag.c:361
10672 msgid "show tag list in columns"
10673 msgstr "以列的方式显示标签列表"
10674
10675 #: builtin/tag.c:362 builtin/tag.c:363
10676 msgid "print only tags that contain the commit"
10677 msgstr "只打印包含提交的标签"
10678
10679 #: builtin/tag.c:364
10680 msgid "print only tags that are merged"
10681 msgstr "只打印已经合并的标签"
10682
10683 #: builtin/tag.c:365
10684 msgid "print only tags that are not merged"
10685 msgstr "只打印尚未合并的标签"
10686
10687 #: builtin/tag.c:370
10688 msgid "print only tags of the object"
10689 msgstr "只打印对象的标签"
10690
10691 #: builtin/tag.c:399
10692 msgid "--column and -n are incompatible"
10693 msgstr "--column 和 -n 不兼容"
10694
10695 #: builtin/tag.c:419
10696 msgid "-n option is only allowed with -l."
10697 msgstr "-n 选项只允许和 -l 同时使用。"
10698
10699 #: builtin/tag.c:421
10700 msgid "--contains option is only allowed with -l."
10701 msgstr "--contains 选项只允许和 -l 同时使用。"
10702
10703 #: builtin/tag.c:423
10704 msgid "--points-at option is only allowed with -l."
10705 msgstr "--points-at 选项只允许和 -l 同时使用。"
10706
10707 #: builtin/tag.c:425
10708 msgid "--merged and --no-merged option are only allowed with -l"
10709 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10710
10711 #: builtin/tag.c:433
10712 msgid "only one -F or -m option is allowed."
10713 msgstr "只允许一个 -F 或 -m 选项。"
10714
10715 #: builtin/tag.c:453
10716 msgid "too many params"
10717 msgstr "太多参数"
10718
10719 #: builtin/tag.c:459
10720 #, c-format
10721 msgid "'%s' is not a valid tag name."
10722 msgstr "'%s' 不是一个有效的标签名称。"
10723
10724 #: builtin/tag.c:464
10725 #, c-format
10726 msgid "tag '%s' already exists"
10727 msgstr "标签 '%s' 已存在"
10728
10729 #: builtin/tag.c:489
10730 #, c-format
10731 msgid "Updated tag '%s' (was %s)\n"
10732 msgstr "已更新标签 '%s'（曾为 %s）\n"
10733
10734 #: builtin/unpack-objects.c:490
10735 msgid "Unpacking objects"
10736 msgstr "展开对象中"
10737
10738 #: builtin/update-index.c:70
10739 #, c-format
10740 msgid "failed to create directory %s"
10741 msgstr "无法创建目录 %s"
10742
10743 #: builtin/update-index.c:76
10744 #, c-format
10745 msgid "failed to stat %s"
10746 msgstr "无法枚举 %s 状态"
10747
10748 #: builtin/update-index.c:86
10749 #, c-format
10750 msgid "failed to create file %s"
10751 msgstr "无法创建文件 %s"
10752
10753 #: builtin/update-index.c:94
10754 #, c-format
10755 msgid "failed to delete file %s"
10756 msgstr "无法删除文件 %s"
10757
10758 #: builtin/update-index.c:101 builtin/update-index.c:203
10759 #, c-format
10760 msgid "failed to delete directory %s"
10761 msgstr "无法删除目录 %s"
10762
10763 #: builtin/update-index.c:124
10764 #, c-format
10765 msgid "Testing "
10766 msgstr "正在测试 "
10767
10768 #: builtin/update-index.c:136
10769 msgid "directory stat info does not change after adding a new file"
10770 msgstr "添加一个新文件后，目录的状态信息未改变"
10771
10772 #: builtin/update-index.c:149
10773 msgid "directory stat info does not change after adding a new directory"
10774 msgstr "添加一个新目录后，目录的状态信息未改变"
10775
10776 #: builtin/update-index.c:162
10777 msgid "directory stat info changes after updating a file"
10778 msgstr "更新一个文件后，目录的状态信息被修改"
10779
10780 #: builtin/update-index.c:173
10781 msgid "directory stat info changes after adding a file inside subdirectory"
10782 msgstr "在子目录中添加文件后，目录的状态信息被修改"
10783
10784 #: builtin/update-index.c:184
10785 msgid "directory stat info does not change after deleting a file"
10786 msgstr "删除一个文件后，目录的状态信息未改变"
10787
10788 #: builtin/update-index.c:197
10789 msgid "directory stat info does not change after deleting a directory"
10790 msgstr "删除一个目录后，目录的状态信息未改变"
10791
10792 #: builtin/update-index.c:204
10793 msgid " OK"
10794 msgstr " OK"
10795
10796 #: builtin/update-index.c:564
10797 msgid "git update-index [<options>] [--] [<file>...]"
10798 msgstr "git update-index [<选项>] [--] [<文件>...]"
10799
10800 #: builtin/update-index.c:918
10801 msgid "continue refresh even when index needs update"
10802 msgstr "当索引需要更新时继续刷新"
10803
10804 #: builtin/update-index.c:921
10805 msgid "refresh: ignore submodules"
10806 msgstr "刷新：忽略子模组"
10807
10808 #: builtin/update-index.c:924
10809 msgid "do not ignore new files"
10810 msgstr "不忽略新的文件"
10811
10812 #: builtin/update-index.c:926
10813 msgid "let files replace directories and vice-versa"
10814 msgstr "让文件替换目录（反之亦然）"
10815
10816 #: builtin/update-index.c:928
10817 msgid "notice files missing from worktree"
10818 msgstr "通知文件从工作区丢失"
10819
10820 #: builtin/update-index.c:930
10821 msgid "refresh even if index contains unmerged entries"
10822 msgstr "即使索引区包含未合并的条目也执行刷新"
10823
10824 #: builtin/update-index.c:933
10825 msgid "refresh stat information"
10826 msgstr "刷新统计信息"
10827
10828 #: builtin/update-index.c:937
10829 msgid "like --refresh, but ignore assume-unchanged setting"
10830 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
10831
10832 #: builtin/update-index.c:941
10833 msgid "<mode>,<object>,<path>"
10834 msgstr "<存取模式>,<对象>,<路径>"
10835
10836 #: builtin/update-index.c:942
10837 msgid "add the specified entry to the index"
10838 msgstr "添加指定的条目到索引区"
10839
10840 #: builtin/update-index.c:946
10841 msgid "(+/-)x"
10842 msgstr "(+/-)x"
10843
10844 #: builtin/update-index.c:947
10845 msgid "override the executable bit of the listed files"
10846 msgstr "覆盖列表里文件的可执行位"
10847
10848 #: builtin/update-index.c:951
10849 msgid "mark files as \"not changing\""
10850 msgstr "把文件标记为 \"没有变更\""
10851
10852 #: builtin/update-index.c:954
10853 msgid "clear assumed-unchanged bit"
10854 msgstr "清除 assumed-unchanged 位"
10855
10856 #: builtin/update-index.c:957
10857 msgid "mark files as \"index-only\""
10858 msgstr "把文件标记为 \"仅索引\""
10859
10860 #: builtin/update-index.c:960
10861 msgid "clear skip-worktree bit"
10862 msgstr "清除 skip-worktree 位"
10863
10864 #: builtin/update-index.c:963
10865 msgid "add to index only; do not add content to object database"
10866 msgstr "只添加到索引区；不添加对象到对象库"
10867
10868 #: builtin/update-index.c:965
10869 msgid "remove named paths even if present in worktree"
10870 msgstr "即使存在工作区里，也删除路径"
10871
10872 #: builtin/update-index.c:967
10873 msgid "with --stdin: input lines are terminated by null bytes"
10874 msgstr "携带 --stdin：输入的行以 null 字符终止"
10875
10876 #: builtin/update-index.c:969
10877 msgid "read list of paths to be updated from standard input"
10878 msgstr "从标准输入中读取需要更新的路径列表"
10879
10880 #: builtin/update-index.c:973
10881 msgid "add entries from standard input to the index"
10882 msgstr "从标准输入添加条目到索引区"
10883
10884 #: builtin/update-index.c:977
10885 msgid "repopulate stages #2 and #3 for the listed paths"
10886 msgstr "为指定文件重新生成第2和第3暂存区"
10887
10888 #: builtin/update-index.c:981
10889 msgid "only update entries that differ from HEAD"
10890 msgstr "只更新与 HEAD 不同的条目"
10891
10892 #: builtin/update-index.c:985
10893 msgid "ignore files missing from worktree"
10894 msgstr "忽略工作区丢失的文件"
10895
10896 #: builtin/update-index.c:988
10897 msgid "report actions to standard output"
10898 msgstr "在标准输出显示操作"
10899
10900 #: builtin/update-index.c:990
10901 msgid "(for porcelains) forget saved unresolved conflicts"
10902 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10903
10904 #: builtin/update-index.c:994
10905 msgid "write index in this format"
10906 msgstr "以这种格式写入索引区"
10907
10908 #: builtin/update-index.c:996
10909 msgid "enable or disable split index"
10910 msgstr "启用或禁用索引拆分"
10911
10912 #: builtin/update-index.c:998
10913 msgid "enable/disable untracked cache"
10914 msgstr "启用/禁用对未跟踪文件的缓存"
10915
10916 #: builtin/update-index.c:1000
10917 msgid "enable untracked cache without testing the filesystem"
10918 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
10919
10920 #: builtin/update-ref.c:9
10921 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10922 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10923
10924 #: builtin/update-ref.c:10
10925 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
10926 msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
10927
10928 #: builtin/update-ref.c:11
10929 msgid "git update-ref [<options>] --stdin [-z]"
10930 msgstr "git update-ref [<选项>] --stdin [-z]"
10931
10932 #: builtin/update-ref.c:363
10933 msgid "delete the reference"
10934 msgstr "删除引用"
10935
10936 #: builtin/update-ref.c:365
10937 msgid "update <refname> not the one it points to"
10938 msgstr "更新 <引用名> 本身而不是它指向的引用"
10939
10940 #: builtin/update-ref.c:366
10941 msgid "stdin has NUL-terminated arguments"
10942 msgstr "标准输入有以 NUL 字符终止的参数"
10943
10944 #: builtin/update-ref.c:367
10945 msgid "read updates from stdin"
10946 msgstr "从标准输入读取更新"
10947
10948 #: builtin/update-server-info.c:6
10949 msgid "git update-server-info [--force]"
10950 msgstr "git update-server-info [--force]"
10951
10952 #: builtin/update-server-info.c:14
10953 msgid "update the info files from scratch"
10954 msgstr "从头开始更新文件信息"
10955
10956 #: builtin/verify-commit.c:17
10957 msgid "git verify-commit [-v | --verbose] <commit>..."
10958 msgstr "git verify-commit [-v | --verbose] <提交>..."
10959
10960 #: builtin/verify-commit.c:72
10961 msgid "print commit contents"
10962 msgstr "打印提交内容"
10963
10964 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10965 msgid "print raw gpg status output"
10966 msgstr "打印原始 gpg 状态输出"
10967
10968 #: builtin/verify-pack.c:54
10969 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10970 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10971
10972 #: builtin/verify-pack.c:64
10973 msgid "verbose"
10974 msgstr "冗长输出"
10975
10976 #: builtin/verify-pack.c:66
10977 msgid "show statistics only"
10978 msgstr "只显示统计"
10979
10980 #: builtin/verify-tag.c:17
10981 msgid "git verify-tag [-v | --verbose] <tag>..."
10982 msgstr "git verify-tag [-v | --verbose] <标签>..."
10983
10984 #: builtin/verify-tag.c:83
10985 msgid "print tag contents"
10986 msgstr "打印标签内容"
10987
10988 #: builtin/worktree.c:15
10989 msgid "git worktree add [<options>] <path> [<branch>]"
10990 msgstr "git worktree add [<选项>] <路径> [<分支>]"
10991
10992 #: builtin/worktree.c:16
10993 msgid "git worktree prune [<options>]"
10994 msgstr "git worktree prune [<选项>]"
10995
10996 #: builtin/worktree.c:17
10997 msgid "git worktree list [<options>]"
10998 msgstr "git worktree list [<选项>]"
10999
11000 #: builtin/worktree.c:39
11001 #, c-format
11002 msgid "Removing worktrees/%s: not a valid directory"
11003 msgstr "删除工作区/%s：不是一个有效的目录"
11004
11005 #: builtin/worktree.c:45
11006 #, c-format
11007 msgid "Removing worktrees/%s: gitdir file does not exist"
11008 msgstr "删除 worktrees/%s：gitdir 文件不存在"
11009
11010 #: builtin/worktree.c:50
11011 #, c-format
11012 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11013 msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
11014
11015 #: builtin/worktree.c:61
11016 #, c-format
11017 msgid "Removing worktrees/%s: invalid gitdir file"
11018 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
11019
11020 #: builtin/worktree.c:77
11021 #, c-format
11022 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11023 msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
11024
11025 #: builtin/worktree.c:112
11026 #, c-format
11027 msgid "failed to remove: %s"
11028 msgstr "无法删除：%s"
11029
11030 #: builtin/worktree.c:201
11031 #, c-format
11032 msgid "'%s' already exists"
11033 msgstr "'%s' 已经存在"
11034
11035 #: builtin/worktree.c:235
11036 #, c-format
11037 msgid "could not create directory of '%s'"
11038 msgstr "不能创建目录 '%s'"
11039
11040 #: builtin/worktree.c:271
11041 #, c-format
11042 msgid "Preparing %s (identifier %s)"
11043 msgstr "准备 %s （标识符 %s）"
11044
11045 #: builtin/worktree.c:319
11046 msgid "checkout <branch> even if already checked out in other worktree"
11047 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11048
11049 #: builtin/worktree.c:321
11050 msgid "create a new branch"
11051 msgstr "创建一个新分支"
11052
11053 #: builtin/worktree.c:323
11054 msgid "create or reset a branch"
11055 msgstr "创建或重置一个分支"
11056
11057 #: builtin/worktree.c:324
11058 msgid "detach HEAD at named commit"
11059 msgstr "HEAD 从指定的提交分离"
11060
11061 #: builtin/worktree.c:331
11062 msgid "-b, -B, and --detach are mutually exclusive"
11063 msgstr "-b、-B 和 --detach 是互斥的"
11064
11065 #: builtin/write-tree.c:13
11066 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11067 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11068
11069 #: builtin/write-tree.c:26
11070 msgid "<prefix>/"
11071 msgstr "<前缀>/"
11072
11073 #: builtin/write-tree.c:27
11074 msgid "write tree object for a subdirectory <prefix>"
11075 msgstr "将 <前缀> 子目录内容写到一个树对象"
11076
11077 #: builtin/write-tree.c:30
11078 msgid "only useful for debugging"
11079 msgstr "只对调试有用"
11080
11081 #: credential-cache--daemon.c:255
11082 msgid "print debugging messages to stderr"
11083 msgstr "调试信息输出到标准错误"
11084
11085 #: git.c:14
11086 msgid ""
11087 "'git help -a' and 'git help -g' list available subcommands and some\n"
11088 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11089 "to read about a specific subcommand or concept."
11090 msgstr ""
11091 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11092 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11093 "帮助。"
11094
11095 #: common-cmds.h:9
11096 msgid "start a working area (see also: git help tutorial)"
11097 msgstr "开始一个工作区（参见：git help tutorial）"
11098
11099 #: common-cmds.h:10
11100 msgid "work on the current change (see also: git help everyday)"
11101 msgstr "在当前变更上工作（参见：git help everyday）"
11102
11103 #: common-cmds.h:11
11104 msgid "examine the history and state (see also: git help revisions)"
11105 msgstr "检查历史和状态（参见：git help revisions）"
11106
11107 #: common-cmds.h:12
11108 msgid "grow, mark and tweak your common history"
11109 msgstr "扩展、标记和调校您的历史记录"
11110
11111 #: common-cmds.h:13
11112 msgid "collaborate (see also: git help workflows)"
11113 msgstr "协同（参见：git help workflows）"
11114
11115 #: common-cmds.h:17
11116 msgid "Add file contents to the index"
11117 msgstr "添加文件内容至索引"
11118
11119 #: common-cmds.h:18
11120 msgid "Use binary search to find the commit that introduced a bug"
11121 msgstr "通过二分查找定位引入 bug 的提交"
11122
11123 #: common-cmds.h:19
11124 msgid "List, create, or delete branches"
11125 msgstr "列出、创建或删除分支"
11126
11127 #: common-cmds.h:20
11128 msgid "Switch branches or restore working tree files"
11129 msgstr "切换分支或恢复工作区文件"
11130
11131 #: common-cmds.h:21
11132 msgid "Clone a repository into a new directory"
11133 msgstr "克隆一个仓库到一个新目录"
11134
11135 #: common-cmds.h:22
11136 msgid "Record changes to the repository"
11137 msgstr "记录变更到仓库"
11138
11139 #: common-cmds.h:23
11140 msgid "Show changes between commits, commit and working tree, etc"
11141 msgstr "显示提交之间、提交和工作区之间等的差异"
11142
11143 #: common-cmds.h:24
11144 msgid "Download objects and refs from another repository"
11145 msgstr "从另外一个仓库下载对象和引用"
11146
11147 #: common-cmds.h:25
11148 msgid "Print lines matching a pattern"
11149 msgstr "输出和模式匹配的行"
11150
11151 #: common-cmds.h:26
11152 msgid "Create an empty Git repository or reinitialize an existing one"
11153 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11154
11155 #: common-cmds.h:27
11156 msgid "Show commit logs"
11157 msgstr "显示提交日志"
11158
11159 #: common-cmds.h:28
11160 msgid "Join two or more development histories together"
11161 msgstr "合并两个或更多开发历史"
11162
11163 #: common-cmds.h:29
11164 msgid "Move or rename a file, a directory, or a symlink"
11165 msgstr "移动或重命名一个文件、目录或符号链接"
11166
11167 #: common-cmds.h:30
11168 msgid "Fetch from and integrate with another repository or a local branch"
11169 msgstr "获取并整合另外的仓库或一个本地分支"
11170
11171 #: common-cmds.h:31
11172 msgid "Update remote refs along with associated objects"
11173 msgstr "更新远程引用和相关的对象"
11174
11175 #: common-cmds.h:32
11176 msgid "Forward-port local commits to the updated upstream head"
11177 msgstr "本地提交转移至更新后的上游分支中"
11178
11179 #: common-cmds.h:33
11180 msgid "Reset current HEAD to the specified state"
11181 msgstr "重置当前 HEAD 到指定状态"
11182
11183 #: common-cmds.h:34
11184 msgid "Remove files from the working tree and from the index"
11185 msgstr "从工作区和索引中删除文件"
11186
11187 #: common-cmds.h:35
11188 msgid "Show various types of objects"
11189 msgstr "显示各种类型的对象"
11190
11191 #: common-cmds.h:36
11192 msgid "Show the working tree status"
11193 msgstr "显示工作区状态"
11194
11195 #: common-cmds.h:37
11196 msgid "Create, list, delete or verify a tag object signed with GPG"
11197 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11198
11199 #: parse-options.h:145
11200 msgid "expiry-date"
11201 msgstr "到期时间"
11202
11203 #: parse-options.h:160
11204 msgid "no-op (backward compatibility)"
11205 msgstr "空操作（向后兼容）"
11206
11207 #: parse-options.h:237
11208 msgid "be more verbose"
11209 msgstr "更加详细"
11210
11211 #: parse-options.h:239
11212 msgid "be more quiet"
11213 msgstr "更加安静"
11214
11215 #: parse-options.h:245
11216 msgid "use <n> digits to display SHA-1s"
11217 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11218
11219 #: rerere.h:38
11220 msgid "update the index with reused conflict resolution if possible"
11221 msgstr "如果可能，重用冲突解决更新索引"
11222
11223 #: git-bisect.sh:55
11224 msgid "You need to start by \"git bisect start\""
11225 msgstr "您需要执行 \"git bisect start\" 来开始"
11226
11227 #  译者：注意保持句尾空格
11228 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11229 #. translation. The program will only accept English input
11230 #. at this point.
11231 #: git-bisect.sh:61
11232 msgid "Do you want me to do it for you [Y/n]? "
11233 msgstr "您想让我为您这样做么[Y/n]？ "
11234
11235 #: git-bisect.sh:122
11236 #, sh-format
11237 msgid "unrecognised option: '$arg'"
11238 msgstr "未能识别的选项：'$arg'"
11239
11240 #: git-bisect.sh:126
11241 #, sh-format
11242 msgid "'$arg' does not appear to be a valid revision"
11243 msgstr "'$arg' 看起来不像是一个有效的版本"
11244
11245 #: git-bisect.sh:155
11246 msgid "Bad HEAD - I need a HEAD"
11247 msgstr "坏的 HEAD - 我需要一个 HEAD"
11248
11249 #: git-bisect.sh:168
11250 #, sh-format
11251 msgid ""
11252 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11253 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11254
11255 #: git-bisect.sh:178
11256 msgid "won't bisect on cg-seek'ed tree"
11257 msgstr "不会在做了 cg-seek 的树上做二分查找"
11258
11259 #: git-bisect.sh:182
11260 msgid "Bad HEAD - strange symbolic ref"
11261 msgstr "坏的 HEAD - 奇怪的符号引用"
11262
11263 #: git-bisect.sh:234
11264 #, sh-format
11265 msgid "Bad bisect_write argument: $state"
11266 msgstr "坏的 bisect_write 参数：$state"
11267
11268 #: git-bisect.sh:263
11269 #, sh-format
11270 msgid "Bad rev input: $arg"
11271 msgstr "输入坏的版本：$arg"
11272
11273 #: git-bisect.sh:278
11274 msgid "Please call 'bisect_state' with at least one argument."
11275 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11276
11277 #: git-bisect.sh:290
11278 #, sh-format
11279 msgid "Bad rev input: $rev"
11280 msgstr "输入坏的版本：$rev"
11281
11282 #: git-bisect.sh:299
11283 #, sh-format
11284 msgid "'git bisect $TERM_BAD' can take only one argument."
11285 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11286
11287 #: git-bisect.sh:322
11288 #, sh-format
11289 msgid "Warning: bisecting only with a $TERM_BAD commit."
11290 msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。"
11291
11292 #  译者：注意保持句尾空格
11293 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11294 #. translation. The program will only accept English input
11295 #. at this point.
11296 #: git-bisect.sh:328
11297 msgid "Are you sure [Y/n]? "
11298 msgstr "您确认么[Y/n]？ "
11299
11300 #: git-bisect.sh:340
11301 #, sh-format
11302 msgid ""
11303 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11304 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11305 msgstr ""
11306 "您需要给我至少一个好版本和一个坏版本。\n"
11307 "（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
11308
11309 #: git-bisect.sh:343
11310 #, sh-format
11311 msgid ""
11312 "You need to start by \"git bisect start\".\n"
11313 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11314 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11315 msgstr ""
11316 "您需要执行 \"git bisect start\" 来开始。\n"
11317 "然后需要提供我至少一个好版本和一个坏版本。\n"
11318 "（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
11319
11320 #: git-bisect.sh:414 git-bisect.sh:546
11321 msgid "We are not bisecting."
11322 msgstr "我们没有在二分查找。"
11323
11324 #: git-bisect.sh:421
11325 #, sh-format
11326 msgid "'$invalid' is not a valid commit"
11327 msgstr "'$invalid' 不是一个有效的提交"
11328
11329 #: git-bisect.sh:430
11330 #, sh-format
11331 msgid ""
11332 "Could not check out original HEAD '$branch'.\n"
11333 "Try 'git bisect reset <commit>'."
11334 msgstr ""
11335 "不能检出原始 HEAD '$branch'。\n"
11336 "尝试 'git bisect reset <提交>'。"
11337
11338 #: git-bisect.sh:458
11339 msgid "No logfile given"
11340 msgstr "未提供日志文件"
11341
11342 #: git-bisect.sh:459
11343 #, sh-format
11344 msgid "cannot read $file for replaying"
11345 msgstr "不能读取 $file 来重放"
11346
11347 #: git-bisect.sh:480
11348 msgid "?? what are you talking about?"
11349 msgstr "?? 您在说什么?"
11350
11351 #: git-bisect.sh:492
11352 #, sh-format
11353 msgid "running $command"
11354 msgstr "运行 $command"
11355
11356 #: git-bisect.sh:499
11357 #, sh-format
11358 msgid ""
11359 "bisect run failed:\n"
11360 "exit code $res from '$command' is < 0 or >= 128"
11361 msgstr ""
11362 "二分查找运行失败：\n"
11363 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11364
11365 #: git-bisect.sh:525
11366 msgid "bisect run cannot continue any more"
11367 msgstr "二分查找不能继续运行"
11368
11369 #: git-bisect.sh:531
11370 #, sh-format
11371 msgid ""
11372 "bisect run failed:\n"
11373 "'bisect_state $state' exited with error code $res"
11374 msgstr ""
11375 "二分查找运行失败：\n"
11376 "'bisect_state $state' 退出码为 $res"
11377
11378 #: git-bisect.sh:538
11379 msgid "bisect run success"
11380 msgstr "二分查找运行成功"
11381
11382 #: git-bisect.sh:565
11383 msgid "please use two different terms"
11384 msgstr "请使用两个不同的术语"
11385
11386 #: git-bisect.sh:575
11387 #, sh-format
11388 msgid "'$term' is not a valid term"
11389 msgstr "'$term' 不是一个有效的名称"
11390
11391 #: git-bisect.sh:578
11392 #, sh-format
11393 msgid "can't use the builtin command '$term' as a term"
11394 msgstr "不能使用内置命令 '$term' 作为术语"
11395
11396 #: git-bisect.sh:587 git-bisect.sh:593
11397 #, sh-format
11398 msgid "can't change the meaning of term '$term'"
11399 msgstr "不能修改术语 '$term' 的含义"
11400
11401 #: git-bisect.sh:606
11402 #, sh-format
11403 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11404 msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11405
11406 #: git-bisect.sh:636
11407 msgid "no terms defined"
11408 msgstr "未定义术语"
11409
11410 #: git-bisect.sh:653
11411 #, sh-format
11412 msgid ""
11413 "invalid argument $arg for 'git bisect terms'.\n"
11414 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11415 msgstr ""
11416 "参数 $arg 对命令 'git bisect terms' 无效。\n"
11417 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
11418
11419 #: git-rebase.sh:57
11420 msgid ""
11421 "When you have resolved this problem, run \"git rebase --continue\".\n"
11422 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11423 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11424 "\"."
11425 msgstr ""
11426 "当您解决了此问题后，执行 \"git rebase --continue\"。\n"
11427 "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
11428 "要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
11429
11430 #: git-rebase.sh:165
11431 msgid "Applied autostash."
11432 msgstr "成功应用 autostash。"
11433
11434 #: git-rebase.sh:168
11435 #, sh-format
11436 msgid "Cannot store $stash_sha1"
11437 msgstr "无法保存 $stash_sha1"
11438
11439 #: git-rebase.sh:169
11440 msgid ""
11441 "Applying autostash resulted in conflicts.\n"
11442 "Your changes are safe in the stash.\n"
11443 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11444 msgstr ""
11445 "应用 autostash 导致冲突。\n"
11446 "您的修改安全地保存在 stash 中。\n"
11447 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11448
11449 #: git-rebase.sh:208
11450 msgid "The pre-rebase hook refused to rebase."
11451 msgstr "钩子 pre-rebase 拒绝变基操作。"
11452
11453 #: git-rebase.sh:213
11454 msgid "It looks like git-am is in progress. Cannot rebase."
11455 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11456
11457 #: git-rebase.sh:354
11458 msgid "The --exec option must be used with the --interactive option"
11459 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11460
11461 #: git-rebase.sh:359
11462 msgid "No rebase in progress?"
11463 msgstr "没有正在进行的变基？"
11464
11465 #: git-rebase.sh:370
11466 msgid "The --edit-todo action can only be used during interactive rebase."
11467 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11468
11469 #: git-rebase.sh:377
11470 msgid "Cannot read HEAD"
11471 msgstr "不能读取 HEAD"
11472
11473 #: git-rebase.sh:380
11474 msgid ""
11475 "You must edit all merge conflicts and then\n"
11476 "mark them as resolved using git add"
11477 msgstr ""
11478 "您必须编辑所有的合并冲突，然后通过 git add\n"
11479 "命令将它们标记为已解决"
11480
11481 #: git-rebase.sh:398
11482 #, sh-format
11483 msgid "Could not move back to $head_name"
11484 msgstr "无法移回 $head_name"
11485
11486 #: git-rebase.sh:417
11487 #, sh-format
11488 msgid ""
11489 "It seems that there is already a $state_dir_base directory, and\n"
11490 "I wonder if you are in the middle of another rebase.  If that is the\n"
11491 "case, please try\n"
11492 "\t$cmd_live_rebase\n"
11493 "If that is not the case, please\n"
11494 "\t$cmd_clear_stale_rebase\n"
11495 "and run me again.  I am stopping in case you still have something\n"
11496 "valuable there."
11497 msgstr ""
11498 "好像已有 $state_dir_base 目录，我怀疑您正处于另外一个变基操作\n"
11499 "过程中。 如果是这样，请执行\n"
11500 "\t$cmd_live_rebase\n"
11501 "如果不是这样，请执行\n"
11502 "\t$cmd_clear_stale_rebase\n"
11503 "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
11504
11505 #: git-rebase.sh:468
11506 #, sh-format
11507 msgid "invalid upstream $upstream_name"
11508 msgstr "无效的上游 $upstream_name"
11509
11510 #: git-rebase.sh:492
11511 #, sh-format
11512 msgid "$onto_name: there are more than one merge bases"
11513 msgstr "$onto_name: 有一个以上的合并基准"
11514
11515 #: git-rebase.sh:495 git-rebase.sh:499
11516 #, sh-format
11517 msgid "$onto_name: there is no merge base"
11518 msgstr "$onto_name: 没有合并基准"
11519
11520 #: git-rebase.sh:504
11521 #, sh-format
11522 msgid "Does not point to a valid commit: $onto_name"
11523 msgstr "没有指向一个有效的提交：$onto_name"
11524
11525 #: git-rebase.sh:527
11526 #, sh-format
11527 msgid "fatal: no such branch: $branch_name"
11528 msgstr "严重错误：无此分支：$branch_name"
11529
11530 #: git-rebase.sh:560
11531 msgid "Cannot autostash"
11532 msgstr "无法 autostash"
11533
11534 #: git-rebase.sh:565
11535 #, sh-format
11536 msgid "Created autostash: $stash_abbrev"
11537 msgstr "创建了 autostash: $stash_abbrev"
11538
11539 #: git-rebase.sh:569
11540 msgid "Please commit or stash them."
11541 msgstr "请提交或为它们保存进度。"
11542
11543 #: git-rebase.sh:589
11544 #, sh-format
11545 msgid "Current branch $branch_name is up to date."
11546 msgstr "当前分支 $branch_name 是最新的。"
11547
11548 #: git-rebase.sh:593
11549 #, sh-format
11550 msgid "Current branch $branch_name is up to date, rebase forced."
11551 msgstr "当前分支 $branch_name 是最新的，强制变基。"
11552
11553 #: git-rebase.sh:604
11554 #, sh-format
11555 msgid "Changes from $mb to $onto:"
11556 msgstr "变更从 $mb 到 $onto："
11557
11558 #: git-rebase.sh:613
11559 msgid "First, rewinding head to replay your work on top of it..."
11560 msgstr "首先，回退分支以便在上面重放您的工作..."
11561
11562 #: git-rebase.sh:623
11563 #, sh-format
11564 msgid "Fast-forwarded $branch_name to $onto_name."
11565 msgstr "快进 $branch_name 至 $onto_name。"
11566
11567 #: git-stash.sh:51
11568 msgid "git stash clear with parameters is unimplemented"
11569 msgstr "git stash clear 不支持参数"
11570
11571 #: git-stash.sh:74
11572 msgid "You do not have the initial commit yet"
11573 msgstr "您尚未建立初始提交"
11574
11575 #: git-stash.sh:89
11576 msgid "Cannot save the current index state"
11577 msgstr "无法保存当前索引状态"
11578
11579 #: git-stash.sh:124 git-stash.sh:137
11580 msgid "Cannot save the current worktree state"
11581 msgstr "无法保存当前工作区状态"
11582
11583 #: git-stash.sh:141
11584 msgid "No changes selected"
11585 msgstr "没有选择变更"
11586
11587 #: git-stash.sh:144
11588 msgid "Cannot remove temporary index (can't happen)"
11589 msgstr "无法删除临时索引（不应发生）"
11590
11591 #: git-stash.sh:157
11592 msgid "Cannot record working tree state"
11593 msgstr "不能记录工作区状态"
11594
11595 #: git-stash.sh:189
11596 #, sh-format
11597 msgid "Cannot update $ref_stash with $w_commit"
11598 msgstr "无法用 $w_commit 更新 $ref_stash"
11599
11600 #. TRANSLATORS: $option is an invalid option, like
11601 #. `--blah-blah'. The 7 spaces at the beginning of the
11602 #. second line correspond to "error: ". So you should line
11603 #. up the second line with however many characters the
11604 #. translation of "error: " takes in your language. E.g. in
11605 #. English this is:
11606 #.
11607 #. $ git stash save --blah-blah 2>&1 | head -n 2
11608 #. error: unknown option for 'stash save': --blah-blah
11609 #. To provide a message, use git stash save -- '--blah-blah'
11610 #: git-stash.sh:239
11611 #, sh-format
11612 msgid ""
11613 "error: unknown option for 'stash save': $option\n"
11614 "       To provide a message, use git stash save -- '$option'"
11615 msgstr ""
11616 "错误：'stash save' 的未知选项：$option\n"
11617 "      要提供一个描述信息，使用 git stash save -- '$option'"
11618
11619 #: git-stash.sh:260
11620 msgid "No local changes to save"
11621 msgstr "没有要保存的本地修改"
11622
11623 #: git-stash.sh:264
11624 msgid "Cannot initialize stash"
11625 msgstr "无法初始化 stash"
11626
11627 #: git-stash.sh:268
11628 msgid "Cannot save the current status"
11629 msgstr "无法保存当前状态"
11630
11631 #: git-stash.sh:286
11632 msgid "Cannot remove worktree changes"
11633 msgstr "无法删除工作区变更"
11634
11635 #: git-stash.sh:405
11636 #, sh-format
11637 msgid "unknown option: $opt"
11638 msgstr "未知选项: $opt"
11639
11640 #: git-stash.sh:415
11641 msgid "No stash found."
11642 msgstr "未发现 stash。"
11643
11644 #: git-stash.sh:422
11645 #, sh-format
11646 msgid "Too many revisions specified: $REV"
11647 msgstr "指定了太多的版本：$REV"
11648
11649 #: git-stash.sh:428
11650 #, sh-format
11651 msgid "$reference is not a valid reference"
11652 msgstr "$reference 不是一个有效的引用"
11653
11654 #: git-stash.sh:456
11655 #, sh-format
11656 msgid "'$args' is not a stash-like commit"
11657 msgstr "'$args' 不是 stash 样提交"
11658
11659 #: git-stash.sh:467
11660 #, sh-format
11661 msgid "'$args' is not a stash reference"
11662 msgstr "'$args' 不是一个 stash 引用"
11663
11664 #: git-stash.sh:475
11665 msgid "unable to refresh index"
11666 msgstr "无法刷新索引"
11667
11668 #: git-stash.sh:479
11669 msgid "Cannot apply a stash in the middle of a merge"
11670 msgstr "无法在合并过程中恢复进度"
11671
11672 #: git-stash.sh:487
11673 msgid "Conflicts in index. Try without --index."
11674 msgstr "索引中有冲突。尝试不使用 --index。"
11675
11676 #: git-stash.sh:489
11677 msgid "Could not save index tree"
11678 msgstr "不能保存索引树"
11679
11680 #: git-stash.sh:523
11681 msgid "Cannot unstage modified files"
11682 msgstr "无法将修改的文件取消暂存"
11683
11684 #: git-stash.sh:538
11685 msgid "Index was not unstashed."
11686 msgstr "索引的进度没有被恢复。"
11687
11688 #: git-stash.sh:561
11689 #, sh-format
11690 msgid "Dropped ${REV} ($s)"
11691 msgstr "丢弃了 ${REV} ($s)"
11692
11693 #: git-stash.sh:562
11694 #, sh-format
11695 msgid "${REV}: Could not drop stash entry"
11696 msgstr "${REV}：不能丢弃进度条目"
11697
11698 #: git-stash.sh:570
11699 msgid "No branch name specified"
11700 msgstr "未指定分支名"
11701
11702 #: git-stash.sh:642
11703 msgid "(To restore them type \"git stash apply\")"
11704 msgstr "（为恢复数据输入 \"git stash apply\"）"
11705
11706 #: git-submodule.sh:104
11707 #, sh-format
11708 msgid "cannot strip one component off url '$remoteurl'"
11709 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11710
11711 #: git-submodule.sh:281
11712 msgid "Relative path can only be used from the toplevel of the working tree"
11713 msgstr "只能在工作区的顶级目录中使用相对路径"
11714
11715 #: git-submodule.sh:291
11716 #, sh-format
11717 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11718 msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
11719
11720 #: git-submodule.sh:308
11721 #, sh-format
11722 msgid "'$sm_path' already exists in the index"
11723 msgstr "'$sm_path' 已经存在于索引中"
11724
11725 #: git-submodule.sh:312
11726 #, sh-format
11727 msgid ""
11728 "The following path is ignored by one of your .gitignore files:\n"
11729 "$sm_path\n"
11730 "Use -f if you really want to add it."
11731 msgstr ""
11732 "以下路径被您的一个 .gitignore 文件所忽略：\n"
11733 "$sm_path\n"
11734 "如果您确实想添加它，使用 -f 参数。"
11735
11736 #: git-submodule.sh:330
11737 #, sh-format
11738 msgid "Adding existing repo at '$sm_path' to the index"
11739 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11740
11741 #: git-submodule.sh:332
11742 #, sh-format
11743 msgid "'$sm_path' already exists and is not a valid git repo"
11744 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11745
11746 #: git-submodule.sh:340
11747 #, sh-format
11748 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11749 msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
11750
11751 #: git-submodule.sh:342
11752 #, sh-format
11753 msgid ""
11754 "If you want to reuse this local git directory instead of cloning again from"
11755 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11756
11757 #: git-submodule.sh:344
11758 #, sh-format
11759 msgid ""
11760 "use the '--force' option. If the local git directory is not the correct repo"
11761 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11762
11763 #: git-submodule.sh:345
11764 #, sh-format
11765 msgid ""
11766 "or you are unsure what this means choose another name with the '--name' "
11767 "option."
11768 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11769
11770 #: git-submodule.sh:347
11771 #, sh-format
11772 msgid "Reactivating local git directory for submodule '$sm_name'."
11773 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11774
11775 #: git-submodule.sh:359
11776 #, sh-format
11777 msgid "Unable to checkout submodule '$sm_path'"
11778 msgstr "不能检出子模组 '$sm_path'"
11779
11780 #: git-submodule.sh:364
11781 #, sh-format
11782 msgid "Failed to add submodule '$sm_path'"
11783 msgstr "无法添加子模组 '$sm_path'"
11784
11785 #: git-submodule.sh:373
11786 #, sh-format
11787 msgid "Failed to register submodule '$sm_path'"
11788 msgstr "无法注册子模组 '$sm_path'"
11789
11790 #: git-submodule.sh:417
11791 #, sh-format
11792 msgid "Entering '$prefix$displaypath'"
11793 msgstr "正在进入 '$prefix$displaypath'"
11794
11795 #: git-submodule.sh:437
11796 #, sh-format
11797 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11798 msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
11799
11800 #: git-submodule.sh:483
11801 #, sh-format
11802 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11803 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11804
11805 #: git-submodule.sh:492
11806 #, sh-format
11807 msgid "Failed to register url for submodule path '$displaypath'"
11808 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11809
11810 #: git-submodule.sh:494
11811 #, sh-format
11812 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11813 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11814
11815 #: git-submodule.sh:511
11816 #, sh-format
11817 msgid "Failed to register update mode for submodule path '$displaypath'"
11818 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11819
11820 #: git-submodule.sh:549
11821 #, sh-format
11822 msgid "Use '.' if you really want to deinitialize all submodules"
11823 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11824
11825 #: git-submodule.sh:566
11826 #, sh-format
11827 msgid "Submodule work tree '$displaypath' contains a .git directory"
11828 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11829
11830 #: git-submodule.sh:567
11831 #, sh-format
11832 msgid ""
11833 "(use 'rm -rf' if you really want to remove it including all of its history)"
11834 msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
11835
11836 #: git-submodule.sh:573
11837 #, sh-format
11838 msgid ""
11839 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11840 "discard them"
11841 msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
11842
11843 #: git-submodule.sh:576
11844 #, sh-format
11845 msgid "Cleared directory '$displaypath'"
11846 msgstr "已清除目录 '$displaypath'"
11847
11848 #: git-submodule.sh:577
11849 #, sh-format
11850 msgid "Could not remove submodule work tree '$displaypath'"
11851 msgstr "无法移除子模组工作区 '$displaypath'"
11852
11853 #: git-submodule.sh:580
11854 #, sh-format
11855 msgid "Could not create empty submodule directory '$displaypath'"
11856 msgstr "不能创建空的子模组目录 '$displaypath'"
11857
11858 #: git-submodule.sh:589
11859 #, sh-format
11860 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11861 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11862
11863 #: git-submodule.sh:705
11864 #, sh-format
11865 msgid ""
11866 "Submodule path '$displaypath' not initialized\n"
11867 "Maybe you want to use 'update --init'?"
11868 msgstr ""
11869 "子模组路径 '$displaypath' 没有初始化\n"
11870 "也许您想用 'update --init'？"
11871
11872 #: git-submodule.sh:718
11873 #, sh-format
11874 msgid "Unable to find current revision in submodule path '$displaypath'"
11875 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11876
11877 #: git-submodule.sh:727
11878 #, sh-format
11879 msgid "Unable to fetch in submodule path '$sm_path'"
11880 msgstr "无法在子模组路径 '$sm_path' 中获取"
11881
11882 #: git-submodule.sh:751
11883 #, sh-format
11884 msgid "Unable to fetch in submodule path '$displaypath'"
11885 msgstr "无法在子模组路径 '$displaypath' 中获取"
11886
11887 #: git-submodule.sh:765
11888 #, sh-format
11889 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11890 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11891
11892 #: git-submodule.sh:766
11893 #, sh-format
11894 msgid "Submodule path '$displaypath': checked out '$sha1'"
11895 msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
11896
11897 #: git-submodule.sh:770
11898 #, sh-format
11899 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11900 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11901
11902 #: git-submodule.sh:771
11903 #, sh-format
11904 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11905 msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
11906
11907 #: git-submodule.sh:776
11908 #, sh-format
11909 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11910 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11911
11912 #: git-submodule.sh:777
11913 #, sh-format
11914 msgid "Submodule path '$displaypath': merged in '$sha1'"
11915 msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
11916
11917 #: git-submodule.sh:782
11918 #, sh-format
11919 msgid ""
11920 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11921 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11922
11923 #: git-submodule.sh:783
11924 #, sh-format
11925 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11926 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11927
11928 #: git-submodule.sh:813
11929 #, sh-format
11930 msgid "Failed to recurse into submodule path '$displaypath'"
11931 msgstr "无法递归进子模组路径 '$displaypath'"
11932
11933 #: git-submodule.sh:921
11934 msgid "The --cached option cannot be used with the --files option"
11935 msgstr "选项 --cached 不能和选项 --files 同时使用"
11936
11937 #: git-submodule.sh:973
11938 #, sh-format
11939 msgid "unexpected mode $mod_dst"
11940 msgstr "意外的模式 $mod_dst"
11941
11942 #  译者：注意保持前导空格
11943 #: git-submodule.sh:993
11944 #, sh-format
11945 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
11946 msgstr "  警告：$display_name 未包含提交 $sha1_src"
11947
11948 #  译者：注意保持前导空格
11949 #: git-submodule.sh:996
11950 #, sh-format
11951 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
11952 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
11953
11954 #  译者：注意保持前导空格
11955 #: git-submodule.sh:999
11956 #, sh-format
11957 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11958 msgstr "  警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11959
11960 #: git-submodule.sh:1024
11961 msgid "blob"
11962 msgstr "数据对象"
11963
11964 #: git-submodule.sh:1142
11965 #, sh-format
11966 msgid "Failed to recurse into submodule path '$sm_path'"
11967 msgstr "无法递归进子模组路径 '$sm_path'"
11968
11969 #: git-submodule.sh:1206
11970 #, sh-format
11971 msgid "Synchronizing submodule url for '$displaypath'"
11972 msgstr "为 '$displaypath' 同步子模组 url"
11973
11974 #~ msgid "unable to look up current user in the passwd file: %s"
11975 #~ msgstr "无法在口令文件中查询到当前用户：%s"
11976
11977 #~ msgid "no such user"
11978 #~ msgstr "无此用户"
11979
11980 #~ msgid "show usage"
11981 #~ msgstr "显示用法"
11982
11983 #~ msgid "branch '%s' does not point at a commit"
11984 #~ msgstr "分支 '%s' 未指向一个提交"
11985
11986 #~ msgid "object '%s' does not point to a commit"
11987 #~ msgstr "对象 '%s' 没有指向一个提交"
11988
11989 #~ msgid "print only merged branches"
11990 #~ msgstr "只打印合并的分支"
11991
11992 #~ msgid "--dissociate given, but there is no --reference"
11993 #~ msgstr "提供了参数 --dissociate，但未提供 --reference"
11994
11995 #~ msgid "insanely long template name %s"
11996 #~ msgstr "太长的模版名 %s"
11997
11998 #~ msgid "insanely long symlink %s"
11999 #~ msgstr "太长的符号链接 %s"
12000
12001 #~ msgid "insanely long template path %s"
12002 #~ msgstr "太长的模版路径 %s"
12003
12004 #~ msgid "insane git directory %s"
12005 #~ msgstr "不正常的 git 目录 %s"
12006
12007 #~ msgid "unsupported sort specification '%s'"
12008 #~ msgstr "不支持的排序规格 '%s'"
12009
12010 #~ msgid "unsupported sort specification '%s' in variable '%s'"
12011 #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12012
12013 #~ msgid "switch 'points-at' requires an object"
12014 #~ msgstr "开关 'points-at' 需要一个对象"
12015
12016 #~ msgid "sort tags"
12017 #~ msgstr "排序标签"
12018
12019 #~ msgid "--sort and -n are incompatible"
12020 #~ msgstr "--sort 和 -n 不兼容"
12021
12022 #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12023 #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12024
12025 #~ msgid "false|true|preserve"
12026 #~ msgstr "false|true|preserve"
12027
12028 #~ msgid "BUG: reopen a lockfile that is still open"
12029 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12030
12031 #~ msgid "BUG: reopen a lockfile that has been committed"
12032 #~ msgstr "BUG: 重新打开一个已提交的锁文件"
12033
12034 #~ msgid "option %s does not accept negative form"
12035 #~ msgstr "选项 %s 不接受否定格式"
12036
12037 #~ msgid "unable to parse value '%s' for option %s"
12038 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12039
12040 #~ msgid "unable to resolve HEAD"
12041 #~ msgstr "不能解析 HEAD"
12042
12043 #~ msgid "-b and -B are mutually exclusive"
12044 #~ msgstr "-b 和 -B 互斥"
12045
12046 #~ msgid "You need to set your committer info first"
12047 #~ msgstr "您需要先设置你的提交者信息"
12048
12049 #~ msgid ""
12050 #~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12051 #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12052 #~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12053 #~ "\"."
12054 #~ msgstr ""
12055 #~ "当您解决了此问题后，执行 \"$cmdline --continue\"。\n"
12056 #~ "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
12057 #~ "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
12058
12059 #~ msgid "Patch format $patch_format is not supported."
12060 #~ msgstr "不支持 $patch_format 补丁格式。"
12061
12062 #~ msgid "Please make up your mind. --skip or --abort?"
12063 #~ msgstr "请下决心。--skip 或是 --abort ？"
12064
12065 #~ msgid ""
12066 #~ "Patch is empty.  Was it split wrong?\n"
12067 #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12068 #~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12069 #~ msgstr ""
12070 #~ "补丁为空。是不是切分错误？\n"
12071 #~ "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
12072 #~ "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
12073
12074 #~ msgid "Patch does not have a valid e-mail address."
12075 #~ msgstr "补丁中没有一个有效的邮件地址。"
12076
12077 #~ msgid "Applying: $FIRSTLINE"
12078 #~ msgstr "正应用：$FIRSTLINE"
12079
12080 #~ msgid "Patch failed at $msgnum $FIRSTLINE"
12081 #~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12082
12083 #~ msgid ""
12084 #~ "Pull is not possible because you have unmerged files.\n"
12085 #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12086 #~ "as appropriate to mark resolution and make a commit."
12087 #~ msgstr ""
12088 #~ "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
12089 #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案，再做提交。"
12090
12091 #~ msgid "Pull is not possible because you have unmerged files."
12092 #~ msgstr "Pull 不可用，因为您尚有未合并的文件。"