9b7e82b940 · 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: 2021-02-26 22:09+0800\n"

11 +"POT-Creation-Date: 2021-03-04 22:41+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"

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

979 msgid "cannot checkout %s"

980 msgstr ""

981

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

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

983 #: setup.c:308

984 #, c-format

985 msgid "failed to read %s"

@@ -1690,7 +1690,7 @@ msgstr ""

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

1691 msgstr ""

1692

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

1693 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 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

@@ -1934,273 +1934,270 @@ msgstr ""

1934 msgid "index-pack died"

1935 msgstr ""

1936

1937 -#: color.c:329

1937 +#: chunk-format.c:113

1938 +msgid "terminating chunk id appears earlier than expected"

1939 +msgstr ""

1940 +

1941 +#: chunk-format.c:122

1942 #, c-format

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

1943 +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

1944 msgstr ""

1945

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

1943 -msgid "invalid hash version"

1946 +#: chunk-format.c:129

1947 +#, c-format

1948 +msgid "duplicate chunk ID %<PRIx32> found"

1949 msgstr ""

1950

1946 -#: commit-graph.c:219

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

1951 +#: chunk-format.c:143

1952 +#, c-format

1953 +msgid "final chunk has non-zero id %<PRIx32>"

1954 msgstr ""

1955

1950 -#: commit-graph.c:228

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

1956 +#: color.c:329

1957 +#, c-format

1958 +msgid "invalid color value: %.*s"

1959 msgstr ""

1960

1954 -#: commit-graph.c:233

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

1961 +#: commit-graph.c:197 midx.c:46

1962 +msgid "invalid hash version"

1963 msgstr ""

1964

1958 -#: commit-graph.c:264

1965 +#: commit-graph.c:255

1966 msgid "commit-graph file is too small"

1967 msgstr ""

1968

1962 -#: commit-graph.c:329

1969 +#: commit-graph.c:348

1970 #, c-format

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

1972 msgstr ""

1973

1967 -#: commit-graph.c:336

1974 +#: commit-graph.c:355

1975 #, c-format

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

1977 msgstr ""

1978

1972 -#: commit-graph.c:343

1979 +#: commit-graph.c:362

1980 #, c-format

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

1982 msgstr ""

1983

1977 -#: commit-graph.c:360

1978 -#, c-format

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

1980 -msgstr ""

1981 -

1984 #: commit-graph.c:379

1985 #, c-format

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

1985 -msgstr ""

1986 -

1987 -#: commit-graph.c:465

1988 -#, c-format

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

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

1987 msgstr ""

1988

1992 -#: commit-graph.c:531

1989 +#: commit-graph.c:472

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

1991 msgstr ""

1992

1996 -#: commit-graph.c:541

1993 +#: commit-graph.c:482

1994 msgid "commit-graph chain does not match"

1995 msgstr ""

1996

2000 -#: commit-graph.c:589

1997 +#: commit-graph.c:530

1998 #, c-format

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

2000 msgstr ""

2001

2005 -#: commit-graph.c:613

2002 +#: commit-graph.c:554

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

2004 msgstr ""

2005

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

2006 +#: commit-graph.c:735 commit-graph.c:772

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

2008 msgstr ""

2009

2013 -#: commit-graph.c:815

2010 +#: commit-graph.c:756

2011 #, c-format

2012 msgid "could not find commit %s"

2013 msgstr ""

2014

2018 -#: commit-graph.c:848

2015 +#: commit-graph.c:789

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

2017 msgstr ""

2018

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

2019 +#: commit-graph.c:1065 builtin/am.c:1292

2020 #, c-format

2021 msgid "unable to parse commit %s"

2022 msgstr ""

2023

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

2024 +#: commit-graph.c:1327 builtin/pack-objects.c:2872

2025 #, c-format

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

2027 msgstr ""

2028

2032 -#: commit-graph.c:1409

2029 +#: commit-graph.c:1358

2030 msgid "Loading known commits in commit graph"

2031 msgstr ""

2032

2036 -#: commit-graph.c:1426

2033 +#: commit-graph.c:1375

2034 msgid "Expanding reachable commits in commit graph"

2035 msgstr ""

2036

2040 -#: commit-graph.c:1446

2037 +#: commit-graph.c:1395

2038 msgid "Clearing commit marks in commit graph"

2039 msgstr ""

2040

2044 -#: commit-graph.c:1465

2041 +#: commit-graph.c:1414

2042 msgid "Computing commit graph topological levels"

2043 msgstr ""

2044

2048 -#: commit-graph.c:1518

2045 +#: commit-graph.c:1467

2046 msgid "Computing commit graph generation numbers"

2047 msgstr ""

2048

2052 -#: commit-graph.c:1599

2049 +#: commit-graph.c:1548

2050 msgid "Computing commit changed paths Bloom filters"

2051 msgstr ""

2052

2056 -#: commit-graph.c:1676

2053 +#: commit-graph.c:1625

2054 msgid "Collecting referenced commits"

2055 msgstr ""

2056

2060 -#: commit-graph.c:1701

2057 +#: commit-graph.c:1650

2058 #, c-format

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

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

2061 msgstr[0] ""

2062 msgstr[1] ""

2063

2067 -#: commit-graph.c:1714

2064 +#: commit-graph.c:1663

2065 #, c-format

2066 msgid "error adding pack %s"

2067 msgstr ""

2068

2072 -#: commit-graph.c:1718

2069 +#: commit-graph.c:1667

2070 #, c-format

2071 msgid "error opening index for %s"

2072 msgstr ""

2073

2077 -#: commit-graph.c:1755

2074 +#: commit-graph.c:1704

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

2076 msgstr ""

2077

2081 -#: commit-graph.c:1773

2078 +#: commit-graph.c:1722

2079 msgid "Finding extra edges in commit graph"

2080 msgstr ""

2081

2085 -#: commit-graph.c:1821

2082 +#: commit-graph.c:1771

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

2084 msgstr ""

2085

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

2086 +#: commit-graph.c:1802 midx.c:794

2087 #, c-format

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

2089 msgstr ""

2090

2094 -#: commit-graph.c:1876

2091 +#: commit-graph.c:1815

2092 msgid "unable to create temporary graph layer"

2093 msgstr ""

2094

2098 -#: commit-graph.c:1881

2095 +#: commit-graph.c:1820

2096 #, c-format

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

2098 msgstr ""

2099

2103 -#: commit-graph.c:1966

2100 +#: commit-graph.c:1879

2101 #, c-format

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

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

2104 msgstr[0] ""

2105 msgstr[1] ""

2106

2110 -#: commit-graph.c:2011

2107 +#: commit-graph.c:1915

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

2109 msgstr ""

2110

2114 -#: commit-graph.c:2027

2111 +#: commit-graph.c:1931

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

2113 msgstr ""

2114

2118 -#: commit-graph.c:2047

2115 +#: commit-graph.c:1951

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

2117 msgstr ""

2118

2122 -#: commit-graph.c:2180

2119 +#: commit-graph.c:2084

2120 msgid "Scanning merged commits"

2121 msgstr ""

2122

2126 -#: commit-graph.c:2224

2123 +#: commit-graph.c:2128

2124 msgid "Merging commit-graph"

2125 msgstr ""

2126

2130 -#: commit-graph.c:2331

2127 +#: commit-graph.c:2235

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

2129 msgstr ""

2130

2134 -#: commit-graph.c:2438

2131 +#: commit-graph.c:2342

2132 msgid "too many commits to write graph"

2133 msgstr ""

2134

2138 -#: commit-graph.c:2536

2135 +#: commit-graph.c:2440

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

2137 msgstr ""

2138

2142 -#: commit-graph.c:2546

2139 +#: commit-graph.c:2450

2140 #, c-format

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

2142 msgstr ""

2143

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

2144 +#: commit-graph.c:2460 commit-graph.c:2475

2145 #, c-format

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

2147 msgstr ""

2148

2152 -#: commit-graph.c:2563

2149 +#: commit-graph.c:2467

2150 #, c-format

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

2152 msgstr ""

2153

2157 -#: commit-graph.c:2581

2154 +#: commit-graph.c:2485

2155 msgid "Verifying commits in commit graph"

2156 msgstr ""

2157

2161 -#: commit-graph.c:2596

2158 +#: commit-graph.c:2500

2159 #, c-format

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

2161 msgstr ""

2162

2166 -#: commit-graph.c:2603

2163 +#: commit-graph.c:2507

2164 #, c-format

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

2166 msgstr ""

2167

2171 -#: commit-graph.c:2613

2168 +#: commit-graph.c:2517

2169 #, c-format

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

2171 msgstr ""

2172

2176 -#: commit-graph.c:2622

2173 +#: commit-graph.c:2526

2174 #, c-format

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

2176 msgstr ""

2177

2181 -#: commit-graph.c:2636

2178 +#: commit-graph.c:2540

2179 #, c-format

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

2181 msgstr ""

2182

2186 -#: commit-graph.c:2641

2183 +#: commit-graph.c:2545

2184 #, c-format

2185 msgid ""

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

2187 msgstr ""

2188

2192 -#: commit-graph.c:2645

2189 +#: commit-graph.c:2549

2190 #, c-format

2191 msgid ""

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

2193 msgstr ""

2194

2198 -#: commit-graph.c:2662

2195 +#: commit-graph.c:2566

2196 #, c-format

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

2198 msgstr ""

2199

2203 -#: commit-graph.c:2668

2200 +#: commit-graph.c:2572

2201 #, c-format

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

2203 msgstr ""

@@ -3641,7 +3638,7 @@ msgstr ""

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

3639 msgstr ""

3640

3644 -#: diffcore-rename.c:555

3641 +#: diffcore-rename.c:786

3642 msgid "Performing inexact rename detection"

3643 msgstr ""

3644

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

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

3690 msgstr ""

3691

3695 -#: dir.c:3537

3692 +#: dir.c:3534

3693 #, c-format

3694 msgid "index file corrupt in repo %s"

3695 msgstr ""

3696

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

3697 +#: dir.c:3579 dir.c:3584

3698 #, c-format

3699 msgid "could not create directories for %s"

3700 msgstr ""

3701

3705 -#: dir.c:3616

3702 +#: dir.c:3613

3703 #, c-format

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

3705 msgstr ""

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

3758 msgid "--stateless-rpc requires multi_ack_detailed"

3759 msgstr ""

3760

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

3761 +#: fetch-pack.c:378 fetch-pack.c:1457

3762 #, c-format

3763 msgid "invalid shallow line: %s"

3764 msgstr ""

3765

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

3766 +#: fetch-pack.c:384 fetch-pack.c:1463

3767 #, c-format

3768 msgid "invalid unshallow line: %s"

3769 msgstr ""

3770

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

3771 +#: fetch-pack.c:386 fetch-pack.c:1465

3772 #, c-format

3773 msgid "object not found: %s"

3774 msgstr ""

3775

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

3776 +#: fetch-pack.c:389 fetch-pack.c:1468

3777 #, c-format

3778 msgid "error in object: %s"

3779 msgstr ""

3780

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

3781 +#: fetch-pack.c:391 fetch-pack.c:1470

3782 #, c-format

3783 msgid "no shallow found: %s"

3784 msgstr ""

3785

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

3786 +#: fetch-pack.c:394 fetch-pack.c:1474

3787 #, c-format

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

3789 msgstr ""

@@ -3824,157 +3821,161 @@ msgstr ""

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

3822 msgstr ""

3823

3827 -#: fetch-pack.c:821

3824 +#: fetch-pack.c:844

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

3826 msgstr ""

3827

3831 -#: fetch-pack.c:829

3828 +#: fetch-pack.c:852

3829 msgid "protocol error: bad pack header"

3830 msgstr ""

3831

3835 -#: fetch-pack.c:913

3832 +#: fetch-pack.c:946

3833 #, c-format

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

3835 msgstr ""

3836

3840 -#: fetch-pack.c:931

3837 +#: fetch-pack.c:952

3838 +msgid "fetch-pack: invalid index-pack output"

3839 +msgstr ""

3840 +

3841 +#: fetch-pack.c:969

3842 #, c-format

3843 msgid "%s failed"

3844 msgstr ""

3845

3845 -#: fetch-pack.c:933

3846 +#: fetch-pack.c:971

3847 msgid "error in sideband demultiplexer"

3848 msgstr ""

3849

3849 -#: fetch-pack.c:976

3850 +#: fetch-pack.c:1031

3851 #, c-format

3852 msgid "Server version is %.*s"

3853 msgstr ""

3854

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

3855 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054

3856 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070

3857 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086

3858 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108

3859 #, c-format

3860 msgid "Server supports %s"

3861 msgstr ""

3862

3862 -#: fetch-pack.c:986

3863 +#: fetch-pack.c:1041

3864 msgid "Server does not support shallow clients"

3865 msgstr ""

3866

3866 -#: fetch-pack.c:1046

3867 +#: fetch-pack.c:1101

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

3869 msgstr ""

3870

3870 -#: fetch-pack.c:1051

3871 +#: fetch-pack.c:1106

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

3873 msgstr ""

3874

3874 -#: fetch-pack.c:1055

3875 +#: fetch-pack.c:1110

3876 msgid "Server does not support --deepen"

3877 msgstr ""

3878

3878 -#: fetch-pack.c:1057

3879 +#: fetch-pack.c:1112

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

3881 msgstr ""

3882

3882 -#: fetch-pack.c:1070

3883 +#: fetch-pack.c:1125

3884 msgid "no common commits"

3885 msgstr ""

3886

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

3887 +#: fetch-pack.c:1138 fetch-pack.c:1682

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

3889 msgstr ""

3890

3890 -#: fetch-pack.c:1208

3891 +#: fetch-pack.c:1265

3892 #, c-format

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

3894 msgstr ""

3895

3895 -#: fetch-pack.c:1212

3896 +#: fetch-pack.c:1269

3897 #, c-format

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

3899 msgstr ""

3900

3900 -#: fetch-pack.c:1232

3901 +#: fetch-pack.c:1289

3902 msgid "Server does not support shallow requests"

3903 msgstr ""

3904

3904 -#: fetch-pack.c:1239

3905 +#: fetch-pack.c:1296

3906 msgid "Server supports filter"

3907 msgstr ""

3908

3908 -#: fetch-pack.c:1278

3909 +#: fetch-pack.c:1335

3910 msgid "unable to write request to remote"

3911 msgstr ""

3912

3912 -#: fetch-pack.c:1296

3913 +#: fetch-pack.c:1353

3914 #, c-format

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

3916 msgstr ""

3917

3917 -#: fetch-pack.c:1302

3918 +#: fetch-pack.c:1359

3919 #, c-format

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

3921 msgstr ""

3922

3922 -#: fetch-pack.c:1363

3923 +#: fetch-pack.c:1420

3924 #, c-format

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

3926 msgstr ""

3927

3927 -#: fetch-pack.c:1368

3928 +#: fetch-pack.c:1425

3929 #, c-format

3930 msgid "error processing acks: %d"

3931 msgstr ""

3932

3932 -#: fetch-pack.c:1378

3933 +#: fetch-pack.c:1435

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

3935 msgstr ""

3936

3936 -#: fetch-pack.c:1380

3937 +#: fetch-pack.c:1437

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

3939 msgstr ""

3940

3940 -#: fetch-pack.c:1422

3941 +#: fetch-pack.c:1479

3942 #, c-format

3943 msgid "error processing shallow info: %d"

3944 msgstr ""

3945

3945 -#: fetch-pack.c:1469

3946 +#: fetch-pack.c:1526

3947 #, c-format

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

3949 msgstr ""

3950

3950 -#: fetch-pack.c:1474

3951 +#: fetch-pack.c:1531

3952 #, c-format

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

3954 msgstr ""

3955

3955 -#: fetch-pack.c:1479

3956 +#: fetch-pack.c:1536

3957 #, c-format

3958 msgid "error processing wanted refs: %d"

3959 msgstr ""

3960

3960 -#: fetch-pack.c:1509

3961 +#: fetch-pack.c:1566

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

3963 msgstr ""

3964

3964 -#: fetch-pack.c:1891

3965 +#: fetch-pack.c:1960

3966 msgid "no matching remote head"

3967 msgstr ""

3968

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

3969 +#: fetch-pack.c:1983 builtin/clone.c:693

3970 msgid "remote did not send all necessary objects"

3971 msgstr ""

3972

3972 -#: fetch-pack.c:1941

3973 +#: fetch-pack.c:2010

3974 #, c-format

3975 msgid "no such remote ref %s"

3976 msgstr ""

3977

3977 -#: fetch-pack.c:1944

3978 +#: fetch-pack.c:2013

3979 #, c-format

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

3981 msgstr ""

@@ -4302,39 +4303,39 @@ msgstr ""

4303 msgid "expected flush after ls-refs arguments"

4304 msgstr ""

4305

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

4306 +#: merge-ort.c:888 merge-recursive.c:1191

4307 #, c-format

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

4309 msgstr ""

4310

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

4311 +#: merge-ort.c:897 merge-recursive.c:1198

4312 #, c-format

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

4314 msgstr ""

4315

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

4316 +#: merge-ort.c:906 merge-recursive.c:1205

4317 #, c-format

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

4319 msgstr ""

4320

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

4321 +#: merge-ort.c:916 merge-ort.c:923

4322 #, c-format

4323 msgid "Note: Fast-forwarding submodule %s to %s"

4324 msgstr ""

4325

4325 -#: merge-ort.c:911

4326 +#: merge-ort.c:944

4327 #, c-format

4328 msgid "Failed to merge submodule %s"

4329 msgstr ""

4330

4330 -#: merge-ort.c:918

4331 +#: merge-ort.c:951

4332 #, c-format

4333 msgid ""

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

4335 "%s\n"

4336 msgstr ""

4337

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

4338 +#: merge-ort.c:955 merge-recursive.c:1259

4339 #, c-format

4340 msgid ""

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

@@ -4345,42 +4346,42 @@ msgid ""

4346 "which will accept this suggestion.\n"

4347 msgstr ""

4348

4348 -#: merge-ort.c:935

4349 +#: merge-ort.c:968

4350 #, c-format

4351 msgid ""

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

4353 "%s"

4354 msgstr ""

4355

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

4356 +#: merge-ort.c:1127 merge-recursive.c:1341

4357 msgid "Failed to execute internal merge"

4358 msgstr ""

4359

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

4360 +#: merge-ort.c:1132 merge-recursive.c:1346

4361 #, c-format

4362 msgid "Unable to add %s to database"

4363 msgstr ""

4364

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

4365 +#: merge-ort.c:1139 merge-recursive.c:1378

4366 #, c-format

4367 msgid "Auto-merging %s"

4368 msgstr ""

4369

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

4370 +#: merge-ort.c:1278 merge-recursive.c:2100

4371 #, c-format

4372 msgid ""

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

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

4375 msgstr ""

4376

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

4377 +#: merge-ort.c:1288 merge-recursive.c:2110

4378 #, c-format

4379 msgid ""

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

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

4382 msgstr ""

4383

4383 -#: merge-ort.c:1438

4384 +#: merge-ort.c:1471

4385 #, c-format

4386 msgid ""

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

@@ -4388,47 +4389,47 @@ msgid ""

4389 "majority of the files."

4390 msgstr ""

4391

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

4392 +#: merge-ort.c:1637 merge-recursive.c:2447

4393 #, c-format

4394 msgid ""

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

4396 "renamed."

4397 msgstr ""

4398

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

4399 +#: merge-ort.c:1781 merge-recursive.c:3215

4400 #, c-format

4401 msgid ""

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

4403 "moving it to %s."

4404 msgstr ""

4405

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

4406 +#: merge-ort.c:1788 merge-recursive.c:3222

4407 #, c-format

4408 msgid ""

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

4410 "%s; moving it to %s."

4411 msgstr ""

4412

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

4413 +#: merge-ort.c:1801 merge-recursive.c:3218

4414 #, c-format

4415 msgid ""

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

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

4418 msgstr ""

4419

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

4420 +#: merge-ort.c:1809 merge-recursive.c:3225

4421 #, c-format

4422 msgid ""

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

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

4425 msgstr ""

4426

4426 -#: merge-ort.c:1919

4427 +#: merge-ort.c:1952

4428 #, c-format

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

4430 msgstr ""

4431

4431 -#: merge-ort.c:2014

4432 +#: merge-ort.c:2047

4433 #, c-format

4434 msgid ""

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

@@ -4436,51 +4437,51 @@ msgid ""

4437 "markers."

4438 msgstr ""

4439

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

4440 +#: merge-ort.c:2066 merge-ort.c:2090

4441 #, c-format

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

4443 msgstr ""

4444

4444 -#: merge-ort.c:2683

4445 +#: merge-ort.c:2735

4446 #, c-format

4447 msgid ""

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

4449 "%s instead."

4450 msgstr ""

4451

4451 -#: merge-ort.c:2756

4452 +#: merge-ort.c:2808

4453 #, c-format

4454 msgid ""

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

4456 "of them so each can be recorded somewhere."

4457 msgstr ""

4458

4458 -#: merge-ort.c:2760

4459 +#: merge-ort.c:2812

4460 msgid "both"

4461 msgstr ""

4462

4462 -#: merge-ort.c:2760

4463 +#: merge-ort.c:2812

4464 msgid "one"

4465 msgstr ""

4466

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

4467 +#: merge-ort.c:2907 merge-recursive.c:3052

4468 msgid "content"

4469 msgstr ""

4470

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

4471 +#: merge-ort.c:2909 merge-recursive.c:3056

4472 msgid "add/add"

4473 msgstr ""

4474

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

4475 +#: merge-ort.c:2911 merge-recursive.c:3101

4476 msgid "submodule"

4477 msgstr ""

4478

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

4479 +#: merge-ort.c:2913 merge-recursive.c:3102

4480 #, c-format

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

4482 msgstr ""

4483

4483 -#: merge-ort.c:2886

4484 +#: merge-ort.c:2938

4485 #, c-format

4486 msgid ""

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

@@ -4490,7 +4491,7 @@ msgstr ""

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

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

4493 #.

4493 -#: merge-ort.c:3354

4494 +#: merge-ort.c:3406

4495 #, c-format

4496 msgid "collecting merge info failed for trees %s, %s, %s"

4497 msgstr ""

@@ -4787,164 +4788,156 @@ msgstr ""

4788 msgid "unable to write new index file"

4789 msgstr ""

4790

4790 -#: midx.c:80

4791 +#: midx.c:62

4792 +msgid "multi-pack-index OID fanout is of the wrong size"

4793 +msgstr ""

4794 +

4795 +#: midx.c:93

4796 #, c-format

4797 msgid "multi-pack-index file %s is too small"

4798 msgstr ""

4799

4795 -#: midx.c:96

4800 +#: midx.c:109

4801 #, c-format

4802 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4803 msgstr ""

4804

4800 -#: midx.c:101

4805 +#: midx.c:114

4806 #, c-format

4807 msgid "multi-pack-index version %d not recognized"

4808 msgstr ""

4809

4805 -#: midx.c:106

4810 +#: midx.c:119

4811 #, c-format

4812 msgid "multi-pack-index hash version %u does not match version %u"

4813 msgstr ""

4814

4810 -#: midx.c:123

4811 -msgid "invalid chunk offset (too large)"

4812 -msgstr ""

4813 -

4814 -#: midx.c:147

4815 -msgid "terminating multi-pack-index chunk id appears earlier than expected"

4816 -msgstr ""

4817 -

4818 -#: midx.c:160

4815 +#: midx.c:136

4816 msgid "multi-pack-index missing required pack-name chunk"

4817 msgstr ""

4818

4822 -#: midx.c:162

4819 +#: midx.c:138

4820 msgid "multi-pack-index missing required OID fanout chunk"

4821 msgstr ""

4822

4826 -#: midx.c:164

4823 +#: midx.c:140

4824 msgid "multi-pack-index missing required OID lookup chunk"

4825 msgstr ""

4826

4830 -#: midx.c:166

4827 +#: midx.c:142

4828 msgid "multi-pack-index missing required object offsets chunk"

4829 msgstr ""

4830

4834 -#: midx.c:180

4831 +#: midx.c:158

4832 #, c-format

4833 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4834 msgstr ""

4835

4839 -#: midx.c:223

4836 +#: midx.c:202

4837 #, c-format

4838 msgid "bad pack-int-id: %u (%u total packs)"

4839 msgstr ""

4840

4844 -#: midx.c:273

4841 +#: midx.c:252

4842 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4843 msgstr ""

4844

4848 -#: midx.c:480

4845 +#: midx.c:467

4846 #, c-format

4847 msgid "failed to add packfile '%s'"

4848 msgstr ""

4849

4853 -#: midx.c:486

4850 +#: midx.c:473

4851 #, c-format

4852 msgid "failed to open pack-index '%s'"

4853 msgstr ""

4854

4858 -#: midx.c:546

4855 +#: midx.c:533

4856 #, c-format

4857 msgid "failed to locate object %d in packfile"

4858 msgstr ""

4859

4863 -#: midx.c:846

4860 +#: midx.c:821

4861 msgid "Adding packfiles to multi-pack-index"

4862 msgstr ""

4863

4867 -#: midx.c:879

4864 +#: midx.c:855

4865 #, c-format

4866 msgid "did not see pack-file %s to drop"

4867 msgstr ""

4868

4872 -#: midx.c:931

4869 +#: midx.c:904

4870 msgid "no pack files to index."

4871 msgstr ""

4872

4876 -#: midx.c:982

4877 -msgid "Writing chunks to multi-pack-index"

4878 -msgstr ""

4879 -

4880 -#: midx.c:1060

4873 +#: midx.c:965

4874 #, c-format

4875 msgid "failed to clear multi-pack-index at %s"

4876 msgstr ""

4877

4885 -#: midx.c:1116

4878 +#: midx.c:1021

4879 msgid "multi-pack-index file exists, but failed to parse"

4880 msgstr ""

4881

4889 -#: midx.c:1124

4882 +#: midx.c:1029

4883 msgid "Looking for referenced packfiles"

4884 msgstr ""

4885

4893 -#: midx.c:1139

4886 +#: midx.c:1044

4887 #, c-format

4888 msgid ""

4889 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4890 msgstr ""

4891

4899 -#: midx.c:1144

4892 +#: midx.c:1049

4893 msgid "the midx contains no oid"

4894 msgstr ""

4895

4903 -#: midx.c:1153

4896 +#: midx.c:1058

4897 msgid "Verifying OID order in multi-pack-index"

4898 msgstr ""

4899

4907 -#: midx.c:1162

4900 +#: midx.c:1067

4901 #, c-format

4902 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4903 msgstr ""

4904

4912 -#: midx.c:1182

4905 +#: midx.c:1087

4906 msgid "Sorting objects by packfile"

4907 msgstr ""

4908

4916 -#: midx.c:1189

4909 +#: midx.c:1094

4910 msgid "Verifying object offsets"

4911 msgstr ""

4912

4920 -#: midx.c:1205

4913 +#: midx.c:1110

4914 #, c-format

4915 msgid "failed to load pack entry for oid[%d] = %s"

4916 msgstr ""

4917

4925 -#: midx.c:1211

4918 +#: midx.c:1116

4919 #, c-format

4920 msgid "failed to load pack-index for packfile %s"

4921 msgstr ""

4922

4930 -#: midx.c:1220

4923 +#: midx.c:1125

4924 #, c-format

4925 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4926 msgstr ""

4927

4935 -#: midx.c:1245

4928 +#: midx.c:1150

4929 msgid "Counting referenced objects"

4930 msgstr ""

4931

4939 -#: midx.c:1255

4932 +#: midx.c:1160

4933 msgid "Finding and deleting unreferenced packfiles"

4934 msgstr ""

4935

4943 -#: midx.c:1446

4936 +#: midx.c:1351

4937 msgid "could not start pack-objects"

4938 msgstr ""

4939

4947 -#: midx.c:1466

4940 +#: midx.c:1371

4941 msgid "could not finish pack-objects"

4942 msgstr ""

4943

@@ -5409,7 +5402,7 @@ msgstr ""

5402 msgid "failed to make %s readable"

5403 msgstr ""

5404

5412 -#: pack-write.c:502

5405 +#: pack-write.c:508

5406 #, c-format

5407 msgid "could not write '%s' promisor file"

5408 msgstr ""

@@ -5670,11 +5663,11 @@ msgstr ""

5663 msgid "remote error: %s"

5664 msgstr ""

5665

5673 -#: preload-index.c:119

5666 +#: preload-index.c:125

5667 msgid "Refreshing index"

5668 msgstr ""

5669

5677 -#: preload-index.c:138

5670 +#: preload-index.c:144

5671 #, c-format

5672 msgid "unable to create threaded lstat: %s"

5673 msgstr ""

@@ -5781,73 +5774,73 @@ msgstr ""

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

5775 msgstr ""

5776

5784 -#: read-cache.c:1524

5777 +#: read-cache.c:1532

5778 msgid "Refresh index"

5779 msgstr ""

5780

5788 -#: read-cache.c:1639

5781 +#: read-cache.c:1657

5782 #, c-format

5783 msgid ""

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

5785 "Using version %i"

5786 msgstr ""

5787

5795 -#: read-cache.c:1649

5788 +#: read-cache.c:1667

5789 #, c-format

5790 msgid ""

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

5792 "Using version %i"

5793 msgstr ""

5794

5802 -#: read-cache.c:1705

5795 +#: read-cache.c:1723

5796 #, c-format

5797 msgid "bad signature 0x%08x"

5798 msgstr ""

5799

5807 -#: read-cache.c:1708

5800 +#: read-cache.c:1726

5801 #, c-format

5802 msgid "bad index version %d"

5803 msgstr ""

5804

5812 -#: read-cache.c:1717

5805 +#: read-cache.c:1735

5806 msgid "bad index file sha1 signature"

5807 msgstr ""

5808

5816 -#: read-cache.c:1747

5809 +#: read-cache.c:1765

5810 #, c-format

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

5812 msgstr ""

5813

5821 -#: read-cache.c:1749

5814 +#: read-cache.c:1767

5815 #, c-format

5816 msgid "ignoring %.4s extension"

5817 msgstr ""

5818

5826 -#: read-cache.c:1786

5819 +#: read-cache.c:1804

5820 #, c-format

5821 msgid "unknown index entry format 0x%08x"

5822 msgstr ""

5823

5831 -#: read-cache.c:1802

5824 +#: read-cache.c:1820

5825 #, c-format

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

5827 msgstr ""

5828

5836 -#: read-cache.c:1859

5829 +#: read-cache.c:1877

5830 msgid "unordered stage entries in index"

5831 msgstr ""

5832

5840 -#: read-cache.c:1862

5833 +#: read-cache.c:1880

5834 #, c-format

5835 msgid "multiple stage entries for merged file '%s'"

5836 msgstr ""

5837

5845 -#: read-cache.c:1865

5838 +#: read-cache.c:1883

5839 #, c-format

5840 msgid "unordered stage entries for '%s'"

5841 msgstr ""

5842

5850 -#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095

5843 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095

5844 #: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

5845 #: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

5846 #: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

@@ -5856,82 +5849,82 @@ msgstr ""

5849 msgid "index file corrupt"

5850 msgstr ""

5851

5859 -#: read-cache.c:2115

5852 +#: read-cache.c:2133

5853 #, c-format

5854 msgid "unable to create load_cache_entries thread: %s"

5855 msgstr ""

5856

5864 -#: read-cache.c:2128

5857 +#: read-cache.c:2146

5858 #, c-format

5859 msgid "unable to join load_cache_entries thread: %s"

5860 msgstr ""

5861

5869 -#: read-cache.c:2161

5862 +#: read-cache.c:2179

5863 #, c-format

5864 msgid "%s: index file open failed"

5865 msgstr ""

5866

5874 -#: read-cache.c:2165

5867 +#: read-cache.c:2183

5868 #, c-format

5869 msgid "%s: cannot stat the open index"

5870 msgstr ""

5871

5879 -#: read-cache.c:2169

5872 +#: read-cache.c:2187

5873 #, c-format

5874 msgid "%s: index file smaller than expected"

5875 msgstr ""

5876

5884 -#: read-cache.c:2173

5877 +#: read-cache.c:2191

5878 #, c-format

5879 msgid "%s: unable to map index file"

5880 msgstr ""

5881

5889 -#: read-cache.c:2215

5882 +#: read-cache.c:2233

5883 #, c-format

5884 msgid "unable to create load_index_extensions thread: %s"

5885 msgstr ""

5886

5894 -#: read-cache.c:2242

5887 +#: read-cache.c:2260

5888 #, c-format

5889 msgid "unable to join load_index_extensions thread: %s"

5890 msgstr ""

5891

5899 -#: read-cache.c:2274

5892 +#: read-cache.c:2292

5893 #, c-format

5894 msgid "could not freshen shared index '%s'"

5895 msgstr ""

5896

5904 -#: read-cache.c:2321

5897 +#: read-cache.c:2339

5898 #, c-format

5899 msgid "broken index, expect %s in %s, got %s"

5900 msgstr ""

5901

5909 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

5902 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

5903 #, c-format

5904 msgid "could not close '%s'"

5905 msgstr ""

5906

5914 -#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239

5907 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

5908 #, c-format

5909 msgid "could not stat '%s'"

5910 msgstr ""

5911

5919 -#: read-cache.c:3133

5912 +#: read-cache.c:3151

5913 #, c-format

5914 msgid "unable to open git dir: %s"

5915 msgstr ""

5916

5924 -#: read-cache.c:3145

5917 +#: read-cache.c:3163

5918 #, c-format

5919 msgid "unable to unlink: %s"

5920 msgstr ""

5921

5929 -#: read-cache.c:3170

5922 +#: read-cache.c:3188

5923 #, c-format

5924 msgid "cannot fix permission bits on '%s'"

5925 msgstr ""

5926

5934 -#: read-cache.c:3319

5927 +#: read-cache.c:3337

5928 #, c-format

5929 msgid "%s: cannot drop to stage #0"

5930 msgstr ""

@@ -6062,242 +6055,247 @@ msgstr ""

6055 msgid "ahead %d, behind %d"

6056 msgstr ""

6057

6065 -#: ref-filter.c:169

6058 +#: ref-filter.c:175

6059 #, c-format

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

6061 msgstr ""

6062

6070 -#: ref-filter.c:171

6063 +#: ref-filter.c:177

6064 #, c-format

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

6066 msgstr ""

6067

6075 -#: ref-filter.c:193

6068 +#: ref-filter.c:199

6069 #, c-format

6070 msgid "Integer value expected refname:lstrip=%s"

6071 msgstr ""

6072

6080 -#: ref-filter.c:197

6073 +#: ref-filter.c:203

6074 #, c-format

6075 msgid "Integer value expected refname:rstrip=%s"

6076 msgstr ""

6077

6085 -#: ref-filter.c:199

6078 +#: ref-filter.c:205

6079 #, c-format

6080 msgid "unrecognized %%(%s) argument: %s"

6081 msgstr ""

6082

6090 -#: ref-filter.c:254

6083 +#: ref-filter.c:260

6084 #, c-format

6085 msgid "%%(objecttype) does not take arguments"

6086 msgstr ""

6087

6095 -#: ref-filter.c:276

6088 +#: ref-filter.c:282

6089 #, c-format

6090 msgid "unrecognized %%(objectsize) argument: %s"

6091 msgstr ""

6092

6100 -#: ref-filter.c:284

6093 +#: ref-filter.c:290

6094 #, c-format

6095 msgid "%%(deltabase) does not take arguments"

6096 msgstr ""

6097

6105 -#: ref-filter.c:296

6098 +#: ref-filter.c:302

6099 #, c-format

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

6101 msgstr ""

6102

6110 -#: ref-filter.c:309

6103 +#: ref-filter.c:315

6104 #, c-format

6105 msgid "unrecognized %%(subject) argument: %s"

6106 msgstr ""

6107

6115 -#: ref-filter.c:330

6108 +#: ref-filter.c:334

6109 +#, c-format

6110 +msgid "expected %%(trailers:key=<value>)"

6111 +msgstr ""

6112 +

6113 +#: ref-filter.c:336

6114 #, c-format

6115 msgid "unknown %%(trailers) argument: %s"

6116 msgstr ""

6117

6120 -#: ref-filter.c:363

6118 +#: ref-filter.c:367

6119 #, c-format

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

6121 msgstr ""

6122

6125 -#: ref-filter.c:365

6123 +#: ref-filter.c:369

6124 #, c-format

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

6126 msgstr ""

6127

6130 -#: ref-filter.c:380

6128 +#: ref-filter.c:384

6129 #, c-format

6130 msgid "positive value expected '%s' in %%(%s)"

6131 msgstr ""

6132

6135 -#: ref-filter.c:384

6133 +#: ref-filter.c:388

6134 #, c-format

6135 msgid "unrecognized argument '%s' in %%(%s)"

6136 msgstr ""

6137

6140 -#: ref-filter.c:398

6138 +#: ref-filter.c:402

6139 #, c-format

6140 msgid "unrecognized email option: %s"

6141 msgstr ""

6142

6145 -#: ref-filter.c:428

6143 +#: ref-filter.c:432

6144 #, c-format

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

6146 msgstr ""

6147

6150 -#: ref-filter.c:440

6148 +#: ref-filter.c:444

6149 #, c-format

6150 msgid "unrecognized position:%s"

6151 msgstr ""

6152

6155 -#: ref-filter.c:447

6153 +#: ref-filter.c:451

6154 #, c-format

6155 msgid "unrecognized width:%s"

6156 msgstr ""

6157

6160 -#: ref-filter.c:456

6158 +#: ref-filter.c:460

6159 #, c-format

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

6161 msgstr ""

6162

6165 -#: ref-filter.c:464

6163 +#: ref-filter.c:468

6164 #, c-format

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

6166 msgstr ""

6167

6170 -#: ref-filter.c:482

6168 +#: ref-filter.c:486

6169 #, c-format

6170 msgid "unrecognized %%(if) argument: %s"

6171 msgstr ""

6172

6175 -#: ref-filter.c:584

6173 +#: ref-filter.c:588

6174 #, c-format

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

6176 msgstr ""

6177

6180 -#: ref-filter.c:611

6178 +#: ref-filter.c:615

6179 #, c-format

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

6181 msgstr ""

6182

6185 -#: ref-filter.c:615

6183 +#: ref-filter.c:619

6184 #, c-format

6185 msgid ""

6186 "not a git repository, but the field '%.*s' requires access to object data"

6187 msgstr ""

6188

6191 -#: ref-filter.c:739

6189 +#: ref-filter.c:743

6190 #, c-format

6191 msgid "format: %%(if) atom used without a %%(then) atom"

6192 msgstr ""

6193

6196 -#: ref-filter.c:802

6194 +#: ref-filter.c:806

6195 #, c-format

6196 msgid "format: %%(then) atom used without an %%(if) atom"

6197 msgstr ""

6198

6201 -#: ref-filter.c:804

6199 +#: ref-filter.c:808

6200 #, c-format

6201 msgid "format: %%(then) atom used more than once"

6202 msgstr ""

6203

6206 -#: ref-filter.c:806

6204 +#: ref-filter.c:810

6205 #, c-format

6206 msgid "format: %%(then) atom used after %%(else)"

6207 msgstr ""

6208

6211 -#: ref-filter.c:834

6209 +#: ref-filter.c:838

6210 #, c-format

6211 msgid "format: %%(else) atom used without an %%(if) atom"

6212 msgstr ""

6213

6216 -#: ref-filter.c:836

6214 +#: ref-filter.c:840

6215 #, c-format

6216 msgid "format: %%(else) atom used without a %%(then) atom"

6217 msgstr ""

6218

6221 -#: ref-filter.c:838

6219 +#: ref-filter.c:842

6220 #, c-format

6221 msgid "format: %%(else) atom used more than once"

6222 msgstr ""

6223

6226 -#: ref-filter.c:853

6224 +#: ref-filter.c:857

6225 #, c-format

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

6227 msgstr ""

6228

6231 -#: ref-filter.c:910

6229 +#: ref-filter.c:914

6230 #, c-format

6231 msgid "malformed format string %s"

6232 msgstr ""

6233

6236 -#: ref-filter.c:1551

6234 +#: ref-filter.c:1555

6235 #, c-format

6236 msgid "(no branch, rebasing %s)"

6237 msgstr ""

6238

6241 -#: ref-filter.c:1554

6239 +#: ref-filter.c:1558

6240 #, c-format

6241 msgid "(no branch, rebasing detached HEAD %s)"

6242 msgstr ""

6243

6246 -#: ref-filter.c:1557

6244 +#: ref-filter.c:1561

6245 #, c-format

6246 msgid "(no branch, bisect started on %s)"

6247 msgstr ""

6248

6251 -#: ref-filter.c:1561

6249 +#: ref-filter.c:1565

6250 #, c-format

6251 msgid "(HEAD detached at %s)"

6252 msgstr ""

6253

6256 -#: ref-filter.c:1564

6254 +#: ref-filter.c:1568

6255 #, c-format

6256 msgid "(HEAD detached from %s)"

6257 msgstr ""

6258

6261 -#: ref-filter.c:1567

6259 +#: ref-filter.c:1571

6260 msgid "(no branch)"

6261 msgstr ""

6262

6265 -#: ref-filter.c:1599 ref-filter.c:1808

6263 +#: ref-filter.c:1603 ref-filter.c:1812

6264 #, c-format

6265 msgid "missing object %s for %s"

6266 msgstr ""

6267

6270 -#: ref-filter.c:1609

6268 +#: ref-filter.c:1613

6269 #, c-format

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

6271 msgstr ""

6272

6275 -#: ref-filter.c:1992

6273 +#: ref-filter.c:1996

6274 #, c-format

6275 msgid "malformed object at '%s'"

6276 msgstr ""

6277

6280 -#: ref-filter.c:2081

6278 +#: ref-filter.c:2085

6279 #, c-format

6280 msgid "ignoring ref with broken name %s"

6281 msgstr ""

6282

6285 -#: ref-filter.c:2086 refs.c:676

6283 +#: ref-filter.c:2090 refs.c:676

6284 #, c-format

6285 msgid "ignoring broken ref %s"

6286 msgstr ""

6287

6290 -#: ref-filter.c:2426

6288 +#: ref-filter.c:2430

6289 #, c-format

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

6291 msgstr ""

6292

6295 -#: ref-filter.c:2525

6293 +#: ref-filter.c:2529

6294 #, c-format

6295 msgid "malformed object name %s"

6296 msgstr ""

6297

6300 -#: ref-filter.c:2530

6298 +#: ref-filter.c:2534

6299 #, c-format

6300 msgid "option `%s' must point to a commit"

6301 msgstr ""

@@ -14572,7 +14570,7 @@ msgstr ""

14570 #. variable for tweaking threads, currently

14571 #. grep.threads

14572 #.

14575 -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792

14573 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808

14574 #: builtin/pack-objects.c:2944

14575 #, c-format

14576 msgid "no threads support, ignoring %s"

@@ -15232,38 +15230,38 @@ msgid_plural "chain length = %d: %lu objects"

15230 msgstr[0] ""

15231 msgstr[1] ""

15232

15235 -#: builtin/index-pack.c:1749

15233 +#: builtin/index-pack.c:1765

15234 msgid "Cannot come back to cwd"

15235 msgstr ""

15236

15239 -#: builtin/index-pack.c:1803 builtin/index-pack.c:1806

15240 -#: builtin/index-pack.c:1822 builtin/index-pack.c:1826

15237 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1822

15238 +#: builtin/index-pack.c:1838 builtin/index-pack.c:1842

15239 #, c-format

15240 msgid "bad %s"

15241 msgstr ""

15242

15245 -#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625

15243 +#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625

15244 #, c-format

15245 msgid "unknown hash algorithm '%s'"

15246 msgstr ""

15247

15250 -#: builtin/index-pack.c:1851

15248 +#: builtin/index-pack.c:1867

15249 msgid "--fix-thin cannot be used without --stdin"

15250 msgstr ""

15251

15254 -#: builtin/index-pack.c:1853

15252 +#: builtin/index-pack.c:1869

15253 msgid "--stdin requires a git repository"

15254 msgstr ""

15255

15258 -#: builtin/index-pack.c:1855

15256 +#: builtin/index-pack.c:1871

15257 msgid "--object-format cannot be used with --stdin"

15258 msgstr ""

15259

15262 -#: builtin/index-pack.c:1870

15260 +#: builtin/index-pack.c:1886

15261 msgid "--verify with no packfile name given"

15262 msgstr ""

15263

15266 -#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582

15264 +#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582

15265 msgid "fsck error in pack objects"

15266 msgstr ""

15267

@@ -21969,15 +21967,23 @@ msgstr ""

21967 msgid "only useful for debugging"

21968 msgstr ""

21969

21972 -#: http-fetch.c:114

21970 +#: http-fetch.c:118

21971 #, c-format

21972 msgid "argument to --packfile must be a valid hash (got '%s')"

21973 msgstr ""

21974

21977 -#: http-fetch.c:122

21975 +#: http-fetch.c:128

21976 msgid "not a git repository"

21977 msgstr ""

21978

21979 +#: http-fetch.c:134

21980 +msgid "--packfile requires --index-pack-args"

21981 +msgstr ""

21982 +

21983 +#: http-fetch.c:143

21984 +msgid "--index-pack-args can only be used with --packfile"

21985 +msgstr ""

21986 +

21987 #: t/helper/test-fast-rebase.c:141

21988 msgid "unhandled options"

21989 msgstr ""

l10n: git.pot: v2.31.0 round 2 (9 new, 8 removed)