@matheusbsbs / matheus-bagliano / commits / 933297211e

l10n: Update git.pot (8 new, 4 removed messages)

Generate po/git.pot from v1.7.10.2-520-g6a4a48: * 8 new l10n messages at lines: 977, 982, 1404, 1409, 1414, 1419, 1424, 1429. * 4 removed l10n messages from lines: 977, 1399, 1404, 1409. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed May 15, 2012 at 06:43 UTC 933297211e88b80d2a26d89c359158eb7c37ca9d
1 file changed +246 -226
po/git.pot
+246 -226
@@ -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-05-08 16:06+0800\n"
11 +"POT-Creation-Date: 2012-05-15 06:42+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"
@@ -45,7 +45,7 @@ msgstr ""
45 msgid "unrecognized header: %s%s (%d)"
46 msgstr ""
47
48 -#: bundle.c:89 builtin/commit.c:753
48 +#: bundle.c:89 builtin/commit.c:697
49 #, c-format
50 msgid "could not open '%s'"
51 msgstr ""
@@ -557,7 +557,7 @@ msgstr ""
557 msgid "cannot abort from a branch yet to be born"
558 msgstr ""
559
560 -#: sequencer.c:788 builtin/apply.c:3682
560 +#: sequencer.c:788 builtin/apply.c:3689
561 #, c-format
562 msgid "cannot open %s: %s"
563 msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
842 msgid "unexpected diff status %c"
843 msgstr ""
844
845 -#: builtin/add.c:67 builtin/commit.c:282
845 +#: builtin/add.c:67 builtin/commit.c:226
846 msgid "updating files failed"
847 msgstr ""
848
@@ -932,12 +932,12 @@ msgstr ""
932 msgid "Maybe you wanted to say 'git add .'?\n"
933 msgstr ""
934
935 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:342 builtin/mv.c:82
935 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
936 #: builtin/rm.c:162
937 msgid "index file corrupt"
938 msgstr ""
939
940 -#: builtin/add.c:476 builtin/apply.c:4093 builtin/mv.c:229 builtin/rm.c:260
940 +#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
941 msgid "Unable to write new index file"
942 msgstr ""
943
@@ -966,32 +966,37 @@ msgstr ""
966 msgid "unable to find filename in patch at line %d"
967 msgstr ""
968
969 -#: builtin/apply.c:934
969 +#: builtin/apply.c:937
970 #, c-format
971 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
972 msgstr ""
973
974 -#: builtin/apply.c:937
974 +#: builtin/apply.c:941
975 +#, c-format
976 +msgid "git apply: bad git-diff - inconsistent new filename on line %d"
977 +msgstr ""
978 +
979 +#: builtin/apply.c:942
980 #, c-format
976 -msgid "git apply: bad git-diff - inconsistent %s filename on line %d"
981 +msgid "git apply: bad git-diff - inconsistent old filename on line %d"
982 msgstr ""
983
979 -#: builtin/apply.c:944
984 +#: builtin/apply.c:949
985 #, c-format
986 msgid "git apply: bad git-diff - expected /dev/null on line %d"
987 msgstr ""
988
984 -#: builtin/apply.c:1387
989 +#: builtin/apply.c:1394
990 #, c-format
991 msgid "recount: unexpected line: %.*s"
992 msgstr ""
993
989 -#: builtin/apply.c:1444
994 +#: builtin/apply.c:1451
995 #, c-format
996 msgid "patch fragment without header at line %d: %.*s"
997 msgstr ""
998
994 -#: builtin/apply.c:1461
999 +#: builtin/apply.c:1468
1000 #, c-format
1001 msgid ""
1002 "git diff header lacks filename information when removing %d leading pathname "
@@ -1002,278 +1007,278 @@ msgid_plural ""
1007 msgstr[0] ""
1008 msgstr[1] ""
1009
1005 -#: builtin/apply.c:1621
1010 +#: builtin/apply.c:1628
1011 msgid "new file depends on old contents"
1012 msgstr ""
1013
1009 -#: builtin/apply.c:1623
1014 +#: builtin/apply.c:1630
1015 msgid "deleted file still has contents"
1016 msgstr ""
1017
1013 -#: builtin/apply.c:1649
1018 +#: builtin/apply.c:1656
1019 #, c-format
1020 msgid "corrupt patch at line %d"
1021 msgstr ""
1022
1018 -#: builtin/apply.c:1685
1023 +#: builtin/apply.c:1692
1024 #, c-format
1025 msgid "new file %s depends on old contents"
1026 msgstr ""
1027
1023 -#: builtin/apply.c:1687
1028 +#: builtin/apply.c:1694
1029 #, c-format
1030 msgid "deleted file %s still has contents"
1031 msgstr ""
1032
1028 -#: builtin/apply.c:1690
1033 +#: builtin/apply.c:1697
1034 #, c-format
1035 msgid "** warning: file %s becomes empty but is not deleted"
1036 msgstr ""
1037
1033 -#: builtin/apply.c:1836
1038 +#: builtin/apply.c:1843
1039 #, c-format
1040 msgid "corrupt binary patch at line %d: %.*s"
1041 msgstr ""
1042
1043 #. there has to be one hunk (forward hunk)
1039 -#: builtin/apply.c:1865
1044 +#: builtin/apply.c:1872
1045 #, c-format
1046 msgid "unrecognized binary patch at line %d"
1047 msgstr ""
1048
1044 -#: builtin/apply.c:1951
1049 +#: builtin/apply.c:1958
1050 #, c-format
1051 msgid "patch with only garbage at line %d"
1052 msgstr ""
1053
1049 -#: builtin/apply.c:2041
1054 +#: builtin/apply.c:2048
1055 #, c-format
1056 msgid "unable to read symlink %s"
1057 msgstr ""
1058
1054 -#: builtin/apply.c:2045
1059 +#: builtin/apply.c:2052
1060 #, c-format
1061 msgid "unable to open or read %s"
1062 msgstr ""
1063
1059 -#: builtin/apply.c:2116
1064 +#: builtin/apply.c:2123
1065 msgid "oops"
1066 msgstr ""
1067
1063 -#: builtin/apply.c:2638
1068 +#: builtin/apply.c:2645
1069 #, c-format
1070 msgid "invalid start of line: '%c'"
1071 msgstr ""
1072
1068 -#: builtin/apply.c:2756
1073 +#: builtin/apply.c:2763
1074 #, c-format
1075 msgid "Hunk #%d succeeded at %d (offset %d line)."
1076 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1077 msgstr[0] ""
1078 msgstr[1] ""
1079
1075 -#: builtin/apply.c:2768
1080 +#: builtin/apply.c:2775
1081 #, c-format
1082 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1083 msgstr ""
1084
1080 -#: builtin/apply.c:2774
1085 +#: builtin/apply.c:2781
1086 #, c-format
1087 msgid ""
1088 "while searching for:\n"
1089 "%.*s"
1090 msgstr ""
1091
1087 -#: builtin/apply.c:2793
1092 +#: builtin/apply.c:2800
1093 #, c-format
1094 msgid "missing binary patch data for '%s'"
1095 msgstr ""
1096
1092 -#: builtin/apply.c:2896
1097 +#: builtin/apply.c:2903
1098 #, c-format
1099 msgid "binary patch does not apply to '%s'"
1100 msgstr ""
1101
1097 -#: builtin/apply.c:2902
1102 +#: builtin/apply.c:2909
1103 #, c-format
1104 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1105 msgstr ""
1106
1102 -#: builtin/apply.c:2923
1107 +#: builtin/apply.c:2930
1108 #, c-format
1109 msgid "patch failed: %s:%ld"
1110 msgstr ""
1111
1107 -#: builtin/apply.c:3038
1112 +#: builtin/apply.c:3045
1113 #, c-format
1114 msgid "patch %s has been renamed/deleted"
1115 msgstr ""
1116
1112 -#: builtin/apply.c:3045 builtin/apply.c:3062
1117 +#: builtin/apply.c:3052 builtin/apply.c:3069
1118 #, c-format
1119 msgid "read of %s failed"
1120 msgstr ""
1121
1117 -#: builtin/apply.c:3077
1122 +#: builtin/apply.c:3084
1123 msgid "removal patch leaves file contents"
1124 msgstr ""
1125
1121 -#: builtin/apply.c:3098
1126 +#: builtin/apply.c:3105
1127 #, c-format
1128 msgid "%s: already exists in working directory"
1129 msgstr ""
1130
1126 -#: builtin/apply.c:3136
1131 +#: builtin/apply.c:3143
1132 #, c-format
1133 msgid "%s: has been deleted/renamed"
1134 msgstr ""
1135
1131 -#: builtin/apply.c:3141 builtin/apply.c:3172
1136 +#: builtin/apply.c:3148 builtin/apply.c:3179
1137 #, c-format
1138 msgid "%s: %s"
1139 msgstr ""
1140
1136 -#: builtin/apply.c:3152
1141 +#: builtin/apply.c:3159
1142 #, c-format
1143 msgid "%s: does not exist in index"
1144 msgstr ""
1145
1141 -#: builtin/apply.c:3166
1146 +#: builtin/apply.c:3173
1147 #, c-format
1148 msgid "%s: does not match index"
1149 msgstr ""
1150
1146 -#: builtin/apply.c:3183
1151 +#: builtin/apply.c:3190
1152 #, c-format
1153 msgid "%s: wrong type"
1154 msgstr ""
1155
1151 -#: builtin/apply.c:3185
1156 +#: builtin/apply.c:3192
1157 #, c-format
1158 msgid "%s has type %o, expected %o"
1159 msgstr ""
1160
1156 -#: builtin/apply.c:3240
1161 +#: builtin/apply.c:3247
1162 #, c-format
1163 msgid "%s: already exists in index"
1164 msgstr ""
1165
1161 -#: builtin/apply.c:3259
1166 +#: builtin/apply.c:3266
1167 #, c-format
1168 msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1169 msgstr ""
1170
1166 -#: builtin/apply.c:3265
1171 +#: builtin/apply.c:3272
1172 #, c-format
1173 msgid "%s: patch does not apply"
1174 msgstr ""
1175
1171 -#: builtin/apply.c:3278
1176 +#: builtin/apply.c:3285
1177 #, c-format
1178 msgid "Checking patch %s..."
1179 msgstr ""
1180
1176 -#: builtin/apply.c:3333 builtin/checkout.c:212 builtin/reset.c:158
1181 +#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
1182 #, c-format
1183 msgid "make_cache_entry failed for path '%s'"
1184 msgstr ""
1185
1181 -#: builtin/apply.c:3476
1186 +#: builtin/apply.c:3483
1187 #, c-format
1188 msgid "unable to remove %s from index"
1189 msgstr ""
1190
1186 -#: builtin/apply.c:3503
1191 +#: builtin/apply.c:3510
1192 #, c-format
1193 msgid "corrupt patch for subproject %s"
1194 msgstr ""
1195
1191 -#: builtin/apply.c:3507
1196 +#: builtin/apply.c:3514
1197 #, c-format
1198 msgid "unable to stat newly created file '%s'"
1199 msgstr ""
1200
1196 -#: builtin/apply.c:3512
1201 +#: builtin/apply.c:3519
1202 #, c-format
1203 msgid "unable to create backing store for newly created file %s"
1204 msgstr ""
1205
1201 -#: builtin/apply.c:3515
1206 +#: builtin/apply.c:3522
1207 #, c-format
1208 msgid "unable to add cache entry for %s"
1209 msgstr ""
1210
1206 -#: builtin/apply.c:3548
1211 +#: builtin/apply.c:3555
1212 #, c-format
1213 msgid "closing file '%s'"
1214 msgstr ""
1215
1211 -#: builtin/apply.c:3597
1216 +#: builtin/apply.c:3604
1217 #, c-format
1218 msgid "unable to write file '%s' mode %o"
1219 msgstr ""
1220
1216 -#: builtin/apply.c:3653
1221 +#: builtin/apply.c:3660
1222 #, c-format
1223 msgid "Applied patch %s cleanly."
1224 msgstr ""
1225
1221 -#: builtin/apply.c:3661
1226 +#: builtin/apply.c:3668
1227 msgid "internal error"
1228 msgstr ""
1229
1230 #. Say this even without --verbose
1226 -#: builtin/apply.c:3664
1231 +#: builtin/apply.c:3671
1232 #, c-format
1233 msgid "Applying patch %%s with %d reject..."
1234 msgid_plural "Applying patch %%s with %d rejects..."
1235 msgstr[0] ""
1236 msgstr[1] ""
1237
1233 -#: builtin/apply.c:3674
1238 +#: builtin/apply.c:3681
1239 #, c-format
1240 msgid "truncating .rej filename to %.*s.rej"
1241 msgstr ""
1242
1238 -#: builtin/apply.c:3695
1243 +#: builtin/apply.c:3702
1244 #, c-format
1245 msgid "Hunk #%d applied cleanly."
1246 msgstr ""
1247
1243 -#: builtin/apply.c:3698
1248 +#: builtin/apply.c:3705
1249 #, c-format
1250 msgid "Rejected hunk #%d."
1251 msgstr ""
1252
1248 -#: builtin/apply.c:3829
1253 +#: builtin/apply.c:3836
1254 msgid "unrecognized input"
1255 msgstr ""
1256
1252 -#: builtin/apply.c:3840
1257 +#: builtin/apply.c:3847
1258 msgid "unable to read index file"
1259 msgstr ""
1260
1256 -#: builtin/apply.c:4035
1261 +#: builtin/apply.c:4042
1262 msgid "--index outside a repository"
1263 msgstr ""
1264
1260 -#: builtin/apply.c:4038
1265 +#: builtin/apply.c:4045
1266 msgid "--cached outside a repository"
1267 msgstr ""
1268
1264 -#: builtin/apply.c:4054
1269 +#: builtin/apply.c:4061
1270 #, c-format
1271 msgid "can't open patch '%s'"
1272 msgstr ""
1273
1269 -#: builtin/apply.c:4068
1274 +#: builtin/apply.c:4075
1275 #, c-format
1276 msgid "squelched %d whitespace error"
1277 msgid_plural "squelched %d whitespace errors"
1278 msgstr[0] ""
1279 msgstr[1] ""
1280
1276 -#: builtin/apply.c:4074 builtin/apply.c:4084
1281 +#: builtin/apply.c:4081 builtin/apply.c:4091
1282 #, c-format
1283 msgid "%d line adds whitespace errors."
1284 msgid_plural "%d lines add whitespace errors."
@@ -1395,77 +1400,92 @@ msgstr ""
1400
1401 #: builtin/branch.c:409
1402 #, c-format
1398 -msgid "behind %d] "
1403 +msgid "[%s: behind %d]"
1404 msgstr ""
1405
1406 #: builtin/branch.c:411
1407 #, c-format
1403 -msgid "ahead %d] "
1408 +msgid "[behind %d]"
1409 +msgstr ""
1410 +
1411 +#: builtin/branch.c:415
1412 +#, c-format
1413 +msgid "[%s: ahead %d]"
1414 +msgstr ""
1415 +
1416 +#: builtin/branch.c:417
1417 +#, c-format
1418 +msgid "[ahead %d]"
1419 msgstr ""
1420
1406 -#: builtin/branch.c:413
1421 +#: builtin/branch.c:420
1422 #, c-format
1408 -msgid "ahead %d, behind %d] "
1423 +msgid "[%s: ahead %d, behind %d]"
1424 msgstr ""
1425
1411 -#: builtin/branch.c:521
1426 +#: builtin/branch.c:423
1427 +#, c-format
1428 +msgid "[ahead %d, behind %d]"
1429 +msgstr ""
1430 +
1431 +#: builtin/branch.c:535
1432 msgid "(no branch)"
1433 msgstr ""
1434
1415 -#: builtin/branch.c:586
1435 +#: builtin/branch.c:600
1436 msgid "some refs could not be read"
1437 msgstr ""
1438
1419 -#: builtin/branch.c:599
1439 +#: builtin/branch.c:613
1440 msgid "cannot rename the current branch while not on any."
1441 msgstr ""
1442
1423 -#: builtin/branch.c:609
1443 +#: builtin/branch.c:623
1444 #, c-format
1445 msgid "Invalid branch name: '%s'"
1446 msgstr ""
1447
1428 -#: builtin/branch.c:624
1448 +#: builtin/branch.c:638
1449 msgid "Branch rename failed"
1450 msgstr ""
1451
1432 -#: builtin/branch.c:628
1452 +#: builtin/branch.c:642
1453 #, c-format
1454 msgid "Renamed a misnamed branch '%s' away"
1455 msgstr ""
1456
1437 -#: builtin/branch.c:632
1457 +#: builtin/branch.c:646
1458 #, c-format
1459 msgid "Branch renamed to %s, but HEAD is not updated!"
1460 msgstr ""
1461
1442 -#: builtin/branch.c:639
1462 +#: builtin/branch.c:653
1463 msgid "Branch is renamed, but update of config-file failed"
1464 msgstr ""
1465
1446 -#: builtin/branch.c:654
1466 +#: builtin/branch.c:668
1467 #, c-format
1468 msgid "malformed object name %s"
1469 msgstr ""
1470
1451 -#: builtin/branch.c:678
1471 +#: builtin/branch.c:692
1472 #, c-format
1473 msgid "could not write branch description template: %s"
1474 msgstr ""
1475
1456 -#: builtin/branch.c:769
1476 +#: builtin/branch.c:783
1477 msgid "Failed to resolve HEAD as a valid ref."
1478 msgstr ""
1479
1460 -#: builtin/branch.c:774 builtin/clone.c:558
1480 +#: builtin/branch.c:788 builtin/clone.c:558
1481 msgid "HEAD not found below refs/heads!"
1482 msgstr ""
1483
1464 -#: builtin/branch.c:794
1484 +#: builtin/branch.c:808
1485 msgid "--column and --verbose are incompatible"
1486 msgstr ""
1487
1468 -#: builtin/branch.c:843
1488 +#: builtin/branch.c:857
1489 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1490 msgstr ""
1491
@@ -1599,96 +1619,96 @@ msgid ""
1619 "\n"
1620 msgstr ""
1621
1602 -#: builtin/checkout.c:693
1622 +#: builtin/checkout.c:694
1623 msgid "internal error in revision walk"
1624 msgstr ""
1625
1606 -#: builtin/checkout.c:697
1626 +#: builtin/checkout.c:698
1627 msgid "Previous HEAD position was"
1628 msgstr ""
1629
1610 -#: builtin/checkout.c:723
1630 +#: builtin/checkout.c:724
1631 msgid "You are on a branch yet to be born"
1632 msgstr ""
1633
1634 #. case (1)
1615 -#: builtin/checkout.c:854
1635 +#: builtin/checkout.c:855
1636 #, c-format
1637 msgid "invalid reference: %s"
1638 msgstr ""
1639
1640 #. case (1): want a tree
1621 -#: builtin/checkout.c:893
1641 +#: builtin/checkout.c:894
1642 #, c-format
1643 msgid "reference is not a tree: %s"
1644 msgstr ""
1645
1626 -#: builtin/checkout.c:973
1646 +#: builtin/checkout.c:974
1647 msgid "-B cannot be used with -b"
1648 msgstr ""
1649
1630 -#: builtin/checkout.c:982
1650 +#: builtin/checkout.c:983
1651 msgid "--patch is incompatible with all other options"
1652 msgstr ""
1653
1634 -#: builtin/checkout.c:985
1654 +#: builtin/checkout.c:986
1655 msgid "--detach cannot be used with -b/-B/--orphan"
1656 msgstr ""
1657
1638 -#: builtin/checkout.c:987
1658 +#: builtin/checkout.c:988
1659 msgid "--detach cannot be used with -t"
1660 msgstr ""
1661
1642 -#: builtin/checkout.c:993
1662 +#: builtin/checkout.c:994
1663 msgid "--track needs a branch name"
1664 msgstr ""
1665
1646 -#: builtin/checkout.c:1000
1666 +#: builtin/checkout.c:1001
1667 msgid "Missing branch name; try -b"
1668 msgstr ""
1669
1650 -#: builtin/checkout.c:1006
1670 +#: builtin/checkout.c:1007
1671 msgid "--orphan and -b|-B are mutually exclusive"
1672 msgstr ""
1673
1654 -#: builtin/checkout.c:1008
1674 +#: builtin/checkout.c:1009
1675 msgid "--orphan cannot be used with -t"
1676 msgstr ""
1677
1658 -#: builtin/checkout.c:1018
1678 +#: builtin/checkout.c:1019
1679 msgid "git checkout: -f and -m are incompatible"
1680 msgstr ""
1681
1662 -#: builtin/checkout.c:1052
1682 +#: builtin/checkout.c:1053
1683 msgid "invalid path specification"
1684 msgstr ""
1685
1666 -#: builtin/checkout.c:1060
1686 +#: builtin/checkout.c:1061
1687 #, c-format
1688 msgid ""
1689 "git checkout: updating paths is incompatible with switching branches.\n"
1690 "Did you intend to checkout '%s' which can not be resolved as commit?"
1691 msgstr ""
1692
1673 -#: builtin/checkout.c:1062
1693 +#: builtin/checkout.c:1063
1694 msgid "git checkout: updating paths is incompatible with switching branches."
1695 msgstr ""
1696
1677 -#: builtin/checkout.c:1067
1697 +#: builtin/checkout.c:1068
1698 msgid "git checkout: --detach does not take a path argument"
1699 msgstr ""
1700
1681 -#: builtin/checkout.c:1070
1701 +#: builtin/checkout.c:1071
1702 msgid ""
1703 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1704 "checking out of the index."
1705 msgstr ""
1706
1687 -#: builtin/checkout.c:1089
1707 +#: builtin/checkout.c:1090
1708 msgid "Cannot switch branch to a non-commit."
1709 msgstr ""
1710
1691 -#: builtin/checkout.c:1092
1711 +#: builtin/checkout.c:1093
1712 msgid "--ours/--theirs is incompatible with switching branches."
1713 msgstr ""
1714
@@ -1892,93 +1912,93 @@ msgid ""
1912 "Otherwise, please use 'git reset'\n"
1913 msgstr ""
1914
1895 -#: builtin/commit.c:309
1915 +#: builtin/commit.c:253
1916 msgid "failed to unpack HEAD tree object"
1917 msgstr ""
1918
1899 -#: builtin/commit.c:351
1919 +#: builtin/commit.c:295
1920 msgid "unable to create temporary index"
1921 msgstr ""
1922
1903 -#: builtin/commit.c:357
1923 +#: builtin/commit.c:301
1924 msgid "interactive add failed"
1925 msgstr ""
1926
1907 -#: builtin/commit.c:390 builtin/commit.c:411 builtin/commit.c:461
1927 +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
1928 msgid "unable to write new_index file"
1929 msgstr ""
1930
1911 -#: builtin/commit.c:442
1931 +#: builtin/commit.c:386
1932 msgid "cannot do a partial commit during a merge."
1933 msgstr ""
1934
1915 -#: builtin/commit.c:444
1935 +#: builtin/commit.c:388
1936 msgid "cannot do a partial commit during a cherry-pick."
1937 msgstr ""
1938
1919 -#: builtin/commit.c:454
1939 +#: builtin/commit.c:398
1940 msgid "cannot read the index"
1941 msgstr ""
1942
1923 -#: builtin/commit.c:474
1943 +#: builtin/commit.c:418
1944 msgid "unable to write temporary index file"
1945 msgstr ""
1946
1927 -#: builtin/commit.c:549 builtin/commit.c:555
1947 +#: builtin/commit.c:493 builtin/commit.c:499
1948 #, c-format
1949 msgid "invalid commit: %s"
1950 msgstr ""
1951
1932 -#: builtin/commit.c:578
1952 +#: builtin/commit.c:522
1953 msgid "malformed --author parameter"
1954 msgstr ""
1955
1936 -#: builtin/commit.c:639
1956 +#: builtin/commit.c:583
1957 #, c-format
1958 msgid "Malformed ident string: '%s'"
1959 msgstr ""
1960
1941 -#: builtin/commit.c:677 builtin/commit.c:710 builtin/commit.c:1024
1961 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968
1962 #, c-format
1963 msgid "could not lookup commit %s"
1964 msgstr ""
1965
1946 -#: builtin/commit.c:689 builtin/shortlog.c:296
1966 +#: builtin/commit.c:633 builtin/shortlog.c:296
1967 #, c-format
1968 msgid "(reading log message from standard input)\n"
1969 msgstr ""
1970
1951 -#: builtin/commit.c:691
1971 +#: builtin/commit.c:635
1972 msgid "could not read log from standard input"
1973 msgstr ""
1974
1955 -#: builtin/commit.c:695
1975 +#: builtin/commit.c:639
1976 #, c-format
1977 msgid "could not read log file '%s'"
1978 msgstr ""
1979
1960 -#: builtin/commit.c:701
1980 +#: builtin/commit.c:645
1981 msgid "commit has empty message"
1982 msgstr ""
1983
1964 -#: builtin/commit.c:717
1984 +#: builtin/commit.c:661
1985 msgid "could not read MERGE_MSG"
1986 msgstr ""
1987
1968 -#: builtin/commit.c:721
1988 +#: builtin/commit.c:665
1989 msgid "could not read SQUASH_MSG"
1990 msgstr ""
1991
1972 -#: builtin/commit.c:725
1992 +#: builtin/commit.c:669
1993 #, c-format
1994 msgid "could not read '%s'"
1995 msgstr ""
1996
1977 -#: builtin/commit.c:777
1997 +#: builtin/commit.c:721
1998 msgid "could not write commit template"
1999 msgstr ""
2000
1981 -#: builtin/commit.c:788
2001 +#: builtin/commit.c:732
2002 #, c-format
2003 msgid ""
2004 "\n"
@@ -1988,7 +2008,7 @@ msgid ""
2008 "and try again.\n"
2009 msgstr ""
2010
1991 -#: builtin/commit.c:793
2011 +#: builtin/commit.c:737
2012 #, c-format
2013 msgid ""
2014 "\n"
@@ -1998,171 +2018,171 @@ msgid ""
2018 "and try again.\n"
2019 msgstr ""
2020
2001 -#: builtin/commit.c:805
2021 +#: builtin/commit.c:749
2022 msgid ""
2023 "Please enter the commit message for your changes. Lines starting\n"
2024 "with '#' will be ignored, and an empty message aborts the commit.\n"
2025 msgstr ""
2026
2007 -#: builtin/commit.c:810
2027 +#: builtin/commit.c:754
2028 msgid ""
2029 "Please enter the commit message for your changes. Lines starting\n"
2030 "with '#' will be kept; you may remove them yourself if you want to.\n"
2031 "An empty message aborts the commit.\n"
2032 msgstr ""
2033
2014 -#: builtin/commit.c:823
2034 +#: builtin/commit.c:767
2035 #, c-format
2036 msgid "%sAuthor: %s"
2037 msgstr ""
2038
2019 -#: builtin/commit.c:830
2039 +#: builtin/commit.c:774
2040 #, c-format
2041 msgid "%sCommitter: %s"
2042 msgstr ""
2043
2024 -#: builtin/commit.c:850
2044 +#: builtin/commit.c:794
2045 msgid "Cannot read index"
2046 msgstr ""
2047
2028 -#: builtin/commit.c:887
2048 +#: builtin/commit.c:831
2049 msgid "Error building trees"
2050 msgstr ""
2051
2032 -#: builtin/commit.c:902 builtin/tag.c:361
2052 +#: builtin/commit.c:846 builtin/tag.c:361
2053 #, c-format
2054 msgid "Please supply the message using either -m or -F option.\n"
2055 msgstr ""
2056
2037 -#: builtin/commit.c:999
2057 +#: builtin/commit.c:943
2058 #, c-format
2059 msgid "No existing author found with '%s'"
2060 msgstr ""
2061
2042 -#: builtin/commit.c:1014 builtin/commit.c:1214
2062 +#: builtin/commit.c:958 builtin/commit.c:1158
2063 #, c-format
2064 msgid "Invalid untracked files mode '%s'"
2065 msgstr ""
2066
2047 -#: builtin/commit.c:1054
2067 +#: builtin/commit.c:998
2068 msgid "Using both --reset-author and --author does not make sense"
2069 msgstr ""
2070
2051 -#: builtin/commit.c:1065
2071 +#: builtin/commit.c:1009
2072 msgid "You have nothing to amend."
2073 msgstr ""
2074
2055 -#: builtin/commit.c:1068
2075 +#: builtin/commit.c:1012
2076 msgid "You are in the middle of a merge -- cannot amend."
2077 msgstr ""
2078
2059 -#: builtin/commit.c:1070
2079 +#: builtin/commit.c:1014
2080 msgid "You are in the middle of a cherry-pick -- cannot amend."
2081 msgstr ""
2082
2063 -#: builtin/commit.c:1073
2083 +#: builtin/commit.c:1017
2084 msgid "Options --squash and --fixup cannot be used together"
2085 msgstr ""
2086
2067 -#: builtin/commit.c:1083
2087 +#: builtin/commit.c:1027
2088 msgid "Only one of -c/-C/-F/--fixup can be used."
2089 msgstr ""
2090
2071 -#: builtin/commit.c:1085
2091 +#: builtin/commit.c:1029
2092 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2093 msgstr ""
2094
2075 -#: builtin/commit.c:1093
2095 +#: builtin/commit.c:1037
2096 msgid "--reset-author can be used only with -C, -c or --amend."
2097 msgstr ""
2098
2079 -#: builtin/commit.c:1110
2099 +#: builtin/commit.c:1054
2100 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2101 msgstr ""
2102
2083 -#: builtin/commit.c:1112
2103 +#: builtin/commit.c:1056
2104 msgid "No paths with --include/--only does not make sense."
2105 msgstr ""
2106
2087 -#: builtin/commit.c:1114
2107 +#: builtin/commit.c:1058
2108 msgid "Clever... amending the last one with dirty index."
2109 msgstr ""
2110
2091 -#: builtin/commit.c:1116
2111 +#: builtin/commit.c:1060
2112 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2113 msgstr ""
2114
2095 -#: builtin/commit.c:1126 builtin/tag.c:577
2115 +#: builtin/commit.c:1070 builtin/tag.c:577
2116 #, c-format
2117 msgid "Invalid cleanup mode %s"
2118 msgstr ""
2119
2100 -#: builtin/commit.c:1131
2120 +#: builtin/commit.c:1075
2121 msgid "Paths with -a does not make sense."
2122 msgstr ""
2123
2104 -#: builtin/commit.c:1315
2124 +#: builtin/commit.c:1258
2125 msgid "couldn't look up newly created commit"
2126 msgstr ""
2127
2108 -#: builtin/commit.c:1317
2128 +#: builtin/commit.c:1260
2129 msgid "could not parse newly created commit"
2130 msgstr ""
2131
2112 -#: builtin/commit.c:1358
2132 +#: builtin/commit.c:1301
2133 msgid "detached HEAD"
2134 msgstr ""
2135
2116 -#: builtin/commit.c:1360
2136 +#: builtin/commit.c:1303
2137 msgid " (root-commit)"
2138 msgstr ""
2139
2120 -#: builtin/commit.c:1450
2140 +#: builtin/commit.c:1447
2141 msgid "could not parse HEAD commit"
2142 msgstr ""
2143
2124 -#: builtin/commit.c:1487 builtin/merge.c:509
2144 +#: builtin/commit.c:1485 builtin/merge.c:509
2145 #, c-format
2146 msgid "could not open '%s' for reading"
2147 msgstr ""
2148
2129 -#: builtin/commit.c:1494
2149 +#: builtin/commit.c:1492
2150 #, c-format
2151 msgid "Corrupt MERGE_HEAD file (%s)"
2152 msgstr ""
2153
2134 -#: builtin/commit.c:1501
2154 +#: builtin/commit.c:1499
2155 msgid "could not read MERGE_MODE"
2156 msgstr ""
2157
2138 -#: builtin/commit.c:1520
2158 +#: builtin/commit.c:1518
2159 #, c-format
2160 msgid "could not read commit message: %s"
2161 msgstr ""
2162
2143 -#: builtin/commit.c:1534
2163 +#: builtin/commit.c:1532
2164 #, c-format
2165 msgid "Aborting commit; you did not edit the message.\n"
2166 msgstr ""
2167
2148 -#: builtin/commit.c:1539
2168 +#: builtin/commit.c:1537
2169 #, c-format
2170 msgid "Aborting commit due to empty commit message.\n"
2171 msgstr ""
2172
2153 -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2173 +#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961
2174 msgid "failed to write commit object"
2175 msgstr ""
2176
2157 -#: builtin/commit.c:1575
2177 +#: builtin/commit.c:1573
2178 msgid "cannot lock HEAD ref"
2179 msgstr ""
2180
2161 -#: builtin/commit.c:1579
2181 +#: builtin/commit.c:1577
2182 msgid "cannot update HEAD ref"
2183 msgstr ""
2184
2165 -#: builtin/commit.c:1590
2185 +#: builtin/commit.c:1588
2186 msgid ""
2187 "Repository has been updated, but unable to write\n"
2188 "new_index file. Check that disk is not full or quota is\n"
@@ -2587,237 +2607,237 @@ msgstr ""
2607 msgid "`git %s' is aliased to `%s'"
2608 msgstr ""
2609
2590 -#: builtin/index-pack.c:84
2610 +#: builtin/index-pack.c:169
2611 #, c-format
2612 msgid "object type mismatch at %s"
2613 msgstr ""
2614
2595 -#: builtin/index-pack.c:104
2615 +#: builtin/index-pack.c:189
2616 msgid "object of unexpected type"
2617 msgstr ""
2618
2599 -#: builtin/index-pack.c:141
2619 +#: builtin/index-pack.c:226
2620 #, c-format
2621 msgid "cannot fill %d byte"
2622 msgid_plural "cannot fill %d bytes"
2623 msgstr[0] ""
2624 msgstr[1] ""
2625
2606 -#: builtin/index-pack.c:151
2626 +#: builtin/index-pack.c:236
2627 msgid "early EOF"
2628 msgstr ""
2629
2610 -#: builtin/index-pack.c:152
2630 +#: builtin/index-pack.c:237
2631 msgid "read error on input"
2632 msgstr ""
2633
2614 -#: builtin/index-pack.c:164
2634 +#: builtin/index-pack.c:249
2635 msgid "used more bytes than were available"
2636 msgstr ""
2637
2618 -#: builtin/index-pack.c:171
2638 +#: builtin/index-pack.c:256
2639 msgid "pack too large for current definition of off_t"
2640 msgstr ""
2641
2622 -#: builtin/index-pack.c:187
2642 +#: builtin/index-pack.c:272
2643 #, c-format
2644 msgid "unable to create '%s'"
2645 msgstr ""
2646
2627 -#: builtin/index-pack.c:192
2647 +#: builtin/index-pack.c:277
2648 #, c-format
2649 msgid "cannot open packfile '%s'"
2650 msgstr ""
2651
2632 -#: builtin/index-pack.c:206
2652 +#: builtin/index-pack.c:291
2653 msgid "pack signature mismatch"
2654 msgstr ""
2655
2636 -#: builtin/index-pack.c:226
2656 +#: builtin/index-pack.c:311
2657 #, c-format
2658 msgid "pack has bad object at offset %lu: %s"
2659 msgstr ""
2660
2641 -#: builtin/index-pack.c:300
2661 +#: builtin/index-pack.c:405
2662 #, c-format
2663 msgid "inflate returned %d"
2664 msgstr ""
2665
2646 -#: builtin/index-pack.c:345
2666 +#: builtin/index-pack.c:450
2667 msgid "offset value overflow for delta base object"
2668 msgstr ""
2669
2650 -#: builtin/index-pack.c:353
2670 +#: builtin/index-pack.c:458
2671 msgid "delta base offset is out of bound"
2672 msgstr ""
2673
2654 -#: builtin/index-pack.c:361
2674 +#: builtin/index-pack.c:466
2675 #, c-format
2676 msgid "unknown object type %d"
2677 msgstr ""
2678
2659 -#: builtin/index-pack.c:390
2679 +#: builtin/index-pack.c:495
2680 msgid "cannot pread pack file"
2681 msgstr ""
2682
2663 -#: builtin/index-pack.c:392
2683 +#: builtin/index-pack.c:497
2684 #, c-format
2685 msgid "premature end of pack file, %lu byte missing"
2686 msgid_plural "premature end of pack file, %lu bytes missing"
2687 msgstr[0] ""
2688 msgstr[1] ""
2689
2670 -#: builtin/index-pack.c:405
2690 +#: builtin/index-pack.c:510
2691 msgid "serious inflate inconsistency"
2692 msgstr ""
2693
2674 -#: builtin/index-pack.c:476
2694 +#: builtin/index-pack.c:583
2695 #, c-format
2696 msgid "cannot read existing object %s"
2697 msgstr ""
2698
2679 -#: builtin/index-pack.c:479
2699 +#: builtin/index-pack.c:586
2700 #, c-format
2701 msgid "SHA1 COLLISION FOUND WITH %s !"
2702 msgstr ""
2703
2684 -#: builtin/index-pack.c:488
2704 +#: builtin/index-pack.c:598
2705 #, c-format
2706 msgid "invalid blob object %s"
2707 msgstr ""
2708
2689 -#: builtin/index-pack.c:500
2709 +#: builtin/index-pack.c:610
2710 #, c-format
2711 msgid "invalid %s"
2712 msgstr ""
2713
2694 -#: builtin/index-pack.c:502
2714 +#: builtin/index-pack.c:612
2715 msgid "Error in object"
2716 msgstr ""
2717
2698 -#: builtin/index-pack.c:504
2718 +#: builtin/index-pack.c:614
2719 #, c-format
2720 msgid "Not all child objects of %s are reachable"
2721 msgstr ""
2722
2703 -#: builtin/index-pack.c:576 builtin/index-pack.c:602
2723 +#: builtin/index-pack.c:687 builtin/index-pack.c:713
2724 msgid "failed to apply delta"
2725 msgstr ""
2726
2707 -#: builtin/index-pack.c:706
2727 +#: builtin/index-pack.c:850
2728 msgid "Receiving objects"
2729 msgstr ""
2730
2711 -#: builtin/index-pack.c:706
2731 +#: builtin/index-pack.c:850
2732 msgid "Indexing objects"
2733 msgstr ""
2734
2715 -#: builtin/index-pack.c:728
2735 +#: builtin/index-pack.c:872
2736 msgid "pack is corrupted (SHA1 mismatch)"
2737 msgstr ""
2738
2719 -#: builtin/index-pack.c:733
2739 +#: builtin/index-pack.c:877
2740 msgid "cannot fstat packfile"
2741 msgstr ""
2742
2723 -#: builtin/index-pack.c:736
2743 +#: builtin/index-pack.c:880
2744 msgid "pack has junk at the end"
2745 msgstr ""
2746
2727 -#: builtin/index-pack.c:754
2747 +#: builtin/index-pack.c:903
2748 msgid "Resolving deltas"
2749 msgstr ""
2750
2731 -#: builtin/index-pack.c:787
2751 +#: builtin/index-pack.c:954
2752 +msgid "confusion beyond insanity"
2753 +msgstr ""
2754 +
2755 +#: builtin/index-pack.c:973
2756 +#, c-format
2757 +msgid "pack has %d unresolved delta"
2758 +msgid_plural "pack has %d unresolved deltas"
2759 +msgstr[0] ""
2760 +msgstr[1] ""
2761 +
2762 +#: builtin/index-pack.c:998
2763 #, c-format
2764 msgid "unable to deflate appended object (%d)"
2765 msgstr ""
2766
2736 -#: builtin/index-pack.c:866
2767 +#: builtin/index-pack.c:1077
2768 #, c-format
2769 msgid "local object %s is corrupt"
2770 msgstr ""
2771
2741 -#: builtin/index-pack.c:890
2772 +#: builtin/index-pack.c:1101
2773 msgid "error while closing pack file"
2774 msgstr ""
2775
2745 -#: builtin/index-pack.c:903
2776 +#: builtin/index-pack.c:1114
2777 #, c-format
2778 msgid "cannot write keep file '%s'"
2779 msgstr ""
2780
2750 -#: builtin/index-pack.c:911
2781 +#: builtin/index-pack.c:1122
2782 #, c-format
2783 msgid "cannot close written keep file '%s'"
2784 msgstr ""
2785
2755 -#: builtin/index-pack.c:924
2786 +#: builtin/index-pack.c:1135
2787 msgid "cannot store pack file"
2788 msgstr ""
2789
2759 -#: builtin/index-pack.c:935
2790 +#: builtin/index-pack.c:1146
2791 msgid "cannot store index file"
2792 msgstr ""
2793
2763 -#: builtin/index-pack.c:1024
2794 +#: builtin/index-pack.c:1247
2795 #, c-format
2796 msgid "Cannot open existing pack file '%s'"
2797 msgstr ""
2798
2768 -#: builtin/index-pack.c:1026
2799 +#: builtin/index-pack.c:1249
2800 #, c-format
2801 msgid "Cannot open existing pack idx file for '%s'"
2802 msgstr ""
2803
2773 -#: builtin/index-pack.c:1073
2804 +#: builtin/index-pack.c:1296
2805 #, c-format
2806 msgid "non delta: %d object"
2807 msgid_plural "non delta: %d objects"
2808 msgstr[0] ""
2809 msgstr[1] ""
2810
2780 -#: builtin/index-pack.c:1080
2811 +#: builtin/index-pack.c:1303
2812 #, c-format
2813 msgid "chain length = %d: %lu object"
2814 msgid_plural "chain length = %d: %lu objects"
2815 msgstr[0] ""
2816 msgstr[1] ""
2817
2787 -#: builtin/index-pack.c:1107
2818 +#: builtin/index-pack.c:1330
2819 msgid "Cannot come back to cwd"
2820 msgstr ""
2821
2791 -#: builtin/index-pack.c:1140 builtin/index-pack.c:1143
2792 -#: builtin/index-pack.c:1155 builtin/index-pack.c:1159
2822 +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
2823 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
2824 #, c-format
2825 msgid "bad %s"
2826 msgstr ""
2827
2797 -#: builtin/index-pack.c:1173
2828 +#: builtin/index-pack.c:1407
2829 msgid "--fix-thin cannot be used without --stdin"
2830 msgstr ""
2831
2801 -#: builtin/index-pack.c:1177 builtin/index-pack.c:1187
2832 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
2833 #, c-format
2834 msgid "packfile name '%s' does not end with '.pack'"
2835 msgstr ""
2836
2806 -#: builtin/index-pack.c:1196
2837 +#: builtin/index-pack.c:1430
2838 msgid "--verify with no packfile name given"
2839 msgstr ""
2840
2810 -#: builtin/index-pack.c:1220
2811 -msgid "confusion beyond insanity"
2812 -msgstr ""
2813 -
2814 -#: builtin/index-pack.c:1239
2815 -#, c-format
2816 -msgid "pack has %d unresolved delta"
2817 -msgid_plural "pack has %d unresolved deltas"
2818 -msgstr[0] ""
2819 -msgstr[1] ""
2820 -
2841 #: builtin/init-db.c:35
2842 #, c-format
2843 msgid "Could not make %s writable by group"