@matheusbsbs / matheus-bagliano / commits / 28e1aaa485

l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)

Generate po/git.pot from v2.13.0-rc2 for git v2.13.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed May 5, 2017 at 09:37 UTC 28e1aaa48544dc2aa89997448b1262485dc7f1bf
1 file changed +417 -428
po/git.pot
+417 -428
@@ -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: 2017-04-23 09:54+0800\n"
11 +"POT-Creation-Date: 2017-05-05 09:35+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"
@@ -562,7 +562,7 @@ msgstr[1] ""
562 msgid "Unable to write new index file"
563 msgstr ""
564
565 -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
565 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
566 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
567 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
568 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
@@ -579,7 +579,7 @@ msgstr ""
579 msgid "apply changes matching the given path"
580 msgstr ""
581
582 -#: apply.c:4917 builtin/am.c:2286
582 +#: apply.c:4917 builtin/am.c:2285
583 msgid "num"
584 msgstr ""
585
@@ -631,7 +631,7 @@ msgstr ""
631 msgid "build a temporary index based on embedded index information"
632 msgstr ""
633
634 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
634 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
635 msgid "paths are separated with NUL character"
636 msgstr ""
637
@@ -639,7 +639,7 @@ msgstr ""
639 msgid "ensure at least <n> lines of context match"
640 msgstr ""
641
642 -#: apply.c:4949 builtin/am.c:2265
642 +#: apply.c:4949 builtin/am.c:2264
643 msgid "action"
644 msgstr ""
645
@@ -681,7 +681,7 @@ msgstr ""
681 msgid "do not trust the line counts in the hunk headers"
682 msgstr ""
683
684 -#: apply.c:4973 builtin/am.c:2274
684 +#: apply.c:4973 builtin/am.c:2273
685 msgid "root"
686 msgstr ""
687
@@ -727,9 +727,9 @@ msgstr ""
727 msgid "prepend prefix to each pathname in the archive"
728 msgstr ""
729
730 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
730 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
731 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
732 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
732 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
733 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
734 #: parse-options.h:153
735 msgid "file"
@@ -813,48 +813,48 @@ msgid ""
813 "Use '\\!' for literal leading exclamation."
814 msgstr ""
815
816 -#: bisect.c:443
816 +#: bisect.c:444
817 #, c-format
818 msgid "Could not open file '%s'"
819 msgstr ""
820
821 -#: bisect.c:448
821 +#: bisect.c:449
822 #, c-format
823 msgid "Badly quoted content in file '%s': %s"
824 msgstr ""
825
826 -#: bisect.c:656
826 +#: bisect.c:657
827 #, c-format
828 msgid "We cannot bisect more!\n"
829 msgstr ""
830
831 -#: bisect.c:709
831 +#: bisect.c:710
832 #, c-format
833 msgid "Not a valid commit name %s"
834 msgstr ""
835
836 -#: bisect.c:733
836 +#: bisect.c:734
837 #, c-format
838 msgid ""
839 "The merge base %s is bad.\n"
840 "This means the bug has been fixed between %s and [%s].\n"
841 msgstr ""
842
843 -#: bisect.c:738
843 +#: bisect.c:739
844 #, c-format
845 msgid ""
846 "The merge base %s is new.\n"
847 "The property has changed between %s and [%s].\n"
848 msgstr ""
849
850 -#: bisect.c:743
850 +#: bisect.c:744
851 #, c-format
852 msgid ""
853 "The merge base %s is %s.\n"
854 "This means the first '%s' commit is between %s and [%s].\n"
855 msgstr ""
856
857 -#: bisect.c:751
857 +#: bisect.c:752
858 #, c-format
859 msgid ""
860 "Some %s revs are not ancestors of the %s rev.\n"
@@ -862,7 +862,7 @@ msgid ""
862 "Maybe you mistook %s and %s revs?\n"
863 msgstr ""
864
865 -#: bisect.c:764
865 +#: bisect.c:765
866 #, c-format
867 msgid ""
868 "the merge base between %s and [%s] must be skipped.\n"
@@ -870,43 +870,43 @@ msgid ""
870 "We continue anyway."
871 msgstr ""
872
873 -#: bisect.c:799
873 +#: bisect.c:800
874 #, c-format
875 msgid "Bisecting: a merge base must be tested\n"
876 msgstr ""
877
878 -#: bisect.c:850
878 +#: bisect.c:851
879 #, c-format
880 msgid "a %s revision is needed"
881 msgstr ""
882
883 -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
883 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
884 #, c-format
885 msgid "could not create file '%s'"
886 msgstr ""
887
888 -#: bisect.c:918
888 +#: bisect.c:919
889 #, c-format
890 msgid "could not read file '%s'"
891 msgstr ""
892
893 -#: bisect.c:948
893 +#: bisect.c:949
894 msgid "reading bisect refs failed"
895 msgstr ""
896
897 -#: bisect.c:968
897 +#: bisect.c:969
898 #, c-format
899 msgid "%s was both %s and %s\n"
900 msgstr ""
901
902 -#: bisect.c:976
902 +#: bisect.c:977
903 #, c-format
904 msgid ""
905 "No testable commit found.\n"
906 "Maybe you started with bad path parameters?\n"
907 msgstr ""
908
909 -#: bisect.c:995
909 +#: bisect.c:996
910 #, c-format
911 msgid "(roughly %d step)"
912 msgid_plural "(roughly %d steps)"
@@ -915,7 +915,7 @@ msgstr[1] ""
915
916 #. TRANSLATORS: the last %s will be replaced with
917 #. "(roughly %d steps)" translation
918 -#: bisect.c:999
918 +#: bisect.c:1000
919 #, c-format
920 msgid "Bisecting: %d revision left to test after this %s\n"
921 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1056,7 +1056,7 @@ msgstr ""
1056 msgid "unrecognized header: %s%s (%d)"
1057 msgstr ""
1058
1059 -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
1059 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
1060 #, c-format
1061 msgid "could not open '%s'"
1062 msgstr ""
@@ -1065,7 +1065,7 @@ msgstr ""
1065 msgid "Repository lacks these prerequisite commits:"
1066 msgstr ""
1067
1068 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
1068 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
1069 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
1070 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
1071 #: builtin/merge.c:359 builtin/shortlog.c:176
@@ -1130,8 +1130,8 @@ msgstr ""
1130 msgid "invalid color value: %.*s"
1131 msgstr ""
1132
1133 -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
1134 -#: builtin/am.c:1493 builtin/am.c:2127
1133 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
1134 +#: builtin/am.c:1489 builtin/am.c:2126
1135 #, c-format
1136 msgid "could not parse %s"
1137 msgstr ""
@@ -1156,148 +1156,148 @@ msgstr ""
1156 msgid "relative config include conditionals must come from files"
1157 msgstr ""
1158
1159 -#: config.c:701
1159 +#: config.c:711
1160 #, c-format
1161 msgid "bad config line %d in blob %s"
1162 msgstr ""
1163
1164 -#: config.c:705
1164 +#: config.c:715
1165 #, c-format
1166 msgid "bad config line %d in file %s"
1167 msgstr ""
1168
1169 -#: config.c:709
1169 +#: config.c:719
1170 #, c-format
1171 msgid "bad config line %d in standard input"
1172 msgstr ""
1173
1174 -#: config.c:713
1174 +#: config.c:723
1175 #, c-format
1176 msgid "bad config line %d in submodule-blob %s"
1177 msgstr ""
1178
1179 -#: config.c:717
1179 +#: config.c:727
1180 #, c-format
1181 msgid "bad config line %d in command line %s"
1182 msgstr ""
1183
1184 -#: config.c:721
1184 +#: config.c:731
1185 #, c-format
1186 msgid "bad config line %d in %s"
1187 msgstr ""
1188
1189 -#: config.c:840
1189 +#: config.c:859
1190 msgid "out of range"
1191 msgstr ""
1192
1193 -#: config.c:840
1193 +#: config.c:859
1194 msgid "invalid unit"
1195 msgstr ""
1196
1197 -#: config.c:846
1197 +#: config.c:865
1198 #, c-format
1199 msgid "bad numeric config value '%s' for '%s': %s"
1200 msgstr ""
1201
1202 -#: config.c:851
1202 +#: config.c:870
1203 #, c-format
1204 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1205 msgstr ""
1206
1207 -#: config.c:854
1207 +#: config.c:873
1208 #, c-format
1209 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1210 msgstr ""
1211
1212 -#: config.c:857
1212 +#: config.c:876
1213 #, c-format
1214 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1215 msgstr ""
1216
1217 -#: config.c:860
1217 +#: config.c:879
1218 #, c-format
1219 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1220 msgstr ""
1221
1222 -#: config.c:863
1222 +#: config.c:882
1223 #, c-format
1224 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1225 msgstr ""
1226
1227 -#: config.c:866
1227 +#: config.c:885
1228 #, c-format
1229 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1230 msgstr ""
1231
1232 -#: config.c:953
1232 +#: config.c:980
1233 #, c-format
1234 msgid "failed to expand user dir in: '%s'"
1235 msgstr ""
1236
1237 -#: config.c:1048 config.c:1059
1237 +#: config.c:1075 config.c:1086
1238 #, c-format
1239 msgid "bad zlib compression level %d"
1240 msgstr ""
1241
1242 -#: config.c:1176
1242 +#: config.c:1203
1243 #, c-format
1244 msgid "invalid mode for object creation: %s"
1245 msgstr ""
1246
1247 -#: config.c:1332
1247 +#: config.c:1359
1248 #, c-format
1249 msgid "bad pack compression level %d"
1250 msgstr ""
1251
1252 -#: config.c:1522
1252 +#: config.c:1557
1253 msgid "unable to parse command-line config"
1254 msgstr ""
1255
1256 -#: config.c:1572
1256 +#: config.c:1611
1257 msgid "unknown error occurred while reading the configuration files"
1258 msgstr ""
1259
1260 -#: config.c:1931
1260 +#: config.c:1970
1261 #, c-format
1262 msgid "Invalid %s: '%s'"
1263 msgstr ""
1264
1265 -#: config.c:1952
1265 +#: config.c:1991
1266 #, c-format
1267 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1268 msgstr ""
1269
1270 -#: config.c:1978
1270 +#: config.c:2017
1271 #, c-format
1272 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1273 msgstr ""
1274
1275 -#: config.c:1989
1275 +#: config.c:2028
1276 #, c-format
1277 msgid "unable to parse '%s' from command-line config"
1278 msgstr ""
1279
1280 -#: config.c:1991
1280 +#: config.c:2030
1281 #, c-format
1282 msgid "bad config variable '%s' in file '%s' at line %d"
1283 msgstr ""
1284
1285 -#: config.c:2050
1285 +#: config.c:2089
1286 #, c-format
1287 msgid "%s has multiple values"
1288 msgstr ""
1289
1290 -#: config.c:2384 config.c:2609
1290 +#: config.c:2423 config.c:2648
1291 #, c-format
1292 msgid "fstat on %s failed"
1293 msgstr ""
1294
1295 -#: config.c:2502
1295 +#: config.c:2541
1296 #, c-format
1297 msgid "could not set '%s' to '%s'"
1298 msgstr ""
1299
1300 -#: config.c:2504 builtin/remote.c:774
1300 +#: config.c:2543 builtin/remote.c:774
1301 #, c-format
1302 msgid "could not unset '%s'"
1303 msgstr ""
@@ -1528,171 +1528,176 @@ msgstr ""
1528 msgid "git fetch-pack: expected ACK/NAK, got EOF"
1529 msgstr ""
1530
1531 -#: fetch-pack.c:279
1531 +#: fetch-pack.c:280 builtin/archive.c:63
1532 +#, c-format
1533 +msgid "remote error: %s"
1534 +msgstr ""
1535 +
1536 +#: fetch-pack.c:281
1537 #, c-format
1538 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
1539 msgstr ""
1540
1536 -#: fetch-pack.c:331
1541 +#: fetch-pack.c:333
1542 msgid "--stateless-rpc requires multi_ack_detailed"
1543 msgstr ""
1544
1540 -#: fetch-pack.c:417
1545 +#: fetch-pack.c:419
1546 #, c-format
1547 msgid "invalid shallow line: %s"
1548 msgstr ""
1549
1545 -#: fetch-pack.c:423
1550 +#: fetch-pack.c:425
1551 #, c-format
1552 msgid "invalid unshallow line: %s"
1553 msgstr ""
1554
1550 -#: fetch-pack.c:425
1555 +#: fetch-pack.c:427
1556 #, c-format
1557 msgid "object not found: %s"
1558 msgstr ""
1559
1555 -#: fetch-pack.c:428
1560 +#: fetch-pack.c:430
1561 #, c-format
1562 msgid "error in object: %s"
1563 msgstr ""
1564
1560 -#: fetch-pack.c:430
1565 +#: fetch-pack.c:432
1566 #, c-format
1567 msgid "no shallow found: %s"
1568 msgstr ""
1569
1565 -#: fetch-pack.c:433
1570 +#: fetch-pack.c:435
1571 #, c-format
1572 msgid "expected shallow/unshallow, got %s"
1573 msgstr ""
1574
1570 -#: fetch-pack.c:472
1575 +#: fetch-pack.c:474
1576 #, c-format
1577 msgid "got %s %d %s"
1578 msgstr ""
1579
1575 -#: fetch-pack.c:486
1580 +#: fetch-pack.c:488
1581 #, c-format
1582 msgid "invalid commit %s"
1583 msgstr ""
1584
1580 -#: fetch-pack.c:519
1585 +#: fetch-pack.c:521
1586 msgid "giving up"
1587 msgstr ""
1588
1584 -#: fetch-pack.c:529 progress.c:235
1589 +#: fetch-pack.c:531 progress.c:235
1590 msgid "done"
1591 msgstr ""
1592
1588 -#: fetch-pack.c:541
1593 +#: fetch-pack.c:543
1594 #, c-format
1595 msgid "got %s (%d) %s"
1596 msgstr ""
1597
1593 -#: fetch-pack.c:587
1598 +#: fetch-pack.c:589
1599 #, c-format
1600 msgid "Marking %s as complete"
1601 msgstr ""
1602
1598 -#: fetch-pack.c:735
1603 +#: fetch-pack.c:737
1604 #, c-format
1605 msgid "already have %s (%s)"
1606 msgstr ""
1607
1603 -#: fetch-pack.c:773
1608 +#: fetch-pack.c:775
1609 msgid "fetch-pack: unable to fork off sideband demultiplexer"
1610 msgstr ""
1611
1607 -#: fetch-pack.c:781
1612 +#: fetch-pack.c:783
1613 msgid "protocol error: bad pack header"
1614 msgstr ""
1615
1611 -#: fetch-pack.c:837
1616 +#: fetch-pack.c:839
1617 #, c-format
1618 msgid "fetch-pack: unable to fork off %s"
1619 msgstr ""
1620
1616 -#: fetch-pack.c:853
1621 +#: fetch-pack.c:855
1622 #, c-format
1623 msgid "%s failed"
1624 msgstr ""
1625
1621 -#: fetch-pack.c:855
1626 +#: fetch-pack.c:857
1627 msgid "error in sideband demultiplexer"
1628 msgstr ""
1629
1625 -#: fetch-pack.c:882
1630 +#: fetch-pack.c:884
1631 msgid "Server does not support shallow clients"
1632 msgstr ""
1633
1629 -#: fetch-pack.c:886
1634 +#: fetch-pack.c:888
1635 msgid "Server supports multi_ack_detailed"
1636 msgstr ""
1637
1633 -#: fetch-pack.c:889
1638 +#: fetch-pack.c:891
1639 msgid "Server supports no-done"
1640 msgstr ""
1641
1637 -#: fetch-pack.c:895
1642 +#: fetch-pack.c:897
1643 msgid "Server supports multi_ack"
1644 msgstr ""
1645
1641 -#: fetch-pack.c:899
1646 +#: fetch-pack.c:901
1647 msgid "Server supports side-band-64k"
1648 msgstr ""
1649
1645 -#: fetch-pack.c:903
1650 +#: fetch-pack.c:905
1651 msgid "Server supports side-band"
1652 msgstr ""
1653
1649 -#: fetch-pack.c:907
1654 +#: fetch-pack.c:909
1655 msgid "Server supports allow-tip-sha1-in-want"
1656 msgstr ""
1657
1653 -#: fetch-pack.c:911
1658 +#: fetch-pack.c:913
1659 msgid "Server supports allow-reachable-sha1-in-want"
1660 msgstr ""
1661
1657 -#: fetch-pack.c:921
1662 +#: fetch-pack.c:923
1663 msgid "Server supports ofs-delta"
1664 msgstr ""
1665
1661 -#: fetch-pack.c:928
1666 +#: fetch-pack.c:930
1667 #, c-format
1668 msgid "Server version is %.*s"
1669 msgstr ""
1670
1666 -#: fetch-pack.c:934
1671 +#: fetch-pack.c:936
1672 msgid "Server does not support --shallow-since"
1673 msgstr ""
1674
1670 -#: fetch-pack.c:938
1675 +#: fetch-pack.c:940
1676 msgid "Server does not support --shallow-exclude"
1677 msgstr ""
1678
1674 -#: fetch-pack.c:940
1679 +#: fetch-pack.c:942
1680 msgid "Server does not support --deepen"
1681 msgstr ""
1682
1678 -#: fetch-pack.c:951
1683 +#: fetch-pack.c:953
1684 msgid "no common commits"
1685 msgstr ""
1686
1682 -#: fetch-pack.c:963
1687 +#: fetch-pack.c:965
1688 msgid "git fetch-pack: fetch failed."
1689 msgstr ""
1690
1686 -#: fetch-pack.c:1125
1691 +#: fetch-pack.c:1127
1692 msgid "no matching remote head"
1693 msgstr ""
1694
1690 -#: fetch-pack.c:1147
1695 +#: fetch-pack.c:1149
1696 #, c-format
1697 msgid "no such remote ref %s"
1698 msgstr ""
1699
1695 -#: fetch-pack.c:1150
1700 +#: fetch-pack.c:1152
1701 #, c-format
1702 msgid "Server does not allow request for unadvertised object %s"
1703 msgstr ""
@@ -1855,7 +1860,7 @@ msgstr ""
1860 msgid "failed to read the cache"
1861 msgstr ""
1862
1858 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
1863 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
1864 #: builtin/checkout.c:607 builtin/clone.c:749
1865 msgid "unable to write new index file"
1866 msgstr ""
@@ -2173,7 +2178,7 @@ msgstr ""
2178 msgid "malformed object name '%s'"
2179 msgstr ""
2180
2176 -#: path.c:805
2181 +#: path.c:810
2182 #, c-format
2183 msgid "Could not make %s writable by group"
2184 msgstr ""
@@ -2264,51 +2269,55 @@ msgstr ""
2269 msgid "unable to parse --pretty format"
2270 msgstr ""
2271
2267 -#: read-cache.c:1307
2272 +#: read-cache.c:1442
2273 #, c-format
2274 msgid ""
2275 "index.version set, but the value is invalid.\n"
2276 "Using version %i"
2277 msgstr ""
2278
2274 -#: read-cache.c:1317
2279 +#: read-cache.c:1452
2280 #, c-format
2281 msgid ""
2282 "GIT_INDEX_VERSION set, but the value is invalid.\n"
2283 "Using version %i"
2284 msgstr ""
2285
2281 -#: read-cache.c:2232
2286 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
2287 #, c-format
2283 -msgid "could not stat '%s"
2288 +msgid "could not stat '%s'"
2289 msgstr ""
2290
2286 -#: read-cache.c:2245
2291 +#: read-cache.c:2388
2292 #, c-format
2293 msgid "unable to open git dir: %s"
2294 msgstr ""
2295
2291 -#: read-cache.c:2257
2296 +#: read-cache.c:2400
2297 #, c-format
2298 msgid "unable to unlink: %s"
2299 msgstr ""
2300
2296 -#: refs.c:619 builtin/merge.c:844
2301 +#: refs.c:620 builtin/merge.c:844
2302 #, c-format
2303 msgid "Could not open '%s' for writing"
2304 msgstr ""
2305
2301 -#: refs/files-backend.c:2531
2306 +#: refs.c:1667
2307 +msgid "ref updates forbidden inside quarantine environment"
2308 +msgstr ""
2309 +
2310 +#: refs/files-backend.c:1631
2311 #, c-format
2312 msgid "could not delete reference %s: %s"
2313 msgstr ""
2314
2306 -#: refs/files-backend.c:2534
2315 +#: refs/files-backend.c:1634
2316 #, c-format
2317 msgid "could not delete references: %s"
2318 msgstr ""
2319
2311 -#: refs/files-backend.c:2543
2320 +#: refs/files-backend.c:1643
2321 #, c-format
2322 msgid "could not remove reference %s"
2323 msgstr ""
@@ -2737,12 +2746,12 @@ msgid ""
2746 "and commit the result with 'git commit'"
2747 msgstr ""
2748
2740 -#: sequencer.c:294 sequencer.c:1675
2749 +#: sequencer.c:294 sequencer.c:1682
2750 #, c-format
2751 msgid "could not lock '%s'"
2752 msgstr ""
2753
2745 -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
2754 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
2755 #, c-format
2756 msgid "could not write to '%s'"
2757 msgstr ""
@@ -2752,12 +2761,12 @@ msgstr ""
2761 msgid "could not write eol to '%s'"
2762 msgstr ""
2763
2755 -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
2764 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
2765 #, c-format
2766 msgid "failed to finalize '%s'."
2767 msgstr ""
2768
2760 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
2769 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
2770 #: builtin/commit.c:749 builtin/merge.c:1018
2771 #, c-format
2772 msgid "could not read '%s'"
@@ -2913,7 +2922,7 @@ msgstr ""
2922 msgid "%s: cannot parse parent commit %s"
2923 msgstr ""
2924
2916 -#: sequencer.c:1071 sequencer.c:1820
2925 +#: sequencer.c:1071 sequencer.c:1827
2926 #, c-format
2927 msgid "could not rename '%s' to '%s'"
2928 msgstr ""
@@ -2942,123 +2951,123 @@ msgstr ""
2951 msgid "git %s: failed to refresh the index"
2952 msgstr ""
2953
2945 -#: sequencer.c:1302
2954 +#: sequencer.c:1303
2955 #, c-format
2956 msgid "invalid line %d: %.*s"
2957 msgstr ""
2958
2950 -#: sequencer.c:1310
2959 +#: sequencer.c:1311
2960 #, c-format
2961 msgid "cannot '%s' without a previous commit"
2962 msgstr ""
2963
2955 -#: sequencer.c:1342
2964 +#: sequencer.c:1344
2965 #, c-format
2966 msgid "could not read '%s'."
2967 msgstr ""
2968
2960 -#: sequencer.c:1349
2969 +#: sequencer.c:1356
2970 msgid "please fix this using 'git rebase --edit-todo'."
2971 msgstr ""
2972
2964 -#: sequencer.c:1351
2973 +#: sequencer.c:1358
2974 #, c-format
2975 msgid "unusable instruction sheet: '%s'"
2976 msgstr ""
2977
2969 -#: sequencer.c:1356
2978 +#: sequencer.c:1363
2979 msgid "no commits parsed."
2980 msgstr ""
2981
2973 -#: sequencer.c:1367
2982 +#: sequencer.c:1374
2983 msgid "cannot cherry-pick during a revert."
2984 msgstr ""
2985
2977 -#: sequencer.c:1369
2986 +#: sequencer.c:1376
2987 msgid "cannot revert during a cherry-pick."
2988 msgstr ""
2989
2981 -#: sequencer.c:1432
2990 +#: sequencer.c:1439
2991 #, c-format
2992 msgid "invalid key: %s"
2993 msgstr ""
2994
2986 -#: sequencer.c:1435
2995 +#: sequencer.c:1442
2996 #, c-format
2997 msgid "invalid value for %s: %s"
2998 msgstr ""
2999
2991 -#: sequencer.c:1492
3000 +#: sequencer.c:1499
3001 #, c-format
3002 msgid "malformed options sheet: '%s'"
3003 msgstr ""
3004
2996 -#: sequencer.c:1530
3005 +#: sequencer.c:1537
3006 msgid "a cherry-pick or revert is already in progress"
3007 msgstr ""
3008
3000 -#: sequencer.c:1531
3009 +#: sequencer.c:1538
3010 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3011 msgstr ""
3012
3004 -#: sequencer.c:1534
3013 +#: sequencer.c:1541
3014 #, c-format
3015 msgid "could not create sequencer directory '%s'"
3016 msgstr ""
3017
3009 -#: sequencer.c:1548
3018 +#: sequencer.c:1555
3019 msgid "could not lock HEAD"
3020 msgstr ""
3021
3013 -#: sequencer.c:1604 sequencer.c:2159
3022 +#: sequencer.c:1611 sequencer.c:2181
3023 msgid "no cherry-pick or revert in progress"
3024 msgstr ""
3025
3017 -#: sequencer.c:1606
3026 +#: sequencer.c:1613
3027 msgid "cannot resolve HEAD"
3028 msgstr ""
3029
3021 -#: sequencer.c:1608 sequencer.c:1642
3030 +#: sequencer.c:1615 sequencer.c:1649
3031 msgid "cannot abort from a branch yet to be born"
3032 msgstr ""
3033
3025 -#: sequencer.c:1628 builtin/grep.c:910
3034 +#: sequencer.c:1635 builtin/grep.c:910
3035 #, c-format
3036 msgid "cannot open '%s'"
3037 msgstr ""
3038
3030 -#: sequencer.c:1630
3039 +#: sequencer.c:1637
3040 #, c-format
3041 msgid "cannot read '%s': %s"
3042 msgstr ""
3043
3035 -#: sequencer.c:1631
3044 +#: sequencer.c:1638
3045 msgid "unexpected end of file"
3046 msgstr ""
3047
3039 -#: sequencer.c:1637
3048 +#: sequencer.c:1644
3049 #, c-format
3050 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3051 msgstr ""
3052
3044 -#: sequencer.c:1648
3053 +#: sequencer.c:1655
3054 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3055 msgstr ""
3056
3048 -#: sequencer.c:1785 sequencer.c:2058
3057 +#: sequencer.c:1792 sequencer.c:2080
3058 msgid "cannot read HEAD"
3059 msgstr ""
3060
3052 -#: sequencer.c:1825 builtin/difftool.c:616
3061 +#: sequencer.c:1832 builtin/difftool.c:616
3062 #, c-format
3063 msgid "could not copy '%s' to '%s'"
3064 msgstr ""
3065
3057 -#: sequencer.c:1841
3066 +#: sequencer.c:1848
3067 msgid "could not read index"
3068 msgstr ""
3069
3061 -#: sequencer.c:1846
3070 +#: sequencer.c:1853
3071 #, c-format
3072 msgid ""
3073 "execution failed: %s\n"
@@ -3068,11 +3077,11 @@ msgid ""
3077 "\n"
3078 msgstr ""
3079
3071 -#: sequencer.c:1852
3080 +#: sequencer.c:1859
3081 msgid "and made changes to the index and/or the working tree\n"
3082 msgstr ""
3083
3075 -#: sequencer.c:1858
3084 +#: sequencer.c:1865
3085 #, c-format
3086 msgid ""
3087 "execution succeeded: %s\n"
@@ -3083,17 +3092,17 @@ msgid ""
3092 "\n"
3093 msgstr ""
3094
3086 -#: sequencer.c:1913 git-rebase.sh:168
3095 +#: sequencer.c:1920 git-rebase.sh:169
3096 #, c-format
3097 msgid "Applied autostash."
3098 msgstr ""
3099
3091 -#: sequencer.c:1925
3100 +#: sequencer.c:1932
3101 #, c-format
3102 msgid "cannot store %s"
3103 msgstr ""
3104
3096 -#: sequencer.c:1927 git-rebase.sh:172
3105 +#: sequencer.c:1934 git-rebase.sh:173
3106 #, c-format
3107 msgid ""
3108 "Applying autostash resulted in conflicts.\n"
@@ -3101,78 +3110,78 @@ msgid ""
3110 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3111 msgstr ""
3112
3104 -#: sequencer.c:2009
3113 +#: sequencer.c:2016
3114 #, c-format
3115 msgid "Stopped at %s... %.*s\n"
3116 msgstr ""
3117
3109 -#: sequencer.c:2036
3118 +#: sequencer.c:2058
3119 #, c-format
3120 msgid "unknown command %d"
3121 msgstr ""
3122
3114 -#: sequencer.c:2066
3123 +#: sequencer.c:2088
3124 msgid "could not read orig-head"
3125 msgstr ""
3126
3118 -#: sequencer.c:2070
3127 +#: sequencer.c:2092
3128 msgid "could not read 'onto'"
3129 msgstr ""
3130
3122 -#: sequencer.c:2077
3131 +#: sequencer.c:2099
3132 #, c-format
3133 msgid "could not update %s"
3134 msgstr ""
3135
3127 -#: sequencer.c:2084
3136 +#: sequencer.c:2106
3137 #, c-format
3138 msgid "could not update HEAD to %s"
3139 msgstr ""
3140
3132 -#: sequencer.c:2168
3141 +#: sequencer.c:2190
3142 msgid "cannot rebase: You have unstaged changes."
3143 msgstr ""
3144
3136 -#: sequencer.c:2173
3145 +#: sequencer.c:2195
3146 msgid "could not remove CHERRY_PICK_HEAD"
3147 msgstr ""
3148
3140 -#: sequencer.c:2182
3149 +#: sequencer.c:2204
3150 msgid "cannot amend non-existing commit"
3151 msgstr ""
3152
3144 -#: sequencer.c:2184
3153 +#: sequencer.c:2206
3154 #, c-format
3155 msgid "invalid file: '%s'"
3156 msgstr ""
3157
3149 -#: sequencer.c:2186
3158 +#: sequencer.c:2208
3159 #, c-format
3160 msgid "invalid contents: '%s'"
3161 msgstr ""
3162
3154 -#: sequencer.c:2189
3163 +#: sequencer.c:2211
3164 msgid ""
3165 "\n"
3166 "You have uncommitted changes in your working tree. Please, commit them\n"
3167 "first and then run 'git rebase --continue' again."
3168 msgstr ""
3169
3161 -#: sequencer.c:2199
3170 +#: sequencer.c:2221
3171 msgid "could not commit staged changes."
3172 msgstr ""
3173
3165 -#: sequencer.c:2279
3174 +#: sequencer.c:2301
3175 #, c-format
3176 msgid "%s: can't cherry-pick a %s"
3177 msgstr ""
3178
3170 -#: sequencer.c:2283
3179 +#: sequencer.c:2305
3180 #, c-format
3181 msgid "%s: bad revision"
3182 msgstr ""
3183
3175 -#: sequencer.c:2316
3184 +#: sequencer.c:2338
3185 msgid "can't revert as initial commit"
3186 msgstr ""
3187
@@ -3348,24 +3357,24 @@ msgstr ""
3357 msgid "submodule '%s' has dirty index"
3358 msgstr ""
3359
3351 -#: submodule.c:1679
3360 +#: submodule.c:1678
3361 #, c-format
3362 msgid ""
3363 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
3364 msgstr ""
3365
3357 -#: submodule.c:1691 submodule.c:1747
3366 +#: submodule.c:1690 submodule.c:1746
3367 #, c-format
3368 msgid "could not lookup name for submodule '%s'"
3369 msgstr ""
3370
3362 -#: submodule.c:1695 builtin/submodule--helper.c:678
3371 +#: submodule.c:1694 builtin/submodule--helper.c:678
3372 #: builtin/submodule--helper.c:688
3373 #, c-format
3374 msgid "could not create directory '%s'"
3375 msgstr ""
3376
3368 -#: submodule.c:1698
3377 +#: submodule.c:1697
3378 #, c-format
3379 msgid ""
3380 "Migrating git directory of '%s%s' from\n"
@@ -3373,20 +3382,20 @@ msgid ""
3382 "'%s'\n"
3383 msgstr ""
3384
3376 -#: submodule.c:1782
3385 +#: submodule.c:1781
3386 #, c-format
3387 msgid "could not recurse into submodule '%s'"
3388 msgstr ""
3389
3381 -#: submodule.c:1826
3390 +#: submodule.c:1825
3391 msgid "could not start ls-files in .."
3392 msgstr ""
3393
3385 -#: submodule.c:1846
3394 +#: submodule.c:1845
3395 msgid "BUG: returned path string doesn't match cwd?"
3396 msgstr ""
3397
3389 -#: submodule.c:1865
3398 +#: submodule.c:1864
3399 #, c-format
3400 msgid "ls-tree returned unexpected return code %d"
3401 msgstr ""
@@ -3736,8 +3745,8 @@ msgstr ""
3745 msgid "could not open '%s' for writing"
3746 msgstr ""
3747
3739 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
3740 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
3748 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
3749 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
3750 #: builtin/pull.c:341
3751 #, c-format
3752 msgid "could not open '%s' for reading"
@@ -4371,141 +4380,141 @@ msgstr ""
4380 msgid "index file corrupt"
4381 msgstr ""
4382
4374 -#: builtin/am.c:414
4383 +#: builtin/am.c:412
4384 msgid "could not parse author script"
4385 msgstr ""
4386
4378 -#: builtin/am.c:491
4387 +#: builtin/am.c:489
4388 #, c-format
4389 msgid "'%s' was deleted by the applypatch-msg hook"
4390 msgstr ""
4391
4383 -#: builtin/am.c:532
4392 +#: builtin/am.c:530
4393 #, c-format
4394 msgid "Malformed input line: '%s'."
4395 msgstr ""
4396
4388 -#: builtin/am.c:569
4397 +#: builtin/am.c:567
4398 #, c-format
4399 msgid "Failed to copy notes from '%s' to '%s'"
4400 msgstr ""
4401
4393 -#: builtin/am.c:595
4402 +#: builtin/am.c:593
4403 msgid "fseek failed"
4404 msgstr ""
4405
4397 -#: builtin/am.c:775
4406 +#: builtin/am.c:777
4407 #, c-format
4408 msgid "could not parse patch '%s'"
4409 msgstr ""
4410
4402 -#: builtin/am.c:840
4411 +#: builtin/am.c:842
4412 msgid "Only one StGIT patch series can be applied at once"
4413 msgstr ""
4414
4406 -#: builtin/am.c:887
4415 +#: builtin/am.c:889
4416 msgid "invalid timestamp"
4417 msgstr ""
4418
4410 -#: builtin/am.c:890 builtin/am.c:898
4419 +#: builtin/am.c:892 builtin/am.c:900
4420 msgid "invalid Date line"
4421 msgstr ""
4422
4414 -#: builtin/am.c:895
4423 +#: builtin/am.c:897
4424 msgid "invalid timezone offset"
4425 msgstr ""
4426
4418 -#: builtin/am.c:984
4427 +#: builtin/am.c:986
4428 msgid "Patch format detection failed."
4429 msgstr ""
4430
4422 -#: builtin/am.c:989 builtin/clone.c:397
4431 +#: builtin/am.c:991 builtin/clone.c:397
4432 #, c-format
4433 msgid "failed to create directory '%s'"
4434 msgstr ""
4435
4427 -#: builtin/am.c:993
4436 +#: builtin/am.c:995
4437 msgid "Failed to split patches."
4438 msgstr ""
4439
4431 -#: builtin/am.c:1125 builtin/commit.c:376
4440 +#: builtin/am.c:1127 builtin/commit.c:376
4441 msgid "unable to write index file"
4442 msgstr ""
4443
4435 -#: builtin/am.c:1176
4444 +#: builtin/am.c:1178
4445 #, c-format
4446 msgid "When you have resolved this problem, run \"%s --continue\"."
4447 msgstr ""
4448
4440 -#: builtin/am.c:1177
4449 +#: builtin/am.c:1179
4450 #, c-format
4451 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4452 msgstr ""
4453
4445 -#: builtin/am.c:1178
4454 +#: builtin/am.c:1180
4455 #, c-format
4456 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4457 msgstr ""
4458
4450 -#: builtin/am.c:1316
4459 +#: builtin/am.c:1315
4460 msgid "Patch is empty. Was it split wrong?"
4461 msgstr ""
4462
4454 -#: builtin/am.c:1390 builtin/log.c:1557
4463 +#: builtin/am.c:1386 builtin/log.c:1557
4464 #, c-format
4465 msgid "invalid ident line: %s"
4466 msgstr ""
4467
4459 -#: builtin/am.c:1417
4468 +#: builtin/am.c:1413
4469 #, c-format
4470 msgid "unable to parse commit %s"
4471 msgstr ""
4472
4464 -#: builtin/am.c:1610
4473 +#: builtin/am.c:1606
4474 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4475 msgstr ""
4476
4468 -#: builtin/am.c:1612
4477 +#: builtin/am.c:1608
4478 msgid "Using index info to reconstruct a base tree..."
4479 msgstr ""
4480
4472 -#: builtin/am.c:1631
4481 +#: builtin/am.c:1627
4482 msgid ""
4483 "Did you hand edit your patch?\n"
4484 "It does not apply to blobs recorded in its index."
4485 msgstr ""
4486
4478 -#: builtin/am.c:1637
4487 +#: builtin/am.c:1633
4488 msgid "Falling back to patching base and 3-way merge..."
4489 msgstr ""
4490
4482 -#: builtin/am.c:1662
4491 +#: builtin/am.c:1658
4492 msgid "Failed to merge in the changes."
4493 msgstr ""
4494
4486 -#: builtin/am.c:1686 builtin/merge.c:631
4495 +#: builtin/am.c:1682 builtin/merge.c:631
4496 msgid "git write-tree failed to write a tree"
4497 msgstr ""
4498
4490 -#: builtin/am.c:1693
4499 +#: builtin/am.c:1689
4500 msgid "applying to an empty history"
4501 msgstr ""
4502
4494 -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
4503 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
4504 #: builtin/merge.c:827
4505 msgid "failed to write commit object"
4506 msgstr ""
4507
4499 -#: builtin/am.c:1739 builtin/am.c:1743
4508 +#: builtin/am.c:1735 builtin/am.c:1739
4509 #, c-format
4510 msgid "cannot resume: %s does not exist."
4511 msgstr ""
4512
4504 -#: builtin/am.c:1759
4513 +#: builtin/am.c:1755
4514 msgid "cannot be interactive without stdin connected to a terminal."
4515 msgstr ""
4516
4508 -#: builtin/am.c:1764
4517 +#: builtin/am.c:1760
4518 msgid "Commit Body is:"
4519 msgstr ""
4520
@@ -4513,132 +4522,132 @@ msgstr ""
4522 #. in your translation. The program will only accept English
4523 #. input at this point.
4524 #.
4516 -#: builtin/am.c:1774
4525 +#: builtin/am.c:1770
4526 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4527 msgstr ""
4528
4520 -#: builtin/am.c:1824
4529 +#: builtin/am.c:1820
4530 #, c-format
4531 msgid "Dirty index: cannot apply patches (dirty: %s)"
4532 msgstr ""
4533
4525 -#: builtin/am.c:1861 builtin/am.c:1933
4534 +#: builtin/am.c:1860 builtin/am.c:1932
4535 #, c-format
4536 msgid "Applying: %.*s"
4537 msgstr ""
4538
4530 -#: builtin/am.c:1877
4539 +#: builtin/am.c:1876
4540 msgid "No changes -- Patch already applied."
4541 msgstr ""
4542
4534 -#: builtin/am.c:1885
4543 +#: builtin/am.c:1884
4544 #, c-format
4545 msgid "Patch failed at %s %.*s"
4546 msgstr ""
4547
4539 -#: builtin/am.c:1891
4548 +#: builtin/am.c:1890
4549 #, c-format
4550 msgid "The copy of the patch that failed is found in: %s"
4551 msgstr ""
4552
4544 -#: builtin/am.c:1936
4553 +#: builtin/am.c:1935
4554 msgid ""
4555 "No changes - did you forget to use 'git add'?\n"
4556 "If there is nothing left to stage, chances are that something else\n"
4557 "already introduced the same changes; you might want to skip this patch."
4558 msgstr ""
4559
4551 -#: builtin/am.c:1943
4560 +#: builtin/am.c:1942
4561 msgid ""
4562 "You still have unmerged paths in your index.\n"
4563 "Did you forget to use 'git add'?"
4564 msgstr ""
4565
4557 -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
4566 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
4567 #: builtin/reset.c:316
4568 #, c-format
4569 msgid "Could not parse object '%s'."
4570 msgstr ""
4571
4563 -#: builtin/am.c:2103
4572 +#: builtin/am.c:2102
4573 msgid "failed to clean index"
4574 msgstr ""
4575
4567 -#: builtin/am.c:2137
4576 +#: builtin/am.c:2136
4577 msgid ""
4578 "You seem to have moved HEAD since the last 'am' failure.\n"
4579 "Not rewinding to ORIG_HEAD"
4580 msgstr ""
4581
4573 -#: builtin/am.c:2200
4582 +#: builtin/am.c:2199
4583 #, c-format
4584 msgid "Invalid value for --patch-format: %s"
4585 msgstr ""
4586
4578 -#: builtin/am.c:2233
4587 +#: builtin/am.c:2232
4588 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4589 msgstr ""
4590
4582 -#: builtin/am.c:2234
4591 +#: builtin/am.c:2233
4592 msgid "git am [<options>] (--continue | --skip | --abort)"
4593 msgstr ""
4594
4586 -#: builtin/am.c:2240
4595 +#: builtin/am.c:2239
4596 msgid "run interactively"
4597 msgstr ""
4598
4590 -#: builtin/am.c:2242
4599 +#: builtin/am.c:2241
4600 msgid "historical option -- no-op"
4601 msgstr ""
4602
4594 -#: builtin/am.c:2244
4603 +#: builtin/am.c:2243
4604 msgid "allow fall back on 3way merging if needed"
4605 msgstr ""
4606
4598 -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
4607 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
4608 #: builtin/repack.c:178
4609 msgid "be quiet"
4610 msgstr ""
4611
4603 -#: builtin/am.c:2247
4612 +#: builtin/am.c:2246
4613 msgid "add a Signed-off-by line to the commit message"
4614 msgstr ""
4615
4607 -#: builtin/am.c:2250
4616 +#: builtin/am.c:2249
4617 msgid "recode into utf8 (default)"
4618 msgstr ""
4619
4611 -#: builtin/am.c:2252
4620 +#: builtin/am.c:2251
4621 msgid "pass -k flag to git-mailinfo"
4622 msgstr ""
4623
4615 -#: builtin/am.c:2254
4624 +#: builtin/am.c:2253
4625 msgid "pass -b flag to git-mailinfo"
4626 msgstr ""
4627
4619 -#: builtin/am.c:2256
4628 +#: builtin/am.c:2255
4629 msgid "pass -m flag to git-mailinfo"
4630 msgstr ""
4631
4623 -#: builtin/am.c:2258
4632 +#: builtin/am.c:2257
4633 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
4634 msgstr ""
4635
4627 -#: builtin/am.c:2261
4636 +#: builtin/am.c:2260
4637 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
4638 msgstr ""
4639
4631 -#: builtin/am.c:2264
4640 +#: builtin/am.c:2263
4641 msgid "strip everything before a scissors line"
4642 msgstr ""
4643
4635 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
4636 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
4637 -#: builtin/am.c:2293
4644 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
4645 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
4646 +#: builtin/am.c:2292
4647 msgid "pass it through git-apply"
4648 msgstr ""
4649
4641 -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4650 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
4651 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
4652 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
4653 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
@@ -4646,79 +4655,79 @@ msgstr ""
4655 msgid "n"
4656 msgstr ""
4657
4649 -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
4650 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
4658 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
4659 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
4660 msgid "format"
4661 msgstr ""
4662
4654 -#: builtin/am.c:2290
4663 +#: builtin/am.c:2289
4664 msgid "format the patch(es) are in"
4665 msgstr ""
4666
4658 -#: builtin/am.c:2296
4667 +#: builtin/am.c:2295
4668 msgid "override error message when patch failure occurs"
4669 msgstr ""
4670
4662 -#: builtin/am.c:2298
4671 +#: builtin/am.c:2297
4672 msgid "continue applying patches after resolving a conflict"
4673 msgstr ""
4674
4666 -#: builtin/am.c:2301
4675 +#: builtin/am.c:2300
4676 msgid "synonyms for --continue"
4677 msgstr ""
4678
4670 -#: builtin/am.c:2304
4679 +#: builtin/am.c:2303
4680 msgid "skip the current patch"
4681 msgstr ""
4682
4674 -#: builtin/am.c:2307
4683 +#: builtin/am.c:2306
4684 msgid "restore the original branch and abort the patching operation."
4685 msgstr ""
4686
4678 -#: builtin/am.c:2311
4687 +#: builtin/am.c:2310
4688 msgid "lie about committer date"
4689 msgstr ""
4690
4682 -#: builtin/am.c:2313
4691 +#: builtin/am.c:2312
4692 msgid "use current timestamp for author date"
4693 msgstr ""
4694
4686 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
4695 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
4696 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
4697 msgid "key-id"
4698 msgstr ""
4699
4691 -#: builtin/am.c:2316
4700 +#: builtin/am.c:2315
4701 msgid "GPG-sign commits"
4702 msgstr ""
4703
4695 -#: builtin/am.c:2319
4704 +#: builtin/am.c:2318
4705 msgid "(internal use for git-rebase)"
4706 msgstr ""
4707
4699 -#: builtin/am.c:2334
4708 +#: builtin/am.c:2333
4709 msgid ""
4710 "The -b/--binary option has been a no-op for long time, and\n"
4711 "it will be removed. Please do not use it anymore."
4712 msgstr ""
4713
4705 -#: builtin/am.c:2341
4714 +#: builtin/am.c:2340
4715 msgid "failed to read the index"
4716 msgstr ""
4717
4709 -#: builtin/am.c:2356
4718 +#: builtin/am.c:2355
4719 #, c-format
4720 msgid "previous rebase directory %s still exists but mbox given."
4721 msgstr ""
4722
4714 -#: builtin/am.c:2380
4723 +#: builtin/am.c:2379
4724 #, c-format
4725 msgid ""
4726 "Stray %s directory found.\n"
4727 "Use \"git am --abort\" to remove it."
4728 msgstr ""
4729
4721 -#: builtin/am.c:2386
4730 +#: builtin/am.c:2385
4731 msgid "Resolve operation not in progress, we are not resuming."
4732 msgstr ""
4733
@@ -4748,11 +4757,6 @@ msgstr ""
4757 msgid "git archive: NACK %s"
4758 msgstr ""
4759
4751 -#: builtin/archive.c:63
4752 -#, c-format
4753 -msgid "remote error: %s"
4754 -msgstr ""
4755 -
4760 #: builtin/archive.c:64
4761 msgid "git archive: protocol error"
4762 msgstr ""
@@ -5405,7 +5409,7 @@ msgstr ""
5409 msgid "terminate input and output records by a NUL character"
5410 msgstr ""
5411
5408 -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
5412 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
5413 msgid "suppress progress reporting"
5414 msgstr ""
5415
@@ -5497,7 +5501,7 @@ msgstr ""
5501 #: builtin/checkout-index.c:174 builtin/column.c:30
5502 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
5503 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
5500 -#: builtin/worktree.c:472
5504 +#: builtin/worktree.c:477
5505 msgid "string"
5506 msgstr ""
5507
@@ -5695,8 +5699,8 @@ msgid "Cannot switch branch to a non-commit '%s'"
5699 msgstr ""
5700
5701 #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
5698 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
5699 -#: builtin/worktree.c:327
5702 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
5703 +#: builtin/worktree.c:331
5704 msgid "branch"
5705 msgstr ""
5706
@@ -5712,7 +5716,7 @@ msgstr ""
5716 msgid "create reflog for new branch"
5717 msgstr ""
5718
5715 -#: builtin/checkout.c:1164 builtin/worktree.c:329
5719 +#: builtin/checkout.c:1164 builtin/worktree.c:333
5720 msgid "detach HEAD at named commit"
5721 msgstr ""
5722
@@ -5937,7 +5941,7 @@ msgid "remove whole directories"
5941 msgstr ""
5942
5943 #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
5940 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
5944 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
5945 #: builtin/name-rev.c:350 builtin/show-ref.c:176
5946 msgid "pattern"
5947 msgstr ""
@@ -6183,7 +6187,7 @@ msgstr ""
6187 msgid "cannot unlink temporary alternates file"
6188 msgstr ""
6189
6186 -#: builtin/clone.c:884 builtin/receive-pack.c:1901
6190 +#: builtin/clone.c:884 builtin/receive-pack.c:1900
6191 msgid "Too many arguments."
6192 msgstr ""
6193
@@ -6221,7 +6225,7 @@ msgid "working tree '%s' already exists."
6225 msgstr ""
6226
6227 #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
6224 -#: builtin/worktree.c:222 builtin/worktree.c:249
6228 +#: builtin/worktree.c:221 builtin/worktree.c:251
6229 #, c-format
6230 msgid "could not create leading directories of '%s'"
6231 msgstr ""
@@ -6614,7 +6618,7 @@ msgid "version"
6618 msgstr ""
6619
6620 #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
6617 -#: builtin/worktree.c:443
6621 +#: builtin/worktree.c:448
6622 msgid "machine-readable output"
6623 msgstr ""
6624
@@ -6693,7 +6697,7 @@ msgstr ""
6697 msgid "override author for commit"
6698 msgstr ""
6699
6696 -#: builtin/commit.c:1588 builtin/gc.c:353
6700 +#: builtin/commit.c:1588 builtin/gc.c:357
6701 msgid "date"
6702 msgstr ""
6703
@@ -6851,139 +6855,139 @@ msgstr ""
6855 msgid "git config [<options>]"
6856 msgstr ""
6857
6854 -#: builtin/config.c:55
6858 +#: builtin/config.c:56
6859 msgid "Config file location"
6860 msgstr ""
6861
6858 -#: builtin/config.c:56
6862 +#: builtin/config.c:57
6863 msgid "use global config file"
6864 msgstr ""
6865
6862 -#: builtin/config.c:57
6866 +#: builtin/config.c:58
6867 msgid "use system config file"
6868 msgstr ""
6869
6866 -#: builtin/config.c:58
6870 +#: builtin/config.c:59
6871 msgid "use repository config file"
6872 msgstr ""
6873
6870 -#: builtin/config.c:59
6874 +#: builtin/config.c:60
6875 msgid "use given config file"
6876 msgstr ""
6877
6874 -#: builtin/config.c:60
6878 +#: builtin/config.c:61
6879 msgid "blob-id"
6880 msgstr ""
6881
6878 -#: builtin/config.c:60
6882 +#: builtin/config.c:61
6883 msgid "read config from given blob object"
6884 msgstr ""
6885
6882 -#: builtin/config.c:61
6886 +#: builtin/config.c:62
6887 msgid "Action"
6888 msgstr ""
6889
6886 -#: builtin/config.c:62
6890 +#: builtin/config.c:63
6891 msgid "get value: name [value-regex]"
6892 msgstr ""
6893
6890 -#: builtin/config.c:63
6894 +#: builtin/config.c:64
6895 msgid "get all values: key [value-regex]"
6896 msgstr ""
6897
6894 -#: builtin/config.c:64
6898 +#: builtin/config.c:65
6899 msgid "get values for regexp: name-regex [value-regex]"
6900 msgstr ""
6901
6898 -#: builtin/config.c:65
6902 +#: builtin/config.c:66
6903 msgid "get value specific for the URL: section[.var] URL"
6904 msgstr ""
6905
6902 -#: builtin/config.c:66
6906 +#: builtin/config.c:67
6907 msgid "replace all matching variables: name value [value_regex]"
6908 msgstr ""
6909
6906 -#: builtin/config.c:67
6910 +#: builtin/config.c:68
6911 msgid "add a new variable: name value"
6912 msgstr ""
6913
6910 -#: builtin/config.c:68
6914 +#: builtin/config.c:69
6915 msgid "remove a variable: name [value-regex]"
6916 msgstr ""
6917
6914 -#: builtin/config.c:69
6918 +#: builtin/config.c:70
6919 msgid "remove all matches: name [value-regex]"
6920 msgstr ""
6921
6918 -#: builtin/config.c:70
6922 +#: builtin/config.c:71
6923 msgid "rename section: old-name new-name"
6924 msgstr ""
6925
6922 -#: builtin/config.c:71
6926 +#: builtin/config.c:72
6927 msgid "remove a section: name"
6928 msgstr ""
6929
6926 -#: builtin/config.c:72
6930 +#: builtin/config.c:73
6931 msgid "list all"
6932 msgstr ""
6933
6930 -#: builtin/config.c:73
6934 +#: builtin/config.c:74
6935 msgid "open an editor"
6936 msgstr ""
6937
6934 -#: builtin/config.c:74
6938 +#: builtin/config.c:75
6939 msgid "find the color configured: slot [default]"
6940 msgstr ""
6941
6938 -#: builtin/config.c:75
6942 +#: builtin/config.c:76
6943 msgid "find the color setting: slot [stdout-is-tty]"
6944 msgstr ""
6945
6942 -#: builtin/config.c:76
6946 +#: builtin/config.c:77
6947 msgid "Type"
6948 msgstr ""
6949
6946 -#: builtin/config.c:77
6950 +#: builtin/config.c:78
6951 msgid "value is \"true\" or \"false\""
6952 msgstr ""
6953
6950 -#: builtin/config.c:78
6954 +#: builtin/config.c:79
6955 msgid "value is decimal number"
6956 msgstr ""
6957
6954 -#: builtin/config.c:79
6958 +#: builtin/config.c:80
6959 msgid "value is --bool or --int"
6960 msgstr ""
6961
6958 -#: builtin/config.c:80
6962 +#: builtin/config.c:81
6963 msgid "value is a path (file or directory name)"
6964 msgstr ""
6965
6962 -#: builtin/config.c:81
6966 +#: builtin/config.c:82
6967 msgid "Other"
6968 msgstr ""
6969
6966 -#: builtin/config.c:82
6970 +#: builtin/config.c:83
6971 msgid "terminate values with NUL byte"
6972 msgstr ""
6973
6970 -#: builtin/config.c:83
6974 +#: builtin/config.c:84
6975 msgid "show variable names only"
6976 msgstr ""
6977
6974 -#: builtin/config.c:84
6978 +#: builtin/config.c:85
6979 msgid "respect include directives on lookup"
6980 msgstr ""
6981
6978 -#: builtin/config.c:85
6982 +#: builtin/config.c:86
6983 msgid "show origin of config (file, standard input, blob, command line)"
6984 msgstr ""
6985
6982 -#: builtin/config.c:327
6986 +#: builtin/config.c:328
6987 msgid "unable to parse default color value"
6988 msgstr ""
6989
6986 -#: builtin/config.c:471
6990 +#: builtin/config.c:472
6991 #, c-format
6992 msgid ""
6993 "# This is Git's per-user configuration file.\n"
@@ -6993,12 +6997,12 @@ msgid ""
6997 "#\temail = %s\n"
6998 msgstr ""
6999
6996 -#: builtin/config.c:611
7000 +#: builtin/config.c:615
7001 #, c-format
7002 msgid "cannot create configuration file %s"
7003 msgstr ""
7004
7001 -#: builtin/config.c:623
7005 +#: builtin/config.c:627
7006 #, c-format
7007 msgid ""
7008 "cannot overwrite multiple values with a single value\n"
@@ -7772,12 +7776,12 @@ msgstr ""
7776 msgid "Failed to fstat %s: %s"
7777 msgstr ""
7778
7775 -#: builtin/gc.c:306
7779 +#: builtin/gc.c:310
7780 #, c-format
7781 msgid "Can't stat %s"
7782 msgstr ""
7783
7780 -#: builtin/gc.c:315
7784 +#: builtin/gc.c:319
7785 #, c-format
7786 msgid ""
7787 "The last gc run reported the following. Please correct the root cause\n"
@@ -7787,49 +7791,49 @@ msgid ""
7791 "%s"
7792 msgstr ""
7793
7790 -#: builtin/gc.c:354
7794 +#: builtin/gc.c:358
7795 msgid "prune unreferenced objects"
7796 msgstr ""
7797
7794 -#: builtin/gc.c:356
7798 +#: builtin/gc.c:360
7799 msgid "be more thorough (increased runtime)"
7800 msgstr ""
7801
7798 -#: builtin/gc.c:357
7802 +#: builtin/gc.c:361
7803 msgid "enable auto-gc mode"
7804 msgstr ""
7805
7802 -#: builtin/gc.c:358
7806 +#: builtin/gc.c:362
7807 msgid "force running gc even if there may be another gc running"
7808 msgstr ""
7809
7806 -#: builtin/gc.c:375
7810 +#: builtin/gc.c:379
7811 #, c-format
7812 msgid "Failed to parse gc.logexpiry value %s"
7813 msgstr ""
7814
7811 -#: builtin/gc.c:403
7815 +#: builtin/gc.c:407
7816 #, c-format
7817 msgid "Auto packing the repository in background for optimum performance.\n"
7818 msgstr ""
7819
7816 -#: builtin/gc.c:405
7820 +#: builtin/gc.c:409
7821 #, c-format
7822 msgid "Auto packing the repository for optimum performance.\n"
7823 msgstr ""
7824
7821 -#: builtin/gc.c:406
7825 +#: builtin/gc.c:410
7826 #, c-format
7827 msgid "See \"git help gc\" for manual housekeeping.\n"
7828 msgstr ""
7829
7826 -#: builtin/gc.c:427
7830 +#: builtin/gc.c:431
7831 #, c-format
7832 msgid ""
7833 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
7834 msgstr ""
7835
7832 -#: builtin/gc.c:471
7836 +#: builtin/gc.c:475
7837 msgid ""
7838 "There are too many unreachable loose objects; run 'git prune' to remove them."
7839 msgstr ""
@@ -9008,103 +9012,103 @@ msgid ""
9012 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
9013 msgstr ""
9014
9011 -#: builtin/ls-files.c:461
9015 +#: builtin/ls-files.c:468
9016 msgid "git ls-files [<options>] [<file>...]"
9017 msgstr ""
9018
9015 -#: builtin/ls-files.c:510
9019 +#: builtin/ls-files.c:517
9020 msgid "identify the file status with tags"
9021 msgstr ""
9022
9019 -#: builtin/ls-files.c:512
9023 +#: builtin/ls-files.c:519
9024 msgid "use lowercase letters for 'assume unchanged' files"
9025 msgstr ""
9026
9023 -#: builtin/ls-files.c:514
9027 +#: builtin/ls-files.c:521
9028 msgid "show cached files in the output (default)"
9029 msgstr ""
9030
9027 -#: builtin/ls-files.c:516
9031 +#: builtin/ls-files.c:523
9032 msgid "show deleted files in the output"
9033 msgstr ""
9034
9031 -#: builtin/ls-files.c:518
9035 +#: builtin/ls-files.c:525
9036 msgid "show modified files in the output"
9037 msgstr ""
9038
9035 -#: builtin/ls-files.c:520
9039 +#: builtin/ls-files.c:527
9040 msgid "show other files in the output"
9041 msgstr ""
9042
9039 -#: builtin/ls-files.c:522
9043 +#: builtin/ls-files.c:529
9044 msgid "show ignored files in the output"
9045 msgstr ""
9046
9043 -#: builtin/ls-files.c:525
9047 +#: builtin/ls-files.c:532
9048 msgid "show staged contents' object name in the output"
9049 msgstr ""
9050
9047 -#: builtin/ls-files.c:527
9051 +#: builtin/ls-files.c:534
9052 msgid "show files on the filesystem that need to be removed"
9053 msgstr ""
9054
9051 -#: builtin/ls-files.c:529
9055 +#: builtin/ls-files.c:536
9056 msgid "show 'other' directories' names only"
9057 msgstr ""
9058
9055 -#: builtin/ls-files.c:531
9059 +#: builtin/ls-files.c:538
9060 msgid "show line endings of files"
9061 msgstr ""
9062
9059 -#: builtin/ls-files.c:533
9063 +#: builtin/ls-files.c:540
9064 msgid "don't show empty directories"
9065 msgstr ""
9066
9063 -#: builtin/ls-files.c:536
9067 +#: builtin/ls-files.c:543
9068 msgid "show unmerged files in the output"
9069 msgstr ""
9070
9067 -#: builtin/ls-files.c:538
9071 +#: builtin/ls-files.c:545
9072 msgid "show resolve-undo information"
9073 msgstr ""
9074
9071 -#: builtin/ls-files.c:540
9075 +#: builtin/ls-files.c:547
9076 msgid "skip files matching pattern"
9077 msgstr ""
9078
9075 -#: builtin/ls-files.c:543
9079 +#: builtin/ls-files.c:550
9080 msgid "exclude patterns are read from <file>"
9081 msgstr ""
9082
9079 -#: builtin/ls-files.c:546
9083 +#: builtin/ls-files.c:553
9084 msgid "read additional per-directory exclude patterns in <file>"
9085 msgstr ""
9086
9083 -#: builtin/ls-files.c:548
9087 +#: builtin/ls-files.c:555
9088 msgid "add the standard git exclusions"
9089 msgstr ""
9090
9087 -#: builtin/ls-files.c:551
9091 +#: builtin/ls-files.c:558
9092 msgid "make the output relative to the project top directory"
9093 msgstr ""
9094
9091 -#: builtin/ls-files.c:554
9095 +#: builtin/ls-files.c:561
9096 msgid "recurse through submodules"
9097 msgstr ""
9098
9095 -#: builtin/ls-files.c:556
9099 +#: builtin/ls-files.c:563
9100 msgid "if any <file> is not in the index, treat this as an error"
9101 msgstr ""
9102
9099 -#: builtin/ls-files.c:557
9103 +#: builtin/ls-files.c:564
9104 msgid "tree-ish"
9105 msgstr ""
9106
9103 -#: builtin/ls-files.c:558
9107 +#: builtin/ls-files.c:565
9108 msgid "pretend that paths removed since <tree-ish> are still present"
9109 msgstr ""
9110
9107 -#: builtin/ls-files.c:560
9111 +#: builtin/ls-files.c:567
9112 msgid "show debugging data"
9113 msgstr ""
9114
@@ -10511,7 +10515,7 @@ msgstr ""
10515 msgid "<remote>"
10516 msgstr ""
10517
10514 -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
10518 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
10519 #: git-parse-remote.sh:65
10520 msgid "<branch>"
10521 msgstr ""
@@ -10909,7 +10913,7 @@ msgstr ""
10913 msgid "git receive-pack <git-dir>"
10914 msgstr ""
10915
10912 -#: builtin/receive-pack.c:796
10916 +#: builtin/receive-pack.c:795
10917 msgid ""
10918 "By default, updating the current branch in a non-bare repository\n"
10919 "is denied, because it will make the index and work tree inconsistent\n"
@@ -10926,7 +10930,7 @@ msgid ""
10930 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
10931 msgstr ""
10932
10929 -#: builtin/receive-pack.c:816
10933 +#: builtin/receive-pack.c:815
10934 msgid ""
10935 "By default, deleting the current branch is denied, because the next\n"
10936 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -10938,11 +10942,11 @@ msgid ""
10942 "To squelch this message, you can set it to 'refuse'."
10943 msgstr ""
10944
10941 -#: builtin/receive-pack.c:1889
10945 +#: builtin/receive-pack.c:1888
10946 msgid "quiet"
10947 msgstr ""
10948
10945 -#: builtin/receive-pack.c:1903
10949 +#: builtin/receive-pack.c:1902
10950 msgid "You must specify a directory."
10951 msgstr ""
10952
@@ -11558,67 +11562,67 @@ msgstr ""
11562 msgid "git replace [--format=<format>] [-l [<pattern>]]"
11563 msgstr ""
11564
11561 -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
11565 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
11566 #, c-format
11567 msgid "Not a valid object name: '%s'"
11568 msgstr ""
11569
11566 -#: builtin/replace.c:359
11570 +#: builtin/replace.c:360
11571 #, c-format
11572 msgid "bad mergetag in commit '%s'"
11573 msgstr ""
11574
11571 -#: builtin/replace.c:361
11575 +#: builtin/replace.c:362
11576 #, c-format
11577 msgid "malformed mergetag in commit '%s'"
11578 msgstr ""
11579
11576 -#: builtin/replace.c:372
11580 +#: builtin/replace.c:373
11581 #, c-format
11582 msgid ""
11583 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
11584 "instead of --graft"
11585 msgstr ""
11586
11583 -#: builtin/replace.c:405
11587 +#: builtin/replace.c:406
11588 #, c-format
11589 msgid "the original commit '%s' has a gpg signature."
11590 msgstr ""
11591
11588 -#: builtin/replace.c:406
11592 +#: builtin/replace.c:407
11593 msgid "the signature will be removed in the replacement commit!"
11594 msgstr ""
11595
11592 -#: builtin/replace.c:412
11596 +#: builtin/replace.c:413
11597 #, c-format
11598 msgid "could not write replacement commit for: '%s'"
11599 msgstr ""
11600
11597 -#: builtin/replace.c:436
11601 +#: builtin/replace.c:437
11602 msgid "list replace refs"
11603 msgstr ""
11604
11601 -#: builtin/replace.c:437
11605 +#: builtin/replace.c:438
11606 msgid "delete replace refs"
11607 msgstr ""
11608
11605 -#: builtin/replace.c:438
11609 +#: builtin/replace.c:439
11610 msgid "edit existing object"
11611 msgstr ""
11612
11609 -#: builtin/replace.c:439
11613 +#: builtin/replace.c:440
11614 msgid "change a commit's parents"
11615 msgstr ""
11616
11613 -#: builtin/replace.c:440
11617 +#: builtin/replace.c:441
11618 msgid "replace the ref if it exists"
11619 msgstr ""
11620
11617 -#: builtin/replace.c:441
11621 +#: builtin/replace.c:442
11622 msgid "do not pretty-print contents for --edit"
11623 msgstr ""
11624
11621 -#: builtin/replace.c:442
11625 +#: builtin/replace.c:443
11626 msgid "use this format"
11627 msgstr ""
11628
@@ -12205,7 +12209,7 @@ msgstr ""
12209 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12210 msgstr ""
12211
12208 -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
12212 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
12213 #, c-format
12214 msgid "No url found for submodule path '%s' in .gitmodules"
12215 msgstr ""
@@ -12498,30 +12502,6 @@ msgstr ""
12502 msgid "The tag message has been left in %s\n"
12503 msgstr ""
12504
12501 -#: builtin/tag.c:312
12502 -msgid "tag: tagging "
12503 -msgstr ""
12504 -
12505 -#: builtin/tag.c:320
12506 -msgid "object of unknown type"
12507 -msgstr ""
12508 -
12509 -#: builtin/tag.c:327
12510 -msgid "commit object"
12511 -msgstr ""
12512 -
12513 -#: builtin/tag.c:335
12514 -msgid "tree object"
12515 -msgstr ""
12516 -
12517 -#: builtin/tag.c:338
12518 -msgid "blob object"
12519 -msgstr ""
12520 -
12521 -#: builtin/tag.c:341
12522 -msgid "other tag object"
12523 -msgstr ""
12524 -
12505 #: builtin/tag.c:397
12506 msgid "list tag names"
12507 msgstr ""
@@ -12944,27 +12924,27 @@ msgstr ""
12924 msgid "git worktree unlock <path>"
12925 msgstr ""
12926
12947 -#: builtin/worktree.c:42
12927 +#: builtin/worktree.c:43
12928 #, c-format
12929 msgid "Removing worktrees/%s: not a valid directory"
12930 msgstr ""
12931
12952 -#: builtin/worktree.c:48
12932 +#: builtin/worktree.c:49
12933 #, c-format
12934 msgid "Removing worktrees/%s: gitdir file does not exist"
12935 msgstr ""
12936
12957 -#: builtin/worktree.c:53
12937 +#: builtin/worktree.c:54
12938 #, c-format
12939 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
12940 msgstr ""
12941
12962 -#: builtin/worktree.c:64
12942 +#: builtin/worktree.c:65
12943 #, c-format
12944 msgid "Removing worktrees/%s: invalid gitdir file"
12945 msgstr ""
12946
12967 -#: builtin/worktree.c:80
12947 +#: builtin/worktree.c:81
12948 #, c-format
12949 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
12950 msgstr ""
@@ -12982,60 +12962,64 @@ msgstr ""
12962 msgid "'%s' already exists"
12963 msgstr ""
12964
12985 -#: builtin/worktree.c:236
12965 +#: builtin/worktree.c:235
12966 #, c-format
12967 msgid "could not create directory of '%s'"
12968 msgstr ""
12969
12990 -#: builtin/worktree.c:272
12970 +#: builtin/worktree.c:274
12971 #, c-format
12972 msgid "Preparing %s (identifier %s)"
12973 msgstr ""
12974
12995 -#: builtin/worktree.c:324
12975 +#: builtin/worktree.c:328
12976 msgid "checkout <branch> even if already checked out in other worktree"
12977 msgstr ""
12978
12999 -#: builtin/worktree.c:326
12979 +#: builtin/worktree.c:330
12980 msgid "create a new branch"
12981 msgstr ""
12982
13003 -#: builtin/worktree.c:328
12983 +#: builtin/worktree.c:332
12984 msgid "create or reset a branch"
12985 msgstr ""
12986
13007 -#: builtin/worktree.c:330
12987 +#: builtin/worktree.c:334
12988 msgid "populate the new working tree"
12989 msgstr ""
12990
13011 -#: builtin/worktree.c:338
12991 +#: builtin/worktree.c:335
12992 +msgid "keep the new working tree locked"
12993 +msgstr ""
12994 +
12995 +#: builtin/worktree.c:343
12996 msgid "-b, -B, and --detach are mutually exclusive"
12997 msgstr ""
12998
13015 -#: builtin/worktree.c:473
12999 +#: builtin/worktree.c:478
13000 msgid "reason for locking"
13001 msgstr ""
13002
13019 -#: builtin/worktree.c:485 builtin/worktree.c:518
13003 +#: builtin/worktree.c:490 builtin/worktree.c:523
13004 #, c-format
13005 msgid "'%s' is not a working tree"
13006 msgstr ""
13007
13024 -#: builtin/worktree.c:487 builtin/worktree.c:520
13008 +#: builtin/worktree.c:492 builtin/worktree.c:525
13009 msgid "The main working tree cannot be locked or unlocked"
13010 msgstr ""
13011
13028 -#: builtin/worktree.c:492
13012 +#: builtin/worktree.c:497
13013 #, c-format
13014 msgid "'%s' is already locked, reason: %s"
13015 msgstr ""
13016
13033 -#: builtin/worktree.c:494
13017 +#: builtin/worktree.c:499
13018 #, c-format
13019 msgid "'%s' is already locked"
13020 msgstr ""
13021
13038 -#: builtin/worktree.c:522
13022 +#: builtin/worktree.c:527
13023 #, c-format
13024 msgid "'%s' is not locked"
13025 msgstr ""
@@ -13096,15 +13080,20 @@ msgid ""
13080 "to read about a specific subcommand or concept."
13081 msgstr ""
13082
13099 -#: http.c:355
13083 +#: http.c:336
13084 +#, c-format
13085 +msgid "negative value for http.postbuffer; defaulting to %d"
13086 +msgstr ""
13087 +
13088 +#: http.c:357
13089 msgid "Delegation control is not supported with cURL < 7.22.0"
13090 msgstr ""
13091
13103 -#: http.c:364
13092 +#: http.c:366
13093 msgid "Public key pinning not supported with cURL < 7.44.0"
13094 msgstr ""
13095
13107 -#: http.c:1755
13096 +#: http.c:1766
13097 #, c-format
13098 msgid ""
13099 "unable to update url base from redirection:\n"
@@ -13465,7 +13454,7 @@ msgstr ""
13454 msgid "Simple merge did not work, trying automatic merge."
13455 msgstr ""
13456
13468 -#: git-rebase.sh:57
13457 +#: git-rebase.sh:58
13458 msgid ""
13459 "When you have resolved this problem, run \"git rebase --continue\".\n"
13460 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -13473,43 +13462,43 @@ msgid ""
13462 "\"."
13463 msgstr ""
13464
13476 -#: git-rebase.sh:157 git-rebase.sh:396
13465 +#: git-rebase.sh:158 git-rebase.sh:397
13466 #, sh-format
13467 msgid "Could not move back to $head_name"
13468 msgstr ""
13469
13481 -#: git-rebase.sh:171
13470 +#: git-rebase.sh:172
13471 #, sh-format
13472 msgid "Cannot store $stash_sha1"
13473 msgstr ""
13474
13486 -#: git-rebase.sh:211
13475 +#: git-rebase.sh:212
13476 msgid "The pre-rebase hook refused to rebase."
13477 msgstr ""
13478
13490 -#: git-rebase.sh:216
13479 +#: git-rebase.sh:217
13480 msgid "It looks like git-am is in progress. Cannot rebase."
13481 msgstr ""
13482
13494 -#: git-rebase.sh:357
13483 +#: git-rebase.sh:358
13484 msgid "No rebase in progress?"
13485 msgstr ""
13486
13498 -#: git-rebase.sh:368
13487 +#: git-rebase.sh:369
13488 msgid "The --edit-todo action can only be used during interactive rebase."
13489 msgstr ""
13490
13502 -#: git-rebase.sh:375
13491 +#: git-rebase.sh:376
13492 msgid "Cannot read HEAD"
13493 msgstr ""
13494
13506 -#: git-rebase.sh:378
13495 +#: git-rebase.sh:379
13496 msgid ""
13497 "You must edit all merge conflicts and then\n"
13498 "mark them as resolved using git add"
13499 msgstr ""
13500
13512 -#: git-rebase.sh:418
13501 +#: git-rebase.sh:419
13502 #, sh-format
13503 msgid ""
13504 "It seems that there is already a $state_dir_base directory, and\n"
@@ -13522,64 +13511,64 @@ msgid ""
13511 "valuable there."
13512 msgstr ""
13513
13525 -#: git-rebase.sh:469
13514 +#: git-rebase.sh:470
13515 #, sh-format
13516 msgid "invalid upstream $upstream_name"
13517 msgstr ""
13518
13530 -#: git-rebase.sh:493
13519 +#: git-rebase.sh:494
13520 #, sh-format
13521 msgid "$onto_name: there are more than one merge bases"
13522 msgstr ""
13523
13535 -#: git-rebase.sh:496 git-rebase.sh:500
13524 +#: git-rebase.sh:497 git-rebase.sh:501
13525 #, sh-format
13526 msgid "$onto_name: there is no merge base"
13527 msgstr ""
13528
13540 -#: git-rebase.sh:505
13529 +#: git-rebase.sh:506
13530 #, sh-format
13531 msgid "Does not point to a valid commit: $onto_name"
13532 msgstr ""
13533
13545 -#: git-rebase.sh:528
13534 +#: git-rebase.sh:529
13535 #, sh-format
13536 msgid "fatal: no such branch: $branch_name"
13537 msgstr ""
13538
13550 -#: git-rebase.sh:561
13539 +#: git-rebase.sh:562
13540 msgid "Cannot autostash"
13541 msgstr ""
13542
13554 -#: git-rebase.sh:566
13543 +#: git-rebase.sh:567
13544 #, sh-format
13545 msgid "Created autostash: $stash_abbrev"
13546 msgstr ""
13547
13559 -#: git-rebase.sh:570
13548 +#: git-rebase.sh:571
13549 msgid "Please commit or stash them."
13550 msgstr ""
13551
13563 -#: git-rebase.sh:590
13552 +#: git-rebase.sh:591
13553 #, sh-format
13554 msgid "Current branch $branch_name is up to date."
13555 msgstr ""
13556
13568 -#: git-rebase.sh:594
13557 +#: git-rebase.sh:595
13558 #, sh-format
13559 msgid "Current branch $branch_name is up to date, rebase forced."
13560 msgstr ""
13561
13573 -#: git-rebase.sh:605
13562 +#: git-rebase.sh:606
13563 #, sh-format
13564 msgid "Changes from $mb to $onto:"
13565 msgstr ""
13566
13578 -#: git-rebase.sh:614
13567 +#: git-rebase.sh:615
13568 msgid "First, rewinding head to replay your work on top of it..."
13569 msgstr ""
13570
13582 -#: git-rebase.sh:624
13571 +#: git-rebase.sh:625
13572 #, sh-format
13573 msgid "Fast-forwarded $branch_name to $onto_name."
13574 msgstr ""