712b0ed6ec · 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: 2020-12-21 07:10+0800\n"

11 +"POT-Creation-Date: 2021-02-26 22:09+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"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr ""

25

26 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

27 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

28 -#: builtin/rebase.c:1955

26 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292

27 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538

28 +#: builtin/rebase.c:1963

29 msgid "could not read index"

30 msgstr ""

31

@@ -53,7 +53,7 @@ msgstr ""

53 msgid "could not stage '%s'"

54 msgstr ""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486

57 msgid "could not write index"

58 msgstr ""

59

@@ -211,7 +211,7 @@ msgstr ""

211

212 #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257

213 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

214 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

214 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190

215 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

@@ -707,7 +707,7 @@ msgstr ""

707 msgid "Exiting because of an unresolved conflict."

708 msgstr ""

709

710 -#: advice.c:281 builtin/merge.c:1369

710 +#: advice.c:281 builtin/merge.c:1370

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

712 msgstr ""

713

@@ -979,7 +979,8 @@ msgstr ""

979 msgid "cannot checkout %s"

980 msgstr ""

981

982 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

982 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213

983 +#: setup.c:308

984 #, c-format

985 msgid "failed to read %s"

986 msgstr ""

@@ -1138,7 +1139,7 @@ msgstr ""

1139 msgid "unable to add cache entry for %s"

1140 msgstr ""

1141

1141 -#: apply.c:4374 builtin/bisect--helper.c:524

1142 +#: apply.c:4374 builtin/bisect--helper.c:523

1143 #, c-format

1144 msgid "failed to write to '%s'"

1145 msgstr ""

@@ -1174,7 +1175,7 @@ msgstr[1] ""

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

1176 msgstr ""

1177

1177 -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228

1178 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334

1179 #, c-format

1180 msgid "cannot open %s"

1181 msgstr ""

@@ -1228,7 +1229,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

1229 msgstr[0] ""

1230 msgstr[1] ""

1231

1231 -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1232 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406

1233 msgid "Unable to write new index file"

1234 msgstr ""

1235

@@ -1296,7 +1297,7 @@ msgstr ""

1297 msgid "build a temporary index based on embedded index information"

1298 msgstr ""

1299

1299 -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525

1300 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540

1301 msgid "paths are separated with NUL character"

1302 msgstr ""

1303

@@ -1306,7 +1307,7 @@ msgstr ""

1307

1308 #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98

1309 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1309 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1310 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352

1311 msgid "action"

1312 msgstr ""

1313

@@ -1334,9 +1335,9 @@ msgstr ""

1335 msgid "allow overlapping hunks"

1336 msgstr ""

1337

1337 -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22

1338 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1339 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1338 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22

1339 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757

1340 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128

1341 msgid "be verbose"

1342 msgstr ""

1343

@@ -1422,14 +1423,14 @@ msgstr ""

1423 msgid "cannot read %s"

1424 msgstr ""

1425

1425 -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1426 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1427 -#: builtin/merge.c:1138

1426 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894

1427 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786

1428 +#: builtin/merge.c:1139

1429 #, c-format

1430 msgid "could not read '%s'"

1431 msgstr ""

1432

1432 -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1433 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315

1434 #, c-format

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

1436 msgstr ""

@@ -1471,7 +1472,7 @@ msgstr ""

1472 msgid "archive format"

1473 msgstr ""

1474

1474 -#: archive.c:556 builtin/log.c:1765

1475 +#: archive.c:556 builtin/log.c:1764

1476 msgid "prefix"

1477 msgstr ""

1478

@@ -1479,11 +1480,11 @@ msgstr ""

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

1481 msgstr ""

1482

1482 -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1483 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1483 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888

1484 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1485 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1485 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105

1486 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1486 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105

1487 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412

1488 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1489 msgid "file"

1490 msgstr ""

@@ -1634,12 +1635,12 @@ msgstr ""

1635 msgid "a %s revision is needed"

1636 msgstr ""

1637

1637 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

1638 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287

1639 #, c-format

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

1641 msgstr ""

1642

1642 -#: bisect.c:987 builtin/merge.c:152

1643 +#: bisect.c:987 builtin/merge.c:153

1644 #, c-format

1645 msgid "could not read file '%s'"

1646 msgstr ""

@@ -1657,7 +1658,7 @@ msgstr ""

1658 #, c-format

1659 msgid ""

1660 "No testable commit found.\n"

1660 -"Maybe you started with bad path parameters?\n"

1661 +"Maybe you started with bad path arguments?\n"

1662 msgstr ""

1663

1664 #: bisect.c:1095

@@ -1689,11 +1690,11 @@ msgstr ""

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

1691 msgstr ""

1692

1692 -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1693 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1694 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1695 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1696 -#: builtin/shortlog.c:267

1693 +#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146

1694 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411

1695 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335

1696 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410

1697 +#: builtin/shortlog.c:255

1698 msgid "revision walk setup failed"

1699 msgstr ""

1700

@@ -1856,7 +1857,7 @@ msgstr ""

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

1858 msgstr ""

1859

1859 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

1860 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184

1861 #: builtin/commit.c:814

1862 #, c-format

1863 msgid "could not open '%s'"

@@ -1900,40 +1901,36 @@ msgstr ""

1901 msgid "pack-objects died"

1902 msgstr ""

1903

1903 -#: bundle.c:379

1904 -msgid "rev-list died"

1905 -msgstr ""

1906 -

1907 -#: bundle.c:428

1904 +#: bundle.c:386

1905 #, c-format

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

1907 msgstr ""

1908

1912 -#: bundle.c:498

1909 +#: bundle.c:490

1910 #, c-format

1911 msgid "unsupported bundle version %d"

1912 msgstr ""

1913

1917 -#: bundle.c:500

1914 +#: bundle.c:492

1915 #, c-format

1916 msgid "cannot write bundle version %d with algorithm %s"

1917 msgstr ""

1918

1922 -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

1919 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396

1920 #, c-format

1921 msgid "unrecognized argument: %s"

1922 msgstr ""

1923

1927 -#: bundle.c:530

1924 +#: bundle.c:539

1925 msgid "Refusing to create empty bundle."

1926 msgstr ""

1927

1931 -#: bundle.c:540

1928 +#: bundle.c:549

1929 #, c-format

1930 msgid "cannot create '%s'"

1931 msgstr ""

1932

1936 -#: bundle.c:565

1933 +#: bundle.c:574

1934 msgid "index-pack died"

1935 msgstr ""

1936

@@ -1942,253 +1939,273 @@ msgstr ""

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

1940 msgstr ""

1941

1945 -#: commit-graph.c:188 midx.c:47

1942 +#: commit-graph.c:198 midx.c:47

1943 msgid "invalid hash version"

1944 msgstr ""

1945

1949 -#: commit-graph.c:246

1946 +#: commit-graph.c:219

1947 +msgid "repository contains replace objects; skipping commit-graph"

1948 +msgstr ""

1949 +

1950 +#: commit-graph.c:228

1951 +msgid "repository contains (deprecated) grafts; skipping commit-graph"

1952 +msgstr ""

1953 +

1954 +#: commit-graph.c:233

1955 +msgid "repository is shallow; skipping commit-graph"

1956 +msgstr ""

1957 +

1958 +#: commit-graph.c:264

1959 msgid "commit-graph file is too small"

1960 msgstr ""

1961

1953 -#: commit-graph.c:311

1962 +#: commit-graph.c:329

1963 #, c-format

1964 msgid "commit-graph signature %X does not match signature %X"

1965 msgstr ""

1966

1958 -#: commit-graph.c:318

1967 +#: commit-graph.c:336

1968 #, c-format

1969 msgid "commit-graph version %X does not match version %X"

1970 msgstr ""

1971

1963 -#: commit-graph.c:325

1972 +#: commit-graph.c:343

1973 #, c-format

1974 msgid "commit-graph hash version %X does not match version %X"

1975 msgstr ""

1976

1968 -#: commit-graph.c:342

1977 +#: commit-graph.c:360

1978 #, c-format

1979 msgid "commit-graph file is too small to hold %u chunks"

1980 msgstr ""

1981

1973 -#: commit-graph.c:361

1982 +#: commit-graph.c:379

1983 #, c-format

1984 msgid "commit-graph improper chunk offset %08x%08x"

1985 msgstr ""

1986

1978 -#: commit-graph.c:433

1987 +#: commit-graph.c:465

1988 #, c-format

1989 msgid "commit-graph chunk id %08x appears multiple times"

1990 msgstr ""

1991

1983 -#: commit-graph.c:499

1992 +#: commit-graph.c:531

1993 msgid "commit-graph has no base graphs chunk"

1994 msgstr ""

1995

1987 -#: commit-graph.c:509

1996 +#: commit-graph.c:541

1997 msgid "commit-graph chain does not match"

1998 msgstr ""

1999

1991 -#: commit-graph.c:557

2000 +#: commit-graph.c:589

2001 #, c-format

2002 msgid "invalid commit-graph chain: line '%s' not a hash"

2003 msgstr ""

2004

1996 -#: commit-graph.c:581

2005 +#: commit-graph.c:613

2006 msgid "unable to find all commit-graph files"

2007 msgstr ""

2008

2000 -#: commit-graph.c:721 commit-graph.c:785

2009 +#: commit-graph.c:794 commit-graph.c:831

2010 msgid "invalid commit position. commit-graph is likely corrupt"

2011 msgstr ""

2012

2004 -#: commit-graph.c:742

2013 +#: commit-graph.c:815

2014 #, c-format

2015 msgid "could not find commit %s"

2016 msgstr ""

2017

2009 -#: commit-graph.c:1036 builtin/am.c:1292

2018 +#: commit-graph.c:848

2019 +msgid "commit-graph requires overflow generation data but has none"

2020 +msgstr ""

2021 +

2022 +#: commit-graph.c:1121 builtin/am.c:1292

2023 #, c-format

2024 msgid "unable to parse commit %s"

2025 msgstr ""

2026

2014 -#: commit-graph.c:1252 builtin/pack-objects.c:2864

2027 +#: commit-graph.c:1378 builtin/pack-objects.c:2872

2028 #, c-format

2029 msgid "unable to get type of object %s"

2030 msgstr ""

2031

2019 -#: commit-graph.c:1283

2032 +#: commit-graph.c:1409

2033 msgid "Loading known commits in commit graph"

2034 msgstr ""

2035

2023 -#: commit-graph.c:1300

2036 +#: commit-graph.c:1426

2037 msgid "Expanding reachable commits in commit graph"

2038 msgstr ""

2039

2027 -#: commit-graph.c:1320

2040 +#: commit-graph.c:1446

2041 msgid "Clearing commit marks in commit graph"

2042 msgstr ""

2043

2031 -#: commit-graph.c:1339

2044 +#: commit-graph.c:1465

2045 +msgid "Computing commit graph topological levels"

2046 +msgstr ""

2047 +

2048 +#: commit-graph.c:1518

2049 msgid "Computing commit graph generation numbers"

2050 msgstr ""

2051

2035 -#: commit-graph.c:1406

2052 +#: commit-graph.c:1599

2053 msgid "Computing commit changed paths Bloom filters"

2054 msgstr ""

2055

2039 -#: commit-graph.c:1483

2056 +#: commit-graph.c:1676

2057 msgid "Collecting referenced commits"

2058 msgstr ""

2059

2043 -#: commit-graph.c:1508

2060 +#: commit-graph.c:1701

2061 #, c-format

2062 msgid "Finding commits for commit graph in %d pack"

2063 msgid_plural "Finding commits for commit graph in %d packs"

2064 msgstr[0] ""

2065 msgstr[1] ""

2066

2050 -#: commit-graph.c:1521

2067 +#: commit-graph.c:1714

2068 #, c-format

2069 msgid "error adding pack %s"

2070 msgstr ""

2071

2055 -#: commit-graph.c:1525

2072 +#: commit-graph.c:1718

2073 #, c-format

2074 msgid "error opening index for %s"

2075 msgstr ""

2076

2060 -#: commit-graph.c:1562

2077 +#: commit-graph.c:1755

2078 msgid "Finding commits for commit graph among packed objects"

2079 msgstr ""

2080

2064 -#: commit-graph.c:1580

2081 +#: commit-graph.c:1773

2082 msgid "Finding extra edges in commit graph"

2083 msgstr ""

2084

2068 -#: commit-graph.c:1628

2085 +#: commit-graph.c:1821

2086 msgid "failed to write correct number of base graph ids"

2087 msgstr ""

2088

2072 -#: commit-graph.c:1670 midx.c:819

2089 +#: commit-graph.c:1863 midx.c:819

2090 #, c-format

2091 msgid "unable to create leading directories of %s"

2092 msgstr ""

2093

2077 -#: commit-graph.c:1683

2094 +#: commit-graph.c:1876

2095 msgid "unable to create temporary graph layer"

2096 msgstr ""

2097

2081 -#: commit-graph.c:1688

2098 +#: commit-graph.c:1881

2099 #, c-format

2100 msgid "unable to adjust shared permissions for '%s'"

2101 msgstr ""

2102

2086 -#: commit-graph.c:1758

2103 +#: commit-graph.c:1966

2104 #, c-format

2105 msgid "Writing out commit graph in %d pass"

2106 msgid_plural "Writing out commit graph in %d passes"

2107 msgstr[0] ""

2108 msgstr[1] ""

2109

2093 -#: commit-graph.c:1803

2110 +#: commit-graph.c:2011

2111 msgid "unable to open commit-graph chain file"

2112 msgstr ""

2113

2097 -#: commit-graph.c:1819

2114 +#: commit-graph.c:2027

2115 msgid "failed to rename base commit-graph file"

2116 msgstr ""

2117

2101 -#: commit-graph.c:1839

2118 +#: commit-graph.c:2047

2119 msgid "failed to rename temporary commit-graph file"

2120 msgstr ""

2121

2105 -#: commit-graph.c:1965

2122 +#: commit-graph.c:2180

2123 msgid "Scanning merged commits"

2124 msgstr ""

2125

2109 -#: commit-graph.c:2009

2126 +#: commit-graph.c:2224

2127 msgid "Merging commit-graph"

2128 msgstr ""

2129

2113 -#: commit-graph.c:2115

2130 +#: commit-graph.c:2331

2131 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2132 msgstr ""

2133

2117 -#: commit-graph.c:2214

2134 +#: commit-graph.c:2438

2135 msgid "too many commits to write graph"

2136 msgstr ""

2137

2121 -#: commit-graph.c:2307

2138 +#: commit-graph.c:2536

2139 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2140 msgstr ""

2141

2125 -#: commit-graph.c:2317

2142 +#: commit-graph.c:2546

2143 #, c-format

2144 msgid "commit-graph has incorrect OID order: %s then %s"

2145 msgstr ""

2146

2130 -#: commit-graph.c:2327 commit-graph.c:2342

2147 +#: commit-graph.c:2556 commit-graph.c:2571

2148 #, c-format

2149 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2150 msgstr ""

2151

2135 -#: commit-graph.c:2334

2152 +#: commit-graph.c:2563

2153 #, c-format

2154 msgid "failed to parse commit %s from commit-graph"

2155 msgstr ""

2156

2140 -#: commit-graph.c:2352

2157 +#: commit-graph.c:2581

2158 msgid "Verifying commits in commit graph"

2159 msgstr ""

2160

2144 -#: commit-graph.c:2367

2161 +#: commit-graph.c:2596

2162 #, c-format

2163 msgid "failed to parse commit %s from object database for commit-graph"

2164 msgstr ""

2165

2149 -#: commit-graph.c:2374

2166 +#: commit-graph.c:2603

2167 #, c-format

2168 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2169 msgstr ""

2170

2154 -#: commit-graph.c:2384

2171 +#: commit-graph.c:2613

2172 #, c-format

2173 msgid "commit-graph parent list for commit %s is too long"

2174 msgstr ""

2175

2159 -#: commit-graph.c:2393

2176 +#: commit-graph.c:2622

2177 #, c-format

2178 msgid "commit-graph parent for %s is %s != %s"

2179 msgstr ""

2180

2164 -#: commit-graph.c:2407

2181 +#: commit-graph.c:2636

2182 #, c-format

2183 msgid "commit-graph parent list for commit %s terminates early"

2184 msgstr ""

2185

2169 -#: commit-graph.c:2412

2186 +#: commit-graph.c:2641

2187 #, c-format

2188 msgid ""

2189 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2190 msgstr ""

2191

2175 -#: commit-graph.c:2416

2192 +#: commit-graph.c:2645

2193 #, c-format

2194 msgid ""

2195 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2196 msgstr ""

2197

2181 -#: commit-graph.c:2432

2198 +#: commit-graph.c:2662

2199 #, c-format

2183 -msgid "commit-graph generation for commit %s is %u != %u"

2200 +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2201 msgstr ""

2202

2186 -#: commit-graph.c:2438

2203 +#: commit-graph.c:2668

2204 #, c-format

2205 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2206 msgstr ""

2207

2191 -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2208 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403

2209 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2210 #, c-format

2211 msgid "could not parse %s"

@@ -2211,27 +2228,27 @@ msgid ""

2228 "\"git config advice.graftFileDeprecated false\""

2229 msgstr ""

2230

2214 -#: commit.c:1172

2231 +#: commit.c:1223

2232 #, c-format

2233 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2234 msgstr ""

2235

2219 -#: commit.c:1176

2236 +#: commit.c:1227

2237 #, c-format

2238 msgid "Commit %s has a bad GPG signature allegedly by %s."

2239 msgstr ""

2240

2224 -#: commit.c:1179

2241 +#: commit.c:1230

2242 #, c-format

2243 msgid "Commit %s does not have a GPG signature."

2244 msgstr ""

2245

2229 -#: commit.c:1182

2246 +#: commit.c:1233

2247 #, c-format

2248 msgid "Commit %s has a good GPG signature by %s\n"

2249 msgstr ""

2250

2234 -#: commit.c:1436

2251 +#: commit.c:1487

2252 msgid ""

2253 "Warning: commit message did not conform to UTF-8.\n"

2254 "You may want to amend it after fixing the message, or set the config\n"

@@ -2242,7 +2259,7 @@ msgstr ""

2259 msgid "memory exhausted"

2260 msgstr ""

2261

2245 -#: config.c:125

2262 +#: config.c:126

2263 #, c-format

2264 msgid ""

2265 "exceeded maximum include depth (%d) while including\n"

@@ -2252,289 +2269,333 @@ msgid ""

2269 "This might be due to circular includes."

2270 msgstr ""

2271

2255 -#: config.c:141

2272 +#: config.c:142

2273 #, c-format

2274 msgid "could not expand include path '%s'"

2275 msgstr ""

2276

2260 -#: config.c:152

2277 +#: config.c:153

2278 msgid "relative config includes must come from files"

2279 msgstr ""

2280

2264 -#: config.c:198

2281 +#: config.c:199

2282 msgid "relative config include conditionals must come from files"

2283 msgstr ""

2284

2268 -#: config.c:378

2285 +#: config.c:396

2286 +#, c-format

2287 +msgid "invalid config format: %s"

2288 +msgstr ""

2289 +

2290 +#: config.c:400

2291 +#, c-format

2292 +msgid "missing environment variable name for configuration '%.*s'"

2293 +msgstr ""

2294 +

2295 +#: config.c:405

2296 +#, c-format

2297 +msgid "missing environment variable '%s' for configuration '%.*s'"

2298 +msgstr ""

2299 +

2300 +#: config.c:442

2301 #, c-format

2302 msgid "key does not contain a section: %s"

2303 msgstr ""

2304

2273 -#: config.c:384

2305 +#: config.c:448

2306 #, c-format

2307 msgid "key does not contain variable name: %s"

2308 msgstr ""

2309

2278 -#: config.c:408 sequencer.c:2580

2310 +#: config.c:472 sequencer.c:2588

2311 #, c-format

2312 msgid "invalid key: %s"

2313 msgstr ""

2314

2283 -#: config.c:414

2315 +#: config.c:478

2316 #, c-format

2317 msgid "invalid key (newline): %s"

2318 msgstr ""

2319

2288 -#: config.c:450 config.c:462

2320 +#: config.c:511

2321 +msgid "empty config key"

2322 +msgstr ""

2323 +

2324 +#: config.c:529 config.c:541

2325 #, c-format

2326 msgid "bogus config parameter: %s"

2327 msgstr ""

2328

2293 -#: config.c:497

2329 +#: config.c:555 config.c:572 config.c:579 config.c:588

2330 #, c-format

2331 msgid "bogus format in %s"

2332 msgstr ""

2333

2298 -#: config.c:836

2334 +#: config.c:622

2335 +#, c-format

2336 +msgid "bogus count in %s"

2337 +msgstr ""

2338 +

2339 +#: config.c:626

2340 +#, c-format

2341 +msgid "too many entries in %s"

2342 +msgstr ""

2343 +

2344 +#: config.c:636

2345 +#, c-format

2346 +msgid "missing config key %s"

2347 +msgstr ""

2348 +

2349 +#: config.c:644

2350 +#, c-format

2351 +msgid "missing config value %s"

2352 +msgstr ""

2353 +

2354 +#: config.c:995

2355 #, c-format

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

2357 msgstr ""

2358

2303 -#: config.c:840

2359 +#: config.c:999

2360 #, c-format

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

2362 msgstr ""

2363

2308 -#: config.c:844

2364 +#: config.c:1003

2365 #, c-format

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

2367 msgstr ""

2368

2313 -#: config.c:848

2369 +#: config.c:1007

2370 #, c-format

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

2372 msgstr ""

2373

2318 -#: config.c:852

2374 +#: config.c:1011

2375 #, c-format

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

2377 msgstr ""

2378

2323 -#: config.c:856

2379 +#: config.c:1015

2380 #, c-format

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

2382 msgstr ""

2383

2328 -#: config.c:993

2384 +#: config.c:1152

2385 msgid "out of range"

2386 msgstr ""

2387

2332 -#: config.c:993

2388 +#: config.c:1152

2389 msgid "invalid unit"

2390 msgstr ""

2391

2336 -#: config.c:994

2392 +#: config.c:1153

2393 #, c-format

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

2395 msgstr ""

2396

2341 -#: config.c:1013

2397 +#: config.c:1163

2398 #, c-format

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

2400 msgstr ""

2401

2346 -#: config.c:1016

2402 +#: config.c:1166

2403 #, c-format

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

2405 msgstr ""

2406

2351 -#: config.c:1019

2407 +#: config.c:1169

2408 #, c-format

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

2410 msgstr ""

2411

2356 -#: config.c:1022

2412 +#: config.c:1172

2413 #, c-format

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

2415 msgstr ""

2416

2361 -#: config.c:1025

2417 +#: config.c:1175

2418 #, c-format

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

2420 msgstr ""

2421

2366 -#: config.c:1028

2422 +#: config.c:1178

2423 #, c-format

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

2425 msgstr ""

2426

2371 -#: config.c:1123

2427 +#: config.c:1194

2428 +#, c-format

2429 +msgid "bad boolean config value '%s' for '%s'"

2430 +msgstr ""

2431 +

2432 +#: config.c:1289

2433 #, c-format

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

2435 msgstr ""

2436

2376 -#: config.c:1132

2437 +#: config.c:1298

2438 #, c-format

2439 msgid "'%s' for '%s' is not a valid timestamp"

2440 msgstr ""

2441

2381 -#: config.c:1223

2442 +#: config.c:1391

2443 #, c-format

2444 msgid "abbrev length out of range: %d"

2445 msgstr ""

2446

2386 -#: config.c:1237 config.c:1248

2447 +#: config.c:1405 config.c:1416

2448 #, c-format

2449 msgid "bad zlib compression level %d"

2450 msgstr ""

2451

2391 -#: config.c:1340

2452 +#: config.c:1508

2453 msgid "core.commentChar should only be one character"

2454 msgstr ""

2455

2395 -#: config.c:1373

2456 +#: config.c:1541

2457 #, c-format

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

2459 msgstr ""

2460

2400 -#: config.c:1445

2461 +#: config.c:1613

2462 #, c-format

2463 msgid "malformed value for %s"

2464 msgstr ""

2465

2405 -#: config.c:1471

2466 +#: config.c:1639

2467 #, c-format

2468 msgid "malformed value for %s: %s"

2469 msgstr ""

2470

2410 -#: config.c:1472

2471 +#: config.c:1640

2472 msgid "must be one of nothing, matching, simple, upstream or current"

2473 msgstr ""

2474

2414 -#: config.c:1533 builtin/pack-objects.c:3649

2475 +#: config.c:1701 builtin/pack-objects.c:3666

2476 #, c-format

2477 msgid "bad pack compression level %d"

2478 msgstr ""

2479

2419 -#: config.c:1655

2480 +#: config.c:1823

2481 #, c-format

2482 msgid "unable to load config blob object '%s'"

2483 msgstr ""

2484

2424 -#: config.c:1658

2485 +#: config.c:1826

2486 #, c-format

2487 msgid "reference '%s' does not point to a blob"

2488 msgstr ""

2489

2429 -#: config.c:1675

2490 +#: config.c:1843

2491 #, c-format

2492 msgid "unable to resolve config blob '%s'"

2493 msgstr ""

2494

2434 -#: config.c:1705

2495 +#: config.c:1873

2496 #, c-format

2497 msgid "failed to parse %s"

2498 msgstr ""

2499

2439 -#: config.c:1759

2500 +#: config.c:1927

2501 msgid "unable to parse command-line config"

2502 msgstr ""

2503

2443 -#: config.c:2122

2504 +#: config.c:2290

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

2506 msgstr ""

2507

2447 -#: config.c:2296

2508 +#: config.c:2464

2509 #, c-format

2510 msgid "Invalid %s: '%s'"

2511 msgstr ""

2512

2452 -#: config.c:2341

2513 +#: config.c:2509

2514 #, c-format

2515 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2516 msgstr ""

2517

2457 -#: config.c:2387

2518 +#: config.c:2555

2519 #, c-format

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

2521 msgstr ""

2522

2462 -#: config.c:2389

2523 +#: config.c:2557

2524 #, c-format

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

2526 msgstr ""

2527

2467 -#: config.c:2473

2528 +#: config.c:2641

2529 #, c-format

2530 msgid "invalid section name '%s'"

2531 msgstr ""

2532

2472 -#: config.c:2505

2533 +#: config.c:2673

2534 #, c-format

2535 msgid "%s has multiple values"

2536 msgstr ""

2537

2477 -#: config.c:2534

2538 +#: config.c:2702

2539 #, c-format

2540 msgid "failed to write new configuration file %s"

2541 msgstr ""

2542

2482 -#: config.c:2786 config.c:3112

2543 +#: config.c:2954 config.c:3280

2544 #, c-format

2545 msgid "could not lock config file %s"

2546 msgstr ""

2547

2487 -#: config.c:2797

2548 +#: config.c:2965

2549 #, c-format

2550 msgid "opening %s"

2551 msgstr ""

2552

2492 -#: config.c:2834 builtin/config.c:361

2553 +#: config.c:3002 builtin/config.c:361

2554 #, c-format

2555 msgid "invalid pattern: %s"

2556 msgstr ""

2557

2497 -#: config.c:2859

2558 +#: config.c:3027

2559 #, c-format

2560 msgid "invalid config file %s"

2561 msgstr ""

2562

2502 -#: config.c:2872 config.c:3125

2563 +#: config.c:3040 config.c:3293

2564 #, c-format

2565 msgid "fstat on %s failed"

2566 msgstr ""

2567

2507 -#: config.c:2883

2568 +#: config.c:3051

2569 #, c-format

2570 msgid "unable to mmap '%s'"

2571 msgstr ""

2572

2512 -#: config.c:2892 config.c:3130

2573 +#: config.c:3060 config.c:3298

2574 #, c-format

2575 msgid "chmod on %s failed"

2576 msgstr ""

2577

2517 -#: config.c:2977 config.c:3227

2578 +#: config.c:3145 config.c:3395

2579 #, c-format

2580 msgid "could not write config file %s"

2581 msgstr ""

2582

2522 -#: config.c:3011

2583 +#: config.c:3179

2584 #, c-format

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

2586 msgstr ""

2587

2527 -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2588 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2589 #, c-format

2590 msgid "could not unset '%s'"

2591 msgstr ""

2592

2532 -#: config.c:3103

2593 +#: config.c:3271

2594 #, c-format

2595 msgid "invalid section name: %s"

2596 msgstr ""

2597

2537 -#: config.c:3270

2598 +#: config.c:3438

2599 #, c-format

2600 msgid "missing value for '%s'"

2601 msgstr ""

@@ -2592,52 +2653,52 @@ msgstr ""

2653 msgid "protocol error: unexpected '%s'"

2654 msgstr ""

2655

2595 -#: connect.c:473

2656 +#: connect.c:497

2657 #, c-format

2658 msgid "unknown object format '%s' specified by server"

2659 msgstr ""

2660

2600 -#: connect.c:500

2661 +#: connect.c:526

2662 #, c-format

2663 msgid "invalid ls-refs response: %s"

2664 msgstr ""

2665

2605 -#: connect.c:504

2666 +#: connect.c:530

2667 msgid "expected flush after ref listing"

2668 msgstr ""

2669

2609 -#: connect.c:507

2670 +#: connect.c:533

2671 msgid "expected response end packet after ref listing"

2672 msgstr ""

2673

2613 -#: connect.c:640

2674 +#: connect.c:666

2675 #, c-format

2676 msgid "protocol '%s' is not supported"

2677 msgstr ""

2678

2618 -#: connect.c:691

2679 +#: connect.c:717

2680 msgid "unable to set SO_KEEPALIVE on socket"

2681 msgstr ""

2682

2622 -#: connect.c:731 connect.c:794

2683 +#: connect.c:757 connect.c:820

2684 #, c-format

2685 msgid "Looking up %s ... "

2686 msgstr ""

2687

2627 -#: connect.c:735

2688 +#: connect.c:761

2689 #, c-format

2690 msgid "unable to look up %s (port %s) (%s)"

2691 msgstr ""

2692

2693 #. TRANSLATORS: this is the end of "Looking up %s ... "

2633 -#: connect.c:739 connect.c:810

2694 +#: connect.c:765 connect.c:836

2695 #, c-format

2696 msgid ""

2697 "done.\n"

2698 "Connecting to %s (port %s) ... "

2699 msgstr ""

2700

2640 -#: connect.c:761 connect.c:838

2701 +#: connect.c:787 connect.c:864

2702 #, c-format

2703 msgid ""

2704 "unable to connect to %s:\n"

@@ -2645,61 +2706,65 @@ msgid ""

2706 msgstr ""

2707

2708 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2648 -#: connect.c:767 connect.c:844

2709 +#: connect.c:793 connect.c:870

2710 msgid "done."

2711 msgstr ""

2712

2652 -#: connect.c:798

2713 +#: connect.c:824

2714 #, c-format

2715 msgid "unable to look up %s (%s)"

2716 msgstr ""

2717

2657 -#: connect.c:804

2718 +#: connect.c:830

2719 #, c-format

2720 msgid "unknown port %s"

2721 msgstr ""

2722

2662 -#: connect.c:941 connect.c:1271

2723 +#: connect.c:967 connect.c:1299

2724 #, c-format

2725 msgid "strange hostname '%s' blocked"

2726 msgstr ""

2727

2667 -#: connect.c:943

2728 +#: connect.c:969

2729 #, c-format

2730 msgid "strange port '%s' blocked"

2731 msgstr ""

2732

2672 -#: connect.c:953

2733 +#: connect.c:979

2734 #, c-format

2735 msgid "cannot start proxy %s"

2736 msgstr ""

2737

2677 -#: connect.c:1024

2738 +#: connect.c:1050

2739 msgid "no path specified; see 'git help pull' for valid url syntax"

2740 msgstr ""

2741

2681 -#: connect.c:1219

2742 +#: connect.c:1190

2743 +msgid "newline is forbidden in git:// hosts and repo paths"

2744 +msgstr ""

2745 +

2746 +#: connect.c:1247

2747 msgid "ssh variant 'simple' does not support -4"

2748 msgstr ""

2749

2685 -#: connect.c:1231

2750 +#: connect.c:1259

2751 msgid "ssh variant 'simple' does not support -6"

2752 msgstr ""

2753

2689 -#: connect.c:1248

2754 +#: connect.c:1276

2755 msgid "ssh variant 'simple' does not support setting port"

2756 msgstr ""

2757

2693 -#: connect.c:1360

2758 +#: connect.c:1388

2759 #, c-format

2760 msgid "strange pathname '%s' blocked"

2761 msgstr ""

2762

2698 -#: connect.c:1408

2763 +#: connect.c:1436

2764 msgid "unable to fork"

2765 msgstr ""

2766

2702 -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

2767 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45

2768 msgid "Checking connectivity"

2769 msgstr ""

2770

@@ -2952,6 +3017,11 @@ msgstr ""

3017 msgid "Marked %d islands, done.\n"

3018 msgstr ""

3019

3020 +#: diff-merges.c:70

3021 +#, c-format

3022 +msgid "unknown value for --diff-merges: %s"

3023 +msgstr ""

3024 +

3025 #: diff-lib.c:534

3026 msgid "--merge-base does not work with ranges"

3027 msgstr ""

@@ -3028,527 +3098,539 @@ msgstr ""

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

3099 msgstr ""

3100

3031 -#: diff.c:4625

3101 +#: diff.c:4628

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

3103 msgstr ""

3104

3035 -#: diff.c:4628

3105 +#: diff.c:4631

3106 msgid "-G, -S and --find-object are mutually exclusive"

3107 msgstr ""

3108

3039 -#: diff.c:4707

3109 +#: diff.c:4710

3110 msgid "--follow requires exactly one pathspec"

3111 msgstr ""

3112

3043 -#: diff.c:4755

3113 +#: diff.c:4758

3114 #, c-format

3115 msgid "invalid --stat value: %s"

3116 msgstr ""

3117

3048 -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303

3118 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306

3119 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3120 #, c-format

3121 msgid "%s expects a numerical value"

3122 msgstr ""

3123

3054 -#: diff.c:4792

3124 +#: diff.c:4795

3125 #, c-format

3126 msgid ""

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

3128 "%s"

3129 msgstr ""

3130

3061 -#: diff.c:4877

3131 +#: diff.c:4880

3132 #, c-format

3133 msgid "unknown change class '%c' in --diff-filter=%s"

3134 msgstr ""

3135

3066 -#: diff.c:4901

3136 +#: diff.c:4904

3137 #, c-format

3138 msgid "unknown value after ws-error-highlight=%.*s"

3139 msgstr ""

3140

3071 -#: diff.c:4915

3141 +#: diff.c:4918

3142 #, c-format

3143 msgid "unable to resolve '%s'"

3144 msgstr ""

3145

3076 -#: diff.c:4965 diff.c:4971

3146 +#: diff.c:4968 diff.c:4974

3147 #, c-format

3148 msgid "%s expects <n>/<m> form"

3149 msgstr ""

3150

3081 -#: diff.c:4983

3151 +#: diff.c:4986

3152 #, c-format

3153 msgid "%s expects a character, got '%s'"

3154 msgstr ""

3155

3086 -#: diff.c:5004

3156 +#: diff.c:5007

3157 #, c-format

3158 msgid "bad --color-moved argument: %s"

3159 msgstr ""

3160

3091 -#: diff.c:5023

3161 +#: diff.c:5026

3162 #, c-format

3163 msgid "invalid mode '%s' in --color-moved-ws"

3164 msgstr ""

3165

3096 -#: diff.c:5063

3166 +#: diff.c:5066

3167 msgid ""

3168 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3169 "\"histogram\""

3170 msgstr ""

3171

3102 -#: diff.c:5099 diff.c:5119

3172 +#: diff.c:5102 diff.c:5122

3173 #, c-format

3174 msgid "invalid argument to %s"

3175 msgstr ""

3176

3107 -#: diff.c:5223

3177 +#: diff.c:5226

3178 #, c-format

3179 msgid "invalid regex given to -I: '%s'"

3180 msgstr ""

3181

3112 -#: diff.c:5272

3182 +#: diff.c:5275

3183 #, c-format

3184 msgid "failed to parse --submodule option parameter: '%s'"

3185 msgstr ""

3186

3117 -#: diff.c:5328

3187 +#: diff.c:5331

3188 #, c-format

3189 msgid "bad --word-diff argument: %s"

3190 msgstr ""

3191

3122 -#: diff.c:5351

3192 +#: diff.c:5367

3193 msgid "Diff output format options"

3194 msgstr ""

3195

3126 -#: diff.c:5353 diff.c:5359

3196 +#: diff.c:5369 diff.c:5375

3197 msgid "generate patch"

3198 msgstr ""

3199

3130 -#: diff.c:5356 builtin/log.c:178

3200 +#: diff.c:5372 builtin/log.c:179

3201 msgid "suppress diff output"

3202 msgstr ""

3203

3134 -#: diff.c:5361 diff.c:5475 diff.c:5482

3204 +#: diff.c:5377 diff.c:5491 diff.c:5498

3205 msgid "<n>"

3206 msgstr ""

3207

3138 -#: diff.c:5362 diff.c:5365

3208 +#: diff.c:5378 diff.c:5381

3209 msgid "generate diffs with <n> lines context"

3210 msgstr ""

3211

3142 -#: diff.c:5367

3212 +#: diff.c:5383

3213 msgid "generate the diff in raw format"

3214 msgstr ""

3215

3146 -#: diff.c:5370

3216 +#: diff.c:5386

3217 msgid "synonym for '-p --raw'"

3218 msgstr ""

3219

3150 -#: diff.c:5374

3220 +#: diff.c:5390

3221 msgid "synonym for '-p --stat'"

3222 msgstr ""

3223

3154 -#: diff.c:5378

3224 +#: diff.c:5394

3225 msgid "machine friendly --stat"

3226 msgstr ""

3227

3158 -#: diff.c:5381

3228 +#: diff.c:5397

3229 msgid "output only the last line of --stat"

3230 msgstr ""

3231

3162 -#: diff.c:5383 diff.c:5391

3232 +#: diff.c:5399 diff.c:5407

3233 msgid "<param1,param2>..."

3234 msgstr ""

3235

3166 -#: diff.c:5384

3236 +#: diff.c:5400

3237 msgid ""

3238 "output the distribution of relative amount of changes for each sub-directory"

3239 msgstr ""

3240

3171 -#: diff.c:5388

3241 +#: diff.c:5404

3242 msgid "synonym for --dirstat=cumulative"

3243 msgstr ""

3244

3175 -#: diff.c:5392

3245 +#: diff.c:5408

3246 msgid "synonym for --dirstat=files,param1,param2..."

3247 msgstr ""

3248

3179 -#: diff.c:5396

3249 +#: diff.c:5412

3250 msgid "warn if changes introduce conflict markers or whitespace errors"

3251 msgstr ""

3252

3183 -#: diff.c:5399

3253 +#: diff.c:5415

3254 msgid "condensed summary such as creations, renames and mode changes"

3255 msgstr ""

3256

3187 -#: diff.c:5402

3257 +#: diff.c:5418

3258 msgid "show only names of changed files"

3259 msgstr ""

3260

3191 -#: diff.c:5405

3261 +#: diff.c:5421

3262 msgid "show only names and status of changed files"

3263 msgstr ""

3264

3195 -#: diff.c:5407

3265 +#: diff.c:5423

3266 msgid "<width>[,<name-width>[,<count>]]"

3267 msgstr ""

3268

3199 -#: diff.c:5408

3269 +#: diff.c:5424

3270 msgid "generate diffstat"

3271 msgstr ""

3272

3203 -#: diff.c:5410 diff.c:5413 diff.c:5416

3273 +#: diff.c:5426 diff.c:5429 diff.c:5432

3274 msgid "<width>"

3275 msgstr ""

3276

3207 -#: diff.c:5411

3277 +#: diff.c:5427

3278 msgid "generate diffstat with a given width"

3279 msgstr ""

3280

3211 -#: diff.c:5414

3281 +#: diff.c:5430

3282 msgid "generate diffstat with a given name width"

3283 msgstr ""

3284

3215 -#: diff.c:5417

3285 +#: diff.c:5433

3286 msgid "generate diffstat with a given graph width"

3287 msgstr ""

3288

3219 -#: diff.c:5419

3289 +#: diff.c:5435

3290 msgid "<count>"

3291 msgstr ""

3292

3223 -#: diff.c:5420

3293 +#: diff.c:5436

3294 msgid "generate diffstat with limited lines"

3295 msgstr ""

3296

3227 -#: diff.c:5423

3297 +#: diff.c:5439

3298 msgid "generate compact summary in diffstat"

3299 msgstr ""

3300

3231 -#: diff.c:5426

3301 +#: diff.c:5442

3302 msgid "output a binary diff that can be applied"

3303 msgstr ""

3304

3235 -#: diff.c:5429

3305 +#: diff.c:5445

3306 msgid "show full pre- and post-image object names on the \"index\" lines"

3307 msgstr ""

3308

3239 -#: diff.c:5431

3309 +#: diff.c:5447

3310 msgid "show colored diff"

3311 msgstr ""

3312

3243 -#: diff.c:5432

3313 +#: diff.c:5448

3314 msgid "<kind>"

3315 msgstr ""

3316

3247 -#: diff.c:5433

3317 +#: diff.c:5449

3318 msgid ""

3319 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3320 "diff"

3321 msgstr ""

3322

3253 -#: diff.c:5436

3323 +#: diff.c:5452

3324 msgid ""

3325 "do not munge pathnames and use NULs as output field terminators in --raw or "

3326 "--numstat"

3327 msgstr ""

3328

3259 -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554

3329 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570

3330 msgid "<prefix>"

3331 msgstr ""

3332

3263 -#: diff.c:5440

3333 +#: diff.c:5456

3334 msgid "show the given source prefix instead of \"a/\""

3335 msgstr ""

3336

3267 -#: diff.c:5443

3337 +#: diff.c:5459

3338 msgid "show the given destination prefix instead of \"b/\""

3339 msgstr ""

3340

3271 -#: diff.c:5446

3341 +#: diff.c:5462

3342 msgid "prepend an additional prefix to every line of output"

3343 msgstr ""

3344

3275 -#: diff.c:5449

3345 +#: diff.c:5465

3346 msgid "do not show any source or destination prefix"

3347 msgstr ""

3348

3279 -#: diff.c:5452

3349 +#: diff.c:5468

3350 msgid "show context between diff hunks up to the specified number of lines"

3351 msgstr ""

3352

3283 -#: diff.c:5456 diff.c:5461 diff.c:5466

3353 +#: diff.c:5472 diff.c:5477 diff.c:5482

3354 msgid "<char>"

3355 msgstr ""

3356

3287 -#: diff.c:5457

3357 +#: diff.c:5473

3358 msgid "specify the character to indicate a new line instead of '+'"

3359 msgstr ""

3360

3291 -#: diff.c:5462

3361 +#: diff.c:5478

3362 msgid "specify the character to indicate an old line instead of '-'"

3363 msgstr ""

3364

3295 -#: diff.c:5467

3365 +#: diff.c:5483

3366 msgid "specify the character to indicate a context instead of ' '"

3367 msgstr ""

3368

3299 -#: diff.c:5470

3369 +#: diff.c:5486

3370 msgid "Diff rename options"

3371 msgstr ""

3372

3303 -#: diff.c:5471

3373 +#: diff.c:5487

3374 msgid "<n>[/<m>]"

3375 msgstr ""

3376

3307 -#: diff.c:5472

3377 +#: diff.c:5488

3378 msgid "break complete rewrite changes into pairs of delete and create"

3379 msgstr ""

3380

3311 -#: diff.c:5476

3381 +#: diff.c:5492

3382 msgid "detect renames"

3383 msgstr ""

3384

3315 -#: diff.c:5480

3385 +#: diff.c:5496

3386 msgid "omit the preimage for deletes"

3387 msgstr ""

3388

3319 -#: diff.c:5483

3389 +#: diff.c:5499

3390 msgid "detect copies"

3391 msgstr ""

3392

3323 -#: diff.c:5487

3393 +#: diff.c:5503

3394 msgid "use unmodified files as source to find copies"

3395 msgstr ""

3396

3327 -#: diff.c:5489

3397 +#: diff.c:5505

3398 msgid "disable rename detection"

3399 msgstr ""

3400

3331 -#: diff.c:5492

3401 +#: diff.c:5508

3402 msgid "use empty blobs as rename source"

3403 msgstr ""

3404

3335 -#: diff.c:5494

3405 +#: diff.c:5510

3406 msgid "continue listing the history of a file beyond renames"

3407 msgstr ""

3408

3339 -#: diff.c:5497

3409 +#: diff.c:5513

3410 msgid ""

3411 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3412 "given limit"

3413 msgstr ""

3414

3345 -#: diff.c:5499

3415 +#: diff.c:5515

3416 msgid "Diff algorithm options"

3417 msgstr ""

3418

3349 -#: diff.c:5501

3419 +#: diff.c:5517

3420 msgid "produce the smallest possible diff"

3421 msgstr ""

3422

3353 -#: diff.c:5504

3423 +#: diff.c:5520

3424 msgid "ignore whitespace when comparing lines"

3425 msgstr ""

3426

3357 -#: diff.c:5507

3427 +#: diff.c:5523

3428 msgid "ignore changes in amount of whitespace"

3429 msgstr ""

3430

3361 -#: diff.c:5510

3431 +#: diff.c:5526

3432 msgid "ignore changes in whitespace at EOL"

3433 msgstr ""

3434

3365 -#: diff.c:5513

3435 +#: diff.c:5529

3436 msgid "ignore carrier-return at the end of line"

3437 msgstr ""

3438

3369 -#: diff.c:5516

3439 +#: diff.c:5532

3440 msgid "ignore changes whose lines are all blank"

3441 msgstr ""

3442

3373 -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588

3443 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604

3444 msgid "<regex>"

3445 msgstr ""

3446

3377 -#: diff.c:5519

3447 +#: diff.c:5535

3448 msgid "ignore changes whose all lines match <regex>"

3449 msgstr ""

3450

3381 -#: diff.c:5522

3451 +#: diff.c:5538

3452 msgid "heuristic to shift diff hunk boundaries for easy reading"

3453 msgstr ""

3454

3385 -#: diff.c:5525

3455 +#: diff.c:5541

3456 msgid "generate diff using the \"patience diff\" algorithm"

3457 msgstr ""

3458

3389 -#: diff.c:5529

3459 +#: diff.c:5545

3460 msgid "generate diff using the \"histogram diff\" algorithm"

3461 msgstr ""

3462

3393 -#: diff.c:5531

3463 +#: diff.c:5547

3464 msgid "<algorithm>"

3465 msgstr ""

3466

3397 -#: diff.c:5532

3467 +#: diff.c:5548

3468 msgid "choose a diff algorithm"

3469 msgstr ""

3470

3401 -#: diff.c:5534

3471 +#: diff.c:5550

3472 msgid "<text>"

3473 msgstr ""

3474

3405 -#: diff.c:5535

3475 +#: diff.c:5551

3476 msgid "generate diff using the \"anchored diff\" algorithm"

3477 msgstr ""

3478

3409 -#: diff.c:5537 diff.c:5546 diff.c:5549

3479 +#: diff.c:5553 diff.c:5562 diff.c:5565

3480 msgid "<mode>"

3481 msgstr ""

3482

3413 -#: diff.c:5538

3483 +#: diff.c:5554

3484 msgid "show word diff, using <mode> to delimit changed words"

3485 msgstr ""

3486

3417 -#: diff.c:5541

3487 +#: diff.c:5557

3488 msgid "use <regex> to decide what a word is"

3489 msgstr ""

3490

3421 -#: diff.c:5544

3491 +#: diff.c:5560

3492 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3493 msgstr ""

3494

3425 -#: diff.c:5547

3495 +#: diff.c:5563

3496 msgid "moved lines of code are colored differently"

3497 msgstr ""

3498

3429 -#: diff.c:5550

3499 +#: diff.c:5566

3500 msgid "how white spaces are ignored in --color-moved"

3501 msgstr ""

3502

3433 -#: diff.c:5553

3503 +#: diff.c:5569

3504 msgid "Other diff options"

3505 msgstr ""

3506

3437 -#: diff.c:5555

3507 +#: diff.c:5571

3508 msgid "when run from subdir, exclude changes outside and show relative paths"

3509 msgstr ""

3510

3441 -#: diff.c:5559

3511 +#: diff.c:5575

3512 msgid "treat all files as text"

3513 msgstr ""

3514

3445 -#: diff.c:5561

3515 +#: diff.c:5577

3516 msgid "swap two inputs, reverse the diff"

3517 msgstr ""

3518

3449 -#: diff.c:5563

3519 +#: diff.c:5579

3520 msgid "exit with 1 if there were differences, 0 otherwise"

3521 msgstr ""

3522

3453 -#: diff.c:5565

3523 +#: diff.c:5581

3524 msgid "disable all output of the program"

3525 msgstr ""

3526

3457 -#: diff.c:5567

3527 +#: diff.c:5583

3528 msgid "allow an external diff helper to be executed"

3529 msgstr ""

3530

3461 -#: diff.c:5569

3531 +#: diff.c:5585

3532 msgid "run external text conversion filters when comparing binary files"

3533 msgstr ""

3534

3465 -#: diff.c:5571

3535 +#: diff.c:5587

3536 msgid "<when>"

3537 msgstr ""

3538

3469 -#: diff.c:5572

3539 +#: diff.c:5588

3540 msgid "ignore changes to submodules in the diff generation"

3541 msgstr ""

3542

3473 -#: diff.c:5575

3543 +#: diff.c:5591

3544 msgid "<format>"

3545 msgstr ""

3546

3477 -#: diff.c:5576

3547 +#: diff.c:5592

3548 msgid "specify how differences in submodules are shown"

3549 msgstr ""

3550

3481 -#: diff.c:5580

3551 +#: diff.c:5596

3552 msgid "hide 'git add -N' entries from the index"

3553 msgstr ""

3554

3485 -#: diff.c:5583

3555 +#: diff.c:5599

3556 msgid "treat 'git add -N' entries as real in the index"

3557 msgstr ""

3558

3489 -#: diff.c:5585

3559 +#: diff.c:5601

3560 msgid "<string>"

3561 msgstr ""

3562

3493 -#: diff.c:5586

3563 +#: diff.c:5602

3564 msgid ""

3565 "look for differences that change the number of occurrences of the specified "

3566 "string"

3567 msgstr ""

3568

3499 -#: diff.c:5589

3569 +#: diff.c:5605

3570 msgid ""

3571 "look for differences that change the number of occurrences of the specified "

3572 "regex"

3573 msgstr ""

3574

3505 -#: diff.c:5592

3575 +#: diff.c:5608

3576 msgid "show all changes in the changeset with -S or -G"

3577 msgstr ""

3578

3509 -#: diff.c:5595

3579 +#: diff.c:5611

3580 msgid "treat <string> in -S as extended POSIX regular expression"

3581 msgstr ""

3582

3513 -#: diff.c:5598

3583 +#: diff.c:5614

3584 msgid "control the order in which files appear in the output"

3585 msgstr ""

3586

3517 -#: diff.c:5599

3587 +#: diff.c:5615 diff.c:5618

3588 +msgid "<path>"

3589 +msgstr ""

3590 +

3591 +#: diff.c:5616

3592 +msgid "show the change in the specified path first"

3593 +msgstr ""

3594 +

3595 +#: diff.c:5619

3596 +msgid "skip the output to the specified path"

3597 +msgstr ""

3598 +

3599 +#: diff.c:5621

3600 msgid "<object-id>"

3601 msgstr ""

3602

3521 -#: diff.c:5600

3603 +#: diff.c:5622

3604 msgid ""

3605 "look for differences that change the number of occurrences of the specified "

3606 "object"

3607 msgstr ""

3608

3527 -#: diff.c:5602

3609 +#: diff.c:5624

3610 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3611 msgstr ""

3612

3531 -#: diff.c:5603

3613 +#: diff.c:5625

3614 msgid "select files by diff type"

3615 msgstr ""

3616

3535 -#: diff.c:5605

3617 +#: diff.c:5627

3618 msgid "<file>"

3619 msgstr ""

3620

3539 -#: diff.c:5606

3621 +#: diff.c:5628

3622 msgid "Output to a specific file"

3623 msgstr ""

3624

3543 -#: diff.c:6263

3625 +#: diff.c:6285

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

3627 msgstr ""

3628

3547 -#: diff.c:6266

3629 +#: diff.c:6288

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

3631 msgstr ""

3632

3551 -#: diff.c:6269

3633 +#: diff.c:6291

3634 #, c-format

3635 msgid ""

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

@@ -3559,10 +3641,15 @@ msgstr ""

3641 msgid "failed to read orderfile '%s'"

3642 msgstr ""

3643

3562 -#: diffcore-rename.c:592

3644 +#: diffcore-rename.c:555

3645 msgid "Performing inexact rename detection"

3646 msgstr ""

3647

3648 +#: diffcore-rotate.c:29

3649 +#, c-format

3650 +msgid "No such path '%s' in the diff"

3651 +msgstr ""

3652 +

3653 #: dir.c:578

3654 #, c-format

3655 msgid "pathspec '%s' did not match any file(s) known to git"

@@ -3605,17 +3692,17 @@ msgstr ""

3692 msgid "untracked cache is disabled on this system or location"

3693 msgstr ""

3694

3608 -#: dir.c:3520

3695 +#: dir.c:3537

3696 #, c-format

3697 msgid "index file corrupt in repo %s"

3698 msgstr ""

3699

3613 -#: dir.c:3565 dir.c:3570

3700 +#: dir.c:3582 dir.c:3587

3701 #, c-format

3702 msgid "could not create directories for %s"

3703 msgstr ""

3704

3618 -#: dir.c:3599

3705 +#: dir.c:3616

3706 #, c-format

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

3708 msgstr ""

@@ -3634,12 +3721,12 @@ msgstr ""

3721 msgid "could not stat file '%s'"

3722 msgstr ""

3723

3637 -#: environment.c:150

3724 +#: environment.c:152

3725 #, c-format

3726 msgid "bad git namespace path \"%s\""

3727 msgstr ""

3728

3642 -#: environment.c:337

3729 +#: environment.c:335

3730 #, c-format

3731 msgid "could not set GIT_DIR to '%s'"

3732 msgstr ""

@@ -3674,32 +3761,32 @@ msgstr ""

3761 msgid "--stateless-rpc requires multi_ack_detailed"

3762 msgstr ""

3763

3677 -#: fetch-pack.c:378 fetch-pack.c:1406

3764 +#: fetch-pack.c:378 fetch-pack.c:1400

3765 #, c-format

3766 msgid "invalid shallow line: %s"

3767 msgstr ""

3768

3682 -#: fetch-pack.c:384 fetch-pack.c:1412

3769 +#: fetch-pack.c:384 fetch-pack.c:1406

3770 #, c-format

3771 msgid "invalid unshallow line: %s"

3772 msgstr ""

3773

3687 -#: fetch-pack.c:386 fetch-pack.c:1414

3774 +#: fetch-pack.c:386 fetch-pack.c:1408

3775 #, c-format

3776 msgid "object not found: %s"

3777 msgstr ""

3778

3692 -#: fetch-pack.c:389 fetch-pack.c:1417

3779 +#: fetch-pack.c:389 fetch-pack.c:1411

3780 #, c-format

3781 msgid "error in object: %s"

3782 msgstr ""

3783

3697 -#: fetch-pack.c:391 fetch-pack.c:1419

3784 +#: fetch-pack.c:391 fetch-pack.c:1413

3785 #, c-format

3786 msgid "no shallow found: %s"

3787 msgstr ""

3788

3702 -#: fetch-pack.c:394 fetch-pack.c:1423

3789 +#: fetch-pack.c:394 fetch-pack.c:1417

3790 #, c-format

3791 msgid "expected shallow/unshallow, got %s"

3792 msgstr ""

@@ -3737,171 +3824,171 @@ msgstr ""

3824 msgid "already have %s (%s)"

3825 msgstr ""

3826

3740 -#: fetch-pack.c:827

3827 +#: fetch-pack.c:821

3828 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3829 msgstr ""

3830

3744 -#: fetch-pack.c:835

3831 +#: fetch-pack.c:829

3832 msgid "protocol error: bad pack header"

3833 msgstr ""

3834

3748 -#: fetch-pack.c:919

3835 +#: fetch-pack.c:913

3836 #, c-format

3837 msgid "fetch-pack: unable to fork off %s"

3838 msgstr ""

3839

3753 -#: fetch-pack.c:937

3840 +#: fetch-pack.c:931

3841 #, c-format

3842 msgid "%s failed"

3843 msgstr ""

3844

3758 -#: fetch-pack.c:939

3845 +#: fetch-pack.c:933

3846 msgid "error in sideband demultiplexer"

3847 msgstr ""

3848

3762 -#: fetch-pack.c:982

3849 +#: fetch-pack.c:976

3850 #, c-format

3851 msgid "Server version is %.*s"

3852 msgstr ""

3853

3767 -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

3768 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

3769 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

3770 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

3854 +#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999

3855 +#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015

3856 +#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031

3857 +#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053

3858 #, c-format

3859 msgid "Server supports %s"

3860 msgstr ""

3861

3775 -#: fetch-pack.c:992

3862 +#: fetch-pack.c:986

3863 msgid "Server does not support shallow clients"

3864 msgstr ""

3865

3779 -#: fetch-pack.c:1052

3866 +#: fetch-pack.c:1046

3867 msgid "Server does not support --shallow-since"

3868 msgstr ""

3869

3783 -#: fetch-pack.c:1057

3870 +#: fetch-pack.c:1051

3871 msgid "Server does not support --shallow-exclude"

3872 msgstr ""

3873

3787 -#: fetch-pack.c:1061

3874 +#: fetch-pack.c:1055

3875 msgid "Server does not support --deepen"

3876 msgstr ""

3877

3791 -#: fetch-pack.c:1063

3878 +#: fetch-pack.c:1057

3879 msgid "Server does not support this repository's object format"

3880 msgstr ""

3881

3795 -#: fetch-pack.c:1076

3882 +#: fetch-pack.c:1070

3883 msgid "no common commits"

3884 msgstr ""

3885

3799 -#: fetch-pack.c:1088 fetch-pack.c:1628

3886 +#: fetch-pack.c:1082 fetch-pack.c:1622

3887 msgid "git fetch-pack: fetch failed."

3888 msgstr ""

3889

3803 -#: fetch-pack.c:1214

3890 +#: fetch-pack.c:1208

3891 #, c-format

3892 msgid "mismatched algorithms: client %s; server %s"

3893 msgstr ""

3894

3808 -#: fetch-pack.c:1218

3895 +#: fetch-pack.c:1212

3896 #, c-format

3897 msgid "the server does not support algorithm '%s'"

3898 msgstr ""

3899

3813 -#: fetch-pack.c:1238

3900 +#: fetch-pack.c:1232

3901 msgid "Server does not support shallow requests"

3902 msgstr ""

3903

3817 -#: fetch-pack.c:1245

3904 +#: fetch-pack.c:1239

3905 msgid "Server supports filter"

3906 msgstr ""

3907

3821 -#: fetch-pack.c:1284

3908 +#: fetch-pack.c:1278

3909 msgid "unable to write request to remote"

3910 msgstr ""

3911

3825 -#: fetch-pack.c:1302

3912 +#: fetch-pack.c:1296

3913 #, c-format

3914 msgid "error reading section header '%s'"

3915 msgstr ""

3916

3830 -#: fetch-pack.c:1308

3917 +#: fetch-pack.c:1302

3918 #, c-format

3919 msgid "expected '%s', received '%s'"

3920 msgstr ""

3921

3835 -#: fetch-pack.c:1369

3922 +#: fetch-pack.c:1363

3923 #, c-format

3924 msgid "unexpected acknowledgment line: '%s'"

3925 msgstr ""

3926

3840 -#: fetch-pack.c:1374

3927 +#: fetch-pack.c:1368

3928 #, c-format

3929 msgid "error processing acks: %d"

3930 msgstr ""

3931

3845 -#: fetch-pack.c:1384

3932 +#: fetch-pack.c:1378

3933 msgid "expected packfile to be sent after 'ready'"

3934 msgstr ""

3935

3849 -#: fetch-pack.c:1386

3936 +#: fetch-pack.c:1380

3937 msgid "expected no other sections to be sent after no 'ready'"

3938 msgstr ""

3939

3853 -#: fetch-pack.c:1428

3940 +#: fetch-pack.c:1422

3941 #, c-format

3942 msgid "error processing shallow info: %d"

3943 msgstr ""

3944

3858 -#: fetch-pack.c:1475

3945 +#: fetch-pack.c:1469

3946 #, c-format

3947 msgid "expected wanted-ref, got '%s'"

3948 msgstr ""

3949

3863 -#: fetch-pack.c:1480

3950 +#: fetch-pack.c:1474

3951 #, c-format

3952 msgid "unexpected wanted-ref: '%s'"

3953 msgstr ""

3954

3868 -#: fetch-pack.c:1485

3955 +#: fetch-pack.c:1479

3956 #, c-format

3957 msgid "error processing wanted refs: %d"

3958 msgstr ""

3959

3873 -#: fetch-pack.c:1515

3960 +#: fetch-pack.c:1509

3961 msgid "git fetch-pack: expected response end packet"

3962 msgstr ""

3963

3877 -#: fetch-pack.c:1897

3964 +#: fetch-pack.c:1891

3965 msgid "no matching remote head"

3966 msgstr ""

3967

3881 -#: fetch-pack.c:1920 builtin/clone.c:693

3968 +#: fetch-pack.c:1914 builtin/clone.c:693

3969 msgid "remote did not send all necessary objects"

3970 msgstr ""

3971

3885 -#: fetch-pack.c:1947

3972 +#: fetch-pack.c:1941

3973 #, c-format

3974 msgid "no such remote ref %s"

3975 msgstr ""

3976

3890 -#: fetch-pack.c:1950

3977 +#: fetch-pack.c:1944

3978 #, c-format

3979 msgid "Server does not allow request for unadvertised object %s"

3980 msgstr ""

3981

3895 -#: gpg-interface.c:272

3982 +#: gpg-interface.c:273

3983 msgid "could not create temporary file"

3984 msgstr ""

3985

3899 -#: gpg-interface.c:275

3986 +#: gpg-interface.c:276

3987 #, c-format

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

3989 msgstr ""

3990

3904 -#: gpg-interface.c:457

3991 +#: gpg-interface.c:470

3992 msgid "gpg failed to sign the data"

3993 msgstr ""

3994

@@ -3910,24 +3997,24 @@ msgstr ""

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

3998 msgstr ""

3999

3913 -#: grep.c:640

4000 +#: grep.c:543

4001 msgid ""

4002 "given pattern contains NULL byte (via -f <file>). This is only supported "

4003 "with -P under PCRE v2"

4004 msgstr ""

4005

3919 -#: grep.c:2100

4006 +#: grep.c:1906

4007 #, c-format

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

4009 msgstr ""

4010

3924 -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4011 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90

4012 #: builtin/rm.c:135

4013 #, c-format

4014 msgid "failed to stat '%s'"

4015 msgstr ""

4016

3930 -#: grep.c:2128

4017 +#: grep.c:1934

4018 #, c-format

4019 msgid "'%s': short read"

4020 msgstr ""

@@ -3997,7 +4084,7 @@ msgstr ""

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

4085 msgstr ""

4086

4000 -#: help.c:365 git.c:99

4087 +#: help.c:365 git.c:100

4088 #, c-format

4089 msgid "unsupported command listing type '%s'"

4090 msgstr ""

@@ -4206,180 +4293,338 @@ msgstr ""

4293 msgid "Unable to create '%s.lock': %s"

4294 msgstr ""

4295

4209 -#: ls-refs.c:109

4296 +#: ls-refs.c:37

4297 +#, c-format

4298 +msgid "invalid value '%s' for lsrefs.unborn"

4299 +msgstr ""

4300 +

4301 +#: ls-refs.c:167

4302 msgid "expected flush after ls-refs arguments"

4303 msgstr ""

4304

4213 -#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4305 +#: merge-ort.c:855 merge-recursive.c:1191

4306 #, c-format

4215 -msgid ""

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

4217 -" %s"

4307 +msgid "Failed to merge submodule %s (not checked out)"

4308 msgstr ""

4309

4220 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4310 +#: merge-ort.c:864 merge-recursive.c:1198

4311 #, c-format

4222 -msgid "Already up to date!"

4312 +msgid "Failed to merge submodule %s (commits not present)"

4313 msgstr ""

4314

4225 -#: merge-recursive.c:356

4226 -msgid "(bad commit)\n"

4315 +#: merge-ort.c:873 merge-recursive.c:1205

4316 +#, c-format

4317 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4318 msgstr ""

4319

4229 -#: merge-recursive.c:379

4320 +#: merge-ort.c:883 merge-ort.c:890

4321 #, c-format

4231 -msgid "add_cacheinfo failed for path '%s'; merge aborting."

4322 +msgid "Note: Fast-forwarding submodule %s to %s"

4323 msgstr ""

4324

4234 -#: merge-recursive.c:388

4325 +#: merge-ort.c:911

4326 #, c-format

4236 -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4327 +msgid "Failed to merge submodule %s"

4328 msgstr ""

4329

4239 -#: merge-recursive.c:874

4330 +#: merge-ort.c:918

4331 #, c-format

4241 -msgid "failed to create path '%s'%s"

4332 +msgid ""

4333 +"Failed to merge submodule %s, but a possible merge resolution exists:\n"

4334 +"%s\n"

4335 msgstr ""

4336

4244 -#: merge-recursive.c:885

4337 +#: merge-ort.c:922 merge-recursive.c:1259

4338 #, c-format

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

4339 +msgid ""

4340 +"If this is correct simply add it to the index for example\n"

4341 +"by using:\n"

4342 +"\n"

4343 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

4344 +"\n"

4345 +"which will accept this suggestion.\n"

4346 msgstr ""

4347

4249 -#: merge-recursive.c:899 merge-recursive.c:918

4250 -msgid ": perhaps a D/F conflict?"

4348 +#: merge-ort.c:935

4349 +#, c-format

4350 +msgid ""

4351 +"Failed to merge submodule %s, but multiple possible merges exist:\n"

4352 +"%s"

4353 msgstr ""

4354

4253 -#: merge-recursive.c:908

4254 -#, c-format

4255 -msgid "refusing to lose untracked file at '%s'"

4355 +#: merge-ort.c:1094 merge-recursive.c:1341

4356 +msgid "Failed to execute internal merge"

4357 msgstr ""

4358

4258 -#: merge-recursive.c:949 builtin/cat-file.c:41

4359 +#: merge-ort.c:1099 merge-recursive.c:1346

4360 #, c-format

4260 -msgid "cannot read object %s '%s'"

4361 +msgid "Unable to add %s to database"

4362 msgstr ""

4363

4263 -#: merge-recursive.c:954

4364 +#: merge-ort.c:1106 merge-recursive.c:1378

4365 #, c-format

4265 -msgid "blob expected for %s '%s'"

4366 +msgid "Auto-merging %s"

4367 msgstr ""

4368

4268 -#: merge-recursive.c:979

4369 +#: merge-ort.c:1245 merge-recursive.c:2100

4370 #, c-format

4270 -msgid "failed to open '%s': %s"

4371 +msgid ""

4372 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4373 +"implicit directory rename(s) putting the following path(s) there: %s."

4374 msgstr ""

4375

4273 -#: merge-recursive.c:990

4376 +#: merge-ort.c:1255 merge-recursive.c:2110

4377 #, c-format

4275 -msgid "failed to symlink '%s': %s"

4378 +msgid ""

4379 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4380 +"implicit directory renames tried to put these paths there: %s"

4381 msgstr ""

4382

4278 -#: merge-recursive.c:995

4383 +#: merge-ort.c:1438

4384 #, c-format

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

4385 +msgid ""

4386 +"CONFLICT (directory rename split): Unclear where to rename %s to; it was "

4387 +"renamed to multiple other directories, with no destination getting a "

4388 +"majority of the files."

4389 msgstr ""

4390

4283 -#: merge-recursive.c:1191

4391 +#: merge-ort.c:1604 merge-recursive.c:2447

4392 #, c-format

4285 -msgid "Failed to merge submodule %s (not checked out)"

4393 +msgid ""

4394 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4395 +"renamed."

4396 msgstr ""

4397

4288 -#: merge-recursive.c:1198

4398 +#: merge-ort.c:1748 merge-recursive.c:3215

4399 #, c-format

4290 -msgid "Failed to merge submodule %s (commits not present)"

4400 +msgid ""

4401 +"Path updated: %s added in %s inside a directory that was renamed in %s; "

4402 +"moving it to %s."

4403 msgstr ""

4404

4293 -#: merge-recursive.c:1205

4405 +#: merge-ort.c:1755 merge-recursive.c:3222

4406 #, c-format

4295 -msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4407 +msgid ""

4408 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4409 +"%s; moving it to %s."

4410 msgstr ""

4411

4298 -#: merge-recursive.c:1213 merge-recursive.c:1225

4412 +#: merge-ort.c:1768 merge-recursive.c:3218

4413 #, c-format

4300 -msgid "Fast-forwarding submodule %s to the following commit:"

4414 +msgid ""

4415 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4416 +"in %s, suggesting it should perhaps be moved to %s."

4417 msgstr ""

4418

4303 -#: merge-recursive.c:1216 merge-recursive.c:1228

4419 +#: merge-ort.c:1776 merge-recursive.c:3225

4420 #, c-format

4305 -msgid "Fast-forwarding submodule %s"

4421 +msgid ""

4422 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4423 +"was renamed in %s, suggesting it should perhaps be moved to %s."

4424 msgstr ""

4425

4308 -#: merge-recursive.c:1251

4426 +#: merge-ort.c:1919

4427 #, c-format

4310 -msgid "Failed to merge submodule %s (merge following commits not found)"

4428 +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4429 msgstr ""

4430

4313 -#: merge-recursive.c:1255

4431 +#: merge-ort.c:2014

4432 #, c-format

4315 -msgid "Failed to merge submodule %s (not fast-forward)"

4433 +msgid ""

4434 +"CONFLICT (rename involved in collision): rename of %s -> %s has content "

4435 +"conflicts AND collides with another path; this may result in nested conflict "

4436 +"markers."

4437 msgstr ""

4438

4318 -#: merge-recursive.c:1256

4319 -msgid "Found a possible merge resolution for the submodule:\n"

4439 +#: merge-ort.c:2033 merge-ort.c:2057

4440 +#, c-format

4441 +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4442 msgstr ""

4443

4322 -#: merge-recursive.c:1259

4444 +#: merge-ort.c:2683

4445 #, c-format

4446 msgid ""

4325 -"If this is correct simply add it to the index for example\n"

4326 -"by using:\n"

4327 -"\n"

4328 -" git update-index --cacheinfo 160000 %s \"%s\"\n"

4329 -"\n"

4330 -"which will accept this suggestion.\n"

4447 +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4448 +"%s instead."

4449 msgstr ""

4450

4333 -#: merge-recursive.c:1268

4451 +#: merge-ort.c:2756

4452 #, c-format

4335 -msgid "Failed to merge submodule %s (multiple merges found)"

4453 +msgid ""

4454 +"CONFLICT (distinct types): %s had different types on each side; renamed %s "

4455 +"of them so each can be recorded somewhere."

4456 msgstr ""

4457

4338 -#: merge-recursive.c:1341

4339 -msgid "Failed to execute internal merge"

4458 +#: merge-ort.c:2760

4459 +msgid "both"

4460 msgstr ""

4461

4342 -#: merge-recursive.c:1346

4343 -#, c-format

4344 -msgid "Unable to add %s to database"

4462 +#: merge-ort.c:2760

4463 +msgid "one"

4464 msgstr ""

4465

4347 -#: merge-recursive.c:1378

4348 -#, c-format

4349 -msgid "Auto-merging %s"

4466 +#: merge-ort.c:2855 merge-recursive.c:3052

4467 +msgid "content"

4468 msgstr ""

4469

4352 -#: merge-recursive.c:1402

4470 +#: merge-ort.c:2857 merge-recursive.c:3056

4471 +msgid "add/add"

4472 +msgstr ""

4473 +

4474 +#: merge-ort.c:2859 merge-recursive.c:3101

4475 +msgid "submodule"

4476 +msgstr ""

4477 +

4478 +#: merge-ort.c:2861 merge-recursive.c:3102

4479 #, c-format

4354 -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4480 +msgid "CONFLICT (%s): Merge conflict in %s"

4481 msgstr ""

4482

4357 -#: merge-recursive.c:1474

4483 +#: merge-ort.c:2886

4484 #, c-format

4485 msgid ""

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

4361 -"in tree."

4486 +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4487 +"of %s left in tree."

4488 msgstr ""

4489

4364 -#: merge-recursive.c:1479

4490 +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4491 +#. base, and 2-3) the trees for the two trees we're merging.

4492 +#.

4493 +#: merge-ort.c:3354

4494 #, c-format

4366 -msgid ""

4367 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4368 -"left in tree."

4495 +msgid "collecting merge info failed for trees %s, %s, %s"

4496 msgstr ""

4497

4371 -#: merge-recursive.c:1486

4498 +#: merge-ort-wrappers.c:13 merge-recursive.c:3661

4499 #, c-format

4500 msgid ""

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

4375 -"in tree at %s."

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

4502 +" %s"

4503 msgstr ""

4504

4378 -#: merge-recursive.c:1491

4505 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4506 #, c-format

4380 -msgid ""

4381 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4382 -"left in tree at %s."

4507 +msgid "Already up to date!"

4508 +msgstr ""

4509 +

4510 +#: merge-recursive.c:356

4511 +msgid "(bad commit)\n"

4512 +msgstr ""

4513 +

4514 +#: merge-recursive.c:379

4515 +#, c-format

4516 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

4517 +msgstr ""

4518 +

4519 +#: merge-recursive.c:388

4520 +#, c-format

4521 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4522 +msgstr ""

4523 +

4524 +#: merge-recursive.c:874

4525 +#, c-format

4526 +msgid "failed to create path '%s'%s"

4527 +msgstr ""

4528 +

4529 +#: merge-recursive.c:885

4530 +#, c-format

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

4532 +msgstr ""

4533 +

4534 +#: merge-recursive.c:899 merge-recursive.c:918

4535 +msgid ": perhaps a D/F conflict?"

4536 +msgstr ""

4537 +

4538 +#: merge-recursive.c:908

4539 +#, c-format

4540 +msgid "refusing to lose untracked file at '%s'"

4541 +msgstr ""

4542 +

4543 +#: merge-recursive.c:949 builtin/cat-file.c:41

4544 +#, c-format

4545 +msgid "cannot read object %s '%s'"

4546 +msgstr ""

4547 +

4548 +#: merge-recursive.c:954

4549 +#, c-format

4550 +msgid "blob expected for %s '%s'"

4551 +msgstr ""

4552 +

4553 +#: merge-recursive.c:979

4554 +#, c-format

4555 +msgid "failed to open '%s': %s"

4556 +msgstr ""

4557 +

4558 +#: merge-recursive.c:990

4559 +#, c-format

4560 +msgid "failed to symlink '%s': %s"

4561 +msgstr ""

4562 +

4563 +#: merge-recursive.c:995

4564 +#, c-format

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

4566 +msgstr ""

4567 +

4568 +#: merge-recursive.c:1213 merge-recursive.c:1225

4569 +#, c-format

4570 +msgid "Fast-forwarding submodule %s to the following commit:"

4571 +msgstr ""

4572 +

4573 +#: merge-recursive.c:1216 merge-recursive.c:1228

4574 +#, c-format

4575 +msgid "Fast-forwarding submodule %s"

4576 +msgstr ""

4577 +

4578 +#: merge-recursive.c:1251

4579 +#, c-format

4580 +msgid "Failed to merge submodule %s (merge following commits not found)"

4581 +msgstr ""

4582 +

4583 +#: merge-recursive.c:1255

4584 +#, c-format

4585 +msgid "Failed to merge submodule %s (not fast-forward)"

4586 +msgstr ""

4587 +

4588 +#: merge-recursive.c:1256

4589 +msgid "Found a possible merge resolution for the submodule:\n"

4590 +msgstr ""

4591 +

4592 +#: merge-recursive.c:1268

4593 +#, c-format

4594 +msgid "Failed to merge submodule %s (multiple merges found)"

4595 +msgstr ""

4596 +

4597 +#: merge-recursive.c:1402

4598 +#, c-format

4599 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4600 +msgstr ""

4601 +

4602 +#: merge-recursive.c:1474

4603 +#, c-format

4604 +msgid ""

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

4606 +"in tree."

4607 +msgstr ""

4608 +

4609 +#: merge-recursive.c:1479

4610 +#, c-format

4611 +msgid ""

4612 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4613 +"left in tree."

4614 +msgstr ""

4615 +

4616 +#: merge-recursive.c:1486

4617 +#, c-format

4618 +msgid ""

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

4620 +"in tree at %s."

4621 +msgstr ""

4622 +

4623 +#: merge-recursive.c:1491

4624 +#, c-format

4625 +msgid ""

4626 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4627 +"left in tree at %s."

4628 msgstr ""

4629

4630 #: merge-recursive.c:1526

@@ -4439,20 +4684,6 @@ msgid ""

4684 "getting a majority of the files."

4685 msgstr ""

4686

4442 -#: merge-recursive.c:2100

4443 -#, c-format

4444 -msgid ""

4445 -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4446 -"implicit directory rename(s) putting the following path(s) there: %s."

4447 -msgstr ""

4448 -

4449 -#: merge-recursive.c:2110

4450 -#, c-format

4451 -msgid ""

4452 -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4453 -"implicit directory renames tried to put these paths there: %s"

4454 -msgstr ""

4455 -

4687 #: merge-recursive.c:2202

4688 #, c-format

4689 msgid ""

@@ -4460,13 +4691,6 @@ msgid ""

4691 ">%s in %s"

4692 msgstr ""

4693

4463 -#: merge-recursive.c:2447

4464 -#, c-format

4465 -msgid ""

4466 -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4467 -"renamed."

4468 -msgstr ""

4469 -

4694 #: merge-recursive.c:2973

4695 #, c-format

4696 msgid "cannot read object %s"

@@ -4485,61 +4709,16 @@ msgstr ""

4709 msgid "modified"

4710 msgstr ""

4711

4488 -#: merge-recursive.c:3052

4489 -msgid "content"

4490 -msgstr ""

4491 -

4492 -#: merge-recursive.c:3056

4493 -msgid "add/add"

4494 -msgstr ""

4495 -

4712 #: merge-recursive.c:3079

4713 #, c-format

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

4715 msgstr ""

4716

4501 -#: merge-recursive.c:3101

4502 -msgid "submodule"

4503 -msgstr ""

4504 -

4505 -#: merge-recursive.c:3102

4506 -#, c-format

4507 -msgid "CONFLICT (%s): Merge conflict in %s"

4508 -msgstr ""

4509 -

4717 #: merge-recursive.c:3132

4718 #, c-format

4719 msgid "Adding as %s instead"

4720 msgstr ""

4721

4515 -#: merge-recursive.c:3215

4516 -#, c-format

4517 -msgid ""

4518 -"Path updated: %s added in %s inside a directory that was renamed in %s; "

4519 -"moving it to %s."

4520 -msgstr ""

4521 -

4522 -#: merge-recursive.c:3218

4523 -#, c-format

4524 -msgid ""

4525 -"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4526 -"in %s, suggesting it should perhaps be moved to %s."

4527 -msgstr ""

4528 -

4529 -#: merge-recursive.c:3222

4530 -#, c-format

4531 -msgid ""

4532 -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4533 -"%s; moving it to %s."

4534 -msgstr ""

4535 -

4536 -#: merge-recursive.c:3225

4537 -#, c-format

4538 -msgid ""

4539 -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4540 -"was renamed in %s, suggesting it should perhaps be moved to %s."

4541 -msgstr ""

4542 -

4722 #: merge-recursive.c:3339

4723 #, c-format

4724 msgid "Removing %s"

@@ -4573,27 +4752,28 @@ msgstr ""

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

4753 msgstr ""

4754

4576 -#: merge-recursive.c:3550

4755 +#: merge-recursive.c:3539

4756 msgid "Merging:"

4757 msgstr ""

4758

4580 -#: merge-recursive.c:3563

4759 +#: merge-recursive.c:3552

4760 #, c-format

4761 msgid "found %u common ancestor:"

4762 msgid_plural "found %u common ancestors:"

4763 msgstr[0] ""

4764 msgstr[1] ""

4765

4587 -#: merge-recursive.c:3613

4766 +#: merge-recursive.c:3602

4767 msgid "merge returned no commit"

4768 msgstr ""

4769

4591 -#: merge-recursive.c:3769

4770 +#: merge-recursive.c:3758

4771 #, c-format

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

4773 msgstr ""

4774

4596 -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

4775 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896

4776 +#: builtin/stash.c:471

4777 msgid "Unable to write index."

4778 msgstr ""

4779

@@ -4601,8 +4781,8 @@ msgstr ""

4781 msgid "failed to read the cache"

4782 msgstr ""

4783

4604 -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

4605 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

4784 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917

4785 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817

4786 #: builtin/stash.c:265

4787 msgid "unable to write new index file"

4788 msgstr ""

@@ -4768,17 +4948,17 @@ msgstr ""

4948 msgid "could not finish pack-objects"

4949 msgstr ""

4950

4771 -#: name-hash.c:537

4951 +#: name-hash.c:538

4952 #, c-format

4953 msgid "unable to create lazy_dir thread: %s"

4954 msgstr ""

4955

4776 -#: name-hash.c:559

4956 +#: name-hash.c:560

4957 #, c-format

4958 msgid "unable to create lazy_name thread: %s"

4959 msgstr ""

4960

4781 -#: name-hash.c:565

4961 +#: name-hash.c:566

4962 #, c-format

4963 msgid "unable to join lazy_name thread: %s"

4964 msgstr ""

@@ -4819,469 +4999,858 @@ msgstr ""

4999 msgid "Bad %s value: '%s'"

5000 msgstr ""

5001

4822 -#: object.c:53

5002 +#: object-file.c:480

5003 #, c-format

4824 -msgid "invalid object type \"%s\""

5004 +msgid "object directory %s does not exist; check .git/objects/info/alternates"

5005 msgstr ""

5006

4827 -#: object.c:173

5007 +#: object-file.c:531

5008 #, c-format

4829 -msgid "object %s is a %s, not a %s"

5009 +msgid "unable to normalize alternate object path: %s"

5010 msgstr ""

5011

4832 -#: object.c:233

5012 +#: object-file.c:603

5013 #, c-format

4834 -msgid "object %s has unknown type id %d"

5014 +msgid "%s: ignoring alternate object stores, nesting too deep"

5015 msgstr ""

5016

4837 -#: object.c:246

5017 +#: object-file.c:610

5018 #, c-format

4839 -msgid "unable to parse object: %s"

5019 +msgid "unable to normalize object directory: %s"

5020 msgstr ""

5021

4842 -#: object.c:266 object.c:278

4843 -#, c-format

4844 -msgid "hash mismatch %s"

5022 +#: object-file.c:653

5023 +msgid "unable to fdopen alternates lockfile"

5024 msgstr ""

5025

4847 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

4848 -#, c-format

4849 -msgid "unable to get size of %s"

5026 +#: object-file.c:671

5027 +msgid "unable to read alternates file"

5028 msgstr ""

5029

4852 -#: packfile.c:615

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

5030 +#: object-file.c:678

5031 +msgid "unable to move new alternates file into place"

5032 msgstr ""

5033

4856 -#: packfile.c:1907

5034 +#: object-file.c:713

5035 #, c-format

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

5036 +msgid "path '%s' does not exist"

5037 msgstr ""

5038

4861 -#: packfile.c:1911

5039 +#: object-file.c:734

5040 #, c-format

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

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

5042 msgstr ""

5043

4866 -#: parse-options-cb.c:20 parse-options-cb.c:24

5044 +#: object-file.c:740

5045 #, c-format

4868 -msgid "option `%s' expects a numerical value"

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

5047 msgstr ""

5048

4871 -#: parse-options-cb.c:41

5049 +#: object-file.c:746

5050 #, c-format

4873 -msgid "malformed expiration date '%s'"

5051 +msgid "reference repository '%s' is shallow"

5052 msgstr ""

5053

4876 -#: parse-options-cb.c:54

5054 +#: object-file.c:754

5055 #, c-format

4878 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5056 +msgid "reference repository '%s' is grafted"

5057 msgstr ""

5058

4881 -#: parse-options-cb.c:132 parse-options-cb.c:149

5059 +#: object-file.c:814

5060 #, c-format

4883 -msgid "malformed object name '%s'"

5061 +msgid "invalid line while parsing alternate refs: %s"

5062 msgstr ""

5063

4886 -#: parse-options.c:38

5064 +#: object-file.c:964

5065 #, c-format

4888 -msgid "%s requires a value"

5066 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5067 msgstr ""

5068

4891 -#: parse-options.c:73

4892 -#, c-format

4893 -msgid "%s is incompatible with %s"

5069 +#: object-file.c:985

5070 +msgid "mmap failed"

5071 msgstr ""

5072

4896 -#: parse-options.c:78

5073 +#: object-file.c:1149

5074 #, c-format

4898 -msgid "%s : incompatible with something else"

5075 +msgid "object file %s is empty"

5076 msgstr ""

5077

4901 -#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5078 +#: object-file.c:1284 object-file.c:2477

5079 #, c-format

4903 -msgid "%s takes no value"

5080 +msgid "corrupt loose object '%s'"

5081 msgstr ""

5082

4906 -#: parse-options.c:94

5083 +#: object-file.c:1286 object-file.c:2481

5084 #, c-format

4908 -msgid "%s isn't available"

5085 +msgid "garbage at end of loose object '%s'"

5086 msgstr ""

5087

4911 -#: parse-options.c:217

4912 -#, c-format

4913 -msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5088 +#: object-file.c:1328

5089 +msgid "invalid object type"

5090 msgstr ""

5091

4916 -#: parse-options.c:386

5092 +#: object-file.c:1412

5093 #, c-format

4918 -msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5094 +msgid "unable to unpack %s header with --allow-unknown-type"

5095 msgstr ""

5096

4921 -#: parse-options.c:420 parse-options.c:428

5097 +#: object-file.c:1415

5098 #, c-format

4923 -msgid "did you mean `--%s` (with two dashes)?"

5099 +msgid "unable to unpack %s header"

5100 msgstr ""

5101

4926 -#: parse-options.c:666 parse-options.c:971

5102 +#: object-file.c:1421

5103 #, c-format

4928 -msgid "alias of --%s"

5104 +msgid "unable to parse %s header with --allow-unknown-type"

5105 msgstr ""

5106

4931 -#: parse-options.c:862

5107 +#: object-file.c:1424

5108 #, c-format

4933 -msgid "unknown option `%s'"

5109 +msgid "unable to parse %s header"

5110 msgstr ""

5111

4936 -#: parse-options.c:864

5112 +#: object-file.c:1651

5113 #, c-format

4938 -msgid "unknown switch `%c'"

5114 +msgid "failed to read object %s"

5115 msgstr ""

5116

4941 -#: parse-options.c:866

5117 +#: object-file.c:1655

5118 #, c-format

4943 -msgid "unknown non-ascii option in string: `%s'"

5119 +msgid "replacement %s not found for %s"

5120 msgstr ""

5121

4946 -#: parse-options.c:890

4947 -msgid "..."

5122 +#: object-file.c:1659

5123 +#, c-format

5124 +msgid "loose object %s (stored in %s) is corrupt"

5125 msgstr ""

5126

4950 -#: parse-options.c:909

5127 +#: object-file.c:1663

5128 #, c-format

4952 -msgid "usage: %s"

5129 +msgid "packed object %s (stored in %s) is corrupt"

5130 msgstr ""

5131

4955 -#. TRANSLATORS: the colon here should align with the

4956 -#. one in "usage: %s" translation.

4957 -#.

4958 -#: parse-options.c:915

5132 +#: object-file.c:1768

5133 #, c-format

4960 -msgid " or: %s"

5134 +msgid "unable to write file %s"

5135 msgstr ""

5136

4963 -#: parse-options.c:918

5137 +#: object-file.c:1775

5138 #, c-format

4965 -msgid " %s"

5139 +msgid "unable to set permission to '%s'"

5140 msgstr ""

5141

4968 -#: parse-options.c:957

4969 -msgid "-NUM"

5142 +#: object-file.c:1782

5143 +msgid "file write error"

5144 msgstr ""

5145

4972 -#: path.c:915

4973 -#, c-format

4974 -msgid "Could not make %s writable by group"

5146 +#: object-file.c:1802

5147 +msgid "error when closing loose object file"

5148 msgstr ""

5149

4977 -#: pathspec.c:130

4978 -msgid "Escape character '\\' not allowed as last character in attr value"

5150 +#: object-file.c:1867

5151 +#, c-format

5152 +msgid "insufficient permission for adding an object to repository database %s"

5153 msgstr ""

5154

4981 -#: pathspec.c:148

4982 -msgid "Only one 'attr:' specification is allowed."

5155 +#: object-file.c:1869

5156 +msgid "unable to create temporary file"

5157 msgstr ""

5158

4985 -#: pathspec.c:151

4986 -msgid "attr spec must not be empty"

5159 +#: object-file.c:1893

5160 +msgid "unable to write loose object file"

5161 msgstr ""

5162

4989 -#: pathspec.c:194

5163 +#: object-file.c:1899

5164 #, c-format

4991 -msgid "invalid attribute name %s"

5165 +msgid "unable to deflate new object %s (%d)"

5166 msgstr ""

5167

4994 -#: pathspec.c:259

4995 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5168 +#: object-file.c:1903

5169 +#, c-format

5170 +msgid "deflateEnd on object %s failed (%d)"

5171 msgstr ""

5172

4998 -#: pathspec.c:266

4999 -msgid ""

5000 -"global 'literal' pathspec setting is incompatible with all other global "

5001 -"pathspec settings"

5173 +#: object-file.c:1907

5174 +#, c-format

5175 +msgid "confused by unstable object source data for %s"

5176 msgstr ""

5177

5004 -#: pathspec.c:306

5005 -msgid "invalid parameter for pathspec magic 'prefix'"

5178 +#: object-file.c:1917 builtin/pack-objects.c:1097

5179 +#, c-format

5180 +msgid "failed utime() on %s"

5181 msgstr ""

5182

5008 -#: pathspec.c:327

5183 +#: object-file.c:1994

5184 #, c-format

5010 -msgid "Invalid pathspec magic '%.*s' in '%s'"

5185 +msgid "cannot read object for %s"

5186 msgstr ""

5187

5013 -#: pathspec.c:332

5014 -#, c-format

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

5188 +#: object-file.c:2045

5189 +msgid "corrupt commit"

5190 msgstr ""

5191

5018 -#: pathspec.c:370

5019 -#, c-format

5020 -msgid "Unimplemented pathspec magic '%c' in '%s'"

5192 +#: object-file.c:2053

5193 +msgid "corrupt tag"

5194 msgstr ""

5195

5023 -#: pathspec.c:429

5196 +#: object-file.c:2153

5197 #, c-format

5025 -msgid "%s: 'literal' and 'glob' are incompatible"

5198 +msgid "read error while indexing %s"

5199 msgstr ""

5200

5028 -#: pathspec.c:445

5201 +#: object-file.c:2156

5202 #, c-format

5030 -msgid "%s: '%s' is outside repository at '%s'"

5203 +msgid "short read while indexing %s"

5204 msgstr ""

5205

5033 -#: pathspec.c:521

5206 +#: object-file.c:2229 object-file.c:2239

5207 #, c-format

5035 -msgid "'%s' (mnemonic: '%c')"

5208 +msgid "%s: failed to insert into database"

5209 msgstr ""

5210

5038 -#: pathspec.c:531

5211 +#: object-file.c:2245

5212 #, c-format

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

5213 +msgid "%s: unsupported file type"

5214 msgstr ""

5215

5043 -#: pathspec.c:598

5216 +#: object-file.c:2269

5217 #, c-format

5045 -msgid "pathspec '%s' is beyond a symbolic link"

5218 +msgid "%s is not a valid object"

5219 msgstr ""

5220

5048 -#: pathspec.c:643

5221 +#: object-file.c:2271

5222 #, c-format

5050 -msgid "line is badly quoted: %s"

5223 +msgid "%s is not a valid '%s' object"

5224 msgstr ""

5225

5053 -#: pkt-line.c:92

5054 -msgid "unable to write flush packet"

5226 +#: object-file.c:2298 builtin/index-pack.c:192

5227 +#, c-format

5228 +msgid "unable to open %s"

5229 msgstr ""

5230

5057 -#: pkt-line.c:99

5058 -msgid "unable to write delim packet"

5231 +#: object-file.c:2488 object-file.c:2541

5232 +#, c-format

5233 +msgid "hash mismatch for %s (expected %s)"

5234 msgstr ""

5235

5061 -#: pkt-line.c:106

5062 -msgid "unable to write stateless separator packet"

5236 +#: object-file.c:2512

5237 +#, c-format

5238 +msgid "unable to mmap %s"

5239 msgstr ""

5240

5065 -#: pkt-line.c:113

5066 -msgid "flush packet write failed"

5241 +#: object-file.c:2517

5242 +#, c-format

5243 +msgid "unable to unpack header of %s"

5244 msgstr ""

5245

5069 -#: pkt-line.c:153 pkt-line.c:239

5070 -msgid "protocol error: impossibly long line"

5246 +#: object-file.c:2523

5247 +#, c-format

5248 +msgid "unable to parse header of %s"

5249 msgstr ""

5250

5073 -#: pkt-line.c:169 pkt-line.c:171

5074 -msgid "packet write with format failed"

5251 +#: object-file.c:2534

5252 +#, c-format

5253 +msgid "unable to unpack contents of %s"

5254 msgstr ""

5255

5077 -#: pkt-line.c:203

5078 -msgid "packet write failed - data exceeds max packet size"

5256 +#: object-name.c:486

5257 +#, c-format

5258 +msgid "short object ID %s is ambiguous"

5259 msgstr ""

5260

5081 -#: pkt-line.c:210 pkt-line.c:217

5082 -msgid "packet write failed"

5261 +#: object-name.c:497

5262 +msgid "The candidates are:"

5263 msgstr ""

5264

5085 -#: pkt-line.c:302

5086 -msgid "read error"

5265 +#: object-name.c:796

5266 +msgid ""

5267 +"Git normally never creates a ref that ends with 40 hex characters\n"

5268 +"because it will be ignored when you just specify 40-hex. These refs\n"

5269 +"may be created by mistake. For example,\n"

5270 +"\n"

5271 +" git switch -c $br $(git rev-parse ...)\n"

5272 +"\n"

5273 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

5274 +"examine these refs and maybe delete them. Turn this message off by\n"

5275 +"running \"git config advice.objectNameWarning false\""

5276 msgstr ""

5277

5089 -#: pkt-line.c:310

5090 -msgid "the remote end hung up unexpectedly"

5278 +#: object-name.c:916

5279 +#, c-format

5280 +msgid "log for '%.*s' only goes back to %s"

5281 msgstr ""

5282

5093 -#: pkt-line.c:338

5283 +#: object-name.c:924

5284 #, c-format

5095 -msgid "protocol error: bad line length character: %.4s"

5285 +msgid "log for '%.*s' only has %d entries"

5286 msgstr ""

5287

5098 -#: pkt-line.c:352 pkt-line.c:357

5288 +#: object-name.c:1702

5289 #, c-format

5100 -msgid "protocol error: bad line length %d"

5290 +msgid "path '%s' exists on disk, but not in '%.*s'"

5291 msgstr ""

5292

5103 -#: pkt-line.c:373 sideband.c:165

5293 +#: object-name.c:1708

5294 #, c-format

5105 -msgid "remote error: %s"

5295 +msgid ""

5296 +"path '%s' exists, but not '%s'\n"

5297 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

5298 msgstr ""

5299

5108 -#: preload-index.c:119

5109 -msgid "Refreshing index"

5300 +#: object-name.c:1717

5301 +#, c-format

5302 +msgid "path '%s' does not exist in '%.*s'"

5303 msgstr ""

5304

5112 -#: preload-index.c:138

5305 +#: object-name.c:1745

5306 #, c-format

5114 -msgid "unable to create threaded lstat: %s"

5307 +msgid ""

5308 +"path '%s' is in the index, but not at stage %d\n"

5309 +"hint: Did you mean ':%d:%s'?"

5310 msgstr ""

5311

5117 -#: pretty.c:983

5118 -msgid "unable to parse --pretty format"

5312 +#: object-name.c:1761

5313 +#, c-format

5314 +msgid ""

5315 +"path '%s' is in the index, but not '%s'\n"

5316 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

5317 msgstr ""

5318

5121 -#: promisor-remote.c:30

5122 -msgid "promisor-remote: unable to fork off fetch subprocess"

5319 +#: object-name.c:1769

5320 +#, c-format

5321 +msgid "path '%s' exists on disk, but not in the index"

5322 msgstr ""

5323

5125 -#: promisor-remote.c:35 promisor-remote.c:37

5126 -msgid "promisor-remote: could not write to fetch subprocess"

5324 +#: object-name.c:1771

5325 +#, c-format

5326 +msgid "path '%s' does not exist (neither on disk nor in the index)"

5327 msgstr ""

5328

5129 -#: promisor-remote.c:41

5130 -msgid "promisor-remote: could not close stdin to fetch subprocess"

5329 +#: object-name.c:1784

5330 +msgid "relative path syntax can't be used outside working tree"

5331 msgstr ""

5332

5133 -#: promisor-remote.c:53

5333 +#: object-name.c:1922

5334 #, c-format

5135 -msgid "promisor remote name cannot begin with '/': %s"

5335 +msgid "invalid object name '%.*s'."

5336 msgstr ""

5337

5138 -#: prune-packed.c:35

5139 -msgid "Removing duplicate objects"

5338 +#: object.c:53

5339 +#, c-format

5340 +msgid "invalid object type \"%s\""

5341 msgstr ""

5342

5142 -#: range-diff.c:77

5143 -msgid "could not start `log`"

5343 +#: object.c:173

5344 +#, c-format

5345 +msgid "object %s is a %s, not a %s"

5346 msgstr ""

5347

5146 -#: range-diff.c:79

5147 -msgid "could not read `log` output"

5348 +#: object.c:233

5349 +#, c-format

5350 +msgid "object %s has unknown type id %d"

5351 msgstr ""

5352

5150 -#: range-diff.c:98 sequencer.c:5310

5353 +#: object.c:246

5354 #, c-format

5152 -msgid "could not parse commit '%s'"

5355 +msgid "unable to parse object: %s"

5356 msgstr ""

5357

5155 -#: range-diff.c:112

5358 +#: object.c:266 object.c:278

5359 #, c-format

5157 -msgid ""

5158 -"could not parse first line of `log` output: did not start with 'commit ': "

5159 -"'%s'"

5360 +msgid "hash mismatch %s"

5361 msgstr ""

5362

5162 -#: range-diff.c:137

5363 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5364 #, c-format

5164 -msgid "could not parse git header '%.*s'"

5365 +msgid "unable to get size of %s"

5366 msgstr ""

5367

5167 -#: range-diff.c:299

5168 -msgid "failed to generate diff"

5368 +#: pack-bitmap.c:1489 builtin/rev-list.c:92

5369 +#, c-format

5370 +msgid "unable to get disk usage of %s"

5371 msgstr ""

5372

5171 -#: range-diff.c:532 range-diff.c:534

5373 +#: pack-revindex.c:220

5374 #, c-format

5173 -msgid "could not parse log for '%s'"

5375 +msgid "reverse-index file %s is too small"

5376 msgstr ""

5377

5176 -#: read-cache.c:682

5378 +#: pack-revindex.c:225

5379 #, c-format

5178 -msgid "will not add file alias '%s' ('%s' already exists in index)"

5380 +msgid "reverse-index file %s is corrupt"

5381 msgstr ""

5382

5181 -#: read-cache.c:698

5182 -msgid "cannot create an empty blob in the object database"

5383 +#: pack-revindex.c:233

5384 +#, c-format

5385 +msgid "reverse-index file %s has unknown signature"

5386 msgstr ""

5387

5185 -#: read-cache.c:720

5388 +#: pack-revindex.c:237

5389 #, c-format

5187 -msgid "%s: can only add regular files, symbolic links or git-directories"

5390 +msgid "reverse-index file %s has unsupported version %<PRIu32>"

5391 msgstr ""

5392

5190 -#: read-cache.c:725

5393 +#: pack-revindex.c:242

5394 #, c-format

5192 -msgid "'%s' does not have a commit checked out"

5395 +msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5396 msgstr ""

5397

5195 -#: read-cache.c:777

5196 -#, c-format

5197 -msgid "unable to index file '%s'"

5398 +#: pack-write.c:236

5399 +msgid "cannot both write and verify reverse index"

5400 msgstr ""

5401

5200 -#: read-cache.c:796

5402 +#: pack-write.c:257

5403 #, c-format

5202 -msgid "unable to add '%s' to index"

5404 +msgid "could not stat: %s"

5405 msgstr ""

5406

5205 -#: read-cache.c:807

5407 +#: pack-write.c:269

5408 #, c-format

5207 -msgid "unable to stat '%s'"

5409 +msgid "failed to make %s readable"

5410 msgstr ""

5411

5210 -#: read-cache.c:1318

5412 +#: pack-write.c:502

5413 #, c-format

5212 -msgid "'%s' appears as both a file and as a directory"

5414 +msgid "could not write '%s' promisor file"

5415 msgstr ""

5416

5215 -#: read-cache.c:1524

5216 -msgid "Refresh index"

5417 +#: packfile.c:625

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

5419 msgstr ""

5420

5219 -#: read-cache.c:1639

5421 +#: packfile.c:1934

5422 #, c-format

5221 -msgid ""

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

5223 -"Using version %i"

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

5424 msgstr ""

5425

5226 -#: read-cache.c:1649

5426 +#: packfile.c:1938

5427 #, c-format

5228 -msgid ""

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

5230 -"Using version %i"

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

5429 msgstr ""

5430

5233 -#: read-cache.c:1705

5431 +#: parse-options-cb.c:20 parse-options-cb.c:24

5432 #, c-format

5235 -msgid "bad signature 0x%08x"

5433 +msgid "option `%s' expects a numerical value"

5434 msgstr ""

5435

5238 -#: read-cache.c:1708

5436 +#: parse-options-cb.c:41

5437 #, c-format

5240 -msgid "bad index version %d"

5241 -msgstr ""

5242 -

5243 -#: read-cache.c:1717

5244 -msgid "bad index file sha1 signature"

5438 +msgid "malformed expiration date '%s'"

5439 msgstr ""

5440

5247 -#: read-cache.c:1747

5441 +#: parse-options-cb.c:54

5442 #, c-format

5249 -msgid "index uses %.4s extension, which we do not understand"

5443 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5444 msgstr ""

5445

5252 -#: read-cache.c:1749

5446 +#: parse-options-cb.c:132 parse-options-cb.c:149

5447 #, c-format

5254 -msgid "ignoring %.4s extension"

5448 +msgid "malformed object name '%s'"

5449 msgstr ""

5450

5257 -#: read-cache.c:1786

5451 +#: parse-options.c:38

5452 #, c-format

5259 -msgid "unknown index entry format 0x%08x"

5453 +msgid "%s requires a value"

5454 msgstr ""

5455

5262 -#: read-cache.c:1802

5456 +#: parse-options.c:73

5457 #, c-format

5264 -msgid "malformed name field in the index, near path '%s'"

5458 +msgid "%s is incompatible with %s"

5459 msgstr ""

5460

5267 -#: read-cache.c:1859

5268 -msgid "unordered stage entries in index"

5461 +#: parse-options.c:78

5462 +#, c-format

5463 +msgid "%s : incompatible with something else"

5464 msgstr ""

5465

5271 -#: read-cache.c:1862

5466 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5467 #, c-format

5273 -msgid "multiple stage entries for merged file '%s'"

5468 +msgid "%s takes no value"

5469 msgstr ""

5470

5276 -#: read-cache.c:1865

5471 +#: parse-options.c:94

5472 #, c-format

5278 -msgid "unordered stage entries for '%s'"

5473 +msgid "%s isn't available"

5474 msgstr ""

5475

5281 -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5282 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5283 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5284 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5476 +#: parse-options.c:217

5477 +#, c-format

5478 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5479 +msgstr ""

5480 +

5481 +#: parse-options.c:386

5482 +#, c-format

5483 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5484 +msgstr ""

5485 +

5486 +#: parse-options.c:420 parse-options.c:428

5487 +#, c-format

5488 +msgid "did you mean `--%s` (with two dashes)?"

5489 +msgstr ""

5490 +

5491 +#: parse-options.c:666 parse-options.c:971

5492 +#, c-format

5493 +msgid "alias of --%s"

5494 +msgstr ""

5495 +

5496 +#: parse-options.c:862

5497 +#, c-format

5498 +msgid "unknown option `%s'"

5499 +msgstr ""

5500 +

5501 +#: parse-options.c:864

5502 +#, c-format

5503 +msgid "unknown switch `%c'"

5504 +msgstr ""

5505 +

5506 +#: parse-options.c:866

5507 +#, c-format

5508 +msgid "unknown non-ascii option in string: `%s'"

5509 +msgstr ""

5510 +

5511 +#: parse-options.c:890

5512 +msgid "..."

5513 +msgstr ""

5514 +

5515 +#: parse-options.c:909

5516 +#, c-format

5517 +msgid "usage: %s"

5518 +msgstr ""

5519 +

5520 +#. TRANSLATORS: the colon here should align with the

5521 +#. one in "usage: %s" translation.

5522 +#.

5523 +#: parse-options.c:915

5524 +#, c-format

5525 +msgid " or: %s"

5526 +msgstr ""

5527 +

5528 +#: parse-options.c:918

5529 +#, c-format

5530 +msgid " %s"

5531 +msgstr ""

5532 +

5533 +#: parse-options.c:957

5534 +msgid "-NUM"

5535 +msgstr ""

5536 +

5537 +#: path.c:915

5538 +#, c-format

5539 +msgid "Could not make %s writable by group"

5540 +msgstr ""

5541 +

5542 +#: pathspec.c:130

5543 +msgid "Escape character '\\' not allowed as last character in attr value"

5544 +msgstr ""

5545 +

5546 +#: pathspec.c:148

5547 +msgid "Only one 'attr:' specification is allowed."

5548 +msgstr ""

5549 +

5550 +#: pathspec.c:151

5551 +msgid "attr spec must not be empty"

5552 +msgstr ""

5553 +

5554 +#: pathspec.c:194

5555 +#, c-format

5556 +msgid "invalid attribute name %s"

5557 +msgstr ""

5558 +

5559 +#: pathspec.c:259

5560 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5561 +msgstr ""

5562 +

5563 +#: pathspec.c:266

5564 +msgid ""

5565 +"global 'literal' pathspec setting is incompatible with all other global "

5566 +"pathspec settings"

5567 +msgstr ""

5568 +

5569 +#: pathspec.c:306

5570 +msgid "invalid parameter for pathspec magic 'prefix'"

5571 +msgstr ""

5572 +

5573 +#: pathspec.c:327

5574 +#, c-format

5575 +msgid "Invalid pathspec magic '%.*s' in '%s'"

5576 +msgstr ""

5577 +

5578 +#: pathspec.c:332

5579 +#, c-format

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

5581 +msgstr ""

5582 +

5583 +#: pathspec.c:370

5584 +#, c-format

5585 +msgid "Unimplemented pathspec magic '%c' in '%s'"

5586 +msgstr ""

5587 +

5588 +#: pathspec.c:429

5589 +#, c-format

5590 +msgid "%s: 'literal' and 'glob' are incompatible"

5591 +msgstr ""

5592 +

5593 +#: pathspec.c:445

5594 +#, c-format

5595 +msgid "%s: '%s' is outside repository at '%s'"

5596 +msgstr ""

5597 +

5598 +#: pathspec.c:521

5599 +#, c-format

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

5601 +msgstr ""

5602 +

5603 +#: pathspec.c:531

5604 +#, c-format

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

5606 +msgstr ""

5607 +

5608 +#: pathspec.c:598

5609 +#, c-format

5610 +msgid "pathspec '%s' is beyond a symbolic link"

5611 +msgstr ""

5612 +

5613 +#: pathspec.c:643

5614 +#, c-format

5615 +msgid "line is badly quoted: %s"

5616 +msgstr ""

5617 +

5618 +#: pkt-line.c:92

5619 +msgid "unable to write flush packet"

5620 +msgstr ""

5621 +

5622 +#: pkt-line.c:99

5623 +msgid "unable to write delim packet"

5624 +msgstr ""

5625 +

5626 +#: pkt-line.c:106

5627 +msgid "unable to write stateless separator packet"

5628 +msgstr ""

5629 +

5630 +#: pkt-line.c:113

5631 +msgid "flush packet write failed"

5632 +msgstr ""

5633 +

5634 +#: pkt-line.c:153 pkt-line.c:239

5635 +msgid "protocol error: impossibly long line"

5636 +msgstr ""

5637 +

5638 +#: pkt-line.c:169 pkt-line.c:171

5639 +msgid "packet write with format failed"

5640 +msgstr ""

5641 +

5642 +#: pkt-line.c:203

5643 +msgid "packet write failed - data exceeds max packet size"

5644 +msgstr ""

5645 +

5646 +#: pkt-line.c:210 pkt-line.c:217

5647 +msgid "packet write failed"

5648 +msgstr ""

5649 +

5650 +#: pkt-line.c:302

5651 +msgid "read error"

5652 +msgstr ""

5653 +

5654 +#: pkt-line.c:310

5655 +msgid "the remote end hung up unexpectedly"

5656 +msgstr ""

5657 +

5658 +#: pkt-line.c:338

5659 +#, c-format

5660 +msgid "protocol error: bad line length character: %.4s"

5661 +msgstr ""

5662 +

5663 +#: pkt-line.c:352 pkt-line.c:357

5664 +#, c-format

5665 +msgid "protocol error: bad line length %d"

5666 +msgstr ""

5667 +

5668 +#: pkt-line.c:373 sideband.c:165

5669 +#, c-format

5670 +msgid "remote error: %s"

5671 +msgstr ""

5672 +

5673 +#: preload-index.c:119

5674 +msgid "Refreshing index"

5675 +msgstr ""

5676 +

5677 +#: preload-index.c:138

5678 +#, c-format

5679 +msgid "unable to create threaded lstat: %s"

5680 +msgstr ""

5681 +

5682 +#: pretty.c:984

5683 +msgid "unable to parse --pretty format"

5684 +msgstr ""

5685 +

5686 +#: promisor-remote.c:30

5687 +msgid "promisor-remote: unable to fork off fetch subprocess"

5688 +msgstr ""

5689 +

5690 +#: promisor-remote.c:35 promisor-remote.c:37

5691 +msgid "promisor-remote: could not write to fetch subprocess"

5692 +msgstr ""

5693 +

5694 +#: promisor-remote.c:41

5695 +msgid "promisor-remote: could not close stdin to fetch subprocess"

5696 +msgstr ""

5697 +

5698 +#: promisor-remote.c:53

5699 +#, c-format

5700 +msgid "promisor remote name cannot begin with '/': %s"

5701 +msgstr ""

5702 +

5703 +#: prune-packed.c:35

5704 +msgid "Removing duplicate objects"

5705 +msgstr ""

5706 +

5707 +#: range-diff.c:78

5708 +msgid "could not start `log`"

5709 +msgstr ""

5710 +

5711 +#: range-diff.c:80

5712 +msgid "could not read `log` output"

5713 +msgstr ""

5714 +

5715 +#: range-diff.c:101 sequencer.c:5318

5716 +#, c-format

5717 +msgid "could not parse commit '%s'"

5718 +msgstr ""

5719 +

5720 +#: range-diff.c:115

5721 +#, c-format

5722 +msgid ""

5723 +"could not parse first line of `log` output: did not start with 'commit ': "

5724 +"'%s'"

5725 +msgstr ""

5726 +

5727 +#: range-diff.c:140

5728 +#, c-format

5729 +msgid "could not parse git header '%.*s'"

5730 +msgstr ""

5731 +

5732 +#: range-diff.c:306

5733 +msgid "failed to generate diff"

5734 +msgstr ""

5735 +

5736 +#: range-diff.c:558

5737 +msgid "--left-only and --right-only are mutually exclusive"

5738 +msgstr ""

5739 +

5740 +#: range-diff.c:561 range-diff.c:563

5741 +#, c-format

5742 +msgid "could not parse log for '%s'"

5743 +msgstr ""

5744 +

5745 +#: read-cache.c:682

5746 +#, c-format

5747 +msgid "will not add file alias '%s' ('%s' already exists in index)"

5748 +msgstr ""

5749 +

5750 +#: read-cache.c:698

5751 +msgid "cannot create an empty blob in the object database"

5752 +msgstr ""

5753 +

5754 +#: read-cache.c:720

5755 +#, c-format

5756 +msgid "%s: can only add regular files, symbolic links or git-directories"

5757 +msgstr ""

5758 +

5759 +#: read-cache.c:725

5760 +#, c-format

5761 +msgid "'%s' does not have a commit checked out"

5762 +msgstr ""

5763 +

5764 +#: read-cache.c:777

5765 +#, c-format

5766 +msgid "unable to index file '%s'"

5767 +msgstr ""

5768 +

5769 +#: read-cache.c:796

5770 +#, c-format

5771 +msgid "unable to add '%s' to index"

5772 +msgstr ""

5773 +

5774 +#: read-cache.c:807

5775 +#, c-format

5776 +msgid "unable to stat '%s'"

5777 +msgstr ""

5778 +

5779 +#: read-cache.c:1318

5780 +#, c-format

5781 +msgid "'%s' appears as both a file and as a directory"

5782 +msgstr ""

5783 +

5784 +#: read-cache.c:1524

5785 +msgid "Refresh index"

5786 +msgstr ""

5787 +

5788 +#: read-cache.c:1639

5789 +#, c-format

5790 +msgid ""

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

5792 +"Using version %i"

5793 +msgstr ""

5794 +

5795 +#: read-cache.c:1649

5796 +#, c-format

5797 +msgid ""

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

5799 +"Using version %i"

5800 +msgstr ""

5801 +

5802 +#: read-cache.c:1705

5803 +#, c-format

5804 +msgid "bad signature 0x%08x"

5805 +msgstr ""

5806 +

5807 +#: read-cache.c:1708

5808 +#, c-format

5809 +msgid "bad index version %d"

5810 +msgstr ""

5811 +

5812 +#: read-cache.c:1717

5813 +msgid "bad index file sha1 signature"

5814 +msgstr ""

5815 +

5816 +#: read-cache.c:1747

5817 +#, c-format

5818 +msgid "index uses %.4s extension, which we do not understand"

5819 +msgstr ""

5820 +

5821 +#: read-cache.c:1749

5822 +#, c-format

5823 +msgid "ignoring %.4s extension"

5824 +msgstr ""

5825 +

5826 +#: read-cache.c:1786

5827 +#, c-format

5828 +msgid "unknown index entry format 0x%08x"

5829 +msgstr ""

5830 +

5831 +#: read-cache.c:1802

5832 +#, c-format

5833 +msgid "malformed name field in the index, near path '%s'"

5834 +msgstr ""

5835 +

5836 +#: read-cache.c:1859

5837 +msgid "unordered stage entries in index"

5838 +msgstr ""

5839 +

5840 +#: read-cache.c:1862

5841 +#, c-format

5842 +msgid "multiple stage entries for merged file '%s'"

5843 +msgstr ""

5844 +

5845 +#: read-cache.c:1865

5846 +#, c-format

5847 +msgid "unordered stage entries for '%s'"

5848 +msgstr ""

5849 +

5850 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095

5851 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

5852 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

5853 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

5854 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5855 #: builtin/submodule--helper.c:332

5856 msgid "index file corrupt"

@@ -5337,12 +5906,12 @@ msgstr ""

5906 msgid "broken index, expect %s in %s, got %s"

5907 msgstr ""

5908

5340 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5909 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

5910 #, c-format

5911 msgid "could not close '%s'"

5912 msgstr ""

5913

5345 -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5914 +#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239

5915 #, c-format

5916 msgid "could not stat '%s'"

5917 msgstr ""

@@ -5437,14 +6006,14 @@ msgid ""

6006 "\n"

6007 msgstr ""

6008

5440 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5441 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

6009 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615

6010 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272

6011 #, c-format

6012 msgid "could not write '%s'"

6013 msgstr ""

6014

5446 -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5447 -#: builtin/rebase.c:252

6015 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230

6016 +#: builtin/rebase.c:254

6017 #, c-format

6018 msgid "could not write '%s'."

6019 msgstr ""

@@ -5467,14 +6036,14 @@ msgid ""

6036 "\n"

6037 msgstr ""

6038

5470 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5471 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5472 -#: builtin/rebase.c:264

6039 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402

6040 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241

6041 +#: builtin/rebase.c:266

6042 #, c-format

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

6044 msgstr ""

6045

5477 -#: ref-filter.c:42 wt-status.c:1973

6046 +#: ref-filter.c:42 wt-status.c:1975

6047 msgid "gone"

6048 msgstr ""

6049

@@ -5664,23 +6233,33 @@ msgstr ""

6233 msgid "malformed format string %s"

6234 msgstr ""

6235

5667 -#: ref-filter.c:1549

6236 +#: ref-filter.c:1551

6237 +#, c-format

6238 +msgid "(no branch, rebasing %s)"

6239 +msgstr ""

6240 +

6241 +#: ref-filter.c:1554

6242 +#, c-format

6243 +msgid "(no branch, rebasing detached HEAD %s)"

6244 +msgstr ""

6245 +

6246 +#: ref-filter.c:1557

6247 #, c-format

5669 -msgid "no branch, rebasing %s"

6248 +msgid "(no branch, bisect started on %s)"

6249 msgstr ""

6250

5672 -#: ref-filter.c:1552

6251 +#: ref-filter.c:1561

6252 #, c-format

5674 -msgid "no branch, rebasing detached HEAD %s"

6253 +msgid "(HEAD detached at %s)"

6254 msgstr ""

6255

5677 -#: ref-filter.c:1555

6256 +#: ref-filter.c:1564

6257 #, c-format

5679 -msgid "no branch, bisect started on %s"

6258 +msgid "(HEAD detached from %s)"

6259 msgstr ""

6260

5682 -#: ref-filter.c:1565

5683 -msgid "no branch"

6261 +#: ref-filter.c:1567

6262 +msgid "(no branch)"

6263 msgstr ""

6264

6265 #: ref-filter.c:1599 ref-filter.c:1808

@@ -5693,32 +6272,32 @@ msgstr ""

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

6273 msgstr ""

6274

5696 -#: ref-filter.c:2062

6275 +#: ref-filter.c:1992

6276 #, c-format

6277 msgid "malformed object at '%s'"

6278 msgstr ""

6279

5701 -#: ref-filter.c:2151

6280 +#: ref-filter.c:2081

6281 #, c-format

6282 msgid "ignoring ref with broken name %s"

6283 msgstr ""

6284

5706 -#: ref-filter.c:2156 refs.c:676

6285 +#: ref-filter.c:2086 refs.c:676

6286 #, c-format

6287 msgid "ignoring broken ref %s"

6288 msgstr ""

6289

5711 -#: ref-filter.c:2472

6290 +#: ref-filter.c:2426

6291 #, c-format

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

6293 msgstr ""

6294

5716 -#: ref-filter.c:2571

6295 +#: ref-filter.c:2525

6296 #, c-format

6297 msgid "malformed object name %s"

6298 msgstr ""

6299

5721 -#: ref-filter.c:2576

6300 +#: ref-filter.c:2530

6301 #, c-format

6302 msgid "option `%s' must point to a commit"

6303 msgstr ""

@@ -5758,50 +6337,50 @@ msgstr ""

6337 msgid "ignoring dangling symref %s"

6338 msgstr ""

6339

5761 -#: refs.c:911

6340 +#: refs.c:922

6341 #, c-format

6342 msgid "log for ref %s has gap after %s"

6343 msgstr ""

6344

5766 -#: refs.c:917

6345 +#: refs.c:929

6346 #, c-format

6347 msgid "log for ref %s unexpectedly ended on %s"

6348 msgstr ""

6349

5771 -#: refs.c:976

6350 +#: refs.c:994

6351 #, c-format

6352 msgid "log for %s is empty"

6353 msgstr ""

6354

5776 -#: refs.c:1068

6355 +#: refs.c:1086

6356 #, c-format

6357 msgid "refusing to update ref with bad name '%s'"

6358 msgstr ""

6359

5781 -#: refs.c:1139

6360 +#: refs.c:1157

6361 #, c-format

6362 msgid "update_ref failed for ref '%s': %s"

6363 msgstr ""

6364

5786 -#: refs.c:1963

6365 +#: refs.c:2051

6366 #, c-format

6367 msgid "multiple updates for ref '%s' not allowed"

6368 msgstr ""

6369

5791 -#: refs.c:2043

6370 +#: refs.c:2131

6371 msgid "ref updates forbidden inside quarantine environment"

6372 msgstr ""

6373

5795 -#: refs.c:2054

6374 +#: refs.c:2142

6375 msgid "ref updates aborted by hook"

6376 msgstr ""

6377

5799 -#: refs.c:2154 refs.c:2184

6378 +#: refs.c:2242 refs.c:2272

6379 #, c-format

6380 msgid "'%s' exists; cannot create '%s'"

6381 msgstr ""

6382

5804 -#: refs.c:2160 refs.c:2195

6383 +#: refs.c:2248 refs.c:2283

6384 #, c-format

6385 msgid "cannot process '%s' and '%s' at the same time"

6386 msgstr ""

@@ -5865,12 +6444,12 @@ msgstr ""

6444 msgid "value '%s' of pattern has no '*'"

6445 msgstr ""

6446

5868 -#: remote.c:1073

6447 +#: remote.c:1083

6448 #, c-format

6449 msgid "src refspec %s does not match any"

6450 msgstr ""

6451

5873 -#: remote.c:1078

6452 +#: remote.c:1088

6453 #, c-format

6454 msgid "src refspec %s matches more than one"

6455 msgstr ""

@@ -5879,7 +6458,7 @@ msgstr ""

6458 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6459 #. the <src>.

6460 #.

5882 -#: remote.c:1093

6461 +#: remote.c:1103

6462 #, c-format

6463 msgid ""

6464 "The destination you provided is not a full refname (i.e.,\n"

@@ -5893,7 +6472,7 @@ msgid ""

6472 "Neither worked, so we gave up. You must fully qualify the ref."

6473 msgstr ""

6474

5896 -#: remote.c:1113

6475 +#: remote.c:1123

6476 #, c-format

6477 msgid ""

6478 "The <src> part of the refspec is a commit object.\n"

@@ -5901,7 +6480,7 @@ msgid ""

6480 "'%s:refs/heads/%s'?"

6481 msgstr ""

6482

5904 -#: remote.c:1118

6483 +#: remote.c:1128

6484 #, c-format

6485 msgid ""

6486 "The <src> part of the refspec is a tag object.\n"

@@ -5909,7 +6488,7 @@ msgid ""

6488 "'%s:refs/tags/%s'?"

6489 msgstr ""

6490

5912 -#: remote.c:1123

6491 +#: remote.c:1133

6492 #, c-format

6493 msgid ""

6494 "The <src> part of the refspec is a tree object.\n"

@@ -5917,7 +6496,7 @@ msgid ""

6496 "'%s:refs/tags/%s'?"

6497 msgstr ""

6498

5920 -#: remote.c:1128

6499 +#: remote.c:1138

6500 #, c-format

6501 msgid ""

6502 "The <src> part of the refspec is a blob object.\n"

@@ -5925,114 +6504,114 @@ msgid ""

6504 "'%s:refs/tags/%s'?"

6505 msgstr ""

6506

5928 -#: remote.c:1164

6507 +#: remote.c:1174

6508 #, c-format

6509 msgid "%s cannot be resolved to branch"

6510 msgstr ""

6511

5933 -#: remote.c:1175

6512 +#: remote.c:1185

6513 #, c-format

6514 msgid "unable to delete '%s': remote ref does not exist"

6515 msgstr ""

6516

5938 -#: remote.c:1187

6517 +#: remote.c:1197

6518 #, c-format

6519 msgid "dst refspec %s matches more than one"

6520 msgstr ""

6521

5943 -#: remote.c:1194

6522 +#: remote.c:1204

6523 #, c-format

6524 msgid "dst ref %s receives from more than one src"

6525 msgstr ""

6526

5948 -#: remote.c:1714 remote.c:1815

6527 +#: remote.c:1724 remote.c:1825

6528 msgid "HEAD does not point to a branch"

6529 msgstr ""

6530

5952 -#: remote.c:1723

6531 +#: remote.c:1733

6532 #, c-format

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

6534 msgstr ""

6535

5957 -#: remote.c:1726

6536 +#: remote.c:1736

6537 #, c-format

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

6539 msgstr ""

6540

5962 -#: remote.c:1732

6541 +#: remote.c:1742

6542 #, c-format

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

6544 msgstr ""

6545

5967 -#: remote.c:1747

6546 +#: remote.c:1757

6547 #, c-format

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

6549 msgstr ""

6550

5972 -#: remote.c:1759

6551 +#: remote.c:1769

6552 #, c-format

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

6554 msgstr ""

6555

5977 -#: remote.c:1769

6556 +#: remote.c:1779

6557 #, c-format

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

6559 msgstr ""

6560

5982 -#: remote.c:1782

6561 +#: remote.c:1792

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

6563 msgstr ""

6564

5986 -#: remote.c:1804

6565 +#: remote.c:1814

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

6567 msgstr ""

6568

5990 -#: remote.c:1933

6569 +#: remote.c:1943

6570 #, c-format

6571 msgid "couldn't find remote ref %s"

6572 msgstr ""

6573

5995 -#: remote.c:1946

6574 +#: remote.c:1956

6575 #, c-format

6576 msgid "* Ignoring funny ref '%s' locally"

6577 msgstr ""

6578

6000 -#: remote.c:2109

6579 +#: remote.c:2119

6580 #, c-format

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

6582 msgstr ""

6583

6005 -#: remote.c:2113

6584 +#: remote.c:2123

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

6586 msgstr ""

6587

6009 -#: remote.c:2116

6588 +#: remote.c:2126

6589 #, c-format

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

6591 msgstr ""

6592

6014 -#: remote.c:2120

6593 +#: remote.c:2130

6594 #, c-format

6595 msgid "Your branch and '%s' refer to different commits.\n"

6596 msgstr ""

6597

6019 -#: remote.c:2123

6598 +#: remote.c:2133

6599 #, c-format

6600 msgid " (use \"%s\" for details)\n"

6601 msgstr ""

6602

6024 -#: remote.c:2127

6603 +#: remote.c:2137

6604 #, c-format

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

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

6607 msgstr[0] ""

6608 msgstr[1] ""

6609

6031 -#: remote.c:2133

6610 +#: remote.c:2143

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

6612 msgstr ""

6613

6035 -#: remote.c:2136

6614 +#: remote.c:2146

6615 #, c-format

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

6617 msgid_plural ""

@@ -6040,11 +6619,11 @@ msgid_plural ""

6619 msgstr[0] ""

6620 msgstr[1] ""

6621

6043 -#: remote.c:2144

6622 +#: remote.c:2154

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

6624 msgstr ""

6625

6047 -#: remote.c:2147

6626 +#: remote.c:2157

6627 #, c-format

6628 msgid ""

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

@@ -6055,11 +6634,11 @@ msgid_plural ""

6634 msgstr[0] ""

6635 msgstr[1] ""

6636

6058 -#: remote.c:2157

6637 +#: remote.c:2167

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

6639 msgstr ""

6640

6062 -#: remote.c:2349

6641 +#: remote.c:2359

6642 #, c-format

6643 msgid "cannot parse expected object name '%s'"

6644 msgstr ""

@@ -6079,96 +6658,96 @@ msgstr ""

6658 msgid "replace depth too high for object %s"

6659 msgstr ""

6660

6082 -#: rerere.c:217 rerere.c:226 rerere.c:229

6661 +#: rerere.c:201 rerere.c:210 rerere.c:213

6662 msgid "corrupt MERGE_RR"

6663 msgstr ""

6664

6086 -#: rerere.c:264 rerere.c:269

6665 +#: rerere.c:248 rerere.c:253

6666 msgid "unable to write rerere record"

6667 msgstr ""

6668

6090 -#: rerere.c:495

6669 +#: rerere.c:479

6670 #, c-format

6671 msgid "there were errors while writing '%s' (%s)"

6672 msgstr ""

6673

6095 -#: rerere.c:498

6674 +#: rerere.c:482

6675 #, c-format

6676 msgid "failed to flush '%s'"

6677 msgstr ""

6678

6100 -#: rerere.c:503 rerere.c:1039

6679 +#: rerere.c:487 rerere.c:1023

6680 #, c-format

6681 msgid "could not parse conflict hunks in '%s'"

6682 msgstr ""

6683

6105 -#: rerere.c:684

6684 +#: rerere.c:668

6685 #, c-format

6686 msgid "failed utime() on '%s'"

6687 msgstr ""

6688

6110 -#: rerere.c:694

6689 +#: rerere.c:678

6690 #, c-format

6691 msgid "writing '%s' failed"

6692 msgstr ""

6693

6115 -#: rerere.c:714

6694 +#: rerere.c:698

6695 #, c-format

6696 msgid "Staged '%s' using previous resolution."

6697 msgstr ""

6698

6120 -#: rerere.c:753

6699 +#: rerere.c:737

6700 #, c-format

6701 msgid "Recorded resolution for '%s'."

6702 msgstr ""

6703

6125 -#: rerere.c:788

6704 +#: rerere.c:772

6705 #, c-format

6706 msgid "Resolved '%s' using previous resolution."

6707 msgstr ""

6708

6130 -#: rerere.c:803

6709 +#: rerere.c:787

6710 #, c-format

6711 msgid "cannot unlink stray '%s'"

6712 msgstr ""

6713

6135 -#: rerere.c:807

6714 +#: rerere.c:791

6715 #, c-format

6716 msgid "Recorded preimage for '%s'"

6717 msgstr ""

6718

6140 -#: rerere.c:881 submodule.c:2082 builtin/log.c:1992

6719 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991

6720 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6721 #, c-format

6722 msgid "could not create directory '%s'"

6723 msgstr ""

6724

6146 -#: rerere.c:1057

6725 +#: rerere.c:1041

6726 #, c-format

6727 msgid "failed to update conflicted state in '%s'"

6728 msgstr ""

6729

6151 -#: rerere.c:1068 rerere.c:1075

6730 +#: rerere.c:1052 rerere.c:1059

6731 #, c-format

6732 msgid "no remembered resolution for '%s'"

6733 msgstr ""

6734

6156 -#: rerere.c:1077

6735 +#: rerere.c:1061

6736 #, c-format

6737 msgid "cannot unlink '%s'"

6738 msgstr ""

6739

6161 -#: rerere.c:1087

6740 +#: rerere.c:1071

6741 #, c-format

6742 msgid "Updated preimage for '%s'"

6743 msgstr ""

6744

6166 -#: rerere.c:1096

6745 +#: rerere.c:1080

6746 #, c-format

6747 msgid "Forgot resolution for '%s'\n"

6748 msgstr ""

6749

6171 -#: rerere.c:1199

6750 +#: rerere.c:1191

6751 msgid "unable to open rr-cache directory"

6752 msgstr ""

6753

@@ -6176,43 +6755,38 @@ msgstr ""

6755 msgid "could not determine HEAD revision"

6756 msgstr ""

6757

6179 -#: reset.c:70 reset.c:76 sequencer.c:3460

6758 +#: reset.c:70 reset.c:76 sequencer.c:3468

6759 #, c-format

6760 msgid "failed to find tree of %s"

6761 msgstr ""

6762

6184 -#: revision.c:2336

6763 +#: revision.c:2338

6764 msgid "--unpacked=<packfile> no longer supported"

6765 msgstr ""

6766

6188 -#: revision.c:2356

6189 -#, c-format

6190 -msgid "unknown value for --diff-merges: %s"

6191 -msgstr ""

6192 -

6193 -#: revision.c:2694

6767 +#: revision.c:2668

6768 msgid "your current branch appears to be broken"

6769 msgstr ""

6770

6197 -#: revision.c:2697

6771 +#: revision.c:2671

6772 #, c-format

6773 msgid "your current branch '%s' does not have any commits yet"

6774 msgstr ""

6775

6202 -#: revision.c:2907

6776 +#: revision.c:2877

6777 msgid "-L does not yet support diff formats besides -p and -s"

6778 msgstr ""

6779

6206 -#: run-command.c:764

6780 +#: run-command.c:767

6781 msgid "open /dev/null failed"

6782 msgstr ""

6783

6210 -#: run-command.c:1271

6784 +#: run-command.c:1274

6785 #, c-format

6786 msgid "cannot create async thread: %s"

6787 msgstr ""

6788

6215 -#: run-command.c:1335

6789 +#: run-command.c:1338

6790 #, c-format

6791 msgid ""

6792 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6269,7 +6843,7 @@ msgstr ""

6843 msgid "could not delete '%s'"

6844 msgstr ""

6845

6272 -#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385

6846 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385

6847 #, c-format

6848 msgid "could not remove '%s'"

6849 msgstr ""

@@ -6300,1279 +6874,943 @@ msgstr ""

6874 #: sequencer.c:421

6875 msgid ""

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

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

6304 -"and commit the result with 'git commit'"

6305 -msgstr ""

6306 -

6307 -#: sequencer.c:434 sequencer.c:3062

6308 -#, c-format

6309 -msgid "could not lock '%s'"

6310 -msgstr ""

6311 -

6312 -#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080

6313 -#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631

6314 -#, c-format

6315 -msgid "could not write to '%s'"

6316 -msgstr ""

6317 -

6318 -#: sequencer.c:441

6319 -#, c-format

6320 -msgid "could not write eol to '%s'"

6321 -msgstr ""

6322 -

6323 -#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082

6324 -#: sequencer.c:3345

6325 -#, c-format

6326 -msgid "failed to finalize '%s'"

6327 -msgstr ""

6328 -

6329 -#: sequencer.c:485

6330 -#, c-format

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

6332 -msgstr ""

6333 -

6334 -#: sequencer.c:489

6335 -msgid "commit your changes or stash them to proceed."

6336 -msgstr ""

6337 -

6338 -#: sequencer.c:521

6339 -#, c-format

6340 -msgid "%s: fast-forward"

6341 -msgstr ""

6342 -

6343 -#: sequencer.c:560 builtin/tag.c:566

6344 -#, c-format

6345 -msgid "Invalid cleanup mode %s"

6346 -msgstr ""

6347 -

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

6349 -#. "rebase".

6350 -#.

6351 -#: sequencer.c:670

6352 -#, c-format

6353 -msgid "%s: Unable to write new index file"

6354 -msgstr ""

6355 -

6356 -#: sequencer.c:687

6357 -msgid "unable to update cache tree"

6358 -msgstr ""

6359 -

6360 -#: sequencer.c:701

6361 -msgid "could not resolve HEAD commit"

6362 -msgstr ""

6363 -

6364 -#: sequencer.c:781

6365 -#, c-format

6366 -msgid "no key present in '%.*s'"

6367 -msgstr ""

6368 -

6369 -#: sequencer.c:792

6370 -#, c-format

6371 -msgid "unable to dequote value of '%s'"

6372 -msgstr ""

6373 -

6374 -#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710

6375 -#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908

6376 -#, c-format

6377 -msgid "could not open '%s' for reading"

6378 -msgstr ""

6379 -

6380 -#: sequencer.c:839

6381 -msgid "'GIT_AUTHOR_NAME' already given"

6382 -msgstr ""

6383 -

6384 -#: sequencer.c:844

6385 -msgid "'GIT_AUTHOR_EMAIL' already given"

6386 -msgstr ""

6387 -

6388 -#: sequencer.c:849

6389 -msgid "'GIT_AUTHOR_DATE' already given"

6390 -msgstr ""

6391 -

6392 -#: sequencer.c:853

6393 -#, c-format

6394 -msgid "unknown variable '%s'"

6395 -msgstr ""

6396 -

6397 -#: sequencer.c:858

6398 -msgid "missing 'GIT_AUTHOR_NAME'"

6399 -msgstr ""

6400 -

6401 -#: sequencer.c:860

6402 -msgid "missing 'GIT_AUTHOR_EMAIL'"

6403 -msgstr ""

6404 -

6405 -#: sequencer.c:862

6406 -msgid "missing 'GIT_AUTHOR_DATE'"

6407 -msgstr ""

6408 -

6409 -#: sequencer.c:927

6410 -#, c-format

6411 -msgid ""

6412 -"you have staged changes in your working tree\n"

6413 -"If these changes are meant to be squashed into the previous commit, run:\n"

6414 -"\n"

6415 -" git commit --amend %s\n"

6416 -"\n"

6417 -"If they are meant to go into a new commit, run:\n"

6418 -"\n"

6419 -" git commit %s\n"

6420 -"\n"

6421 -"In both cases, once you're done, continue with:\n"

6422 -"\n"

6423 -" git rebase --continue\n"

6424 -msgstr ""

6425 -

6426 -#: sequencer.c:1208

6427 -msgid "'prepare-commit-msg' hook failed"

6428 -msgstr ""

6429 -

6430 -#: sequencer.c:1214

6431 -msgid ""

6432 -"Your name and email address were configured automatically based\n"

6433 -"on your username and hostname. Please check that they are accurate.\n"

6434 -"You can suppress this message by setting them explicitly. Run the\n"

6435 -"following command and follow the instructions in your editor to edit\n"

6436 -"your configuration file:\n"

6437 -"\n"

6438 -" git config --global --edit\n"

6439 -"\n"

6440 -"After doing this, you may fix the identity used for this commit with:\n"

6441 -"\n"

6442 -" git commit --amend --reset-author\n"

6443 -msgstr ""

6444 -

6445 -#: sequencer.c:1227

6446 -msgid ""

6447 -"Your name and email address were configured automatically based\n"

6448 -"on your username and hostname. Please check that they are accurate.\n"

6449 -"You can suppress this message by setting them explicitly:\n"

6450 -"\n"

6451 -" git config --global user.name \"Your Name\"\n"

6452 -" git config --global user.email you@example.com\n"

6453 -"\n"

6454 -"After doing this, you may fix the identity used for this commit with:\n"

6455 -"\n"

6456 -" git commit --amend --reset-author\n"

6457 -msgstr ""

6458 -

6459 -#: sequencer.c:1269

6460 -msgid "couldn't look up newly created commit"

6461 -msgstr ""

6462 -

6463 -#: sequencer.c:1271

6464 -msgid "could not parse newly created commit"

6465 -msgstr ""

6466 -

6467 -#: sequencer.c:1317

6468 -msgid "unable to resolve HEAD after creating commit"

6469 -msgstr ""

6470 -

6471 -#: sequencer.c:1319

6472 -msgid "detached HEAD"

6473 -msgstr ""

6474 -

6475 -#: sequencer.c:1323

6476 -msgid " (root-commit)"

6477 -msgstr ""

6478 -

6479 -#: sequencer.c:1344

6480 -msgid "could not parse HEAD"

6481 -msgstr ""

6482 -

6483 -#: sequencer.c:1346

6484 -#, c-format

6485 -msgid "HEAD %s is not a commit!"

6486 -msgstr ""

6487 -

6488 -#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577

6489 -msgid "could not parse HEAD commit"

6490 -msgstr ""

6491 -

6492 -#: sequencer.c:1403 sequencer.c:2100

6493 -msgid "unable to parse commit author"

6494 -msgstr ""

6495 -

6496 -#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701

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

6498 -msgstr ""

6499 -

6500 -#: sequencer.c:1447 sequencer.c:1565

6501 -#, c-format

6502 -msgid "unable to read commit message from '%s'"

6503 -msgstr ""

6504 -

6505 -#: sequencer.c:1476 sequencer.c:1508

6506 -#, c-format

6507 -msgid "invalid author identity '%s'"

6508 -msgstr ""

6509 -

6510 -#: sequencer.c:1482

6511 -msgid "corrupt author: missing date information"

6512 -msgstr ""

6513 -

6514 -#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904

6515 -#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78

6516 -msgid "failed to write commit object"

6517 -msgstr ""

6518 -

6519 -#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198

6520 -#, c-format

6521 -msgid "could not update %s"

6522 -msgstr ""

6523 -

6524 -#: sequencer.c:1597

6525 -#, c-format

6526 -msgid "could not parse commit %s"

6527 -msgstr ""

6528 -

6529 -#: sequencer.c:1602

6530 -#, c-format

6531 -msgid "could not parse parent commit %s"

6532 -msgstr ""

6533 -

6534 -#: sequencer.c:1685 sequencer.c:1796

6535 -#, c-format

6536 -msgid "unknown command: %d"

6537 -msgstr ""

6538 -

6539 -#: sequencer.c:1743 sequencer.c:1768

6540 -#, c-format

6541 -msgid "This is a combination of %d commits."

6542 -msgstr ""

6543 -

6544 -#: sequencer.c:1753

6545 -msgid "need a HEAD to fixup"

6546 -msgstr ""

6547 -

6548 -#: sequencer.c:1755 sequencer.c:3372

6549 -msgid "could not read HEAD"

6550 -msgstr ""

6551 -

6552 -#: sequencer.c:1757

6553 -msgid "could not read HEAD's commit message"

6554 -msgstr ""

6555 -

6556 -#: sequencer.c:1763

6557 -#, c-format

6558 -msgid "cannot write '%s'"

6559 -msgstr ""

6560 -

6561 -#: sequencer.c:1770 git-rebase--preserve-merges.sh:486

6562 -msgid "This is the 1st commit message:"

6563 -msgstr ""

6564 -

6565 -#: sequencer.c:1778

6566 -#, c-format

6567 -msgid "could not read commit message of %s"

6568 -msgstr ""

6569 -

6570 -#: sequencer.c:1785

6571 -#, c-format

6572 -msgid "This is the commit message #%d:"

6573 -msgstr ""

6574 -

6575 -#: sequencer.c:1791

6576 -#, c-format

6577 -msgid "The commit message #%d will be skipped:"

6578 -msgstr ""

6579 -

6580 -#: sequencer.c:1879

6581 -msgid "your index file is unmerged."

6582 -msgstr ""

6583 -

6584 -#: sequencer.c:1886

6585 -msgid "cannot fixup root commit"

6586 -msgstr ""

6587 -

6588 -#: sequencer.c:1905

6589 -#, c-format

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

6591 -msgstr ""

6592 -

6593 -#: sequencer.c:1913 sequencer.c:1921

6594 -#, c-format

6595 -msgid "commit %s does not have parent %d"

6596 -msgstr ""

6597 -

6598 -#: sequencer.c:1927

6599 -#, c-format

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

6601 -msgstr ""

6602 -

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

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

6605 -#: sequencer.c:1946

6606 -#, c-format

6607 -msgid "%s: cannot parse parent commit %s"

6608 -msgstr ""

6609 -

6610 -#: sequencer.c:2011

6611 -#, c-format

6612 -msgid "could not rename '%s' to '%s'"

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

6878 +"and commit the result with 'git commit'"

6879 msgstr ""

6880

6615 -#: sequencer.c:2071

6881 +#: sequencer.c:434 sequencer.c:3070

6882 #, c-format

6617 -msgid "could not revert %s... %s"

6883 +msgid "could not lock '%s'"

6884 msgstr ""

6885

6620 -#: sequencer.c:2072

6886 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088

6887 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631

6888 #, c-format

6622 -msgid "could not apply %s... %s"

6889 +msgid "could not write to '%s'"

6890 msgstr ""

6891

6625 -#: sequencer.c:2092

6892 +#: sequencer.c:441

6893 #, c-format

6627 -msgid "dropping %s %s -- patch contents already upstream\n"

6894 +msgid "could not write eol to '%s'"

6895 msgstr ""

6896

6630 -#: sequencer.c:2150

6897 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090

6898 +#: sequencer.c:3353

6899 #, c-format

6632 -msgid "git %s: failed to read the index"

6900 +msgid "failed to finalize '%s'"

6901 msgstr ""

6902

6635 -#: sequencer.c:2157

6903 +#: sequencer.c:485

6904 #, c-format

6637 -msgid "git %s: failed to refresh the index"

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

6906 msgstr ""

6907

6640 -#: sequencer.c:2234

6641 -#, c-format

6642 -msgid "%s does not accept arguments: '%s'"

6908 +#: sequencer.c:489

6909 +msgid "commit your changes or stash them to proceed."

6910 msgstr ""

6911

6645 -#: sequencer.c:2243

6912 +#: sequencer.c:521

6913 #, c-format

6647 -msgid "missing arguments for %s"

6914 +msgid "%s: fast-forward"

6915 msgstr ""

6916

6650 -#: sequencer.c:2274

6917 +#: sequencer.c:560 builtin/tag.c:598

6918 #, c-format

6652 -msgid "could not parse '%s'"

6919 +msgid "Invalid cleanup mode %s"

6920 msgstr ""

6921

6655 -#: sequencer.c:2335

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

6923 +#. "rebase".

6924 +#.

6925 +#: sequencer.c:670

6926 #, c-format

6657 -msgid "invalid line %d: %.*s"

6927 +msgid "%s: Unable to write new index file"

6928 msgstr ""

6929

6660 -#: sequencer.c:2346

6661 -#, c-format

6662 -msgid "cannot '%s' without a previous commit"

6930 +#: sequencer.c:684

6931 +msgid "unable to update cache tree"

6932 msgstr ""

6933

6665 -#: sequencer.c:2432

6666 -msgid "cancelling a cherry picking in progress"

6934 +#: sequencer.c:698

6935 +msgid "could not resolve HEAD commit"

6936 msgstr ""

6937

6669 -#: sequencer.c:2441

6670 -msgid "cancelling a revert in progress"

6938 +#: sequencer.c:778

6939 +#, c-format

6940 +msgid "no key present in '%.*s'"

6941 msgstr ""

6942

6673 -#: sequencer.c:2485

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

6943 +#: sequencer.c:789

6944 +#, c-format

6945 +msgid "unable to dequote value of '%s'"

6946 msgstr ""

6947

6677 -#: sequencer.c:2487

6948 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710

6949 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910

6950 #, c-format

6679 -msgid "unusable instruction sheet: '%s'"

6951 +msgid "could not open '%s' for reading"

6952 msgstr ""

6953

6682 -#: sequencer.c:2492

6683 -msgid "no commits parsed."

6954 +#: sequencer.c:836

6955 +msgid "'GIT_AUTHOR_NAME' already given"

6956 msgstr ""

6957

6686 -#: sequencer.c:2503

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

6958 +#: sequencer.c:841

6959 +msgid "'GIT_AUTHOR_EMAIL' already given"

6960 msgstr ""

6961

6690 -#: sequencer.c:2505

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

6962 +#: sequencer.c:846

6963 +msgid "'GIT_AUTHOR_DATE' already given"

6964 msgstr ""

6965

6694 -#: sequencer.c:2583

6966 +#: sequencer.c:850

6967 #, c-format

6696 -msgid "invalid value for %s: %s"

6697 -msgstr ""

6698 -

6699 -#: sequencer.c:2690

6700 -msgid "unusable squash-onto"

6968 +msgid "unknown variable '%s'"

6969 msgstr ""

6970

6703 -#: sequencer.c:2710

6704 -#, c-format

6705 -msgid "malformed options sheet: '%s'"

6971 +#: sequencer.c:855

6972 +msgid "missing 'GIT_AUTHOR_NAME'"

6973 msgstr ""

6974

6708 -#: sequencer.c:2803 sequencer.c:4636

6709 -msgid "empty commit set passed"

6975 +#: sequencer.c:857

6976 +msgid "missing 'GIT_AUTHOR_EMAIL'"

6977 msgstr ""

6978

6712 -#: sequencer.c:2820

6713 -msgid "revert is already in progress"

6979 +#: sequencer.c:859

6980 +msgid "missing 'GIT_AUTHOR_DATE'"

6981 msgstr ""

6982

6716 -#: sequencer.c:2822

6983 +#: sequencer.c:924

6984 #, c-format

6718 -msgid "try \"git revert (--continue | %s--abort | --quit)\""

6719 -msgstr ""

6720 -

6721 -#: sequencer.c:2825

6722 -msgid "cherry-pick is already in progress"

6985 +msgid ""

6986 +"you have staged changes in your working tree\n"

6987 +"If these changes are meant to be squashed into the previous commit, run:\n"

6988 +"\n"

6989 +" git commit --amend %s\n"

6990 +"\n"

6991 +"If they are meant to go into a new commit, run:\n"

6992 +"\n"

6993 +" git commit %s\n"

6994 +"\n"

6995 +"In both cases, once you're done, continue with:\n"

6996 +"\n"

6997 +" git rebase --continue\n"

6998 msgstr ""

6999

6725 -#: sequencer.c:2827

6726 -#, c-format

6727 -msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7000 +#: sequencer.c:1211

7001 +msgid "'prepare-commit-msg' hook failed"

7002 msgstr ""

7003

6730 -#: sequencer.c:2841

6731 -#, c-format

6732 -msgid "could not create sequencer directory '%s'"

7004 +#: sequencer.c:1217

7005 +msgid ""

7006 +"Your name and email address were configured automatically based\n"

7007 +"on your username and hostname. Please check that they are accurate.\n"

7008 +"You can suppress this message by setting them explicitly. Run the\n"

7009 +"following command and follow the instructions in your editor to edit\n"

7010 +"your configuration file:\n"

7011 +"\n"

7012 +" git config --global --edit\n"

7013 +"\n"

7014 +"After doing this, you may fix the identity used for this commit with:\n"

7015 +"\n"

7016 +" git commit --amend --reset-author\n"

7017 msgstr ""

7018

6735 -#: sequencer.c:2856

6736 -msgid "could not lock HEAD"

7019 +#: sequencer.c:1230

7020 +msgid ""

7021 +"Your name and email address were configured automatically based\n"

7022 +"on your username and hostname. Please check that they are accurate.\n"

7023 +"You can suppress this message by setting them explicitly:\n"

7024 +"\n"

7025 +" git config --global user.name \"Your Name\"\n"

7026 +" git config --global user.email you@example.com\n"

7027 +"\n"

7028 +"After doing this, you may fix the identity used for this commit with:\n"

7029 +"\n"

7030 +" git commit --amend --reset-author\n"

7031 msgstr ""

7032

6739 -#: sequencer.c:2916 sequencer.c:4371

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

7033 +#: sequencer.c:1272

7034 +msgid "couldn't look up newly created commit"

7035 msgstr ""

7036

6743 -#: sequencer.c:2918 sequencer.c:2929

6744 -msgid "cannot resolve HEAD"

7037 +#: sequencer.c:1274

7038 +msgid "could not parse newly created commit"

7039 msgstr ""

7040

6747 -#: sequencer.c:2920 sequencer.c:2964

6748 -msgid "cannot abort from a branch yet to be born"

7041 +#: sequencer.c:1320

7042 +msgid "unable to resolve HEAD after creating commit"

7043 msgstr ""

7044

6751 -#: sequencer.c:2950 builtin/grep.c:756

6752 -#, c-format

6753 -msgid "cannot open '%s'"

7045 +#: sequencer.c:1322

7046 +msgid "detached HEAD"

7047 msgstr ""

7048

6756 -#: sequencer.c:2952

6757 -#, c-format

6758 -msgid "cannot read '%s': %s"

l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed)