73a60cd252 · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ 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-03-16 20:18+0800\n"

15 +"POT-Creation-Date: 2012-04-28 20:33+0800\n"

16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"

17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"

@@ -91,29 +91,29 @@ msgstr ""

91 "发现配置变量 'diff.dirstat' 中的错误：\n"

92 "%s"

93

94 -#: diff.c:1336

94 +#: diff.c:1400

95 msgid " 0 files changed\n"

96 msgstr " 0 个文件被修改\n"

97

98 -#: diff.c:1340

98 +#: diff.c:1404

99 #, c-format

100 msgid " %d file changed"

101 msgid_plural " %d files changed"

102 msgstr[0] " %d 个文件被修改"

103

104 -#: diff.c:1357

104 +#: diff.c:1421

105 #, c-format

106 msgid ", %d insertion(+)"

107 msgid_plural ", %d insertions(+)"

108 msgstr[0] "，插入 %d 行(+)"

109

110 -#: diff.c:1368

110 +#: diff.c:1432

111 #, c-format

112 msgid ", %d deletion(-)"

113 msgid_plural ", %d deletions(-)"

114 msgstr[0] "，删除 %d 行(-)"

115

116 -#: diff.c:3424

116 +#: diff.c:3435

117 #, c-format

118 msgid ""

119 "Failed to parse --dirstat/-X option parameter:\n"

@@ -1452,67 +1452,67 @@ msgstr "无法读取索引"

1452 msgid "unable to write temporary index file"

1453 msgstr "无法写临时索引文件"

1454

1455 -#: builtin/commit.c:550 builtin/commit.c:556

1455 +#: builtin/commit.c:561 builtin/commit.c:567

1456 #, c-format

1457 msgid "invalid commit: %s"

1458 msgstr "无效的提交：%s"

1459

1460 -#: builtin/commit.c:579

1460 +#: builtin/commit.c:590

1461 msgid "malformed --author parameter"

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

1463

1464 -#: builtin/commit.c:635

1464 +#: builtin/commit.c:651

1465 #, c-format

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

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

1468

1469 -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000

1469 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033

1470 #, c-format

1471 msgid "could not lookup commit %s"

1472 msgstr "不能查询提交 %s"

1473

1474 -#: builtin/commit.c:682 builtin/shortlog.c:296

1474 +#: builtin/commit.c:701 builtin/shortlog.c:296

1475 #, c-format

1476 msgid "(reading log message from standard input)\n"

1477 msgstr "（正从标准输入中读取日志信息）\n"

1478

1479 -#: builtin/commit.c:684

1479 +#: builtin/commit.c:703

1480 msgid "could not read log from standard input"

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

1482

1483 -#: builtin/commit.c:688

1483 +#: builtin/commit.c:707

1484 #, c-format

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

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

1487

1488 -#: builtin/commit.c:694

1488 +#: builtin/commit.c:713

1489 msgid "commit has empty message"

1490 msgstr "提交说明为空"

1491

1492 -#: builtin/commit.c:710

1492 +#: builtin/commit.c:729

1493 msgid "could not read MERGE_MSG"

1494 msgstr "不能读取 MERGE_MSG"

1495

1496 -#: builtin/commit.c:714

1496 +#: builtin/commit.c:733

1497 msgid "could not read SQUASH_MSG"

1498 msgstr "不能读取 SQUASH_MSG"

1499

1500 -#: builtin/commit.c:718

1500 +#: builtin/commit.c:737

1501 #, c-format

1502 msgid "could not read '%s'"

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

1504

1505 -#: builtin/commit.c:746

1505 +#: builtin/commit.c:765

1506 #, c-format

1507 msgid "could not open '%s'"

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

1509

1510 -#: builtin/commit.c:770

1510 +#: builtin/commit.c:789

1511 msgid "could not write commit template"

1512 msgstr "不能写提交模版"

1513

1514 # 译者：%s若翻为中文，前后不需要空格

1515 -#: builtin/commit.c:783

1515 +#: builtin/commit.c:799

1516 #, c-format

1517 msgid ""

1518 "\n"

@@ -1527,12 +1527,12 @@ msgstr ""

1527 "\t%s\n"

1528 "然后重试。\n"

1529

1530 -#: builtin/commit.c:796

1530 +#: builtin/commit.c:812

1531 msgid "Please enter the commit message for your changes."

1532 msgstr "请为您的修改输入提交说明。"

1533

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

1535 -#: builtin/commit.c:799

1535 +#: builtin/commit.c:815

1536 msgid ""

1537 " Lines starting\n"

1538 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -1541,7 +1541,7 @@ msgstr ""

1541 "的行将被忽略，并且空的提交说明将会中止提交。\n"

1542

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

1544 -#: builtin/commit.c:804

1544 +#: builtin/commit.c:820

1545 msgid ""

1546 " Lines starting\n"

1547 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -1552,153 +1552,158 @@ msgstr ""

1552 "中止提交。\n"

1553

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

1555 -#: builtin/commit.c:816

1555 +#: builtin/commit.c:832

1556 #, c-format

1557 msgid "%sAuthor: %s"

1558 msgstr "%s作者： %s"

1559

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

1561 -#: builtin/commit.c:823

1561 +#: builtin/commit.c:839

1562 #, c-format

1563 msgid "%sCommitter: %s"

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

1565

1566 -#: builtin/commit.c:843

1566 +#: builtin/commit.c:859

1567 msgid "Cannot read index"

1568 msgstr "无法读取索引"

1569

1570 -#: builtin/commit.c:880

1570 +#: builtin/commit.c:896

1571 msgid "Error building trees"

1572 msgstr "无法创建树对象"

1573

1574 -#: builtin/commit.c:895 builtin/tag.c:357

1574 +#: builtin/commit.c:911 builtin/tag.c:357

1575 #, c-format

1576 msgid "Please supply the message using either -m or -F option.\n"

1577 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"

1578

1579 -#: builtin/commit.c:975

1579 +#: builtin/commit.c:1008

1580 #, c-format

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

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

1583

1584 -#: builtin/commit.c:990 builtin/commit.c:1182

1584 +#: builtin/commit.c:1023 builtin/commit.c:1217

1585 #, c-format

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

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

1588

1589 -#: builtin/commit.c:1030

1589 +#: builtin/commit.c:1063

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

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

1592

1593 -#: builtin/commit.c:1041

1593 +#: builtin/commit.c:1074

1594 msgid "You have nothing to amend."

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

1596

1597 # 译者：%s若翻为中文，前后不需要空格

1598 -#: builtin/commit.c:1043

1598 +#: builtin/commit.c:1076

1599 #, c-format

1600 msgid "You are in the middle of a %s -- cannot amend."

1601 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"

1602

1603 -#: builtin/commit.c:1045

1603 +#: builtin/commit.c:1078

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

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

1606

1607 -#: builtin/commit.c:1055

1607 +#: builtin/commit.c:1088

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

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

1610

1611 -#: builtin/commit.c:1057

1611 +#: builtin/commit.c:1090

1612 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

1613 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"

1614

1615 -#: builtin/commit.c:1063

1615 +#: builtin/commit.c:1098

1616 msgid "--reset-author can be used only with -C, -c or --amend."

1617 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"

1618

1619 -#: builtin/commit.c:1080

1619 +#: builtin/commit.c:1115

1620 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

1621 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

1622

1623 -#: builtin/commit.c:1082

1623 +#: builtin/commit.c:1117

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

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

1626

1627 -#: builtin/commit.c:1084

1627 +#: builtin/commit.c:1119

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

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

1630

1631 -#: builtin/commit.c:1086

1631 +#: builtin/commit.c:1121

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

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

1634

1635 -#: builtin/commit.c:1096 builtin/tag.c:556

1635 +#: builtin/commit.c:1131 builtin/tag.c:556

1636 #, c-format

1637 msgid "Invalid cleanup mode %s"

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

1639

1640 -#: builtin/commit.c:1101

1640 +#: builtin/commit.c:1136

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

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

1643

1644 -#: builtin/commit.c:1280

1644 +#: builtin/commit.c:1315

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

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

1647

1648 -#: builtin/commit.c:1282

1648 +#: builtin/commit.c:1317

1649 msgid "could not parse newly created commit"

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

1651

1652 -#: builtin/commit.c:1323

1652 +#: builtin/commit.c:1358

1653 msgid "detached HEAD"

1654 msgstr "分离头指针"

1655

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

1657 -#: builtin/commit.c:1325

1657 +#: builtin/commit.c:1360

1658 msgid " (root-commit)"

1659 msgstr "（根提交）"

1660

1661 -#: builtin/commit.c:1415

1661 +#: builtin/commit.c:1450

1662 msgid "could not parse HEAD commit"

1663 msgstr "不能解析 HEAD 提交"

1664

1665 -#: builtin/commit.c:1452 builtin/merge.c:509

1665 +#: builtin/commit.c:1487 builtin/merge.c:509

1666 #, c-format

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

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

1669

1670 -#: builtin/commit.c:1459

1670 +#: builtin/commit.c:1494

1671 #, c-format

1672 msgid "Corrupt MERGE_HEAD file (%s)"

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

1674

1675 -#: builtin/commit.c:1466

1675 +#: builtin/commit.c:1501

1676 msgid "could not read MERGE_MODE"

1677 msgstr "不能读取 MERGE_MODE"

1678

1679 -#: builtin/commit.c:1485

1679 +#: builtin/commit.c:1520

1680 #, c-format

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

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

1683

1684 -#: builtin/commit.c:1499

1684 +#: builtin/commit.c:1534

1685 +#, c-format

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

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

1688 +

1689 +#: builtin/commit.c:1539

1690 #, c-format

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

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

1693

1689 -#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968

1694 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968

1695 msgid "failed to write commit object"

1696 msgstr "无法写提交对象"

1697

1693 -#: builtin/commit.c:1535

1698 +#: builtin/commit.c:1575

1699 msgid "cannot lock HEAD ref"

1700 msgstr "无法锁定 HEAD 引用"

1701

1697 -#: builtin/commit.c:1539

1702 +#: builtin/commit.c:1579

1703 msgid "cannot update HEAD ref"

1704 msgstr "无法更新 HEAD 引用"

1705

1701 -#: builtin/commit.c:1550

1706 +#: builtin/commit.c:1590

1707 msgid ""

1708 "Repository has been updated, but unable to write\n"

1709 "new_index file. Check that disk is not full or quota is\n"

@@ -2202,7 +2207,8 @@ msgid ""

2207 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

2208 "dir=<directory>)"

2209 msgstr ""

2205 -"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-dir=<directory>）"

2210 +"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"

2211 +"dir=<directory>）"

2212

2213 #: builtin/init-db.c:578

2214 msgid "Cannot access current working directory"

@@ -2531,51 +2537,51 @@ msgstr "到空分支的非快进式提交没有意义"

2537 msgid "%s - not something we can merge"

2538 msgstr "%s - 不能被合并"

2539

2534 -#: builtin/merge.c:1385

2540 +#: builtin/merge.c:1382

2541 #, c-format

2542 msgid "Updating %s..%s\n"

2543 msgstr "更新 %s..%s\n"

2544

2539 -#: builtin/merge.c:1423

2545 +#: builtin/merge.c:1420

2546 #, c-format

2547 msgid "Trying really trivial in-index merge...\n"

2548 msgstr "尝试非常小的索引内合并...\n"

2549

2544 -#: builtin/merge.c:1430

2550 +#: builtin/merge.c:1427

2551 #, c-format

2552 msgid "Nope.\n"

2553 msgstr "无。\n"

2554

2549 -#: builtin/merge.c:1462

2555 +#: builtin/merge.c:1459

2556 msgid "Not possible to fast-forward, aborting."

2557 msgstr "无法快进，终止。"

2558

2553 -#: builtin/merge.c:1485 builtin/merge.c:1562

2559 +#: builtin/merge.c:1482 builtin/merge.c:1559

2560 #, c-format

2561 msgid "Rewinding the tree to pristine...\n"

2562 msgstr "将树回滚至原始状态...\n"

2563

2558 -#: builtin/merge.c:1489

2564 +#: builtin/merge.c:1486

2565 #, c-format

2566 msgid "Trying merge strategy %s...\n"

2567 msgstr "尝试合并策略 %s...\n"

2568

2563 -#: builtin/merge.c:1553

2569 +#: builtin/merge.c:1550

2570 #, c-format

2571 msgid "No merge strategy handled the merge.\n"

2572 msgstr "没有合并策略处理此合并。\n"

2573

2568 -#: builtin/merge.c:1555

2574 +#: builtin/merge.c:1552

2575 #, c-format

2576 msgid "Merge with strategy %s failed.\n"

2577 msgstr "使用策略 %s 合并失败。\n"

2578

2573 -#: builtin/merge.c:1564

2579 +#: builtin/merge.c:1561

2580 #, c-format

2581 msgid "Using the %s to prepare resolving by hand.\n"

2582 msgstr "使用 %s 以准备手工解决。\n"

2583

2578 -#: builtin/merge.c:1575

2584 +#: builtin/merge.c:1572

2585 #, c-format

2586 msgid "Automatic merge went well; stopped before committing as requested\n"

2587 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -2824,7 +2830,7 @@ msgstr "tag 简写没有跟 <tag> 参数"

2830 msgid "--delete only accepts plain target ref names"

2831 msgstr "--delete 只接受简单的目标引用名"

2832

2827 -#: builtin/push.c:73

2833 +#: builtin/push.c:83

2834 #, c-format

2835 msgid ""

2836 "You are not currently on a branch.\n"

@@ -2838,7 +2844,7 @@ msgstr ""

2844 "\n"

2845 " git push %s HEAD:<name-of-remote-branch>\n"

2846

2841 -#: builtin/push.c:80

2847 +#: builtin/push.c:90

2848 #, c-format

2849 msgid ""

2850 "The current branch %s has no upstream branch.\n"

@@ -2851,27 +2857,37 @@ msgstr ""

2857 "\n"

2858 " git push --set-upstream %s %s\n"

2859

2854 -#: builtin/push.c:88

2860 +#: builtin/push.c:98

2861 #, c-format

2862 msgid "The current branch %s has multiple upstream branches, refusing to push."

2863 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

2864

2859 -#: builtin/push.c:111

2865 +#: builtin/push.c:101

2866 +#, c-format

2867 +msgid ""

2868 +"You are pushing to remote '%s', which is not the upstream of\n"

2869 +"your current branch '%s', without telling me what to push\n"

2870 +"to update which remote branch."

2871 +msgstr ""

2872 +"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"

2873 +"而没有告诉我要推送什么、更新哪个远程分支。"

2874 +

2875 +#: builtin/push.c:127

2876 msgid ""

2877 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

2878 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"

2879

2864 -#: builtin/push.c:131

2880 +#: builtin/push.c:147

2881 #, c-format

2882 msgid "Pushing to %s\n"

2883 msgstr "推送到 %s\n"

2884

2869 -#: builtin/push.c:135

2885 +#: builtin/push.c:151

2886 #, c-format

2887 msgid "failed to push some refs to '%s'"

2888 msgstr "无法推送一些引用到 '%s'"

2889

2874 -#: builtin/push.c:143

2890 +#: builtin/push.c:159

2891 #, c-format

2892 msgid ""

2893 "To prevent you from losing history, non-fast-forward updates were rejected\n"

@@ -2882,12 +2898,12 @@ msgstr ""

2898 "再次推送前先与远程变更合并（如 'git pull'）。详见\n"

2899 "'git push --help' 中的 'Note about fast-forwards' 小节。\n"

2900

2885 -#: builtin/push.c:160

2901 +#: builtin/push.c:176

2902 #, c-format

2903 msgid "bad repository '%s'"

2904 msgstr "坏的版本库 '%s'"

2905

2890 -#: builtin/push.c:161

2906 +#: builtin/push.c:177

2907 msgid ""

2908 "No configured push destination.\n"

2909 "Either specify the URL from the command-line or configure a remote "

@@ -2908,31 +2924,31 @@ msgstr ""

2924 "\n"

2925 " git push <name>\n"

2926

2911 -#: builtin/push.c:176

2927 +#: builtin/push.c:192

2928 msgid "--all and --tags are incompatible"

2929 msgstr "--all 和 --tags 不兼容"

2930

2915 -#: builtin/push.c:177

2931 +#: builtin/push.c:193

2932 msgid "--all can't be combined with refspecs"

2933 msgstr "--all 不能和引用表达式共用"

2934

2919 -#: builtin/push.c:182

2935 +#: builtin/push.c:198

2936 msgid "--mirror and --tags are incompatible"

2937 msgstr "--mirror 和 --tags 不兼容"

2938

2923 -#: builtin/push.c:183

2939 +#: builtin/push.c:199

2940 msgid "--mirror can't be combined with refspecs"

2941 msgstr "--mirror 不能和引用表达式共用"

2942

2927 -#: builtin/push.c:188

2943 +#: builtin/push.c:204

2944 msgid "--all and --mirror are incompatible"

2945 msgstr "--all 和 --mirror 不兼容"

2946

2931 -#: builtin/push.c:274

2947 +#: builtin/push.c:284

2948 msgid "--delete is incompatible with --all, --mirror and --tags"

2949 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

2950

2935 -#: builtin/push.c:276

2951 +#: builtin/push.c:286

2952 msgid "--delete doesn't make sense without any refs"

2953 msgstr "--delete 未接任何引用没有意义"

2954

l10n: Update Simplified Chinese translation