673bfad09c · matheusbsbs/matheus-bagliano

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

8 msgstr ""

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

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

11 -"POT-Creation-Date: 2016-11-25 22:50+0800\n"

11 +"POT-Creation-Date: 2017-02-04 13:02+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"

@@ -58,7 +58,7 @@ msgstr ""

58 msgid "Exiting because of an unresolved conflict."

59 msgstr ""

60

61 -#: advice.c:114 builtin/merge.c:1181

61 +#: advice.c:114 builtin/merge.c:1206

62 msgid "You have not concluded your merge (MERGE_HEAD exists)."

63 msgstr ""

64

@@ -504,7 +504,7 @@ msgstr[1] ""

504 msgid "truncating .rej filename to %.*s.rej"

505 msgstr ""

506

507 -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

507 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

508 #, c-format

509 msgid "cannot open %s"

510 msgstr ""

@@ -558,15 +558,16 @@ msgid_plural "%d lines applied after fixing whitespace errors."

558 msgstr[0] ""

559 msgstr[1] ""

560

561 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

561 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

562 msgid "Unable to write new index file"

563 msgstr ""

564

565 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

566 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

567 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

568 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

569 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

567 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

568 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

569 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

570 +#: git-add--interactive.perl:239

571 msgid "path"

572 msgstr ""

573

@@ -667,8 +668,8 @@ msgid "allow overlapping hunks"

668 msgstr ""

669

670 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

670 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

671 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

671 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

672 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

673 msgid "be verbose"

674 msgstr ""

675

@@ -705,7 +706,7 @@ msgstr ""

706 msgid "git archive --remote <repo> [--exec <cmd>] --list"

707 msgstr ""

708

708 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

709 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

710 #, c-format

711 msgid "pathspec '%s' did not match any files"

712 msgstr ""

@@ -726,8 +727,8 @@ msgstr ""

727 msgid "prepend prefix to each pathname in the archive"

728 msgstr ""

729

729 -#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59

730 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723

730 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

731 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

732 #: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542

733 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

734 #: parse-options.h:153

@@ -763,7 +764,7 @@ msgid "list supported archive formats"

764 msgstr ""

765

766 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

766 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

767 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

768 msgid "repo"

769 msgstr ""

770

@@ -851,7 +852,7 @@ msgstr ""

852 #: bisect.c:750

853 #, c-format

854 msgid ""

854 -"Some %s revs are not ancestor of the %s rev.\n"

855 +"Some %s revs are not ancestors of the %s rev.\n"

856 "git bisect cannot work properly in this case.\n"

857 "Maybe you mistook %s and %s revs?\n"

858 msgstr ""

@@ -874,7 +875,7 @@ msgstr ""

875 msgid "a %s revision is needed"

876 msgstr ""

877

877 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

878 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

879 #, c-format

880 msgid "could not create file '%s'"

881 msgstr ""

@@ -1050,7 +1051,7 @@ msgstr ""

1051 msgid "unrecognized header: %s%s (%d)"

1052 msgstr ""

1053

1053 -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1054 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1055 #, c-format

1056 msgid "could not open '%s'"

1057 msgstr ""

@@ -1059,10 +1060,10 @@ msgstr ""

1060 msgid "Repository lacks these prerequisite commits:"

1061 msgstr ""

1062

1062 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1063 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1063 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1064 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1065 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1065 -#: builtin/merge.c:356 builtin/shortlog.c:170

1066 +#: builtin/merge.c:360 builtin/shortlog.c:177

1067 msgid "revision walk setup failed"

1068 msgstr ""

1069

@@ -1101,7 +1102,7 @@ msgstr ""

1102 msgid "ref '%s' is excluded by the rev-list options"

1103 msgstr ""

1104

1104 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1105 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1106 #, c-format

1107 msgid "unrecognized argument: %s"

1108 msgstr ""

@@ -1119,13 +1120,13 @@ msgstr ""

1120 msgid "index-pack died"

1121 msgstr ""

1122

1122 -#: color.c:290

1123 +#: color.c:300

1124 #, c-format

1125 msgid "invalid color value: %.*s"

1126 msgstr ""

1127

1127 -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1128 -#: builtin/am.c:2127

1128 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1129 +#: builtin/am.c:1493 builtin/am.c:2127

1130 #, c-format

1131 msgid "could not parse %s"

1132 msgstr ""

@@ -1146,123 +1147,133 @@ msgstr ""

1147 msgid "memory exhausted"

1148 msgstr ""

1149

1149 -#: config.c:516

1150 +#: config.c:518

1151 #, c-format

1152 msgid "bad config line %d in blob %s"

1153 msgstr ""

1154

1154 -#: config.c:520

1155 +#: config.c:522

1156 #, c-format

1157 msgid "bad config line %d in file %s"

1158 msgstr ""

1159

1159 -#: config.c:524

1160 +#: config.c:526

1161 #, c-format

1162 msgid "bad config line %d in standard input"

1163 msgstr ""

1164

1164 -#: config.c:528

1165 +#: config.c:530

1166 #, c-format

1167 msgid "bad config line %d in submodule-blob %s"

1168 msgstr ""

1169

1169 -#: config.c:532

1170 +#: config.c:534

1171 #, c-format

1172 msgid "bad config line %d in command line %s"

1173 msgstr ""

1174

1174 -#: config.c:536

1175 +#: config.c:538

1176 #, c-format

1177 msgid "bad config line %d in %s"

1178 msgstr ""

1179

1179 -#: config.c:655

1180 +#: config.c:657

1181 msgid "out of range"

1182 msgstr ""

1183

1183 -#: config.c:655

1184 +#: config.c:657

1185 msgid "invalid unit"

1186 msgstr ""

1187

1187 -#: config.c:661

1188 +#: config.c:663

1189 #, c-format

1190 msgid "bad numeric config value '%s' for '%s': %s"

1191 msgstr ""

1192

1192 -#: config.c:666

1193 +#: config.c:668

1194 #, c-format

1195 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1196 msgstr ""

1197

1197 -#: config.c:669

1198 +#: config.c:671

1199 #, c-format

1200 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1201 msgstr ""

1202

1202 -#: config.c:672

1203 +#: config.c:674

1204 #, c-format

1205 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1206 msgstr ""

1207

1207 -#: config.c:675

1208 +#: config.c:677

1209 #, c-format

1210 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1211 msgstr ""

1212

1212 -#: config.c:678

1213 +#: config.c:680

1214 #, c-format

1215 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1216 msgstr ""

1217

1217 -#: config.c:681

1218 +#: config.c:683

1219 #, c-format

1220 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1221 msgstr ""

1222

1222 -#: config.c:768

1223 +#: config.c:770

1224 #, c-format

1225 msgid "failed to expand user dir in: '%s'"

1226 msgstr ""

1227

1227 -#: config.c:852 config.c:863

1228 +#: config.c:865 config.c:876

1229 #, c-format

1230 msgid "bad zlib compression level %d"

1231 msgstr ""

1232

1232 -#: config.c:978

1233 +#: config.c:993

1234 #, c-format

1235 msgid "invalid mode for object creation: %s"

1236 msgstr ""

1237

1237 -#: config.c:1312

1238 +#: config.c:1149

1239 +#, c-format

1240 +msgid "bad pack compression level %d"

1241 +msgstr ""

1242 +

1243 +#: config.c:1339

1244 msgid "unable to parse command-line config"

1245 msgstr ""

1246

1241 -#: config.c:1362

1247 +#: config.c:1389

1248 msgid "unknown error occurred while reading the configuration files"

1249 msgstr ""

1250

1245 -#: config.c:1716

1251 +#: config.c:1743

1252 #, c-format

1253 msgid "unable to parse '%s' from command-line config"

1254 msgstr ""

1255

1250 -#: config.c:1718

1256 +#: config.c:1745

1257 #, c-format

1258 msgid "bad config variable '%s' in file '%s' at line %d"

1259 msgstr ""

1260

1255 -#: config.c:1777

1261 +#: config.c:1804

1262 #, c-format

1263 msgid "%s has multiple values"

1264 msgstr ""

1265

1260 -#: config.c:2311

1266 +#: config.c:2225 config.c:2450

1267 +#, c-format

1268 +msgid "fstat on %s failed"

1269 +msgstr ""

1270 +

1271 +#: config.c:2343

1272 #, c-format

1273 msgid "could not set '%s' to '%s'"

1274 msgstr ""

1275

1265 -#: config.c:2313

1276 +#: config.c:2345

1277 #, c-format

1278 msgid "could not unset '%s'"

1279 msgstr ""

@@ -1279,7 +1290,7 @@ msgid ""

1290 "and the repository exists."

1291 msgstr ""

1292

1282 -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1293 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1294 msgid "Checking connectivity"

1295 msgstr ""

1296

@@ -1411,65 +1422,70 @@ msgstr ""

1422 msgid " Unknown dirstat parameter '%s'\n"

1423 msgstr ""

1424

1414 -#: diff.c:283

1425 +#: diff.c:281

1426 #, c-format

1427 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1428 msgstr ""

1429

1419 -#: diff.c:346

1430 +#: diff.c:344

1431 #, c-format

1432 msgid ""

1433 "Found errors in 'diff.dirstat' config variable:\n"

1434 "%s"

1435 msgstr ""

1436

1426 -#: diff.c:3087

1437 +#: diff.c:3085

1438 #, c-format

1439 msgid "external diff died, stopping at %s"

1440 msgstr ""

1441

1431 -#: diff.c:3412

1442 +#: diff.c:3411

1443 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1444 msgstr ""

1445

1435 -#: diff.c:3502

1446 +#: diff.c:3501

1447 msgid "--follow requires exactly one pathspec"

1448 msgstr ""

1449

1439 -#: diff.c:3665

1450 +#: diff.c:3664

1451 #, c-format

1452 msgid ""

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

1454 "%s"

1455 msgstr ""

1456

1446 -#: diff.c:3679

1457 +#: diff.c:3678

1458 #, c-format

1459 msgid "Failed to parse --submodule option parameter: '%s'"

1460 msgstr ""

1461

1451 -#: diff.c:4700

1462 +#: diff.c:4695

1463 msgid "inexact rename detection was skipped due to too many files."

1464 msgstr ""

1465

1455 -#: diff.c:4703

1466 +#: diff.c:4698

1467 msgid "only found copies from modified paths due to too many files."

1468 msgstr ""

1469

1459 -#: diff.c:4706

1470 +#: diff.c:4701

1471 #, c-format

1472 msgid ""

1473 "you may want to set your %s variable to at least %d and retry the command."

1474 msgstr ""

1475

1465 -#: dir.c:1866

1476 +#: dir.c:1863

1477 msgid "failed to get kernel name and information"

1478 msgstr ""

1479

1469 -#: dir.c:1985

1480 +#: dir.c:1982

1481 msgid "Untracked cache is disabled on this system or location."

1482 msgstr ""

1483

1484 +#: dir.c:2760

1485 +#, c-format

1486 +msgid "could not migrate git directory from '%s' to '%s'"

1487 +msgstr ""

1488 +

1489 #: fetch-pack.c:213

1490 msgid "git fetch-pack: expected shallow list"

1491 msgstr ""

@@ -1650,63 +1666,68 @@ msgstr ""

1666 msgid "failed writing detached signature to '%s'"

1667 msgstr ""

1668

1653 -#: grep.c:1782

1669 +#: graph.c:96

1670 +#, c-format

1671 +msgid "ignore invalid color '%.*s' in log.graphColors"

1672 +msgstr ""

1673 +

1674 +#: grep.c:1794

1675 #, c-format

1676 msgid "'%s': unable to read %s"

1677 msgstr ""

1678

1658 -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1679 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

1680 #, c-format

1681 msgid "failed to stat '%s'"

1682 msgstr ""

1683

1663 -#: grep.c:1810

1684 +#: grep.c:1822

1685 #, c-format

1686 msgid "'%s': short read"

1687 msgstr ""

1688

1668 -#: help.c:203

1689 +#: help.c:218

1690 #, c-format

1691 msgid "available git commands in '%s'"

1692 msgstr ""

1693

1673 -#: help.c:210

1694 +#: help.c:225

1695 msgid "git commands available from elsewhere on your $PATH"

1696 msgstr ""

1697

1677 -#: help.c:241

1698 +#: help.c:256

1699 msgid "These are common Git commands used in various situations:"

1700 msgstr ""

1701

1681 -#: help.c:306

1702 +#: help.c:321

1703 #, c-format

1704 msgid ""

1705 "'%s' appears to be a git command, but we were not\n"

1706 "able to execute it. Maybe git-%s is broken?"

1707 msgstr ""

1708

1688 -#: help.c:361

1709 +#: help.c:376

1710 msgid "Uh oh. Your system reports no Git commands at all."

1711 msgstr ""

1712

1692 -#: help.c:383

1713 +#: help.c:398

1714 #, c-format

1715 msgid ""

1716 "WARNING: You called a Git command named '%s', which does not exist.\n"

1717 "Continuing under the assumption that you meant '%s'"

1718 msgstr ""

1719

1699 -#: help.c:388

1720 +#: help.c:403

1721 #, c-format

1722 msgid "in %0.1f seconds automatically..."

1723 msgstr ""

1724

1704 -#: help.c:395

1725 +#: help.c:410

1726 #, c-format

1727 msgid "git: '%s' is not a git command. See 'git --help'."

1728 msgstr ""

1729

1709 -#: help.c:399 help.c:465

1730 +#: help.c:414 help.c:480

1731 msgid ""

1732 "\n"

1733 "Did you mean this?"

@@ -1716,7 +1737,7 @@ msgid_plural ""

1737 msgstr[0] ""

1738 msgstr[1] ""

1739

1719 -#: help.c:461

1740 +#: help.c:476

1741 #, c-format

1742 msgid "%s: %s - %s"

1743 msgstr ""

@@ -1766,229 +1787,229 @@ msgstr ""

1787 msgid "(bad commit)\n"

1788 msgstr ""

1789

1769 -#: merge-recursive.c:231

1790 +#: merge-recursive.c:231 merge-recursive.c:239

1791 #, c-format

1792 msgid "addinfo_cache failed for path '%s'"

1793 msgstr ""

1794

1774 -#: merge-recursive.c:301

1795 +#: merge-recursive.c:303

1796 msgid "error building trees"

1797 msgstr ""

1798

1778 -#: merge-recursive.c:720

1799 +#: merge-recursive.c:727

1800 #, c-format

1801 msgid "failed to create path '%s'%s"

1802 msgstr ""

1803

1783 -#: merge-recursive.c:731

1804 +#: merge-recursive.c:738

1805 #, c-format

1806 msgid "Removing %s to make room for subdirectory\n"

1807 msgstr ""

1808

1788 -#: merge-recursive.c:745 merge-recursive.c:764

1809 +#: merge-recursive.c:752 merge-recursive.c:771

1810 msgid ": perhaps a D/F conflict?"

1811 msgstr ""

1812

1792 -#: merge-recursive.c:754

1813 +#: merge-recursive.c:761

1814 #, c-format

1815 msgid "refusing to lose untracked file at '%s'"

1816 msgstr ""

1817

1797 -#: merge-recursive.c:796 builtin/cat-file.c:34

1818 +#: merge-recursive.c:803 builtin/cat-file.c:34

1819 #, c-format

1820 msgid "cannot read object %s '%s'"

1821 msgstr ""

1822

1802 -#: merge-recursive.c:798

1823 +#: merge-recursive.c:805

1824 #, c-format

1825 msgid "blob expected for %s '%s'"

1826 msgstr ""

1827

1807 -#: merge-recursive.c:822

1828 +#: merge-recursive.c:829

1829 #, c-format

1830 msgid "failed to open '%s': %s"

1831 msgstr ""

1832

1812 -#: merge-recursive.c:833

1833 +#: merge-recursive.c:840

1834 #, c-format

1835 msgid "failed to symlink '%s': %s"

1836 msgstr ""

1837

1817 -#: merge-recursive.c:838

1838 +#: merge-recursive.c:845

1839 #, c-format

1840 msgid "do not know what to do with %06o %s '%s'"

1841 msgstr ""

1842

1822 -#: merge-recursive.c:978

1843 +#: merge-recursive.c:985

1844 msgid "Failed to execute internal merge"

1845 msgstr ""

1846

1826 -#: merge-recursive.c:982

1847 +#: merge-recursive.c:989

1848 #, c-format

1849 msgid "Unable to add %s to database"

1850 msgstr ""

1851

1831 -#: merge-recursive.c:1081 merge-recursive.c:1095

1852 +#: merge-recursive.c:1088 merge-recursive.c:1102

1853 #, c-format

1854 msgid ""

1855 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

1856 "in tree."

1857 msgstr ""

1858

1838 -#: merge-recursive.c:1087 merge-recursive.c:1100

1859 +#: merge-recursive.c:1094 merge-recursive.c:1107

1860 #, c-format

1861 msgid ""

1862 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

1863 "in tree at %s."

1864 msgstr ""

1865

1845 -#: merge-recursive.c:1143

1866 +#: merge-recursive.c:1150

1867 msgid "rename"

1868 msgstr ""

1869

1849 -#: merge-recursive.c:1143

1870 +#: merge-recursive.c:1150

1871 msgid "renamed"

1872 msgstr ""

1873

1853 -#: merge-recursive.c:1200

1874 +#: merge-recursive.c:1207

1875 #, c-format

1876 msgid "%s is a directory in %s adding as %s instead"

1877 msgstr ""

1878

1858 -#: merge-recursive.c:1225

1879 +#: merge-recursive.c:1232

1880 #, c-format

1881 msgid ""

1882 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

1883 "\"->\"%s\" in \"%s\"%s"

1884 msgstr ""

1885

1865 -#: merge-recursive.c:1230

1886 +#: merge-recursive.c:1237

1887 msgid " (left unresolved)"

1888 msgstr ""

1889

1869 -#: merge-recursive.c:1292

1890 +#: merge-recursive.c:1299

1891 #, c-format

1892 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

1893 msgstr ""

1894

1874 -#: merge-recursive.c:1325

1895 +#: merge-recursive.c:1332

1896 #, c-format

1897 msgid "Renaming %s to %s and %s to %s instead"

1898 msgstr ""

1899

1879 -#: merge-recursive.c:1531

1900 +#: merge-recursive.c:1538

1901 #, c-format

1902 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

1903 msgstr ""

1904

1884 -#: merge-recursive.c:1546

1905 +#: merge-recursive.c:1553

1906 #, c-format

1907 msgid "Adding merged %s"

1908 msgstr ""

1909

1889 -#: merge-recursive.c:1553 merge-recursive.c:1766

1910 +#: merge-recursive.c:1560 merge-recursive.c:1774

1911 #, c-format

1912 msgid "Adding as %s instead"

1913 msgstr ""

1914

1894 -#: merge-recursive.c:1610

1915 +#: merge-recursive.c:1617

1916 #, c-format

1917 msgid "cannot read object %s"

1918 msgstr ""

1919

1899 -#: merge-recursive.c:1613

1920 +#: merge-recursive.c:1620

1921 #, c-format

1922 msgid "object %s is not a blob"

1923 msgstr ""

1924

1904 -#: merge-recursive.c:1666

1925 +#: merge-recursive.c:1673

1926 msgid "modify"

1927 msgstr ""

1928

1908 -#: merge-recursive.c:1666

1929 +#: merge-recursive.c:1673

1930 msgid "modified"

1931 msgstr ""

1932

1912 -#: merge-recursive.c:1676

1933 +#: merge-recursive.c:1683

1934 msgid "content"

1935 msgstr ""

1936

1916 -#: merge-recursive.c:1683

1937 +#: merge-recursive.c:1690

1938 msgid "add/add"

1939 msgstr ""

1940

1920 -#: merge-recursive.c:1718

1941 +#: merge-recursive.c:1726

1942 #, c-format

1943 msgid "Skipped %s (merged same as existing)"

1944 msgstr ""

1945

1925 -#: merge-recursive.c:1732

1946 +#: merge-recursive.c:1740

1947 #, c-format

1948 msgid "Auto-merging %s"

1949 msgstr ""

1950

1930 -#: merge-recursive.c:1736 git-submodule.sh:924

1951 +#: merge-recursive.c:1744 git-submodule.sh:930

1952 msgid "submodule"

1953 msgstr ""

1954

1934 -#: merge-recursive.c:1737

1955 +#: merge-recursive.c:1745

1956 #, c-format

1957 msgid "CONFLICT (%s): Merge conflict in %s"

1958 msgstr ""

1959

1939 -#: merge-recursive.c:1831

1960 +#: merge-recursive.c:1839

1961 #, c-format

1962 msgid "Removing %s"

1963 msgstr ""

1964

1944 -#: merge-recursive.c:1857

1965 +#: merge-recursive.c:1865

1966 msgid "file/directory"

1967 msgstr ""

1968

1948 -#: merge-recursive.c:1863

1969 +#: merge-recursive.c:1871

1970 msgid "directory/file"

1971 msgstr ""

1972

1952 -#: merge-recursive.c:1868

1973 +#: merge-recursive.c:1877

1974 #, c-format

1975 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

1976 msgstr ""

1977

1957 -#: merge-recursive.c:1877

1978 +#: merge-recursive.c:1886

1979 #, c-format

1980 msgid "Adding %s"

1981 msgstr ""

1982

1962 -#: merge-recursive.c:1914

1983 +#: merge-recursive.c:1923

1984 msgid "Already up-to-date!"

1985 msgstr ""

1986

1966 -#: merge-recursive.c:1923

1987 +#: merge-recursive.c:1932

1988 #, c-format

1989 msgid "merging of trees %s and %s failed"

1990 msgstr ""

1991

1971 -#: merge-recursive.c:2006

1992 +#: merge-recursive.c:2015

1993 msgid "Merging:"

1994 msgstr ""

1995

1975 -#: merge-recursive.c:2019

1996 +#: merge-recursive.c:2028

1997 #, c-format

1998 msgid "found %u common ancestor:"

1999 msgid_plural "found %u common ancestors:"

2000 msgstr[0] ""

2001 msgstr[1] ""

2002

1982 -#: merge-recursive.c:2058

2003 +#: merge-recursive.c:2067

2004 msgid "merge returned no commit"

2005 msgstr ""

2006

1986 -#: merge-recursive.c:2121

2007 +#: merge-recursive.c:2130

2008 #, c-format

2009 msgid "Could not parse object '%s'"

2010 msgstr ""

2011

1991 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

2012 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

2013 msgid "Unable to write index."

2014 msgstr ""

2015

@@ -2066,91 +2087,96 @@ msgstr ""

2087 msgid "Could not make %s writable by group"

2088 msgstr ""

2089

2069 -#: pathspec.c:133

2090 +#: pathspec.c:142

2091 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2092 msgstr ""

2093

2073 -#: pathspec.c:143

2094 +#: pathspec.c:149

2095 msgid ""

2096 "global 'literal' pathspec setting is incompatible with all other global "

2097 "pathspec settings"

2098 msgstr ""

2099

2079 -#: pathspec.c:177

2100 +#: pathspec.c:188

2101 msgid "invalid parameter for pathspec magic 'prefix'"

2102 msgstr ""

2103

2083 -#: pathspec.c:183

2104 +#: pathspec.c:201

2105 #, c-format

2106 msgid "Invalid pathspec magic '%.*s' in '%s'"

2107 msgstr ""

2108

2088 -#: pathspec.c:187

2109 +#: pathspec.c:206

2110 #, c-format

2111 msgid "Missing ')' at the end of pathspec magic in '%s'"

2112 msgstr ""

2113

2093 -#: pathspec.c:205

2114 +#: pathspec.c:238

2115 #, c-format

2116 msgid "Unimplemented pathspec magic '%c' in '%s'"

2117 msgstr ""

2118

2098 -#: pathspec.c:230

2119 +#: pathspec.c:293 pathspec.c:315

2120 +#, c-format

2121 +msgid "Pathspec '%s' is in submodule '%.*s'"

2122 +msgstr ""

2123 +

2124 +#: pathspec.c:350

2125 #, c-format

2126 msgid "%s: 'literal' and 'glob' are incompatible"

2127 msgstr ""

2128

2103 -#: pathspec.c:241

2129 +#: pathspec.c:363

2130 #, c-format

2131 msgid "%s: '%s' is outside repository"

2132 msgstr ""

2133

2108 -#: pathspec.c:291

2134 +#: pathspec.c:451

2135 #, c-format

2110 -msgid "Pathspec '%s' is in submodule '%.*s'"

2136 +msgid "'%s' (mnemonic: '%c')"

2137 msgstr ""

2138

2113 -#: pathspec.c:353

2139 +#: pathspec.c:461

2140 #, c-format

2141 msgid "%s: pathspec magic not supported by this command: %s"

2142 msgstr ""

2143

2118 -#: pathspec.c:408

2144 +#: pathspec.c:511

2145 msgid ""

2146 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2147 "use . instead if you meant to match all paths"

2148 msgstr ""

2149

2124 -#: pathspec.c:440

2150 +#: pathspec.c:535

2151 #, c-format

2152 msgid "pathspec '%s' is beyond a symbolic link"

2153 msgstr ""

2154

2129 -#: pathspec.c:449

2155 +#: pathspec.c:544

2156 msgid ""

2157 "There is nothing to exclude from by :(exclude) patterns.\n"

2158 "Perhaps you forgot to add either ':/' or '.' ?"

2159 msgstr ""

2160

2135 -#: pretty.c:971

2161 +#: pretty.c:982

2162 msgid "unable to parse --pretty format"

2163 msgstr ""

2164

2139 -#: read-cache.c:1315

2165 +#: read-cache.c:1307

2166 #, c-format

2167 msgid ""

2168 "index.version set, but the value is invalid.\n"

2169 "Using version %i"

2170 msgstr ""

2171

2146 -#: read-cache.c:1325

2172 +#: read-cache.c:1317

2173 #, c-format

2174 msgid ""

2175 "GIT_INDEX_VERSION set, but the value is invalid.\n"

2176 "Using version %i"

2177 msgstr ""

2178

2153 -#: refs.c:576 builtin/merge.c:840

2179 +#: refs.c:576 builtin/merge.c:844

2180 #, c-format

2181 msgid "Could not open '%s' for writing"

2182 msgstr ""

@@ -2170,227 +2196,232 @@ msgstr ""

2196 msgid "could not remove reference %s"

2197 msgstr ""

2198

2173 -#: ref-filter.c:55

2199 +#: ref-filter.c:56

2200 #, c-format

2201 msgid "expected format: %%(color:<color>)"

2202 msgstr ""

2203

2178 -#: ref-filter.c:57

2204 +#: ref-filter.c:58

2205 #, c-format

2206 msgid "unrecognized color: %%(color:%s)"

2207 msgstr ""

2208

2183 -#: ref-filter.c:71

2209 +#: ref-filter.c:72

2210 #, c-format

2211 msgid "unrecognized format: %%(%s)"

2212 msgstr ""

2213

2188 -#: ref-filter.c:77

2214 +#: ref-filter.c:78

2215 #, c-format

2216 msgid "%%(body) does not take arguments"

2217 msgstr ""

2218

2193 -#: ref-filter.c:84

2219 +#: ref-filter.c:85

2220 #, c-format

2221 msgid "%%(subject) does not take arguments"

2222 msgstr ""

2223

2198 -#: ref-filter.c:101

2224 +#: ref-filter.c:92

2225 +#, c-format

2226 +msgid "%%(trailers) does not take arguments"

2227 +msgstr ""

2228 +

2229 +#: ref-filter.c:111

2230 #, c-format

2231 msgid "positive value expected contents:lines=%s"

2232 msgstr ""

2233

2203 -#: ref-filter.c:103

2234 +#: ref-filter.c:113

2235 #, c-format

2236 msgid "unrecognized %%(contents) argument: %s"

2237 msgstr ""

2238

2208 -#: ref-filter.c:113

2239 +#: ref-filter.c:123

2240 #, c-format

2241 msgid "unrecognized %%(objectname) argument: %s"

2242 msgstr ""

2243

2213 -#: ref-filter.c:135

2244 +#: ref-filter.c:145

2245 #, c-format

2246 msgid "expected format: %%(align:<width>,<position>)"

2247 msgstr ""

2248

2218 -#: ref-filter.c:147

2249 +#: ref-filter.c:157

2250 #, c-format

2251 msgid "unrecognized position:%s"

2252 msgstr ""

2253

2223 -#: ref-filter.c:151

2254 +#: ref-filter.c:161

2255 #, c-format

2256 msgid "unrecognized width:%s"

2257 msgstr ""

2258

2228 -#: ref-filter.c:157

2259 +#: ref-filter.c:167

2260 #, c-format

2261 msgid "unrecognized %%(align) argument: %s"

2262 msgstr ""

2263

2233 -#: ref-filter.c:161

2264 +#: ref-filter.c:171

2265 #, c-format

2266 msgid "positive width expected with the %%(align) atom"

2267 msgstr ""

2268

2238 -#: ref-filter.c:244

2269 +#: ref-filter.c:255

2270 #, c-format

2271 msgid "malformed field name: %.*s"

2272 msgstr ""

2273

2243 -#: ref-filter.c:270

2274 +#: ref-filter.c:281

2275 #, c-format

2276 msgid "unknown field name: %.*s"

2277 msgstr ""

2278

2248 -#: ref-filter.c:372

2279 +#: ref-filter.c:383

2280 #, c-format

2281 msgid "format: %%(end) atom used without corresponding atom"

2282 msgstr ""

2283

2253 -#: ref-filter.c:424

2284 +#: ref-filter.c:435

2285 #, c-format

2286 msgid "malformed format string %s"

2287 msgstr ""

2288

2258 -#: ref-filter.c:878

2289 +#: ref-filter.c:898

2290 msgid ":strip= requires a positive integer argument"

2291 msgstr ""

2292

2262 -#: ref-filter.c:883

2293 +#: ref-filter.c:903

2294 #, c-format

2295 msgid "ref '%s' does not have %ld components to :strip"

2296 msgstr ""

2297

2267 -#: ref-filter.c:1046

2298 +#: ref-filter.c:1066

2299 #, c-format

2300 msgid "unknown %.*s format %s"

2301 msgstr ""

2302

2272 -#: ref-filter.c:1066 ref-filter.c:1097

2303 +#: ref-filter.c:1086 ref-filter.c:1117

2304 #, c-format

2305 msgid "missing object %s for %s"

2306 msgstr ""

2307

2277 -#: ref-filter.c:1069 ref-filter.c:1100

2308 +#: ref-filter.c:1089 ref-filter.c:1120

2309 #, c-format

2310 msgid "parse_object_buffer failed on %s for %s"

2311 msgstr ""

2312

2282 -#: ref-filter.c:1311

2313 +#: ref-filter.c:1343

2314 #, c-format

2315 msgid "malformed object at '%s'"

2316 msgstr ""

2317

2287 -#: ref-filter.c:1373

2318 +#: ref-filter.c:1410

2319 #, c-format

2320 msgid "ignoring ref with broken name %s"

2321 msgstr ""

2322

2292 -#: ref-filter.c:1378

2323 +#: ref-filter.c:1415

2324 #, c-format

2325 msgid "ignoring broken ref %s"

2326 msgstr ""

2327

2297 -#: ref-filter.c:1633

2328 +#: ref-filter.c:1670

2329 #, c-format

2330 msgid "format: %%(end) atom missing"

2331 msgstr ""

2332

2302 -#: ref-filter.c:1687

2333 +#: ref-filter.c:1734

2334 #, c-format

2335 msgid "malformed object name %s"

2336 msgstr ""

2337

2307 -#: remote.c:746

2338 +#: remote.c:754

2339 #, c-format

2340 msgid "Cannot fetch both %s and %s to %s"

2341 msgstr ""

2342

2312 -#: remote.c:750

2343 +#: remote.c:758

2344 #, c-format

2345 msgid "%s usually tracks %s, not %s"

2346 msgstr ""

2347

2317 -#: remote.c:754

2348 +#: remote.c:762

2349 #, c-format

2350 msgid "%s tracks both %s and %s"

2351 msgstr ""

2352

2322 -#: remote.c:762

2353 +#: remote.c:770

2354 msgid "Internal error"

2355 msgstr ""

2356

2326 -#: remote.c:1677 remote.c:1720

2357 +#: remote.c:1685 remote.c:1787

2358 msgid "HEAD does not point to a branch"

2359 msgstr ""

2360

2330 -#: remote.c:1686

2361 +#: remote.c:1694

2362 #, c-format

2363 msgid "no such branch: '%s'"

2364 msgstr ""

2365

2335 -#: remote.c:1689

2366 +#: remote.c:1697

2367 #, c-format

2368 msgid "no upstream configured for branch '%s'"

2369 msgstr ""

2370

2340 -#: remote.c:1695

2371 +#: remote.c:1703

2372 #, c-format

2373 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2374 msgstr ""

2375

2345 -#: remote.c:1710

2376 +#: remote.c:1718

2377 #, c-format

2378 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2379 msgstr ""

2380

2350 -#: remote.c:1725

2381 +#: remote.c:1730

2382 #, c-format

2383 msgid "branch '%s' has no remote for pushing"

2384 msgstr ""

2385

2355 -#: remote.c:1736

2386 +#: remote.c:1741

2387 #, c-format

2388 msgid "push refspecs for '%s' do not include '%s'"

2389 msgstr ""

2390

2360 -#: remote.c:1749

2391 +#: remote.c:1754

2392 msgid "push has no destination (push.default is 'nothing')"

2393 msgstr ""

2394

2364 -#: remote.c:1771

2395 +#: remote.c:1776

2396 msgid "cannot resolve 'simple' push to a single destination"

2397 msgstr ""

2398

2368 -#: remote.c:2073

2399 +#: remote.c:2081

2400 #, c-format

2401 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2402 msgstr ""

2403

2373 -#: remote.c:2077

2404 +#: remote.c:2085

2405 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2406 msgstr ""

2407

2377 -#: remote.c:2080

2408 +#: remote.c:2088

2409 #, c-format

2410 msgid "Your branch is up-to-date with '%s'.\n"

2411 msgstr ""

2412

2382 -#: remote.c:2084

2413 +#: remote.c:2092

2414 #, c-format

2415 msgid "Your branch is ahead of '%s' by %d commit.\n"

2416 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2417 msgstr[0] ""

2418 msgstr[1] ""

2419

2389 -#: remote.c:2090

2420 +#: remote.c:2098

2421 msgid " (use \"git push\" to publish your local commits)\n"

2422 msgstr ""

2423

2393 -#: remote.c:2093

2424 +#: remote.c:2101

2425 #, c-format

2426 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2427 msgid_plural ""

@@ -2398,11 +2429,11 @@ msgid_plural ""

2429 msgstr[0] ""

2430 msgstr[1] ""

2431

2401 -#: remote.c:2101

2432 +#: remote.c:2109

2433 msgid " (use \"git pull\" to update your local branch)\n"

2434 msgstr ""

2435

2405 -#: remote.c:2104

2436 +#: remote.c:2112

2437 #, c-format

2438 msgid ""

2439 "Your branch and '%s' have diverged,\n"

@@ -2413,7 +2444,7 @@ msgid_plural ""

2444 msgstr[0] ""

2445 msgstr[1] ""

2446

2416 -#: remote.c:2114

2447 +#: remote.c:2122

2448 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2449 msgstr ""

2450

@@ -2430,11 +2461,11 @@ msgstr ""

2461 msgid "--first-parent is incompatible with --bisect"

2462 msgstr ""

2463

2433 -#: run-command.c:106

2464 +#: run-command.c:125

2465 msgid "open /dev/null failed"

2466 msgstr ""

2467

2437 -#: run-command.c:108

2468 +#: run-command.c:127

2469 #, c-format

2470 msgid "dup2(%d,%d) failed"

2471 msgstr ""

@@ -2461,81 +2492,93 @@ msgstr ""

2492 msgid "the receiving end does not support push options"

2493 msgstr ""

2494

2464 -#: sequencer.c:171

2495 +#: sequencer.c:215

2496 msgid "revert"

2497 msgstr ""

2498

2468 -#: sequencer.c:171

2499 +#: sequencer.c:217

2500 msgid "cherry-pick"

2501 msgstr ""

2502

2472 -#: sequencer.c:228

2503 +#: sequencer.c:219

2504 +msgid "rebase -i"

2505 +msgstr ""

2506 +

2507 +#: sequencer.c:221

2508 +#, c-format

2509 +msgid "Unknown action: %d"

2510 +msgstr ""

2511 +

2512 +#: sequencer.c:278

2513 msgid ""

2514 "after resolving the conflicts, mark the corrected paths\n"

2515 "with 'git add <paths>' or 'git rm <paths>'"

2516 msgstr ""

2517

2478 -#: sequencer.c:231

2518 +#: sequencer.c:281

2519 msgid ""

2520 "after resolving the conflicts, mark the corrected paths\n"

2521 "with 'git add <paths>' or 'git rm <paths>'\n"

2522 "and commit the result with 'git commit'"

2523 msgstr ""

2524

2485 -#: sequencer.c:244 sequencer.c:1209

2525 +#: sequencer.c:294 sequencer.c:1667

2526 #, c-format

2527 msgid "could not lock '%s'"

2528 msgstr ""

2529

2490 -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2530 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2531 #, c-format

2532 msgid "could not write to '%s'"

2533 msgstr ""

2534

2495 -#: sequencer.c:251

2535 +#: sequencer.c:301

2536 #, c-format

2537 msgid "could not write eol to '%s'"

2538 msgstr ""

2539

2500 -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2540 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2541 #, c-format

2542 msgid "failed to finalize '%s'."

2543 msgstr ""

2544

2505 -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2545 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2546 +#: builtin/commit.c:749 builtin/merge.c:1036

2547 #, c-format

2548 msgid "could not read '%s'"

2549 msgstr ""

2550

2510 -#: sequencer.c:305

2551 +#: sequencer.c:355

2552 #, c-format

2553 msgid "your local changes would be overwritten by %s."

2554 msgstr ""

2555

2515 -#: sequencer.c:309

2556 +#: sequencer.c:359

2557 msgid "commit your changes or stash them to proceed."

2558 msgstr ""

2559

2519 -#: sequencer.c:324

2560 +#: sequencer.c:388

2561 #, c-format

2562 msgid "%s: fast-forward"

2563 msgstr ""

2564

2524 -#. TRANSLATORS: %s will be "revert" or "cherry-pick"

2525 -#: sequencer.c:399

2565 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or

2566 +#. * "rebase -i".

2567 +#.

2568 +#: sequencer.c:470

2569 #, c-format

2570 msgid "%s: Unable to write new index file"

2571 msgstr ""

2572

2530 -#: sequencer.c:418

2573 +#: sequencer.c:489

2574 msgid "could not resolve HEAD commit\n"

2575 msgstr ""

2576

2534 -#: sequencer.c:438

2577 +#: sequencer.c:509

2578 msgid "unable to update cache tree\n"

2579 msgstr ""

2580

2538 -#: sequencer.c:483

2581 +#: sequencer.c:592

2582 #, c-format

2583 msgid ""

2584 "you have staged changes in your working tree\n"

@@ -2552,172 +2595,369 @@ msgid ""

2595 " git rebase --continue\n"

2596 msgstr ""

2597

2555 -#: sequencer.c:567

2598 +#: sequencer.c:688

2599 #, c-format

2600 msgid "could not parse commit %s\n"

2601 msgstr ""

2602

2560 -#: sequencer.c:572

2603 +#: sequencer.c:693

2604 #, c-format

2605 msgid "could not parse parent commit %s\n"

2606 msgstr ""

2607

2565 -#: sequencer.c:656

2608 +#: sequencer.c:815

2609 +#, c-format

2610 +msgid ""

2611 +"unexpected 1st line of squash message:\n"

2612 +"\n"

2613 +"\t%.*s"

2614 +msgstr ""

2615 +

2616 +#: sequencer.c:821

2617 +#, c-format

2618 +msgid ""

2619 +"invalid 1st line of squash message:\n"

2620 +"\n"

2621 +"\t%.*s"

2622 +msgstr ""

2623 +

2624 +#: sequencer.c:827 sequencer.c:852

2625 +#, c-format

2626 +msgid "This is a combination of %d commits."

2627 +msgstr ""

2628 +

2629 +#: sequencer.c:836

2630 +msgid "need a HEAD to fixup"

2631 +msgstr ""

2632 +

2633 +#: sequencer.c:838

2634 +msgid "could not read HEAD"

2635 +msgstr ""

2636 +

2637 +#: sequencer.c:840

2638 +msgid "could not read HEAD's commit message"

2639 +msgstr ""

2640 +

2641 +#: sequencer.c:846

2642 +#, c-format

2643 +msgid "cannot write '%s'"

2644 +msgstr ""

2645 +

2646 +#: sequencer.c:855 git-rebase--interactive.sh:445

2647 +msgid "This is the 1st commit message:"

2648 +msgstr ""

2649 +

2650 +#: sequencer.c:863

2651 +#, c-format

2652 +msgid "could not read commit message of %s"

2653 +msgstr ""

2654 +

2655 +#: sequencer.c:870

2656 +#, c-format

2657 +msgid "This is the commit message #%d:"

2658 +msgstr ""

2659 +

2660 +#: sequencer.c:875

2661 +#, c-format

2662 +msgid "The commit message #%d will be skipped:"

2663 +msgstr ""

2664 +

2665 +#: sequencer.c:880

2666 +#, c-format

2667 +msgid "unknown command: %d"

2668 +msgstr ""

2669 +

2670 +#: sequencer.c:946

2671 msgid "your index file is unmerged."

2672 msgstr ""

2673

2569 -#: sequencer.c:675

2674 +#: sequencer.c:964

2675 #, c-format

2676 msgid "commit %s is a merge but no -m option was given."

2677 msgstr ""

2678

2574 -#: sequencer.c:683

2679 +#: sequencer.c:972

2680 #, c-format

2681 msgid "commit %s does not have parent %d"

2682 msgstr ""

2683

2579 -#: sequencer.c:687

2684 +#: sequencer.c:976

2685 #, c-format

2686 msgid "mainline was specified but commit %s is not a merge."

2687 msgstr ""

2688

2689 +#: sequencer.c:982

2690 +#, c-format

2691 +msgid "cannot get commit message for %s"

2692 +msgstr ""

2693 +

2694 #. TRANSLATORS: The first %s will be a "todo" command like

2695 #. "revert" or "pick", the second %s a SHA1.

2586 -#: sequencer.c:700

2696 +#: sequencer.c:1001

2697 #, c-format

2698 msgid "%s: cannot parse parent commit %s"

2699 msgstr ""

2700

2591 -#: sequencer.c:705

2701 +#: sequencer.c:1063 sequencer.c:1812

2702 #, c-format

2593 -msgid "cannot get commit message for %s"

2703 +msgid "could not rename '%s' to '%s'"

2704 msgstr ""

2705

2596 -#: sequencer.c:797

2706 +#: sequencer.c:1114

2707 #, c-format

2708 msgid "could not revert %s... %s"

2709 msgstr ""

2710

2601 -#: sequencer.c:798

2711 +#: sequencer.c:1115

2712 #, c-format

2713 msgid "could not apply %s... %s"

2714 msgstr ""

2715

2606 -#: sequencer.c:833

2716 +#: sequencer.c:1157

2717 msgid "empty commit set passed"

2718 msgstr ""

2719

2610 -#: sequencer.c:843

2720 +#: sequencer.c:1167

2721 #, c-format

2722 msgid "git %s: failed to read the index"

2723 msgstr ""

2724

2615 -#: sequencer.c:850

2725 +#: sequencer.c:1174

2726 #, c-format

2727 msgid "git %s: failed to refresh the index"

2728 msgstr ""

2729

2620 -#: sequencer.c:944

2730 +#: sequencer.c:1294

2731 #, c-format

2732 msgid "invalid line %d: %.*s"

2733 msgstr ""

2734

2625 -#: sequencer.c:950

2626 -msgid "no commits parsed."

2735 +#: sequencer.c:1302

2736 +#, c-format

2737 +msgid "cannot '%s' without a previous commit"

2738 msgstr ""

2739

2629 -#: sequencer.c:966

2740 +#: sequencer.c:1334

2741 #, c-format

2742 msgid "could not read '%s'."

2743 msgstr ""

2744

2634 -#: sequencer.c:972

2745 +#: sequencer.c:1341

2746 +msgid "please fix this using 'git rebase --edit-todo'."

2747 +msgstr ""

2748 +

2749 +#: sequencer.c:1343

2750 #, c-format

2751 msgid "unusable instruction sheet: '%s'"

2752 msgstr ""

2753

2639 -#: sequencer.c:983

2754 +#: sequencer.c:1348

2755 +msgid "no commits parsed."

2756 +msgstr ""

2757 +

2758 +#: sequencer.c:1359

2759 msgid "cannot cherry-pick during a revert."

2760 msgstr ""

2761

2643 -#: sequencer.c:985

2762 +#: sequencer.c:1361

2763 msgid "cannot revert during a cherry-pick."

2764 msgstr ""

2765

2647 -#: sequencer.c:1028

2766 +#: sequencer.c:1424

2767 #, c-format

2768 msgid "invalid key: %s"

2769 msgstr ""

2770

2652 -#: sequencer.c:1031

2771 +#: sequencer.c:1427

2772 #, c-format

2773 msgid "invalid value for %s: %s"

2774 msgstr ""

2775

2657 -#: sequencer.c:1063

2776 +#: sequencer.c:1484

2777 #, c-format

2778 msgid "malformed options sheet: '%s'"

2779 msgstr ""

2780

2662 -#: sequencer.c:1101

2781 +#: sequencer.c:1522

2782 msgid "a cherry-pick or revert is already in progress"

2783 msgstr ""

2784

2666 -#: sequencer.c:1102

2785 +#: sequencer.c:1523

2786 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

2787 msgstr ""

2788

2670 -#: sequencer.c:1106

2789 +#: sequencer.c:1526

2790 #, c-format

2791 msgid "could not create sequencer directory '%s'"

2792 msgstr ""

2793

2675 -#: sequencer.c:1120

2794 +#: sequencer.c:1540

2795 msgid "could not lock HEAD"

2796 msgstr ""

2797

2679 -#: sequencer.c:1151 sequencer.c:1289

2798 +#: sequencer.c:1596 sequencer.c:2150

2799 msgid "no cherry-pick or revert in progress"

2800 msgstr ""

2801

2683 -#: sequencer.c:1153

2802 +#: sequencer.c:1598

2803 msgid "cannot resolve HEAD"

2804 msgstr ""

2805

2687 -#: sequencer.c:1155 sequencer.c:1189

2806 +#: sequencer.c:1600 sequencer.c:1634

2807 msgid "cannot abort from a branch yet to be born"

2808 msgstr ""

2809

2691 -#: sequencer.c:1175 builtin/grep.c:578

2810 +#: sequencer.c:1620 builtin/grep.c:904

2811 #, c-format

2812 msgid "cannot open '%s'"

2813 msgstr ""

2814

2696 -#: sequencer.c:1177

2815 +#: sequencer.c:1622

2816 #, c-format

2817 msgid "cannot read '%s': %s"

2818 msgstr ""

2819

2701 -#: sequencer.c:1178

2820 +#: sequencer.c:1623

2821 msgid "unexpected end of file"

2822 msgstr ""

2823

2705 -#: sequencer.c:1184

2824 +#: sequencer.c:1629

2825 #, c-format

2826 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

2827 msgstr ""

2828

2710 -#: sequencer.c:1354

2829 +#: sequencer.c:1640

2830 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

2831 +msgstr ""

2832 +

2833 +#: sequencer.c:1777 sequencer.c:2049

2834 +msgid "cannot read HEAD"

2835 +msgstr ""

2836 +

2837 +#: sequencer.c:1817 builtin/difftool.c:574

2838 +#, c-format

2839 +msgid "could not copy '%s' to '%s'"

2840 +msgstr ""

2841 +

2842 +#: sequencer.c:1833

2843 +msgid "could not read index"

2844 +msgstr ""

2845 +

2846 +#: sequencer.c:1838

2847 +#, c-format

2848 +msgid ""

2849 +"execution failed: %s\n"

2850 +"%sYou can fix the problem, and then run\n"

2851 +"\n"

2852 +" git rebase --continue\n"

2853 +"\n"

2854 +msgstr ""

2855 +

2856 +#: sequencer.c:1844

2857 +msgid "and made changes to the index and/or the working tree\n"

2858 +msgstr ""

2859 +

2860 +#: sequencer.c:1850

2861 +#, c-format

2862 +msgid ""

2863 +"execution succeeded: %s\n"

2864 +"but left changes to the index and/or the working tree\n"

2865 +"Commit or stash your changes, and then run\n"

2866 +"\n"

2867 +" git rebase --continue\n"

2868 +"\n"

2869 +msgstr ""

2870 +

2871 +#: sequencer.c:1905 git-rebase.sh:168

2872 +#, c-format

2873 +msgid "Applied autostash."

2874 +msgstr ""

2875 +

2876 +#: sequencer.c:1917

2877 +#, c-format

2878 +msgid "cannot store %s"

2879 +msgstr ""

2880 +

2881 +#: sequencer.c:1919 git-rebase.sh:172

2882 +#, c-format

2883 +msgid ""

2884 +"Applying autostash resulted in conflicts.\n"

2885 +"Your changes are safe in the stash.\n"

2886 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

2887 +msgstr ""

2888 +

2889 +#: sequencer.c:2000

2890 +#, c-format

2891 +msgid "stopped at %s... %.*s"

2892 +msgstr ""

2893 +

2894 +#: sequencer.c:2027

2895 +#, c-format

2896 +msgid "unknown command %d"

2897 +msgstr ""

2898 +

2899 +#: sequencer.c:2057

2900 +msgid "could not read orig-head"

2901 +msgstr ""

2902 +

2903 +#: sequencer.c:2061

2904 +msgid "could not read 'onto'"

2905 +msgstr ""

2906 +

2907 +#: sequencer.c:2068

2908 +#, c-format

2909 +msgid "could not update %s"

2910 +msgstr ""

2911 +

2912 +#: sequencer.c:2075

2913 +#, c-format

2914 +msgid "could not update HEAD to %s"

2915 +msgstr ""

2916 +

2917 +#: sequencer.c:2159

2918 +msgid "cannot rebase: You have unstaged changes."

2919 +msgstr ""

2920 +

2921 +#: sequencer.c:2164

2922 +msgid "could not remove CHERRY_PICK_HEAD"

2923 +msgstr ""

2924 +

2925 +#: sequencer.c:2173

2926 +msgid "cannot amend non-existing commit"

2927 +msgstr ""

2928 +

2929 +#: sequencer.c:2175

2930 +#, c-format

2931 +msgid "invalid file: '%s'"

2932 +msgstr ""

2933 +

2934 +#: sequencer.c:2177

2935 +#, c-format

2936 +msgid "invalid contents: '%s'"

2937 +msgstr ""

2938 +

2939 +#: sequencer.c:2180

2940 +msgid ""

2941 +"\n"

2942 +"You have uncommitted changes in your working tree. Please, commit them\n"

2943 +"first and then run 'git rebase --continue' again."

2944 +msgstr ""

2945 +

2946 +#: sequencer.c:2190

2947 +msgid "could not commit staged changes."

2948 +msgstr ""

2949 +

2950 +#: sequencer.c:2270

2951 #, c-format

2952 msgid "%s: can't cherry-pick a %s"

2953 msgstr ""

2954

2715 -#: sequencer.c:1358

2955 +#: sequencer.c:2274

2956 #, c-format

2957 msgid "%s: bad revision"

2958 msgstr ""

2959

2720 -#: sequencer.c:1391

2960 +#: sequencer.c:2307

2961 msgid "can't revert as initial commit"

2962 msgstr ""

2963

@@ -2744,82 +2984,82 @@ msgid ""

2984 "'git <command> [<revision>...] -- [<file>...]'"

2985 msgstr ""

2986

2747 -#: setup.c:468

2987 +#: setup.c:470

2988 #, c-format

2989 msgid "Expected git repo version <= %d, found %d"

2990 msgstr ""

2991

2752 -#: setup.c:476

2992 +#: setup.c:478

2993 msgid "unknown repository extensions found:"

2994 msgstr ""

2995

2756 -#: setup.c:762

2996 +#: setup.c:768

2997 #, c-format

2998 msgid "Not a git repository (or any of the parent directories): %s"

2999 msgstr ""

3000

2761 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

3001 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3002 msgid "Cannot come back to cwd"

3003 msgstr ""

3004

2765 -#: setup.c:845

3005 +#: setup.c:852

3006 msgid "Unable to read current working directory"

3007 msgstr ""

3008

2769 -#: setup.c:920

3009 +#: setup.c:927

3010 #, c-format

3011 msgid ""

3012 "Not a git repository (or any parent up to mount point %s)\n"

3013 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3014 msgstr ""

3015

2776 -#: setup.c:927

3016 +#: setup.c:934

3017 #, c-format

3018 msgid "Cannot change to '%s/..'"

3019 msgstr ""

3020

2781 -#: setup.c:989

3021 +#: setup.c:996

3022 #, c-format

3023 msgid ""

3024 "Problem with core.sharedRepository filemode value (0%.3o).\n"

3025 "The owner of files must always have read and write permissions."

3026 msgstr ""

3027

2788 -#: sha1_file.c:473

3028 +#: sha1_file.c:490

3029 #, c-format

3030 msgid "path '%s' does not exist"

3031 msgstr ""

3032

2793 -#: sha1_file.c:499

3033 +#: sha1_file.c:516

3034 #, c-format

3035 msgid "reference repository '%s' as a linked checkout is not supported yet."

3036 msgstr ""

3037

2798 -#: sha1_file.c:505

3038 +#: sha1_file.c:522

3039 #, c-format

3040 msgid "reference repository '%s' is not a local repository."

3041 msgstr ""

3042

2803 -#: sha1_file.c:511

3043 +#: sha1_file.c:528

3044 #, c-format

3045 msgid "reference repository '%s' is shallow"

3046 msgstr ""

3047

2808 -#: sha1_file.c:519

3048 +#: sha1_file.c:536

3049 #, c-format

3050 msgid "reference repository '%s' is grafted"

3051 msgstr ""

3052

2813 -#: sha1_file.c:1159

3053 +#: sha1_file.c:1176

3054 msgid "offset before end of packfile (broken .idx?)"

3055 msgstr ""

3056

2817 -#: sha1_file.c:2592

3057 +#: sha1_file.c:2637

3058 #, c-format

3059 msgid "offset before start of pack index for %s (corrupt index?)"

3060 msgstr ""

3061

2822 -#: sha1_file.c:2596

3062 +#: sha1_file.c:2641

3063 #, c-format

3064 msgid "offset beyond end of pack index for %s (truncated index?)"

3065 msgstr ""

@@ -2846,88 +3086,128 @@ msgid ""

3086 "running \"git config advice.objectNameWarning false\""

3087 msgstr ""

3088

2849 -#: submodule.c:64 submodule.c:98

3089 +#: submodule.c:65 submodule.c:99

3090 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3091 msgstr ""

3092

2853 -#: submodule.c:68 submodule.c:102

3093 +#: submodule.c:69 submodule.c:103

3094 #, c-format

3095 msgid "Could not find section in .gitmodules where path=%s"

3096 msgstr ""

3097

2858 -#: submodule.c:76

3098 +#: submodule.c:77

3099 #, c-format

3100 msgid "Could not update .gitmodules entry %s"

3101 msgstr ""

3102

2863 -#: submodule.c:109

3103 +#: submodule.c:110

3104 #, c-format

3105 msgid "Could not remove .gitmodules entry for %s"

3106 msgstr ""

3107

2868 -#: submodule.c:120

3108 +#: submodule.c:121

3109 msgid "staging updated .gitmodules failed"

3110 msgstr ""

3111

2872 -#: submodule.c:158

3112 +#: submodule.c:159

3113 msgid "negative values not allowed for submodule.fetchJobs"

3114 msgstr ""

3115

2876 -#: submodule-config.c:358

3116 +#: submodule.c:1184

3117 +#, c-format

3118 +msgid "could not start 'git status in submodule '%s'"

3119 +msgstr ""

3120 +

3121 +#: submodule.c:1197

3122 +#, c-format

3123 +msgid "could not run 'git status in submodule '%s'"

3124 +msgstr ""

3125 +

3126 +#: submodule.c:1398

3127 +#, c-format

3128 +msgid ""

3129 +"relocate_gitdir for submodule '%s' with more than one worktree not supported"

3130 +msgstr ""

3131 +

3132 +#: submodule.c:1410 submodule.c:1471

3133 +#, c-format

3134 +msgid "could not lookup name for submodule '%s'"

3135 +msgstr ""

3136 +

3137 +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3138 +#: builtin/submodule--helper.c:650

3139 +#, c-format

3140 +msgid "could not create directory '%s'"

3141 +msgstr ""

3142 +

3143 +#: submodule.c:1420

3144 +#, c-format

3145 +msgid ""

3146 +"Migrating git directory of '%s%s' from\n"

3147 +"'%s' to\n"

3148 +"'%s'\n"

3149 +msgstr ""

3150 +

3151 +#: submodule.c:1512

3152 +#, c-format

3153 +msgid "could not recurse into submodule '%s'"

3154 +msgstr ""

3155 +

3156 +#: submodule-config.c:360

3157 #, c-format

3158 msgid "invalid value for %s"

3159 msgstr ""

3160

2881 -#: trailer.c:238

3161 +#: trailer.c:240

3162 #, c-format

3163 msgid "running trailer command '%s' failed"

3164 msgstr ""

3165

2886 -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

2887 -#: trailer.c:541

3166 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3167 +#: trailer.c:543

3168 #, c-format

3169 msgid "unknown value '%s' for key '%s'"

3170 msgstr ""

3171

2892 -#: trailer.c:523 trailer.c:528 builtin/remote.c:289

3172 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3173 #, c-format

3174 msgid "more than one %s"

3175 msgstr ""

3176

2897 -#: trailer.c:672

3177 +#: trailer.c:702

3178 #, c-format

3179 msgid "empty trailer token in trailer '%.*s'"

3180 msgstr ""

3181

2902 -#: trailer.c:695

3182 +#: trailer.c:722

3183 #, c-format

3184 msgid "could not read input file '%s'"

3185 msgstr ""

3186

2907 -#: trailer.c:698

3187 +#: trailer.c:725

3188 msgid "could not read from stdin"

3189 msgstr ""

3190

2911 -#: trailer.c:929 builtin/am.c:44

3191 +#: trailer.c:949 builtin/am.c:44

3192 #, c-format

3193 msgid "could not stat %s"

3194 msgstr ""

3195

2916 -#: trailer.c:931

3196 +#: trailer.c:951

3197 #, c-format

3198 msgid "file %s is not a regular file"

3199 msgstr ""

3200

2921 -#: trailer.c:933

3201 +#: trailer.c:953

3202 #, c-format

3203 msgid "file %s is not writable by user"

3204 msgstr ""

3205

2926 -#: trailer.c:945

3206 +#: trailer.c:965

3207 msgid "could not open temporary file"

3208 msgstr ""

3209

2930 -#: trailer.c:983

3210 +#: trailer.c:1001

3211 #, c-format

3212 msgid "could not rename temporary file to %s"

3213 msgstr ""

@@ -2942,14 +3222,14 @@ msgstr ""

3222 msgid "transport: invalid depth option '%s'"

3223 msgstr ""

3224

2945 -#: transport.c:817

3225 +#: transport.c:885

3226 #, c-format

3227 msgid ""

3228 "The following submodule paths contain changes that can\n"

3229 "not be found on any remote:\n"

3230 msgstr ""

3231

2952 -#: transport.c:821

3232 +#: transport.c:889

3233 #, c-format

3234 msgid ""

3235 "\n"

@@ -2965,7 +3245,7 @@ msgid ""

3245 "\n"

3246 msgstr ""

3247

2968 -#: transport.c:829

3248 +#: transport.c:897

3249 msgid "Aborting."

3250 msgstr ""

3251

@@ -2990,98 +3270,98 @@ msgstr ""

3270 msgid "too-short tree file"

3271 msgstr ""

3272

2993 -#: unpack-trees.c:64

3273 +#: unpack-trees.c:99

3274 #, c-format

3275 msgid ""

3276 "Your local changes to the following files would be overwritten by checkout:\n"

3277 "%%sPlease commit your changes or stash them before you switch branches."

3278 msgstr ""

3279

3000 -#: unpack-trees.c:66

3280 +#: unpack-trees.c:101

3281 #, c-format

3282 msgid ""

3283 "Your local changes to the following files would be overwritten by checkout:\n"

3284 "%%s"

3285 msgstr ""

3286

3007 -#: unpack-trees.c:69

3287 +#: unpack-trees.c:104

3288 #, c-format

3289 msgid ""

3290 "Your local changes to the following files would be overwritten by merge:\n"

3291 "%%sPlease commit your changes or stash them before you merge."

3292 msgstr ""

3293

3014 -#: unpack-trees.c:71

3294 +#: unpack-trees.c:106

3295 #, c-format

3296 msgid ""

3297 "Your local changes to the following files would be overwritten by merge:\n"

3298 "%%s"

3299 msgstr ""

3300

3021 -#: unpack-trees.c:74

3301 +#: unpack-trees.c:109

3302 #, c-format

3303 msgid ""

3304 "Your local changes to the following files would be overwritten by %s:\n"

3305 "%%sPlease commit your changes or stash them before you %s."

3306 msgstr ""

3307

3028 -#: unpack-trees.c:76

3308 +#: unpack-trees.c:111

3309 #, c-format

3310 msgid ""

3311 "Your local changes to the following files would be overwritten by %s:\n"

3312 "%%s"

3313 msgstr ""

3314

3035 -#: unpack-trees.c:81

3315 +#: unpack-trees.c:116

3316 #, c-format

3317 msgid ""

3038 -"Updating the following directories would lose untracked files in it:\n"

3318 +"Updating the following directories would lose untracked files in them:\n"

3319 "%s"

3320 msgstr ""

3321

3042 -#: unpack-trees.c:85

3322 +#: unpack-trees.c:120

3323 #, c-format

3324 msgid ""

3325 "The following untracked working tree files would be removed by checkout:\n"

3326 "%%sPlease move or remove them before you switch branches."

3327 msgstr ""

3328

3049 -#: unpack-trees.c:87

3329 +#: unpack-trees.c:122

3330 #, c-format

3331 msgid ""

3332 "The following untracked working tree files would be removed by checkout:\n"

3333 "%%s"

3334 msgstr ""

3335

3056 -#: unpack-trees.c:90

3336 +#: unpack-trees.c:125

3337 #, c-format

3338 msgid ""

3339 "The following untracked working tree files would be removed by merge:\n"

3340 "%%sPlease move or remove them before you merge."

3341 msgstr ""

3342

3063 -#: unpack-trees.c:92

3343 +#: unpack-trees.c:127

3344 #, c-format

3345 msgid ""

3346 "The following untracked working tree files would be removed by merge:\n"

3347 "%%s"

3348 msgstr ""

3349

3070 -#: unpack-trees.c:95

3350 +#: unpack-trees.c:130

3351 #, c-format

3352 msgid ""

3353 "The following untracked working tree files would be removed by %s:\n"

3354 "%%sPlease move or remove them before you %s."

3355 msgstr ""

3356

3077 -#: unpack-trees.c:97

3357 +#: unpack-trees.c:132

3358 #, c-format

3359 msgid ""

3360 "The following untracked working tree files would be removed by %s:\n"

3361 "%%s"

3362 msgstr ""

3363

3084 -#: unpack-trees.c:102

3364 +#: unpack-trees.c:137

3365 #, c-format

3366 msgid ""

3367 "The following untracked working tree files would be overwritten by "

@@ -3089,7 +3369,7 @@ msgid ""

3369 "%%sPlease move or remove them before you switch branches."

3370 msgstr ""

3371

3092 -#: unpack-trees.c:104

3372 +#: unpack-trees.c:139

3373 #, c-format

3374 msgid ""

3375 "The following untracked working tree files would be overwritten by "

@@ -3097,47 +3377,47 @@ msgid ""

3377 "%%s"

3378 msgstr ""

3379

3100 -#: unpack-trees.c:107

3380 +#: unpack-trees.c:142

3381 #, c-format

3382 msgid ""

3383 "The following untracked working tree files would be overwritten by merge:\n"

3384 "%%sPlease move or remove them before you merge."

3385 msgstr ""

3386

3107 -#: unpack-trees.c:109

3387 +#: unpack-trees.c:144

3388 #, c-format

3389 msgid ""

3390 "The following untracked working tree files would be overwritten by merge:\n"

3391 "%%s"

3392 msgstr ""

3393

3114 -#: unpack-trees.c:112

3394 +#: unpack-trees.c:147

3395 #, c-format

3396 msgid ""

3397 "The following untracked working tree files would be overwritten by %s:\n"

3398 "%%sPlease move or remove them before you %s."

3399 msgstr ""

3400

3121 -#: unpack-trees.c:114

3401 +#: unpack-trees.c:149

3402 #, c-format

3403 msgid ""

3404 "The following untracked working tree files would be overwritten by %s:\n"

3405 "%%s"

3406 msgstr ""

3407

3128 -#: unpack-trees.c:121

3408 +#: unpack-trees.c:156

3409 #, c-format

3410 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3411 msgstr ""

3412

3133 -#: unpack-trees.c:124

3413 +#: unpack-trees.c:159

3414 #, c-format

3415 msgid ""

3416 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

3417 "%s"

3418 msgstr ""

3419

3140 -#: unpack-trees.c:126

3420 +#: unpack-trees.c:161

3421 #, c-format

3422 msgid ""

3423 "The following working tree files would be overwritten by sparse checkout "

@@ -3145,7 +3425,7 @@ msgid ""

3425 "%s"

3426 msgstr ""

3427

3148 -#: unpack-trees.c:128

3428 +#: unpack-trees.c:163

3429 #, c-format

3430 msgid ""

3431 "The following working tree files would be removed by sparse checkout "

@@ -3153,12 +3433,12 @@ msgid ""

3433 "%s"

3434 msgstr ""

3435

3156 -#: unpack-trees.c:205

3436 +#: unpack-trees.c:240

3437 #, c-format

3438 msgid "Aborting\n"

3439 msgstr ""

3440

3161 -#: unpack-trees.c:237

3441 +#: unpack-trees.c:270

3442 msgid "Checking out files"

3443 msgstr ""

3444

@@ -3207,7 +3487,7 @@ msgid "could not open '%s' for writing"

3487 msgstr ""

3488

3489 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3210 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029

3490 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

3491 #: builtin/pull.c:341

3492 #, c-format

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

@@ -3413,178 +3693,182 @@ msgstr ""

3693 msgid " (use \"git am --abort\" to restore the original branch)"

3694 msgstr ""

3695

3416 -#: wt-status.c:1172

3696 +#: wt-status.c:1176

3697 +msgid "git-rebase-todo is missing."

3698 +msgstr ""

3699 +

3700 +#: wt-status.c:1178

3701 msgid "No commands done."

3702 msgstr ""

3703

3420 -#: wt-status.c:1175

3704 +#: wt-status.c:1181

3705 #, c-format

3706 msgid "Last command done (%d command done):"

3707 msgid_plural "Last commands done (%d commands done):"

3708 msgstr[0] ""

3709 msgstr[1] ""

3710

3427 -#: wt-status.c:1186

3711 +#: wt-status.c:1192

3712 #, c-format

3713 msgid " (see more in file %s)"

3714 msgstr ""

3715

3432 -#: wt-status.c:1191

3716 +#: wt-status.c:1197

3717 msgid "No commands remaining."

3718 msgstr ""

3719

3436 -#: wt-status.c:1194

3720 +#: wt-status.c:1200

3721 #, c-format

3722 msgid "Next command to do (%d remaining command):"

3723 msgid_plural "Next commands to do (%d remaining commands):"

3724 msgstr[0] ""

3725 msgstr[1] ""

3726

3443 -#: wt-status.c:1202

3727 +#: wt-status.c:1208

3728 msgid " (use \"git rebase --edit-todo\" to view and edit)"

3729 msgstr ""

3730

3447 -#: wt-status.c:1215

3731 +#: wt-status.c:1221

3732 #, c-format

3733 msgid "You are currently rebasing branch '%s' on '%s'."

3734 msgstr ""

3735

3452 -#: wt-status.c:1220

3736 +#: wt-status.c:1226

3737 msgid "You are currently rebasing."

3738 msgstr ""

3739

3456 -#: wt-status.c:1234

3740 +#: wt-status.c:1240

3741 msgid " (fix conflicts and then run \"git rebase --continue\")"

3742 msgstr ""

3743

3460 -#: wt-status.c:1236

3744 +#: wt-status.c:1242

3745 msgid " (use \"git rebase --skip\" to skip this patch)"

3746 msgstr ""

3747

3464 -#: wt-status.c:1238

3748 +#: wt-status.c:1244

3749 msgid " (use \"git rebase --abort\" to check out the original branch)"

3750 msgstr ""

3751

3468 -#: wt-status.c:1244

3752 +#: wt-status.c:1250

3753 msgid " (all conflicts fixed: run \"git rebase --continue\")"

3754 msgstr ""

3755

3472 -#: wt-status.c:1248

3756 +#: wt-status.c:1254

3757 #, c-format

3758 msgid ""

3759 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

3760 msgstr ""

3761

3478 -#: wt-status.c:1253

3762 +#: wt-status.c:1259

3763 msgid "You are currently splitting a commit during a rebase."

3764 msgstr ""

3765

3482 -#: wt-status.c:1256

3766 +#: wt-status.c:1262

3767 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

3768 msgstr ""

3769

3486 -#: wt-status.c:1260

3770 +#: wt-status.c:1266

3771 #, c-format

3772 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

3773 msgstr ""

3774

3491 -#: wt-status.c:1265

3775 +#: wt-status.c:1271

3776 msgid "You are currently editing a commit during a rebase."

3777 msgstr ""

3778

3495 -#: wt-status.c:1268

3779 +#: wt-status.c:1274

3780 msgid " (use \"git commit --amend\" to amend the current commit)"

3781 msgstr ""

3782

3499 -#: wt-status.c:1270

3783 +#: wt-status.c:1276

3784 msgid ""

3785 " (use \"git rebase --continue\" once you are satisfied with your changes)"

3786 msgstr ""

3787

3504 -#: wt-status.c:1280

3788 +#: wt-status.c:1286

3789 #, c-format

3790 msgid "You are currently cherry-picking commit %s."

3791 msgstr ""

3792

3509 -#: wt-status.c:1285

3793 +#: wt-status.c:1291

3794 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

3795 msgstr ""

3796

3513 -#: wt-status.c:1288

3797 +#: wt-status.c:1294

3798 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

3799 msgstr ""

3800

3517 -#: wt-status.c:1290

3801 +#: wt-status.c:1296

3802 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

3803 msgstr ""

3804

3521 -#: wt-status.c:1299

3805 +#: wt-status.c:1305

3806 #, c-format

3807 msgid "You are currently reverting commit %s."

3808 msgstr ""

3809

3526 -#: wt-status.c:1304

3810 +#: wt-status.c:1310

3811 msgid " (fix conflicts and run \"git revert --continue\")"

3812 msgstr ""

3813

3530 -#: wt-status.c:1307

3814 +#: wt-status.c:1313

3815 msgid " (all conflicts fixed: run \"git revert --continue\")"

3816 msgstr ""

3817

3534 -#: wt-status.c:1309

3818 +#: wt-status.c:1315

3819 msgid " (use \"git revert --abort\" to cancel the revert operation)"

3820 msgstr ""

3821

3538 -#: wt-status.c:1320

3822 +#: wt-status.c:1326

3823 #, c-format

3824 msgid "You are currently bisecting, started from branch '%s'."

3825 msgstr ""

3826

3543 -#: wt-status.c:1324

3827 +#: wt-status.c:1330

3828 msgid "You are currently bisecting."

3829 msgstr ""

3830

3547 -#: wt-status.c:1327

3831 +#: wt-status.c:1333

3832 msgid " (use \"git bisect reset\" to get back to the original branch)"

3833 msgstr ""

3834

3551 -#: wt-status.c:1524

3835 +#: wt-status.c:1530

3836 msgid "On branch "

3837 msgstr ""

3838

3555 -#: wt-status.c:1530

3839 +#: wt-status.c:1536

3840 msgid "interactive rebase in progress; onto "

3841 msgstr ""

3842

3559 -#: wt-status.c:1532

3843 +#: wt-status.c:1538

3844 msgid "rebase in progress; onto "

3845 msgstr ""

3846

3563 -#: wt-status.c:1537

3847 +#: wt-status.c:1543

3848 msgid "HEAD detached at "

3849 msgstr ""

3850

3567 -#: wt-status.c:1539

3851 +#: wt-status.c:1545

3852 msgid "HEAD detached from "

3853 msgstr ""

3854

3571 -#: wt-status.c:1542

3855 +#: wt-status.c:1548

3856 msgid "Not currently on any branch."

3857 msgstr ""

3858

3575 -#: wt-status.c:1560

3859 +#: wt-status.c:1566

3860 msgid "Initial commit"

3861 msgstr ""

3862

3579 -#: wt-status.c:1574

3863 +#: wt-status.c:1580

3864 msgid "Untracked files"

3865 msgstr ""

3866

3583 -#: wt-status.c:1576

3867 +#: wt-status.c:1582

3868 msgid "Ignored files"

3869 msgstr ""

3870

3587 -#: wt-status.c:1580

3871 +#: wt-status.c:1586

3872 #, c-format

3873 msgid ""

3874 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -3592,92 +3876,92 @@ msgid ""

3876 "new files yourself (see 'git help status')."

3877 msgstr ""

3878

3595 -#: wt-status.c:1586

3879 +#: wt-status.c:1592

3880 #, c-format

3881 msgid "Untracked files not listed%s"

3882 msgstr ""

3883

3600 -#: wt-status.c:1588

3884 +#: wt-status.c:1594

3885 msgid " (use -u option to show untracked files)"

3886 msgstr ""

3887

3604 -#: wt-status.c:1594

3888 +#: wt-status.c:1600

3889 msgid "No changes"

3890 msgstr ""

3891

3608 -#: wt-status.c:1599

3892 +#: wt-status.c:1605

3893 #, c-format

3894 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

3895 msgstr ""

3896

3613 -#: wt-status.c:1602

3897 +#: wt-status.c:1608

3898 #, c-format

3899 msgid "no changes added to commit\n"

3900 msgstr ""

3901

3618 -#: wt-status.c:1605

3902 +#: wt-status.c:1611

3903 #, c-format

3904 msgid ""

3905 "nothing added to commit but untracked files present (use \"git add\" to "

3906 "track)\n"

3907 msgstr ""

3908

3625 -#: wt-status.c:1608

3909 +#: wt-status.c:1614

3910 #, c-format

3911 msgid "nothing added to commit but untracked files present\n"

3912 msgstr ""

3913

3630 -#: wt-status.c:1611

3914 +#: wt-status.c:1617

3915 #, c-format

3916 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

3917 msgstr ""

3918

3635 -#: wt-status.c:1614 wt-status.c:1619

3919 +#: wt-status.c:1620 wt-status.c:1625

3920 #, c-format

3921 msgid "nothing to commit\n"

3922 msgstr ""

3923

3640 -#: wt-status.c:1617

3924 +#: wt-status.c:1623

3925 #, c-format

3926 msgid "nothing to commit (use -u to show untracked files)\n"

3927 msgstr ""

3928

3645 -#: wt-status.c:1621

3929 +#: wt-status.c:1627

3930 #, c-format

3931 msgid "nothing to commit, working tree clean\n"

3932 msgstr ""

3933

3650 -#: wt-status.c:1728

3934 +#: wt-status.c:1734

3935 msgid "Initial commit on "

3936 msgstr ""

3937

3654 -#: wt-status.c:1732

3938 +#: wt-status.c:1738

3939 msgid "HEAD (no branch)"

3940 msgstr ""

3941

3658 -#: wt-status.c:1761

3942 +#: wt-status.c:1767

3943 msgid "gone"

3944 msgstr ""

3945

3662 -#: wt-status.c:1763 wt-status.c:1771

3946 +#: wt-status.c:1769 wt-status.c:1777

3947 msgid "behind "

3948 msgstr ""

3949

3666 -#: wt-status.c:1766 wt-status.c:1769

3950 +#: wt-status.c:1772 wt-status.c:1775

3951 msgid "ahead "

3952 msgstr ""

3953

3954 #. TRANSLATORS: the action is e.g. "pull with rebase"

3671 -#: wt-status.c:2270

3955 +#: wt-status.c:2277

3956 #, c-format

3957 msgid "cannot %s: You have unstaged changes."

3958 msgstr ""

3959

3676 -#: wt-status.c:2276

3960 +#: wt-status.c:2283

3961 msgid "additionally, your index contains uncommitted changes."

3962 msgstr ""

3963

3680 -#: wt-status.c:2278

3964 +#: wt-status.c:2285

3965 #, c-format

3966 msgid "cannot %s: Your index contains uncommitted changes."

3967 msgstr ""

@@ -3709,7 +3993,7 @@ msgstr ""

3993 msgid "Unstaged changes after refreshing the index:"

3994 msgstr ""

3995

3712 -#: builtin/add.c:209 builtin/rev-parse.c:840

3996 +#: builtin/add.c:209 builtin/rev-parse.c:845

3997 msgid "Could not read the index"

3998 msgstr ""

3999

@@ -3744,9 +4028,9 @@ msgstr ""

4028 msgid "The following paths are ignored by one of your .gitignore files:\n"

4029 msgstr ""

4030

3747 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111

3748 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521

3749 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162

4031 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4032 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4033 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4034 msgid "dry run"

4035 msgstr ""

4036

@@ -3754,7 +4038,7 @@ msgstr ""

4038 msgid "interactive picking"

4039 msgstr ""

4040

3757 -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286

4041 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4042 msgid "select hunks interactively"

4043 msgstr ""

4044

@@ -3836,7 +4120,7 @@ msgstr ""

4120

4121 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4122 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

3839 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

4123 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4124 #: builtin/submodule--helper.c:244

4125 msgid "index file corrupt"

4126 msgstr ""

@@ -3953,7 +4237,7 @@ msgstr ""

4237 msgid "Failed to merge in the changes."

4238 msgstr ""

4239

3956 -#: builtin/am.c:1686 builtin/merge.c:628

4240 +#: builtin/am.c:1686 builtin/merge.c:632

4241 msgid "git write-tree failed to write a tree"

4242 msgstr ""

4243

@@ -3961,8 +4245,8 @@ msgstr ""

4245 msgid "applying to an empty history"

4246 msgstr ""

4247

3964 -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798

3965 -#: builtin/merge.c:823

4248 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4249 +#: builtin/merge.c:827

4250 msgid "failed to write commit object"

4251 msgstr ""

4252

@@ -4066,7 +4350,7 @@ msgid "allow fall back on 3way merging if needed"

4350 msgstr ""

4351

4352 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

4069 -#: builtin/repack.c:172

4353 +#: builtin/repack.c:178

4354 msgid "be quiet"

4355 msgstr ""

4356

@@ -4109,15 +4393,15 @@ msgid "pass it through git-apply"

4393 msgstr ""

4394

4395 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4112 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135

4113 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185

4114 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340

4396 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4397 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4398 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4399 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4400 msgid "n"

4401 msgstr ""

4402

4403 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4120 -#: builtin/tag.c:372

4404 +#: builtin/tag.c:387 builtin/verify-tag.c:38

4405 msgid "format"

4406 msgstr ""

4407

@@ -4153,8 +4437,8 @@ msgstr ""

4437 msgid "use current timestamp for author date"

4438 msgstr ""

4439

4156 -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229

4157 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355

4440 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4441 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

4442 msgid "key-id"

4443 msgstr ""

4444

@@ -4251,115 +4535,111 @@ msgstr ""

4535 msgid "<rev-opts> are documented in git-rev-list(1)"

4536 msgstr ""

4537

4254 -#: builtin/blame.c:1781

4538 +#: builtin/blame.c:1786

4539 msgid "Blaming lines"

4540 msgstr ""

4541

4258 -#: builtin/blame.c:2577

4542 +#: builtin/blame.c:2582

4543 msgid "Show blame entries as we find them, incrementally"

4544 msgstr ""

4545

4262 -#: builtin/blame.c:2578

4546 +#: builtin/blame.c:2583

4547 msgid "Show blank SHA-1 for boundary commits (Default: off)"

4548 msgstr ""

4549

4266 -#: builtin/blame.c:2579

4550 +#: builtin/blame.c:2584

4551 msgid "Do not treat root commits as boundaries (Default: off)"

4552 msgstr ""

4553

4270 -#: builtin/blame.c:2580

4554 +#: builtin/blame.c:2585

4555 msgid "Show work cost statistics"

4556 msgstr ""

4557

4274 -#: builtin/blame.c:2581

4558 +#: builtin/blame.c:2586

4559 msgid "Force progress reporting"

4560 msgstr ""

4561

4278 -#: builtin/blame.c:2582

4562 +#: builtin/blame.c:2587

4563 msgid "Show output score for blame entries"

4564 msgstr ""

4565

4282 -#: builtin/blame.c:2583

4566 +#: builtin/blame.c:2588

4567 msgid "Show original filename (Default: auto)"

4568 msgstr ""

4569

4286 -#: builtin/blame.c:2584

4570 +#: builtin/blame.c:2589

4571 msgid "Show original linenumber (Default: off)"

4572 msgstr ""

4573

4290 -#: builtin/blame.c:2585

4574 +#: builtin/blame.c:2590

4575 msgid "Show in a format designed for machine consumption"

4576 msgstr ""

4577

4294 -#: builtin/blame.c:2586

4578 +#: builtin/blame.c:2591

4579 msgid "Show porcelain format with per-line commit information"

4580 msgstr ""

4581

4298 -#: builtin/blame.c:2587

4582 +#: builtin/blame.c:2592

4583 msgid "Use the same output mode as git-annotate (Default: off)"

4584 msgstr ""

4585

4302 -#: builtin/blame.c:2588

4586 +#: builtin/blame.c:2593

4587 msgid "Show raw timestamp (Default: off)"

4588 msgstr ""

4589

4306 -#: builtin/blame.c:2589

4590 +#: builtin/blame.c:2594

4591 msgid "Show long commit SHA1 (Default: off)"

4592 msgstr ""

4593

4310 -#: builtin/blame.c:2590

4594 +#: builtin/blame.c:2595

4595 msgid "Suppress author name and timestamp (Default: off)"

4596 msgstr ""

4597

4314 -#: builtin/blame.c:2591

4598 +#: builtin/blame.c:2596

4599 msgid "Show author email instead of name (Default: off)"

4600 msgstr ""

4601

4318 -#: builtin/blame.c:2592

4602 +#: builtin/blame.c:2597

4603 msgid "Ignore whitespace differences"

4604 msgstr ""

4605

4322 -#: builtin/blame.c:2599

4323 -msgid "Use an experimental indent-based heuristic to improve diffs"

4324 -msgstr ""

4325 -

4326 -#: builtin/blame.c:2600

4327 -msgid "Use an experimental blank-line-based heuristic to improve diffs"

4606 +#: builtin/blame.c:2604

4607 +msgid "Use an experimental heuristic to improve diffs"

4608 msgstr ""

4609

4330 -#: builtin/blame.c:2602

4610 +#: builtin/blame.c:2606

4611 msgid "Spend extra cycles to find better match"

4612 msgstr ""

4613

4334 -#: builtin/blame.c:2603

4614 +#: builtin/blame.c:2607

4615 msgid "Use revisions from <file> instead of calling git-rev-list"

4616 msgstr ""

4617

4338 -#: builtin/blame.c:2604

4618 +#: builtin/blame.c:2608

4619 msgid "Use <file>'s contents as the final image"

4620 msgstr ""

4621

4342 -#: builtin/blame.c:2605 builtin/blame.c:2606

4622 +#: builtin/blame.c:2609 builtin/blame.c:2610

4623 msgid "score"

4624 msgstr ""

4625

4346 -#: builtin/blame.c:2605

4626 +#: builtin/blame.c:2609

4627 msgid "Find line copies within and across files"

4628 msgstr ""

4629

4350 -#: builtin/blame.c:2606

4630 +#: builtin/blame.c:2610

4631 msgid "Find line movements within and across files"

4632 msgstr ""

4633

4354 -#: builtin/blame.c:2607

4634 +#: builtin/blame.c:2611

4635 msgid "n,m"

4636 msgstr ""

4637

4358 -#: builtin/blame.c:2607

4638 +#: builtin/blame.c:2611

4639 msgid "Process only line range n,m, counting from 1"

4640 msgstr ""

4641

4362 -#: builtin/blame.c:2654

4642 +#: builtin/blame.c:2658

4643 msgid "--progress can't be used with --incremental or porcelain formats"

4644 msgstr ""

4645

@@ -4369,38 +4649,38 @@ msgstr ""

4649 #. takes 22 places, is the longest among various forms of

4650 #. relative timestamps, but your language may need more or

4651 #. fewer display columns.

4372 -#: builtin/blame.c:2700

4652 +#: builtin/blame.c:2706

4653 msgid "4 years, 11 months ago"

4654 msgstr ""

4655

4376 -#: builtin/blame.c:2780

4656 +#: builtin/blame.c:2786

4657 msgid "--contents and --reverse do not blend well."

4658 msgstr ""

4659

4380 -#: builtin/blame.c:2800

4660 +#: builtin/blame.c:2806

4661 msgid "cannot use --contents with final commit object name"

4662 msgstr ""

4663

4384 -#: builtin/blame.c:2805

4664 +#: builtin/blame.c:2811

4665 msgid "--reverse and --first-parent together require specified latest commit"

4666 msgstr ""

4667

4388 -#: builtin/blame.c:2832

4668 +#: builtin/blame.c:2838

4669 msgid ""

4670 "--reverse --first-parent together require range along first-parent chain"

4671 msgstr ""

4672

4393 -#: builtin/blame.c:2843

4673 +#: builtin/blame.c:2849

4674 #, c-format

4675 msgid "no such path %s in %s"

4676 msgstr ""

4677

4398 -#: builtin/blame.c:2854

4678 +#: builtin/blame.c:2860

4679 #, c-format

4680 msgid "cannot read blob %s for path %s"

4681 msgstr ""

4682

4403 -#: builtin/blame.c:2873

4683 +#: builtin/blame.c:2879

4684 #, c-format

4685 msgid "file %s has only %lu line"

4686 msgid_plural "file %s has only %lu lines"

@@ -4572,44 +4852,44 @@ msgstr ""

4852 msgid "(no branch)"

4853 msgstr ""

4854

4575 -#: builtin/branch.c:544

4855 +#: builtin/branch.c:535

4856 #, c-format

4857 msgid "Branch %s is being rebased at %s"

4858 msgstr ""

4859

4580 -#: builtin/branch.c:548

4860 +#: builtin/branch.c:539

4861 #, c-format

4862 msgid "Branch %s is being bisected at %s"

4863 msgstr ""

4864

4585 -#: builtin/branch.c:563

4865 +#: builtin/branch.c:554

4866 msgid "cannot rename the current branch while not on any."

4867 msgstr ""

4868

4589 -#: builtin/branch.c:573

4869 +#: builtin/branch.c:564

4870 #, c-format

4871 msgid "Invalid branch name: '%s'"

4872 msgstr ""

4873

4594 -#: builtin/branch.c:590

4874 +#: builtin/branch.c:581

4875 msgid "Branch rename failed"

4876 msgstr ""

4877

4598 -#: builtin/branch.c:594

4878 +#: builtin/branch.c:585

4879 #, c-format

4880 msgid "Renamed a misnamed branch '%s' away"

4881 msgstr ""

4882

4603 -#: builtin/branch.c:597

4883 +#: builtin/branch.c:588

4884 #, c-format

4885 msgid "Branch renamed to %s, but HEAD is not updated!"

4886 msgstr ""

4887

4608 -#: builtin/branch.c:604

4888 +#: builtin/branch.c:595

4889 msgid "Branch is renamed, but update of config-file failed"

4890 msgstr ""

4891

4612 -#: builtin/branch.c:620

4892 +#: builtin/branch.c:611

4893 #, c-format

4894 msgid ""

4895 "Please edit the description for the branch\n"

@@ -4617,207 +4897,211 @@ msgid ""

4897 "Lines starting with '%c' will be stripped.\n"

4898 msgstr ""

4899

4620 -#: builtin/branch.c:651

4900 +#: builtin/branch.c:643

4901 msgid "Generic options"

4902 msgstr ""

4903

4624 -#: builtin/branch.c:653

4904 +#: builtin/branch.c:645

4905 msgid "show hash and subject, give twice for upstream branch"

4906 msgstr ""

4907

4628 -#: builtin/branch.c:654

4908 +#: builtin/branch.c:646

4909 msgid "suppress informational messages"

4910 msgstr ""

4911

4632 -#: builtin/branch.c:655

4912 +#: builtin/branch.c:647

4913 msgid "set up tracking mode (see git-pull(1))"

4914 msgstr ""

4915

4636 -#: builtin/branch.c:657

4916 +#: builtin/branch.c:649

4917 msgid "change upstream info"

4918 msgstr ""

4919

4640 -#: builtin/branch.c:659

4920 +#: builtin/branch.c:651

4921 msgid "upstream"

4922 msgstr ""

4923

4644 -#: builtin/branch.c:659

4924 +#: builtin/branch.c:651

4925 msgid "change the upstream info"

4926 msgstr ""

4927

4648 -#: builtin/branch.c:660

4928 +#: builtin/branch.c:652

4929 msgid "Unset the upstream info"

4930 msgstr ""

4931

4652 -#: builtin/branch.c:661

4932 +#: builtin/branch.c:653

4933 msgid "use colored output"

4934 msgstr ""

4935

4656 -#: builtin/branch.c:662

4936 +#: builtin/branch.c:654

4937 msgid "act on remote-tracking branches"

4938 msgstr ""

4939

4660 -#: builtin/branch.c:664 builtin/branch.c:665

4940 +#: builtin/branch.c:656 builtin/branch.c:657

4941 msgid "print only branches that contain the commit"

4942 msgstr ""

4943

4664 -#: builtin/branch.c:668

4944 +#: builtin/branch.c:660

4945 msgid "Specific git-branch actions:"

4946 msgstr ""

4947

4668 -#: builtin/branch.c:669

4948 +#: builtin/branch.c:661

4949 msgid "list both remote-tracking and local branches"

4950 msgstr ""

4951

4672 -#: builtin/branch.c:671

4952 +#: builtin/branch.c:663

4953 msgid "delete fully merged branch"

4954 msgstr ""

4955

4676 -#: builtin/branch.c:672

4956 +#: builtin/branch.c:664

4957 msgid "delete branch (even if not merged)"

4958 msgstr ""

4959

4680 -#: builtin/branch.c:673

4960 +#: builtin/branch.c:665

4961 msgid "move/rename a branch and its reflog"

4962 msgstr ""

4963

4684 -#: builtin/branch.c:674

4964 +#: builtin/branch.c:666

4965 msgid "move/rename a branch, even if target exists"

4966 msgstr ""

4967

4688 -#: builtin/branch.c:675

4968 +#: builtin/branch.c:667

4969 msgid "list branch names"

4970 msgstr ""

4971

4692 -#: builtin/branch.c:676

4972 +#: builtin/branch.c:668

4973 msgid "create the branch's reflog"

4974 msgstr ""

4975

4696 -#: builtin/branch.c:678

4976 +#: builtin/branch.c:670

4977 msgid "edit the description for the branch"

4978 msgstr ""

4979

4700 -#: builtin/branch.c:679

4980 +#: builtin/branch.c:671

4981 msgid "force creation, move/rename, deletion"

4982 msgstr ""

4983

4704 -#: builtin/branch.c:680

4984 +#: builtin/branch.c:672

4985 msgid "print only branches that are merged"

4986 msgstr ""

4987

4708 -#: builtin/branch.c:681

4988 +#: builtin/branch.c:673

4989 msgid "print only branches that are not merged"

4990 msgstr ""

4991

4712 -#: builtin/branch.c:682

4992 +#: builtin/branch.c:674

4993 msgid "list branches in columns"

4994 msgstr ""

4995

4716 -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

4996 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

4997 msgid "key"

4998 msgstr ""

4999

4720 -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

5000 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5001 msgid "field name to sort on"

5002 msgstr ""

5003

4724 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404

5004 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5005 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

4726 -#: builtin/tag.c:369

5006 +#: builtin/tag.c:384

5007 msgid "object"

5008 msgstr ""

5009

4730 -#: builtin/branch.c:687

5010 +#: builtin/branch.c:679

5011 msgid "print only branches of the object"

5012 msgstr ""

5013

4734 -#: builtin/branch.c:705

5014 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5015 +msgid "sorting and filtering are case insensitive"

5016 +msgstr ""

5017 +

5018 +#: builtin/branch.c:698

5019 msgid "Failed to resolve HEAD as a valid ref."

5020 msgstr ""

5021

4738 -#: builtin/branch.c:709 builtin/clone.c:706

5022 +#: builtin/branch.c:702 builtin/clone.c:706

5023 msgid "HEAD not found below refs/heads!"

5024 msgstr ""

5025

4742 -#: builtin/branch.c:729

5026 +#: builtin/branch.c:724

5027 msgid "--column and --verbose are incompatible"

5028 msgstr ""

5029

4746 -#: builtin/branch.c:740 builtin/branch.c:782

5030 +#: builtin/branch.c:735 builtin/branch.c:787

5031 msgid "branch name required"

5032 msgstr ""

5033

4750 -#: builtin/branch.c:758

5034 +#: builtin/branch.c:763

5035 msgid "Cannot give description to detached HEAD"

5036 msgstr ""

5037

4754 -#: builtin/branch.c:763

5038 +#: builtin/branch.c:768

5039 msgid "cannot edit description of more than one branch"

5040 msgstr ""

5041

4758 -#: builtin/branch.c:770

5042 +#: builtin/branch.c:775

5043 #, c-format

5044 msgid "No commit on branch '%s' yet."

5045 msgstr ""

5046

4763 -#: builtin/branch.c:773

5047 +#: builtin/branch.c:778

5048 #, c-format

5049 msgid "No branch named '%s'."

5050 msgstr ""

5051

4768 -#: builtin/branch.c:788

5052 +#: builtin/branch.c:793

5053 msgid "too many branches for a rename operation"

5054 msgstr ""

5055

4772 -#: builtin/branch.c:793

5056 +#: builtin/branch.c:798

5057 msgid "too many branches to set new upstream"

5058 msgstr ""

5059

4776 -#: builtin/branch.c:797

5060 +#: builtin/branch.c:802

5061 #, c-format

5062 msgid ""

5063 "could not set upstream of HEAD to %s when it does not point to any branch."

5064 msgstr ""

5065

4782 -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

5066 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5067 #, c-format

5068 msgid "no such branch '%s'"

5069 msgstr ""

5070

4787 -#: builtin/branch.c:804

5071 +#: builtin/branch.c:809

5072 #, c-format

5073 msgid "branch '%s' does not exist"

5074 msgstr ""

5075

4792 -#: builtin/branch.c:816

5076 +#: builtin/branch.c:821

5077 msgid "too many branches to unset upstream"

5078 msgstr ""

5079

4796 -#: builtin/branch.c:820

5080 +#: builtin/branch.c:825

5081 msgid "could not unset upstream of HEAD when it does not point to any branch."

5082 msgstr ""

5083

4800 -#: builtin/branch.c:826

5084 +#: builtin/branch.c:831

5085 #, c-format

5086 msgid "Branch '%s' has no upstream information"

5087 msgstr ""

5088

4805 -#: builtin/branch.c:840

5089 +#: builtin/branch.c:845

5090 msgid "it does not make sense to create 'HEAD' manually"

5091 msgstr ""

5092

4809 -#: builtin/branch.c:846

5093 +#: builtin/branch.c:851

5094 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5095 msgstr ""

5096

4813 -#: builtin/branch.c:849

5097 +#: builtin/branch.c:854

5098 #, c-format

5099 msgid ""

5100 "The --set-upstream flag is deprecated and will be removed. Consider using --"

5101 "track or --set-upstream-to\n"

5102 msgstr ""

5103

4820 -#: builtin/branch.c:866

5104 +#: builtin/branch.c:871

5105 #, c-format

5106 msgid ""

5107 "\n"

@@ -4878,7 +5162,7 @@ msgstr ""

5162 msgid "for blob objects, run filters on object's content"

5163 msgstr ""

5164

4881 -#: builtin/cat-file.c:561 git-submodule.sh:923

5165 +#: builtin/cat-file.c:561 git-submodule.sh:929

5166 msgid "blob"

5167 msgstr ""

5168

@@ -4934,7 +5218,7 @@ msgstr ""

5218 msgid "terminate input and output records by a NUL character"

5219 msgstr ""

5220

4937 -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325

5221 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5222 msgid "suppress progress reporting"

5223 msgstr ""

5224

@@ -5024,9 +5308,9 @@ msgid "write the content to temporary files"

5308 msgstr ""

5309

5310 #: builtin/checkout-index.c:174 builtin/column.c:30

5027 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598

5028 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951

5029 -#: builtin/worktree.c:469

5311 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5312 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5313 +#: builtin/worktree.c:471

5314 msgid "string"

5315 msgstr ""

5316

@@ -5101,50 +5385,50 @@ msgstr ""

5385 msgid "you need to resolve your current index first"

5386 msgstr ""

5387

5104 -#: builtin/checkout.c:624

5388 +#: builtin/checkout.c:625

5389 #, c-format

5390 msgid "Can not do reflog for '%s': %s\n"

5391 msgstr ""

5392

5109 -#: builtin/checkout.c:663

5393 +#: builtin/checkout.c:666

5394 msgid "HEAD is now at"

5395 msgstr ""

5396

5113 -#: builtin/checkout.c:667 builtin/clone.c:660

5397 +#: builtin/checkout.c:670 builtin/clone.c:660

5398 msgid "unable to update HEAD"

5399 msgstr ""

5400

5117 -#: builtin/checkout.c:671

5401 +#: builtin/checkout.c:674

5402 #, c-format

5403 msgid "Reset branch '%s'\n"

5404 msgstr ""

5405

5122 -#: builtin/checkout.c:674

5406 +#: builtin/checkout.c:677

5407 #, c-format

5408 msgid "Already on '%s'\n"

5409 msgstr ""

5410

5127 -#: builtin/checkout.c:678

5411 +#: builtin/checkout.c:681

5412 #, c-format

5413 msgid "Switched to and reset branch '%s'\n"

5414 msgstr ""

5415

5132 -#: builtin/checkout.c:680 builtin/checkout.c:1069

5416 +#: builtin/checkout.c:683 builtin/checkout.c:1072

5417 #, c-format

5418 msgid "Switched to a new branch '%s'\n"

5419 msgstr ""

5420

5137 -#: builtin/checkout.c:682

5421 +#: builtin/checkout.c:685

5422 #, c-format

5423 msgid "Switched to branch '%s'\n"

5424 msgstr ""

5425

5142 -#: builtin/checkout.c:733

5426 +#: builtin/checkout.c:736

5427 #, c-format

5428 msgid " ... and %d more.\n"

5429 msgstr ""

5430

5147 -#: builtin/checkout.c:739

5431 +#: builtin/checkout.c:742

5432 #, c-format

5433 msgid ""

5434 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5159,7 +5443,7 @@ msgid_plural ""

5443 msgstr[0] ""

5444 msgstr[1] ""

5445

5162 -#: builtin/checkout.c:758

5446 +#: builtin/checkout.c:761

5447 #, c-format

5448 msgid ""

5449 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5176,162 +5460,162 @@ msgid_plural ""

5460 msgstr[0] ""

5461 msgstr[1] ""

5462

5179 -#: builtin/checkout.c:794

5463 +#: builtin/checkout.c:797

5464 msgid "internal error in revision walk"

5465 msgstr ""

5466

5183 -#: builtin/checkout.c:798

5467 +#: builtin/checkout.c:801

5468 msgid "Previous HEAD position was"

5469 msgstr ""

5470

5187 -#: builtin/checkout.c:825 builtin/checkout.c:1064

5471 +#: builtin/checkout.c:828 builtin/checkout.c:1067

5472 msgid "You are on a branch yet to be born"

5473 msgstr ""

5474

5191 -#: builtin/checkout.c:970

5475 +#: builtin/checkout.c:973

5476 #, c-format

5477 msgid "only one reference expected, %d given."

5478 msgstr ""

5479

5196 -#: builtin/checkout.c:1010 builtin/worktree.c:214

5480 +#: builtin/checkout.c:1013 builtin/worktree.c:214

5481 #, c-format

5482 msgid "invalid reference: %s"

5483 msgstr ""

5484

5201 -#: builtin/checkout.c:1039

5485 +#: builtin/checkout.c:1042

5486 #, c-format

5487 msgid "reference is not a tree: %s"

5488 msgstr ""

5489

5206 -#: builtin/checkout.c:1078

5490 +#: builtin/checkout.c:1081

5491 msgid "paths cannot be used with switching branches"

5492 msgstr ""

5493

5210 -#: builtin/checkout.c:1081 builtin/checkout.c:1085

5494 +#: builtin/checkout.c:1084 builtin/checkout.c:1088

5495 #, c-format

5496 msgid "'%s' cannot be used with switching branches"

5497 msgstr ""

5498

5215 -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097

5216 -#: builtin/checkout.c:1100

5499 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5500 +#: builtin/checkout.c:1103

5501 #, c-format

5502 msgid "'%s' cannot be used with '%s'"

5503 msgstr ""

5504

5221 -#: builtin/checkout.c:1105

5505 +#: builtin/checkout.c:1108

5506 #, c-format

5507 msgid "Cannot switch branch to a non-commit '%s'"

5508 msgstr ""

5509

5226 -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93

5510 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5511 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5512 #: builtin/worktree.c:326

5513 msgid "branch"

5514 msgstr ""

5515

5232 -#: builtin/checkout.c:1139

5516 +#: builtin/checkout.c:1142

5517 msgid "create and checkout a new branch"

5518 msgstr ""

5519

5236 -#: builtin/checkout.c:1141

5520 +#: builtin/checkout.c:1144

5521 msgid "create/reset and checkout a branch"

5522 msgstr ""

5523

5240 -#: builtin/checkout.c:1142

5524 +#: builtin/checkout.c:1145

5525 msgid "create reflog for new branch"

5526 msgstr ""

5527

5244 -#: builtin/checkout.c:1143 builtin/worktree.c:328

5528 +#: builtin/checkout.c:1146 builtin/worktree.c:328

5529 msgid "detach HEAD at named commit"

5530 msgstr ""

5531

5248 -#: builtin/checkout.c:1144

5532 +#: builtin/checkout.c:1147

5533 msgid "set upstream info for new branch"

5534 msgstr ""

5535

5252 -#: builtin/checkout.c:1146

5536 +#: builtin/checkout.c:1149

5537 msgid "new-branch"

5538 msgstr ""

5539

5256 -#: builtin/checkout.c:1146

5540 +#: builtin/checkout.c:1149

5541 msgid "new unparented branch"

5542 msgstr ""

5543

5260 -#: builtin/checkout.c:1147

5544 +#: builtin/checkout.c:1150

5545 msgid "checkout our version for unmerged files"

5546 msgstr ""

5547

5264 -#: builtin/checkout.c:1149

5548 +#: builtin/checkout.c:1152

5549 msgid "checkout their version for unmerged files"

5550 msgstr ""

5551

5268 -#: builtin/checkout.c:1151

5552 +#: builtin/checkout.c:1154

5553 msgid "force checkout (throw away local modifications)"

5554 msgstr ""

5555

5272 -#: builtin/checkout.c:1152

5556 +#: builtin/checkout.c:1155

5557 msgid "perform a 3-way merge with the new branch"

5558 msgstr ""

5559

5276 -#: builtin/checkout.c:1153 builtin/merge.c:231

5560 +#: builtin/checkout.c:1156 builtin/merge.c:235

5561 msgid "update ignored files (default)"

5562 msgstr ""

5563

5280 -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251

5564 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

5565 msgid "style"

5566 msgstr ""

5567

5284 -#: builtin/checkout.c:1155

5568 +#: builtin/checkout.c:1158

5569 msgid "conflict style (merge or diff3)"

5570 msgstr ""

5571

5288 -#: builtin/checkout.c:1158

5572 +#: builtin/checkout.c:1161

5573 msgid "do not limit pathspecs to sparse entries only"

5574 msgstr ""

5575

5292 -#: builtin/checkout.c:1160

5576 +#: builtin/checkout.c:1163

5577 msgid "second guess 'git checkout <no-such-branch>'"

5578 msgstr ""

5579

5296 -#: builtin/checkout.c:1162

5580 +#: builtin/checkout.c:1165

5581 msgid "do not check if another worktree is holding the given ref"

5582 msgstr ""

5583

5300 -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119

5301 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536

5584 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

5585 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

5586 #: builtin/send-pack.c:168

5587 msgid "force progress reporting"

5588 msgstr ""

5589

5306 -#: builtin/checkout.c:1194

5590 +#: builtin/checkout.c:1197

5591 msgid "-b, -B and --orphan are mutually exclusive"

5592 msgstr ""

5593

5310 -#: builtin/checkout.c:1211

5594 +#: builtin/checkout.c:1214

5595 msgid "--track needs a branch name"

5596 msgstr ""

5597

5314 -#: builtin/checkout.c:1216

5598 +#: builtin/checkout.c:1219

5599 msgid "Missing branch name; try -b"

5600 msgstr ""

5601

5318 -#: builtin/checkout.c:1252

5602 +#: builtin/checkout.c:1255

5603 msgid "invalid path specification"

5604 msgstr ""

5605

5322 -#: builtin/checkout.c:1259

5606 +#: builtin/checkout.c:1262

5607 #, c-format

5608 msgid ""

5609 "Cannot update paths and switch to branch '%s' at the same time.\n"

5610 "Did you intend to checkout '%s' which can not be resolved as commit?"

5611 msgstr ""

5612

5329 -#: builtin/checkout.c:1264

5613 +#: builtin/checkout.c:1267

5614 #, c-format

5615 msgid "git checkout: --detach does not take a path argument '%s'"

5616 msgstr ""

5617

5334 -#: builtin/checkout.c:1268

5618 +#: builtin/checkout.c:1271

5619 msgid ""

5620 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

5621 "checking out of the index."

@@ -5367,15 +5651,17 @@ msgstr ""

5651 msgid "failed to remove %s"

5652 msgstr ""

5653

5370 -#: builtin/clean.c:291

5654 +#: builtin/clean.c:291 git-add--interactive.perl:623

5655 +#, c-format

5656 msgid ""

5657 "Prompt help:\n"

5658 "1 - select a numbered item\n"

5659 "foo - select item based on unique prefix\n"

5375 -" - (empty) select nothing"

5660 +" - (empty) select nothing\n"

5661 msgstr ""

5662

5378 -#: builtin/clean.c:295

5663 +#: builtin/clean.c:295 git-add--interactive.perl:632

5664 +#, c-format

5665 msgid ""

5666 "Prompt help:\n"

5667 "1 - select a single item\n"

@@ -5384,12 +5670,13 @@ msgid ""

5670 "foo - select item based on unique prefix\n"

5671 "-... - unselect specified items\n"

5672 "* - choose all items\n"

5387 -" - (empty) finish selecting"

5673 +" - (empty) finish selecting\n"

5674 msgstr ""

5675

5390 -#: builtin/clean.c:511

5391 -#, c-format

5392 -msgid "Huh (%s)?"

5676 +#: builtin/clean.c:511 git-add--interactive.perl:598

5677 +#: git-add--interactive.perl:603

5678 +#, c-format, perl-format

5679 +msgid "Huh (%s)?\n"

5680 msgstr ""

5681

5682 #: builtin/clean.c:653

@@ -5412,8 +5699,9 @@ msgstr ""

5699 msgid "Remove %s [y/N]? "

5700 msgstr ""

5701

5415 -#: builtin/clean.c:777

5416 -msgid "Bye."

5702 +#: builtin/clean.c:777 git-add--interactive.perl:1669

5703 +#, c-format

5704 +msgid "Bye.\n"

5705 msgstr ""

5706

5707 #: builtin/clean.c:785

@@ -5427,11 +5715,11 @@ msgid ""

5715 "? - help for prompt selection"

5716 msgstr ""

5717

5430 -#: builtin/clean.c:812

5718 +#: builtin/clean.c:812 git-add--interactive.perl:1745

5719 msgid "*** Commands ***"

5720 msgstr ""

5721

5434 -#: builtin/clean.c:813

5722 +#: builtin/clean.c:813 git-add--interactive.perl:1742

5723 msgid "What now"

5724 msgstr ""

5725

@@ -5461,8 +5749,8 @@ msgstr ""

5749 msgid "remove whole directories"

5750 msgstr ""

5751

5464 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725

5465 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182

5752 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

5753 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

5754 msgid "pattern"

5755 msgstr ""

5756

@@ -5538,8 +5826,8 @@ msgstr ""

5826 msgid "directory from which templates will be used"

5827 msgstr ""

5828

5541 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602

5542 -#: builtin/submodule--helper.c:954

5829 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

5830 +#: builtin/submodule--helper.c:970

5831 msgid "reference repository"

5832 msgstr ""

5833

@@ -5563,7 +5851,7 @@ msgstr ""

5851 msgid "path to git-upload-pack on the remote"

5852 msgstr ""

5853

5566 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668

5854 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

5855 #: builtin/pull.c:202

5856 msgid "depth"

5857 msgstr ""

@@ -5572,7 +5860,7 @@ msgstr ""

5860 msgid "create a shallow clone of that depth"

5861 msgstr ""

5862

5575 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848

5863 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

5864 #: parse-options.h:142

5865 msgid "time"

5866 msgstr ""

@@ -5586,7 +5874,7 @@ msgid "revision"

5874 msgstr ""

5875

5876 #: builtin/clone.c:102 builtin/fetch.c:125

5589 -msgid "deepen history of shallow clone by excluding rev"

5877 +msgid "deepen history of shallow clone, excluding rev"

5878 msgstr ""

5879

5880 #: builtin/clone.c:104

@@ -5613,11 +5901,11 @@ msgstr ""

5901 msgid "set config inside the new repository"

5902 msgstr ""

5903

5616 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547

5904 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

5905 msgid "use IPv4 addresses only"

5906 msgstr ""

5907

5620 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549

5908 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

5909 msgid "use IPv6 addresses only"

5910 msgstr ""

5911

@@ -5725,7 +6013,7 @@ msgstr ""

6013 msgid "repository '%s' does not exist"

6014 msgstr ""

6015

5728 -#: builtin/clone.c:905 builtin/fetch.c:1338

6016 +#: builtin/clone.c:905 builtin/fetch.c:1335

6017 #, c-format

6018 msgid "depth %s is not a positive number"

6019 msgstr ""

@@ -5740,8 +6028,9 @@ msgstr ""

6028 msgid "working tree '%s' already exists."

6029 msgstr ""

6030

5743 -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657

5744 -#: builtin/worktree.c:222 builtin/worktree.c:249

6031 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252

6032 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222

6033 +#: builtin/worktree.c:249

6034 #, c-format

6035 msgid "could not create leading directories of '%s'"

6036 msgstr ""

@@ -5970,7 +6259,7 @@ msgstr ""

6259 msgid "could not lookup commit %s"

6260 msgstr ""

6261

5973 -#: builtin/commit.c:704 builtin/shortlog.c:286

6262 +#: builtin/commit.c:704 builtin/shortlog.c:295

6263 #, c-format

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

6265 msgstr ""

@@ -6054,7 +6343,7 @@ msgstr ""

6343 msgid "Error building trees"

6344 msgstr ""

6345

6057 -#: builtin/commit.c:969 builtin/tag.c:266

6346 +#: builtin/commit.c:968 builtin/tag.c:280

6347 #, c-format

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

6349 msgstr ""

@@ -6064,7 +6353,7 @@ msgstr ""

6353 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

6354 msgstr ""

6355

6067 -#: builtin/commit.c:1086 builtin/commit.c:1327

6356 +#: builtin/commit.c:1086 builtin/commit.c:1325

6357 #, c-format

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

6359 msgstr ""

@@ -6114,262 +6403,258 @@ msgid "No paths with --include/--only does not make sense."

6403 msgstr ""

6404

6405 #: builtin/commit.c:1212

6117 -msgid "Clever... amending the last one with dirty index."

6118 -msgstr ""

6119 -

6120 -#: builtin/commit.c:1214

6406 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

6407 msgstr ""

6408

6124 -#: builtin/commit.c:1226 builtin/tag.c:474

6409 +#: builtin/commit.c:1224 builtin/tag.c:495

6410 #, c-format

6411 msgid "Invalid cleanup mode %s"

6412 msgstr ""

6413

6129 -#: builtin/commit.c:1231

6414 +#: builtin/commit.c:1229

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

6416 msgstr ""

6417

6133 -#: builtin/commit.c:1341 builtin/commit.c:1617

6418 +#: builtin/commit.c:1339 builtin/commit.c:1612

6419 msgid "show status concisely"

6420 msgstr ""

6421

6137 -#: builtin/commit.c:1343 builtin/commit.c:1619

6422 +#: builtin/commit.c:1341 builtin/commit.c:1614

6423 msgid "show branch information"

6424 msgstr ""

6425

6141 -#: builtin/commit.c:1345

6426 +#: builtin/commit.c:1343

6427 msgid "version"

6428 msgstr ""

6429

6145 -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522

6146 -#: builtin/worktree.c:440

6430 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

6431 +#: builtin/worktree.c:442

6432 msgid "machine-readable output"

6433 msgstr ""

6434

6150 -#: builtin/commit.c:1348 builtin/commit.c:1623

6435 +#: builtin/commit.c:1346 builtin/commit.c:1618

6436 msgid "show status in long format (default)"

6437 msgstr ""

6438

6154 -#: builtin/commit.c:1351 builtin/commit.c:1626

6439 +#: builtin/commit.c:1349 builtin/commit.c:1621

6440 msgid "terminate entries with NUL"

6441 msgstr ""

6442

6158 -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981

6159 -#: builtin/fast-export.c:984 builtin/tag.c:353

6443 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981

6444 +#: builtin/fast-export.c:984 builtin/tag.c:368

6445 msgid "mode"

6446 msgstr ""

6447

6163 -#: builtin/commit.c:1354 builtin/commit.c:1629

6448 +#: builtin/commit.c:1352 builtin/commit.c:1624

6449 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6450 msgstr ""

6451

6167 -#: builtin/commit.c:1357

6452 +#: builtin/commit.c:1355

6453 msgid "show ignored files"

6454 msgstr ""

6455

6171 -#: builtin/commit.c:1358 parse-options.h:155

6456 +#: builtin/commit.c:1356 parse-options.h:155

6457 msgid "when"

6458 msgstr ""

6459

6175 -#: builtin/commit.c:1359

6460 +#: builtin/commit.c:1357

6461 msgid ""

6462 "ignore changes to submodules, optional when: all, dirty, untracked. "

6463 "(Default: all)"

6464 msgstr ""

6465

6181 -#: builtin/commit.c:1361

6466 +#: builtin/commit.c:1359

6467 msgid "list untracked files in columns"

6468 msgstr ""

6469

6185 -#: builtin/commit.c:1437

6470 +#: builtin/commit.c:1435

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

6472 msgstr ""

6473

6189 -#: builtin/commit.c:1439

6474 +#: builtin/commit.c:1437

6475 msgid "could not parse newly created commit"

6476 msgstr ""

6477

6193 -#: builtin/commit.c:1484

6478 +#: builtin/commit.c:1482

6479 msgid "detached HEAD"

6480 msgstr ""

6481

6197 -#: builtin/commit.c:1487

6482 +#: builtin/commit.c:1485

6483 msgid " (root-commit)"

6484 msgstr ""

6485

6201 -#: builtin/commit.c:1587

6486 +#: builtin/commit.c:1582

6487 msgid "suppress summary after successful commit"

6488 msgstr ""

6489

6205 -#: builtin/commit.c:1588

6490 +#: builtin/commit.c:1583

6491 msgid "show diff in commit message template"

6492 msgstr ""

6493

6209 -#: builtin/commit.c:1590

6494 +#: builtin/commit.c:1585

6495 msgid "Commit message options"

6496 msgstr ""

6497

6213 -#: builtin/commit.c:1591 builtin/tag.c:351

6498 +#: builtin/commit.c:1586 builtin/tag.c:366

6499 msgid "read message from file"

6500 msgstr ""

6501

6217 -#: builtin/commit.c:1592

6502 +#: builtin/commit.c:1587

6503 msgid "author"

6504 msgstr ""

6505

6221 -#: builtin/commit.c:1592

6506 +#: builtin/commit.c:1587

6507 msgid "override author for commit"

6508 msgstr ""

6509

6225 -#: builtin/commit.c:1593 builtin/gc.c:326

6510 +#: builtin/commit.c:1588 builtin/gc.c:333

6511 msgid "date"

6512 msgstr ""

6513

6229 -#: builtin/commit.c:1593

6514 +#: builtin/commit.c:1588

6515 msgid "override date for commit"

6516 msgstr ""

6517

6233 -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398

6234 -#: builtin/notes.c:561 builtin/tag.c:349

6518 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398

6519 +#: builtin/notes.c:561 builtin/tag.c:364

6520 msgid "message"

6521 msgstr ""

6522

6238 -#: builtin/commit.c:1594

6523 +#: builtin/commit.c:1589

6524 msgid "commit message"

6525 msgstr ""

6526

6242 -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597

6243 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79

6527 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592

6528 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81

6529 msgid "commit"

6530 msgstr ""

6531

6247 -#: builtin/commit.c:1595

6532 +#: builtin/commit.c:1590

6533 msgid "reuse and edit message from specified commit"

6534 msgstr ""

6535

6251 -#: builtin/commit.c:1596

6536 +#: builtin/commit.c:1591

6537 msgid "reuse message from specified commit"

6538 msgstr ""

6539

6255 -#: builtin/commit.c:1597

6540 +#: builtin/commit.c:1592

6541 msgid "use autosquash formatted message to fixup specified commit"

6542 msgstr ""

6543

6259 -#: builtin/commit.c:1598

6544 +#: builtin/commit.c:1593

6545 msgid "use autosquash formatted message to squash specified commit"

6546 msgstr ""

6547

6263 -#: builtin/commit.c:1599

6548 +#: builtin/commit.c:1594

6549 msgid "the commit is authored by me now (used with -C/-c/--amend)"

6550 msgstr ""

6551

6267 -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86

6552 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86

6553 msgid "add Signed-off-by:"

6554 msgstr ""

6555

6271 -#: builtin/commit.c:1601

6556 +#: builtin/commit.c:1596

6557 msgid "use specified template file"

6558 msgstr ""

6559

6275 -#: builtin/commit.c:1602

6560 +#: builtin/commit.c:1597

6561 msgid "force edit of commit"

6562 msgstr ""

6563

6279 -#: builtin/commit.c:1603

6564 +#: builtin/commit.c:1598

6565 msgid "default"

6566 msgstr ""

6567

6283 -#: builtin/commit.c:1603 builtin/tag.c:354

6568 +#: builtin/commit.c:1598 builtin/tag.c:369

6569 msgid "how to strip spaces and #comments from message"

6570 msgstr ""

6571

6287 -#: builtin/commit.c:1604

6572 +#: builtin/commit.c:1599

6573 msgid "include status in commit message template"

6574 msgstr ""

6575

6291 -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166

6576 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166

6577 #: builtin/revert.c:93

6578 msgid "GPG sign commit"

6579 msgstr ""

6580

6296 -#: builtin/commit.c:1609

6581 +#: builtin/commit.c:1604

6582 msgid "Commit contents options"

6583 msgstr ""

6584

6300 -#: builtin/commit.c:1610

6585 +#: builtin/commit.c:1605

6586 msgid "commit all changed files"

6587 msgstr ""

6588

6304 -#: builtin/commit.c:1611

6589 +#: builtin/commit.c:1606

6590 msgid "add specified files to index for commit"

6591 msgstr ""

6592

6308 -#: builtin/commit.c:1612

6593 +#: builtin/commit.c:1607

6594 msgid "interactively add files"

6595 msgstr ""

6596

6312 -#: builtin/commit.c:1613

6597 +#: builtin/commit.c:1608

6598 msgid "interactively add changes"

6599 msgstr ""

6600

6316 -#: builtin/commit.c:1614

6601 +#: builtin/commit.c:1609

6602 msgid "commit only specified files"

6603 msgstr ""

6604

6320 -#: builtin/commit.c:1615

6605 +#: builtin/commit.c:1610

6606 msgid "bypass pre-commit and commit-msg hooks"

6607 msgstr ""

6608

6324 -#: builtin/commit.c:1616

6609 +#: builtin/commit.c:1611

6610 msgid "show what would be committed"

6611 msgstr ""

6612

6328 -#: builtin/commit.c:1627

6613 +#: builtin/commit.c:1622

6614 msgid "amend previous commit"

6615 msgstr ""

6616

6332 -#: builtin/commit.c:1628

6617 +#: builtin/commit.c:1623

6618 msgid "bypass post-rewrite hook"

6619 msgstr ""

6620

6336 -#: builtin/commit.c:1633

6621 +#: builtin/commit.c:1628

6622 msgid "ok to record an empty change"

6623 msgstr ""

6624

6340 -#: builtin/commit.c:1635

6625 +#: builtin/commit.c:1630

6626 msgid "ok to record a change with an empty message"

6627 msgstr ""

6628

6344 -#: builtin/commit.c:1664

6629 +#: builtin/commit.c:1659

6630 msgid "could not parse HEAD commit"

6631 msgstr ""

6632

6348 -#: builtin/commit.c:1712

6633 +#: builtin/commit.c:1707

6634 #, c-format

6635 msgid "Corrupt MERGE_HEAD file (%s)"

6636 msgstr ""

6637

6353 -#: builtin/commit.c:1719

6638 +#: builtin/commit.c:1714

6639 msgid "could not read MERGE_MODE"

6640 msgstr ""

6641

6357 -#: builtin/commit.c:1738

6642 +#: builtin/commit.c:1733

6643 #, c-format

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

6645 msgstr ""

6646

6362 -#: builtin/commit.c:1749

6647 +#: builtin/commit.c:1744

6648 #, c-format

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

6650 msgstr ""

6651

6367 -#: builtin/commit.c:1754

6652 +#: builtin/commit.c:1749

6653 #, c-format

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

6655 msgstr ""

6656

6372 -#: builtin/commit.c:1802

6657 +#: builtin/commit.c:1797

6658 msgid ""

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

6660 "new_index file. Check that disk is not full and quota is\n"

@@ -6705,6 +6990,89 @@ msgstr ""

6990 msgid "unhandled object '%s' given."

6991 msgstr ""

6992

6993 +#: builtin/difftool.c:28

6994 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

6995 +msgstr ""

6996 +

6997 +#: builtin/difftool.c:241

6998 +#, c-format

6999 +msgid "failed: %d"

7000 +msgstr ""

7001 +

7002 +#: builtin/difftool.c:342

7003 +msgid ""

7004 +"combined diff formats('-c' and '--cc') are not supported in\n"

7005 +"directory diff mode('-d' and '--dir-diff')."

7006 +msgstr ""

7007 +

7008 +#: builtin/difftool.c:567

7009 +#, c-format

7010 +msgid "both files modified: '%s' and '%s'."

7011 +msgstr ""

7012 +

7013 +#: builtin/difftool.c:569

7014 +msgid "working tree file has been left."

7015 +msgstr ""

7016 +

7017 +#: builtin/difftool.c:580

7018 +#, c-format

7019 +msgid "temporary files exist in '%s'."

7020 +msgstr ""

7021 +

7022 +#: builtin/difftool.c:581

7023 +msgid "you may want to cleanup or recover these."

7024 +msgstr ""

7025 +

7026 +#: builtin/difftool.c:626

7027 +msgid "use `diff.guitool` instead of `diff.tool`"

7028 +msgstr ""

7029 +

7030 +#: builtin/difftool.c:628

7031 +msgid "perform a full-directory diff"

7032 +msgstr ""

7033 +

7034 +#: builtin/difftool.c:630

7035 +msgid "do not prompt before launching a diff tool"

7036 +msgstr ""

7037 +

7038 +#: builtin/difftool.c:636

7039 +msgid "use symlinks in dir-diff mode"

7040 +msgstr ""

7041 +

7042 +#: builtin/difftool.c:637

7043 +msgid "<tool>"

7044 +msgstr ""

7045 +

7046 +#: builtin/difftool.c:638

7047 +msgid "use the specified diff tool"

7048 +msgstr ""

7049 +

7050 +#: builtin/difftool.c:640

7051 +msgid "print a list of diff tools that may be used with `--tool`"

7052 +msgstr ""

7053 +

7054 +#: builtin/difftool.c:643

7055 +msgid ""

7056 +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

7057 +"code"

7058 +msgstr ""

7059 +

7060 +#: builtin/difftool.c:645

7061 +msgid "<command>"

7062 +msgstr ""

7063 +

7064 +#: builtin/difftool.c:646

7065 +msgid "specify a custom command for viewing diffs"

7066 +msgstr ""

7067 +

7068 +#: builtin/difftool.c:670

7069 +msgid "no <tool> given for --tool=<tool>"

7070 +msgstr ""

7071 +

7072 +#: builtin/difftool.c:677

7073 +msgid "no <cmd> given for --extcmd=<cmd>"

7074 +msgstr ""

7075 +

7076 #: builtin/fast-export.c:25

7077 msgid "git fast-export [rev-list-opts]"

7078 msgstr ""

@@ -6861,171 +7229,171 @@ msgstr ""

7229 msgid "specify fetch refmap"

7230 msgstr ""

7231

6864 -#: builtin/fetch.c:398

7232 +#: builtin/fetch.c:395

7233 msgid "Couldn't find remote ref HEAD"

7234 msgstr ""

7235

6868 -#: builtin/fetch.c:514

7236 +#: builtin/fetch.c:511

7237 #, c-format

7238 msgid "configuration fetch.output contains invalid value %s"

7239 msgstr ""

7240

6873 -#: builtin/fetch.c:607

7241 +#: builtin/fetch.c:604

7242 #, c-format

7243 msgid "object %s not found"

7244 msgstr ""

7245

6878 -#: builtin/fetch.c:611

7246 +#: builtin/fetch.c:608

7247 msgid "[up to date]"

7248 msgstr ""

7249

6882 -#: builtin/fetch.c:624 builtin/fetch.c:704

7250 +#: builtin/fetch.c:621 builtin/fetch.c:701

7251 msgid "[rejected]"

7252 msgstr ""

7253

6886 -#: builtin/fetch.c:625

7254 +#: builtin/fetch.c:622

7255 msgid "can't fetch in current branch"

7256 msgstr ""

7257

6890 -#: builtin/fetch.c:634

7258 +#: builtin/fetch.c:631

7259 msgid "[tag update]"

7260 msgstr ""

7261

6894 -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684

6895 -#: builtin/fetch.c:699

7262 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681

7263 +#: builtin/fetch.c:696

7264 msgid "unable to update local ref"

7265 msgstr ""

7266

6899 -#: builtin/fetch.c:654

7267 +#: builtin/fetch.c:651

7268 msgid "[new tag]"

7269 msgstr ""

7270

6903 -#: builtin/fetch.c:657

7271 +#: builtin/fetch.c:654

7272 msgid "[new branch]"

7273 msgstr ""

7274

6907 -#: builtin/fetch.c:660

7275 +#: builtin/fetch.c:657

7276 msgid "[new ref]"

7277 msgstr ""

7278

6911 -#: builtin/fetch.c:699

7279 +#: builtin/fetch.c:696

7280 msgid "forced update"

7281 msgstr ""

7282

6915 -#: builtin/fetch.c:704

7283 +#: builtin/fetch.c:701

7284 msgid "non-fast-forward"

7285 msgstr ""

7286

6919 -#: builtin/fetch.c:749

7287 +#: builtin/fetch.c:746

7288 #, c-format

7289 msgid "%s did not send all necessary objects\n"

7290 msgstr ""

7291

6924 -#: builtin/fetch.c:769

7292 +#: builtin/fetch.c:766

7293 #, c-format

7294 msgid "reject %s because shallow roots are not allowed to be updated"

7295 msgstr ""

7296

6929 -#: builtin/fetch.c:856 builtin/fetch.c:952

7297 +#: builtin/fetch.c:853 builtin/fetch.c:949

7298 #, c-format

7299 msgid "From %.*s\n"

7300 msgstr ""

7301

6934 -#: builtin/fetch.c:867

7302 +#: builtin/fetch.c:864

7303 #, c-format

7304 msgid ""

7305 "some local refs could not be updated; try running\n"

7306 " 'git remote prune %s' to remove any old, conflicting branches"

7307 msgstr ""

7308

6941 -#: builtin/fetch.c:922

7309 +#: builtin/fetch.c:919

7310 #, c-format

7311 msgid " (%s will become dangling)"

7312 msgstr ""

7313

6946 -#: builtin/fetch.c:923

7314 +#: builtin/fetch.c:920

7315 #, c-format

7316 msgid " (%s has become dangling)"

7317 msgstr ""

7318

6951 -#: builtin/fetch.c:955

7319 +#: builtin/fetch.c:952

7320 msgid "[deleted]"

7321 msgstr ""

7322

6955 -#: builtin/fetch.c:956 builtin/remote.c:1020

7323 +#: builtin/fetch.c:953 builtin/remote.c:1020

7324 msgid "(none)"

7325 msgstr ""

7326

6959 -#: builtin/fetch.c:979

7327 +#: builtin/fetch.c:976

7328 #, c-format

7329 msgid "Refusing to fetch into current branch %s of non-bare repository"

7330 msgstr ""

7331

6964 -#: builtin/fetch.c:998

7332 +#: builtin/fetch.c:995

7333 #, c-format

7334 msgid "Option \"%s\" value \"%s\" is not valid for %s"

7335 msgstr ""

7336

6969 -#: builtin/fetch.c:1001

7337 +#: builtin/fetch.c:998

7338 #, c-format

7339 msgid "Option \"%s\" is ignored for %s\n"

7340 msgstr ""

7341

6974 -#: builtin/fetch.c:1077

7342 +#: builtin/fetch.c:1074

7343 #, c-format

7344 msgid "Don't know how to fetch from %s"

7345 msgstr ""

7346

6979 -#: builtin/fetch.c:1237

7347 +#: builtin/fetch.c:1234

7348 #, c-format

7349 msgid "Fetching %s\n"

7350 msgstr ""

7351

6984 -#: builtin/fetch.c:1239 builtin/remote.c:96

7352 +#: builtin/fetch.c:1236 builtin/remote.c:96

7353 #, c-format

7354 msgid "Could not fetch %s"

7355 msgstr ""

7356

6989 -#: builtin/fetch.c:1257

7357 +#: builtin/fetch.c:1254

7358 msgid ""

7359 "No remote repository specified. Please, specify either a URL or a\n"

7360 "remote name from which new revisions should be fetched."

7361 msgstr ""

7362

6995 -#: builtin/fetch.c:1280

7363 +#: builtin/fetch.c:1277

7364 msgid "You need to specify a tag name."

7365 msgstr ""

7366

6999 -#: builtin/fetch.c:1322

7367 +#: builtin/fetch.c:1319

7368 msgid "Negative depth in --deepen is not supported"

7369 msgstr ""

7370

7003 -#: builtin/fetch.c:1324

7371 +#: builtin/fetch.c:1321

7372 msgid "--deepen and --depth are mutually exclusive"

7373 msgstr ""

7374

7007 -#: builtin/fetch.c:1329

7375 +#: builtin/fetch.c:1326

7376 msgid "--depth and --unshallow cannot be used together"

7377 msgstr ""

7378

7011 -#: builtin/fetch.c:1331

7379 +#: builtin/fetch.c:1328

7380 msgid "--unshallow on a complete repository does not make sense"

7381 msgstr ""

7382

7015 -#: builtin/fetch.c:1353

7383 +#: builtin/fetch.c:1350

7384 msgid "fetch --all does not take a repository argument"

7385 msgstr ""

7386

7019 -#: builtin/fetch.c:1355

7387 +#: builtin/fetch.c:1352

7388 msgid "fetch --all does not make sense with refspecs"

7389 msgstr ""

7390

7023 -#: builtin/fetch.c:1366

7391 +#: builtin/fetch.c:1363

7392 #, c-format

7393 msgid "No such remote or remote group: %s"

7394 msgstr ""

7395

7028 -#: builtin/fetch.c:1374

7396 +#: builtin/fetch.c:1371

7397 msgid "Fetching a group and specifying refspecs does not make sense"

7398 msgstr ""

7399

@@ -7090,7 +7458,7 @@ msgstr ""

7458 msgid "show only <n> matched refs"

7459 msgstr ""

7460

7093 -#: builtin/for-each-ref.c:37 builtin/tag.c:372

7461 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38

7462 msgid "format to use for the output"

7463 msgstr ""

7464

@@ -7110,63 +7478,63 @@ msgstr ""

7478 msgid "print only refs which contain the commit"

7479 msgstr ""

7480

7113 -#: builtin/fsck.c:519

7481 +#: builtin/fsck.c:554

7482 msgid "Checking object directories"

7483 msgstr ""

7484

7117 -#: builtin/fsck.c:588

7485 +#: builtin/fsck.c:646

7486 msgid "git fsck [<options>] [<object>...]"

7487 msgstr ""

7488

7121 -#: builtin/fsck.c:594

7489 +#: builtin/fsck.c:652

7490 msgid "show unreachable objects"

7491 msgstr ""

7492

7125 -#: builtin/fsck.c:595

7493 +#: builtin/fsck.c:653

7494 msgid "show dangling objects"

7495 msgstr ""

7496

7129 -#: builtin/fsck.c:596

7497 +#: builtin/fsck.c:654

7498 msgid "report tags"

7499 msgstr ""

7500

7133 -#: builtin/fsck.c:597

7501 +#: builtin/fsck.c:655

7502 msgid "report root nodes"

7503 msgstr ""

7504

7137 -#: builtin/fsck.c:598

7505 +#: builtin/fsck.c:656

7506 msgid "make index objects head nodes"

7507 msgstr ""

7508

7141 -#: builtin/fsck.c:599

7509 +#: builtin/fsck.c:657

7510 msgid "make reflogs head nodes (default)"

7511 msgstr ""

7512

7145 -#: builtin/fsck.c:600

7513 +#: builtin/fsck.c:658

7514 msgid "also consider packs and alternate objects"

7515 msgstr ""

7516

7149 -#: builtin/fsck.c:601

7517 +#: builtin/fsck.c:659

7518 msgid "check only connectivity"

7519 msgstr ""

7520

7153 -#: builtin/fsck.c:602

7521 +#: builtin/fsck.c:660

7522 msgid "enable more strict checking"

7523 msgstr ""

7524

7157 -#: builtin/fsck.c:604

7525 +#: builtin/fsck.c:662

7526 msgid "write dangling objects in .git/lost-found"

7527 msgstr ""

7528

7161 -#: builtin/fsck.c:605 builtin/prune.c:107

7529 +#: builtin/fsck.c:663 builtin/prune.c:107

7530 msgid "show progress"

7531 msgstr ""

7532

7165 -#: builtin/fsck.c:606

7533 +#: builtin/fsck.c:664

7534 msgid "show verbose names for reachable objects"

7535 msgstr ""

7536

7169 -#: builtin/fsck.c:665

7537 +#: builtin/fsck.c:725

7538 msgid "Checking objects"

7539 msgstr ""

7540

@@ -7184,7 +7552,7 @@ msgstr ""

7552 msgid "insanely long object directory %.*s"

7553 msgstr ""

7554

7187 -#: builtin/gc.c:290

7555 +#: builtin/gc.c:297

7556 #, c-format

7557 msgid ""

7558 "The last gc run reported the following. Please correct the root cause\n"

@@ -7194,275 +7562,291 @@ msgid ""

7562 "%s"

7563 msgstr ""

7564

7197 -#: builtin/gc.c:327

7565 +#: builtin/gc.c:334

7566 msgid "prune unreferenced objects"

7567 msgstr ""

7568

7201 -#: builtin/gc.c:329

7569 +#: builtin/gc.c:336

7570 msgid "be more thorough (increased runtime)"

7571 msgstr ""

7572

7205 -#: builtin/gc.c:330

7573 +#: builtin/gc.c:337

7574 msgid "enable auto-gc mode"

7575 msgstr ""

7576

7209 -#: builtin/gc.c:331

7577 +#: builtin/gc.c:338

7578 msgid "force running gc even if there may be another gc running"

7579 msgstr ""

7580

7213 -#: builtin/gc.c:373

7581 +#: builtin/gc.c:380

7582 #, c-format

7583 msgid "Auto packing the repository in background for optimum performance.\n"

7584 msgstr ""

7585

7218 -#: builtin/gc.c:375

7586 +#: builtin/gc.c:382

7587 #, c-format

7588 msgid "Auto packing the repository for optimum performance.\n"

7589 msgstr ""

7590

7223 -#: builtin/gc.c:376

7591 +#: builtin/gc.c:383

7592 #, c-format

7593 msgid "See \"git help gc\" for manual housekeeping.\n"

7594 msgstr ""

7595

7228 -#: builtin/gc.c:397

7596 +#: builtin/gc.c:404

7597 #, c-format

7598 msgid ""

7599 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

7600 msgstr ""

7601

7234 -#: builtin/gc.c:441

7602 +#: builtin/gc.c:448

7603 msgid ""

7604 "There are too many unreachable loose objects; run 'git prune' to remove them."

7605 msgstr ""

7606

7239 -#: builtin/grep.c:23

7607 +#: builtin/grep.c:25

7608 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

7609 msgstr ""

7610

7243 -#: builtin/grep.c:219

7611 +#: builtin/grep.c:232

7612 #, c-format

7613 msgid "grep: failed to create thread: %s"

7614 msgstr ""

7615

7248 -#: builtin/grep.c:277

7616 +#: builtin/grep.c:290

7617 #, c-format

7618 msgid "invalid number of threads specified (%d) for %s"

7619 msgstr ""

7620

7253 -#: builtin/grep.c:453 builtin/grep.c:488

7621 +#: builtin/grep.c:763 builtin/grep.c:804

7622 #, c-format

7623 msgid "unable to read tree (%s)"

7624 msgstr ""

7625

7258 -#: builtin/grep.c:503

7626 +#: builtin/grep.c:823

7627 #, c-format

7628 msgid "unable to grep from object of type %s"

7629 msgstr ""

7630

7263 -#: builtin/grep.c:561

7631 +#: builtin/grep.c:887

7632 #, c-format

7633 msgid "switch `%c' expects a numerical value"

7634 msgstr ""

7635

7268 -#: builtin/grep.c:647

7636 +#: builtin/grep.c:973

7637 msgid "search in index instead of in the work tree"

7638 msgstr ""

7639

7272 -#: builtin/grep.c:649

7640 +#: builtin/grep.c:975

7641 msgid "find in contents not managed by git"

7642 msgstr ""

7643

7276 -#: builtin/grep.c:651

7644 +#: builtin/grep.c:977

7645 msgid "search in both tracked and untracked files"

7646 msgstr ""

7647

7280 -#: builtin/grep.c:653

7648 +#: builtin/grep.c:979

7649 msgid "ignore files specified via '.gitignore'"

7650 msgstr ""

7651

7284 -#: builtin/grep.c:656

7652 +#: builtin/grep.c:981

7653 +msgid "recursivley search in each submodule"

7654 +msgstr ""

7655 +

7656 +#: builtin/grep.c:983

7657 +msgid "basename"

7658 +msgstr ""

7659 +

7660 +#: builtin/grep.c:984

7661 +msgid "prepend parent project's basename to output"

7662 +msgstr ""

7663 +

7664 +#: builtin/grep.c:987

7665 msgid "show non-matching lines"

7666 msgstr ""

7667

7288 -#: builtin/grep.c:658

7668 +#: builtin/grep.c:989

7669 msgid "case insensitive matching"

7670 msgstr ""

7671

7292 -#: builtin/grep.c:660

7672 +#: builtin/grep.c:991

7673 msgid "match patterns only at word boundaries"

7674 msgstr ""

7675

7296 -#: builtin/grep.c:662

7676 +#: builtin/grep.c:993

7677 msgid "process binary files as text"

7678 msgstr ""

7679

7300 -#: builtin/grep.c:664

7680 +#: builtin/grep.c:995

7681 msgid "don't match patterns in binary files"

7682 msgstr ""

7683

7304 -#: builtin/grep.c:667

7684 +#: builtin/grep.c:998

7685 msgid "process binary files with textconv filters"

7686 msgstr ""

7687

7308 -#: builtin/grep.c:669

7688 +#: builtin/grep.c:1000

7689 msgid "descend at most <depth> levels"

7690 msgstr ""

7691

7312 -#: builtin/grep.c:673

7692 +#: builtin/grep.c:1004

7693 msgid "use extended POSIX regular expressions"

7694 msgstr ""

7695

7316 -#: builtin/grep.c:676

7696 +#: builtin/grep.c:1007

7697 msgid "use basic POSIX regular expressions (default)"

7698 msgstr ""

7699

7320 -#: builtin/grep.c:679

7700 +#: builtin/grep.c:1010

7701 msgid "interpret patterns as fixed strings"

7702 msgstr ""

7703

7324 -#: builtin/grep.c:682

7704 +#: builtin/grep.c:1013

7705 msgid "use Perl-compatible regular expressions"

7706 msgstr ""

7707

7328 -#: builtin/grep.c:685

7708 +#: builtin/grep.c:1016

7709 msgid "show line numbers"

7710 msgstr ""

7711

7332 -#: builtin/grep.c:686

7712 +#: builtin/grep.c:1017

7713 msgid "don't show filenames"

7714 msgstr ""

7715

7336 -#: builtin/grep.c:687

7716 +#: builtin/grep.c:1018

7717 msgid "show filenames"

7718 msgstr ""

7719

7340 -#: builtin/grep.c:689

7720 +#: builtin/grep.c:1020

7721 msgid "show filenames relative to top directory"

7722 msgstr ""

7723

7344 -#: builtin/grep.c:691

7724 +#: builtin/grep.c:1022

7725 msgid "show only filenames instead of matching lines"

7726 msgstr ""

7727

7348 -#: builtin/grep.c:693

7728 +#: builtin/grep.c:1024

7729 msgid "synonym for --files-with-matches"

7730 msgstr ""

7731

7352 -#: builtin/grep.c:696

7732 +#: builtin/grep.c:1027

7733 msgid "show only the names of files without match"

7734 msgstr ""

7735

7356 -#: builtin/grep.c:698

7736 +#: builtin/grep.c:1029

7737 msgid "print NUL after filenames"

7738 msgstr ""

7739

7360 -#: builtin/grep.c:700

7740 +#: builtin/grep.c:1031

7741 msgid "show the number of matches instead of matching lines"

7742 msgstr ""

7743

7364 -#: builtin/grep.c:701

7744 +#: builtin/grep.c:1032

7745 msgid "highlight matches"

7746 msgstr ""

7747

7368 -#: builtin/grep.c:703

7748 +#: builtin/grep.c:1034

7749 msgid "print empty line between matches from different files"

7750 msgstr ""

7751

7372 -#: builtin/grep.c:705

7752 +#: builtin/grep.c:1036

7753 msgid "show filename only once above matches from same file"

7754 msgstr ""

7755

7376 -#: builtin/grep.c:708

7756 +#: builtin/grep.c:1039

7757 msgid "show <n> context lines before and after matches"

7758 msgstr ""

7759

7380 -#: builtin/grep.c:711

7760 +#: builtin/grep.c:1042

7761 msgid "show <n> context lines before matches"

7762 msgstr ""

7763

7384 -#: builtin/grep.c:713

7764 +#: builtin/grep.c:1044

7765 msgid "show <n> context lines after matches"

7766 msgstr ""

7767

7388 -#: builtin/grep.c:715

7768 +#: builtin/grep.c:1046

7769 msgid "use <n> worker threads"

7770 msgstr ""

7771

7392 -#: builtin/grep.c:716

7772 +#: builtin/grep.c:1047

7773 msgid "shortcut for -C NUM"

7774 msgstr ""

7775

7396 -#: builtin/grep.c:719

7776 +#: builtin/grep.c:1050

7777 msgid "show a line with the function name before matches"

7778 msgstr ""

7779

7400 -#: builtin/grep.c:721

7780 +#: builtin/grep.c:1052

7781 msgid "show the surrounding function"

7782 msgstr ""

7783

7404 -#: builtin/grep.c:724

7784 +#: builtin/grep.c:1055

7785 msgid "read patterns from file"

7786 msgstr ""

7787

7408 -#: builtin/grep.c:726

7788 +#: builtin/grep.c:1057

7789 msgid "match <pattern>"

7790 msgstr ""

7791

7412 -#: builtin/grep.c:728

7792 +#: builtin/grep.c:1059

7793 msgid "combine patterns specified with -e"

7794 msgstr ""

7795

7416 -#: builtin/grep.c:740

7796 +#: builtin/grep.c:1071

7797 msgid "indicate hit with exit status without output"

7798 msgstr ""

7799

7420 -#: builtin/grep.c:742

7800 +#: builtin/grep.c:1073

7801 msgid "show only matches from files that match all patterns"

7802 msgstr ""

7803

7424 -#: builtin/grep.c:744

7804 +#: builtin/grep.c:1075

7805 msgid "show parse tree for grep expression"

7806 msgstr ""

7807

7428 -#: builtin/grep.c:748

7808 +#: builtin/grep.c:1079

7809 msgid "pager"

7810 msgstr ""

7811

7432 -#: builtin/grep.c:748

7812 +#: builtin/grep.c:1079

7813 msgid "show matching files in the pager"

7814 msgstr ""

7815

7436 -#: builtin/grep.c:751

7816 +#: builtin/grep.c:1082

7817 msgid "allow calling of grep(1) (ignored by this build)"

7818 msgstr ""

7819

7440 -#: builtin/grep.c:814

7820 +#: builtin/grep.c:1146

7821 msgid "no pattern given."

7822 msgstr ""

7823

7444 -#: builtin/grep.c:846 builtin/index-pack.c:1480

7824 +#: builtin/grep.c:1178 builtin/index-pack.c:1482

7825 #, c-format

7826 msgid "invalid number of threads specified (%d)"

7827 msgstr ""

7828

7449 -#: builtin/grep.c:876

7829 +#: builtin/grep.c:1215

7830 msgid "--open-files-in-pager only works on the worktree"

7831 msgstr ""

7832

7453 -#: builtin/grep.c:902

7833 +#: builtin/grep.c:1238

7834 +msgid "option not supported with --recurse-submodules."

7835 +msgstr ""

7836 +

7837 +#: builtin/grep.c:1244

7838 msgid "--cached or --untracked cannot be used with --no-index."

7839 msgstr ""

7840

7457 -#: builtin/grep.c:907

7841 +#: builtin/grep.c:1249

7842 msgid "--no-index or --untracked cannot be used with revs."

7843 msgstr ""

7844

7461 -#: builtin/grep.c:910

7845 +#: builtin/grep.c:1252

7846 msgid "--[no-]exclude-standard cannot be used for tracked contents."

7847 msgstr ""

7848

7465 -#: builtin/grep.c:918

7849 +#: builtin/grep.c:1260

7850 msgid "both --cached and trees are given."

7851 msgstr ""

7852

@@ -7734,183 +8118,187 @@ msgid "serious inflate inconsistency"

8118 msgstr ""

8119

8120 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777

7737 -#: builtin/index-pack.c:811 builtin/index-pack.c:820

8121 +#: builtin/index-pack.c:813 builtin/index-pack.c:822

8122 #, c-format

8123 msgid "SHA1 COLLISION FOUND WITH %s !"

8124 msgstr ""

8125

7742 -#: builtin/index-pack.c:751 builtin/pack-objects.c:166

7743 -#: builtin/pack-objects.c:258

8126 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164

8127 +#: builtin/pack-objects.c:256

8128 #, c-format

8129 msgid "unable to read %s"

8130 msgstr ""

8131

7748 -#: builtin/index-pack.c:817

8132 +#: builtin/index-pack.c:819

8133 #, c-format

8134 msgid "cannot read existing object %s"

8135 msgstr ""

8136

7753 -#: builtin/index-pack.c:831

8137 +#: builtin/index-pack.c:833

8138 #, c-format

8139 msgid "invalid blob object %s"

8140 msgstr ""

8141

7758 -#: builtin/index-pack.c:845

8142 +#: builtin/index-pack.c:847

8143 #, c-format

8144 msgid "invalid %s"

8145 msgstr ""

8146

7763 -#: builtin/index-pack.c:848

8147 +#: builtin/index-pack.c:850

8148 msgid "Error in object"

8149 msgstr ""

8150

7767 -#: builtin/index-pack.c:850

8151 +#: builtin/index-pack.c:852

8152 #, c-format

8153 msgid "Not all child objects of %s are reachable"

8154 msgstr ""

8155

7772 -#: builtin/index-pack.c:922 builtin/index-pack.c:953

8156 +#: builtin/index-pack.c:924 builtin/index-pack.c:955

8157 msgid "failed to apply delta"

8158 msgstr ""

8159

7776 -#: builtin/index-pack.c:1123

8160 +#: builtin/index-pack.c:1125

8161 msgid "Receiving objects"

8162 msgstr ""

8163

7780 -#: builtin/index-pack.c:1123

8164 +#: builtin/index-pack.c:1125

8165 msgid "Indexing objects"

8166 msgstr ""

8167

7784 -#: builtin/index-pack.c:1155

8168 +#: builtin/index-pack.c:1157

8169 msgid "pack is corrupted (SHA1 mismatch)"

8170 msgstr ""

8171

7788 -#: builtin/index-pack.c:1160

8172 +#: builtin/index-pack.c:1162

8173 msgid "cannot fstat packfile"

8174 msgstr ""

8175

7792 -#: builtin/index-pack.c:1163

8176 +#: builtin/index-pack.c:1165

8177 msgid "pack has junk at the end"

8178 msgstr ""

8179

7796 -#: builtin/index-pack.c:1174

8180 +#: builtin/index-pack.c:1176

8181 msgid "confusion beyond insanity in parse_pack_objects()"

8182 msgstr ""

8183

7800 -#: builtin/index-pack.c:1197

8184 +#: builtin/index-pack.c:1199

8185 msgid "Resolving deltas"

8186 msgstr ""

8187

7804 -#: builtin/index-pack.c:1208

8188 +#: builtin/index-pack.c:1210

8189 #, c-format

8190 msgid "unable to create thread: %s"

8191 msgstr ""

8192

7809 -#: builtin/index-pack.c:1250

8193 +#: builtin/index-pack.c:1252

8194 msgid "confusion beyond insanity"

8195 msgstr ""

8196

7813 -#: builtin/index-pack.c:1256

8197 +#: builtin/index-pack.c:1258

8198 #, c-format

8199 msgid "completed with %d local object"

8200 msgid_plural "completed with %d local objects"

8201 msgstr[0] ""

8202 msgstr[1] ""

8203

7820 -#: builtin/index-pack.c:1268

8204 +#: builtin/index-pack.c:1270

8205 #, c-format

8206 msgid "Unexpected tail checksum for %s (disk corruption?)"

8207 msgstr ""

8208

7825 -#: builtin/index-pack.c:1272

8209 +#: builtin/index-pack.c:1274

8210 #, c-format

8211 msgid "pack has %d unresolved delta"

8212 msgid_plural "pack has %d unresolved deltas"

8213 msgstr[0] ""

8214 msgstr[1] ""

8215

7832 -#: builtin/index-pack.c:1296

8216 +#: builtin/index-pack.c:1298

8217 #, c-format

8218 msgid "unable to deflate appended object (%d)"

8219 msgstr ""

8220

7837 -#: builtin/index-pack.c:1372

8221 +#: builtin/index-pack.c:1374

8222 #, c-format

8223 msgid "local object %s is corrupt"

8224 msgstr ""

8225

7842 -#: builtin/index-pack.c:1396

8226 +#: builtin/index-pack.c:1398

8227 msgid "error while closing pack file"

8228 msgstr ""

8229

7846 -#: builtin/index-pack.c:1409

8230 +#: builtin/index-pack.c:1411

8231 #, c-format

8232 msgid "cannot write keep file '%s'"

8233 msgstr ""

8234

7851 -#: builtin/index-pack.c:1417

8235 +#: builtin/index-pack.c:1419

8236 #, c-format

8237 msgid "cannot close written keep file '%s'"

8238 msgstr ""

8239

7856 -#: builtin/index-pack.c:1430

8240 +#: builtin/index-pack.c:1432

8241 msgid "cannot store pack file"

8242 msgstr ""

8243

7860 -#: builtin/index-pack.c:1441

8244 +#: builtin/index-pack.c:1443

8245 msgid "cannot store index file"

8246 msgstr ""

8247

7864 -#: builtin/index-pack.c:1474

8248 +#: builtin/index-pack.c:1476

8249 #, c-format

8250 msgid "bad pack.indexversion=%<PRIu32>"

8251 msgstr ""

8252

7869 -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681

8253 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683

8254 #, c-format

8255 msgid "no threads support, ignoring %s"

8256 msgstr ""

8257

7874 -#: builtin/index-pack.c:1542

8258 +#: builtin/index-pack.c:1544

8259 #, c-format

8260 msgid "Cannot open existing pack file '%s'"

8261 msgstr ""

8262

7879 -#: builtin/index-pack.c:1544

8263 +#: builtin/index-pack.c:1546

8264 #, c-format

8265 msgid "Cannot open existing pack idx file for '%s'"

8266 msgstr ""

8267

7884 -#: builtin/index-pack.c:1591

8268 +#: builtin/index-pack.c:1593

8269 #, c-format

8270 msgid "non delta: %d object"

8271 msgid_plural "non delta: %d objects"

8272 msgstr[0] ""

8273 msgstr[1] ""

8274

7891 -#: builtin/index-pack.c:1598

8275 +#: builtin/index-pack.c:1600

8276 #, c-format

8277 msgid "chain length = %d: %lu object"

8278 msgid_plural "chain length = %d: %lu objects"

8279 msgstr[0] ""

8280 msgstr[1] ""

8281

7898 -#: builtin/index-pack.c:1611

8282 +#: builtin/index-pack.c:1613

8283 #, c-format

8284 msgid "packfile name '%s' does not end with '.pack'"

8285 msgstr ""

8286

7903 -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696

7904 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716

8287 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698

8288 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718

8289 #, c-format

8290 msgid "bad %s"

8291 msgstr ""

8292

7909 -#: builtin/index-pack.c:1732

8293 +#: builtin/index-pack.c:1734

8294 msgid "--fix-thin cannot be used without --stdin"

8295 msgstr ""

8296

7913 -#: builtin/index-pack.c:1740

8297 +#: builtin/index-pack.c:1736

8298 +msgid "--stdin requires a git repository"

8299 +msgstr ""

8300 +

8301 +#: builtin/index-pack.c:1744

8302 msgid "--verify with no packfile name given"

8303 msgstr ""

8304

@@ -8152,7 +8540,7 @@ msgstr ""

8540 msgid "Unknown commit %s"

8541 msgstr ""

8542

8155 -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455

8543 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476

8544 #, c-format

8545 msgid "Failed to resolve '%s' as a valid ref."

8546 msgstr ""

@@ -8527,35 +8915,35 @@ msgstr ""

8915 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

8916 msgstr ""

8917

8530 -#: builtin/ls-tree.c:128

8918 +#: builtin/ls-tree.c:126

8919 msgid "only show trees"

8920 msgstr ""

8921

8534 -#: builtin/ls-tree.c:130

8922 +#: builtin/ls-tree.c:128

8923 msgid "recurse into subtrees"

8924 msgstr ""

8925

8538 -#: builtin/ls-tree.c:132

8926 +#: builtin/ls-tree.c:130

8927 msgid "show trees when recursing"

8928 msgstr ""

8929

8542 -#: builtin/ls-tree.c:135

8930 +#: builtin/ls-tree.c:133

8931 msgid "terminate entries with NUL byte"

8932 msgstr ""

8933

8546 -#: builtin/ls-tree.c:136

8934 +#: builtin/ls-tree.c:134

8935 msgid "include object size"

8936 msgstr ""

8937

8550 -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140

8938 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

8939 msgid "list only filenames"

8940 msgstr ""

8941

8554 -#: builtin/ls-tree.c:143

8942 +#: builtin/ls-tree.c:141

8943 msgid "use full path names"

8944 msgstr ""

8945

8558 -#: builtin/ls-tree.c:145

8946 +#: builtin/ls-tree.c:143

8947 msgid "list entire tree; not just current directory (implies --full-name)"

8948 msgstr ""

8949

@@ -8571,160 +8959,168 @@ msgstr ""

8959 msgid "git merge --abort"

8960 msgstr ""

8961

8574 -#: builtin/merge.c:102

8962 +#: builtin/merge.c:49

8963 +msgid "git merge --continue"

8964 +msgstr ""

8965 +

8966 +#: builtin/merge.c:104

8967 msgid "switch `m' requires a value"

8968 msgstr ""

8969

l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)