df3ef6fb98 · matheusbsbs/matheus-bagliano

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

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

11 -"POT-Creation-Date: 2012-03-16 20:18+0800\n"

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

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -80,32 +80,32 @@ msgid ""

80 "%s"

81 msgstr ""

82

83 -#: diff.c:1336

83 +#: diff.c:1400

84 msgid " 0 files changed\n"

85 msgstr ""

86

87 -#: diff.c:1340

87 +#: diff.c:1404

88 #, c-format

89 msgid " %d file changed"

90 msgid_plural " %d files changed"

91 msgstr[0] ""

92 msgstr[1] ""

93

94 -#: diff.c:1357

94 +#: diff.c:1421

95 #, c-format

96 msgid ", %d insertion(+)"

97 msgid_plural ", %d insertions(+)"

98 msgstr[0] ""

99 msgstr[1] ""

100

101 -#: diff.c:1368

101 +#: diff.c:1432

102 #, c-format

103 msgid ", %d deletion(-)"

104 msgid_plural ", %d deletions(-)"

105 msgstr[0] ""

106 msgstr[1] ""

107

108 -#: diff.c:3424

108 +#: diff.c:3435

109 #, c-format

110 msgid ""

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

@@ -1365,66 +1365,66 @@ msgstr ""

1365 msgid "unable to write temporary index file"

1366 msgstr ""

1367

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

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

1369 #, c-format

1370 msgid "invalid commit: %s"

1371 msgstr ""

1372

1373 -#: builtin/commit.c:579

1373 +#: builtin/commit.c:590

1374 msgid "malformed --author parameter"

1375 msgstr ""

1376

1377 -#: builtin/commit.c:635

1377 +#: builtin/commit.c:651

1378 #, c-format

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

1380 msgstr ""

1381

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

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

1383 #, c-format

1384 msgid "could not lookup commit %s"

1385 msgstr ""

1386

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

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

1388 #, c-format

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

1390 msgstr ""

1391

1392 -#: builtin/commit.c:684

1392 +#: builtin/commit.c:703

1393 msgid "could not read log from standard input"

1394 msgstr ""

1395

1396 -#: builtin/commit.c:688

1396 +#: builtin/commit.c:707

1397 #, c-format

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

1399 msgstr ""

1400

1401 -#: builtin/commit.c:694

1401 +#: builtin/commit.c:713

1402 msgid "commit has empty message"

1403 msgstr ""

1404

1405 -#: builtin/commit.c:710

1405 +#: builtin/commit.c:729

1406 msgid "could not read MERGE_MSG"

1407 msgstr ""

1408

1409 -#: builtin/commit.c:714

1409 +#: builtin/commit.c:733

1410 msgid "could not read SQUASH_MSG"

1411 msgstr ""

1412

1413 -#: builtin/commit.c:718

1413 +#: builtin/commit.c:737

1414 #, c-format

1415 msgid "could not read '%s'"

1416 msgstr ""

1417

1418 -#: builtin/commit.c:746

1418 +#: builtin/commit.c:765

1419 #, c-format

1420 msgid "could not open '%s'"

1421 msgstr ""

1422

1423 -#: builtin/commit.c:770

1423 +#: builtin/commit.c:789

1424 msgid "could not write commit template"

1425 msgstr ""

1426

1427 -#: builtin/commit.c:783

1427 +#: builtin/commit.c:799

1428 #, c-format

1429 msgid ""

1430 "\n"

@@ -1434,167 +1434,172 @@ msgid ""

1434 "and try again.\n"

1435 msgstr ""

1436

1437 -#: builtin/commit.c:796

1437 +#: builtin/commit.c:812

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

1439 msgstr ""

1440

1441 -#: builtin/commit.c:799

1441 +#: builtin/commit.c:815

1442 msgid ""

1443 " Lines starting\n"

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

1445 msgstr ""

1446

1447 -#: builtin/commit.c:804

1447 +#: builtin/commit.c:820

1448 msgid ""

1449 " Lines starting\n"

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

1451 "An empty message aborts the commit.\n"

1452 msgstr ""

1453

1454 -#: builtin/commit.c:816

1454 +#: builtin/commit.c:832

1455 #, c-format

1456 msgid "%sAuthor: %s"

1457 msgstr ""

1458

1459 -#: builtin/commit.c:823

1459 +#: builtin/commit.c:839

1460 #, c-format

1461 msgid "%sCommitter: %s"

1462 msgstr ""

1463

1464 -#: builtin/commit.c:843

1464 +#: builtin/commit.c:859

1465 msgid "Cannot read index"

1466 msgstr ""

1467

1468 -#: builtin/commit.c:880

1468 +#: builtin/commit.c:896

1469 msgid "Error building trees"

1470 msgstr ""

1471

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

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

1473 #, c-format

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

1475 msgstr ""

1476

1477 -#: builtin/commit.c:975

1477 +#: builtin/commit.c:1008

1478 #, c-format

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

1480 msgstr ""

1481

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

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

1483 #, c-format

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

1485 msgstr ""

1486

1487 -#: builtin/commit.c:1030

1487 +#: builtin/commit.c:1063

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

1489 msgstr ""

1490

1491 -#: builtin/commit.c:1041

1491 +#: builtin/commit.c:1074

1492 msgid "You have nothing to amend."

1493 msgstr ""

1494

1495 -#: builtin/commit.c:1043

1495 +#: builtin/commit.c:1076

1496 #, c-format

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

1498 msgstr ""

1499

1500 -#: builtin/commit.c:1045

1500 +#: builtin/commit.c:1078

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

1502 msgstr ""

1503

1504 -#: builtin/commit.c:1055

1504 +#: builtin/commit.c:1088

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

1506 msgstr ""

1507

1508 -#: builtin/commit.c:1057

1508 +#: builtin/commit.c:1090

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

1510 msgstr ""

1511

1512 -#: builtin/commit.c:1063

1512 +#: builtin/commit.c:1098

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

1514 msgstr ""

1515

1516 -#: builtin/commit.c:1080

1516 +#: builtin/commit.c:1115

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

1518 msgstr ""

1519

1520 -#: builtin/commit.c:1082

1520 +#: builtin/commit.c:1117

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

1522 msgstr ""

1523

1524 -#: builtin/commit.c:1084

1524 +#: builtin/commit.c:1119

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

1526 msgstr ""

1527

1528 -#: builtin/commit.c:1086

1528 +#: builtin/commit.c:1121

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

1530 msgstr ""

1531

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

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

1533 #, c-format

1534 msgid "Invalid cleanup mode %s"

1535 msgstr ""

1536

1537 -#: builtin/commit.c:1101

1537 +#: builtin/commit.c:1136

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

1539 msgstr ""

1540

1541 -#: builtin/commit.c:1280

1541 +#: builtin/commit.c:1315

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

1543 msgstr ""

1544

1545 -#: builtin/commit.c:1282

1545 +#: builtin/commit.c:1317

1546 msgid "could not parse newly created commit"

1547 msgstr ""

1548

1549 -#: builtin/commit.c:1323

1549 +#: builtin/commit.c:1358

1550 msgid "detached HEAD"

1551 msgstr ""

1552

1553 -#: builtin/commit.c:1325

1553 +#: builtin/commit.c:1360

1554 msgid " (root-commit)"

1555 msgstr ""

1556

1557 -#: builtin/commit.c:1415

1557 +#: builtin/commit.c:1450

1558 msgid "could not parse HEAD commit"

1559 msgstr ""

1560

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

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

1562 #, c-format

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

1564 msgstr ""

1565

1566 -#: builtin/commit.c:1459

1566 +#: builtin/commit.c:1494

1567 #, c-format

1568 msgid "Corrupt MERGE_HEAD file (%s)"

1569 msgstr ""

1570

1571 -#: builtin/commit.c:1466

1571 +#: builtin/commit.c:1501

1572 msgid "could not read MERGE_MODE"

1573 msgstr ""

1574

1575 -#: builtin/commit.c:1485

1575 +#: builtin/commit.c:1520

1576 #, c-format

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

1578 msgstr ""

1579

1580 -#: builtin/commit.c:1499

1580 +#: builtin/commit.c:1534

1581 +#, c-format

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

1583 +msgstr ""

1584 +

1585 +#: builtin/commit.c:1539

1586 #, c-format

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

1588 msgstr ""

1589

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

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

1591 msgid "failed to write commit object"

1592 msgstr ""

1593

1589 -#: builtin/commit.c:1535

1594 +#: builtin/commit.c:1575

1595 msgid "cannot lock HEAD ref"

1596 msgstr ""

1597

1593 -#: builtin/commit.c:1539

1598 +#: builtin/commit.c:1579

1599 msgid "cannot update HEAD ref"

1600 msgstr ""

1601

1597 -#: builtin/commit.c:1550

1602 +#: builtin/commit.c:1590

1603 msgid ""

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

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

@@ -2401,51 +2406,51 @@ msgstr ""

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

2407 msgstr ""

2408

2404 -#: builtin/merge.c:1385

2409 +#: builtin/merge.c:1382

2410 #, c-format

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

2412 msgstr ""

2413

2409 -#: builtin/merge.c:1423

2414 +#: builtin/merge.c:1420

2415 #, c-format

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

2417 msgstr ""

2418

2414 -#: builtin/merge.c:1430

2419 +#: builtin/merge.c:1427

2420 #, c-format

2421 msgid "Nope.\n"

2422 msgstr ""

2423

2419 -#: builtin/merge.c:1462

2424 +#: builtin/merge.c:1459

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

2426 msgstr ""

2427

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

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

2429 #, c-format

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

2431 msgstr ""

2432

2428 -#: builtin/merge.c:1489

2433 +#: builtin/merge.c:1486

2434 #, c-format

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

2436 msgstr ""

2437

2433 -#: builtin/merge.c:1553

2438 +#: builtin/merge.c:1550

2439 #, c-format

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

2441 msgstr ""

2442

2438 -#: builtin/merge.c:1555

2443 +#: builtin/merge.c:1552

2444 #, c-format

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

2446 msgstr ""

2447

2443 -#: builtin/merge.c:1564

2448 +#: builtin/merge.c:1561

2449 #, c-format

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

2451 msgstr ""

2452

2448 -#: builtin/merge.c:1575

2453 +#: builtin/merge.c:1572

2454 #, c-format

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

2456 msgstr ""

@@ -2692,7 +2697,7 @@ msgstr ""

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

2698 msgstr ""

2699

2695 -#: builtin/push.c:73

2700 +#: builtin/push.c:83

2701 #, c-format

2702 msgid ""

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

@@ -2702,7 +2707,7 @@ msgid ""

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

2708 msgstr ""

2709

2705 -#: builtin/push.c:80

2710 +#: builtin/push.c:90

2711 #, c-format

2712 msgid ""

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

@@ -2711,27 +2716,35 @@ msgid ""

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

2717 msgstr ""

2718

2714 -#: builtin/push.c:88

2719 +#: builtin/push.c:98

2720 #, c-format

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

2722 msgstr ""

2723

2719 -#: builtin/push.c:111

2724 +#: builtin/push.c:101

2725 +#, c-format

2726 +msgid ""

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

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

2729 +"to update which remote branch."

2730 +msgstr ""

2731 +

2732 +#: builtin/push.c:127

2733 msgid ""

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

2735 msgstr ""

2736

2724 -#: builtin/push.c:131

2737 +#: builtin/push.c:147

2738 #, c-format

2739 msgid "Pushing to %s\n"

2740 msgstr ""

2741

2729 -#: builtin/push.c:135

2742 +#: builtin/push.c:151

2743 #, c-format

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

2745 msgstr ""

2746

2734 -#: builtin/push.c:143

2747 +#: builtin/push.c:159

2748 #, c-format

2749 msgid ""

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

@@ -2739,12 +2752,12 @@ msgid ""

2752 "'Note about fast-forwards' section of 'git push --help' for details.\n"

2753 msgstr ""

2754

2742 -#: builtin/push.c:160

2755 +#: builtin/push.c:176

2756 #, c-format

2757 msgid "bad repository '%s'"

2758 msgstr ""

2759

2747 -#: builtin/push.c:161

2760 +#: builtin/push.c:177

2761 msgid ""

2762 "No configured push destination.\n"

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

@@ -2757,31 +2770,31 @@ msgid ""

2770 " git push <name>\n"

2771 msgstr ""

2772

2760 -#: builtin/push.c:176

2773 +#: builtin/push.c:192

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

2775 msgstr ""

2776

2764 -#: builtin/push.c:177

2777 +#: builtin/push.c:193

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

2779 msgstr ""

2780

2768 -#: builtin/push.c:182

2781 +#: builtin/push.c:198

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

2783 msgstr ""

2784

2772 -#: builtin/push.c:183

2785 +#: builtin/push.c:199

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

2787 msgstr ""

2788

2776 -#: builtin/push.c:188

2789 +#: builtin/push.c:204

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

2791 msgstr ""

2792

2780 -#: builtin/push.c:274

2793 +#: builtin/push.c:284

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

2795 msgstr ""

2796

2784 -#: builtin/push.c:276

2797 +#: builtin/push.c:286

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

2799 msgstr ""

2800

l10n: Update git.pot (2 new messages)