d691f47942 · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ 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-05-21 08:57+0800\n"

16 -"PO-Revision-Date: 2012-06-01 17:43+0800\n"

15 +"POT-Creation-Date: 2012-06-02 07:03+0800\n"

16 +"PO-Revision-Date: 2012-06-02 17:05+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"

@@ -52,7 +52,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

52 msgid "unrecognized header: %s%s (%d)"

53 msgstr "未能识别的包头：%s%s (%d)"

54

55 -#: bundle.c:89 builtin/commit.c:697

55 +#: bundle.c:89 builtin/commit.c:696

56 #, c-format

57 msgid "could not open '%s'"

58 msgstr "不能打开 '%s'"

@@ -61,8 +61,8 @@ msgstr "不能打开 '%s'"

61 msgid "Repository lacks these prerequisite commits:"

62 msgstr "版本库缺少这些必备的提交："

63

64 -#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289

65 -#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347

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 "版本遍历设置失败"

@@ -85,7 +85,7 @@ msgstr[1] "这个包需要 %d 个这些引用"

85 msgid "rev-list died"

86 msgstr "rev-list 终止"

87

88 -#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284

88 +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284

89 #, c-format

90 msgid "unrecognized argument: %s"

91 msgstr "未能识别的参数：%s"

@@ -278,17 +278,17 @@ msgstr "gpg 没有接受数据"

278 msgid "gpg failed to sign the data"

279 msgstr "gpg 无法为数据签名"

280

281 -#: grep.c:1280

281 +#: grep.c:1320

282 #, c-format

283 msgid "'%s': unable to read %s"

284 msgstr "'%s'：无法读取 %s"

285

286 -#: grep.c:1297

286 +#: grep.c:1337

287 #, c-format

288 msgid "'%s': %s"

289 msgstr "'%s'：%s"

290

291 -#: grep.c:1308

291 +#: grep.c:1348

292 #, c-format

293 msgid "'%s': short read %s"

294 msgstr "'%s'：读取不完整 %s"

@@ -370,14 +370,14 @@ msgstr " 或：%s"

370 msgid " %s"

371 msgstr " %s"

372

373 -#: remote.c:1607

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:1613

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 ""

@@ -385,7 +385,7 @@ msgid_plural ""

385 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

386 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

387

388 -#: remote.c:1621

388 +#: remote.c:1643

389 #, c-format

390 msgid ""

391 "Your branch and '%s' have diverged,\n"

@@ -429,7 +429,7 @@ msgstr ""

429 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

430 "对修正后的文件做标记，然后用 'git commit' 提交"

431

432 -#: sequencer.c:160 sequencer.c:741 sequencer.c:824

432 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841

433 #, c-format

434 msgid "Could not write to %s"

435 msgstr "不能写入 %s"

@@ -465,178 +465,178 @@ msgstr "不能解析 HEAD 提交\n"

465 msgid "Unable to update cache tree\n"

466 msgstr "不能更新缓存\n"

467

468 -#: sequencer.c:323

468 +#: sequencer.c:324

469 #, c-format

470 msgid "Could not parse commit %s\n"

471 msgstr "不能解析提交 %s\n"

472

473 -#: sequencer.c:328

473 +#: sequencer.c:329

474 #, c-format

475 msgid "Could not parse parent commit %s\n"

476 msgstr "不能解析父提交 %s\n"

477

478 -#: sequencer.c:358

478 +#: sequencer.c:395

479 msgid "Your index file is unmerged."

480 msgstr "您的索引文件未完成合并。"

481

482 -#: sequencer.c:361

482 +#: sequencer.c:398

483 msgid "You do not have a valid HEAD"

484 msgstr "您没有一个有效的 HEAD"

485

486 -#: sequencer.c:376

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:384

491 +#: sequencer.c:421

492 #, c-format

493 msgid "Commit %s does not have parent %d"

494 msgstr "提交 %s 没有父提交 %d"

495

496 -#: sequencer.c:388

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:399

503 +#: sequencer.c:436

504 #, c-format

505 msgid "%s: cannot parse parent commit %s"

506 msgstr "%s：不能解析父提交 %s"

507

508 -#: sequencer.c:403

508 +#: sequencer.c:440

509 #, c-format

510 msgid "Cannot get commit message for %s"

511 msgstr "不能得到 %s 的提交说明"

512

513 -#: sequencer.c:491

513 +#: sequencer.c:524

514 #, c-format

515 msgid "could not revert %s... %s"

516 msgstr "不能还原 %s... %s"

517

518 -#: sequencer.c:492

518 +#: sequencer.c:525

519 #, c-format

520 msgid "could not apply %s... %s"

521 msgstr "不能应用 %s... %s"

522

523 -#: sequencer.c:536

523 +#: sequencer.c:553

524 msgid "empty commit set passed"

525 msgstr "提供了空的提交集"

526

527 -#: sequencer.c:544

527 +#: sequencer.c:561

528 #, c-format

529 msgid "git %s: failed to read the index"

530 msgstr "git %s：无法读取索引"

531

532 -#: sequencer.c:549

532 +#: sequencer.c:566

533 #, c-format

534 msgid "git %s: failed to refresh the index"

535 msgstr "git %s：无法刷新索引"

536

537 -#: sequencer.c:607

537 +#: sequencer.c:624

538 #, c-format

539 msgid "Cannot %s during a %s"

540 msgstr "无法 %s 在一个 %s 过程中"

541

542 -#: sequencer.c:629

542 +#: sequencer.c:646

543 #, c-format

544 msgid "Could not parse line %d."

545 msgstr "不能解析第 %d 行。"

546

547 -#: sequencer.c:634

547 +#: sequencer.c:651

548 msgid "No commits parsed."

549 msgstr "没有提交被解析。"

550

551 -#: sequencer.c:647

551 +#: sequencer.c:664

552 #, c-format

553 msgid "Could not open %s"

554 msgstr "不能打开 %s"

555

556 -#: sequencer.c:651

556 +#: sequencer.c:668

557 #, c-format

558 msgid "Could not read %s."

559 msgstr "不能读取 %s。"

560

561 -#: sequencer.c:658

561 +#: sequencer.c:675

562 #, c-format

563 msgid "Unusable instruction sheet: %s"

564 msgstr "无用的指令表单：%s"

565

566 -#: sequencer.c:686

566 +#: sequencer.c:703

567 #, c-format

568 msgid "Invalid key: %s"

569 msgstr "无效键名：%s"

570

571 -#: sequencer.c:689

571 +#: sequencer.c:706

572 #, c-format

573 msgid "Invalid value for %s: %s"

574 msgstr "%s 的值无效：%s"

575

576 -#: sequencer.c:701

576 +#: sequencer.c:718

577 #, c-format

578 msgid "Malformed options sheet: %s"

579 msgstr "非法的选项表单：%s"

580

581 -#: sequencer.c:722

581 +#: sequencer.c:739

582 msgid "a cherry-pick or revert is already in progress"

583 msgstr "一个拣选或还原操作已在进行"

584

585 -#: sequencer.c:723

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:727

589 +#: sequencer.c:744

590 #, c-format

591 msgid "Could not create sequencer directory %s"

592 msgstr "不能创建序列目录 %s"

593

594 -#: sequencer.c:743 sequencer.c:828

594 +#: sequencer.c:760 sequencer.c:845

595 #, c-format

596 msgid "Error wrapping up %s."

597 msgstr "错误收尾 %s。"

598

599 -#: sequencer.c:762 sequencer.c:896

599 +#: sequencer.c:779 sequencer.c:913

600 msgid "no cherry-pick or revert in progress"

601 msgstr "没有拣选或还原操作在进行"

602

603 -#: sequencer.c:764

603 +#: sequencer.c:781

604 msgid "cannot resolve HEAD"

605 msgstr "不能解析 HEAD"

606

607 -#: sequencer.c:766

607 +#: sequencer.c:783

608 msgid "cannot abort from a branch yet to be born"

609 msgstr "不能从尚未建立的分支终止"

610

611 -#: sequencer.c:788 builtin/apply.c:3689

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:791

616 +#: sequencer.c:808

617 #, c-format

618 msgid "cannot read %s: %s"

619 msgstr "不能读取 %s：%s"

620

621 -#: sequencer.c:792

621 +#: sequencer.c:809

622 msgid "unexpected end of file"

623 msgstr "未预期的文件结束"

624

625 -#: sequencer.c:798

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:821

630 +#: sequencer.c:838

631 #, c-format

632 msgid "Could not format %s."

633 msgstr "不能格式化 %s。"

634

635 -#: sequencer.c:983

635 +#: sequencer.c:1000

636 msgid "Can't revert as initial commit"

637 msgstr "不能作为初始提交还原"

638

639 -#: sequencer.c:984

639 +#: sequencer.c:1001

640 msgid "Can't cherry-pick into empty head"

641 msgstr "不能拣选到空分支"

642

@@ -659,6 +659,15 @@ msgstr "尚未给分支 '%s' 设置上游"

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 "未合并的路径："

@@ -1017,7 +1026,7 @@ msgstr "也许您想要执行 'git add .'？\n"

1026 msgid "index file corrupt"

1027 msgstr "索引文件损坏"

1028

1020 -#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260

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

@@ -1249,234 +1258,239 @@ msgstr "%s 的类型是 %o，预期是 %o"

1258 msgid "%s: already exists in index"

1259 msgstr "%s：已经存在于索引中"

1260

1252 -#: builtin/apply.c:3266

1253 -#, fuzzy, c-format

1254 -msgid "new mode (%o) of %s does not match old mode (%o)%s%s"

1255 -msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）%4$s%5$s 不匹配"

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

1262 -#: builtin/apply.c:3285

1276 +#: builtin/apply.c:3293

1277 #, c-format

1278 msgid "Checking patch %s..."

1279 msgstr "检查补丁 %s..."

1280

1267 -#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158

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

1272 -#: builtin/apply.c:3483

1286 +#: builtin/apply.c:3491

1287 #, c-format

1288 msgid "unable to remove %s from index"

1289 msgstr "不能从索引中移除 %s"

1290

1277 -#: builtin/apply.c:3510

1291 +#: builtin/apply.c:3518

1292 #, c-format

1293 msgid "corrupt patch for subproject %s"

1294 msgstr "子项目 %s 损坏的补丁"

1295

1282 -#: builtin/apply.c:3514

1296 +#: builtin/apply.c:3522

1297 #, c-format

1298 msgid "unable to stat newly created file '%s'"

1299 msgstr "不能枚举新建文件 '%s' 的状态"

1300

1287 -#: builtin/apply.c:3519

1301 +#: builtin/apply.c:3527

1302 #, c-format

1303 msgid "unable to create backing store for newly created file %s"

1304 msgstr "不能为新建文件 %s 创建后端存储"

1305

1292 -#: builtin/apply.c:3522

1306 +#: builtin/apply.c:3530

1307 #, c-format

1308 msgid "unable to add cache entry for %s"

1309 msgstr "无法为 %s 添加缓存条目"

1310

1297 -#: builtin/apply.c:3555

1311 +#: builtin/apply.c:3563

1312 #, c-format

1313 msgid "closing file '%s'"

1314 msgstr "关闭文件 '%s'"

1315

1302 -#: builtin/apply.c:3604

1316 +#: builtin/apply.c:3612

1317 #, c-format

1318 msgid "unable to write file '%s' mode %o"

1319 msgstr "不能写文件 '%s' 权限 %o"

1320

1307 -#: builtin/apply.c:3660

1321 +#: builtin/apply.c:3668

1322 #, c-format

1323 msgid "Applied patch %s cleanly."

1324 msgstr "成功应用补丁 %s。"

1325

1312 -#: builtin/apply.c:3668

1326 +#: builtin/apply.c:3676

1327 msgid "internal error"

1328 msgstr "内部错误"

1329

1330 #. Say this even without --verbose

1317 -#: builtin/apply.c:3671

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

1324 -#: builtin/apply.c:3681

1338 +#: builtin/apply.c:3689

1339 #, c-format

1340 msgid "truncating .rej filename to %.*s.rej"

1341 msgstr "截短 .rej 文件名为 %.*s.rej"

1342

1329 -#: builtin/apply.c:3702

1343 +#: builtin/apply.c:3710

1344 #, c-format

1345 msgid "Hunk #%d applied cleanly."

1346 msgstr "第 #%d 个片段成功应用。"

1347

1334 -#: builtin/apply.c:3705

1348 +#: builtin/apply.c:3713

1349 #, c-format

1350 msgid "Rejected hunk #%d."

1351 msgstr "拒绝第 #%d 个片段。"

1352

1339 -#: builtin/apply.c:3836

1353 +#: builtin/apply.c:3844

1354 msgid "unrecognized input"

1355 msgstr "未能识别的输入"

1356

1343 -#: builtin/apply.c:3847

1357 +#: builtin/apply.c:3855

1358 msgid "unable to read index file"

1359 msgstr "无法读取索引文件"

1360

1347 -#: builtin/apply.c:3962 builtin/apply.c:3965

1361 +#: builtin/apply.c:3970 builtin/apply.c:3973

1362 msgid "path"

1363 msgstr "路径"

1364

1351 -#: builtin/apply.c:3963

1365 +#: builtin/apply.c:3971

1366 msgid "don't apply changes matching the given path"

1367 msgstr "不要应用与给出路径向匹配的变更"

1368

1355 -#: builtin/apply.c:3966

1369 +#: builtin/apply.c:3974

1370 msgid "apply changes matching the given path"

1371 msgstr "应用与给出路径向匹配的变更"

1372

1359 -#: builtin/apply.c:3968

1373 +#: builtin/apply.c:3976

1374 msgid "num"

1375 msgstr "数字"

1376

1363 -#: builtin/apply.c:3969

1377 +#: builtin/apply.c:3977

1378 msgid "remove <num> leading slashes from traditional diff paths"

1379 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"

1380

1367 -#: builtin/apply.c:3972

1381 +#: builtin/apply.c:3980

1382 msgid "ignore additions made by the patch"

1383 msgstr "忽略补丁中的添加的文件"

1384

1371 -#: builtin/apply.c:3974

1385 +#: builtin/apply.c:3982

1386 msgid "instead of applying the patch, output diffstat for the input"

1387 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

1388

1375 -#: builtin/apply.c:3978

1389 +#: builtin/apply.c:3986

1390 msgid "shows number of added and deleted lines in decimal notation"

1391 msgstr "以数字方式显示添加或删除行的数量"

1392

1379 -#: builtin/apply.c:3980

1393 +#: builtin/apply.c:3988

1394 msgid "instead of applying the patch, output a summary for the input"

1395 msgstr "不应用补丁，而是显示输入的概要"

1396

1383 -#: builtin/apply.c:3982

1397 +#: builtin/apply.c:3990

1398 msgid "instead of applying the patch, see if the patch is applicable"

1399 msgstr "不应用补丁，而是查看补丁是否可应用"

1400

1387 -#: builtin/apply.c:3984

1401 +#: builtin/apply.c:3992

1402 msgid "make sure the patch is applicable to the current index"

1403 msgstr "确认补丁可以应用到当前索引"

1404

1391 -#: builtin/apply.c:3986

1405 +#: builtin/apply.c:3994

1406 msgid "apply a patch without touching the working tree"

1407 msgstr "应用补丁而不修改工作区"

1408

1395 -#: builtin/apply.c:3988

1409 +#: builtin/apply.c:3996

1410 msgid "also apply the patch (use with --stat/--summary/--check)"

1411 msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）"

1412

1399 -#: builtin/apply.c:3990

1413 +#: builtin/apply.c:3998

1414 msgid "build a temporary index based on embedded index information"

1415 msgstr "创建一个临时索引基于嵌入的索引信息"

1416

1403 -#: builtin/apply.c:3992

1417 +#: builtin/apply.c:4000

1418 msgid "paths are separated with NUL character"

1419 msgstr "路径以 NUL 字符分隔"

1420

1407 -#: builtin/apply.c:3995

1421 +#: builtin/apply.c:4003

1422 msgid "ensure at least <n> lines of context match"

1423 msgstr "确保至少匹配 <n> 行上下文"

1424

1411 -#: builtin/apply.c:3996

1425 +#: builtin/apply.c:4004

1426 msgid "action"

1427 msgstr "动作"

1428

1415 -#: builtin/apply.c:3997

1429 +#: builtin/apply.c:4005

1430 msgid "detect new or modified lines that have whitespace errors"

1431 msgstr "检查新增和修改的行中间的空白字符滥用"

1432

1419 -#: builtin/apply.c:4000 builtin/apply.c:4003

1433 +#: builtin/apply.c:4008 builtin/apply.c:4011

1434 msgid "ignore changes in whitespace when finding context"

1435 msgstr "查找上下文时忽略空白字符的变更"

1436

1423 -#: builtin/apply.c:4006

1437 +#: builtin/apply.c:4014

1438 msgid "apply the patch in reverse"

1439 msgstr "反向应用补丁"

1440

1427 -#: builtin/apply.c:4008

1441 +#: builtin/apply.c:4016

1442 msgid "don't expect at least one line of context"

1443 msgstr "无需至少一行上下文"

1444

1431 -#: builtin/apply.c:4010

1445 +#: builtin/apply.c:4018

1446 msgid "leave the rejected hunks in corresponding *.rej files"

1447 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1448

1435 -#: builtin/apply.c:4012

1449 +#: builtin/apply.c:4020

1450 msgid "allow overlapping hunks"

1451 msgstr "允许重叠的补丁片段"

1452

1439 -#: builtin/apply.c:4013

1453 +#: builtin/apply.c:4021

1454 msgid "be verbose"

1455 msgstr "冗长输出"

1456

1443 -#: builtin/apply.c:4015

1457 +#: builtin/apply.c:4023

1458 msgid "tolerate incorrectly detected missing new-line at the end of file"

1459 msgstr "宽容不正确的文件末尾换行符"

1460

1447 -#: builtin/apply.c:4018

1461 +#: builtin/apply.c:4026

1462 msgid "do not trust the line counts in the hunk headers"

1463 msgstr "不信任补丁片段的头信息中的行号"

1464

1451 -#: builtin/apply.c:4020

1465 +#: builtin/apply.c:4028

1466 msgid "root"

1467 msgstr "根目录"

1468

1455 -#: builtin/apply.c:4021

1469 +#: builtin/apply.c:4029

1470 msgid "prepend <root> to all filenames"

1471 msgstr "为所有文件名前添加 <根目录>"

1472

1459 -#: builtin/apply.c:4042

1473 +#: builtin/apply.c:4050

1474 msgid "--index outside a repository"

1475 msgstr "--index 在一个版本库之外"

1476

1463 -#: builtin/apply.c:4045

1477 +#: builtin/apply.c:4053

1478 msgid "--cached outside a repository"

1479 msgstr "--cached 在一个版本库之外"

1480

1467 -#: builtin/apply.c:4061

1481 +#: builtin/apply.c:4069

1482 #, c-format

1483 msgid "can't open patch '%s'"

1484 msgstr "不能打开补丁 '%s'"

1485

1472 -#: builtin/apply.c:4075

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

1479 -#: builtin/apply.c:4081 builtin/apply.c:4091

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."

@@ -2193,52 +2207,52 @@ msgstr "无效的提交：%s"

2207 msgid "malformed --author parameter"

2208 msgstr "非法的 --author 参数"

2209

2196 -#: builtin/commit.c:583

2210 +#: builtin/commit.c:582

2211 #, c-format

2212 msgid "Malformed ident string: '%s'"

2213 msgstr "非法的身份字符串：'%s'"

2214

2201 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968

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

2206 -#: builtin/commit.c:633 builtin/shortlog.c:296

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

2211 -#: builtin/commit.c:635

2225 +#: builtin/commit.c:634

2226 msgid "could not read log from standard input"

2227 msgstr "不能从标准输入中读取日志信息"

2228

2215 -#: builtin/commit.c:639

2229 +#: builtin/commit.c:638

2230 #, c-format

2231 msgid "could not read log file '%s'"

2232 msgstr "不能读取日志文件 '%s'"

2233

2220 -#: builtin/commit.c:645

2234 +#: builtin/commit.c:644

2235 msgid "commit has empty message"

2236 msgstr "提交说明为空"

2237

2224 -#: builtin/commit.c:661

2238 +#: builtin/commit.c:660

2239 msgid "could not read MERGE_MSG"

2240 msgstr "不能读取 MERGE_MSG"

2241

2228 -#: builtin/commit.c:665

2242 +#: builtin/commit.c:664

2243 msgid "could not read SQUASH_MSG"

2244 msgstr "不能读取 SQUASH_MSG"

2245

2232 -#: builtin/commit.c:669

2246 +#: builtin/commit.c:668

2247 #, c-format

2248 msgid "could not read '%s'"

2249 msgstr "不能读取 '%s'"

2250

2237 -#: builtin/commit.c:721

2251 +#: builtin/commit.c:720

2252 msgid "could not write commit template"

2253 msgstr "不能写提交模版"

2254

2241 -#: builtin/commit.c:732

2255 +#: builtin/commit.c:731

2256 #, c-format

2257 msgid ""

2258 "\n"

@@ -2252,7 +2266,7 @@ msgstr ""

2266 "\t%s\n"

2267 "然后重试。\n"

2268

2255 -#: builtin/commit.c:737

2269 +#: builtin/commit.c:736

2270 #, c-format

2271 msgid ""

2272 "\n"

@@ -2266,7 +2280,7 @@ msgstr ""

2280 "\t%s\n"

2281 "然后重试。\n"

2282

2269 -#: builtin/commit.c:749

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"

@@ -2274,7 +2288,7 @@ msgstr ""

2288 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"

2289 "说明将会终止提交。\n"

2290

2277 -#: builtin/commit.c:754

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"

@@ -2284,160 +2298,160 @@ msgstr ""

2298 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"

2299

2300 # 译者：为保证在输出中对齐，注意调整句中空格！

2287 -#: builtin/commit.c:767

2301 +#: builtin/commit.c:766

2302 #, c-format

2303 msgid "%sAuthor: %s"

2304 msgstr "%s作者： %s"

2305

2306 # 译者：为保证在输出中对齐，注意调整句中空格！

2293 -#: builtin/commit.c:774

2307 +#: builtin/commit.c:773

2308 #, c-format

2309 msgid "%sCommitter: %s"

2310 msgstr "%s提交者： %s"

2311

2298 -#: builtin/commit.c:794

2312 +#: builtin/commit.c:793

2313 msgid "Cannot read index"

2314 msgstr "无法读取索引"

2315

2302 -#: builtin/commit.c:831

2316 +#: builtin/commit.c:830

2317 msgid "Error building trees"

2318 msgstr "无法创建树对象"

2319

2306 -#: builtin/commit.c:846 builtin/tag.c:361

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

2311 -#: builtin/commit.c:943

2325 +#: builtin/commit.c:942

2326 #, c-format

2327 msgid "No existing author found with '%s'"

2328 msgstr "没有找到匹配 '%s' 的作者"

2329

2316 -#: builtin/commit.c:958 builtin/commit.c:1158

2330 +#: builtin/commit.c:957 builtin/commit.c:1157

2331 #, c-format

2332 msgid "Invalid untracked files mode '%s'"

2333 msgstr "无效的未追踪文件参数 '%s'"

2334

2321 -#: builtin/commit.c:998

2335 +#: builtin/commit.c:997

2336 msgid "Using both --reset-author and --author does not make sense"

2337 msgstr "同时使用 --reset-author 和 --author 没有意义"

2338

2325 -#: builtin/commit.c:1009

2339 +#: builtin/commit.c:1008

2340 msgid "You have nothing to amend."

2341 msgstr "您没有可修补的提交。"

2342

2329 -#: builtin/commit.c:1012

2343 +#: builtin/commit.c:1011

2344 msgid "You are in the middle of a merge -- cannot amend."

2345 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

2346

2333 -#: builtin/commit.c:1014

2347 +#: builtin/commit.c:1013

2348 msgid "You are in the middle of a cherry-pick -- cannot amend."

2349 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

2350

2337 -#: builtin/commit.c:1017

2351 +#: builtin/commit.c:1016

2352 msgid "Options --squash and --fixup cannot be used together"

2353 msgstr "选项 --squash 和 --fixup 不能共用"

2354

2341 -#: builtin/commit.c:1027

2355 +#: builtin/commit.c:1026

2356 msgid "Only one of -c/-C/-F/--fixup can be used."

2357 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

2358

2345 -#: builtin/commit.c:1029

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

2349 -#: builtin/commit.c:1037

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

2353 -#: builtin/commit.c:1054

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

2357 -#: builtin/commit.c:1056

2371 +#: builtin/commit.c:1055

2372 msgid "No paths with --include/--only does not make sense."

2373 msgstr "参数 --include/--only 不跟路径没有意义。"

2374

2361 -#: builtin/commit.c:1058

2375 +#: builtin/commit.c:1057

2376 msgid "Clever... amending the last one with dirty index."

2377 msgstr "聪明... 在索引不干净下修补最后的提交。"

2378

2365 -#: builtin/commit.c:1060

2379 +#: builtin/commit.c:1059

2380 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

2381 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

2382

2369 -#: builtin/commit.c:1070 builtin/tag.c:577

2383 +#: builtin/commit.c:1069 builtin/tag.c:577

2384 #, c-format

2385 msgid "Invalid cleanup mode %s"

2386 msgstr "无效的清理模式 %s"

2387

2374 -#: builtin/commit.c:1075

2388 +#: builtin/commit.c:1074

2389 msgid "Paths with -a does not make sense."

2390 msgstr "路径和 -a 选项共用没有意义。"

2391

2378 -#: builtin/commit.c:1258

2392 +#: builtin/commit.c:1257

2393 msgid "couldn't look up newly created commit"

2394 msgstr "无法找到新创建的提交"

2395

2382 -#: builtin/commit.c:1260

2396 +#: builtin/commit.c:1259

2397 msgid "could not parse newly created commit"

2398 msgstr "不能解析新创建的提交"

2399

2386 -#: builtin/commit.c:1301

2400 +#: builtin/commit.c:1300

2401 msgid "detached HEAD"

2402 msgstr "分离头指针"

2403

2404 # 译者：中文字符串拼接，可删除前导空格

2391 -#: builtin/commit.c:1303

2405 +#: builtin/commit.c:1302

2406 msgid " (root-commit)"

2407 msgstr "（根提交）"

2408

2395 -#: builtin/commit.c:1447

2409 +#: builtin/commit.c:1446

2410 msgid "could not parse HEAD commit"

2411 msgstr "不能解析 HEAD 提交"

2412

2399 -#: builtin/commit.c:1485 builtin/merge.c:509

2413 +#: builtin/commit.c:1484 builtin/merge.c:509

2414 #, c-format

2415 msgid "could not open '%s' for reading"

2416 msgstr "不能为读入打开 '%s'"

2417

2404 -#: builtin/commit.c:1492

2418 +#: builtin/commit.c:1491

2419 #, c-format

2420 msgid "Corrupt MERGE_HEAD file (%s)"

2421 msgstr "损坏的 MERGE_HEAD 文件（%s）"

2422

2409 -#: builtin/commit.c:1499

2423 +#: builtin/commit.c:1498

2424 msgid "could not read MERGE_MODE"

2425 msgstr "不能读取 MERGE_MODE"

2426

2413 -#: builtin/commit.c:1518

2427 +#: builtin/commit.c:1517

2428 #, c-format

2429 msgid "could not read commit message: %s"

2430 msgstr "不能读取提交说明：%s"

2431

2418 -#: builtin/commit.c:1532

2432 +#: builtin/commit.c:1531

2433 #, c-format

2434 msgid "Aborting commit; you did not edit the message.\n"

2435 msgstr "终止提交；您未更改来自模版的提交说明。\n"

2436

2423 -#: builtin/commit.c:1537

2437 +#: builtin/commit.c:1536

2438 #, c-format

2439 msgid "Aborting commit due to empty commit message.\n"

2440 msgstr "终止提交因为提交说明为空。\n"

2441

2428 -#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961

2442 +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961

2443 msgid "failed to write commit object"

2444 msgstr "无法写提交对象"

2445

2432 -#: builtin/commit.c:1573

2446 +#: builtin/commit.c:1572

2447 msgid "cannot lock HEAD ref"

2448 msgstr "无法锁定 HEAD 引用"

2449

2436 -#: builtin/commit.c:1577

2450 +#: builtin/commit.c:1576

2451 msgid "cannot update HEAD ref"

2452 msgstr "无法更新 HEAD 引用"

2453

2440 -#: builtin/commit.c:1588

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"

@@ -2779,32 +2793,32 @@ msgstr "开关 `%c' 期望一个数字值"

2793 msgid "cannot open '%s'"

2794 msgstr "不能打开 '%s'"

2795

2782 -#: builtin/grep.c:888

2796 +#: builtin/grep.c:885

2797 msgid "no pattern given."

2798 msgstr "未提供模式匹配。"

2799

2786 -#: builtin/grep.c:902

2800 +#: builtin/grep.c:899

2801 #, c-format

2802 msgid "bad object %s"

2803 msgstr "坏对象 %s"

2804

2791 -#: builtin/grep.c:943

2805 +#: builtin/grep.c:940

2806 msgid "--open-files-in-pager only works on the worktree"

2807 msgstr "--open-files-in-pager 仅用于工作区"

2808

2795 -#: builtin/grep.c:966

2809 +#: builtin/grep.c:963

2810 msgid "--cached or --untracked cannot be used with --no-index."

2811 msgstr "--cached 或 --untracked 不能与 --no-index 共用。"

2812

2799 -#: builtin/grep.c:971

2813 +#: builtin/grep.c:968

2814 msgid "--no-index or --untracked cannot be used with revs."

2815 msgstr "--no-index 或 --untracked 不能和版本共用。"

2816

2803 -#: builtin/grep.c:974

2817 +#: builtin/grep.c:971

2818 msgid "--[no-]exclude-standard cannot be used for tracked contents."

2819 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

2820

2807 -#: builtin/grep.c:982

2821 +#: builtin/grep.c:979

2822 msgid "both --cached and trees are given."

2823 msgstr "同时给出了 --cached 和树对象。"

2824

@@ -3276,85 +3290,81 @@ msgstr "未知类型：%d"

3290 msgid "format.headers without value"

3291 msgstr "format.headers 没有值"

3292

3279 -#: builtin/log.c:675

3293 +#: builtin/log.c:676

3294 msgid "name of output directory is too long"

3295 msgstr "输出目录名太长"

3296

3283 -#: builtin/log.c:686

3297 +#: builtin/log.c:687

3298 #, c-format

3299 msgid "Cannot open patch file %s"

3300 msgstr "无法打开补丁文件 %s"

3301

3288 -#: builtin/log.c:700

3302 +#: builtin/log.c:701

3303 msgid "Need exactly one range."

3304 msgstr "只需要一个范围。"

3305

3292 -#: builtin/log.c:708

3306 +#: builtin/log.c:709

3307 msgid "Not a range."

3308 msgstr "不是一个范围。"

3309

3296 -#: builtin/log.c:745

3297 -msgid "Could not extract email from committer identity."

3298 -msgstr "不能从提交者身份中提取邮件地址。"

3299 -

3300 -#: builtin/log.c:791

3310 +#: builtin/log.c:786

3311 msgid "Cover letter needs email format"

3312 msgstr "信封需要邮件地址格式"

3313

3304 -#: builtin/log.c:885

3314 +#: builtin/log.c:859

3315 #, c-format

3316 msgid "insane in-reply-to: %s"

3317 msgstr "不正常的 in-reply-to：%s"

3318

3309 -#: builtin/log.c:958

3319 +#: builtin/log.c:932

3320 msgid "Two output directories?"

3321 msgstr "两个输出目录？"

3322

3313 -#: builtin/log.c:1179

3323 +#: builtin/log.c:1153

3324 #, c-format

3325 msgid "bogus committer info %s"

3326 msgstr "虚假的提交者信息 %s"

3327

3318 -#: builtin/log.c:1224

3328 +#: builtin/log.c:1198

3329 msgid "-n and -k are mutually exclusive."

3330 msgstr "-n 和 -k 互斥。"

3331

3322 -#: builtin/log.c:1226

3332 +#: builtin/log.c:1200

3333 msgid "--subject-prefix and -k are mutually exclusive."

3334 msgstr "--subject-prefix 和 -k 互斥。"

3335

3326 -#: builtin/log.c:1234

3336 +#: builtin/log.c:1208

3337 msgid "--name-only does not make sense"

3338 msgstr "--name-only 无意义"

3339

3330 -#: builtin/log.c:1236

3340 +#: builtin/log.c:1210

3341 msgid "--name-status does not make sense"

3342 msgstr "--name-status 无意义"

3343

3334 -#: builtin/log.c:1238

3344 +#: builtin/log.c:1212

3345 msgid "--check does not make sense"

3346 msgstr "--check 无意义"

3347

3338 -#: builtin/log.c:1261

3348 +#: builtin/log.c:1235

3349 msgid "standard output, or directory, which one?"

3350 msgstr "标准输出或目录，哪一个？"

3351

3342 -#: builtin/log.c:1263

3352 +#: builtin/log.c:1237

3353 #, c-format

3354 msgid "Could not create directory '%s'"

3355 msgstr "不能创建目录 '%s'"

3356

3347 -#: builtin/log.c:1416

3357 +#: builtin/log.c:1390

3358 msgid "Failed to create output files"

3359 msgstr "无法创建输出文件"

3360

3351 -#: builtin/log.c:1520

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

3357 -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550

3367 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524

3368 #, c-format

3369 msgid "Unknown commit %s"

3370 msgstr "未知提交 %s"

@@ -3835,22 +3845,22 @@ msgstr "对象 %s 没有注解\n"

3845 msgid "Unknown subcommand: %s"

3846 msgstr "未知子命令：%s"

3847

3838 -#: builtin/pack-objects.c:2315

3848 +#: builtin/pack-objects.c:2337

3849 #, c-format

3850 msgid "unsupported index version %s"

3851 msgstr "不支持的索引版本 %s"

3852

3843 -#: builtin/pack-objects.c:2319

3853 +#: builtin/pack-objects.c:2341

3854 #, c-format

3855 msgid "bad index version '%s'"

3856 msgstr "坏的索引版本 '%s'"

3857

3848 -#: builtin/pack-objects.c:2342

3858 +#: builtin/pack-objects.c:2364

3859 #, c-format

3860 msgid "option %s does not accept negative form"

3861 msgstr "选项 %s 不接受否定格式"

3862

3853 -#: builtin/pack-objects.c:2346

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'"

@@ -4121,7 +4131,7 @@ msgstr "不能移除配置小节 '%s'"

4131 #: builtin/remote.c:677

4132 #, c-format

4133 msgid ""

4124 -"Not updating non-default fetch respec\n"

4134 +"Not updating non-default fetch refspec\n"

4135 "\t%s\n"

4136 "\tPlease update the configuration manually if necessary."

4137 msgstr ""

@@ -5162,27 +5172,27 @@ msgstr "正在进入 '$prefix$sm_path'"

5172 msgid "Stopping at '$sm_path'; script returned non-zero status."

5173 msgstr "停止于 '$sm_path'，脚本返回非零值。"

5174

5165 -#: git-submodule.sh:405

5175 +#: git-submodule.sh:406

5176 #, sh-format

5177 msgid "No url found for submodule path '$sm_path' in .gitmodules"

5178 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"

5179

5170 -#: git-submodule.sh:414

5180 +#: git-submodule.sh:415

5181 #, sh-format

5182 msgid "Failed to register url for submodule path '$sm_path'"

5183 msgstr "无法为子模组路径 '$sm_path' 注册 url"

5184

5175 -#: git-submodule.sh:422

5176 -#, sh-format

5177 -msgid "Failed to register update mode for submodule path '$sm_path'"

5178 -msgstr "无法为子模组路径 '$sm_path' 注册更新模式"

5179 -

5180 -#: git-submodule.sh:424

5185 +#: git-submodule.sh:417

5186 #, sh-format

5187 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

5188 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"

5189

5185 -#: git-submodule.sh:523

5190 +#: git-submodule.sh:425

5191 +#, sh-format

5192 +msgid "Failed to register update mode for submodule path '$sm_path'"

5193 +msgstr "无法为子模组路径 '$sm_path' 注册更新模式"

5194 +

5195 +#: git-submodule.sh:524

5196 #, sh-format

5197 msgid ""

5198 "Submodule path '$sm_path' not initialized\n"

@@ -5191,86 +5201,89 @@ msgstr ""

5201 "子模组路径 '$sm_path' 没有初始化\n"

5202 "也许您想用 'update --init'？"

5203

5194 -#: git-submodule.sh:536

5204 +#: git-submodule.sh:537

5205 #, sh-format

5206 msgid "Unable to find current revision in submodule path '$sm_path'"

5207 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"

5208

5199 -#: git-submodule.sh:555

5209 +#: git-submodule.sh:556

5210 #, sh-format

5211 msgid "Unable to fetch in submodule path '$sm_path'"

5212 msgstr "无法在子模组路径 '$sm_path' 中获取"

5213

5204 -#: git-submodule.sh:569

5214 +#: git-submodule.sh:570

5215 #, sh-format

5216 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

5217 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"

5218

5209 -#: git-submodule.sh:570

5219 +#: git-submodule.sh:571

5220 #, sh-format

5221 msgid "Submodule path '$sm_path': rebased into '$sha1'"

5222 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"

5223

5214 -#: git-submodule.sh:575

5224 +#: git-submodule.sh:576

5225 #, sh-format

5226 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

5227 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"

5228

5219 -#: git-submodule.sh:576

5229 +#: git-submodule.sh:577

5230 #, sh-format

5231 msgid "Submodule path '$sm_path': merged in '$sha1'"

5232 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"

5233

5224 -#: git-submodule.sh:581

5234 +#: git-submodule.sh:582

5235 #, sh-format

5236 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

5237 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"

5238

5229 -#: git-submodule.sh:582

5239 +#: git-submodule.sh:583

5240 #, sh-format

5241 msgid "Submodule path '$sm_path': checked out '$sha1'"

5242 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"

5243

5234 -#: git-submodule.sh:604 git-submodule.sh:927

5244 +#: git-submodule.sh:605 git-submodule.sh:928

5245 #, sh-format

5246 msgid "Failed to recurse into submodule path '$sm_path'"

5247 msgstr "无法递归进子模组路径 '$sm_path'"

5248

5239 -#: git-submodule.sh:712

5249 +#: git-submodule.sh:713

5250 msgid "--"

5251 msgstr "--"

5252

5253 # 译者：注意保持前导空格

5244 -#: git-submodule.sh:770

5254 +#: git-submodule.sh:771

5255 #, sh-format

5256 msgid " Warn: $name doesn't contain commit $sha1_src"

5257 msgstr " 警告：$name 未包含提交 $sha1_src"

5258

5259 # 译者：注意保持前导空格

5250 -#: git-submodule.sh:773

5260 +#: git-submodule.sh:774

5261 #, sh-format

5262 msgid " Warn: $name doesn't contain commit $sha1_dst"

5263 msgstr " 警告：$name 未包含提交 $sha1_dst"

5264

5265 # 译者：注意保持前导空格

5256 -#: git-submodule.sh:776

5266 +#: git-submodule.sh:777

5267 #, sh-format

5268 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

5269 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

5270

5261 -#: git-submodule.sh:801

5271 +#: git-submodule.sh:802

5272 msgid "blob"

5273 msgstr "blob"

5274

5265 -#: git-submodule.sh:802

5275 +#: git-submodule.sh:803

5276 msgid "submodule"

5277 msgstr "子模组"

5278

5269 -#: git-submodule.sh:973

5279 +#: git-submodule.sh:974

5280 #, sh-format

5281 msgid "Synchronizing submodule url for '$name'"

5282 msgstr "为 '$name' 同步子模组 url"

5283

5284 +#~ msgid "Could not extract email from committer identity."

5285 +#~ msgstr "不能从提交者身份中提取邮件地址。"

5286 +

5287 #~ msgid "cherry-pick"

5288 #~ msgstr "拣选"

5289

l10n: zh_CN.po: translate 2 new, 3 fuzzy messages