@matheusbsbs / matheus-bagliano / commits / cd1e748740

l10n: Update git.pot (33 new, 24 deleted messages)

Changes of po/git.pot from v1.7.10 to v1.7.10-382-g62bc8 * 33 new l10n messages at lines: 401, 406, 411, 416, 1602, 1780, 2753, 2766, 2774, 2782, 3403, 3408, 3423, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463, 3468, 3473, 3480, 3485, 3490, 3495, 3500, 3505, 3510, 3515, 3520, 3525 * 24 deleted l10n messages at lines: 2740, 3351, 3356, 3371, 3376, 3381, 3386, 3391, 3396, 3401, 3406, 3411, 3416, 3421, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463, 3468, 3473 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Apr 28, 2012 at 20:27 UTC cd1e74874049c8ba8e510f2fae064e510cccd32b
1 file changed +386 -334
po/git.pot
+386 -334
@@ -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:17+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"
@@ -18,7 +18,7 @@ msgstr ""
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21 -#: advice.c:34
21 +#: advice.c:40
22 #, c-format
23 msgid "hint: %.*s\n"
24 msgstr ""
@@ -27,7 +27,7 @@ msgstr ""
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
29 #.
30 -#: advice.c:64
30 +#: advice.c:70
31 msgid ""
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
@@ -35,12 +35,12 @@ msgid ""
35 "or use 'git commit -a'."
36 msgstr ""
37
38 -#: commit.c:47
38 +#: commit.c:48
39 #, c-format
40 msgid "could not parse %s"
41 msgstr ""
42
43 -#: commit.c:49
43 +#: commit.c:50
44 #, c-format
45 msgid "%s %s is not a commit!"
46 msgstr ""
@@ -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"
@@ -172,14 +172,14 @@ msgid_plural ""
172 msgstr[0] ""
173 msgstr[1] ""
174
175 -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
176 -#: builtin/merge.c:1095 builtin/merge.c:1105
175 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
176 +#: builtin/merge.c:1088 builtin/merge.c:1098
177 #, c-format
178 msgid "Could not open '%s' for writing"
179 msgstr ""
180
181 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
182 -#: builtin/merge.c:1097 builtin/merge.c:1110
181 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
182 +#: builtin/merge.c:1090 builtin/merge.c:1103
183 #, c-format
184 msgid "Could not write to '%s'"
185 msgstr ""
@@ -270,8 +270,8 @@ msgstr ""
270 msgid "could not apply %s... %s"
271 msgstr ""
272
273 -#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
274 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
273 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719
274 +#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
275 #: builtin/shortlog.c:181
276 msgid "revision walk setup failed"
277 msgstr ""
@@ -396,6 +396,25 @@ msgstr ""
396 msgid "Can't cherry-pick into empty head"
397 msgstr ""
398
399 +#: sha1_name.c:864
400 +msgid "HEAD does not point to a branch"
401 +msgstr ""
402 +
403 +#: sha1_name.c:867
404 +#, c-format
405 +msgid "No such branch: '%s'"
406 +msgstr ""
407 +
408 +#: sha1_name.c:869
409 +#, c-format
410 +msgid "No upstream configured for branch '%s'"
411 +msgstr ""
412 +
413 +#: sha1_name.c:872
414 +#, c-format
415 +msgid "Upstream branch '%s' not stored as a remote-tracking branch"
416 +msgstr ""
417 +
418 #: wt-status.c:134
419 msgid "Unmerged paths:"
420 msgstr ""
@@ -779,128 +798,128 @@ msgid ""
798 msgstr ""
799
800 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
782 -#: builtin/branch.c:163
801 +#: builtin/branch.c:164
802 msgid "remote "
803 msgstr ""
804
786 -#: builtin/branch.c:171
805 +#: builtin/branch.c:172
806 msgid "cannot use -a with -d"
807 msgstr ""
808
790 -#: builtin/branch.c:177
809 +#: builtin/branch.c:178
810 msgid "Couldn't look up commit object for HEAD"
811 msgstr ""
812
794 -#: builtin/branch.c:182
813 +#: builtin/branch.c:183
814 #, c-format
815 msgid "Cannot delete the branch '%s' which you are currently on."
816 msgstr ""
817
799 -#: builtin/branch.c:192
818 +#: builtin/branch.c:193
819 #, c-format
820 msgid "%sbranch '%s' not found."
821 msgstr ""
822
804 -#: builtin/branch.c:200
823 +#: builtin/branch.c:201
824 #, c-format
825 msgid "Couldn't look up commit object for '%s'"
826 msgstr ""
827
809 -#: builtin/branch.c:206
828 +#: builtin/branch.c:207
829 #, c-format
830 msgid ""
831 "The branch '%s' is not fully merged.\n"
832 "If you are sure you want to delete it, run 'git branch -D %s'."
833 msgstr ""
834
816 -#: builtin/branch.c:214
835 +#: builtin/branch.c:215
836 #, c-format
837 msgid "Error deleting %sbranch '%s'"
838 msgstr ""
839
821 -#: builtin/branch.c:219
840 +#: builtin/branch.c:221
841 #, c-format
842 msgid "Deleted %sbranch %s (was %s).\n"
843 msgstr ""
844
826 -#: builtin/branch.c:224
845 +#: builtin/branch.c:226
846 msgid "Update of config-file failed"
847 msgstr ""
848
830 -#: builtin/branch.c:322
849 +#: builtin/branch.c:324
850 #, c-format
851 msgid "branch '%s' does not point at a commit"
852 msgstr ""
853
835 -#: builtin/branch.c:394
854 +#: builtin/branch.c:396
855 #, c-format
856 msgid "behind %d] "
857 msgstr ""
858
840 -#: builtin/branch.c:396
859 +#: builtin/branch.c:398
860 #, c-format
861 msgid "ahead %d] "
862 msgstr ""
863
845 -#: builtin/branch.c:398
864 +#: builtin/branch.c:400
865 #, c-format
866 msgid "ahead %d, behind %d] "
867 msgstr ""
868
850 -#: builtin/branch.c:501
869 +#: builtin/branch.c:503
870 msgid "(no branch)"
871 msgstr ""
872
854 -#: builtin/branch.c:566
873 +#: builtin/branch.c:568
874 msgid "some refs could not be read"
875 msgstr ""
876
858 -#: builtin/branch.c:579
877 +#: builtin/branch.c:581
878 msgid "cannot rename the current branch while not on any."
879 msgstr ""
880
862 -#: builtin/branch.c:589
881 +#: builtin/branch.c:591
882 #, c-format
883 msgid "Invalid branch name: '%s'"
884 msgstr ""
885
867 -#: builtin/branch.c:604
886 +#: builtin/branch.c:606
887 msgid "Branch rename failed"
888 msgstr ""
889
871 -#: builtin/branch.c:608
890 +#: builtin/branch.c:610
891 #, c-format
892 msgid "Renamed a misnamed branch '%s' away"
893 msgstr ""
894
876 -#: builtin/branch.c:612
895 +#: builtin/branch.c:614
896 #, c-format
897 msgid "Branch renamed to %s, but HEAD is not updated!"
898 msgstr ""
899
881 -#: builtin/branch.c:619
900 +#: builtin/branch.c:621
901 msgid "Branch is renamed, but update of config-file failed"
902 msgstr ""
903
885 -#: builtin/branch.c:634
904 +#: builtin/branch.c:636
905 #, c-format
906 msgid "malformed object name %s"
907 msgstr ""
908
890 -#: builtin/branch.c:658
909 +#: builtin/branch.c:660
910 #, c-format
911 msgid "could not write branch description template: %s\n"
912 msgstr ""
913
895 -#: builtin/branch.c:746
914 +#: builtin/branch.c:750
915 msgid "Failed to resolve HEAD as a valid ref."
916 msgstr ""
917
899 -#: builtin/branch.c:751 builtin/clone.c:558
918 +#: builtin/branch.c:755 builtin/clone.c:558
919 msgid "HEAD not found below refs/heads!"
920 msgstr ""
921
903 -#: builtin/branch.c:809
922 +#: builtin/branch.c:813
923 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
924 msgstr ""
925
@@ -962,7 +981,7 @@ msgid "path '%s' is unmerged"
981 msgstr ""
982
983 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
965 -#: builtin/merge.c:811
984 +#: builtin/merge.c:812
985 msgid "unable to write new index file"
986 msgstr ""
987
@@ -979,42 +998,42 @@ msgstr ""
998 msgid "Can not do reflog for '%s'\n"
999 msgstr ""
1000
982 -#: builtin/checkout.c:565
1001 +#: builtin/checkout.c:566
1002 msgid "HEAD is now at"
1003 msgstr ""
1004
986 -#: builtin/checkout.c:572
1005 +#: builtin/checkout.c:573
1006 #, c-format
1007 msgid "Reset branch '%s'\n"
1008 msgstr ""
1009
991 -#: builtin/checkout.c:575
1010 +#: builtin/checkout.c:576
1011 #, c-format
1012 msgid "Already on '%s'\n"
1013 msgstr ""
1014
996 -#: builtin/checkout.c:579
1015 +#: builtin/checkout.c:580
1016 #, c-format
1017 msgid "Switched to and reset branch '%s'\n"
1018 msgstr ""
1019
1001 -#: builtin/checkout.c:581
1020 +#: builtin/checkout.c:582
1021 #, c-format
1022 msgid "Switched to a new branch '%s'\n"
1023 msgstr ""
1024
1006 -#: builtin/checkout.c:583
1025 +#: builtin/checkout.c:584
1026 #, c-format
1027 msgid "Switched to branch '%s'\n"
1028 msgstr ""
1029
1011 -#: builtin/checkout.c:639
1030 +#: builtin/checkout.c:640
1031 #, c-format
1032 msgid " ... and %d more.\n"
1033 msgstr ""
1034
1035 #. The singular version
1017 -#: builtin/checkout.c:645
1036 +#: builtin/checkout.c:646
1037 #, c-format
1038 msgid ""
1039 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -1029,7 +1048,7 @@ msgid_plural ""
1048 msgstr[0] ""
1049 msgstr[1] ""
1050
1032 -#: builtin/checkout.c:663
1051 +#: builtin/checkout.c:664
1052 #, c-format
1053 msgid ""
1054 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -1039,96 +1058,96 @@ msgid ""
1058 "\n"
1059 msgstr ""
1060
1042 -#: builtin/checkout.c:692
1061 +#: builtin/checkout.c:693
1062 msgid "internal error in revision walk"
1063 msgstr ""
1064
1046 -#: builtin/checkout.c:696
1065 +#: builtin/checkout.c:697
1066 msgid "Previous HEAD position was"
1067 msgstr ""
1068
1050 -#: builtin/checkout.c:722
1069 +#: builtin/checkout.c:723
1070 msgid "You are on a branch yet to be born"
1071 msgstr ""
1072
1073 #. case (1)
1055 -#: builtin/checkout.c:853
1074 +#: builtin/checkout.c:854
1075 #, c-format
1076 msgid "invalid reference: %s"
1077 msgstr ""
1078
1079 #. case (1): want a tree
1061 -#: builtin/checkout.c:892
1080 +#: builtin/checkout.c:893
1081 #, c-format
1082 msgid "reference is not a tree: %s"
1083 msgstr ""
1084
1066 -#: builtin/checkout.c:972
1085 +#: builtin/checkout.c:973
1086 msgid "-B cannot be used with -b"
1087 msgstr ""
1088
1070 -#: builtin/checkout.c:981
1089 +#: builtin/checkout.c:982
1090 msgid "--patch is incompatible with all other options"
1091 msgstr ""
1092
1074 -#: builtin/checkout.c:984
1093 +#: builtin/checkout.c:985
1094 msgid "--detach cannot be used with -b/-B/--orphan"
1095 msgstr ""
1096
1078 -#: builtin/checkout.c:986
1097 +#: builtin/checkout.c:987
1098 msgid "--detach cannot be used with -t"
1099 msgstr ""
1100
1082 -#: builtin/checkout.c:992
1101 +#: builtin/checkout.c:993
1102 msgid "--track needs a branch name"
1103 msgstr ""
1104
1086 -#: builtin/checkout.c:999
1105 +#: builtin/checkout.c:1000
1106 msgid "Missing branch name; try -b"
1107 msgstr ""
1108
1090 -#: builtin/checkout.c:1005
1109 +#: builtin/checkout.c:1006
1110 msgid "--orphan and -b|-B are mutually exclusive"
1111 msgstr ""
1112
1094 -#: builtin/checkout.c:1007
1113 +#: builtin/checkout.c:1008
1114 msgid "--orphan cannot be used with -t"
1115 msgstr ""
1116
1098 -#: builtin/checkout.c:1017
1117 +#: builtin/checkout.c:1018
1118 msgid "git checkout: -f and -m are incompatible"
1119 msgstr ""
1120
1102 -#: builtin/checkout.c:1051
1121 +#: builtin/checkout.c:1052
1122 msgid "invalid path specification"
1123 msgstr ""
1124
1106 -#: builtin/checkout.c:1059
1125 +#: builtin/checkout.c:1060
1126 #, c-format
1127 msgid ""
1128 "git checkout: updating paths is incompatible with switching branches.\n"
1129 "Did you intend to checkout '%s' which can not be resolved as commit?"
1130 msgstr ""
1131
1113 -#: builtin/checkout.c:1061
1132 +#: builtin/checkout.c:1062
1133 msgid "git checkout: updating paths is incompatible with switching branches."
1134 msgstr ""
1135
1117 -#: builtin/checkout.c:1066
1136 +#: builtin/checkout.c:1067
1137 msgid "git checkout: --detach does not take a path argument"
1138 msgstr ""
1139
1121 -#: builtin/checkout.c:1069
1140 +#: builtin/checkout.c:1070
1141 msgid ""
1142 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1143 "checking out of the index."
1144 msgstr ""
1145
1127 -#: builtin/checkout.c:1088
1146 +#: builtin/checkout.c:1089
1147 msgid "Cannot switch branch to a non-commit."
1148 msgstr ""
1149
1131 -#: builtin/checkout.c:1091
1150 +#: builtin/checkout.c:1092
1151 msgid "--ours/--theirs is incompatible with switching branches."
1152 msgstr ""
1153
@@ -1365,66 +1384,66 @@ msgstr ""
1384 msgid "unable to write temporary index file"
1385 msgstr ""
1386
1368 -#: builtin/commit.c:550 builtin/commit.c:556
1387 +#: builtin/commit.c:561 builtin/commit.c:567
1388 #, c-format
1389 msgid "invalid commit: %s"
1390 msgstr ""
1391
1373 -#: builtin/commit.c:579
1392 +#: builtin/commit.c:590
1393 msgid "malformed --author parameter"
1394 msgstr ""
1395
1377 -#: builtin/commit.c:635
1396 +#: builtin/commit.c:651
1397 #, c-format
1398 msgid "Malformed ident string: '%s'"
1399 msgstr ""
1400
1382 -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
1401 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
1402 #, c-format
1403 msgid "could not lookup commit %s"
1404 msgstr ""
1405
1387 -#: builtin/commit.c:682 builtin/shortlog.c:296
1406 +#: builtin/commit.c:701 builtin/shortlog.c:296
1407 #, c-format
1408 msgid "(reading log message from standard input)\n"
1409 msgstr ""
1410
1392 -#: builtin/commit.c:684
1411 +#: builtin/commit.c:703
1412 msgid "could not read log from standard input"
1413 msgstr ""
1414
1396 -#: builtin/commit.c:688
1415 +#: builtin/commit.c:707
1416 #, c-format
1417 msgid "could not read log file '%s'"
1418 msgstr ""
1419
1401 -#: builtin/commit.c:694
1420 +#: builtin/commit.c:713
1421 msgid "commit has empty message"
1422 msgstr ""
1423
1405 -#: builtin/commit.c:710
1424 +#: builtin/commit.c:729
1425 msgid "could not read MERGE_MSG"
1426 msgstr ""
1427
1409 -#: builtin/commit.c:714
1428 +#: builtin/commit.c:733
1429 msgid "could not read SQUASH_MSG"
1430 msgstr ""
1431
1413 -#: builtin/commit.c:718
1432 +#: builtin/commit.c:737
1433 #, c-format
1434 msgid "could not read '%s'"
1435 msgstr ""
1436
1418 -#: builtin/commit.c:746
1437 +#: builtin/commit.c:765
1438 #, c-format
1439 msgid "could not open '%s'"
1440 msgstr ""
1441
1423 -#: builtin/commit.c:770
1442 +#: builtin/commit.c:789
1443 msgid "could not write commit template"
1444 msgstr ""
1445
1427 -#: builtin/commit.c:783
1446 +#: builtin/commit.c:799
1447 #, c-format
1448 msgid ""
1449 "\n"
@@ -1434,167 +1453,172 @@ msgid ""
1453 "and try again.\n"
1454 msgstr ""
1455
1437 -#: builtin/commit.c:796
1456 +#: builtin/commit.c:812
1457 msgid "Please enter the commit message for your changes."
1458 msgstr ""
1459
1441 -#: builtin/commit.c:799
1460 +#: builtin/commit.c:815
1461 msgid ""
1462 " Lines starting\n"
1463 "with '#' will be ignored, and an empty message aborts the commit.\n"
1464 msgstr ""
1465
1447 -#: builtin/commit.c:804
1466 +#: builtin/commit.c:820
1467 msgid ""
1468 " Lines starting\n"
1469 "with '#' will be kept; you may remove them yourself if you want to.\n"
1470 "An empty message aborts the commit.\n"
1471 msgstr ""
1472
1454 -#: builtin/commit.c:816
1473 +#: builtin/commit.c:832
1474 #, c-format
1475 msgid "%sAuthor: %s"
1476 msgstr ""
1477
1459 -#: builtin/commit.c:823
1478 +#: builtin/commit.c:839
1479 #, c-format
1480 msgid "%sCommitter: %s"
1481 msgstr ""
1482
1464 -#: builtin/commit.c:843
1483 +#: builtin/commit.c:859
1484 msgid "Cannot read index"
1485 msgstr ""
1486
1468 -#: builtin/commit.c:880
1487 +#: builtin/commit.c:896
1488 msgid "Error building trees"
1489 msgstr ""
1490
1472 -#: builtin/commit.c:895 builtin/tag.c:357
1491 +#: builtin/commit.c:911 builtin/tag.c:357
1492 #, c-format
1493 msgid "Please supply the message using either -m or -F option.\n"
1494 msgstr ""
1495
1477 -#: builtin/commit.c:975
1496 +#: builtin/commit.c:1008
1497 #, c-format
1498 msgid "No existing author found with '%s'"
1499 msgstr ""
1500
1482 -#: builtin/commit.c:990 builtin/commit.c:1182
1501 +#: builtin/commit.c:1023 builtin/commit.c:1217
1502 #, c-format
1503 msgid "Invalid untracked files mode '%s'"
1504 msgstr ""
1505
1487 -#: builtin/commit.c:1030
1506 +#: builtin/commit.c:1063
1507 msgid "Using both --reset-author and --author does not make sense"
1508 msgstr ""
1509
1491 -#: builtin/commit.c:1041
1510 +#: builtin/commit.c:1074
1511 msgid "You have nothing to amend."
1512 msgstr ""
1513
1495 -#: builtin/commit.c:1043
1514 +#: builtin/commit.c:1076
1515 #, c-format
1516 msgid "You are in the middle of a %s -- cannot amend."
1517 msgstr ""
1518
1500 -#: builtin/commit.c:1045
1519 +#: builtin/commit.c:1078
1520 msgid "Options --squash and --fixup cannot be used together"
1521 msgstr ""
1522
1504 -#: builtin/commit.c:1055
1523 +#: builtin/commit.c:1088
1524 msgid "Only one of -c/-C/-F/--fixup can be used."
1525 msgstr ""
1526
1508 -#: builtin/commit.c:1057
1527 +#: builtin/commit.c:1090
1528 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1529 msgstr ""
1530
1512 -#: builtin/commit.c:1063
1531 +#: builtin/commit.c:1098
1532 msgid "--reset-author can be used only with -C, -c or --amend."
1533 msgstr ""
1534
1516 -#: builtin/commit.c:1080
1535 +#: builtin/commit.c:1115
1536 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1537 msgstr ""
1538
1520 -#: builtin/commit.c:1082
1539 +#: builtin/commit.c:1117
1540 msgid "No paths with --include/--only does not make sense."
1541 msgstr ""
1542
1524 -#: builtin/commit.c:1084
1543 +#: builtin/commit.c:1119
1544 msgid "Clever... amending the last one with dirty index."
1545 msgstr ""
1546
1528 -#: builtin/commit.c:1086
1547 +#: builtin/commit.c:1121
1548 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1549 msgstr ""
1550
1532 -#: builtin/commit.c:1096 builtin/tag.c:556
1551 +#: builtin/commit.c:1131 builtin/tag.c:556
1552 #, c-format
1553 msgid "Invalid cleanup mode %s"
1554 msgstr ""
1555
1537 -#: builtin/commit.c:1101
1556 +#: builtin/commit.c:1136
1557 msgid "Paths with -a does not make sense."
1558 msgstr ""
1559
1541 -#: builtin/commit.c:1280
1560 +#: builtin/commit.c:1315
1561 msgid "couldn't look up newly created commit"
1562 msgstr ""
1563
1545 -#: builtin/commit.c:1282
1564 +#: builtin/commit.c:1317
1565 msgid "could not parse newly created commit"
1566 msgstr ""
1567
1549 -#: builtin/commit.c:1323
1568 +#: builtin/commit.c:1358
1569 msgid "detached HEAD"
1570 msgstr ""
1571
1553 -#: builtin/commit.c:1325
1572 +#: builtin/commit.c:1360
1573 msgid " (root-commit)"
1574 msgstr ""
1575
1557 -#: builtin/commit.c:1415
1576 +#: builtin/commit.c:1450
1577 msgid "could not parse HEAD commit"
1578 msgstr ""
1579
1561 -#: builtin/commit.c:1452 builtin/merge.c:509
1580 +#: builtin/commit.c:1487 builtin/merge.c:509
1581 #, c-format
1582 msgid "could not open '%s' for reading"
1583 msgstr ""
1584
1566 -#: builtin/commit.c:1459
1585 +#: builtin/commit.c:1494
1586 #, c-format
1587 msgid "Corrupt MERGE_HEAD file (%s)"
1588 msgstr ""
1589
1571 -#: builtin/commit.c:1466
1590 +#: builtin/commit.c:1501
1591 msgid "could not read MERGE_MODE"
1592 msgstr ""
1593
1575 -#: builtin/commit.c:1485
1594 +#: builtin/commit.c:1520
1595 #, c-format
1596 msgid "could not read commit message: %s"
1597 msgstr ""
1598
1580 -#: builtin/commit.c:1499
1599 +#: builtin/commit.c:1534
1600 +#, c-format
1601 +msgid "Aborting commit; you did not edit the message.\n"
1602 +msgstr ""
1603 +
1604 +#: builtin/commit.c:1539
1605 #, c-format
1606 msgid "Aborting commit due to empty commit message.\n"
1607 msgstr ""
1608
1585 -#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968
1609 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
1610 msgid "failed to write commit object"
1611 msgstr ""
1612
1589 -#: builtin/commit.c:1535
1613 +#: builtin/commit.c:1575
1614 msgid "cannot lock HEAD ref"
1615 msgstr ""
1616
1593 -#: builtin/commit.c:1539
1617 +#: builtin/commit.c:1579
1618 msgid "cannot update HEAD ref"
1619 msgstr ""
1620
1597 -#: builtin/commit.c:1550
1621 +#: builtin/commit.c:1590
1622 msgid ""
1623 "Repository has been updated, but unable to write\n"
1624 "new_index file. Check that disk is not full or quota is\n"
@@ -1717,146 +1741,150 @@ msgstr ""
1741 msgid "Couldn't find remote ref HEAD"
1742 msgstr ""
1743
1720 -#: builtin/fetch.c:252
1744 +#: builtin/fetch.c:253
1745 #, c-format
1746 msgid "object %s not found"
1747 msgstr ""
1748
1725 -#: builtin/fetch.c:258
1749 +#: builtin/fetch.c:259
1750 msgid "[up to date]"
1751 msgstr ""
1752
1729 -#: builtin/fetch.c:272
1753 +#: builtin/fetch.c:273
1754 #, c-format
1755 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1756 msgstr ""
1757
1734 -#: builtin/fetch.c:273 builtin/fetch.c:351
1758 +#: builtin/fetch.c:274 builtin/fetch.c:360
1759 msgid "[rejected]"
1760 msgstr ""
1761
1738 -#: builtin/fetch.c:284
1762 +#: builtin/fetch.c:285
1763 msgid "[tag update]"
1764 msgstr ""
1765
1742 -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
1766 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
1767 msgid " (unable to update local ref)"
1768 msgstr ""
1769
1746 -#: builtin/fetch.c:298
1770 +#: builtin/fetch.c:305
1771 msgid "[new tag]"
1772 msgstr ""
1773
1750 -#: builtin/fetch.c:302
1774 +#: builtin/fetch.c:308
1775 msgid "[new branch]"
1776 msgstr ""
1777
1754 -#: builtin/fetch.c:347
1778 +#: builtin/fetch.c:311
1779 +msgid "[new ref]"
1780 +msgstr ""
1781 +
1782 +#: builtin/fetch.c:356
1783 msgid "unable to update local ref"
1784 msgstr ""
1785
1758 -#: builtin/fetch.c:347
1786 +#: builtin/fetch.c:356
1787 msgid "forced update"
1788 msgstr ""
1789
1762 -#: builtin/fetch.c:353
1790 +#: builtin/fetch.c:362
1791 msgid "(non-fast-forward)"
1792 msgstr ""
1793
1766 -#: builtin/fetch.c:384 builtin/fetch.c:676
1794 +#: builtin/fetch.c:393 builtin/fetch.c:685
1795 #, c-format
1796 msgid "cannot open %s: %s\n"
1797 msgstr ""
1798
1771 -#: builtin/fetch.c:393
1799 +#: builtin/fetch.c:402
1800 #, c-format
1801 msgid "%s did not send all necessary objects\n"
1802 msgstr ""
1803
1776 -#: builtin/fetch.c:479
1804 +#: builtin/fetch.c:488
1805 #, c-format
1806 msgid "From %.*s\n"
1807 msgstr ""
1808
1781 -#: builtin/fetch.c:490
1809 +#: builtin/fetch.c:499
1810 #, c-format
1811 msgid ""
1812 "some local refs could not be updated; try running\n"
1813 " 'git remote prune %s' to remove any old, conflicting branches"
1814 msgstr ""
1815
1788 -#: builtin/fetch.c:540
1816 +#: builtin/fetch.c:549
1817 #, c-format
1818 msgid " (%s will become dangling)\n"
1819 msgstr ""
1820
1793 -#: builtin/fetch.c:541
1821 +#: builtin/fetch.c:550
1822 #, c-format
1823 msgid " (%s has become dangling)\n"
1824 msgstr ""
1825
1798 -#: builtin/fetch.c:548
1826 +#: builtin/fetch.c:557
1827 msgid "[deleted]"
1828 msgstr ""
1829
1802 -#: builtin/fetch.c:549
1830 +#: builtin/fetch.c:558
1831 msgid "(none)"
1832 msgstr ""
1833
1806 -#: builtin/fetch.c:666
1834 +#: builtin/fetch.c:675
1835 #, c-format
1836 msgid "Refusing to fetch into current branch %s of non-bare repository"
1837 msgstr ""
1838
1811 -#: builtin/fetch.c:700
1839 +#: builtin/fetch.c:709
1840 #, c-format
1841 msgid "Don't know how to fetch from %s"
1842 msgstr ""
1843
1816 -#: builtin/fetch.c:777
1844 +#: builtin/fetch.c:786
1845 #, c-format
1846 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1847 msgstr ""
1848
1821 -#: builtin/fetch.c:780
1849 +#: builtin/fetch.c:789
1850 #, c-format
1851 msgid "Option \"%s\" is ignored for %s\n"
1852 msgstr ""
1853
1826 -#: builtin/fetch.c:879
1854 +#: builtin/fetch.c:888
1855 #, c-format
1856 msgid "Fetching %s\n"
1857 msgstr ""
1858
1831 -#: builtin/fetch.c:881
1859 +#: builtin/fetch.c:890
1860 #, c-format
1861 msgid "Could not fetch %s"
1862 msgstr ""
1863
1836 -#: builtin/fetch.c:898
1864 +#: builtin/fetch.c:907
1865 msgid ""
1866 "No remote repository specified. Please, specify either a URL or a\n"
1867 "remote name from which new revisions should be fetched."
1868 msgstr ""
1869
1842 -#: builtin/fetch.c:918
1870 +#: builtin/fetch.c:927
1871 msgid "You need to specify a tag name."
1872 msgstr ""
1873
1846 -#: builtin/fetch.c:970
1874 +#: builtin/fetch.c:979
1875 msgid "fetch --all does not take a repository argument"
1876 msgstr ""
1877
1850 -#: builtin/fetch.c:972
1878 +#: builtin/fetch.c:981
1879 msgid "fetch --all does not make sense with refspecs"
1880 msgstr ""
1881
1854 -#: builtin/fetch.c:983
1882 +#: builtin/fetch.c:992
1883 #, c-format
1884 msgid "No such remote or remote group: %s"
1885 msgstr ""
1886
1859 -#: builtin/fetch.c:991
1887 +#: builtin/fetch.c:1000
1888 msgid "Fetching a group and specifying refspecs does not make sense"
1889 msgstr ""
1890
@@ -2092,163 +2120,163 @@ msgstr ""
2120 msgid "Cannot access work tree '%s'"
2121 msgstr ""
2122
2095 -#: builtin/log.c:187
2123 +#: builtin/log.c:188
2124 #, c-format
2125 msgid "Final output: %d %s\n"
2126 msgstr ""
2127
2100 -#: builtin/log.c:395 builtin/log.c:483
2128 +#: builtin/log.c:401 builtin/log.c:489
2129 #, c-format
2130 msgid "Could not read object %s"
2131 msgstr ""
2132
2105 -#: builtin/log.c:507
2133 +#: builtin/log.c:513
2134 #, c-format
2135 msgid "Unknown type: %d"
2136 msgstr ""
2137
2110 -#: builtin/log.c:596
2138 +#: builtin/log.c:602
2139 msgid "format.headers without value"
2140 msgstr ""
2141
2114 -#: builtin/log.c:669
2142 +#: builtin/log.c:675
2143 msgid "name of output directory is too long"
2144 msgstr ""
2145
2118 -#: builtin/log.c:680
2146 +#: builtin/log.c:686
2147 #, c-format
2148 msgid "Cannot open patch file %s"
2149 msgstr ""
2150
2123 -#: builtin/log.c:694
2151 +#: builtin/log.c:700
2152 msgid "Need exactly one range."
2153 msgstr ""
2154
2127 -#: builtin/log.c:702
2155 +#: builtin/log.c:708
2156 msgid "Not a range."
2157 msgstr ""
2158
2131 -#: builtin/log.c:739
2159 +#: builtin/log.c:745
2160 msgid "Could not extract email from committer identity."
2161 msgstr ""
2162
2135 -#: builtin/log.c:785
2163 +#: builtin/log.c:791
2164 msgid "Cover letter needs email format"
2165 msgstr ""
2166
2139 -#: builtin/log.c:879
2167 +#: builtin/log.c:885
2168 #, c-format
2169 msgid "insane in-reply-to: %s"
2170 msgstr ""
2171
2144 -#: builtin/log.c:952
2172 +#: builtin/log.c:958
2173 msgid "Two output directories?"
2174 msgstr ""
2175
2148 -#: builtin/log.c:1173
2176 +#: builtin/log.c:1179
2177 #, c-format
2178 msgid "bogus committer info %s"
2179 msgstr ""
2180
2153 -#: builtin/log.c:1218
2181 +#: builtin/log.c:1224
2182 msgid "-n and -k are mutually exclusive."
2183 msgstr ""
2184
2157 -#: builtin/log.c:1220
2185 +#: builtin/log.c:1226
2186 msgid "--subject-prefix and -k are mutually exclusive."
2187 msgstr ""
2188
2161 -#: builtin/log.c:1225 builtin/shortlog.c:284
2189 +#: builtin/log.c:1231 builtin/shortlog.c:284
2190 #, c-format
2191 msgid "unrecognized argument: %s"
2192 msgstr ""
2193
2166 -#: builtin/log.c:1228
2194 +#: builtin/log.c:1234
2195 msgid "--name-only does not make sense"
2196 msgstr ""
2197
2170 -#: builtin/log.c:1230
2198 +#: builtin/log.c:1236
2199 msgid "--name-status does not make sense"
2200 msgstr ""
2201
2174 -#: builtin/log.c:1232
2202 +#: builtin/log.c:1238
2203 msgid "--check does not make sense"
2204 msgstr ""
2205
2178 -#: builtin/log.c:1255
2206 +#: builtin/log.c:1261
2207 msgid "standard output, or directory, which one?"
2208 msgstr ""
2209
2182 -#: builtin/log.c:1257
2210 +#: builtin/log.c:1263
2211 #, c-format
2212 msgid "Could not create directory '%s'"
2213 msgstr ""
2214
2187 -#: builtin/log.c:1410
2215 +#: builtin/log.c:1416
2216 msgid "Failed to create output files"
2217 msgstr ""
2218
2191 -#: builtin/log.c:1514
2219 +#: builtin/log.c:1520
2220 #, c-format
2221 msgid ""
2222 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2223 msgstr ""
2224
2197 -#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
2225 +#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
2226 #, c-format
2227 msgid "Unknown commit %s"
2228 msgstr ""
2229
2202 -#: builtin/merge.c:91
2230 +#: builtin/merge.c:90
2231 msgid "switch `m' requires a value"
2232 msgstr ""
2233
2206 -#: builtin/merge.c:128
2234 +#: builtin/merge.c:127
2235 #, c-format
2236 msgid "Could not find merge strategy '%s'.\n"
2237 msgstr ""
2238
2211 -#: builtin/merge.c:129
2239 +#: builtin/merge.c:128
2240 #, c-format
2241 msgid "Available strategies are:"
2242 msgstr ""
2243
2216 -#: builtin/merge.c:134
2244 +#: builtin/merge.c:133
2245 #, c-format
2246 msgid "Available custom strategies are:"
2247 msgstr ""
2248
2221 -#: builtin/merge.c:241
2249 +#: builtin/merge.c:240
2250 msgid "could not run stash."
2251 msgstr ""
2252
2225 -#: builtin/merge.c:246
2253 +#: builtin/merge.c:245
2254 msgid "stash failed"
2255 msgstr ""
2256
2229 -#: builtin/merge.c:251
2257 +#: builtin/merge.c:250
2258 #, c-format
2259 msgid "not a valid object: %s"
2260 msgstr ""
2261
2234 -#: builtin/merge.c:270 builtin/merge.c:287
2262 +#: builtin/merge.c:269 builtin/merge.c:286
2263 msgid "read-tree failed"
2264 msgstr ""
2265
2238 -#: builtin/merge.c:317
2266 +#: builtin/merge.c:316
2267 msgid " (nothing to squash)"
2268 msgstr ""
2269
2242 -#: builtin/merge.c:330
2270 +#: builtin/merge.c:329
2271 #, c-format
2272 msgid "Squash commit -- not updating HEAD\n"
2273 msgstr ""
2274
2247 -#: builtin/merge.c:362
2275 +#: builtin/merge.c:361
2276 msgid "Writing SQUASH_MSG"
2277 msgstr ""
2278
2251 -#: builtin/merge.c:364
2279 +#: builtin/merge.c:363
2280 msgid "Finishing SQUASH_MSG"
2281 msgstr ""
2282
@@ -2275,35 +2303,35 @@ msgstr ""
2303 msgid "failed to read the cache"
2304 msgstr ""
2305
2278 -#: builtin/merge.c:696
2306 +#: builtin/merge.c:697
2307 msgid "Unable to write index."
2308 msgstr ""
2309
2282 -#: builtin/merge.c:709
2310 +#: builtin/merge.c:710
2311 msgid "Not handling anything other than two heads merge."
2312 msgstr ""
2313
2286 -#: builtin/merge.c:723
2314 +#: builtin/merge.c:724
2315 #, c-format
2316 msgid "Unknown option for merge-recursive: -X%s"
2317 msgstr ""
2318
2291 -#: builtin/merge.c:737
2319 +#: builtin/merge.c:738
2320 #, c-format
2321 msgid "unable to write %s"
2322 msgstr ""
2323
2296 -#: builtin/merge.c:876
2324 +#: builtin/merge.c:877
2325 #, c-format
2326 msgid "Could not read from '%s'"
2327 msgstr ""
2328
2301 -#: builtin/merge.c:885
2329 +#: builtin/merge.c:886
2330 #, c-format
2331 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2332 msgstr ""
2333
2306 -#: builtin/merge.c:891
2334 +#: builtin/merge.c:892
2335 msgid ""
2336 "Please enter a commit message to explain why this merge is necessary,\n"
2337 "especially if it merges an updated upstream into a topic branch.\n"
@@ -2312,140 +2340,140 @@ msgid ""
2340 "the commit.\n"
2341 msgstr ""
2342
2315 -#: builtin/merge.c:915
2343 +#: builtin/merge.c:916
2344 msgid "Empty commit message."
2345 msgstr ""
2346
2319 -#: builtin/merge.c:927
2347 +#: builtin/merge.c:928
2348 #, c-format
2349 msgid "Wonderful.\n"
2350 msgstr ""
2351
2324 -#: builtin/merge.c:1000
2352 +#: builtin/merge.c:993
2353 #, c-format
2354 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2355 msgstr ""
2356
2329 -#: builtin/merge.c:1016
2357 +#: builtin/merge.c:1009
2358 #, c-format
2359 msgid "'%s' is not a commit"
2360 msgstr ""
2361
2334 -#: builtin/merge.c:1057
2362 +#: builtin/merge.c:1050
2363 msgid "No current branch."
2364 msgstr ""
2365
2338 -#: builtin/merge.c:1059
2366 +#: builtin/merge.c:1052
2367 msgid "No remote for the current branch."
2368 msgstr ""
2369
2342 -#: builtin/merge.c:1061
2370 +#: builtin/merge.c:1054
2371 msgid "No default upstream defined for the current branch."
2372 msgstr ""
2373
2346 -#: builtin/merge.c:1066
2374 +#: builtin/merge.c:1059
2375 #, c-format
2376 msgid "No remote tracking branch for %s from %s"
2377 msgstr ""
2378
2351 -#: builtin/merge.c:1188
2379 +#: builtin/merge.c:1146 builtin/merge.c:1303
2380 +#, c-format
2381 +msgid "%s - not something we can merge"
2382 +msgstr ""
2383 +
2384 +#: builtin/merge.c:1214
2385 msgid "There is no merge to abort (MERGE_HEAD missing)."
2386 msgstr ""
2387
2355 -#: builtin/merge.c:1204 git-pull.sh:31
2388 +#: builtin/merge.c:1230 git-pull.sh:31
2389 msgid ""
2390 "You have not concluded your merge (MERGE_HEAD exists).\n"
2391 "Please, commit your changes before you can merge."
2392 msgstr ""
2393
2361 -#: builtin/merge.c:1207 git-pull.sh:34
2394 +#: builtin/merge.c:1233 git-pull.sh:34
2395 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2396 msgstr ""
2397
2365 -#: builtin/merge.c:1211
2398 +#: builtin/merge.c:1237
2399 msgid ""
2400 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2401 "Please, commit your changes before you can merge."
2402 msgstr ""
2403
2371 -#: builtin/merge.c:1214
2404 +#: builtin/merge.c:1240
2405 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2406 msgstr ""
2407
2375 -#: builtin/merge.c:1223
2408 +#: builtin/merge.c:1249
2409 msgid "You cannot combine --squash with --no-ff."
2410 msgstr ""
2411
2379 -#: builtin/merge.c:1228
2412 +#: builtin/merge.c:1254
2413 msgid "You cannot combine --no-ff with --ff-only."
2414 msgstr ""
2415
2383 -#: builtin/merge.c:1235
2416 +#: builtin/merge.c:1261
2417 msgid "No commit specified and merge.defaultToUpstream not set."
2418 msgstr ""
2419
2387 -#: builtin/merge.c:1266
2420 +#: builtin/merge.c:1293
2421 msgid "Can merge only exactly one commit into empty head"
2422 msgstr ""
2423
2391 -#: builtin/merge.c:1269
2424 +#: builtin/merge.c:1296
2425 msgid "Squash commit into empty head not supported yet"
2426 msgstr ""
2427
2395 -#: builtin/merge.c:1271
2428 +#: builtin/merge.c:1298
2429 msgid "Non-fast-forward commit does not make sense into an empty head"
2430 msgstr ""
2431
2399 -#: builtin/merge.c:1275 builtin/merge.c:1319
2400 -#, c-format
2401 -msgid "%s - not something we can merge"
2402 -msgstr ""
2403 -
2404 -#: builtin/merge.c:1385
2432 +#: builtin/merge.c:1413
2433 #, c-format
2434 msgid "Updating %s..%s\n"
2435 msgstr ""
2436
2409 -#: builtin/merge.c:1423
2437 +#: builtin/merge.c:1451
2438 #, c-format
2439 msgid "Trying really trivial in-index merge...\n"
2440 msgstr ""
2441
2414 -#: builtin/merge.c:1430
2442 +#: builtin/merge.c:1458
2443 #, c-format
2444 msgid "Nope.\n"
2445 msgstr ""
2446
2419 -#: builtin/merge.c:1462
2447 +#: builtin/merge.c:1490
2448 msgid "Not possible to fast-forward, aborting."
2449 msgstr ""
2450
2423 -#: builtin/merge.c:1485 builtin/merge.c:1562
2451 +#: builtin/merge.c:1513 builtin/merge.c:1592
2452 #, c-format
2453 msgid "Rewinding the tree to pristine...\n"
2454 msgstr ""
2455
2428 -#: builtin/merge.c:1489
2456 +#: builtin/merge.c:1517
2457 #, c-format
2458 msgid "Trying merge strategy %s...\n"
2459 msgstr ""
2460
2433 -#: builtin/merge.c:1553
2461 +#: builtin/merge.c:1583
2462 #, c-format
2463 msgid "No merge strategy handled the merge.\n"
2464 msgstr ""
2465
2438 -#: builtin/merge.c:1555
2466 +#: builtin/merge.c:1585
2467 #, c-format
2468 msgid "Merge with strategy %s failed.\n"
2469 msgstr ""
2470
2443 -#: builtin/merge.c:1564
2471 +#: builtin/merge.c:1594
2472 #, c-format
2473 msgid "Using the %s to prepare resolving by hand.\n"
2474 msgstr ""
2475
2448 -#: builtin/merge.c:1575
2476 +#: builtin/merge.c:1606
2477 #, c-format
2478 msgid "Automatic merge went well; stopped before committing as requested\n"
2479 msgstr ""
@@ -2684,15 +2712,15 @@ msgstr ""
2712 msgid "unable to parse value '%s' for option %s"
2713 msgstr ""
2714
2687 -#: builtin/push.c:44
2715 +#: builtin/push.c:45
2716 msgid "tag shorthand without <tag>"
2717 msgstr ""
2718
2691 -#: builtin/push.c:63
2719 +#: builtin/push.c:64
2720 msgid "--delete only accepts plain target ref names"
2721 msgstr ""
2722
2695 -#: builtin/push.c:73
2723 +#: builtin/push.c:84
2724 #, c-format
2725 msgid ""
2726 "You are not currently on a branch.\n"
@@ -2702,7 +2730,7 @@ msgid ""
2730 " git push %s HEAD:<name-of-remote-branch>\n"
2731 msgstr ""
2732
2705 -#: builtin/push.c:80
2733 +#: builtin/push.c:91
2734 #, c-format
2735 msgid ""
2736 "The current branch %s has no upstream branch.\n"
@@ -2711,40 +2739,64 @@ msgid ""
2739 " git push --set-upstream %s %s\n"
2740 msgstr ""
2741
2714 -#: builtin/push.c:88
2742 +#: builtin/push.c:99
2743 #, c-format
2744 msgid "The current branch %s has multiple upstream branches, refusing to push."
2745 msgstr ""
2746
2719 -#: builtin/push.c:111
2747 +#: builtin/push.c:102
2748 +#, c-format
2749 msgid ""
2721 -"You didn't specify any refspecs to push, and push.default is \"nothing\"."
2750 +"You are pushing to remote '%s', which is not the upstream of\n"
2751 +"your current branch '%s', without telling me what to push\n"
2752 +"to update which remote branch."
2753 msgstr ""
2754
2755 #: builtin/push.c:131
2725 -#, c-format
2726 -msgid "Pushing to %s\n"
2756 +msgid ""
2757 +"You didn't specify any refspecs to push, and push.default is \"nothing\"."
2758 +msgstr ""
2759 +
2760 +#: builtin/push.c:138
2761 +msgid ""
2762 +"Updates were rejected because the tip of your current branch is behind\n"
2763 +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2764 +"before pushing again.\n"
2765 +"See the 'Note about fast-forwards' in 'git push --help' for details."
2766 +msgstr ""
2767 +
2768 +#: builtin/push.c:144
2769 +msgid ""
2770 +"Updates were rejected because a pushed branch tip is behind its remote\n"
2771 +"counterpart. If you did not intend to push that branch, you may want to\n"
2772 +"specify branches to push or set the 'push.default' configuration\n"
2773 +"variable to 'current' or 'upstream' to push only the current branch."
2774 msgstr ""
2775
2729 -#: builtin/push.c:135
2776 +#: builtin/push.c:150
2777 +msgid ""
2778 +"Updates were rejected because a pushed branch tip is behind its remote\n"
2779 +"counterpart. Check out this branch and merge the remote changes\n"
2780 +"(e.g. 'git pull') before pushing again.\n"
2781 +"See the 'Note about fast-forwards' in 'git push --help' for details."
2782 +msgstr ""
2783 +
2784 +#: builtin/push.c:190
2785 #, c-format
2731 -msgid "failed to push some refs to '%s'"
2786 +msgid "Pushing to %s\n"
2787 msgstr ""
2788
2734 -#: builtin/push.c:143
2789 +#: builtin/push.c:194
2790 #, c-format
2736 -msgid ""
2737 -"To prevent you from losing history, non-fast-forward updates were rejected\n"
2738 -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2739 -"'Note about fast-forwards' section of 'git push --help' for details.\n"
2791 +msgid "failed to push some refs to '%s'"
2792 msgstr ""
2793
2742 -#: builtin/push.c:160
2794 +#: builtin/push.c:226
2795 #, c-format
2796 msgid "bad repository '%s'"
2797 msgstr ""
2798
2747 -#: builtin/push.c:161
2799 +#: builtin/push.c:227
2800 msgid ""
2801 "No configured push destination.\n"
2802 "Either specify the URL from the command-line or configure a remote "
@@ -2757,31 +2809,31 @@ msgid ""
2809 " git push <name>\n"
2810 msgstr ""
2811
2760 -#: builtin/push.c:176
2812 +#: builtin/push.c:242
2813 msgid "--all and --tags are incompatible"
2814 msgstr ""
2815
2764 -#: builtin/push.c:177
2816 +#: builtin/push.c:243
2817 msgid "--all can't be combined with refspecs"
2818 msgstr ""
2819
2768 -#: builtin/push.c:182
2820 +#: builtin/push.c:248
2821 msgid "--mirror and --tags are incompatible"
2822 msgstr ""
2823
2772 -#: builtin/push.c:183
2824 +#: builtin/push.c:249
2825 msgid "--mirror can't be combined with refspecs"
2826 msgstr ""
2827
2776 -#: builtin/push.c:188
2828 +#: builtin/push.c:254
2829 msgid "--all and --mirror are incompatible"
2830 msgstr ""
2831
2780 -#: builtin/push.c:274
2832 +#: builtin/push.c:342
2833 msgid "--delete is incompatible with --all, --mirror and --tags"
2834 msgstr ""
2835
2784 -#: builtin/push.c:276
2836 +#: builtin/push.c:344
2837 msgid "--delete doesn't make sense without any refs"
2838 msgstr ""
2839
@@ -2864,20 +2916,20 @@ msgstr ""
2916 msgid "Could not reset index file to revision '%s'."
2917 msgstr ""
2918
2867 -#: builtin/revert.c:70 builtin/revert.c:91
2919 +#: builtin/revert.c:70 builtin/revert.c:92
2920 #, c-format
2921 msgid "%s: %s cannot be used with %s"
2922 msgstr ""
2923
2872 -#: builtin/revert.c:126
2924 +#: builtin/revert.c:127
2925 msgid "program error"
2926 msgstr ""
2927
2876 -#: builtin/revert.c:209
2928 +#: builtin/revert.c:213
2929 msgid "revert failed"
2930 msgstr ""
2931
2880 -#: builtin/revert.c:224
2932 +#: builtin/revert.c:228
2933 msgid "cherry-pick failed"
2934 msgstr ""
2935
@@ -3040,80 +3092,80 @@ msgstr ""
3092 msgid "Updated tag '%s' (was %s)\n"
3093 msgstr ""
3094
3043 -#: git-am.sh:49
3095 +#: git-am.sh:50
3096 msgid "You need to set your committer info first"
3097 msgstr ""
3098
3047 -#: git-am.sh:136
3099 +#: git-am.sh:137
3100 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3101 msgstr ""
3102
3051 -#: git-am.sh:147
3103 +#: git-am.sh:154
3104 msgid ""
3105 "Did you hand edit your patch?\n"
3106 "It does not apply to blobs recorded in its index."
3107 msgstr ""
3108
3057 -#: git-am.sh:156
3109 +#: git-am.sh:163
3110 msgid "Falling back to patching base and 3-way merge..."
3111 msgstr ""
3112
3061 -#: git-am.sh:268
3113 +#: git-am.sh:275
3114 msgid "Only one StGIT patch series can be applied at once"
3115 msgstr ""
3116
3065 -#: git-am.sh:355
3117 +#: git-am.sh:362
3118 #, sh-format
3119 msgid "Patch format $patch_format is not supported."
3120 msgstr ""
3121
3070 -#: git-am.sh:357
3122 +#: git-am.sh:364
3123 msgid "Patch format detection failed."
3124 msgstr ""
3125
3074 -#: git-am.sh:411
3126 +#: git-am.sh:418
3127 msgid "-d option is no longer supported. Do not use."
3128 msgstr ""
3129
3078 -#: git-am.sh:474
3130 +#: git-am.sh:481
3131 #, sh-format
3132 msgid "previous rebase directory $dotest still exists but mbox given."
3133 msgstr ""
3134
3083 -#: git-am.sh:479
3135 +#: git-am.sh:486
3136 msgid "Please make up your mind. --skip or --abort?"
3137 msgstr ""
3138
3087 -#: git-am.sh:506
3139 +#: git-am.sh:513
3140 msgid "Resolve operation not in progress, we are not resuming."
3141 msgstr ""
3142
3091 -#: git-am.sh:572
3143 +#: git-am.sh:579
3144 #, sh-format
3145 msgid "Dirty index: cannot apply patches (dirty: $files)"
3146 msgstr ""
3147
3096 -#: git-am.sh:748
3148 +#: git-am.sh:755
3149 msgid "cannot be interactive without stdin connected to a terminal."
3150 msgstr ""
3151
3152 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3153 #. in your translation. The program will only accept English
3154 #. input at this point.
3103 -#: git-am.sh:759
3155 +#: git-am.sh:766
3156 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3157 msgstr ""
3158
3107 -#: git-am.sh:795
3159 +#: git-am.sh:802
3160 #, sh-format
3161 msgid "Applying: $FIRSTLINE"
3162 msgstr ""
3163
3112 -#: git-am.sh:840
3164 +#: git-am.sh:847
3165 msgid "No changes -- Patch already applied."
3166 msgstr ""
3167
3116 -#: git-am.sh:866
3168 +#: git-am.sh:873
3169 msgid "applying to an empty history"
3170 msgstr ""
3171
@@ -3345,161 +3397,161 @@ msgstr ""
3397 msgid "cannot strip one component off url '$remoteurl'"
3398 msgstr ""
3399
3348 -#: git-submodule.sh:108
3400 +#: git-submodule.sh:109
3401 #, sh-format
3350 -msgid "No submodule mapping found in .gitmodules for path '$path'"
3402 +msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
3403 msgstr ""
3404
3353 -#: git-submodule.sh:149
3405 +#: git-submodule.sh:150
3406 #, sh-format
3355 -msgid "Clone of '$url' into submodule path '$path' failed"
3407 +msgid "Clone of '$url' into submodule path '$sm_path' failed"
3408 msgstr ""
3409
3358 -#: git-submodule.sh:159
3410 +#: git-submodule.sh:160
3411 #, sh-format
3412 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3413 msgstr ""
3414
3363 -#: git-submodule.sh:247
3415 +#: git-submodule.sh:249
3416 #, sh-format
3417 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3418 msgstr ""
3419
3368 -#: git-submodule.sh:264
3420 +#: git-submodule.sh:266
3421 #, sh-format
3370 -msgid "'$path' already exists in the index"
3422 +msgid "'$sm_path' already exists in the index"
3423 msgstr ""
3424
3373 -#: git-submodule.sh:281
3425 +#: git-submodule.sh:283
3426 #, sh-format
3375 -msgid "'$path' already exists and is not a valid git repo"
3427 +msgid "'$sm_path' already exists and is not a valid git repo"
3428 msgstr ""
3429
3378 -#: git-submodule.sh:295
3430 +#: git-submodule.sh:297
3431 #, sh-format
3380 -msgid "Unable to checkout submodule '$path'"
3432 +msgid "Unable to checkout submodule '$sm_path'"
3433 msgstr ""
3434
3383 -#: git-submodule.sh:300
3435 +#: git-submodule.sh:302
3436 #, sh-format
3385 -msgid "Failed to add submodule '$path'"
3437 +msgid "Failed to add submodule '$sm_path'"
3438 msgstr ""
3439
3388 -#: git-submodule.sh:305
3440 +#: git-submodule.sh:307
3441 #, sh-format
3390 -msgid "Failed to register submodule '$path'"
3442 +msgid "Failed to register submodule '$sm_path'"
3443 msgstr ""
3444
3393 -#: git-submodule.sh:347
3445 +#: git-submodule.sh:349
3446 #, sh-format
3395 -msgid "Entering '$prefix$path'"
3447 +msgid "Entering '$prefix$sm_path'"
3448 msgstr ""
3449
3398 -#: git-submodule.sh:359
3450 +#: git-submodule.sh:363
3451 #, sh-format
3400 -msgid "Stopping at '$path'; script returned non-zero status."
3452 +msgid "Stopping at '$sm_path'; script returned non-zero status."
3453 msgstr ""
3454
3403 -#: git-submodule.sh:401
3455 +#: git-submodule.sh:405
3456 #, sh-format
3405 -msgid "No url found for submodule path '$path' in .gitmodules"
3457 +msgid "No url found for submodule path '$sm_path' in .gitmodules"
3458 msgstr ""
3459
3408 -#: git-submodule.sh:410
3460 +#: git-submodule.sh:414
3461 #, sh-format
3410 -msgid "Failed to register url for submodule path '$path'"
3462 +msgid "Failed to register url for submodule path '$sm_path'"
3463 msgstr ""
3464
3413 -#: git-submodule.sh:418
3465 +#: git-submodule.sh:422
3466 #, sh-format
3415 -msgid "Failed to register update mode for submodule path '$path'"
3467 +msgid "Failed to register update mode for submodule path '$sm_path'"
3468 msgstr ""
3469
3418 -#: git-submodule.sh:420
3470 +#: git-submodule.sh:424
3471 #, sh-format
3420 -msgid "Submodule '$name' ($url) registered for path '$path'"
3472 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
3473 msgstr ""
3474
3423 -#: git-submodule.sh:519
3475 +#: git-submodule.sh:523
3476 #, sh-format
3477 msgid ""
3426 -"Submodule path '$path' not initialized\n"
3478 +"Submodule path '$sm_path' not initialized\n"
3479 "Maybe you want to use 'update --init'?"
3480 msgstr ""
3481
3430 -#: git-submodule.sh:532
3482 +#: git-submodule.sh:536
3483 #, sh-format
3432 -msgid "Unable to find current revision in submodule path '$path'"
3484 +msgid "Unable to find current revision in submodule path '$sm_path'"
3485 msgstr ""
3486
3435 -#: git-submodule.sh:551
3487 +#: git-submodule.sh:555
3488 #, sh-format
3437 -msgid "Unable to fetch in submodule path '$path'"
3489 +msgid "Unable to fetch in submodule path '$sm_path'"
3490 msgstr ""
3491
3440 -#: git-submodule.sh:565
3492 +#: git-submodule.sh:569
3493 #, sh-format
3442 -msgid "Unable to rebase '$sha1' in submodule path '$path'"
3494 +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
3495 msgstr ""
3496
3445 -#: git-submodule.sh:566
3497 +#: git-submodule.sh:570
3498 #, sh-format
3447 -msgid "Submodule path '$path': rebased into '$sha1'"
3499 +msgid "Submodule path '$sm_path': rebased into '$sha1'"
3500 msgstr ""
3501
3450 -#: git-submodule.sh:571
3502 +#: git-submodule.sh:575
3503 #, sh-format
3452 -msgid "Unable to merge '$sha1' in submodule path '$path'"
3504 +msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
3505 msgstr ""
3506
3455 -#: git-submodule.sh:572
3507 +#: git-submodule.sh:576
3508 #, sh-format
3457 -msgid "Submodule path '$path': merged in '$sha1'"
3509 +msgid "Submodule path '$sm_path': merged in '$sha1'"
3510 msgstr ""
3511
3460 -#: git-submodule.sh:577
3512 +#: git-submodule.sh:581
3513 #, sh-format
3462 -msgid "Unable to checkout '$sha1' in submodule path '$path'"
3514 +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
3515 msgstr ""
3516
3465 -#: git-submodule.sh:578
3517 +#: git-submodule.sh:582
3518 #, sh-format
3467 -msgid "Submodule path '$path': checked out '$sha1'"
3519 +msgid "Submodule path '$sm_path': checked out '$sha1'"
3520 msgstr ""
3521
3470 -#: git-submodule.sh:600 git-submodule.sh:923
3522 +#: git-submodule.sh:604 git-submodule.sh:927
3523 #, sh-format
3472 -msgid "Failed to recurse into submodule path '$path'"
3524 +msgid "Failed to recurse into submodule path '$sm_path'"
3525 msgstr ""
3526
3475 -#: git-submodule.sh:708
3527 +#: git-submodule.sh:712
3528 msgid "--"
3529 msgstr ""
3530
3479 -#: git-submodule.sh:766
3531 +#: git-submodule.sh:770
3532 #, sh-format
3533 msgid " Warn: $name doesn't contain commit $sha1_src"
3534 msgstr ""
3535
3484 -#: git-submodule.sh:769
3536 +#: git-submodule.sh:773
3537 #, sh-format
3538 msgid " Warn: $name doesn't contain commit $sha1_dst"
3539 msgstr ""
3540
3489 -#: git-submodule.sh:772
3541 +#: git-submodule.sh:776
3542 #, sh-format
3543 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3544 msgstr ""
3545
3494 -#: git-submodule.sh:797
3546 +#: git-submodule.sh:801
3547 msgid "blob"
3548 msgstr ""
3549
3498 -#: git-submodule.sh:798
3550 +#: git-submodule.sh:802
3551 msgid "submodule"
3552 msgstr ""
3553
3502 -#: git-submodule.sh:969
3554 +#: git-submodule.sh:973
3555 #, sh-format
3556 msgid "Synchronizing submodule url for '$name'"
3557 msgstr ""