po/zh_CN.po

   1 # Chinese translations for Git package
   2 # Git 软件包的简体中文翻译.
   3 # Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
   4 # This file is distributed under the same license as the Git package.
   5 # Contributers:
   6 #   - Jiang Xin <worldhello.net AT gmail.com>
   7 #   - Riku <lu.riku AT gmail.com>
   8 #   - Zhuang Ya <zhuangya AT me.com>
   9 #   - Lian Cheng <rhythm.mail AT gmail.com>
  10 #
  11 msgid ""
  12 msgstr ""
  13 "Project-Id-Version: Git\n"
  14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
  15 "POT-Creation-Date: 2012-06-08 10:20+0800\n"
  16 "PO-Revision-Date: 2012-06-08 12:24+0800\n"
  17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
  18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
  19 "Language: zh_CN\n"
  20 "MIME-Version: 1.0\n"
  21 "Content-Type: text/plain; charset=UTF-8\n"
  22 "Content-Transfer-Encoding: 8bit\n"
  23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
  24
  25 #: advice.c:40
  26 #, c-format
  27 msgid "hint: %.*s\n"
  28 msgstr "提示：%.*s\n"
  29
  30 #.
  31 #. * Message used both when 'git commit' fails and when
  32 #. * other commands doing a merge do.
  33 #.
  34 #: advice.c:70
  35 msgid ""
  36 "Fix them up in the work tree,\n"
  37 "and then use 'git add/rm <file>' as\n"
  38 "appropriate to mark resolution and make a commit,\n"
  39 "or use 'git commit -a'."
  40 msgstr ""
  41 "请先在工作区改正文件，然后酌情使用\n"
  42 "'git add/rm <file>' 标记解决方案，\n"
  43 "或使用 'git commit -a'。"
  44
  45 #: bundle.c:36
  46 #, c-format
  47 msgid "'%s' does not look like a v2 bundle file"
  48 msgstr "'%s' 不像是一个 v2 版本的包文件"
  49
  50 #: bundle.c:63
  51 #, c-format
  52 msgid "unrecognized header: %s%s (%d)"
  53 msgstr "未能识别的包头：%s%s (%d)"
  54
  55 #: bundle.c:89 builtin/commit.c:696
  56 #, c-format
  57 msgid "could not open '%s'"
  58 msgstr "不能打开 '%s'"
  59
  60 #: bundle.c:140
  61 msgid "Repository lacks these prerequisite commits:"
  62 msgstr "版本库缺少这些必备的提交："
  63
  64 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
  65 #: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
  66 #: builtin/shortlog.c:181
  67 msgid "revision walk setup failed"
  68 msgstr "版本遍历设置失败"
  69
  70 #: bundle.c:186
  71 #, c-format
  72 msgid "The bundle contains %d ref"
  73 msgid_plural "The bundle contains %d refs"
  74 msgstr[0] "这个包中含有 %d 个引用"
  75 msgstr[1] "这个包中含有 %d 个引用"
  76
  77 #: bundle.c:192
  78 #, c-format
  79 msgid "The bundle requires this ref"
  80 msgid_plural "The bundle requires these %d refs"
  81 msgstr[0] "这个包需要这个引用"
  82 msgstr[1] "这个包需要 %d 个这些引用"
  83
  84 #: bundle.c:290
  85 msgid "rev-list died"
  86 msgstr "rev-list 终止"
  87
  88 #: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
  89 #, c-format
  90 msgid "unrecognized argument: %s"
  91 msgstr "未能识别的参数：%s"
  92
  93 #: bundle.c:331
  94 #, c-format
  95 msgid "ref '%s' is excluded by the rev-list options"
  96 msgstr "引用 '%s' 被 rev-list 选项排除"
  97
  98 #: bundle.c:376
  99 msgid "Refusing to create empty bundle."
 100 msgstr "不能创建空包。"
 101
 102 #: bundle.c:394
 103 msgid "Could not spawn pack-objects"
 104 msgstr "不能生成 pack-objects 进程"
 105
 106 #: bundle.c:412
 107 msgid "pack-objects died"
 108 msgstr "pack-objects 终止"
 109
 110 #: bundle.c:415
 111 #, c-format
 112 msgid "cannot create '%s'"
 113 msgstr "不能创建 '%s'"
 114
 115 #: bundle.c:437
 116 msgid "index-pack died"
 117 msgstr "index-pack 终止"
 118
 119 #: commit.c:48
 120 #, c-format
 121 msgid "could not parse %s"
 122 msgstr "不能解析 %s"
 123
 124 #: commit.c:50
 125 #, c-format
 126 msgid "%s %s is not a commit!"
 127 msgstr "%s %s 不是一个提交!"
 128
 129 #: compat/obstack.c:406 compat/obstack.c:408
 130 msgid "memory exhausted"
 131 msgstr "内存耗尽"
 132
 133 #: connected.c:39
 134 msgid "Could not run 'git rev-list'"
 135 msgstr "不能执行 'git rev-list'"
 136
 137 #: connected.c:48
 138 #, c-format
 139 msgid "failed write to rev-list: %s"
 140 msgstr "无法写入 rev-list：%s"
 141
 142 #: connected.c:56
 143 #, c-format
 144 msgid "failed to close rev-list's stdin: %s"
 145 msgstr "无法关闭 rev-list 的标准输入：%s"
 146
 147 #: date.c:95
 148 msgid "in the future"
 149 msgstr "在将来"
 150
 151 #: date.c:101
 152 #, c-format
 153 msgid "%lu second ago"
 154 msgid_plural "%lu seconds ago"
 155 msgstr[0] "%lu 秒钟之前"
 156 msgstr[1] "%lu 秒钟之前"
 157
 158 #: date.c:108
 159 #, c-format
 160 msgid "%lu minute ago"
 161 msgid_plural "%lu minutes ago"
 162 msgstr[0] "%lu 分钟之前"
 163 msgstr[1] "%lu 分钟之前"
 164
 165 #: date.c:115
 166 #, c-format
 167 msgid "%lu hour ago"
 168 msgid_plural "%lu hours ago"
 169 msgstr[0] "%lu 小时之前"
 170 msgstr[1] "%lu 小时之前"
 171
 172 #: date.c:122
 173 #, c-format
 174 msgid "%lu day ago"
 175 msgid_plural "%lu days ago"
 176 msgstr[0] "%lu 天之前"
 177 msgstr[1] "%lu 天之前"
 178
 179 #: date.c:128
 180 #, c-format
 181 msgid "%lu week ago"
 182 msgid_plural "%lu weeks ago"
 183 msgstr[0] "%lu 周之前"
 184 msgstr[1] "%lu 周之前"
 185
 186 #: date.c:135
 187 #, c-format
 188 msgid "%lu month ago"
 189 msgid_plural "%lu months ago"
 190 msgstr[0] "%lu 个月之前"
 191 msgstr[1] "%lu 个月之前"
 192
 193 #: date.c:146
 194 #, c-format
 195 msgid "%lu year"
 196 msgid_plural "%lu years"
 197 msgstr[0] "%lu 年"
 198 msgstr[1] "%lu 年"
 199
 200 #: date.c:149
 201 #, c-format
 202 msgid "%s, %lu month ago"
 203 msgid_plural "%s, %lu months ago"
 204 msgstr[0] "%s，%lu 个月之前"
 205 msgstr[1] "%s，%lu 个月之前"
 206
 207 #: date.c:154 date.c:159
 208 #, c-format
 209 msgid "%lu year ago"
 210 msgid_plural "%lu years ago"
 211 msgstr[0] "%lu 年前"
 212 msgstr[1] "%lu 年前"
 213
 214 #  译者：注意保持前导空格
 215 #: diff.c:105
 216 #, c-format
 217 msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
 218 msgstr "  无法解析 dirstat 阈值 '%.*s'\n"
 219
 220 #  译者：注意保持前导空格
 221 #: diff.c:110
 222 #, c-format
 223 msgid "  Unknown dirstat parameter '%.*s'\n"
 224 msgstr "  未知 dirstat 参数 '%.*s'\n"
 225
 226 #: diff.c:210
 227 #, c-format
 228 msgid ""
 229 "Found errors in 'diff.dirstat' config variable:\n"
 230 "%s"
 231 msgstr ""
 232 "发现配置变量 'diff.dirstat' 中的错误：\n"
 233 "%s"
 234
 235 #: diff.c:1400
 236 msgid " 0 files changed\n"
 237 msgstr " 0 个文件被修改\n"
 238
 239 #: diff.c:1404
 240 #, c-format
 241 msgid " %d file changed"
 242 msgid_plural " %d files changed"
 243 msgstr[0] " %d 个文件被修改"
 244 msgstr[1] " %d 个文件被修改"
 245
 246 #: diff.c:1421
 247 #, c-format
 248 msgid ", %d insertion(+)"
 249 msgid_plural ", %d insertions(+)"
 250 msgstr[0] "，插入 %d 行(+)"
 251 msgstr[1] "，插入 %d 行(+)"
 252
 253 #: diff.c:1432
 254 #, c-format
 255 msgid ", %d deletion(-)"
 256 msgid_plural ", %d deletions(-)"
 257 msgstr[0] "，删除 %d 行(-)"
 258 msgstr[1] "，删除 %d 行(-)"
 259
 260 #: diff.c:3478
 261 #, c-format
 262 msgid ""
 263 "Failed to parse --dirstat/-X option parameter:\n"
 264 "%s"
 265 msgstr ""
 266 "无法解析 --dirstat/-X 选项的参数：\n"
 267 "%s"
 268
 269 #: gpg-interface.c:59
 270 msgid "could not run gpg."
 271 msgstr "不能执行 gpg。"
 272
 273 #: gpg-interface.c:71
 274 msgid "gpg did not accept the data"
 275 msgstr "gpg 没有接受数据"
 276
 277 #: gpg-interface.c:82
 278 msgid "gpg failed to sign the data"
 279 msgstr "gpg 无法为数据签名"
 280
 281 #: grep.c:1320
 282 #, c-format
 283 msgid "'%s': unable to read %s"
 284 msgstr "'%s'：无法读取 %s"
 285
 286 #: grep.c:1337
 287 #, c-format
 288 msgid "'%s': %s"
 289 msgstr "'%s'：%s"
 290
 291 #: grep.c:1348
 292 #, c-format
 293 msgid "'%s': short read %s"
 294 msgstr "'%s'：读取不完整 %s"
 295
 296 #: help.c:207
 297 #, c-format
 298 msgid "available git commands in '%s'"
 299 msgstr "在 '%s' 下可用的 git 命令"
 300
 301 #: help.c:214
 302 msgid "git commands available from elsewhere on your $PATH"
 303 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 304
 305 #: help.c:270
 306 #, c-format
 307 msgid ""
 308 "'%s' appears to be a git command, but we were not\n"
 309 "able to execute it. Maybe git-%s is broken?"
 310 msgstr ""
 311 "'%s' 像是一个 git 命令，但却无法运行。\n"
 312 "可能是 git-%s 受损？"
 313
 314 #: help.c:327
 315 msgid "Uh oh. Your system reports no Git commands at all."
 316 msgstr "唉呀，您的系统中未发现 Git 命令。"
 317
 318 #: help.c:349
 319 #, c-format
 320 msgid ""
 321 "WARNING: You called a Git command named '%s', which does not exist.\n"
 322 "Continuing under the assumption that you meant '%s'"
 323 msgstr ""
 324 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
 325 "是 '%s'"
 326
 327 #: help.c:354
 328 #, c-format
 329 msgid "in %0.1f seconds automatically..."
 330 msgstr "在 %0.1f 秒钟后自动运行..."
 331
 332 #: help.c:361
 333 #, c-format
 334 msgid "git: '%s' is not a git command. See 'git --help'."
 335 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 336
 337 #: help.c:365
 338 msgid ""
 339 "\n"
 340 "Did you mean this?"
 341 msgid_plural ""
 342 "\n"
 343 "Did you mean one of these?"
 344 msgstr[0] ""
 345 "\n"
 346 "您指的是这个么？"
 347 msgstr[1] ""
 348 "\n"
 349 "您指的是这些其中一个么？"
 350
 351 #: parse-options.c:493
 352 msgid "..."
 353 msgstr "..."
 354
 355 #: parse-options.c:511
 356 #, c-format
 357 msgid "usage: %s"
 358 msgstr "用法：%s"
 359
 360 #. TRANSLATORS: the colon here should align with the
 361 #. one in "usage: %s" translation
 362 #: parse-options.c:515
 363 #, c-format
 364 msgid "   or: %s"
 365 msgstr "  或：%s"
 366
 367 #  译者：为保证在输出中对齐，注意调整句中空格！
 368 #: parse-options.c:518
 369 #, c-format
 370 msgid "    %s"
 371 msgstr "    %s"
 372
 373 #: remote.c:1629
 374 #, c-format
 375 msgid "Your branch is ahead of '%s' by %d commit.\n"
 376 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 377 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 378 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
 379
 380 #: remote.c:1635
 381 #, c-format
 382 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 383 msgid_plural ""
 384 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
 385 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 386 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 387
 388 #: remote.c:1643
 389 #, c-format
 390 msgid ""
 391 "Your branch and '%s' have diverged,\n"
 392 "and have %d and %d different commit each, respectively.\n"
 393 msgid_plural ""
 394 "Your branch and '%s' have diverged,\n"
 395 "and have %d and %d different commits each, respectively.\n"
 396 msgstr[0] ""
 397 "您的分支和 '%s' 出现了偏离，\n"
 398 "并且各自分别有 %d 和 %d 处不同的提交。\n"
 399 msgstr[1] ""
 400 "您的分支和 '%s' 出现了偏离，\n"
 401 "并且各自分别有 %d 和 %d 处不同的提交。\n"
 402
 403 #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
 404 #: builtin/merge.c:1088 builtin/merge.c:1098
 405 #, c-format
 406 msgid "Could not open '%s' for writing"
 407 msgstr "不能为写入打开 '%s'"
 408
 409 #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
 410 #: builtin/merge.c:1090 builtin/merge.c:1103
 411 #, c-format
 412 msgid "Could not write to '%s'"
 413 msgstr "不能写入 '%s'"
 414
 415 #: sequencer.c:144
 416 msgid ""
 417 "after resolving the conflicts, mark the corrected paths\n"
 418 "with 'git add <paths>' or 'git rm <paths>'"
 419 msgstr ""
 420 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 421 "命令标记修正后的文件"
 422
 423 #: sequencer.c:147
 424 msgid ""
 425 "after resolving the conflicts, mark the corrected paths\n"
 426 "with 'git add <paths>' or 'git rm <paths>'\n"
 427 "and commit the result with 'git commit'"
 428 msgstr ""
 429 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 430 "对修正后的文件做标记，然后用 'git commit' 提交"
 431
 432 #: sequencer.c:160 sequencer.c:758 sequencer.c:841
 433 #, c-format
 434 msgid "Could not write to %s"
 435 msgstr "不能写入 %s"
 436
 437 #: sequencer.c:163
 438 #, c-format
 439 msgid "Error wrapping up %s"
 440 msgstr "错误收尾 %s"
 441
 442 #: sequencer.c:178
 443 msgid "Your local changes would be overwritten by cherry-pick."
 444 msgstr "您的本地修改将被拣选操作覆盖。"
 445
 446 #: sequencer.c:180
 447 msgid "Your local changes would be overwritten by revert."
 448 msgstr "您的本地修改将被还原操作覆盖。"
 449
 450 #: sequencer.c:183
 451 msgid "Commit your changes or stash them to proceed."
 452 msgstr "提交您的修改或保存进度后再继续。"
 453
 454 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
 455 #: sequencer.c:233
 456 #, c-format
 457 msgid "%s: Unable to write new index file"
 458 msgstr "%s：无法写入新索引文件"
 459
 460 #: sequencer.c:261
 461 msgid "Could not resolve HEAD commit\n"
 462 msgstr "不能解析 HEAD 提交\n"
 463
 464 #: sequencer.c:282
 465 msgid "Unable to update cache tree\n"
 466 msgstr "不能更新缓存\n"
 467
 468 #: sequencer.c:324
 469 #, c-format
 470 msgid "Could not parse commit %s\n"
 471 msgstr "不能解析提交 %s\n"
 472
 473 #: sequencer.c:329
 474 #, c-format
 475 msgid "Could not parse parent commit %s\n"
 476 msgstr "不能解析父提交 %s\n"
 477
 478 #: sequencer.c:395
 479 msgid "Your index file is unmerged."
 480 msgstr "您的索引文件未完成合并。"
 481
 482 #: sequencer.c:398
 483 msgid "You do not have a valid HEAD"
 484 msgstr "您没有一个有效的 HEAD"
 485
 486 #: sequencer.c:413
 487 #, c-format
 488 msgid "Commit %s is a merge but no -m option was given."
 489 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 490
 491 #: sequencer.c:421
 492 #, c-format
 493 msgid "Commit %s does not have parent %d"
 494 msgstr "提交 %s 没有父提交 %d"
 495
 496 #: sequencer.c:425
 497 #, c-format
 498 msgid "Mainline was specified but commit %s is not a merge."
 499 msgstr "指定了主线但提交 %s 不是一个合并。"
 500
 501 #. TRANSLATORS: The first %s will be "revert" or
 502 #. "cherry-pick", the second %s a SHA1
 503 #: sequencer.c:436
 504 #, c-format
 505 msgid "%s: cannot parse parent commit %s"
 506 msgstr "%s：不能解析父提交 %s"
 507
 508 #: sequencer.c:440
 509 #, c-format
 510 msgid "Cannot get commit message for %s"
 511 msgstr "不能得到 %s 的提交说明"
 512
 513 #: sequencer.c:524
 514 #, c-format
 515 msgid "could not revert %s... %s"
 516 msgstr "不能还原 %s... %s"
 517
 518 #: sequencer.c:525
 519 #, c-format
 520 msgid "could not apply %s... %s"
 521 msgstr "不能应用 %s... %s"
 522
 523 #: sequencer.c:553
 524 msgid "empty commit set passed"
 525 msgstr "提供了空的提交集"
 526
 527 #: sequencer.c:561
 528 #, c-format
 529 msgid "git %s: failed to read the index"
 530 msgstr "git %s：无法读取索引"
 531
 532 #: sequencer.c:566
 533 #, c-format
 534 msgid "git %s: failed to refresh the index"
 535 msgstr "git %s：无法刷新索引"
 536
 537 #: sequencer.c:624
 538 #, c-format
 539 msgid "Cannot %s during a %s"
 540 msgstr "无法 %s 在一个 %s 过程中"
 541
 542 #: sequencer.c:646
 543 #, c-format
 544 msgid "Could not parse line %d."
 545 msgstr "不能解析第 %d 行。"
 546
 547 #: sequencer.c:651
 548 msgid "No commits parsed."
 549 msgstr "没有提交被解析。"
 550
 551 #: sequencer.c:664
 552 #, c-format
 553 msgid "Could not open %s"
 554 msgstr "不能打开 %s"
 555
 556 #: sequencer.c:668
 557 #, c-format
 558 msgid "Could not read %s."
 559 msgstr "不能读取 %s。"
 560
 561 #: sequencer.c:675
 562 #, c-format
 563 msgid "Unusable instruction sheet: %s"
 564 msgstr "无用的指令表单：%s"
 565
 566 #: sequencer.c:703
 567 #, c-format
 568 msgid "Invalid key: %s"
 569 msgstr "无效键名：%s"
 570
 571 #: sequencer.c:706
 572 #, c-format
 573 msgid "Invalid value for %s: %s"
 574 msgstr "%s 的值无效：%s"
 575
 576 #: sequencer.c:718
 577 #, c-format
 578 msgid "Malformed options sheet: %s"
 579 msgstr "非法的选项表单：%s"
 580
 581 #: sequencer.c:739
 582 msgid "a cherry-pick or revert is already in progress"
 583 msgstr "一个拣选或还原操作已在进行"
 584
 585 #: sequencer.c:740
 586 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 587 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 588
 589 #: sequencer.c:744
 590 #, c-format
 591 msgid "Could not create sequencer directory %s"
 592 msgstr "不能创建序列目录 %s"
 593
 594 #: sequencer.c:760 sequencer.c:845
 595 #, c-format
 596 msgid "Error wrapping up %s."
 597 msgstr "错误收尾 %s。"
 598
 599 #: sequencer.c:779 sequencer.c:913
 600 msgid "no cherry-pick or revert in progress"
 601 msgstr "没有拣选或还原操作在进行"
 602
 603 #: sequencer.c:781
 604 msgid "cannot resolve HEAD"
 605 msgstr "不能解析 HEAD"
 606
 607 #: sequencer.c:783
 608 msgid "cannot abort from a branch yet to be born"
 609 msgstr "不能从尚未建立的分支终止"
 610
 611 #: sequencer.c:805 builtin/apply.c:3697
 612 #, c-format
 613 msgid "cannot open %s: %s"
 614 msgstr "不能打开 %s：%s"
 615
 616 #: sequencer.c:808
 617 #, c-format
 618 msgid "cannot read %s: %s"
 619 msgstr "不能读取 %s：%s"
 620
 621 #: sequencer.c:809
 622 msgid "unexpected end of file"
 623 msgstr "未预期的文件结束"
 624
 625 #: sequencer.c:815
 626 #, c-format
 627 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 628 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 629
 630 #: sequencer.c:838
 631 #, c-format
 632 msgid "Could not format %s."
 633 msgstr "不能格式化 %s。"
 634
 635 #: sequencer.c:1000
 636 msgid "Can't revert as initial commit"
 637 msgstr "不能作为初始提交还原"
 638
 639 #: sequencer.c:1001
 640 msgid "Can't cherry-pick into empty head"
 641 msgstr "不能拣选到空分支"
 642
 643 #: sha1_name.c:864
 644 msgid "HEAD does not point to a branch"
 645 msgstr "HEAD 没有指向一个分支"
 646
 647 #: sha1_name.c:867
 648 #, c-format
 649 msgid "No such branch: '%s'"
 650 msgstr "没有此分支：'%s'"
 651
 652 #: sha1_name.c:869
 653 #, c-format
 654 msgid "No upstream configured for branch '%s'"
 655 msgstr "尚未给分支 '%s' 设置上游"
 656
 657 #: sha1_name.c:872
 658 #, c-format
 659 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
 660 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 661
 662 #: wrapper.c:413
 663 #, c-format
 664 msgid "unable to look up current user in the passwd file: %s"
 665 msgstr "无法在 passwd 文件中查询到当前用户：%s"
 666
 667 #: wrapper.c:414
 668 msgid "no such user"
 669 msgstr "无此用户"
 670
 671 #: wt-status.c:135
 672 msgid "Unmerged paths:"
 673 msgstr "未合并的路径："
 674
 675 #  译者：注意保持前导空格
 676 #: wt-status.c:141 wt-status.c:158
 677 #, c-format
 678 msgid "  (use \"git reset %s <file>...\" to unstage)"
 679 msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"
 680
 681 #  译者：注意保持前导空格
 682 #: wt-status.c:143 wt-status.c:160
 683 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 684 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"
 685
 686 #  译者：注意保持前导空格
 687 #: wt-status.c:144
 688 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 689 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
 690
 691 #: wt-status.c:152
 692 msgid "Changes to be committed:"
 693 msgstr "要提交的变更："
 694
 695 #: wt-status.c:170
 696 msgid "Changes not staged for commit:"
 697 msgstr "尚未暂存以备提交的变更："
 698
 699 #  译者：注意保持前导空格
 700 #: wt-status.c:174
 701 msgid "  (use \"git add <file>...\" to update what will be committed)"
 702 msgstr "  （使用 \"git add <file>...\" 更新要提交的内容）"
 703
 704 #  译者：注意保持前导空格
 705 #: wt-status.c:176
 706 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 707 msgstr "  （使用 \"git add/rm <file>...\" 更新要提交的内容）"
 708
 709 #  译者：注意保持前导空格
 710 #: wt-status.c:177
 711 msgid ""
 712 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 713 msgstr "  （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
 714
 715 #  译者：注意保持前导空格
 716 #: wt-status.c:179
 717 msgid "  (commit or discard the untracked or modified content in submodules)"
 718 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 719
 720 #: wt-status.c:188
 721 #, c-format
 722 msgid "%s files:"
 723 msgstr "%s文件："
 724
 725 #  译者：注意保持前导空格
 726 #: wt-status.c:191
 727 #, c-format
 728 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 729 msgstr "  （使用 \"git %s <file>...\" 以包含要提交的内容）"
 730
 731 #: wt-status.c:208
 732 msgid "bug"
 733 msgstr "bug"
 734
 735 #: wt-status.c:213
 736 msgid "both deleted:"
 737 msgstr "双方删除："
 738
 739 #: wt-status.c:214
 740 msgid "added by us:"
 741 msgstr "由我们添加："
 742
 743 #: wt-status.c:215
 744 msgid "deleted by them:"
 745 msgstr "由他们删除："
 746
 747 #: wt-status.c:216
 748 msgid "added by them:"
 749 msgstr "由他们添加："
 750
 751 #: wt-status.c:217
 752 msgid "deleted by us:"
 753 msgstr "由我们删除："
 754
 755 #: wt-status.c:218
 756 msgid "both added:"
 757 msgstr "双方添加："
 758
 759 #: wt-status.c:219
 760 msgid "both modified:"
 761 msgstr "双方修改："
 762
 763 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 764 #: wt-status.c:249
 765 msgid "new commits, "
 766 msgstr "新提交, "
 767
 768 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 769 #: wt-status.c:251
 770 msgid "modified content, "
 771 msgstr "修改的内容, "
 772
 773 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 774 #: wt-status.c:253
 775 msgid "untracked content, "
 776 msgstr "未跟踪的内容, "
 777
 778 #  译者：为保证在输出中对齐，注意调整句中空格！
 779 #: wt-status.c:267
 780 #, c-format
 781 msgid "new file:   %s"
 782 msgstr "新文件：    %s"
 783
 784 #  译者：为保证在输出中对齐，注意调整句中空格！
 785 #: wt-status.c:270
 786 #, c-format
 787 msgid "copied:     %s -> %s"
 788 msgstr "拷贝：      %s -> %s"
 789
 790 #  译者：为保证在输出中对齐，注意调整句中空格！
 791 #: wt-status.c:273
 792 #, c-format
 793 msgid "deleted:    %s"
 794 msgstr "删除：      %s"
 795
 796 #  译者：为保证在输出中对齐，注意调整句中空格！
 797 #: wt-status.c:276
 798 #, c-format
 799 msgid "modified:   %s"
 800 msgstr "修改：      %s"
 801
 802 #  译者：为保证在输出中对齐，注意调整句中空格！
 803 #: wt-status.c:279
 804 #, c-format
 805 msgid "renamed:    %s -> %s"
 806 msgstr "重命名：    %s -> %s"
 807
 808 #  译者：为保证在输出中对齐，注意调整句中空格！
 809 #: wt-status.c:282
 810 #, c-format
 811 msgid "typechange: %s"
 812 msgstr "类型变更：  %s"
 813
 814 #  译者：为保证在输出中对齐，注意调整句中空格！
 815 #: wt-status.c:285
 816 #, c-format
 817 msgid "unknown:    %s"
 818 msgstr "未知：      %s"
 819
 820 #  译者：为保证在输出中对齐，注意调整句中空格！
 821 #: wt-status.c:288
 822 #, c-format
 823 msgid "unmerged:   %s"
 824 msgstr "未合并：    %s"
 825
 826 #: wt-status.c:291
 827 #, c-format
 828 msgid "bug: unhandled diff status %c"
 829 msgstr "bug：未处理的差异状态 %c"
 830
 831 #: wt-status.c:737
 832 msgid "On branch "
 833 msgstr "位于分支 "
 834
 835 #: wt-status.c:744
 836 msgid "Not currently on any branch."
 837 msgstr "当前不在任何分支上。"
 838
 839 #: wt-status.c:755
 840 msgid "Initial commit"
 841 msgstr "初始提交"
 842
 843 #: wt-status.c:769
 844 msgid "Untracked"
 845 msgstr "未跟踪的"
 846
 847 #: wt-status.c:771
 848 msgid "Ignored"
 849 msgstr "忽略的"
 850
 851 #: wt-status.c:773
 852 #, c-format
 853 msgid "Untracked files not listed%s"
 854 msgstr "未跟踪的文件没有列出%s"
 855
 856 #  译者：中文字符串拼接，可删除前导空格
 857 #: wt-status.c:775
 858 msgid " (use -u option to show untracked files)"
 859 msgstr "（使用 -u 参数显示未跟踪的文件）"
 860
 861 #: wt-status.c:781
 862 msgid "No changes"
 863 msgstr "没有修改"
 864
 865 #: wt-status.c:785
 866 #, c-format
 867 msgid "no changes added to commit%s\n"
 868 msgstr "修改尚未加入提交%s\n"
 869
 870 #  译者：中文字符串拼接，可删除前导空格
 871 #: wt-status.c:787
 872 msgid " (use \"git add\" and/or \"git commit -a\")"
 873 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
 874
 875 #: wt-status.c:789
 876 #, c-format
 877 msgid "nothing added to commit but untracked files present%s\n"
 878 msgstr "空提交但存在未跟踪文件%s\n"
 879
 880 #  译者：中文字符串拼接，可删除前导空格
 881 #: wt-status.c:791
 882 msgid " (use \"git add\" to track)"
 883 msgstr "（使用 \"git add\" 建立跟踪）"
 884
 885 #: wt-status.c:793 wt-status.c:796 wt-status.c:799
 886 #, c-format
 887 msgid "nothing to commit%s\n"
 888 msgstr "无须提交%s\n"
 889
 890 #  译者：中文字符串拼接，可删除前导空格
 891 #: wt-status.c:794
 892 msgid " (create/copy files and use \"git add\" to track)"
 893 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
 894
 895 #  译者：中文字符串拼接，可删除前导空格
 896 #: wt-status.c:797
 897 msgid " (use -u to show untracked files)"
 898 msgstr "（使用 -u 显示未跟踪文件）"
 899
 900 #  译者：中文字符串拼接，可删除前导空格
 901 #: wt-status.c:800
 902 msgid " (working directory clean)"
 903 msgstr "（干净的工作区）"
 904
 905 #: wt-status.c:908
 906 msgid "HEAD (no branch)"
 907 msgstr "HEAD（非分支）"
 908
 909 #  译者：注意保持句尾空格
 910 #: wt-status.c:914
 911 msgid "Initial commit on "
 912 msgstr "初始提交于 "
 913
 914 #  译者：注意保持句尾空格
 915 #: wt-status.c:929
 916 msgid "behind "
 917 msgstr "落后 "
 918
 919 #  译者：注意保持句尾空格
 920 #: wt-status.c:932 wt-status.c:935
 921 msgid "ahead "
 922 msgstr "领先 "
 923
 924 #  译者：注意保持句尾空格
 925 #: wt-status.c:937
 926 msgid ", behind "
 927 msgstr "，落后 "
 928
 929 #: builtin/add.c:62
 930 #, c-format
 931 msgid "unexpected diff status %c"
 932 msgstr "意外的差异状态 %c"
 933
 934 #: builtin/add.c:67 builtin/commit.c:226
 935 msgid "updating files failed"
 936 msgstr "更新文件失败"
 937
 938 #: builtin/add.c:77
 939 #, c-format
 940 msgid "remove '%s'\n"
 941 msgstr "删除 '%s'\n"
 942
 943 #: builtin/add.c:176
 944 #, c-format
 945 msgid "Path '%s' is in submodule '%.*s'"
 946 msgstr "路径 '%s' 属于模组 '%.*s'"
 947
 948 #: builtin/add.c:192
 949 msgid "Unstaged changes after refreshing the index:"
 950 msgstr "刷新索引之后尚未被暂存的变更："
 951
 952 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
 953 #, c-format
 954 msgid "pathspec '%s' did not match any files"
 955 msgstr "路径 '%s' 未匹配任何文件"
 956
 957 #: builtin/add.c:209
 958 #, c-format
 959 msgid "'%s' is beyond a symbolic link"
 960 msgstr "'%s' 位于符号链接中"
 961
 962 #: builtin/add.c:276
 963 msgid "Could not read the index"
 964 msgstr "不能读取索引"
 965
 966 #: builtin/add.c:286
 967 #, c-format
 968 msgid "Could not open '%s' for writing."
 969 msgstr "不能为写入打开 '%s'。"
 970
 971 #: builtin/add.c:290
 972 msgid "Could not write patch"
 973 msgstr "不能写补丁"
 974
 975 #: builtin/add.c:295
 976 #, c-format
 977 msgid "Could not stat '%s'"
 978 msgstr "不能查看文件状态 '%s'"
 979
 980 #: builtin/add.c:297
 981 msgid "Empty patch. Aborted."
 982 msgstr "空补丁。异常终止。"
 983
 984 #: builtin/add.c:303
 985 #, c-format
 986 msgid "Could not apply '%s'"
 987 msgstr "不能应用 '%s'"
 988
 989 #: builtin/add.c:312
 990 msgid "The following paths are ignored by one of your .gitignore files:\n"
 991 msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
 992
 993 #: builtin/add.c:352
 994 #, c-format
 995 msgid "Use -f if you really want to add them.\n"
 996 msgstr "使用 -f 参数如果您确实要添加它们。\n"
 997
 998 #: builtin/add.c:353
 999 msgid "no files added"
1000 msgstr "没有文件被添加"
1001
1002 #: builtin/add.c:359
1003 msgid "adding files failed"
1004 msgstr "添加文件失败"
1005
1006 #: builtin/add.c:391
1007 msgid "-A and -u are mutually incompatible"
1008 msgstr "-A 和 -u 选项互斥"
1009
1010 #: builtin/add.c:393
1011 msgid "Option --ignore-missing can only be used together with --dry-run"
1012 msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
1013
1014 #: builtin/add.c:413
1015 #, c-format
1016 msgid "Nothing specified, nothing added.\n"
1017 msgstr "没有指定文件，也没有文件被添加。\n"
1018
1019 #: builtin/add.c:414
1020 #, c-format
1021 msgid "Maybe you wanted to say 'git add .'?\n"
1022 msgstr "也许您想要执行 'git add .'？\n"
1023
1024 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
1025 #: builtin/rm.c:162
1026 msgid "index file corrupt"
1027 msgstr "索引文件损坏"
1028
1029 #: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1030 msgid "Unable to write new index file"
1031 msgstr "无法写入新索引文件"
1032
1033 #: builtin/apply.c:53
1034 msgid "git apply [options] [<patch>...]"
1035 msgstr "git apply [选项] [<补丁>...]"
1036
1037 #: builtin/apply.c:106
1038 #, c-format
1039 msgid "unrecognized whitespace option '%s'"
1040 msgstr "未能识别的空白字符选项 '%s'"
1041
1042 #: builtin/apply.c:121
1043 #, c-format
1044 msgid "unrecognized whitespace ignore option '%s'"
1045 msgstr "未能识别的空白字符忽略选项 '%s'"
1046
1047 #: builtin/apply.c:815
1048 #, c-format
1049 msgid "Cannot prepare timestamp regexp %s"
1050 msgstr "无法准备时间戳正则表达式 %s"
1051
1052 #: builtin/apply.c:824
1053 #, c-format
1054 msgid "regexec returned %d for input: %s"
1055 msgstr "regexec 返回 %d，输入为：%s"
1056
1057 #: builtin/apply.c:905
1058 #, c-format
1059 msgid "unable to find filename in patch at line %d"
1060 msgstr "不能在补丁的第 %d 行找到文件名"
1061
1062 #: builtin/apply.c:937
1063 #, c-format
1064 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1065 msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
1066
1067 #: builtin/apply.c:941
1068 #, c-format
1069 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1070 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1071
1072 #: builtin/apply.c:942
1073 #, c-format
1074 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1075 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1076
1077 #: builtin/apply.c:949
1078 #, c-format
1079 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1080 msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
1081
1082 #: builtin/apply.c:1394
1083 #, c-format
1084 msgid "recount: unexpected line: %.*s"
1085 msgstr "recount：意外的行：%.*s"
1086
1087 #: builtin/apply.c:1451
1088 #, c-format
1089 msgid "patch fragment without header at line %d: %.*s"
1090 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1091
1092 #: builtin/apply.c:1468
1093 #, c-format
1094 msgid ""
1095 "git diff header lacks filename information when removing %d leading pathname "
1096 "component (line %d)"
1097 msgid_plural ""
1098 "git diff header lacks filename information when removing %d leading pathname "
1099 "components (line %d)"
1100 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1101 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1102
1103 #: builtin/apply.c:1628
1104 msgid "new file depends on old contents"
1105 msgstr "新文件依赖旧内容"
1106
1107 #: builtin/apply.c:1630
1108 msgid "deleted file still has contents"
1109 msgstr "删除的文件仍有内容"
1110
1111 #: builtin/apply.c:1656
1112 #, c-format
1113 msgid "corrupt patch at line %d"
1114 msgstr "补丁损坏位于第 %d 行"
1115
1116 #: builtin/apply.c:1692
1117 #, c-format
1118 msgid "new file %s depends on old contents"
1119 msgstr "新文件 %s 依赖旧内容"
1120
1121 #: builtin/apply.c:1694
1122 #, c-format
1123 msgid "deleted file %s still has contents"
1124 msgstr "删除的文件 %s 仍有内容"
1125
1126 #: builtin/apply.c:1697
1127 #, c-format
1128 msgid "** warning: file %s becomes empty but is not deleted"
1129 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1130
1131 #: builtin/apply.c:1843
1132 #, c-format
1133 msgid "corrupt binary patch at line %d: %.*s"
1134 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1135
1136 #. there has to be one hunk (forward hunk)
1137 #: builtin/apply.c:1872
1138 #, c-format
1139 msgid "unrecognized binary patch at line %d"
1140 msgstr "未能识别的二进制补丁位于第 %d 行"
1141
1142 #: builtin/apply.c:1958
1143 #, c-format
1144 msgid "patch with only garbage at line %d"
1145 msgstr "补丁文件的第 %d 行只有垃圾数据"
1146
1147 #: builtin/apply.c:2048
1148 #, c-format
1149 msgid "unable to read symlink %s"
1150 msgstr "无法读取符号链接 %s"
1151
1152 #: builtin/apply.c:2052
1153 #, c-format
1154 msgid "unable to open or read %s"
1155 msgstr "不能打开或读取 %s"
1156
1157 #: builtin/apply.c:2123
1158 msgid "oops"
1159 msgstr "哎哟"
1160
1161 #: builtin/apply.c:2645
1162 #, c-format
1163 msgid "invalid start of line: '%c'"
1164 msgstr "无效的行首字符：'%c'"
1165
1166 #: builtin/apply.c:2763
1167 #, c-format
1168 msgid "Hunk #%d succeeded at %d (offset %d line)."
1169 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1170 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）"
1171 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）"
1172
1173 #: builtin/apply.c:2775
1174 #, c-format
1175 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1176 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1177
1178 #: builtin/apply.c:2781
1179 #, c-format
1180 msgid ""
1181 "while searching for:\n"
1182 "%.*s"
1183 msgstr ""
1184 "当查询：\n"
1185 "%.*s"
1186
1187 #: builtin/apply.c:2800
1188 #, c-format
1189 msgid "missing binary patch data for '%s'"
1190 msgstr "缺失 '%s' 的二进制补丁数据"
1191
1192 #: builtin/apply.c:2903
1193 #, c-format
1194 msgid "binary patch does not apply to '%s'"
1195 msgstr "二进制补丁未应用到 '%s'"
1196
1197 #: builtin/apply.c:2909
1198 #, c-format
1199 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1200 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
1201
1202 #: builtin/apply.c:2930
1203 #, c-format
1204 msgid "patch failed: %s:%ld"
1205 msgstr "打补丁失败：%s:%ld"
1206
1207 #: builtin/apply.c:3045
1208 #, c-format
1209 msgid "patch %s has been renamed/deleted"
1210 msgstr "补丁 %s 已经被重命名/删除"
1211
1212 #: builtin/apply.c:3052 builtin/apply.c:3069
1213 #, c-format
1214 msgid "read of %s failed"
1215 msgstr "读取 %s 失败"
1216
1217 #: builtin/apply.c:3084
1218 msgid "removal patch leaves file contents"
1219 msgstr "移除补丁仍留下了文件内容"
1220
1221 #: builtin/apply.c:3105
1222 #, c-format
1223 msgid "%s: already exists in working directory"
1224 msgstr "%s：已经存在于工作区中"
1225
1226 #: builtin/apply.c:3143
1227 #, c-format
1228 msgid "%s: has been deleted/renamed"
1229 msgstr "%s：已经被删除/重命名"
1230
1231 #: builtin/apply.c:3148 builtin/apply.c:3179
1232 #, c-format
1233 msgid "%s: %s"
1234 msgstr "%s：%s"
1235
1236 #: builtin/apply.c:3159
1237 #, c-format
1238 msgid "%s: does not exist in index"
1239 msgstr "%s：不存在于索引中"
1240
1241 #: builtin/apply.c:3173
1242 #, c-format
1243 msgid "%s: does not match index"
1244 msgstr "%s：和索引不匹配"
1245
1246 #: builtin/apply.c:3190
1247 #, c-format
1248 msgid "%s: wrong type"
1249 msgstr "%s：错误类型"
1250
1251 #: builtin/apply.c:3192
1252 #, c-format
1253 msgid "%s has type %o, expected %o"
1254 msgstr "%s 的类型是 %o，预期是 %o"
1255
1256 #: builtin/apply.c:3247
1257 #, c-format
1258 msgid "%s: already exists in index"
1259 msgstr "%s：已经存在于索引中"
1260
1261 #: builtin/apply.c:3267
1262 #, c-format
1263 msgid "new mode (%o) of %s does not match old mode (%o)"
1264 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1265
1266 #: builtin/apply.c:3272
1267 #, c-format
1268 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1269 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1270
1271 #: builtin/apply.c:3280
1272 #, c-format
1273 msgid "%s: patch does not apply"
1274 msgstr "%s：补丁未应用"
1275
1276 #: builtin/apply.c:3293
1277 #, c-format
1278 msgid "Checking patch %s..."
1279 msgstr "检查补丁 %s..."
1280
1281 #: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1282 #, c-format
1283 msgid "make_cache_entry failed for path '%s'"
1284 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1285
1286 #: builtin/apply.c:3491
1287 #, c-format
1288 msgid "unable to remove %s from index"
1289 msgstr "不能从索引中移除 %s"
1290
1291 #: builtin/apply.c:3518
1292 #, c-format
1293 msgid "corrupt patch for subproject %s"
1294 msgstr "子项目 %s 损坏的补丁"
1295
1296 #: builtin/apply.c:3522
1297 #, c-format
1298 msgid "unable to stat newly created file '%s'"
1299 msgstr "不能枚举新建文件 '%s' 的状态"
1300
1301 #: builtin/apply.c:3527
1302 #, c-format
1303 msgid "unable to create backing store for newly created file %s"
1304 msgstr "不能为新建文件 %s 创建后端存储"
1305
1306 #: builtin/apply.c:3530
1307 #, c-format
1308 msgid "unable to add cache entry for %s"
1309 msgstr "无法为 %s 添加缓存条目"
1310
1311 #: builtin/apply.c:3563
1312 #, c-format
1313 msgid "closing file '%s'"
1314 msgstr "关闭文件 '%s'"
1315
1316 #: builtin/apply.c:3612
1317 #, c-format
1318 msgid "unable to write file '%s' mode %o"
1319 msgstr "不能写文件 '%s' 权限 %o"
1320
1321 #: builtin/apply.c:3668
1322 #, c-format
1323 msgid "Applied patch %s cleanly."
1324 msgstr "成功应用补丁 %s。"
1325
1326 #: builtin/apply.c:3676
1327 msgid "internal error"
1328 msgstr "内部错误"
1329
1330 #. Say this even without --verbose
1331 #: builtin/apply.c:3679
1332 #, c-format
1333 msgid "Applying patch %%s with %d reject..."
1334 msgid_plural "Applying patch %%s with %d rejects..."
1335 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1336 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1337
1338 #: builtin/apply.c:3689
1339 #, c-format
1340 msgid "truncating .rej filename to %.*s.rej"
1341 msgstr "截短 .rej 文件名为 %.*s.rej"
1342
1343 #: builtin/apply.c:3710
1344 #, c-format
1345 msgid "Hunk #%d applied cleanly."
1346 msgstr "第 #%d 个片段成功应用。"
1347
1348 #: builtin/apply.c:3713
1349 #, c-format
1350 msgid "Rejected hunk #%d."
1351 msgstr "拒绝第 #%d 个片段。"
1352
1353 #: builtin/apply.c:3844
1354 msgid "unrecognized input"
1355 msgstr "未能识别的输入"
1356
1357 #: builtin/apply.c:3855
1358 msgid "unable to read index file"
1359 msgstr "无法读取索引文件"
1360
1361 #: builtin/apply.c:3970 builtin/apply.c:3973
1362 msgid "path"
1363 msgstr "路径"
1364
1365 #: builtin/apply.c:3971
1366 msgid "don't apply changes matching the given path"
1367 msgstr "不要应用与给出路径向匹配的变更"
1368
1369 #: builtin/apply.c:3974
1370 msgid "apply changes matching the given path"
1371 msgstr "应用与给出路径向匹配的变更"
1372
1373 #: builtin/apply.c:3976
1374 msgid "num"
1375 msgstr "数字"
1376
1377 #: builtin/apply.c:3977
1378 msgid "remove <num> leading slashes from traditional diff paths"
1379 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1380
1381 #: builtin/apply.c:3980
1382 msgid "ignore additions made by the patch"
1383 msgstr "忽略补丁中的添加的文件"
1384
1385 #: builtin/apply.c:3982
1386 msgid "instead of applying the patch, output diffstat for the input"
1387 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1388
1389 #: builtin/apply.c:3986
1390 msgid "shows number of added and deleted lines in decimal notation"
1391 msgstr "以数字方式显示添加或删除行的数量"
1392
1393 #: builtin/apply.c:3988
1394 msgid "instead of applying the patch, output a summary for the input"
1395 msgstr "不应用补丁，而是显示输入的概要"
1396
1397 #: builtin/apply.c:3990
1398 msgid "instead of applying the patch, see if the patch is applicable"
1399 msgstr "不应用补丁，而是查看补丁是否可应用"
1400
1401 #: builtin/apply.c:3992
1402 msgid "make sure the patch is applicable to the current index"
1403 msgstr "确认补丁可以应用到当前索引"
1404
1405 #: builtin/apply.c:3994
1406 msgid "apply a patch without touching the working tree"
1407 msgstr "应用补丁而不修改工作区"
1408
1409 #: builtin/apply.c:3996
1410 msgid "also apply the patch (use with --stat/--summary/--check)"
1411 msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）"
1412
1413 #: builtin/apply.c:3998
1414 msgid "build a temporary index based on embedded index information"
1415 msgstr "创建一个临时索引基于嵌入的索引信息"
1416
1417 #: builtin/apply.c:4000
1418 msgid "paths are separated with NUL character"
1419 msgstr "路径以 NUL 字符分隔"
1420
1421 #: builtin/apply.c:4003
1422 msgid "ensure at least <n> lines of context match"
1423 msgstr "确保至少匹配 <n> 行上下文"
1424
1425 #: builtin/apply.c:4004
1426 msgid "action"
1427 msgstr "动作"
1428
1429 #: builtin/apply.c:4005
1430 msgid "detect new or modified lines that have whitespace errors"
1431 msgstr "检查新增和修改的行中间的空白字符滥用"
1432
1433 #: builtin/apply.c:4008 builtin/apply.c:4011
1434 msgid "ignore changes in whitespace when finding context"
1435 msgstr "查找上下文时忽略空白字符的变更"
1436
1437 #: builtin/apply.c:4014
1438 msgid "apply the patch in reverse"
1439 msgstr "反向应用补丁"
1440
1441 #: builtin/apply.c:4016
1442 msgid "don't expect at least one line of context"
1443 msgstr "无需至少一行上下文"
1444
1445 #: builtin/apply.c:4018
1446 msgid "leave the rejected hunks in corresponding *.rej files"
1447 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1448
1449 #: builtin/apply.c:4020
1450 msgid "allow overlapping hunks"
1451 msgstr "允许重叠的补丁片段"
1452
1453 #: builtin/apply.c:4021
1454 msgid "be verbose"
1455 msgstr "冗长输出"
1456
1457 #: builtin/apply.c:4023
1458 msgid "tolerate incorrectly detected missing new-line at the end of file"
1459 msgstr "宽容不正确的文件末尾换行符"
1460
1461 #: builtin/apply.c:4026
1462 msgid "do not trust the line counts in the hunk headers"
1463 msgstr "不信任补丁片段的头信息中的行号"
1464
1465 #: builtin/apply.c:4028
1466 msgid "root"
1467 msgstr "根目录"
1468
1469 #: builtin/apply.c:4029
1470 msgid "prepend <root> to all filenames"
1471 msgstr "为所有文件名前添加 <根目录>"
1472
1473 #: builtin/apply.c:4050
1474 msgid "--index outside a repository"
1475 msgstr "--index 在一个版本库之外"
1476
1477 #: builtin/apply.c:4053
1478 msgid "--cached outside a repository"
1479 msgstr "--cached 在一个版本库之外"
1480
1481 #: builtin/apply.c:4069
1482 #, c-format
1483 msgid "can't open patch '%s'"
1484 msgstr "不能打开补丁 '%s'"
1485
1486 #: builtin/apply.c:4083
1487 #, c-format
1488 msgid "squelched %d whitespace error"
1489 msgid_plural "squelched %d whitespace errors"
1490 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1491 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1492
1493 #: builtin/apply.c:4089 builtin/apply.c:4099
1494 #, c-format
1495 msgid "%d line adds whitespace errors."
1496 msgid_plural "%d lines add whitespace errors."
1497 msgstr[0] "%d 行有空白字符误用。"
1498 msgstr[1] "%d 行有空白字符误用。"
1499
1500 #: builtin/archive.c:17
1501 #, c-format
1502 msgid "could not create archive file '%s'"
1503 msgstr "不能创建归档文件 '%s'"
1504
1505 #: builtin/archive.c:20
1506 msgid "could not redirect output"
1507 msgstr "不能输出重定向"
1508
1509 #: builtin/archive.c:37
1510 msgid "git archive: Remote with no URL"
1511 msgstr "git archive：未提供远程URL"
1512
1513 #: builtin/archive.c:58
1514 msgid "git archive: expected ACK/NAK, got EOF"
1515 msgstr "git archive：期待ACK/NACK，却得到EOF"
1516
1517 #: builtin/archive.c:63
1518 #, c-format
1519 msgid "git archive: NACK %s"
1520 msgstr "git archive：NACK %s"
1521
1522 #: builtin/archive.c:65
1523 #, c-format
1524 msgid "remote error: %s"
1525 msgstr "远程错误：%s"
1526
1527 #: builtin/archive.c:66
1528 msgid "git archive: protocol error"
1529 msgstr "git archive：协议错误"
1530
1531 #: builtin/archive.c:71
1532 msgid "git archive: expected a flush"
1533 msgstr "git archive：预期一个刷新"
1534
1535 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
1536 #: builtin/branch.c:144
1537 #, c-format
1538 msgid ""
1539 "deleting branch '%s' that has been merged to\n"
1540 "         '%s', but not yet merged to HEAD."
1541 msgstr ""
1542 "将要删除的分支 '%s' 已经被合并到\n"
1543 "         '%s'，但未合并到 HEAD。"
1544
1545 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
1546 #: builtin/branch.c:148
1547 #, c-format
1548 msgid ""
1549 "not deleting branch '%s' that is not yet merged to\n"
1550 "         '%s', even though it is merged to HEAD."
1551 msgstr ""
1552 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
1553 "         然而却尚未被合并到分支 '%s' 。"
1554
1555 #: builtin/branch.c:180
1556 msgid "cannot use -a with -d"
1557 msgstr "不能将 -a 和 -d 共用"
1558
1559 #: builtin/branch.c:186
1560 msgid "Couldn't look up commit object for HEAD"
1561 msgstr "无法查询 HEAD 指向的提交对象"
1562
1563 #: builtin/branch.c:191
1564 #, c-format
1565 msgid "Cannot delete the branch '%s' which you are currently on."
1566 msgstr "无法删除您当前所在的分支 '%s'。"
1567
1568 #: builtin/branch.c:202
1569 #, c-format
1570 msgid "remote branch '%s' not found."
1571 msgstr "远程分支 '%s' 未发现。"
1572
1573 #: builtin/branch.c:203
1574 #, c-format
1575 msgid "branch '%s' not found."
1576 msgstr "分支 '%s' 未发现。"
1577
1578 #: builtin/branch.c:210
1579 #, c-format
1580 msgid "Couldn't look up commit object for '%s'"
1581 msgstr "无法查询 '%s' 指向的提交对象"
1582
1583 #: builtin/branch.c:216
1584 #, c-format
1585 msgid ""
1586 "The branch '%s' is not fully merged.\n"
1587 "If you are sure you want to delete it, run 'git branch -D %s'."
1588 msgstr ""
1589 "分支 '%s' 没有完全合并。\n"
1590 "如果您确认要删除它，执行 'git branch -D %s'。"
1591
1592 #: builtin/branch.c:225
1593 #, c-format
1594 msgid "Error deleting remote branch '%s'"
1595 msgstr "删除远程分支 '%s' 时出错"
1596
1597 #: builtin/branch.c:226
1598 #, c-format
1599 msgid "Error deleting branch '%s'"
1600 msgstr "删除分支 '%s' 时出错"
1601
1602 #: builtin/branch.c:233
1603 #, c-format
1604 msgid "Deleted remote branch %s (was %s).\n"
1605 msgstr "已删除远程分支 %s（曾为 %s）。\n"
1606
1607 #: builtin/branch.c:234
1608 #, c-format
1609 msgid "Deleted branch %s (was %s).\n"
1610 msgstr "已删除分支 %s（曾为 %s）。\n"
1611
1612 #: builtin/branch.c:239
1613 msgid "Update of config-file failed"
1614 msgstr "无法更新 config 文件"
1615
1616 #: builtin/branch.c:337
1617 #, c-format
1618 msgid "branch '%s' does not point at a commit"
1619 msgstr "分支 '%s' 未指向一个提交"
1620
1621 #: builtin/branch.c:409
1622 #, c-format
1623 msgid "[%s: behind %d]"
1624 msgstr "[%s：落后 %d]"
1625
1626 #: builtin/branch.c:411
1627 #, c-format
1628 msgid "[behind %d]"
1629 msgstr "[落后 %d]"
1630
1631 #: builtin/branch.c:415
1632 #, c-format
1633 msgid "[%s: ahead %d]"
1634 msgstr "[%s：领先 %d]"
1635
1636 #: builtin/branch.c:417
1637 #, c-format
1638 msgid "[ahead %d]"
1639 msgstr "[领先 %d]"
1640
1641 #: builtin/branch.c:420
1642 #, c-format
1643 msgid "[%s: ahead %d, behind %d]"
1644 msgstr "[%s：领先 %d，落后 %d]"
1645
1646 #: builtin/branch.c:423
1647 #, c-format
1648 msgid "[ahead %d, behind %d]"
1649 msgstr "[领先 %d，落后 %d]"
1650
1651 #: builtin/branch.c:535
1652 msgid "(no branch)"
1653 msgstr "（非分支）"
1654
1655 #: builtin/branch.c:600
1656 msgid "some refs could not be read"
1657 msgstr "一些引用不能读取"
1658
1659 #: builtin/branch.c:613
1660 msgid "cannot rename the current branch while not on any."
1661 msgstr "无法重命名当前分支因为不处于任何分支上。"
1662
1663 #: builtin/branch.c:623
1664 #, c-format
1665 msgid "Invalid branch name: '%s'"
1666 msgstr "无效的分支名：'%s'"
1667
1668 #: builtin/branch.c:638
1669 msgid "Branch rename failed"
1670 msgstr "分支重命名失败"
1671
1672 #: builtin/branch.c:642
1673 #, c-format
1674 msgid "Renamed a misnamed branch '%s' away"
1675 msgstr "重命名掉一个错误命名的旧分支 '%s'"
1676
1677 #: builtin/branch.c:646
1678 #, c-format
1679 msgid "Branch renamed to %s, but HEAD is not updated!"
1680 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
1681
1682 #: builtin/branch.c:653
1683 msgid "Branch is renamed, but update of config-file failed"
1684 msgstr "分支被重命名，但更新 config 文件失败"
1685
1686 #: builtin/branch.c:668
1687 #, c-format
1688 msgid "malformed object name %s"
1689 msgstr "非法的对象名 %s"
1690
1691 #: builtin/branch.c:692
1692 #, c-format
1693 msgid "could not write branch description template: %s"
1694 msgstr "不能写分支描述模版：%s"
1695
1696 #: builtin/branch.c:783
1697 msgid "Failed to resolve HEAD as a valid ref."
1698 msgstr "无法将 HEAD 解析为有效引用。"
1699
1700 #: builtin/branch.c:788 builtin/clone.c:558
1701 msgid "HEAD not found below refs/heads!"
1702 msgstr "HEAD 没有位于 /refs/heads 之下！"
1703
1704 #: builtin/branch.c:808
1705 msgid "--column and --verbose are incompatible"
1706 msgstr "--column 和 --verbose 不兼容"
1707
1708 #: builtin/branch.c:857
1709 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1710 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
1711
1712 #: builtin/bundle.c:47
1713 #, c-format
1714 msgid "%s is okay\n"
1715 msgstr "%s 可以\n"
1716
1717 #: builtin/bundle.c:56
1718 msgid "Need a repository to create a bundle."
1719 msgstr "需要一个版本库来创建包。"
1720
1721 #: builtin/bundle.c:60
1722 msgid "Need a repository to unbundle."
1723 msgstr "需要一个版本库来解包。"
1724
1725 #: builtin/checkout.c:113 builtin/checkout.c:146
1726 #, c-format
1727 msgid "path '%s' does not have our version"
1728 msgstr "路径 '%s' 没有我们的版本"
1729
1730 #: builtin/checkout.c:115 builtin/checkout.c:148
1731 #, c-format
1732 msgid "path '%s' does not have their version"
1733 msgstr "路径 '%s' 没有他们的版本"
1734
1735 #: builtin/checkout.c:131
1736 #, c-format
1737 msgid "path '%s' does not have all necessary versions"
1738 msgstr "路径 '%s' 没有全部必须的版本"
1739
1740 #: builtin/checkout.c:175
1741 #, c-format
1742 msgid "path '%s' does not have necessary versions"
1743 msgstr "路径 '%s' 没有必须的版本"
1744
1745 #: builtin/checkout.c:192
1746 #, c-format
1747 msgid "path '%s': cannot merge"
1748 msgstr "path '%s'：无法合并"
1749
1750 #: builtin/checkout.c:209
1751 #, c-format
1752 msgid "Unable to add merge result for '%s'"
1753 msgstr "无法为 '%s' 添加合并结果"
1754
1755 #: builtin/checkout.c:234 builtin/checkout.c:392
1756 msgid "corrupt index file"
1757 msgstr "损坏的索引文件"
1758
1759 #: builtin/checkout.c:264 builtin/checkout.c:271
1760 #, c-format
1761 msgid "path '%s' is unmerged"
1762 msgstr "路径 '%s' 未合并"
1763
1764 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1765 #: builtin/merge.c:812
1766 msgid "unable to write new index file"
1767 msgstr "无法写新的索引文件"
1768
1769 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1770 msgid "diff_setup_done failed"
1771 msgstr "diff_setup_done 失败"
1772
1773 #: builtin/checkout.c:414
1774 msgid "you need to resolve your current index first"
1775 msgstr "您需要先解决当前索引的冲突"
1776
1777 #: builtin/checkout.c:533
1778 #, c-format
1779 msgid "Can not do reflog for '%s'\n"
1780 msgstr "不能对 '%s' 执行 reflog 操作\n"
1781
1782 #: builtin/checkout.c:566
1783 msgid "HEAD is now at"
1784 msgstr "HEAD 目前位于"
1785
1786 #: builtin/checkout.c:573
1787 #, c-format
1788 msgid "Reset branch '%s'\n"
1789 msgstr "重置分支 '%s'\n"
1790
1791 #: builtin/checkout.c:576
1792 #, c-format
1793 msgid "Already on '%s'\n"
1794 msgstr "已经位于 '%s'\n"
1795
1796 #: builtin/checkout.c:580
1797 #, c-format
1798 msgid "Switched to and reset branch '%s'\n"
1799 msgstr "切换并重置分支 '%s'\n"
1800
1801 #: builtin/checkout.c:582
1802 #, c-format
1803 msgid "Switched to a new branch '%s'\n"
1804 msgstr "切换到一个新分支 '%s'\n"
1805
1806 #: builtin/checkout.c:584
1807 #, c-format
1808 msgid "Switched to branch '%s'\n"
1809 msgstr "切换到分支 '%s'\n"
1810
1811 #  译者：注意保持前导空格
1812 #: builtin/checkout.c:640
1813 #, c-format
1814 msgid " ... and %d more.\n"
1815 msgstr " ... 及其它 %d 个。\n"
1816
1817 #. The singular version
1818 #: builtin/checkout.c:646
1819 #, c-format
1820 msgid ""
1821 "Warning: you are leaving %d commit behind, not connected to\n"
1822 "any of your branches:\n"
1823 "\n"
1824 "%s\n"
1825 msgid_plural ""
1826 "Warning: you are leaving %d commits behind, not connected to\n"
1827 "any of your branches:\n"
1828 "\n"
1829 "%s\n"
1830 msgstr[0] ""
1831 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
1832 "\n"
1833 "%s\n"
1834 msgstr[1] ""
1835 "警告：您正丢下 %d 个提交，未和任何分支关联：\n"
1836 "\n"
1837 "%s\n"
1838
1839 #: builtin/checkout.c:664
1840 #, c-format
1841 msgid ""
1842 "If you want to keep them by creating a new branch, this may be a good time\n"
1843 "to do so with:\n"
1844 "\n"
1845 " git branch new_branch_name %s\n"
1846 "\n"
1847 msgstr ""
1848 "如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"
1849 "如下操作：\n"
1850 "\n"
1851 " git branch new_branch_name %s\n"
1852 "\n"
1853
1854 #: builtin/checkout.c:694
1855 msgid "internal error in revision walk"
1856 msgstr "在版本遍历时遇到内部错误"
1857
1858 #: builtin/checkout.c:698
1859 msgid "Previous HEAD position was"
1860 msgstr "之前的 HEAD 位置是"
1861
1862 #: builtin/checkout.c:724
1863 msgid "You are on a branch yet to be born"
1864 msgstr "您位于一个尚未初始化的分支"
1865
1866 #. case (1)
1867 #: builtin/checkout.c:855
1868 #, c-format
1869 msgid "invalid reference: %s"
1870 msgstr "无效引用：%s"
1871
1872 #. case (1): want a tree
1873 #: builtin/checkout.c:894
1874 #, c-format
1875 msgid "reference is not a tree: %s"
1876 msgstr "引用不是一个树：%s"
1877
1878 #: builtin/checkout.c:974
1879 msgid "-B cannot be used with -b"
1880 msgstr "-B 不能和 -b 共用"
1881
1882 #: builtin/checkout.c:983
1883 msgid "--patch is incompatible with all other options"
1884 msgstr "--patch 选项和其他选项不兼容"
1885
1886 #: builtin/checkout.c:986
1887 msgid "--detach cannot be used with -b/-B/--orphan"
1888 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1889
1890 #: builtin/checkout.c:988
1891 msgid "--detach cannot be used with -t"
1892 msgstr "--detach 不能和 -t 共用"
1893
1894 #: builtin/checkout.c:994
1895 msgid "--track needs a branch name"
1896 msgstr "--track 需要一个分支名"
1897
1898 #: builtin/checkout.c:1001
1899 msgid "Missing branch name; try -b"
1900 msgstr "缺少分支名；尝试 -b"
1901
1902 #: builtin/checkout.c:1007
1903 msgid "--orphan and -b|-B are mutually exclusive"
1904 msgstr "--orphan 和 -b|-B 互斥"
1905
1906 #: builtin/checkout.c:1009
1907 msgid "--orphan cannot be used with -t"
1908 msgstr "--orphan 不能和 -t 共用"
1909
1910 #: builtin/checkout.c:1019
1911 msgid "git checkout: -f and -m are incompatible"
1912 msgstr "git checkout：-f 和 -m 不兼容"
1913
1914 #: builtin/checkout.c:1053
1915 msgid "invalid path specification"
1916 msgstr "无效的路径规格"
1917
1918 #: builtin/checkout.c:1061
1919 #, c-format
1920 msgid ""
1921 "git checkout: updating paths is incompatible with switching branches.\n"
1922 "Did you intend to checkout '%s' which can not be resolved as commit?"
1923 msgstr ""
1924 "git checkout：更新路径和切换分支不兼容。\n"
1925 "您是想要检出 '%s' 但未能将其解析为提交么？"
1926
1927 #: builtin/checkout.c:1063
1928 msgid "git checkout: updating paths is incompatible with switching branches."
1929 msgstr "git checkout：更新路径和切换分支不兼容。"
1930
1931 #: builtin/checkout.c:1068
1932 msgid "git checkout: --detach does not take a path argument"
1933 msgstr "git checkout：--detach 不跟路径参数"
1934
1935 #: builtin/checkout.c:1071
1936 msgid ""
1937 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1938 "checking out of the index."
1939 msgstr ""
1940 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
1941
1942 #: builtin/checkout.c:1090
1943 msgid "Cannot switch branch to a non-commit."
1944 msgstr "无法切换分支到一个非提交。"
1945
1946 #: builtin/checkout.c:1093
1947 msgid "--ours/--theirs is incompatible with switching branches."
1948 msgstr "--ours/--theirs 和切换分支不兼容。"
1949
1950 #: builtin/clean.c:78
1951 msgid "-x and -X cannot be used together"
1952 msgstr "-x 和 -X 不能共用"
1953
1954 #: builtin/clean.c:82
1955 msgid ""
1956 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1957 msgstr ""
1958 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
1959
1960 #: builtin/clean.c:85
1961 msgid ""
1962 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1963 "clean"
1964 msgstr ""
1965 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
1966
1967 #: builtin/clean.c:155 builtin/clean.c:176
1968 #, c-format
1969 msgid "Would remove %s\n"
1970 msgstr "将删除 %s\n"
1971
1972 #: builtin/clean.c:159 builtin/clean.c:179
1973 #, c-format
1974 msgid "Removing %s\n"
1975 msgstr "正删除 %s\n"
1976
1977 #: builtin/clean.c:162 builtin/clean.c:182
1978 #, c-format
1979 msgid "failed to remove %s"
1980 msgstr "无法删除 %s"
1981
1982 #: builtin/clean.c:166
1983 #, c-format
1984 msgid "Would not remove %s\n"
1985 msgstr "不会删除 %s\n"
1986
1987 #: builtin/clean.c:168
1988 #, c-format
1989 msgid "Not removing %s\n"
1990 msgstr "未删除 %s\n"
1991
1992 #: builtin/clone.c:243
1993 #, c-format
1994 msgid "reference repository '%s' is not a local directory."
1995 msgstr "引用版本库 '%s' 不是一个本地目录。"
1996
1997 #: builtin/clone.c:302
1998 #, c-format
1999 msgid "failed to open '%s'"
2000 msgstr "无法打开 '%s'"
2001
2002 #: builtin/clone.c:306
2003 #, c-format
2004 msgid "failed to create directory '%s'"
2005 msgstr "无法创建目录 '%s'"
2006
2007 #: builtin/clone.c:308 builtin/diff.c:75
2008 #, c-format
2009 msgid "failed to stat '%s'"
2010 msgstr "无法枚举 '%s' 状态"
2011
2012 #: builtin/clone.c:310
2013 #, c-format
2014 msgid "%s exists and is not a directory"
2015 msgstr "%s 存在且不是一个目录"
2016
2017 #: builtin/clone.c:324
2018 #, c-format
2019 msgid "failed to stat %s\n"
2020 msgstr "无法枚举 %s 状态\n"
2021
2022 #: builtin/clone.c:341
2023 #, c-format
2024 msgid "failed to unlink '%s'"
2025 msgstr "无法删除 '%s'"
2026
2027 #: builtin/clone.c:346
2028 #, c-format
2029 msgid "failed to create link '%s'"
2030 msgstr "无法创建链接 '%s'"
2031
2032 #: builtin/clone.c:350
2033 #, c-format
2034 msgid "failed to copy file to '%s'"
2035 msgstr "无法拷贝文件至 '%s'"
2036
2037 #: builtin/clone.c:373
2038 #, c-format
2039 msgid "done.\n"
2040 msgstr "完成。\n"
2041
2042 #: builtin/clone.c:440
2043 #, c-format
2044 msgid "Could not find remote branch %s to clone."
2045 msgstr "不能发现要克隆的远程分支 %s。"
2046
2047 #: builtin/clone.c:549
2048 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2049 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
2050
2051 #: builtin/clone.c:639
2052 msgid "Too many arguments."
2053 msgstr "太多参数。"
2054
2055 #: builtin/clone.c:643
2056 msgid "You must specify a repository to clone."
2057 msgstr "您必须指定一个版本库来克隆。"
2058
2059 #: builtin/clone.c:654
2060 #, c-format
2061 msgid "--bare and --origin %s options are incompatible."
2062 msgstr "--bare 和 --origin %s 选项不兼容。"
2063
2064 #: builtin/clone.c:668
2065 #, c-format
2066 msgid "repository '%s' does not exist"
2067 msgstr "版本库 '%s' 不存在"
2068
2069 #: builtin/clone.c:673
2070 msgid "--depth is ignored in local clones; use file:// instead."
2071 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
2072
2073 #: builtin/clone.c:683
2074 #, c-format
2075 msgid "destination path '%s' already exists and is not an empty directory."
2076 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
2077
2078 #: builtin/clone.c:693
2079 #, c-format
2080 msgid "working tree '%s' already exists."
2081 msgstr "工作区 '%s' 已经存在。"
2082
2083 #: builtin/clone.c:706 builtin/clone.c:720
2084 #, c-format
2085 msgid "could not create leading directories of '%s'"
2086 msgstr "不能为 '%s' 创建先导目录"
2087
2088 #: builtin/clone.c:709
2089 #, c-format
2090 msgid "could not create work tree dir '%s'."
2091 msgstr "不能为 '%s' 创建工作区目录。"
2092
2093 #: builtin/clone.c:728
2094 #, c-format
2095 msgid "Cloning into bare repository '%s'...\n"
2096 msgstr "克隆到裸版本库 '%s'...\n"
2097
2098 #: builtin/clone.c:730
2099 #, c-format
2100 msgid "Cloning into '%s'...\n"
2101 msgstr "正克隆到 '%s'...\n"
2102
2103 #: builtin/clone.c:786
2104 #, c-format
2105 msgid "Don't know how to clone %s"
2106 msgstr "不知道如何克隆 %s"
2107
2108 #: builtin/clone.c:835
2109 #, c-format
2110 msgid "Remote branch %s not found in upstream %s"
2111 msgstr "远程分支 %s 在上游 %s 未发现"
2112
2113 #: builtin/clone.c:842
2114 msgid "You appear to have cloned an empty repository."
2115 msgstr "您似乎克隆了一个空版本库。"
2116
2117 #: builtin/column.c:51
2118 msgid "--command must be the first argument"
2119 msgstr "--command 必须是第一个参数"
2120
2121 #: builtin/commit.c:43
2122 msgid ""
2123 "Your name and email address were configured automatically based\n"
2124 "on your username and hostname. Please check that they are accurate.\n"
2125 "You can suppress this message by setting them explicitly:\n"
2126 "\n"
2127 "    git config --global user.name \"Your Name\"\n"
2128 "    git config --global user.email you@example.com\n"
2129 "\n"
2130 "After doing this, you may fix the identity used for this commit with:\n"
2131 "\n"
2132 "    git commit --amend --reset-author\n"
2133 msgstr ""
2134 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
2135 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n"
2136 "\n"
2137 "    git config --global user.name \"Your Name\"\n"
2138 "    git config --global user.email you@example.com\n"
2139 "\n"
2140 "设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
2141 "\n"
2142 "    git commit --amend --reset-author\n"
2143
2144 #: builtin/commit.c:55
2145 msgid ""
2146 "You asked to amend the most recent commit, but doing so would make\n"
2147 "it empty. You can repeat your command with --allow-empty, or you can\n"
2148 "remove the commit entirely with \"git reset HEAD^\".\n"
2149 msgstr ""
2150 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
2151 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
2152
2153 #: builtin/commit.c:60
2154 msgid ""
2155 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
2156 "If you wish to commit it anyway, use:\n"
2157 "\n"
2158 "    git commit --allow-empty\n"
2159 "\n"
2160 "Otherwise, please use 'git reset'\n"
2161 msgstr ""
2162 "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
2163 "也要提交，使用命令：\n"
2164 "\n"
2165 "    git commit --allow-empty\n"
2166 "\n"
2167 "否则，请使用命令 'git reset'\n"
2168
2169 #: builtin/commit.c:253
2170 msgid "failed to unpack HEAD tree object"
2171 msgstr "无法解包 HEAD 树对象"
2172
2173 #: builtin/commit.c:295
2174 msgid "unable to create temporary index"
2175 msgstr "不能创建临时索引"
2176
2177 #: builtin/commit.c:301
2178 msgid "interactive add failed"
2179 msgstr "交互式添加失败"
2180
2181 #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2182 msgid "unable to write new_index file"
2183 msgstr "无法写 new_index 文件"
2184
2185 #: builtin/commit.c:386
2186 msgid "cannot do a partial commit during a merge."
2187 msgstr "在合并过程中不能做部分提交。"
2188
2189 #: builtin/commit.c:388
2190 msgid "cannot do a partial commit during a cherry-pick."
2191 msgstr "在拣选过程中不能做部分提交。"
2192
2193 #: builtin/commit.c:398
2194 msgid "cannot read the index"
2195 msgstr "无法读取索引"
2196
2197 #: builtin/commit.c:418
2198 msgid "unable to write temporary index file"
2199 msgstr "无法写临时索引文件"
2200
2201 #: builtin/commit.c:493 builtin/commit.c:499
2202 #, c-format
2203 msgid "invalid commit: %s"
2204 msgstr "无效的提交：%s"
2205
2206 #: builtin/commit.c:522
2207 msgid "malformed --author parameter"
2208 msgstr "非法的 --author 参数"
2209
2210 #: builtin/commit.c:582
2211 #, c-format
2212 msgid "Malformed ident string: '%s'"
2213 msgstr "非法的身份字符串：'%s'"
2214
2215 #: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2216 #, c-format
2217 msgid "could not lookup commit %s"
2218 msgstr "不能查询提交 %s"
2219
2220 #: builtin/commit.c:632 builtin/shortlog.c:296
2221 #, c-format
2222 msgid "(reading log message from standard input)\n"
2223 msgstr "（正从标准输入中读取日志信息）\n"
2224
2225 #: builtin/commit.c:634
2226 msgid "could not read log from standard input"
2227 msgstr "不能从标准输入中读取日志信息"
2228
2229 #: builtin/commit.c:638
2230 #, c-format
2231 msgid "could not read log file '%s'"
2232 msgstr "不能读取日志文件 '%s'"
2233
2234 #: builtin/commit.c:644
2235 msgid "commit has empty message"
2236 msgstr "提交说明为空"
2237
2238 #: builtin/commit.c:660
2239 msgid "could not read MERGE_MSG"
2240 msgstr "不能读取 MERGE_MSG"
2241
2242 #: builtin/commit.c:664
2243 msgid "could not read SQUASH_MSG"
2244 msgstr "不能读取 SQUASH_MSG"
2245
2246 #: builtin/commit.c:668
2247 #, c-format
2248 msgid "could not read '%s'"
2249 msgstr "不能读取 '%s'"
2250
2251 #: builtin/commit.c:720
2252 msgid "could not write commit template"
2253 msgstr "不能写提交模版"
2254
2255 #: builtin/commit.c:731
2256 #, c-format
2257 msgid ""
2258 "\n"
2259 "It looks like you may be committing a merge.\n"
2260 "If this is not correct, please remove the file\n"
2261 "\t%s\n"
2262 "and try again.\n"
2263 msgstr ""
2264 "\n"
2265 "看起来您正在做一个合并提交。如果不对，请删除文件\n"
2266 "\t%s\n"
2267 "然后重试。\n"
2268
2269 #: builtin/commit.c:736
2270 #, c-format
2271 msgid ""
2272 "\n"
2273 "It looks like you may be committing a cherry-pick.\n"
2274 "If this is not correct, please remove the file\n"
2275 "\t%s\n"
2276 "and try again.\n"
2277 msgstr ""
2278 "\n"
2279 "看起来您正在做一个拣选提交。如果不对，请删除文件\n"
2280 "\t%s\n"
2281 "然后重试。\n"
2282
2283 #: builtin/commit.c:748
2284 msgid ""
2285 "Please enter the commit message for your changes. Lines starting\n"
2286 "with '#' will be ignored, and an empty message aborts the commit.\n"
2287 msgstr ""
2288 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"
2289 "说明将会终止提交。\n"
2290
2291 #: builtin/commit.c:753
2292 msgid ""
2293 "Please enter the commit message for your changes. Lines starting\n"
2294 "with '#' will be kept; you may remove them yourself if you want to.\n"
2295 "An empty message aborts the commit.\n"
2296 msgstr ""
2297 "请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n"
2298 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2299
2300 #  译者：为保证在输出中对齐，注意调整句中空格！
2301 #: builtin/commit.c:766
2302 #, c-format
2303 msgid "%sAuthor:    %s"
2304 msgstr "%s作者：     %s"
2305
2306 #  译者：为保证在输出中对齐，注意调整句中空格！
2307 #: builtin/commit.c:773
2308 #, c-format
2309 msgid "%sCommitter: %s"
2310 msgstr "%s提交者：   %s"
2311
2312 #: builtin/commit.c:793
2313 msgid "Cannot read index"
2314 msgstr "无法读取索引"
2315
2316 #: builtin/commit.c:830
2317 msgid "Error building trees"
2318 msgstr "无法创建树对象"
2319
2320 #: builtin/commit.c:845 builtin/tag.c:361
2321 #, c-format
2322 msgid "Please supply the message using either -m or -F option.\n"
2323 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2324
2325 #: builtin/commit.c:942
2326 #, c-format
2327 msgid "No existing author found with '%s'"
2328 msgstr "没有找到匹配 '%s' 的作者"
2329
2330 #: builtin/commit.c:957 builtin/commit.c:1157
2331 #, c-format
2332 msgid "Invalid untracked files mode '%s'"
2333 msgstr "无效的未追踪文件参数 '%s'"
2334
2335 #: builtin/commit.c:997
2336 msgid "Using both --reset-author and --author does not make sense"
2337 msgstr "同时使用 --reset-author 和 --author 没有意义"
2338
2339 #: builtin/commit.c:1008
2340 msgid "You have nothing to amend."
2341 msgstr "您没有可修补的提交。"
2342
2343 #: builtin/commit.c:1011
2344 msgid "You are in the middle of a merge -- cannot amend."
2345 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2346
2347 #: builtin/commit.c:1013
2348 msgid "You are in the middle of a cherry-pick -- cannot amend."
2349 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2350
2351 #: builtin/commit.c:1016
2352 msgid "Options --squash and --fixup cannot be used together"
2353 msgstr "选项 --squash 和 --fixup 不能共用"
2354
2355 #: builtin/commit.c:1026
2356 msgid "Only one of -c/-C/-F/--fixup can be used."
2357 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2358
2359 #: builtin/commit.c:1028
2360 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2361 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2362
2363 #: builtin/commit.c:1036
2364 msgid "--reset-author can be used only with -C, -c or --amend."
2365 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2366
2367 #: builtin/commit.c:1053
2368 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2369 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2370
2371 #: builtin/commit.c:1055
2372 msgid "No paths with --include/--only does not make sense."
2373 msgstr "参数 --include/--only 不跟路径没有意义。"
2374
2375 #: builtin/commit.c:1057
2376 msgid "Clever... amending the last one with dirty index."
2377 msgstr "聪明... 在索引不干净下修补最后的提交。"
2378
2379 #: builtin/commit.c:1059
2380 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2381 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
2382
2383 #: builtin/commit.c:1069 builtin/tag.c:577
2384 #, c-format
2385 msgid "Invalid cleanup mode %s"
2386 msgstr "无效的清理模式 %s"
2387
2388 #: builtin/commit.c:1074
2389 msgid "Paths with -a does not make sense."
2390 msgstr "路径和 -a 选项共用没有意义。"
2391
2392 #: builtin/commit.c:1257
2393 msgid "couldn't look up newly created commit"
2394 msgstr "无法找到新创建的提交"
2395
2396 #: builtin/commit.c:1259
2397 msgid "could not parse newly created commit"
2398 msgstr "不能解析新创建的提交"
2399
2400 #: builtin/commit.c:1300
2401 msgid "detached HEAD"
2402 msgstr "分离头指针"
2403
2404 #  译者：中文字符串拼接，可删除前导空格
2405 #: builtin/commit.c:1302
2406 msgid " (root-commit)"
2407 msgstr "（根提交）"
2408
2409 #: builtin/commit.c:1446
2410 msgid "could not parse HEAD commit"
2411 msgstr "不能解析 HEAD 提交"
2412
2413 #: builtin/commit.c:1484 builtin/merge.c:509
2414 #, c-format
2415 msgid "could not open '%s' for reading"
2416 msgstr "不能为读入打开 '%s'"
2417
2418 #: builtin/commit.c:1491
2419 #, c-format
2420 msgid "Corrupt MERGE_HEAD file (%s)"
2421 msgstr "损坏的 MERGE_HEAD 文件（%s）"
2422
2423 #: builtin/commit.c:1498
2424 msgid "could not read MERGE_MODE"
2425 msgstr "不能读取 MERGE_MODE"
2426
2427 #: builtin/commit.c:1517
2428 #, c-format
2429 msgid "could not read commit message: %s"
2430 msgstr "不能读取提交说明：%s"
2431
2432 #: builtin/commit.c:1531
2433 #, c-format
2434 msgid "Aborting commit; you did not edit the message.\n"
2435 msgstr "终止提交；您未更改来自模版的提交说明。\n"
2436
2437 #: builtin/commit.c:1536
2438 #, c-format
2439 msgid "Aborting commit due to empty commit message.\n"
2440 msgstr "终止提交因为提交说明为空。\n"
2441
2442 #: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2443 msgid "failed to write commit object"
2444 msgstr "无法写提交对象"
2445
2446 #: builtin/commit.c:1572
2447 msgid "cannot lock HEAD ref"
2448 msgstr "无法锁定 HEAD 引用"
2449
2450 #: builtin/commit.c:1576
2451 msgid "cannot update HEAD ref"
2452 msgstr "无法更新 HEAD 引用"
2453
2454 #: builtin/commit.c:1587
2455 msgid ""
2456 "Repository has been updated, but unable to write\n"
2457 "new_index file. Check that disk is not full or quota is\n"
2458 "not exceeded, and then \"git reset HEAD\" to recover."
2459 msgstr ""
2460 "版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
2461 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
2462
2463 #: builtin/describe.c:234
2464 #, c-format
2465 msgid "annotated tag %s not available"
2466 msgstr "注释 tag %s 无效"
2467
2468 #: builtin/describe.c:238
2469 #, c-format
2470 msgid "annotated tag %s has no embedded name"
2471 msgstr "注释 tag %s 没有嵌入名称"
2472
2473 #: builtin/describe.c:240
2474 #, c-format
2475 msgid "tag '%s' is really '%s' here"
2476 msgstr "tag '%s' 的确是在 '%s'"
2477
2478 #: builtin/describe.c:267
2479 #, c-format
2480 msgid "Not a valid object name %s"
2481 msgstr "不是一个有效的对象名 %s"
2482
2483 #: builtin/describe.c:270
2484 #, c-format
2485 msgid "%s is not a valid '%s' object"
2486 msgstr "%s 不是一个有效的 '%s' 对象"
2487
2488 #: builtin/describe.c:287
2489 #, c-format
2490 msgid "no tag exactly matches '%s'"
2491 msgstr "没有 tag 准确匹配 '%s'"
2492
2493 #: builtin/describe.c:289
2494 #, c-format
2495 msgid "searching to describe %s\n"
2496 msgstr "搜索描述 %s\n"
2497
2498 #: builtin/describe.c:329
2499 #, c-format
2500 msgid "finished search at %s\n"
2501 msgstr "完成搜索 %s\n"
2502
2503 #: builtin/describe.c:353
2504 #, c-format
2505 msgid ""
2506 "No annotated tags can describe '%s'.\n"
2507 "However, there were unannotated tags: try --tags."
2508 msgstr ""
2509 "没有注释 tag 能描述 '%s'。\n"
2510 "然而，有非注释 tag：尝试 --tags。"
2511
2512 #: builtin/describe.c:357
2513 #, c-format
2514 msgid ""
2515 "No tags can describe '%s'.\n"
2516 "Try --always, or create some tags."
2517 msgstr ""
2518 "没有注释 tag 能描述 '%s'。\n"
2519 "尝试 --always，或者创建一些 tag。"
2520
2521 #: builtin/describe.c:378
2522 #, c-format
2523 msgid "traversed %lu commits\n"
2524 msgstr "已遍历 %lu 个提交\n"
2525
2526 #: builtin/describe.c:381
2527 #, c-format
2528 msgid ""
2529 "more than %i tags found; listed %i most recent\n"
2530 "gave up search at %s\n"
2531 msgstr ""
2532 "发现多于 %i 个 tag，列出最近的 %i 个\n"
2533 "在 %s 放弃搜索\n"
2534
2535 #: builtin/describe.c:436
2536 msgid "--long is incompatible with --abbrev=0"
2537 msgstr "--long 与 --abbrev=0 不兼容"
2538
2539 #: builtin/describe.c:462
2540 msgid "No names found, cannot describe anything."
2541 msgstr "没有发现名称，无法描述任何东西。"
2542
2543 #: builtin/describe.c:482
2544 msgid "--dirty is incompatible with committishes"
2545 msgstr "--dirty 不能与提交共用"
2546
2547 #: builtin/diff.c:77
2548 #, c-format
2549 msgid "'%s': not a regular file or symlink"
2550 msgstr "'%s'：不是一个正规文件或符号链接"
2551
2552 #: builtin/diff.c:220
2553 #, c-format
2554 msgid "invalid option: %s"
2555 msgstr "无效选项：%s"
2556
2557 #: builtin/diff.c:297
2558 msgid "Not a git repository"
2559 msgstr "不是一个 git 版本库"
2560
2561 #: builtin/diff.c:347
2562 #, c-format
2563 msgid "invalid object '%s' given."
2564 msgstr "提供了无效对象 '%s'。"
2565
2566 #: builtin/diff.c:352
2567 #, c-format
2568 msgid "more than %d trees given: '%s'"
2569 msgstr "提供了超过 %d 个树对象：'%s'"
2570
2571 #: builtin/diff.c:362
2572 #, c-format
2573 msgid "more than two blobs given: '%s'"
2574 msgstr "提供了超过两个 blob 对象：'%s'"
2575
2576 #: builtin/diff.c:370
2577 #, c-format
2578 msgid "unhandled object '%s' given."
2579 msgstr "提供了无法处理的对象 '%s'。"
2580
2581 #: builtin/fetch.c:200
2582 msgid "Couldn't find remote ref HEAD"
2583 msgstr "无法发现远程 HEAD 引用"
2584
2585 #: builtin/fetch.c:253
2586 #, c-format
2587 msgid "object %s not found"
2588 msgstr "对象 %s 未发现"
2589
2590 #: builtin/fetch.c:259
2591 msgid "[up to date]"
2592 msgstr "[最新]"
2593
2594 #: builtin/fetch.c:273
2595 #, c-format
2596 msgid "! %-*s %-*s -> %s  (can't fetch in current branch)"
2597 msgstr "! %-*s %-*s -> %s  （在当前分支下不能获取）"
2598
2599 #: builtin/fetch.c:274 builtin/fetch.c:360
2600 msgid "[rejected]"
2601 msgstr "[已拒绝]"
2602
2603 #: builtin/fetch.c:285
2604 msgid "[tag update]"
2605 msgstr "[tag更新]"
2606
2607 #  译者：注意保持前导空格
2608 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
2609 msgid "  (unable to update local ref)"
2610 msgstr "  （不能更新本地引用）"
2611
2612 #: builtin/fetch.c:305
2613 msgid "[new tag]"
2614 msgstr "[新tag]"
2615
2616 #: builtin/fetch.c:308
2617 msgid "[new branch]"
2618 msgstr "[新分支]"
2619
2620 #: builtin/fetch.c:311
2621 msgid "[new ref]"
2622 msgstr "[新引用]"
2623
2624 #: builtin/fetch.c:356
2625 msgid "unable to update local ref"
2626 msgstr "不能更新本地引用"
2627
2628 #: builtin/fetch.c:356
2629 msgid "forced update"
2630 msgstr "强制更新"
2631
2632 #: builtin/fetch.c:362
2633 msgid "(non-fast-forward)"
2634 msgstr "（非快进式）"
2635
2636 #: builtin/fetch.c:393 builtin/fetch.c:685
2637 #, c-format
2638 msgid "cannot open %s: %s\n"
2639 msgstr "无法打开 %s：%s\n"
2640
2641 #: builtin/fetch.c:402
2642 #, c-format
2643 msgid "%s did not send all necessary objects\n"
2644 msgstr "%s 未发送所有必须的对象\n"
2645
2646 #: builtin/fetch.c:488
2647 #, c-format
2648 msgid "From %.*s\n"
2649 msgstr "来自 %.*s\n"
2650
2651 #: builtin/fetch.c:499
2652 #, c-format
2653 msgid ""
2654 "some local refs could not be updated; try running\n"
2655 " 'git remote prune %s' to remove any old, conflicting branches"
2656 msgstr ""
2657 "一些本地引用不能被更新；尝试运行\n"
2658 " 'git remote prune %s' 来删除旧的、有冲突的分支"
2659
2660 #  译者：注意保持前导空格
2661 #: builtin/fetch.c:549
2662 #, c-format
2663 msgid "   (%s will become dangling)"
2664 msgstr "   （%s 将成为悬空状态）"
2665
2666 #  译者：注意保持前导空格
2667 #: builtin/fetch.c:550
2668 #, c-format
2669 msgid "   (%s has become dangling)"
2670 msgstr "   （%s 已成为悬空状态）"
2671
2672 #: builtin/fetch.c:557
2673 msgid "[deleted]"
2674 msgstr "[已删除]"
2675
2676 #: builtin/fetch.c:558 builtin/remote.c:1055
2677 msgid "(none)"
2678 msgstr "（无）"
2679
2680 #: builtin/fetch.c:675
2681 #, c-format
2682 msgid "Refusing to fetch into current branch %s of non-bare repository"
2683 msgstr "拒绝获取到非裸版本库的当前分支 %s"
2684
2685 #: builtin/fetch.c:709
2686 #, c-format
2687 msgid "Don't know how to fetch from %s"
2688 msgstr "不知道如何从 %s 获取"
2689
2690 #: builtin/fetch.c:786
2691 #, c-format
2692 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2693 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
2694
2695 #: builtin/fetch.c:789
2696 #, c-format
2697 msgid "Option \"%s\" is ignored for %s\n"
2698 msgstr "选项 \"%s\" 为 %s 所忽略\n"
2699
2700 #: builtin/fetch.c:888
2701 #, c-format
2702 msgid "Fetching %s\n"
2703 msgstr "正在获取 %s\n"
2704
2705 #: builtin/fetch.c:890 builtin/remote.c:100
2706 #, c-format
2707 msgid "Could not fetch %s"
2708 msgstr "不能获取 %s"
2709
2710 #: builtin/fetch.c:907
2711 msgid ""
2712 "No remote repository specified.  Please, specify either a URL or a\n"
2713 "remote name from which new revisions should be fetched."
2714 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
2715
2716 #: builtin/fetch.c:927
2717 msgid "You need to specify a tag name."
2718 msgstr "您需要指定一个 tag 名称。"
2719
2720 #: builtin/fetch.c:979
2721 msgid "fetch --all does not take a repository argument"
2722 msgstr "fetch --all 不能带一个版本库参数"
2723
2724 #: builtin/fetch.c:981
2725 msgid "fetch --all does not make sense with refspecs"
2726 msgstr "fetch --all 带引用表达式没有任何意义"
2727
2728 #: builtin/fetch.c:992
2729 #, c-format
2730 msgid "No such remote or remote group: %s"
2731 msgstr "没有这样的远程或远程组：%s"
2732
2733 #: builtin/fetch.c:1000
2734 msgid "Fetching a group and specifying refspecs does not make sense"
2735 msgstr "获取组并指定引用表达式没有意义"
2736
2737 #: builtin/gc.c:63
2738 #, c-format
2739 msgid "Invalid %s: '%s'"
2740 msgstr "无效的 %s：'%s'"
2741
2742 #: builtin/gc.c:90
2743 #, c-format
2744 msgid "insanely long object directory %.*s"
2745 msgstr "不正常的长对象目录 %.*s"
2746
2747 #: builtin/gc.c:221
2748 #, c-format
2749 msgid "Auto packing the repository for optimum performance.\n"
2750 msgstr "自动打包版本库以求最佳性能。\n"
2751
2752 #: builtin/gc.c:224
2753 #, c-format
2754 msgid ""
2755 "Auto packing the repository for optimum performance. You may also\n"
2756 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2757 msgstr ""
2758 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
2759 "参见 \"git help gc\" 以获取更多信息。\n"
2760
2761 #: builtin/gc.c:251
2762 msgid ""
2763 "There are too many unreachable loose objects; run 'git prune' to remove them."
2764 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
2765
2766 #: builtin/grep.c:216
2767 #, c-format
2768 msgid "grep: failed to create thread: %s"
2769 msgstr "grep：无法创建线程：%s"
2770
2771 #: builtin/grep.c:402
2772 #, c-format
2773 msgid "Failed to chdir: %s"
2774 msgstr "无法切换目录：%s"
2775
2776 #: builtin/grep.c:478 builtin/grep.c:512
2777 #, c-format
2778 msgid "unable to read tree (%s)"
2779 msgstr "无法读取树（%s）"
2780
2781 #: builtin/grep.c:526
2782 #, c-format
2783 msgid "unable to grep from object of type %s"
2784 msgstr "无法抓取来自于 %s 类型的对象"
2785
2786 #: builtin/grep.c:584
2787 #, c-format
2788 msgid "switch `%c' expects a numerical value"
2789 msgstr "开关 `%c' 期望一个数字值"
2790
2791 #: builtin/grep.c:601
2792 #, c-format
2793 msgid "cannot open '%s'"
2794 msgstr "不能打开 '%s'"
2795
2796 #: builtin/grep.c:885
2797 msgid "no pattern given."
2798 msgstr "未提供模式匹配。"
2799
2800 #: builtin/grep.c:899
2801 #, c-format
2802 msgid "bad object %s"
2803 msgstr "坏对象 %s"
2804
2805 #: builtin/grep.c:940
2806 msgid "--open-files-in-pager only works on the worktree"
2807 msgstr "--open-files-in-pager 仅用于工作区"
2808
2809 #: builtin/grep.c:963
2810 msgid "--cached or --untracked cannot be used with --no-index."
2811 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
2812
2813 #: builtin/grep.c:968
2814 msgid "--no-index or --untracked cannot be used with revs."
2815 msgstr "--no-index 或 --untracked 不能和版本共用。"
2816
2817 #: builtin/grep.c:971
2818 msgid "--[no-]exclude-standard cannot be used for tracked contents."
2819 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2820
2821 #: builtin/grep.c:979
2822 msgid "both --cached and trees are given."
2823 msgstr "同时给出了 --cached 和树对象。"
2824
2825 #: builtin/help.c:59
2826 #, c-format
2827 msgid "unrecognized help format '%s'"
2828 msgstr "未能识别的帮助格式 '%s'"
2829
2830 #: builtin/help.c:87
2831 msgid "Failed to start emacsclient."
2832 msgstr "无法启动 emacsclient。"
2833
2834 #: builtin/help.c:100
2835 msgid "Failed to parse emacsclient version."
2836 msgstr "无法解析 emacsclient 版本。"
2837
2838 #: builtin/help.c:108
2839 #, c-format
2840 msgid "emacsclient version '%d' too old (< 22)."
2841 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2842
2843 #: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2844 #, c-format
2845 msgid "failed to exec '%s': %s"
2846 msgstr "无法执行 '%s'：%s"
2847
2848 #: builtin/help.c:211
2849 #, c-format
2850 msgid ""
2851 "'%s': path for unsupported man viewer.\n"
2852 "Please consider using 'man.<tool>.cmd' instead."
2853 msgstr ""
2854 "'%s'：不支持的 man 手册查看器的路径。\n"
2855 "请使用 'man.<tool>.cmd'。"
2856
2857 #: builtin/help.c:223
2858 #, c-format
2859 msgid ""
2860 "'%s': cmd for supported man viewer.\n"
2861 "Please consider using 'man.<tool>.path' instead."
2862 msgstr ""
2863 "'%s': 支持的 man 手册查看器命令。\n"
2864 "请使用 'man.<tool>.path'。"
2865
2866 #: builtin/help.c:287
2867 msgid "The most commonly used git commands are:"
2868 msgstr "最常用的 git 命令有："
2869
2870 #: builtin/help.c:355
2871 #, c-format
2872 msgid "'%s': unknown man viewer."
2873 msgstr "'%s'：未知的 man 查看器。"
2874
2875 #: builtin/help.c:372
2876 msgid "no man viewer handled the request"
2877 msgstr "没有 man 查看器处理此请求"
2878
2879 #: builtin/help.c:380
2880 msgid "no info viewer handled the request"
2881 msgstr "没有 info 查看器处理此请求"
2882
2883 #: builtin/help.c:391
2884 #, c-format
2885 msgid "'%s': not a documentation directory."
2886 msgstr "'%s'：不是一个文档目录。"
2887
2888 #: builtin/help.c:432 builtin/help.c:439
2889 #, c-format
2890 msgid "usage: %s%s"
2891 msgstr "用法：%s%s"
2892
2893 #: builtin/help.c:453
2894 #, c-format
2895 msgid "`git %s' is aliased to `%s'"
2896 msgstr "`git %s' 是 `%s' 的别名"
2897
2898 #: builtin/index-pack.c:169
2899 #, c-format
2900 msgid "object type mismatch at %s"
2901 msgstr "%s 的对象类型不匹配"
2902
2903 #: builtin/index-pack.c:189
2904 msgid "object of unexpected type"
2905 msgstr "意外的类型的对象"
2906
2907 #: builtin/index-pack.c:226
2908 #, c-format
2909 msgid "cannot fill %d byte"
2910 msgid_plural "cannot fill %d bytes"
2911 msgstr[0] "无法填充 %d 字节"
2912 msgstr[1] "无法填充 %d 字节"
2913
2914 #: builtin/index-pack.c:236
2915 msgid "early EOF"
2916 msgstr "过早的文件结束符（EOF）"
2917
2918 #: builtin/index-pack.c:237
2919 msgid "read error on input"
2920 msgstr "输入上的读错误"
2921
2922 #: builtin/index-pack.c:249
2923 msgid "used more bytes than were available"
2924 msgstr "用掉了超过可用的字节"
2925
2926 #: builtin/index-pack.c:256
2927 msgid "pack too large for current definition of off_t"
2928 msgstr "包太大超过了当前 off_t 的定义"
2929
2930 #: builtin/index-pack.c:272
2931 #, c-format
2932 msgid "unable to create '%s'"
2933 msgstr "不能创建 '%s'"
2934
2935 #: builtin/index-pack.c:277
2936 #, c-format
2937 msgid "cannot open packfile '%s'"
2938 msgstr "无法打开包文件 '%s'"
2939
2940 #: builtin/index-pack.c:291
2941 msgid "pack signature mismatch"
2942 msgstr "包签名不匹配"
2943
2944 #: builtin/index-pack.c:311
2945 #, c-format
2946 msgid "pack has bad object at offset %lu: %s"
2947 msgstr "包中有错误的对象位于 %lu：%s"
2948
2949 #: builtin/index-pack.c:405
2950 #, c-format
2951 msgid "inflate returned %d"
2952 msgstr "解压缩返回 %d"
2953
2954 #: builtin/index-pack.c:450
2955 msgid "offset value overflow for delta base object"
2956 msgstr "偏移值覆盖了 delta 基准对象"
2957
2958 #: builtin/index-pack.c:458
2959 msgid "delta base offset is out of bound"
2960 msgstr "delta 基准偏移越界"
2961
2962 #: builtin/index-pack.c:466
2963 #, c-format
2964 msgid "unknown object type %d"
2965 msgstr "未知对象类型 %d"
2966
2967 #: builtin/index-pack.c:495
2968 msgid "cannot pread pack file"
2969 msgstr "无法读取包文件"
2970
2971 #: builtin/index-pack.c:497
2972 #, c-format
2973 msgid "premature end of pack file, %lu byte missing"
2974 msgid_plural "premature end of pack file, %lu bytes missing"
2975 msgstr[0] "包文件过早结束，缺少 %lu 字节"
2976 msgstr[1] "包文件过早结束，缺少 %lu 字节"
2977
2978 #: builtin/index-pack.c:510
2979 msgid "serious inflate inconsistency"
2980 msgstr "解压缩严重的不一致"
2981
2982 #: builtin/index-pack.c:583
2983 #, c-format
2984 msgid "cannot read existing object %s"
2985 msgstr "不能读取现存对象 %s"
2986
2987 #: builtin/index-pack.c:586
2988 #, c-format
2989 msgid "SHA1 COLLISION FOUND WITH %s !"
2990 msgstr "发现 %s 出现 SHA1 冲突！"
2991
2992 #: builtin/index-pack.c:598
2993 #, c-format
2994 msgid "invalid blob object %s"
2995 msgstr "无效的 blob 对象 %s"
2996
2997 #: builtin/index-pack.c:610
2998 #, c-format
2999 msgid "invalid %s"
3000 msgstr "无效的 %s"
3001
3002 #: builtin/index-pack.c:612
3003 msgid "Error in object"
3004 msgstr "对象中出错"
3005
3006 #: builtin/index-pack.c:614
3007 #, c-format
3008 msgid "Not all child objects of %s are reachable"
3009 msgstr "%s 的所有子对象并非都可达"
3010
3011 #: builtin/index-pack.c:687 builtin/index-pack.c:713
3012 msgid "failed to apply delta"
3013 msgstr "无法应用 delta"
3014
3015 #: builtin/index-pack.c:850
3016 msgid "Receiving objects"
3017 msgstr "接收对象中"
3018
3019 #: builtin/index-pack.c:850
3020 msgid "Indexing objects"
3021 msgstr "索引对象中"
3022
3023 #: builtin/index-pack.c:872
3024 msgid "pack is corrupted (SHA1 mismatch)"
3025 msgstr "包冲突（SHA1 不匹配）"
3026
3027 #: builtin/index-pack.c:877
3028 msgid "cannot fstat packfile"
3029 msgstr "不能枚举包文件状态"
3030
3031 #: builtin/index-pack.c:880
3032 msgid "pack has junk at the end"
3033 msgstr "包的结尾有垃圾数据"
3034
3035 #: builtin/index-pack.c:903
3036 msgid "Resolving deltas"
3037 msgstr "处理 delta 中"
3038
3039 #: builtin/index-pack.c:954
3040 msgid "confusion beyond insanity"
3041 msgstr "不可理喻"
3042
3043 #: builtin/index-pack.c:973
3044 #, c-format
3045 msgid "pack has %d unresolved delta"
3046 msgid_plural "pack has %d unresolved deltas"
3047 msgstr[0] "包有 %d 个未解决的 delta"
3048 msgstr[1] "包有 %d 个未解决的 delta"
3049
3050 #: builtin/index-pack.c:998
3051 #, c-format
3052 msgid "unable to deflate appended object (%d)"
3053 msgstr "不能缩小附加对象（%d）"
3054
3055 #: builtin/index-pack.c:1077
3056 #, c-format
3057 msgid "local object %s is corrupt"
3058 msgstr "本地对象 %s 已损坏"
3059
3060 #: builtin/index-pack.c:1101
3061 msgid "error while closing pack file"
3062 msgstr "关闭包文件时出错"
3063
3064 #: builtin/index-pack.c:1114
3065 #, c-format
3066 msgid "cannot write keep file '%s'"
3067 msgstr "无法写保留文件 '%s'"
3068
3069 #: builtin/index-pack.c:1122
3070 #, c-format
3071 msgid "cannot close written keep file '%s'"
3072 msgstr "无法关闭保留文件 '%s'"
3073
3074 #: builtin/index-pack.c:1135
3075 msgid "cannot store pack file"
3076 msgstr "无法存储包文件"
3077
3078 #: builtin/index-pack.c:1146
3079 msgid "cannot store index file"
3080 msgstr "无法存储索引文件"
3081
3082 #: builtin/index-pack.c:1247
3083 #, c-format
3084 msgid "Cannot open existing pack file '%s'"
3085 msgstr "无法打开现存包文件 '%s'"
3086
3087 #: builtin/index-pack.c:1249
3088 #, c-format
3089 msgid "Cannot open existing pack idx file for '%s'"
3090 msgstr "无法为 %s 打开包索引文件"
3091
3092 #: builtin/index-pack.c:1296
3093 #, c-format
3094 msgid "non delta: %d object"
3095 msgid_plural "non delta: %d objects"
3096 msgstr[0] "非 delta：%d 个对象"
3097 msgstr[1] "非 delta：%d 个对象"
3098
3099 #: builtin/index-pack.c:1303
3100 #, c-format
3101 msgid "chain length = %d: %lu object"
3102 msgid_plural "chain length = %d: %lu objects"
3103 msgstr[0] "链长 = %d: %lu 对象"
3104 msgstr[1] "链长 = %d: %lu 对象"
3105
3106 #: builtin/index-pack.c:1330
3107 msgid "Cannot come back to cwd"
3108 msgstr "无法返回当前工作目录"
3109
3110 #: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3111 #: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3112 #, c-format
3113 msgid "bad %s"
3114 msgstr "错误选项 %s"
3115
3116 #: builtin/index-pack.c:1407
3117 msgid "--fix-thin cannot be used without --stdin"
3118 msgstr "--fix-thin 不能和 --stdin 共用"
3119
3120 #: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3121 #, c-format
3122 msgid "packfile name '%s' does not end with '.pack'"
3123 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3124
3125 #: builtin/index-pack.c:1430
3126 msgid "--verify with no packfile name given"
3127 msgstr "--verify 没有提供包名参数"
3128
3129 #: builtin/init-db.c:35
3130 #, c-format
3131 msgid "Could not make %s writable by group"
3132 msgstr "不能设置 %s 为组可写"
3133
3134 #: builtin/init-db.c:62
3135 #, c-format
3136 msgid "insanely long template name %s"
3137 msgstr "太长的模版名 %s"
3138
3139 #: builtin/init-db.c:67
3140 #, c-format
3141 msgid "cannot stat '%s'"
3142 msgstr "不能枚举 '%s' 状态"
3143
3144 #: builtin/init-db.c:73
3145 #, c-format
3146 msgid "cannot stat template '%s'"
3147 msgstr "不能枚举模版 '%s' 状态"
3148
3149 #: builtin/init-db.c:80
3150 #, c-format
3151 msgid "cannot opendir '%s'"
3152 msgstr "不能打开目录 '%s'"
3153
3154 #: builtin/init-db.c:97
3155 #, c-format
3156 msgid "cannot readlink '%s'"
3157 msgstr "不能读取链接 '%s'"
3158
3159 #: builtin/init-db.c:99
3160 #, c-format
3161 msgid "insanely long symlink %s"
3162 msgstr "太长的符号链接 %s"
3163
3164 #: builtin/init-db.c:102
3165 #, c-format
3166 msgid "cannot symlink '%s' '%s'"
3167 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
3168
3169 #: builtin/init-db.c:106
3170 #, c-format
3171 msgid "cannot copy '%s' to '%s'"
3172 msgstr "不能拷贝 '%s' 至 '%s'"
3173
3174 #: builtin/init-db.c:110
3175 #, c-format
3176 msgid "ignoring template %s"
3177 msgstr "忽略模版 %s"
3178
3179 #: builtin/init-db.c:133
3180 #, c-format
3181 msgid "insanely long template path %s"
3182 msgstr "太长的模版路径 %s"
3183
3184 #: builtin/init-db.c:141
3185 #, c-format
3186 msgid "templates not found %s"
3187 msgstr "模版未找到 %s"
3188
3189 #: builtin/init-db.c:154
3190 #, c-format
3191 msgid "not copying templates of a wrong format version %d from '%s'"
3192 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3193
3194 #: builtin/init-db.c:192
3195 #, c-format
3196 msgid "insane git directory %s"
3197 msgstr "不正常的 git 目录 %s"
3198
3199 #: builtin/init-db.c:322 builtin/init-db.c:325
3200 #, c-format
3201 msgid "%s already exists"
3202 msgstr "%s 已经存在"
3203
3204 #: builtin/init-db.c:354
3205 #, c-format
3206 msgid "unable to handle file type %d"
3207 msgstr "不能处理 %d 类型的文件"
3208
3209 #: builtin/init-db.c:357
3210 #, c-format
3211 msgid "unable to move %s to %s"
3212 msgstr "不能移动 %s 至 %s"
3213
3214 #: builtin/init-db.c:362
3215 #, c-format
3216 msgid "Could not create git link %s"
3217 msgstr "不能创建 git link %s"
3218
3219 #.
3220 #. * TRANSLATORS: The first '%s' is either "Reinitialized
3221 #. * existing" or "Initialized empty", the second " shared" or
3222 #. * "", and the last '%s%s' is the verbatim directory name.
3223 #.
3224 #: builtin/init-db.c:419
3225 #, c-format
3226 msgid "%s%s Git repository in %s%s\n"
3227 msgstr "%s%s Git 版本库于 %s%s\n"
3228
3229 #: builtin/init-db.c:420
3230 msgid "Reinitialized existing"
3231 msgstr "重新初始化现存的"
3232
3233 #: builtin/init-db.c:420
3234 msgid "Initialized empty"
3235 msgstr "初始化空的"
3236
3237 #  译者：中文字符串拼接，可删除前导空格
3238 #: builtin/init-db.c:421
3239 msgid " shared"
3240 msgstr "共享"
3241
3242 #: builtin/init-db.c:440
3243 msgid "cannot tell cwd"
3244 msgstr "无法获知当前路径"
3245
3246 #: builtin/init-db.c:521 builtin/init-db.c:528
3247 #, c-format
3248 msgid "cannot mkdir %s"
3249 msgstr "不能创建目录 %s"
3250
3251 #: builtin/init-db.c:532
3252 #, c-format
3253 msgid "cannot chdir to %s"
3254 msgstr "不能切换目录到 %s"
3255
3256 #: builtin/init-db.c:554
3257 #, c-format
3258 msgid ""
3259 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
3260 "dir=<directory>)"
3261 msgstr ""
3262 "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
3263 "dir=<directory>）"
3264
3265 #: builtin/init-db.c:578
3266 msgid "Cannot access current working directory"
3267 msgstr "不能访问当前工作目录"
3268
3269 #: builtin/init-db.c:585
3270 #, c-format
3271 msgid "Cannot access work tree '%s'"
3272 msgstr "不能访问工作区 '%s'"
3273
3274 #: builtin/log.c:188
3275 #, c-format
3276 msgid "Final output: %d %s\n"
3277 msgstr "最终输出：%d %s\n"
3278
3279 #: builtin/log.c:401 builtin/log.c:489
3280 #, c-format
3281 msgid "Could not read object %s"
3282 msgstr "不能读取对象 %s"
3283
3284 #: builtin/log.c:513
3285 #, c-format
3286 msgid "Unknown type: %d"
3287 msgstr "未知类型：%d"
3288
3289 #: builtin/log.c:602
3290 msgid "format.headers without value"
3291 msgstr "format.headers 没有值"
3292
3293 #: builtin/log.c:676
3294 msgid "name of output directory is too long"
3295 msgstr "输出目录名太长"
3296
3297 #: builtin/log.c:687
3298 #, c-format
3299 msgid "Cannot open patch file %s"
3300 msgstr "无法打开补丁文件 %s"
3301
3302 #: builtin/log.c:701
3303 msgid "Need exactly one range."
3304 msgstr "只需要一个范围。"
3305
3306 #: builtin/log.c:709
3307 msgid "Not a range."
3308 msgstr "不是一个范围。"
3309
3310 #: builtin/log.c:786
3311 msgid "Cover letter needs email format"
3312 msgstr "信封需要邮件地址格式"
3313
3314 #: builtin/log.c:859
3315 #, c-format
3316 msgid "insane in-reply-to: %s"
3317 msgstr "不正常的 in-reply-to：%s"
3318
3319 #: builtin/log.c:932
3320 msgid "Two output directories?"
3321 msgstr "两个输出目录？"
3322
3323 #: builtin/log.c:1153
3324 #, c-format
3325 msgid "bogus committer info %s"
3326 msgstr "虚假的提交者信息 %s"
3327
3328 #: builtin/log.c:1198
3329 msgid "-n and -k are mutually exclusive."
3330 msgstr "-n 和 -k 互斥。"
3331
3332 #: builtin/log.c:1200
3333 msgid "--subject-prefix and -k are mutually exclusive."
3334 msgstr "--subject-prefix 和 -k 互斥。"
3335
3336 #: builtin/log.c:1208
3337 msgid "--name-only does not make sense"
3338 msgstr "--name-only 无意义"
3339
3340 #: builtin/log.c:1210
3341 msgid "--name-status does not make sense"
3342 msgstr "--name-status 无意义"
3343
3344 #: builtin/log.c:1212
3345 msgid "--check does not make sense"
3346 msgstr "--check 无意义"
3347
3348 #: builtin/log.c:1235
3349 msgid "standard output, or directory, which one?"
3350 msgstr "标准输出或目录，哪一个？"
3351
3352 #: builtin/log.c:1237
3353 #, c-format
3354 msgid "Could not create directory '%s'"
3355 msgstr "不能创建目录 '%s'"
3356
3357 #: builtin/log.c:1390
3358 msgid "Failed to create output files"
3359 msgstr "无法创建输出文件"
3360
3361 #: builtin/log.c:1494
3362 #, c-format
3363 msgid ""
3364 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3365 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
3366
3367 #: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3368 #, c-format
3369 msgid "Unknown commit %s"
3370 msgstr "未知提交 %s"
3371
3372 #: builtin/merge.c:90
3373 msgid "switch `m' requires a value"
3374 msgstr "开关 `m' 需要一个值"
3375
3376 #: builtin/merge.c:127
3377 #, c-format
3378 msgid "Could not find merge strategy '%s'.\n"
3379 msgstr "不能找到合并策略 '%s'。\n"
3380
3381 #: builtin/merge.c:128
3382 #, c-format
3383 msgid "Available strategies are:"
3384 msgstr "可用的策略有："
3385
3386 #: builtin/merge.c:133
3387 #, c-format
3388 msgid "Available custom strategies are:"
3389 msgstr "可用的自定义策略有："
3390
3391 #: builtin/merge.c:240
3392 msgid "could not run stash."
3393 msgstr "不能进行进度保存。"
3394
3395 #: builtin/merge.c:245
3396 msgid "stash failed"
3397 msgstr "进度保存失败"
3398
3399 #: builtin/merge.c:250
3400 #, c-format
3401 msgid "not a valid object: %s"
3402 msgstr "不是一个有效对象：%s"
3403
3404 #: builtin/merge.c:269 builtin/merge.c:286
3405 msgid "read-tree failed"
3406 msgstr "读取树失败"
3407
3408 #  译者：注意保持前导空格
3409 #: builtin/merge.c:316
3410 msgid " (nothing to squash)"
3411 msgstr " （无可压缩）"
3412
3413 #: builtin/merge.c:329
3414 #, c-format
3415 msgid "Squash commit -- not updating HEAD\n"
3416 msgstr "压缩提交 -- 未更新 HEAD\n"
3417
3418 #: builtin/merge.c:361
3419 msgid "Writing SQUASH_MSG"
3420 msgstr "写入 SQUASH_MSG"
3421
3422 #: builtin/merge.c:363
3423 msgid "Finishing SQUASH_MSG"
3424 msgstr "完成 SQUASH_MSG"
3425
3426 #: builtin/merge.c:386
3427 #, c-format
3428 msgid "No merge message -- not updating HEAD\n"
3429 msgstr "无合并信息 -- 未更新 HEAD\n"
3430
3431 #: builtin/merge.c:437
3432 #, c-format
3433 msgid "'%s' does not point to a commit"
3434 msgstr "'%s' 没有指向一个提交"
3435
3436 #: builtin/merge.c:536
3437 #, c-format
3438 msgid "Bad branch.%s.mergeoptions string: %s"
3439 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
3440
3441 #: builtin/merge.c:629
3442 msgid "git write-tree failed to write a tree"
3443 msgstr "git write-tree 无法写入一树对象"
3444
3445 #: builtin/merge.c:679
3446 msgid "failed to read the cache"
3447 msgstr "无法读取缓存"
3448
3449 #: builtin/merge.c:697
3450 msgid "Unable to write index."
3451 msgstr "不能写索引。"
3452
3453 #: builtin/merge.c:710
3454 msgid "Not handling anything other than two heads merge."
3455 msgstr "不能处理两个头合并之外的任何操作。"
3456
3457 #: builtin/merge.c:724
3458 #, c-format
3459 msgid "Unknown option for merge-recursive: -X%s"
3460 msgstr "merge-recursive 的未知选项：-X%s"
3461
3462 #: builtin/merge.c:738
3463 #, c-format
3464 msgid "unable to write %s"
3465 msgstr "不能写 %s"
3466
3467 #: builtin/merge.c:877
3468 #, c-format
3469 msgid "Could not read from '%s'"
3470 msgstr "不能从 '%s' 读取"
3471
3472 #: builtin/merge.c:886
3473 #, c-format
3474 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3475 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
3476
3477 #: builtin/merge.c:892
3478 msgid ""
3479 "Please enter a commit message to explain why this merge is necessary,\n"
3480 "especially if it merges an updated upstream into a topic branch.\n"
3481 "\n"
3482 "Lines starting with '#' will be ignored, and an empty message aborts\n"
3483 "the commit.\n"
3484 msgstr ""
3485 "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
3486 "合并到主题分支。\n"
3487 "\n"
3488 "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
3489
3490 #: builtin/merge.c:916
3491 msgid "Empty commit message."
3492 msgstr "空提交信息。"
3493
3494 #: builtin/merge.c:928
3495 #, c-format
3496 msgid "Wonderful.\n"
3497 msgstr "太棒了。\n"
3498
3499 #: builtin/merge.c:993
3500 #, c-format
3501 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3502 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
3503
3504 #: builtin/merge.c:1009
3505 #, c-format
3506 msgid "'%s' is not a commit"
3507 msgstr "'%s' 不是一个提交"
3508
3509 #: builtin/merge.c:1050
3510 msgid "No current branch."
3511 msgstr "没有当前分支。"
3512
3513 #: builtin/merge.c:1052
3514 msgid "No remote for the current branch."
3515 msgstr "当前分支没有对应的远程版本库。"
3516
3517 #: builtin/merge.c:1054
3518 msgid "No default upstream defined for the current branch."
3519 msgstr "当前分支没有定义默认的上游分支。"
3520
3521 #: builtin/merge.c:1059
3522 #, c-format
3523 msgid "No remote tracking branch for %s from %s"
3524 msgstr "%s 没有来自 %s 的远程跟踪分支"
3525
3526 #: builtin/merge.c:1146 builtin/merge.c:1303
3527 #, c-format
3528 msgid "%s - not something we can merge"
3529 msgstr "%s - 不能被合并"
3530
3531 #: builtin/merge.c:1214
3532 msgid "There is no merge to abort (MERGE_HEAD missing)."
3533 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
3534
3535 #: builtin/merge.c:1230 git-pull.sh:31
3536 msgid ""
3537 "You have not concluded your merge (MERGE_HEAD exists).\n"
3538 "Please, commit your changes before you can merge."
3539 msgstr ""
3540 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
3541 "请在合并前先提交您的修改。"
3542
3543 #: builtin/merge.c:1233 git-pull.sh:34
3544 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3545 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
3546
3547 #: builtin/merge.c:1237
3548 msgid ""
3549 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3550 "Please, commit your changes before you can merge."
3551 msgstr ""
3552 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
3553 "请在合并前先提交您的修改。"
3554
3555 #: builtin/merge.c:1240
3556 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3557 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
3558
3559 #: builtin/merge.c:1249
3560 msgid "You cannot combine --squash with --no-ff."
3561 msgstr "您不能将 --squash 与 --no-ff 共用。"
3562
3563 #: builtin/merge.c:1254
3564 msgid "You cannot combine --no-ff with --ff-only."
3565 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
3566
3567 #: builtin/merge.c:1261
3568 msgid "No commit specified and merge.defaultToUpstream not set."
3569 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3570
3571 #: builtin/merge.c:1293
3572 msgid "Can merge only exactly one commit into empty head"
3573 msgstr "只能将一个提交合并到空分支上"
3574
3575 #: builtin/merge.c:1296
3576 msgid "Squash commit into empty head not supported yet"
3577 msgstr "尚不支持到空分支的压缩提交"
3578
3579 #: builtin/merge.c:1298
3580 msgid "Non-fast-forward commit does not make sense into an empty head"
3581 msgstr "到空分支的非快进式提交没有意义"
3582
3583 #: builtin/merge.c:1413
3584 #, c-format
3585 msgid "Updating %s..%s\n"
3586 msgstr "更新 %s..%s\n"
3587
3588 #: builtin/merge.c:1451
3589 #, c-format
3590 msgid "Trying really trivial in-index merge...\n"
3591 msgstr "尝试非常小的索引内合并...\n"
3592
3593 #: builtin/merge.c:1458
3594 #, c-format
3595 msgid "Nope.\n"
3596 msgstr "无。\n"
3597
3598 #: builtin/merge.c:1490
3599 msgid "Not possible to fast-forward, aborting."
3600 msgstr "无法快进，终止。"
3601
3602 #: builtin/merge.c:1513 builtin/merge.c:1592
3603 #, c-format
3604 msgid "Rewinding the tree to pristine...\n"
3605 msgstr "将树回滚至原始状态...\n"
3606
3607 #: builtin/merge.c:1517
3608 #, c-format
3609 msgid "Trying merge strategy %s...\n"
3610 msgstr "尝试合并策略 %s...\n"
3611
3612 #: builtin/merge.c:1583
3613 #, c-format
3614 msgid "No merge strategy handled the merge.\n"
3615 msgstr "没有合并策略处理此合并。\n"
3616
3617 #: builtin/merge.c:1585
3618 #, c-format
3619 msgid "Merge with strategy %s failed.\n"
3620 msgstr "使用策略 %s 合并失败。\n"
3621
3622 #: builtin/merge.c:1594
3623 #, c-format
3624 msgid "Using the %s to prepare resolving by hand.\n"
3625 msgstr "使用 %s 以准备手工解决。\n"
3626
3627 #: builtin/merge.c:1606
3628 #, c-format
3629 msgid "Automatic merge went well; stopped before committing as requested\n"
3630 msgstr "自动合并进展顺利，按要求在提交前停止\n"
3631
3632 #: builtin/mv.c:108
3633 #, c-format
3634 msgid "Checking rename of '%s' to '%s'\n"
3635 msgstr "检查 '%s' 到 '%s' 的重命名\n"
3636
3637 #: builtin/mv.c:112
3638 msgid "bad source"
3639 msgstr "坏的源"
3640
3641 #: builtin/mv.c:115
3642 msgid "can not move directory into itself"
3643 msgstr "不能将目录移动到自身"
3644
3645 #: builtin/mv.c:118
3646 msgid "cannot move directory over file"
3647 msgstr "不能将目录移动到文件"
3648
3649 #: builtin/mv.c:128
3650 #, c-format
3651 msgid "Huh? %.*s is in index?"
3652 msgstr "嗯？%.*s 在索引中？"
3653
3654 #: builtin/mv.c:140
3655 msgid "source directory is empty"
3656 msgstr "源目录为空"
3657
3658 #: builtin/mv.c:171
3659 msgid "not under version control"
3660 msgstr "不在版本控制之下"
3661
3662 #: builtin/mv.c:173
3663 msgid "destination exists"
3664 msgstr "目标已存在"
3665
3666 #: builtin/mv.c:181
3667 #, c-format
3668 msgid "overwriting '%s'"
3669 msgstr "覆盖 '%s'"
3670
3671 #: builtin/mv.c:184
3672 msgid "Cannot overwrite"
3673 msgstr "不能覆盖"
3674
3675 #: builtin/mv.c:187
3676 msgid "multiple sources for the same target"
3677 msgstr "同一目标具有多个源"
3678
3679 #: builtin/mv.c:202
3680 #, c-format
3681 msgid "%s, source=%s, destination=%s"
3682 msgstr "%s，源=%s，目标=%s"
3683
3684 #: builtin/mv.c:212
3685 #, c-format
3686 msgid "Renaming %s to %s\n"
3687 msgstr "重命名 %s 至 %s\n"
3688
3689 #: builtin/mv.c:215 builtin/remote.c:731
3690 #, c-format
3691 msgid "renaming '%s' failed"
3692 msgstr "重命名 '%s' 失败"
3693
3694 #: builtin/notes.c:139
3695 #, c-format
3696 msgid "unable to start 'show' for object '%s'"
3697 msgstr "不能为对象 '%s' 开始 'show'"
3698
3699 #: builtin/notes.c:145
3700 msgid "can't fdopen 'show' output fd"
3701 msgstr "不能打开 'show' 输出文件句柄"
3702
3703 #: builtin/notes.c:155
3704 #, c-format
3705 msgid "failed to close pipe to 'show' for object '%s'"
3706 msgstr "无法为对象 '%s' 的 'show' 关闭管道"
3707
3708 #: builtin/notes.c:158
3709 #, c-format
3710 msgid "failed to finish 'show' for object '%s'"
3711 msgstr "无法为对象 '%s' 完成 'show'"
3712
3713 #: builtin/notes.c:175 builtin/tag.c:347
3714 #, c-format
3715 msgid "could not create file '%s'"
3716 msgstr "不能创建文件 '%s'"
3717
3718 #: builtin/notes.c:189
3719 msgid "Please supply the note contents using either -m or -F option"
3720 msgstr "请通过 -m 或 -F 选项为注解提供内容"
3721
3722 #: builtin/notes.c:210 builtin/notes.c:973
3723 #, c-format
3724 msgid "Removing note for object %s\n"
3725 msgstr "删除对象 %s 的注解\n"
3726
3727 #: builtin/notes.c:215
3728 msgid "unable to write note object"
3729 msgstr "不能写注解对象"
3730
3731 #: builtin/notes.c:217
3732 #, c-format
3733 msgid "The note contents has been left in %s"
3734 msgstr "注解内容被留在文件 %s 中"
3735
3736 #: builtin/notes.c:251 builtin/tag.c:542
3737 #, c-format
3738 msgid "cannot read '%s'"
3739 msgstr "不能读取 '%s'"
3740
3741 #: builtin/notes.c:253 builtin/tag.c:545
3742 #, c-format
3743 msgid "could not open or read '%s'"
3744 msgstr "不能打开或读取 '%s'"
3745
3746 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
3747 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
3748 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
3749 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
3750 #, c-format
3751 msgid "Failed to resolve '%s' as a valid ref."
3752 msgstr "无法解析 '%s' 为一个有效引用。"
3753
3754 #: builtin/notes.c:275
3755 #, c-format
3756 msgid "Failed to read object '%s'."
3757 msgstr "无法读取对象 '%s'。"
3758
3759 #: builtin/notes.c:299
3760 msgid "Cannot commit uninitialized/unreferenced notes tree"
3761 msgstr "不能提交未初始化/未引用的注解树"
3762
3763 #: builtin/notes.c:340
3764 #, c-format
3765 msgid "Bad notes.rewriteMode value: '%s'"
3766 msgstr "坏的 notes.rewriteMode 值：'%s'"
3767
3768 #: builtin/notes.c:350
3769 #, c-format
3770 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3771 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
3772
3773 #. TRANSLATORS: The first %s is the name of the
3774 #. environment variable, the second %s is its value
3775 #: builtin/notes.c:377
3776 #, c-format
3777 msgid "Bad %s value: '%s'"
3778 msgstr "坏的 %s 值：'%s'"
3779
3780 #: builtin/notes.c:441
3781 #, c-format
3782 msgid "Malformed input line: '%s'."
3783 msgstr "非法的输入行：'%s'。"
3784
3785 #: builtin/notes.c:456
3786 #, c-format
3787 msgid "Failed to copy notes from '%s' to '%s'"
3788 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
3789
3790 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
3791 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
3792 #: builtin/notes.c:1033
3793 msgid "too many parameters"
3794 msgstr "参数太多"
3795
3796 #: builtin/notes.c:513 builtin/notes.c:772
3797 #, c-format
3798 msgid "No note found for object %s."
3799 msgstr "未发现对象 %s 的注解。"
3800
3801 #: builtin/notes.c:580
3802 #, c-format
3803 msgid ""
3804 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
3805 "existing notes"
3806 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3807
3808 #: builtin/notes.c:585 builtin/notes.c:662
3809 #, c-format
3810 msgid "Overwriting existing notes for object %s\n"
3811 msgstr "覆盖对象 %s 现存注解\n"
3812
3813 #: builtin/notes.c:635
3814 msgid "too few parameters"
3815 msgstr "参数太少"
3816
3817 #: builtin/notes.c:656
3818 #, c-format
3819 msgid ""
3820 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
3821 "existing notes"
3822 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
3823
3824 #: builtin/notes.c:668
3825 #, c-format
3826 msgid "Missing notes on source object %s. Cannot copy."
3827 msgstr "源对象 %s 缺少注解。不能拷贝。"
3828
3829 #: builtin/notes.c:717
3830 #, c-format
3831 msgid ""
3832 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
3833 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
3834 msgstr ""
3835 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
3836 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
3837
3838 #: builtin/notes.c:971
3839 #, c-format
3840 msgid "Object %s has no note\n"
3841 msgstr "对象 %s 没有注解\n"
3842
3843 #: builtin/notes.c:1103 builtin/remote.c:1598
3844 #, c-format
3845 msgid "Unknown subcommand: %s"
3846 msgstr "未知子命令：%s"
3847
3848 #: builtin/pack-objects.c:2337
3849 #, c-format
3850 msgid "unsupported index version %s"
3851 msgstr "不支持的索引版本 %s"
3852
3853 #: builtin/pack-objects.c:2341
3854 #, c-format
3855 msgid "bad index version '%s'"
3856 msgstr "坏的索引版本 '%s'"
3857
3858 #: builtin/pack-objects.c:2364
3859 #, c-format
3860 msgid "option %s does not accept negative form"
3861 msgstr "选项 %s 不接受否定格式"
3862
3863 #: builtin/pack-objects.c:2368
3864 #, c-format
3865 msgid "unable to parse value '%s' for option %s"
3866 msgstr "不能解析选项 %1$s 的值 '%2$s'"
3867
3868 #: builtin/push.c:45
3869 msgid "tag shorthand without <tag>"
3870 msgstr "tag 简写没有跟 <tag> 参数"
3871
3872 #: builtin/push.c:64
3873 msgid "--delete only accepts plain target ref names"
3874 msgstr "--delete 只接受简单的目标引用名"
3875
3876 #: builtin/push.c:99
3877 msgid ""
3878 "\n"
3879 "To choose either option permanently, see push.default in 'git help config'."
3880 msgstr ""
3881 "\n"
3882 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
3883
3884 #: builtin/push.c:102
3885 #, c-format
3886 msgid ""
3887 "The upstream branch of your current branch does not match\n"
3888 "the name of your current branch.  To push to the upstream branch\n"
3889 "on the remote, use\n"
3890 "\n"
3891 "    git push %s HEAD:%s\n"
3892 "\n"
3893 "To push to the branch of the same name on the remote, use\n"
3894 "\n"
3895 "    git push %s %s\n"
3896 "%s"
3897 msgstr ""
3898 "如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n"
3899 "上游分支，使用\n"
3900 "\n"
3901 "    git push %s HEAD:%s\n"
3902 "\n"
3903 "为推送至远程同名分支，使用\n"
3904 "\n"
3905 "    git push %s %s\n"
3906 "%s"
3907
3908 #: builtin/push.c:121
3909 #, c-format
3910 msgid ""
3911 "You are not currently on a branch.\n"
3912 "To push the history leading to the current (detached HEAD)\n"
3913 "state now, use\n"
3914 "\n"
3915 "    git push %s HEAD:<name-of-remote-branch>\n"
3916 msgstr ""
3917 "您当前不在一个分支上。\n"
3918 "现在为推送当前（分离头指针）的历史，使用\n"
3919 "\n"
3920 "    git push %s HEAD:<name-of-remote-branch>\n"
3921
3922 #: builtin/push.c:128
3923 #, c-format
3924 msgid ""
3925 "The current branch %s has no upstream branch.\n"
3926 "To push the current branch and set the remote as upstream, use\n"
3927 "\n"
3928 "    git push --set-upstream %s %s\n"
3929 msgstr ""
3930 "当前分支 %s 没有对应的上游分支。\n"
3931 "为推送当前分支并建立与远程上游的跟踪，使用\n"
3932 "\n"
3933 "    git push --set-upstream %s %s\n"
3934
3935 #: builtin/push.c:136
3936 #, c-format
3937 msgid "The current branch %s has multiple upstream branches, refusing to push."
3938 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
3939
3940 #: builtin/push.c:139
3941 #, c-format
3942 msgid ""
3943 "You are pushing to remote '%s', which is not the upstream of\n"
3944 "your current branch '%s', without telling me what to push\n"
3945 "to update which remote branch."
3946 msgstr ""
3947 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
3948 "而没有告诉我要推送什么、更新哪个远程分支。"
3949
3950 #: builtin/push.c:174
3951 msgid ""
3952 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3953 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
3954
3955 #: builtin/push.c:181
3956 msgid ""
3957 "Updates were rejected because the tip of your current branch is behind\n"
3958 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3959 "before pushing again.\n"
3960 "See the 'Note about fast-forwards' in 'git push --help' for details."
3961 msgstr ""
3962 "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
3963 "再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
3964 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3965
3966 #: builtin/push.c:187
3967 msgid ""
3968 "Updates were rejected because a pushed branch tip is behind its remote\n"
3969 "counterpart. If you did not intend to push that branch, you may want to\n"
3970 "specify branches to push or set the 'push.default' configuration\n"
3971 "variable to 'current' or 'upstream' to push only the current branch."
3972 msgstr ""
3973 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3974 "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
3975 "配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
3976
3977 #: builtin/push.c:193
3978 msgid ""
3979 "Updates were rejected because a pushed branch tip is behind its remote\n"
3980 "counterpart. Check out this branch and merge the remote changes\n"
3981 "(e.g. 'git pull') before pushing again.\n"
3982 "See the 'Note about fast-forwards' in 'git push --help' for details."
3983 msgstr ""
3984 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
3985 "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
3986 "'git push --help' 中的 'Note about fast-forwards' 小节。"
3987
3988 #: builtin/push.c:233
3989 #, c-format
3990 msgid "Pushing to %s\n"
3991 msgstr "推送到 %s\n"
3992
3993 #: builtin/push.c:237
3994 #, c-format
3995 msgid "failed to push some refs to '%s'"
3996 msgstr "无法推送一些引用到 '%s'"
3997
3998 #: builtin/push.c:269
3999 #, c-format
4000 msgid "bad repository '%s'"
4001 msgstr "坏的版本库 '%s'"
4002
4003 #: builtin/push.c:270
4004 msgid ""
4005 "No configured push destination.\n"
4006 "Either specify the URL from the command-line or configure a remote "
4007 "repository using\n"
4008 "\n"
4009 "    git remote add <name> <url>\n"
4010 "\n"
4011 "and then push using the remote name\n"
4012 "\n"
4013 "    git push <name>\n"
4014 msgstr ""
4015 "没有配置推送目标。\n"
4016 "或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n"
4017 "\n"
4018 "    git remote add <name> <url>\n"
4019 "\n"
4020 "然后使用该远程版本库名执行推送\n"
4021 "\n"
4022 "    git push <name>\n"
4023
4024 #: builtin/push.c:285
4025 msgid "--all and --tags are incompatible"
4026 msgstr "--all 和 --tags 不兼容"
4027
4028 #: builtin/push.c:286
4029 msgid "--all can't be combined with refspecs"
4030 msgstr "--all 不能和引用表达式共用"
4031
4032 #: builtin/push.c:291
4033 msgid "--mirror and --tags are incompatible"
4034 msgstr "--mirror 和 --tags 不兼容"
4035
4036 #: builtin/push.c:292
4037 msgid "--mirror can't be combined with refspecs"
4038 msgstr "--mirror 不能和引用表达式共用"
4039
4040 #: builtin/push.c:297
4041 msgid "--all and --mirror are incompatible"
4042 msgstr "--all 和 --mirror 不兼容"
4043
4044 #: builtin/push.c:385
4045 msgid "--delete is incompatible with --all, --mirror and --tags"
4046 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4047
4048 #: builtin/push.c:387
4049 msgid "--delete doesn't make sense without any refs"
4050 msgstr "--delete 未接任何引用没有意义"
4051
4052 #: builtin/remote.c:98
4053 #, c-format
4054 msgid "Updating %s"
4055 msgstr "更新 %s 中"
4056
4057 #: builtin/remote.c:130
4058 msgid ""
4059 "--mirror is dangerous and deprecated; please\n"
4060 "\t use --mirror=fetch or --mirror=push instead"
4061 msgstr ""
4062 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
4063 "\t 或 --mirror=push"
4064
4065 #: builtin/remote.c:147
4066 #, c-format
4067 msgid "unknown mirror argument: %s"
4068 msgstr "未知的镜像参数：%s"
4069
4070 #: builtin/remote.c:185
4071 msgid "specifying a master branch makes no sense with --mirror"
4072 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
4073
4074 #: builtin/remote.c:187
4075 msgid "specifying branches to track makes sense only with fetch mirrors"
4076 msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"
4077
4078 #: builtin/remote.c:195 builtin/remote.c:646
4079 #, c-format
4080 msgid "remote %s already exists."
4081 msgstr "远程 %s 已经存在。"
4082
4083 #: builtin/remote.c:199 builtin/remote.c:650
4084 #, c-format
4085 msgid "'%s' is not a valid remote name"
4086 msgstr "'%s' 不是一个有效的远程名称"
4087
4088 #: builtin/remote.c:243
4089 #, c-format
4090 msgid "Could not setup master '%s'"
4091 msgstr "无法设置 master '%s'"
4092
4093 #: builtin/remote.c:299
4094 #, c-format
4095 msgid "more than one %s"
4096 msgstr "多于一个 %s"
4097
4098 #: builtin/remote.c:339
4099 #, c-format
4100 msgid "Could not get fetch map for refspec %s"
4101 msgstr "无法得到引用表达式 %s 的获取列表"
4102
4103 #: builtin/remote.c:440 builtin/remote.c:448
4104 msgid "(matching)"
4105 msgstr "（匹配）"
4106
4107 #: builtin/remote.c:452
4108 msgid "(delete)"
4109 msgstr "（删除）"
4110
4111 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
4112 #, c-format
4113 msgid "Could not append '%s' to '%s'"
4114 msgstr "不能添加 '%s' 至 '%s'"
4115
4116 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
4117 #, c-format
4118 msgid "No such remote: %s"
4119 msgstr "没有这样的远程：%s"
4120
4121 #: builtin/remote.c:656
4122 #, c-format
4123 msgid "Could not rename config section '%s' to '%s'"
4124 msgstr "不能重命名配置小节 '%s' 到 '%s'"
4125
4126 #: builtin/remote.c:662 builtin/remote.c:799
4127 #, c-format
4128 msgid "Could not remove config section '%s'"
4129 msgstr "不能移除配置小节 '%s'"
4130
4131 #: builtin/remote.c:677
4132 #, c-format
4133 msgid ""
4134 "Not updating non-default fetch refspec\n"
4135 "\t%s\n"
4136 "\tPlease update the configuration manually if necessary."
4137 msgstr ""
4138 "没有更新非默认的获取引用表达式\n"
4139 "\t%s\n"
4140 "\t如果必要请手动更新配置。"
4141
4142 #: builtin/remote.c:683
4143 #, c-format
4144 msgid "Could not append '%s'"
4145 msgstr "不能追加 '%s'"
4146
4147 #: builtin/remote.c:694
4148 #, c-format
4149 msgid "Could not set '%s'"
4150 msgstr "不能设置 '%s'"
4151
4152 #: builtin/remote.c:716
4153 #, c-format
4154 msgid "deleting '%s' failed"
4155 msgstr "删除 '%s' 失败"
4156
4157 #: builtin/remote.c:750
4158 #, c-format
4159 msgid "creating '%s' failed"
4160 msgstr "创建 '%s' 失败"
4161
4162 #: builtin/remote.c:764
4163 #, c-format
4164 msgid "Could not remove branch %s"
4165 msgstr "无法移除分支 %s"
4166
4167 #: builtin/remote.c:834
4168 msgid ""
4169 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
4170 "to delete it, use:"
4171 msgid_plural ""
4172 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
4173 "to delete them, use:"
4174 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
4175 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
4176
4177 #: builtin/remote.c:943
4178 #, c-format
4179 msgid " new (next fetch will store in remotes/%s)"
4180 msgstr " 新的（下一次获取将存储于 remotes/%s）"
4181
4182 #: builtin/remote.c:946
4183 msgid " tracked"
4184 msgstr " 已跟踪"
4185
4186 #: builtin/remote.c:948
4187 msgid " stale (use 'git remote prune' to remove)"
4188 msgstr " 过时（使用 'git remote prune' 来移除）"
4189
4190 #: builtin/remote.c:950
4191 msgid " ???"
4192 msgstr " ???"
4193
4194 #: builtin/remote.c:991
4195 #, c-format
4196 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
4197 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
4198
4199 #: builtin/remote.c:998
4200 #, c-format
4201 msgid "rebases onto remote %s"
4202 msgstr "变基到远程 %s"
4203
4204 #: builtin/remote.c:1001
4205 #, c-format
4206 msgid " merges with remote %s"
4207 msgstr " 与远程 %s 合并"
4208
4209 #: builtin/remote.c:1002
4210 msgid "    and with remote"
4211 msgstr "    且有远程"
4212
4213 #: builtin/remote.c:1004
4214 #, c-format
4215 msgid "merges with remote %s"
4216 msgstr "与远程 %s 合并"
4217
4218 #: builtin/remote.c:1005
4219 msgid "   and with remote"
4220 msgstr "   且有远程"
4221
4222 #: builtin/remote.c:1051
4223 msgid "create"
4224 msgstr "创建"
4225
4226 #: builtin/remote.c:1054
4227 msgid "delete"
4228 msgstr "删除"
4229
4230 #: builtin/remote.c:1058
4231 msgid "up to date"
4232 msgstr "最新"
4233
4234 #: builtin/remote.c:1061
4235 msgid "fast-forwardable"
4236 msgstr "可快进"
4237
4238 #: builtin/remote.c:1064
4239 msgid "local out of date"
4240 msgstr "本地已过时"
4241
4242 #: builtin/remote.c:1071
4243 #, c-format
4244 msgid "    %-*s forces to %-*s (%s)"
4245 msgstr "    %-*s 强制推送至 %-*s (%s)"
4246
4247 #: builtin/remote.c:1074
4248 #, c-format
4249 msgid "    %-*s pushes to %-*s (%s)"
4250 msgstr "    %-*s 推送至 %-*s (%s)"
4251
4252 #: builtin/remote.c:1078
4253 #, c-format
4254 msgid "    %-*s forces to %s"
4255 msgstr "    %-*s 强制推送至 %s"
4256
4257 #: builtin/remote.c:1081
4258 #, c-format
4259 msgid "    %-*s pushes to %s"
4260 msgstr "    %-*s 推送至 %s"
4261
4262 #: builtin/remote.c:1118
4263 #, c-format
4264 msgid "* remote %s"
4265 msgstr "* 远程 %s"
4266
4267 #: builtin/remote.c:1119
4268 #, c-format
4269 msgid "  Fetch URL: %s"
4270 msgstr "  获取地址：%s"
4271
4272 #: builtin/remote.c:1120 builtin/remote.c:1285
4273 msgid "(no URL)"
4274 msgstr "(无 URL)"
4275
4276 #: builtin/remote.c:1129 builtin/remote.c:1131
4277 #, c-format
4278 msgid "  Push  URL: %s"
4279 msgstr "  推送地址：%s"
4280
4281 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
4282 #, c-format
4283 msgid "  HEAD branch: %s"
4284 msgstr "  HEAD分支：%s"
4285
4286 #: builtin/remote.c:1139
4287 #, c-format
4288 msgid ""
4289 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4290 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
4291
4292 #: builtin/remote.c:1151
4293 #, c-format
4294 msgid "  Remote branch:%s"
4295 msgid_plural "  Remote branches:%s"
4296 msgstr[0] "  远程分支：%s"
4297 msgstr[1] "  远程分支：%s"
4298
4299 #  译者：中文字符串拼接，可删除前导空格
4300 #: builtin/remote.c:1154 builtin/remote.c:1181
4301 msgid " (status not queried)"
4302 msgstr "（状态未查询）"
4303
4304 #: builtin/remote.c:1163
4305 msgid "  Local branch configured for 'git pull':"
4306 msgid_plural "  Local branches configured for 'git pull':"
4307 msgstr[0] "  为 'git pull' 配置的本地分支："
4308 msgstr[1] "  为 'git pull' 配置的本地分支："
4309
4310 #: builtin/remote.c:1171
4311 msgid "  Local refs will be mirrored by 'git push'"
4312 msgstr "  本地引用将在 'git push' 时被镜像"
4313
4314 #: builtin/remote.c:1178
4315 #, c-format
4316 msgid "  Local ref configured for 'git push'%s:"
4317 msgid_plural "  Local refs configured for 'git push'%s:"
4318 msgstr[0] "  为 'git push' 配置的本地引用%s："
4319 msgstr[1] "  为 'git push' 配置的本地引用%s："
4320
4321 #: builtin/remote.c:1216
4322 msgid "Cannot determine remote HEAD"
4323 msgstr "无法确定远程 HEAD"
4324
4325 #: builtin/remote.c:1218
4326 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4327 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
4328
4329 #: builtin/remote.c:1228
4330 #, c-format
4331 msgid "Could not delete %s"
4332 msgstr "无法删除 %s"
4333
4334 #: builtin/remote.c:1236
4335 #, c-format
4336 msgid "Not a valid ref: %s"
4337 msgstr "不是一个有效引用：%s"
4338
4339 #: builtin/remote.c:1238
4340 #, c-format
4341 msgid "Could not setup %s"
4342 msgstr "不能设置 %s"
4343
4344 #  译者：注意保持前导空格
4345 #: builtin/remote.c:1274
4346 #, c-format
4347 msgid " %s will become dangling!"
4348 msgstr " %s 将成为悬空状态！"
4349
4350 #  译者：注意保持前导空格
4351 #: builtin/remote.c:1275
4352 #, c-format
4353 msgid " %s has become dangling!"
4354 msgstr " %s 已成为悬空状态！"
4355
4356 #: builtin/remote.c:1281
4357 #, c-format
4358 msgid "Pruning %s"
4359 msgstr "修剪 %s"
4360
4361 #: builtin/remote.c:1282
4362 #, c-format
4363 msgid "URL: %s"
4364 msgstr "URL：%s"
4365
4366 #: builtin/remote.c:1295
4367 #, c-format
4368 msgid " * [would prune] %s"
4369 msgstr " * [将删除] %s"
4370
4371 #: builtin/remote.c:1298
4372 #, c-format
4373 msgid " * [pruned] %s"
4374 msgstr " * [已删除] %s"
4375
4376 #: builtin/remote.c:1387 builtin/remote.c:1461
4377 #, c-format
4378 msgid "No such remote '%s'"
4379 msgstr "没有此远程 '%s'"
4380
4381 #: builtin/remote.c:1414
4382 msgid "no remote specified"
4383 msgstr "未指定远程"
4384
4385 #: builtin/remote.c:1447
4386 msgid "--add --delete doesn't make sense"
4387 msgstr "--add --delete 无意义"
4388
4389 #: builtin/remote.c:1487
4390 #, c-format
4391 msgid "Invalid old URL pattern: %s"
4392 msgstr "无效的旧URL匹配模版：%s"
4393
4394 #: builtin/remote.c:1495
4395 #, c-format
4396 msgid "No such URL found: %s"
4397 msgstr "未找到此URL：%s"
4398
4399 #: builtin/remote.c:1497
4400 msgid "Will not delete all non-push URLs"
4401 msgstr "将不会删除所有非推送URL地址"
4402
4403 #: builtin/reset.c:33
4404 msgid "mixed"
4405 msgstr "混杂"
4406
4407 #: builtin/reset.c:33
4408 msgid "soft"
4409 msgstr "软性"
4410
4411 #: builtin/reset.c:33
4412 msgid "hard"
4413 msgstr "硬性"
4414
4415 #: builtin/reset.c:33
4416 msgid "merge"
4417 msgstr "合并"
4418
4419 #: builtin/reset.c:33
4420 msgid "keep"
4421 msgstr "保持"
4422
4423 #: builtin/reset.c:77
4424 msgid "You do not have a valid HEAD."
4425 msgstr "您没有一个有效的 HEAD。"
4426
4427 #: builtin/reset.c:79
4428 msgid "Failed to find tree of HEAD."
4429 msgstr "无法找到 HEAD 指向的树。"
4430
4431 #: builtin/reset.c:85
4432 #, c-format
4433 msgid "Failed to find tree of %s."
4434 msgstr "无法找到 %s 指向的树。"
4435
4436 #: builtin/reset.c:96
4437 msgid "Could not write new index file."
4438 msgstr "不能写入新的索引文件。"
4439
4440 #: builtin/reset.c:106
4441 #, c-format
4442 msgid "HEAD is now at %s"
4443 msgstr "HEAD 现在位于 %s"
4444
4445 #: builtin/reset.c:130
4446 msgid "Could not read index"
4447 msgstr "不能读取索引"
4448
4449 #: builtin/reset.c:133
4450 msgid "Unstaged changes after reset:"
4451 msgstr "重置后撤出暂存区的变更："
4452
4453 #  译者：汉字之间无空格，故删除%s前后空格
4454 #: builtin/reset.c:223
4455 #, c-format
4456 msgid "Cannot do a %s reset in the middle of a merge."
4457 msgstr "在合并过程中不能做%s重置操作。"
4458
4459 #: builtin/reset.c:297
4460 #, c-format
4461 msgid "Could not parse object '%s'."
4462 msgstr "不能解析对象 '%s'。"
4463
4464 #: builtin/reset.c:302
4465 msgid "--patch is incompatible with --{hard,mixed,soft}"
4466 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4467
4468 #: builtin/reset.c:311
4469 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4470 msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。"
4471
4472 #  译者：汉字之间无空格，故删除%s前后空格
4473 #: builtin/reset.c:313
4474 #, c-format
4475 msgid "Cannot do %s reset with paths."
4476 msgstr "不能带路径进行%s重置。"
4477
4478 #  译者：汉字之间无空格，故删除%s前后空格
4479 #: builtin/reset.c:325
4480 #, c-format
4481 msgid "%s reset is not allowed in a bare repository"
4482 msgstr "不能对裸版本库进行%s重置"
4483
4484 #: builtin/reset.c:341
4485 #, c-format
4486 msgid "Could not reset index file to revision '%s'."
4487 msgstr "不能重置索引文件至版本 '%s'。"
4488
4489 #: builtin/revert.c:70 builtin/revert.c:92
4490 #, c-format
4491 msgid "%s: %s cannot be used with %s"
4492 msgstr "%s：%s 不能和 %s 共用"
4493
4494 #: builtin/revert.c:131
4495 msgid "program error"
4496 msgstr "程序错误"
4497
4498 #: builtin/revert.c:221
4499 msgid "revert failed"
4500 msgstr "还原失败"
4501
4502 #: builtin/revert.c:236
4503 msgid "cherry-pick failed"
4504 msgstr "拣选失败"
4505
4506 #: builtin/rm.c:109
4507 #, c-format
4508 msgid ""
4509 "'%s' has staged content different from both the file and the HEAD\n"
4510 "(use -f to force removal)"
4511 msgstr ""
4512 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
4513 "（使用 -f 强制删除）"
4514
4515 #: builtin/rm.c:115
4516 #, c-format
4517 msgid ""
4518 "'%s' has changes staged in the index\n"
4519 "(use --cached to keep the file, or -f to force removal)"
4520 msgstr ""
4521 "'%s' 有变更已暂存至索引中\n"
4522 "（使用 --cached 保存文件，或用 -f 强制删除）"
4523
4524 #: builtin/rm.c:119
4525 #, c-format
4526 msgid ""
4527 "'%s' has local modifications\n"
4528 "(use --cached to keep the file, or -f to force removal)"
4529 msgstr ""
4530 "'%s' 有本地修改\n"
4531 "（使用 --cached 保存文件，或用 -f 强制删除）"
4532
4533 #: builtin/rm.c:194
4534 #, c-format
4535 msgid "not removing '%s' recursively without -r"
4536 msgstr "未提供 -r 选项不会递归删除 '%s'"
4537
4538 #: builtin/rm.c:230
4539 #, c-format
4540 msgid "git rm: unable to remove %s"
4541 msgstr "git rm：不能删除 %s"
4542
4543 #: builtin/shortlog.c:157
4544 #, c-format
4545 msgid "Missing author: %s"
4546 msgstr "缺少作者：%s"
4547
4548 #: builtin/tag.c:60
4549 #, c-format
4550 msgid "malformed object at '%s'"
4551 msgstr "非法的对象于 '%s'"
4552
4553 #: builtin/tag.c:207
4554 #, c-format
4555 msgid "tag name too long: %.*s..."
4556 msgstr "tag 名字太长：%.*s..."
4557
4558 #: builtin/tag.c:212
4559 #, c-format
4560 msgid "tag '%s' not found."
4561 msgstr "tag '%s' 未发现。"
4562
4563 #: builtin/tag.c:227
4564 #, c-format
4565 msgid "Deleted tag '%s' (was %s)\n"
4566 msgstr "已删除 tag '%s'（曾为 %s）\n"
4567
4568 #: builtin/tag.c:239
4569 #, c-format
4570 msgid "could not verify the tag '%s'"
4571 msgstr "不能校验 tag '%s'"
4572
4573 #: builtin/tag.c:249
4574 msgid ""
4575 "\n"
4576 "#\n"
4577 "# Write a tag message\n"
4578 "# Lines starting with '#' will be ignored.\n"
4579 "#\n"
4580 msgstr ""
4581 "\n"
4582 "#\n"
4583 "# 输入一个 tag 说明\n"
4584 "# 以 '#' 开头的行将被忽略。\n"
4585 "#\n"
4586
4587 #: builtin/tag.c:256
4588 msgid ""
4589 "\n"
4590 "#\n"
4591 "# Write a tag message\n"
4592 "# Lines starting with '#' will be kept; you may remove them yourself if you "
4593 "want to.\n"
4594 "#\n"
4595 msgstr ""
4596 "\n"
4597 "#\n"
4598 "# 输入一个 tag 说明\n"
4599 "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"
4600 "#\n"
4601
4602 #: builtin/tag.c:298
4603 msgid "unable to sign the tag"
4604 msgstr "无法签署 tag"
4605
4606 #: builtin/tag.c:300
4607 msgid "unable to write tag file"
4608 msgstr "无法写 tag 文件"
4609
4610 #: builtin/tag.c:325
4611 msgid "bad object type."
4612 msgstr "坏的对象类型。"
4613
4614 #: builtin/tag.c:338
4615 msgid "tag header too big."
4616 msgstr "tag 头信息太大。"
4617
4618 #: builtin/tag.c:370
4619 msgid "no tag message?"
4620 msgstr "无 tag 说明？"
4621
4622 #: builtin/tag.c:376
4623 #, c-format
4624 msgid "The tag message has been left in %s\n"
4625 msgstr "tag 说明被保留在 %s\n"
4626
4627 #: builtin/tag.c:425
4628 msgid "switch 'points-at' requires an object"
4629 msgstr "开关 'points-at' 需要一个对象"
4630
4631 #: builtin/tag.c:427
4632 #, c-format
4633 msgid "malformed object name '%s'"
4634 msgstr "非法的对象名 '%s'"
4635
4636 #: builtin/tag.c:506
4637 msgid "--column and -n are incompatible"
4638 msgstr "--column 和 -n 不兼容"
4639
4640 #: builtin/tag.c:523
4641 msgid "-n option is only allowed with -l."
4642 msgstr "-n 选项只允许和 -l 共用。"
4643
4644 #: builtin/tag.c:525
4645 msgid "--contains option is only allowed with -l."
4646 msgstr "--contains 选项只允许和 -l 共用。"
4647
4648 #: builtin/tag.c:527
4649 msgid "--points-at option is only allowed with -l."
4650 msgstr "--points-at 选项只允许和 -l 共用。"
4651
4652 #: builtin/tag.c:535
4653 msgid "only one -F or -m option is allowed."
4654 msgstr "只允许一个 -F 或 -m 选项。"
4655
4656 #: builtin/tag.c:555
4657 msgid "too many params"
4658 msgstr "太多参数"
4659
4660 #: builtin/tag.c:561
4661 #, c-format
4662 msgid "'%s' is not a valid tag name."
4663 msgstr "'%s' 不是一个有效的tag名称。"
4664
4665 #: builtin/tag.c:566
4666 #, c-format
4667 msgid "tag '%s' already exists"
4668 msgstr "tag '%s' 已存在"
4669
4670 #: builtin/tag.c:584
4671 #, c-format
4672 msgid "%s: cannot lock the ref"
4673 msgstr "%s：不能锁定引用"
4674
4675 #: builtin/tag.c:586
4676 #, c-format
4677 msgid "%s: cannot update the ref"
4678 msgstr "%s：不能更新引用"
4679
4680 #: builtin/tag.c:588
4681 #, c-format
4682 msgid "Updated tag '%s' (was %s)\n"
4683 msgstr "已更新tag '%s'（曾为 %s）\n"
4684
4685 #: git.c:16
4686 msgid "See 'git help <command>' for more information on a specific command."
4687 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
4688
4689 #: parse-options.h:133 parse-options.h:235
4690 msgid "n"
4691 msgstr "数字"
4692
4693 #: parse-options.h:141
4694 msgid "time"
4695 msgstr "时间"
4696
4697 #: parse-options.h:149
4698 msgid "file"
4699 msgstr "文件"
4700
4701 #: parse-options.h:151
4702 msgid "when"
4703 msgstr "何时"
4704
4705 #: parse-options.h:156
4706 msgid "no-op (backward compatibility)"
4707 msgstr "空操作（向后兼容）"
4708
4709 #: parse-options.h:228
4710 msgid "be more verbose"
4711 msgstr "更加详细"
4712
4713 #: parse-options.h:230
4714 msgid "be more quiet"
4715 msgstr "更加安静"
4716
4717 #: parse-options.h:236
4718 msgid "use <n> digits to display SHA-1s"
4719 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
4720
4721 #: common-cmds.h:8
4722 msgid "Add file contents to the index"
4723 msgstr "添加文件内容至索引"
4724
4725 #: common-cmds.h:9
4726 msgid "Find by binary search the change that introduced a bug"
4727 msgstr "通过二分查找定位引入 bug 的变更"
4728
4729 #: common-cmds.h:10
4730 msgid "List, create, or delete branches"
4731 msgstr "列出、创建或删除分支"
4732
4733 #: common-cmds.h:11
4734 msgid "Checkout a branch or paths to the working tree"
4735 msgstr "检出一个分支或路径到工作区"
4736
4737 #: common-cmds.h:12
4738 msgid "Clone a repository into a new directory"
4739 msgstr "克隆一个版本库到一个新目录"
4740
4741 #: common-cmds.h:13
4742 msgid "Record changes to the repository"
4743 msgstr "记录变更到版本库"
4744
4745 #: common-cmds.h:14
4746 msgid "Show changes between commits, commit and working tree, etc"
4747 msgstr "显示提交之间、提交和工作区之间等的差异"
4748
4749 #: common-cmds.h:15
4750 msgid "Download objects and refs from another repository"
4751 msgstr "从另外一个版本库下载对象和引用"
4752
4753 #: common-cmds.h:16
4754 msgid "Print lines matching a pattern"
4755 msgstr "输出和模式匹配的行"
4756
4757 #: common-cmds.h:17
4758 msgid "Create an empty git repository or reinitialize an existing one"
4759 msgstr "创建一个空的 git 版本库或者重新初始化一个"
4760
4761 #: common-cmds.h:18
4762 msgid "Show commit logs"
4763 msgstr "显示提交日志"
4764
4765 #: common-cmds.h:19
4766 msgid "Join two or more development histories together"
4767 msgstr "合并两个或更多开发历史"
4768
4769 #: common-cmds.h:20
4770 msgid "Move or rename a file, a directory, or a symlink"
4771 msgstr "移动或重命名一个文件、目录或符号链接"
4772
4773 #: common-cmds.h:21
4774 msgid "Fetch from and merge with another repository or a local branch"
4775 msgstr "获取并合并另外的版本库或一个本地分支"
4776
4777 #: common-cmds.h:22
4778 msgid "Update remote refs along with associated objects"
4779 msgstr "更新远程引用和相关的对象"
4780
4781 #: common-cmds.h:23
4782 msgid "Forward-port local commits to the updated upstream head"
4783 msgstr "本地提交转移至更新后的上游分支中"
4784
4785 #: common-cmds.h:24
4786 msgid "Reset current HEAD to the specified state"
4787 msgstr "重置当前HEAD到指定状态"
4788
4789 #: common-cmds.h:25
4790 msgid "Remove files from the working tree and from the index"
4791 msgstr "从工作区和索引中删除文件"
4792
4793 #: common-cmds.h:26
4794 msgid "Show various types of objects"
4795 msgstr "显示各种类型的对象"
4796
4797 #: common-cmds.h:27
4798 msgid "Show the working tree status"
4799 msgstr "显示工作区状态"
4800
4801 #: common-cmds.h:28
4802 msgid "Create, list, delete or verify a tag object signed with GPG"
4803 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4804
4805 #: git-am.sh:50
4806 msgid "You need to set your committer info first"
4807 msgstr "您需要先设置你的提交者信息"
4808
4809 #: git-am.sh:95
4810 msgid ""
4811 "You seem to have moved HEAD since the last 'am' failure.\n"
4812 "Not rewinding to ORIG_HEAD"
4813 msgstr ""
4814 "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4815
4816 #: git-am.sh:105
4817 #, sh-format
4818 msgid ""
4819 "When you have resolved this problem run \"$cmdline --resolved\".\n"
4820 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4821 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4822 msgstr ""
4823 "当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"
4824 "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
4825 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
4826
4827 #: git-am.sh:121
4828 msgid "Cannot fall back to three-way merge."
4829 msgstr "无法求助于三路合并。"
4830
4831 #: git-am.sh:137
4832 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4833 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
4834
4835 #: git-am.sh:154
4836 msgid ""
4837 "Did you hand edit your patch?\n"
4838 "It does not apply to blobs recorded in its index."
4839 msgstr ""
4840 "您是否曾手动编辑过您的补丁？\n"
4841 "无法应用补丁到索引中的数据上。"
4842
4843 #: git-am.sh:163
4844 msgid "Falling back to patching base and 3-way merge..."
4845 msgstr "转而在基础版本上打补丁及进行三路合并..."
4846
4847 #: git-am.sh:275
4848 msgid "Only one StGIT patch series can be applied at once"
4849 msgstr "一次只能有一个 StGIT 补丁队列被应用"
4850
4851 #: git-am.sh:362
4852 #, sh-format
4853 msgid "Patch format $patch_format is not supported."
4854 msgstr "不支持 $patch_format 补丁格式。"
4855
4856 #: git-am.sh:364
4857 msgid "Patch format detection failed."
4858 msgstr "补丁格式检测失败。"
4859
4860 #: git-am.sh:418
4861 msgid "-d option is no longer supported.  Do not use."
4862 msgstr "不再支持 -d 选项。不要使用。"
4863
4864 #: git-am.sh:481
4865 #, sh-format
4866 msgid "previous rebase directory $dotest still exists but mbox given."
4867 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
4868
4869 #: git-am.sh:486
4870 msgid "Please make up your mind. --skip or --abort?"
4871 msgstr "请下决心。--skip 或是 --abort ？"
4872
4873 #: git-am.sh:513
4874 msgid "Resolve operation not in progress, we are not resuming."
4875 msgstr "解决操作未进行，我们不会继续。"
4876
4877 #: git-am.sh:579
4878 #, sh-format
4879 msgid "Dirty index: cannot apply patches (dirty: $files)"
4880 msgstr "脏的索引：不能应用补丁（脏文件：$files）"
4881
4882 #: git-am.sh:671
4883 #, sh-format
4884 msgid ""
4885 "Patch is empty.  Was it split wrong?\n"
4886 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4887 "To restore the original branch and stop patching run \"$cmdline --abort\"."
4888 msgstr ""
4889 "补丁为空。是不是切分错误？\n"
4890 "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
4891 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
4892
4893 #: git-am.sh:708
4894 msgid "Patch does not have a valid e-mail address."
4895 msgstr "补丁中没有一个有效的邮件地址。"
4896
4897 #: git-am.sh:755
4898 msgid "cannot be interactive without stdin connected to a terminal."
4899 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
4900
4901 #: git-am.sh:759
4902 msgid "Commit Body is:"
4903 msgstr "提交内容为："
4904
4905 #  译者：注意保持句尾空格
4906 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4907 #. in your translation. The program will only accept English
4908 #. input at this point.
4909 #: git-am.sh:766
4910 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4911 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4912
4913 #: git-am.sh:802
4914 #, sh-format
4915 msgid "Applying: $FIRSTLINE"
4916 msgstr "正应用：$FIRSTLINE"
4917
4918 #: git-am.sh:823
4919 msgid ""
4920 "No changes - did you forget to use 'git add'?\n"
4921 "If there is nothing left to stage, chances are that something else\n"
4922 "already introduced the same changes; you might want to skip this patch."
4923 msgstr ""
4924 "没有变更 —— 您是不是忘了执行 'git add'？\n"
4925 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
4926 "您也许想要跳过这个补丁。"
4927
4928 #: git-am.sh:831
4929 msgid ""
4930 "You still have unmerged paths in your index\n"
4931 "did you forget to use 'git add'?"
4932 msgstr ""
4933 "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
4934
4935 #: git-am.sh:847
4936 msgid "No changes -- Patch already applied."
4937 msgstr "没有变更 -- 补丁已经应用过。"
4938
4939 #: git-am.sh:857
4940 #, sh-format
4941 msgid "Patch failed at $msgnum $FIRSTLINE"
4942 msgstr "补丁失败于 $msgnum $FIRSTLINE"
4943
4944 #: git-am.sh:873
4945 msgid "applying to an empty history"
4946 msgstr "正应用到一个空历史上"
4947
4948 #: git-bisect.sh:48
4949 msgid "You need to start by \"git bisect start\""
4950 msgstr "您需要执行 \"git bisect start\" 来开始"
4951
4952 #  译者：注意保持句尾空格
4953 #. TRANSLATORS: Make sure to include [Y] and [n] in your
4954 #. translation. The program will only accept English input
4955 #. at this point.
4956 #: git-bisect.sh:54
4957 msgid "Do you want me to do it for you [Y/n]? "
4958 msgstr "您想让我为您这样做么[Y/n]？ "
4959
4960 #: git-bisect.sh:95
4961 #, sh-format
4962 msgid "unrecognised option: '$arg'"
4963 msgstr "未能识别的选项：'$arg'"
4964
4965 #: git-bisect.sh:99
4966 #, sh-format
4967 msgid "'$arg' does not appear to be a valid revision"
4968 msgstr "'$arg' 看起来不像是一个有效的版本"
4969
4970 #: git-bisect.sh:117
4971 msgid "Bad HEAD - I need a HEAD"
4972 msgstr "坏的 HEAD - 我需要一个 HEAD"
4973
4974 #: git-bisect.sh:130
4975 #, sh-format
4976 msgid ""
4977 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
4978 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
4979
4980 #: git-bisect.sh:140
4981 msgid "won't bisect on seeked tree"
4982 msgstr "不会在已查找过的树上二分查找"
4983
4984 #: git-bisect.sh:144
4985 msgid "Bad HEAD - strange symbolic ref"
4986 msgstr "坏的 HEAD - 奇怪的符号引用"
4987
4988 #: git-bisect.sh:189
4989 #, sh-format
4990 msgid "Bad bisect_write argument: $state"
4991 msgstr "坏的 bisect_write 参数：$state"
4992
4993 #: git-bisect.sh:218
4994 #, sh-format
4995 msgid "Bad rev input: $arg"
4996 msgstr "输入坏的版本：$arg"
4997
4998 #: git-bisect.sh:232
4999 msgid "Please call 'bisect_state' with at least one argument."
5000 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
5001
5002 #: git-bisect.sh:244
5003 #, sh-format
5004 msgid "Bad rev input: $rev"
5005 msgstr "输入坏的版本：$rev"
5006
5007 #: git-bisect.sh:250
5008 msgid "'git bisect bad' can take only one argument."
5009 msgstr "'git bisect bad' 只能带一个参数。"
5010
5011 #. have bad but not good.  we could bisect although
5012 #. this is less optimum.
5013 #: git-bisect.sh:273
5014 msgid "Warning: bisecting only with a bad commit."
5015 msgstr "警告：在仅有一个坏提交下进行二分查找。"
5016
5017 #  译者：注意保持句尾空格
5018 #. TRANSLATORS: Make sure to include [Y] and [n] in your
5019 #. translation. The program will only accept English input
5020 #. at this point.
5021 #: git-bisect.sh:279
5022 msgid "Are you sure [Y/n]? "
5023 msgstr "您确认么[Y/n]？ "
5024
5025 #: git-bisect.sh:289
5026 msgid ""
5027 "You need to give me at least one good and one bad revisions.\n"
5028 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5029 msgstr ""
5030 "您需要给我至少一个好版本和一个坏版本。\n"
5031 "（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
5032
5033 #: git-bisect.sh:292
5034 msgid ""
5035 "You need to start by \"git bisect start\".\n"
5036 "You then need to give me at least one good and one bad revisions.\n"
5037 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5038 msgstr ""
5039 "您需要执行 \"git bisect start\" 来开始。\n"
5040 "然后需要提供我至少一个好版本和一个坏版本。\n"
5041 "（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
5042
5043 #: git-bisect.sh:347 git-bisect.sh:474
5044 msgid "We are not bisecting."
5045 msgstr "我们没有在二分查找。"
5046
5047 #: git-bisect.sh:354
5048 #, sh-format
5049 msgid "'$invalid' is not a valid commit"
5050 msgstr "'$invalid' 不是一个有效的提交"
5051
5052 #: git-bisect.sh:363
5053 #, sh-format
5054 msgid ""
5055 "Could not check out original HEAD '$branch'.\n"
5056 "Try 'git bisect reset <commit>'."
5057 msgstr ""
5058 "不能检出原始 HEAD '$branch'。\n"
5059 "尝试 'git bisect reset <commit>'。"
5060
5061 #: git-bisect.sh:390
5062 msgid "No logfile given"
5063 msgstr "未提供日志文件"
5064
5065 #: git-bisect.sh:391
5066 #, sh-format
5067 msgid "cannot read $file for replaying"
5068 msgstr "不能读取 $file 来重放"
5069
5070 #: git-bisect.sh:408
5071 msgid "?? what are you talking about?"
5072 msgstr "?? 您在说什么?"
5073
5074 #: git-bisect.sh:420
5075 #, sh-format
5076 msgid "running $command"
5077 msgstr "运行 $command"
5078
5079 #: git-bisect.sh:427
5080 #, sh-format
5081 msgid ""
5082 "bisect run failed:\n"
5083 "exit code $res from '$command' is < 0 or >= 128"
5084 msgstr ""
5085 "二分查找运行失败：\n"
5086 "命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
5087
5088 #: git-bisect.sh:453
5089 msgid "bisect run cannot continue any more"
5090 msgstr "二分查找不能继续运行"
5091
5092 #: git-bisect.sh:459
5093 #, sh-format
5094 msgid ""
5095 "bisect run failed:\n"
5096 "'bisect_state $state' exited with error code $res"
5097 msgstr ""
5098 "二分查找运行失败：\n"
5099 "'bisect_state $state' 退出码为 $res"
5100
5101 #: git-bisect.sh:466
5102 msgid "bisect run success"
5103 msgstr "二分查找运行成功"
5104
5105 #: git-pull.sh:21
5106 msgid ""
5107 "Pull is not possible because you have unmerged files.\n"
5108 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
5109 "as appropriate to mark resolution, or use 'git commit -a'."
5110 msgstr ""
5111 "Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
5112 "然后酌情使用 'git add/rm <file>' 标记解决方案，\n"
5113 "或者使用 'git commit -a'。"
5114
5115 #: git-pull.sh:25
5116 msgid "Pull is not possible because you have unmerged files."
5117 msgstr "Pull 不可用，因为您尚有未合并的文件。"
5118
5119 #: git-pull.sh:197
5120 msgid "updating an unborn branch with changes added to the index"
5121 msgstr "更新尚未诞生的分支，变更添加至索引"
5122
5123 #. The fetch involved updating the current branch.
5124 #. The working tree and the index file is still based on the
5125 #. $orig_head commit, but we are merging into $curr_head.
5126 #. First update the working tree to match $curr_head.
5127 #: git-pull.sh:228
5128 #, sh-format
5129 msgid ""
5130 "Warning: fetch updated the current branch head.\n"
5131 "Warning: fast-forwarding your working tree from\n"
5132 "Warning: commit $orig_head."
5133 msgstr ""
5134 "警告：fetch 更新了当前的分支。您的工作区\n"
5135 "警告：从原提交 $orig_head 快进。"
5136
5137 #: git-pull.sh:253
5138 msgid "Cannot merge multiple branches into empty head"
5139 msgstr "无法将多个分支合并到空分支"
5140
5141 #: git-pull.sh:257
5142 msgid "Cannot rebase onto multiple branches"
5143 msgstr "无法变基到多个分支"
5144
5145 #: git-stash.sh:51
5146 msgid "git stash clear with parameters is unimplemented"
5147 msgstr "git stash clear 不支持参数"
5148
5149 #: git-stash.sh:74
5150 msgid "You do not have the initial commit yet"
5151 msgstr "您尚未建立初始提交"
5152
5153 #: git-stash.sh:89
5154 msgid "Cannot save the current index state"
5155 msgstr "无法保存当前索引状态"
5156
5157 #: git-stash.sh:123 git-stash.sh:136
5158 msgid "Cannot save the current worktree state"
5159 msgstr "无法保存当前工作区状态"
5160
5161 #: git-stash.sh:140
5162 msgid "No changes selected"
5163 msgstr "没有选择变更"
5164
5165 #: git-stash.sh:143
5166 msgid "Cannot remove temporary index (can't happen)"
5167 msgstr "无法删除临时索引（不应发生）"
5168
5169 #: git-stash.sh:156
5170 msgid "Cannot record working tree state"
5171 msgstr "不能记录工作区状态"
5172
5173 #. TRANSLATORS: $option is an invalid option, like
5174 #. `--blah-blah'. The 7 spaces at the beginning of the
5175 #. second line correspond to "error: ". So you should line
5176 #. up the second line with however many characters the
5177 #. translation of "error: " takes in your language. E.g. in
5178 #. English this is:
5179 #.
5180 #. $ git stash save --blah-blah 2>&1 | head -n 2
5181 #. error: unknown option for 'stash save': --blah-blah
5182 #. To provide a message, use git stash save -- '--blah-blah'
5183 #: git-stash.sh:202
5184 #, sh-format
5185 msgid ""
5186 "error: unknown option for 'stash save': $option\n"
5187 "       To provide a message, use git stash save -- '$option'"
5188 msgstr ""
5189 "错误：'stash save' 的未知选项：$option\n"
5190 "      要提供一个描述信息，使用 git stash save -- '$option'"
5191
5192 #: git-stash.sh:223
5193 msgid "No local changes to save"
5194 msgstr "没有要保存的本地修改"
5195
5196 #: git-stash.sh:227
5197 msgid "Cannot initialize stash"
5198 msgstr "无法初始化 stash"
5199
5200 #: git-stash.sh:235
5201 msgid "Cannot save the current status"
5202 msgstr "无法保存当前状态"
5203
5204 #: git-stash.sh:253
5205 msgid "Cannot remove worktree changes"
5206 msgstr "无法删除工作区变更"
5207
5208 #: git-stash.sh:352
5209 msgid "No stash found."
5210 msgstr "未发现 stash。"
5211
5212 #: git-stash.sh:359
5213 #, sh-format
5214 msgid "Too many revisions specified: $REV"
5215 msgstr "指定了太多的版本：$REV"
5216
5217 #: git-stash.sh:365
5218 #, sh-format
5219 msgid "$reference is not valid reference"
5220 msgstr "$reference 不是有效的引用"
5221
5222 #: git-stash.sh:393
5223 #, sh-format
5224 msgid "'$args' is not a stash-like commit"
5225 msgstr "'$args' 不是 stash 样提交"
5226
5227 #: git-stash.sh:404
5228 #, sh-format
5229 msgid "'$args' is not a stash reference"
5230 msgstr "'$args' 不是一个 stash 引用"
5231
5232 #: git-stash.sh:412
5233 msgid "unable to refresh index"
5234 msgstr "无法刷新索引"
5235
5236 #: git-stash.sh:416
5237 msgid "Cannot apply a stash in the middle of a merge"
5238 msgstr "无法在合并过程中恢复进度"
5239
5240 #: git-stash.sh:424
5241 msgid "Conflicts in index. Try without --index."
5242 msgstr "索引中有冲突。尝试不使用 --index。"
5243
5244 #: git-stash.sh:426
5245 msgid "Could not save index tree"
5246 msgstr "不能保存索引树"
5247
5248 #: git-stash.sh:460
5249 msgid "Cannot unstage modified files"
5250 msgstr "无法还原修改的文件"
5251
5252 #: git-stash.sh:474
5253 msgid "Index was not unstashed."
5254 msgstr "索引的进度没有被恢复。"
5255
5256 #: git-stash.sh:491
5257 #, sh-format
5258 msgid "Dropped ${REV} ($s)"
5259 msgstr "丢弃了 ${REV} ($s)"
5260
5261 #: git-stash.sh:492
5262 #, sh-format
5263 msgid "${REV}: Could not drop stash entry"
5264 msgstr "${REV}：不能丢弃进度条目"
5265
5266 #: git-stash.sh:499
5267 msgid "No branch name specified"
5268 msgstr "未指定分支名"
5269
5270 #: git-stash.sh:570
5271 msgid "(To restore them type \"git stash apply\")"
5272 msgstr "（为恢复数据输入 \"git stash apply\"）"
5273
5274 #: git-submodule.sh:56
5275 #, sh-format
5276 msgid "cannot strip one component off url '$remoteurl'"
5277 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5278
5279 #: git-submodule.sh:109
5280 #, sh-format
5281 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5282 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5283
5284 #: git-submodule.sh:150
5285 #, sh-format
5286 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5287 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5288
5289 #: git-submodule.sh:160
5290 #, sh-format
5291 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5292 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5293
5294 #: git-submodule.sh:249
5295 #, sh-format
5296 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5297 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
5298
5299 #: git-submodule.sh:266
5300 #, sh-format
5301 msgid "'$sm_path' already exists in the index"
5302 msgstr "'$sm_path' 已经存在于索引中"
5303
5304 #: git-submodule.sh:270
5305 #, sh-format
5306 msgid ""
5307 "The following path is ignored by one of your .gitignore files:\n"
5308 "$sm_path\n"
5309 "Use -f if you really want to add it."
5310 msgstr ""
5311 "以下路径被您的一个 .gitignore 文件所忽略：\n"
5312 "$sm_path\n"
5313 "如果您确实想添加它，使用 -f 参数。"
5314
5315 #: git-submodule.sh:281
5316 #, sh-format
5317 msgid "Adding existing repo at '$sm_path' to the index"
5318 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5319
5320 #: git-submodule.sh:283
5321 #, sh-format
5322 msgid "'$sm_path' already exists and is not a valid git repo"
5323 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5324
5325 #: git-submodule.sh:297
5326 #, sh-format
5327 msgid "Unable to checkout submodule '$sm_path'"
5328 msgstr "不能检出子模组 '$sm_path'"
5329
5330 #: git-submodule.sh:302
5331 #, sh-format
5332 msgid "Failed to add submodule '$sm_path'"
5333 msgstr "无法添加子模组 '$sm_path'"
5334
5335 #: git-submodule.sh:307
5336 #, sh-format
5337 msgid "Failed to register submodule '$sm_path'"
5338 msgstr "无法注册子模组 '$sm_path'"
5339
5340 #: git-submodule.sh:349
5341 #, sh-format
5342 msgid "Entering '$prefix$sm_path'"
5343 msgstr "正在进入 '$prefix$sm_path'"
5344
5345 #: git-submodule.sh:363
5346 #, sh-format
5347 msgid "Stopping at '$sm_path'; script returned non-zero status."
5348 msgstr "停止于 '$sm_path'，脚本返回非零值。"
5349
5350 #: git-submodule.sh:406
5351 #, sh-format
5352 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5353 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5354
5355 #: git-submodule.sh:415
5356 #, sh-format
5357 msgid "Failed to register url for submodule path '$sm_path'"
5358 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5359
5360 #: git-submodule.sh:417
5361 #, sh-format
5362 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5363 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5364
5365 #: git-submodule.sh:425
5366 #, sh-format
5367 msgid "Failed to register update mode for submodule path '$sm_path'"
5368 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5369
5370 #: git-submodule.sh:524
5371 #, sh-format
5372 msgid ""
5373 "Submodule path '$sm_path' not initialized\n"
5374 "Maybe you want to use 'update --init'?"
5375 msgstr ""
5376 "子模组路径 '$sm_path' 没有初始化\n"
5377 "也许您想用 'update --init'？"
5378
5379 #: git-submodule.sh:537
5380 #, sh-format
5381 msgid "Unable to find current revision in submodule path '$sm_path'"
5382 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5383
5384 #: git-submodule.sh:556
5385 #, sh-format
5386 msgid "Unable to fetch in submodule path '$sm_path'"
5387 msgstr "无法在子模组路径 '$sm_path' 中获取"
5388
5389 #: git-submodule.sh:570
5390 #, sh-format
5391 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5392 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5393
5394 #: git-submodule.sh:571
5395 #, sh-format
5396 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5397 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
5398
5399 #: git-submodule.sh:576
5400 #, sh-format
5401 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5402 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5403
5404 #: git-submodule.sh:577
5405 #, sh-format
5406 msgid "Submodule path '$sm_path': merged in '$sha1'"
5407 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
5408
5409 #: git-submodule.sh:582
5410 #, sh-format
5411 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5412 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5413
5414 #: git-submodule.sh:583
5415 #, sh-format
5416 msgid "Submodule path '$sm_path': checked out '$sha1'"
5417 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
5418
5419 #: git-submodule.sh:605 git-submodule.sh:928
5420 #, sh-format
5421 msgid "Failed to recurse into submodule path '$sm_path'"
5422 msgstr "无法递归进子模组路径 '$sm_path'"
5423
5424 #: git-submodule.sh:713
5425 msgid "--cached cannot be used with --files"
5426 msgstr "--cached 不能和 --files 共用"
5427
5428 #. unexpected type
5429 #: git-submodule.sh:753
5430 #, sh-format
5431 msgid "unexpected mode $mod_dst"
5432 msgstr "意外的模式 $mod_dst"
5433
5434 #  译者：注意保持前导空格
5435 #: git-submodule.sh:771
5436 #, sh-format
5437 msgid "  Warn: $name doesn't contain commit $sha1_src"
5438 msgstr "  警告：$name 未包含提交 $sha1_src"
5439
5440 #  译者：注意保持前导空格
5441 #: git-submodule.sh:774
5442 #, sh-format
5443 msgid "  Warn: $name doesn't contain commit $sha1_dst"
5444 msgstr "  警告：$name 未包含提交 $sha1_dst"
5445
5446 #  译者：注意保持前导空格
5447 #: git-submodule.sh:777
5448 #, sh-format
5449 msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5450 msgstr "  警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
5451
5452 #: git-submodule.sh:802
5453 msgid "blob"
5454 msgstr "blob"
5455
5456 #: git-submodule.sh:803
5457 msgid "submodule"
5458 msgstr "子模组"
5459
5460 #: git-submodule.sh:840
5461 msgid "# Submodules changed but not updated:"
5462 msgstr "# 子模组已修改但尚未更新："
5463
5464 #: git-submodule.sh:842
5465 msgid "# Submodule changes to be committed:"
5466 msgstr "要提交的子模组变更："
5467
5468 #: git-submodule.sh:974
5469 #, sh-format
5470 msgid "Synchronizing submodule url for '$name'"
5471 msgstr "为 '$name' 同步子模组 url"