d0b62a5259 · 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-15 16:27+0800\n"

11 +"POT-Creation-Date: 2020-12-21 07:10+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"

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

69 msgid "note: %s is untracked now.\n"

70 msgstr ""

71

72 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295

72 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295

73 #: builtin/reset.c:145

74 #, c-format

75 msgid "make_cache_entry failed for path '%s'"

@@ -209,7 +209,7 @@ msgstr ""

209 msgid "unstaged"

210 msgstr ""

211

212 -#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257

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

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

@@ -999,7 +999,7 @@ msgstr ""

999 msgid "%s: does not exist in index"

1000 msgstr ""

1001

1002 -#: apply.c:3537 apply.c:3708 apply.c:3953

1002 +#: apply.c:3537 apply.c:3708 apply.c:3952

1003 #, c-format

1004 msgid "%s: does not match index"

1005 msgstr ""

@@ -1058,301 +1058,301 @@ msgstr ""

1058 msgid "%s: already exists in index"

1059 msgstr ""

1060

1061 -#: apply.c:3956

1061 +#: apply.c:3954

1062 #, c-format

1063 msgid "%s: already exists in working directory"

1064 msgstr ""

1065

1066 -#: apply.c:3976

1066 +#: apply.c:3974

1067 #, c-format

1068 msgid "new mode (%o) of %s does not match old mode (%o)"

1069 msgstr ""

1070

1071 -#: apply.c:3981

1071 +#: apply.c:3979

1072 #, c-format

1073 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1074 msgstr ""

1075

1076 -#: apply.c:4001

1076 +#: apply.c:3999

1077 #, c-format

1078 msgid "affected file '%s' is beyond a symbolic link"

1079 msgstr ""

1080

1081 -#: apply.c:4005

1081 +#: apply.c:4003

1082 #, c-format

1083 msgid "%s: patch does not apply"

1084 msgstr ""

1085

1086 -#: apply.c:4020

1086 +#: apply.c:4018

1087 #, c-format

1088 msgid "Checking patch %s..."

1089 msgstr ""

1090

1091 -#: apply.c:4112

1091 +#: apply.c:4110

1092 #, c-format

1093 msgid "sha1 information is lacking or useless for submodule %s"

1094 msgstr ""

1095

1096 -#: apply.c:4119

1096 +#: apply.c:4117

1097 #, c-format

1098 msgid "mode change for %s, which is not in current HEAD"

1099 msgstr ""

1100

1101 -#: apply.c:4122

1101 +#: apply.c:4120

1102 #, c-format

1103 msgid "sha1 information is lacking or useless (%s)."

1104 msgstr ""

1105

1106 -#: apply.c:4131

1106 +#: apply.c:4129

1107 #, c-format

1108 msgid "could not add %s to temporary index"

1109 msgstr ""

1110

1111 -#: apply.c:4141

1111 +#: apply.c:4139

1112 #, c-format

1113 msgid "could not write temporary index to %s"

1114 msgstr ""

1115

1116 -#: apply.c:4279

1116 +#: apply.c:4277

1117 #, c-format

1118 msgid "unable to remove %s from index"

1119 msgstr ""

1120

1121 -#: apply.c:4313

1121 +#: apply.c:4311

1122 #, c-format

1123 msgid "corrupt patch for submodule %s"

1124 msgstr ""

1125

1126 -#: apply.c:4319

1126 +#: apply.c:4317

1127 #, c-format

1128 msgid "unable to stat newly created file '%s'"

1129 msgstr ""

1130

1131 -#: apply.c:4327

1131 +#: apply.c:4325

1132 #, c-format

1133 msgid "unable to create backing store for newly created file %s"

1134 msgstr ""

1135

1136 -#: apply.c:4333 apply.c:4478

1136 +#: apply.c:4331 apply.c:4476

1137 #, c-format

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

1139 msgstr ""

1140

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

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

1142 #, c-format

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

1144 msgstr ""

1145

1146 -#: apply.c:4380

1146 +#: apply.c:4378

1147 #, c-format

1148 msgid "closing file '%s'"

1149 msgstr ""

1150

1151 -#: apply.c:4450

1151 +#: apply.c:4448

1152 #, c-format

1153 msgid "unable to write file '%s' mode %o"

1154 msgstr ""

1155

1156 -#: apply.c:4548

1156 +#: apply.c:4546

1157 #, c-format

1158 msgid "Applied patch %s cleanly."

1159 msgstr ""

1160

1161 -#: apply.c:4556

1161 +#: apply.c:4554

1162 msgid "internal error"

1163 msgstr ""

1164

1165 -#: apply.c:4559

1165 +#: apply.c:4557

1166 #, c-format

1167 msgid "Applying patch %%s with %d reject..."

1168 msgid_plural "Applying patch %%s with %d rejects..."

1169 msgstr[0] ""

1170 msgstr[1] ""

1171

1172 -#: apply.c:4570

1172 +#: apply.c:4568

1173 #, c-format

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

1175 msgstr ""

1176

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

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

1178 #, c-format

1179 msgid "cannot open %s"

1180 msgstr ""

1181

1182 -#: apply.c:4592

1182 +#: apply.c:4590

1183 #, c-format

1184 msgid "Hunk #%d applied cleanly."

1185 msgstr ""

1186

1187 -#: apply.c:4596

1187 +#: apply.c:4594

1188 #, c-format

1189 msgid "Rejected hunk #%d."

1190 msgstr ""

1191

1192 -#: apply.c:4720

1192 +#: apply.c:4718

1193 #, c-format

1194 msgid "Skipped patch '%s'."

1195 msgstr ""

1196

1197 -#: apply.c:4728

1197 +#: apply.c:4726

1198 msgid "unrecognized input"

1199 msgstr ""

1200

1201 -#: apply.c:4748

1201 +#: apply.c:4746

1202 msgid "unable to read index file"

1203 msgstr ""

1204

1205 -#: apply.c:4905

1205 +#: apply.c:4903

1206 #, c-format

1207 msgid "can't open patch '%s': %s"

1208 msgstr ""

1209

1210 -#: apply.c:4932

1210 +#: apply.c:4930

1211 #, c-format

1212 msgid "squelched %d whitespace error"

1213 msgid_plural "squelched %d whitespace errors"

1214 msgstr[0] ""

1215 msgstr[1] ""

1216

1217 -#: apply.c:4938 apply.c:4953

1217 +#: apply.c:4936 apply.c:4951

1218 #, c-format

1219 msgid "%d line adds whitespace errors."

1220 msgid_plural "%d lines add whitespace errors."

1221 msgstr[0] ""

1222 msgstr[1] ""

1223

1224 -#: apply.c:4946

1224 +#: apply.c:4944

1225 #, c-format

1226 msgid "%d line applied after fixing whitespace errors."

1227 msgid_plural "%d lines applied after fixing whitespace errors."

1228 msgstr[0] ""

1229 msgstr[1] ""

1230

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

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

1232 msgid "Unable to write new index file"

1233 msgstr ""

1234

1235 -#: apply.c:4990

1235 +#: apply.c:4988

1236 msgid "don't apply changes matching the given path"

1237 msgstr ""

1238

1239 -#: apply.c:4993

1239 +#: apply.c:4991

1240 msgid "apply changes matching the given path"

1241 msgstr ""

1242

1243 -#: apply.c:4995 builtin/am.c:2266

1243 +#: apply.c:4993 builtin/am.c:2266

1244 msgid "num"

1245 msgstr ""

1246

1247 -#: apply.c:4996

1247 +#: apply.c:4994

1248 msgid "remove <num> leading slashes from traditional diff paths"

1249 msgstr ""

1250

1251 -#: apply.c:4999

1251 +#: apply.c:4997

1252 msgid "ignore additions made by the patch"

1253 msgstr ""

1254

1255 -#: apply.c:5001

1255 +#: apply.c:4999

1256 msgid "instead of applying the patch, output diffstat for the input"

1257 msgstr ""

1258

1259 -#: apply.c:5005

1259 +#: apply.c:5003

1260 msgid "show number of added and deleted lines in decimal notation"

1261 msgstr ""

1262

1263 -#: apply.c:5007

1263 +#: apply.c:5005

1264 msgid "instead of applying the patch, output a summary for the input"

1265 msgstr ""

1266

1267 -#: apply.c:5009

1267 +#: apply.c:5007

1268 msgid "instead of applying the patch, see if the patch is applicable"

1269 msgstr ""

1270

1271 -#: apply.c:5011

1271 +#: apply.c:5009

1272 msgid "make sure the patch is applicable to the current index"

1273 msgstr ""

1274

1275 -#: apply.c:5013

1275 +#: apply.c:5011

1276 msgid "mark new files with `git add --intent-to-add`"

1277 msgstr ""

1278

1279 -#: apply.c:5015

1279 +#: apply.c:5013

1280 msgid "apply a patch without touching the working tree"

1281 msgstr ""

1282

1283 -#: apply.c:5017

1283 +#: apply.c:5015

1284 msgid "accept a patch that touches outside the working area"

1285 msgstr ""

1286

1287 -#: apply.c:5020

1287 +#: apply.c:5018

1288 msgid "also apply the patch (use with --stat/--summary/--check)"

1289 msgstr ""

1290

1291 -#: apply.c:5022

1291 +#: apply.c:5020

1292 msgid "attempt three-way merge if a patch does not apply"

1293 msgstr ""

1294

1295 -#: apply.c:5024

1295 +#: apply.c:5022

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

1297 msgstr ""

1298

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

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

1300 msgid "paths are separated with NUL character"

1301 msgstr ""

1302

1303 -#: apply.c:5029

1303 +#: apply.c:5027

1304 msgid "ensure at least <n> lines of context match"

1305 msgstr ""

1306

1307 -#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98

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

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

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

1310 msgid "action"

1311 msgstr ""

1312

1313 -#: apply.c:5031

1313 +#: apply.c:5029

1314 msgid "detect new or modified lines that have whitespace errors"

1315 msgstr ""

1316

1317 -#: apply.c:5034 apply.c:5037

1317 +#: apply.c:5032 apply.c:5035

1318 msgid "ignore changes in whitespace when finding context"

1319 msgstr ""

1320

1321 -#: apply.c:5040

1321 +#: apply.c:5038

1322 msgid "apply the patch in reverse"

1323 msgstr ""

1324

1325 -#: apply.c:5042

1325 +#: apply.c:5040

1326 msgid "don't expect at least one line of context"

1327 msgstr ""

1328

1329 -#: apply.c:5044

1329 +#: apply.c:5042

1330 msgid "leave the rejected hunks in corresponding *.rej files"

1331 msgstr ""

1332

1333 -#: apply.c:5046

1333 +#: apply.c:5044

1334 msgid "allow overlapping hunks"

1335 msgstr ""

1336

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

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

1340 msgid "be verbose"

1341 msgstr ""

1342

1343 -#: apply.c:5049

1343 +#: apply.c:5047

1344 msgid "tolerate incorrectly detected missing new-line at the end of file"

1345 msgstr ""

1346

1347 -#: apply.c:5052

1347 +#: apply.c:5050

1348 msgid "do not trust the line counts in the hunk headers"

1349 msgstr ""

1350

1351 -#: apply.c:5054 builtin/am.c:2254

1351 +#: apply.c:5052 builtin/am.c:2254

1352 msgid "root"

1353 msgstr ""

1354

1355 -#: apply.c:5055

1355 +#: apply.c:5053

1356 msgid "prepend <root> to all filenames"

1357 msgstr ""

1358

@@ -1481,8 +1481,8 @@ msgstr ""

1481

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

1484 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

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

1484 +#: 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

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

1488 msgid "file"

@@ -2006,193 +2006,184 @@ msgstr ""

2006 msgid "could not find commit %s"

2007 msgstr ""

2008

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

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

2010 #, c-format

2011 msgid "unable to parse commit %s"

2012 msgstr ""

2013

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

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

2015 #, c-format

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

2017 msgstr ""

2018

2019 -#: commit-graph.c:1301

2019 +#: commit-graph.c:1283

2020 msgid "Loading known commits in commit graph"

2021 msgstr ""

2022

2023 -#: commit-graph.c:1318

2023 +#: commit-graph.c:1300

2024 msgid "Expanding reachable commits in commit graph"

2025 msgstr ""

2026

2027 -#: commit-graph.c:1338

2027 +#: commit-graph.c:1320

2028 msgid "Clearing commit marks in commit graph"

2029 msgstr ""

2030

2031 -#: commit-graph.c:1357

2031 +#: commit-graph.c:1339

2032 msgid "Computing commit graph generation numbers"

2033 msgstr ""

2034

2035 -#: commit-graph.c:1424

2035 +#: commit-graph.c:1406

2036 msgid "Computing commit changed paths Bloom filters"

2037 msgstr ""

2038

2039 -#: commit-graph.c:1501

2039 +#: commit-graph.c:1483

2040 msgid "Collecting referenced commits"

2041 msgstr ""

2042

2043 -#: commit-graph.c:1526

2043 +#: commit-graph.c:1508

2044 #, c-format

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

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

2047 msgstr[0] ""

2048 msgstr[1] ""

2049

2050 -#: commit-graph.c:1539

2050 +#: commit-graph.c:1521

2051 #, c-format

2052 msgid "error adding pack %s"

2053 msgstr ""

2054

2055 -#: commit-graph.c:1543

2055 +#: commit-graph.c:1525

2056 #, c-format

2057 msgid "error opening index for %s"

2058 msgstr ""

2059

2060 -#: commit-graph.c:1582

2060 +#: commit-graph.c:1562

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

2062 msgstr ""

2063

2064 -#: commit-graph.c:1597

2065 -msgid "Counting distinct commits in commit graph"

2066 -msgstr ""

2067 -

2068 -#: commit-graph.c:1629

2064 +#: commit-graph.c:1580

2065 msgid "Finding extra edges in commit graph"

2066 msgstr ""

2067

2072 -#: commit-graph.c:1678

2068 +#: commit-graph.c:1628

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

2070 msgstr ""

2071

2076 -#: commit-graph.c:1720 midx.c:819

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

2073 #, c-format

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

2075 msgstr ""

2076

2081 -#: commit-graph.c:1733

2077 +#: commit-graph.c:1683

2078 msgid "unable to create temporary graph layer"

2079 msgstr ""

2080

2085 -#: commit-graph.c:1738

2081 +#: commit-graph.c:1688

2082 #, c-format

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

2084 msgstr ""

2085

2090 -#: commit-graph.c:1808

2086 +#: commit-graph.c:1758

2087 #, c-format

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

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

2090 msgstr[0] ""

2091 msgstr[1] ""

2092

2097 -#: commit-graph.c:1853

2093 +#: commit-graph.c:1803

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

2095 msgstr ""

2096

2101 -#: commit-graph.c:1869

2097 +#: commit-graph.c:1819

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

2099 msgstr ""

2100

2105 -#: commit-graph.c:1889

2101 +#: commit-graph.c:1839

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

2103 msgstr ""

2104

2109 -#: commit-graph.c:2015

2105 +#: commit-graph.c:1965

2106 msgid "Scanning merged commits"

2107 msgstr ""

2108

2113 -#: commit-graph.c:2059

2109 +#: commit-graph.c:2009

2110 msgid "Merging commit-graph"

2111 msgstr ""

2112

2117 -#: commit-graph.c:2165

2113 +#: commit-graph.c:2115

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

2115 msgstr ""

2116

2121 -#: commit-graph.c:2274

2122 -#, c-format

2123 -msgid "the commit graph format cannot write %d commits"

2124 -msgstr ""

2125 -

2126 -#: commit-graph.c:2285

2117 +#: commit-graph.c:2214

2118 msgid "too many commits to write graph"

2119 msgstr ""

2120

2130 -#: commit-graph.c:2378

2121 +#: commit-graph.c:2307

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

2123 msgstr ""

2124

2134 -#: commit-graph.c:2388

2125 +#: commit-graph.c:2317

2126 #, c-format

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

2128 msgstr ""

2129

2139 -#: commit-graph.c:2398 commit-graph.c:2413

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

2131 #, c-format

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

2133 msgstr ""

2134

2144 -#: commit-graph.c:2405

2135 +#: commit-graph.c:2334

2136 #, c-format

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

2138 msgstr ""

2139

2149 -#: commit-graph.c:2423

2140 +#: commit-graph.c:2352

2141 msgid "Verifying commits in commit graph"

2142 msgstr ""

2143

2153 -#: commit-graph.c:2438

2144 +#: commit-graph.c:2367

2145 #, c-format

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

2147 msgstr ""

2148

2158 -#: commit-graph.c:2445

2149 +#: commit-graph.c:2374

2150 #, c-format

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

2152 msgstr ""

2153

2163 -#: commit-graph.c:2455

2154 +#: commit-graph.c:2384

2155 #, c-format

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

2157 msgstr ""

2158

2168 -#: commit-graph.c:2464

2159 +#: commit-graph.c:2393

2160 #, c-format

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

2162 msgstr ""

2163

2173 -#: commit-graph.c:2478

2164 +#: commit-graph.c:2407

2165 #, c-format

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

2167 msgstr ""

2168

2178 -#: commit-graph.c:2483

2169 +#: commit-graph.c:2412

2170 #, c-format

2171 msgid ""

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

2173 msgstr ""

2174

2184 -#: commit-graph.c:2487

2175 +#: commit-graph.c:2416

2176 #, c-format

2177 msgid ""

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

2179 msgstr ""

2180

2190 -#: commit-graph.c:2503

2181 +#: commit-graph.c:2432

2182 #, c-format

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

2184 msgstr ""

2185

2195 -#: commit-graph.c:2509

2186 +#: commit-graph.c:2438

2187 #, c-format

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

2189 msgstr ""

@@ -3045,519 +3036,519 @@ msgstr ""

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

3037 msgstr ""

3038

3048 -#: diff.c:4706

3039 +#: diff.c:4707

3040 msgid "--follow requires exactly one pathspec"

3041 msgstr ""

3042

3052 -#: diff.c:4754

3043 +#: diff.c:4755

3044 #, c-format

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

3046 msgstr ""

3047

3057 -#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302

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

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

3050 #, c-format

3051 msgid "%s expects a numerical value"

3052 msgstr ""

3053

3063 -#: diff.c:4791

3054 +#: diff.c:4792

3055 #, c-format

3056 msgid ""

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

3058 "%s"

3059 msgstr ""

3060

3070 -#: diff.c:4876

3061 +#: diff.c:4877

3062 #, c-format

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

3064 msgstr ""

3065

3075 -#: diff.c:4900

3066 +#: diff.c:4901

3067 #, c-format

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

3069 msgstr ""

3070

3080 -#: diff.c:4914

3071 +#: diff.c:4915

3072 #, c-format

3073 msgid "unable to resolve '%s'"

3074 msgstr ""

3075

3085 -#: diff.c:4964 diff.c:4970

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

3077 #, c-format

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

3079 msgstr ""

3080

3090 -#: diff.c:4982

3081 +#: diff.c:4983

3082 #, c-format

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

3084 msgstr ""

3085

3095 -#: diff.c:5003

3086 +#: diff.c:5004

3087 #, c-format

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

3089 msgstr ""

3090

3100 -#: diff.c:5022

3091 +#: diff.c:5023

3092 #, c-format

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

3094 msgstr ""

3095

3105 -#: diff.c:5062

3096 +#: diff.c:5063

3097 msgid ""

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

3099 "\"histogram\""

3100 msgstr ""

3101

3111 -#: diff.c:5098 diff.c:5118

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

3103 #, c-format

3104 msgid "invalid argument to %s"

3105 msgstr ""

3106

3116 -#: diff.c:5222

3107 +#: diff.c:5223

3108 #, c-format

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

3110 msgstr ""

3111

3121 -#: diff.c:5271

3112 +#: diff.c:5272

3113 #, c-format

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

3115 msgstr ""

3116

3126 -#: diff.c:5327

3117 +#: diff.c:5328

3118 #, c-format

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

3120 msgstr ""

3121

3131 -#: diff.c:5350

3122 +#: diff.c:5351

3123 msgid "Diff output format options"

3124 msgstr ""

3125

3135 -#: diff.c:5352 diff.c:5358

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

3127 msgid "generate patch"

3128 msgstr ""

3129

3139 -#: diff.c:5355 builtin/log.c:178

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

3131 msgid "suppress diff output"

3132 msgstr ""

3133

3143 -#: diff.c:5360 diff.c:5474 diff.c:5481

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

3135 msgid "<n>"

3136 msgstr ""

3137

3147 -#: diff.c:5361 diff.c:5364

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

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

3140 msgstr ""

3141

3151 -#: diff.c:5366

3142 +#: diff.c:5367

3143 msgid "generate the diff in raw format"

3144 msgstr ""

3145

3155 -#: diff.c:5369

3146 +#: diff.c:5370

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

3148 msgstr ""

3149

3159 -#: diff.c:5373

3150 +#: diff.c:5374

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

3152 msgstr ""

3153

3163 -#: diff.c:5377

3154 +#: diff.c:5378

3155 msgid "machine friendly --stat"

3156 msgstr ""

3157

3167 -#: diff.c:5380

3158 +#: diff.c:5381

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

3160 msgstr ""

3161

3171 -#: diff.c:5382 diff.c:5390

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

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

3164 msgstr ""

3165

3175 -#: diff.c:5383

3166 +#: diff.c:5384

3167 msgid ""

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

3169 msgstr ""

3170

3180 -#: diff.c:5387

3171 +#: diff.c:5388

3172 msgid "synonym for --dirstat=cumulative"

3173 msgstr ""

3174

3184 -#: diff.c:5391

3175 +#: diff.c:5392

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

3177 msgstr ""

3178

3188 -#: diff.c:5395

3179 +#: diff.c:5396

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

3181 msgstr ""

3182

3192 -#: diff.c:5398

3183 +#: diff.c:5399

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

3185 msgstr ""

3186

3196 -#: diff.c:5401

3187 +#: diff.c:5402

3188 msgid "show only names of changed files"

3189 msgstr ""

3190

3200 -#: diff.c:5404

3191 +#: diff.c:5405

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

3193 msgstr ""

3194

3204 -#: diff.c:5406

3195 +#: diff.c:5407

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

3197 msgstr ""

3198

3208 -#: diff.c:5407

3199 +#: diff.c:5408

3200 msgid "generate diffstat"

3201 msgstr ""

3202

3212 -#: diff.c:5409 diff.c:5412 diff.c:5415

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

3204 msgid "<width>"

3205 msgstr ""

3206

3216 -#: diff.c:5410

3207 +#: diff.c:5411

3208 msgid "generate diffstat with a given width"

3209 msgstr ""

3210

3220 -#: diff.c:5413

3211 +#: diff.c:5414

3212 msgid "generate diffstat with a given name width"

3213 msgstr ""

3214

3224 -#: diff.c:5416

3215 +#: diff.c:5417

3216 msgid "generate diffstat with a given graph width"

3217 msgstr ""

3218

3228 -#: diff.c:5418

3219 +#: diff.c:5419

3220 msgid "<count>"

3221 msgstr ""

3222

3232 -#: diff.c:5419

3223 +#: diff.c:5420

3224 msgid "generate diffstat with limited lines"

3225 msgstr ""

3226

3236 -#: diff.c:5422

3227 +#: diff.c:5423

3228 msgid "generate compact summary in diffstat"

3229 msgstr ""

3230

3240 -#: diff.c:5425

3231 +#: diff.c:5426

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

3233 msgstr ""

3234

3244 -#: diff.c:5428

3235 +#: diff.c:5429

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

3237 msgstr ""

3238

3248 -#: diff.c:5430

3239 +#: diff.c:5431

3240 msgid "show colored diff"

3241 msgstr ""

3242

3252 -#: diff.c:5431

3243 +#: diff.c:5432

3244 msgid "<kind>"

3245 msgstr ""

3246

3256 -#: diff.c:5432

3247 +#: diff.c:5433

3248 msgid ""

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

3250 "diff"

3251 msgstr ""

3252

3262 -#: diff.c:5435

3253 +#: diff.c:5436

3254 msgid ""

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

3256 "--numstat"

3257 msgstr ""

3258

3268 -#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553

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

3260 msgid "<prefix>"

3261 msgstr ""

3262

3272 -#: diff.c:5439

3263 +#: diff.c:5440

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

3265 msgstr ""

3266

3276 -#: diff.c:5442

3267 +#: diff.c:5443

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

3269 msgstr ""

3270

3280 -#: diff.c:5445

3271 +#: diff.c:5446

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

3273 msgstr ""

3274

3284 -#: diff.c:5448

3275 +#: diff.c:5449

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

3277 msgstr ""

3278

3288 -#: diff.c:5451

3279 +#: diff.c:5452

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

3281 msgstr ""

3282

3292 -#: diff.c:5455 diff.c:5460 diff.c:5465

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

3284 msgid "<char>"

3285 msgstr ""

3286

3296 -#: diff.c:5456

3287 +#: diff.c:5457

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

3289 msgstr ""

3290

3300 -#: diff.c:5461

3291 +#: diff.c:5462

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

3293 msgstr ""

3294

3304 -#: diff.c:5466

3295 +#: diff.c:5467

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

3297 msgstr ""

3298

3308 -#: diff.c:5469

3299 +#: diff.c:5470

3300 msgid "Diff rename options"

3301 msgstr ""

3302

3312 -#: diff.c:5470

3303 +#: diff.c:5471

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

3305 msgstr ""

3306

3316 -#: diff.c:5471

3307 +#: diff.c:5472

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

3309 msgstr ""

3310

3320 -#: diff.c:5475

3311 +#: diff.c:5476

3312 msgid "detect renames"

3313 msgstr ""

3314

3324 -#: diff.c:5479

3315 +#: diff.c:5480

3316 msgid "omit the preimage for deletes"

3317 msgstr ""

3318

3328 -#: diff.c:5482

3319 +#: diff.c:5483

3320 msgid "detect copies"

3321 msgstr ""

3322

3332 -#: diff.c:5486

3323 +#: diff.c:5487

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

3325 msgstr ""

3326

3336 -#: diff.c:5488

3327 +#: diff.c:5489

3328 msgid "disable rename detection"

3329 msgstr ""

3330

3340 -#: diff.c:5491

3331 +#: diff.c:5492

3332 msgid "use empty blobs as rename source"

3333 msgstr ""

3334

3344 -#: diff.c:5493

3335 +#: diff.c:5494

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

3337 msgstr ""

3338

3348 -#: diff.c:5496

3339 +#: diff.c:5497

3340 msgid ""

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

3342 "given limit"

3343 msgstr ""

3344

3354 -#: diff.c:5498

3345 +#: diff.c:5499

3346 msgid "Diff algorithm options"

3347 msgstr ""

3348

3358 -#: diff.c:5500

3349 +#: diff.c:5501

3350 msgid "produce the smallest possible diff"

3351 msgstr ""

3352

3362 -#: diff.c:5503

3353 +#: diff.c:5504

3354 msgid "ignore whitespace when comparing lines"

3355 msgstr ""

3356

3366 -#: diff.c:5506

3357 +#: diff.c:5507

3358 msgid "ignore changes in amount of whitespace"

3359 msgstr ""

3360

3370 -#: diff.c:5509

3361 +#: diff.c:5510

3362 msgid "ignore changes in whitespace at EOL"

3363 msgstr ""

3364

3374 -#: diff.c:5512

3365 +#: diff.c:5513

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

3367 msgstr ""

3368

3378 -#: diff.c:5515

3369 +#: diff.c:5516

3370 msgid "ignore changes whose lines are all blank"

3371 msgstr ""

3372

3382 -#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587

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

3374 msgid "<regex>"

3375 msgstr ""

3376

3386 -#: diff.c:5518

3377 +#: diff.c:5519

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

3379 msgstr ""

3380

3390 -#: diff.c:5521

3381 +#: diff.c:5522

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

3383 msgstr ""

3384

3394 -#: diff.c:5524

3385 +#: diff.c:5525

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

3387 msgstr ""

3388

3398 -#: diff.c:5528

3389 +#: diff.c:5529

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

3391 msgstr ""

3392

3402 -#: diff.c:5530

3393 +#: diff.c:5531

3394 msgid "<algorithm>"

3395 msgstr ""

3396

3406 -#: diff.c:5531

3397 +#: diff.c:5532

3398 msgid "choose a diff algorithm"

3399 msgstr ""

3400

3410 -#: diff.c:5533

3401 +#: diff.c:5534

3402 msgid "<text>"

3403 msgstr ""

3404

3414 -#: diff.c:5534

3405 +#: diff.c:5535

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

3407 msgstr ""

3408

3418 -#: diff.c:5536 diff.c:5545 diff.c:5548

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

3410 msgid "<mode>"

3411 msgstr ""

3412

3422 -#: diff.c:5537

3413 +#: diff.c:5538

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

3415 msgstr ""

3416

3426 -#: diff.c:5540

3417 +#: diff.c:5541

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

3419 msgstr ""

3420

3430 -#: diff.c:5543

3421 +#: diff.c:5544

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

3423 msgstr ""

3424

3434 -#: diff.c:5546

3425 +#: diff.c:5547

3426 msgid "moved lines of code are colored differently"

3427 msgstr ""

3428

3438 -#: diff.c:5549

3429 +#: diff.c:5550

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

3431 msgstr ""

3432

3442 -#: diff.c:5552

3433 +#: diff.c:5553

3434 msgid "Other diff options"

3435 msgstr ""

3436

3446 -#: diff.c:5554

3437 +#: diff.c:5555

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

3439 msgstr ""

3440

3450 -#: diff.c:5558

3441 +#: diff.c:5559

3442 msgid "treat all files as text"

3443 msgstr ""

3444

3454 -#: diff.c:5560

3445 +#: diff.c:5561

3446 msgid "swap two inputs, reverse the diff"

3447 msgstr ""

3448

3458 -#: diff.c:5562

3449 +#: diff.c:5563

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

3451 msgstr ""

3452

3462 -#: diff.c:5564

3453 +#: diff.c:5565

3454 msgid "disable all output of the program"

3455 msgstr ""

3456

3466 -#: diff.c:5566

3457 +#: diff.c:5567

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

3459 msgstr ""

3460

3470 -#: diff.c:5568

3461 +#: diff.c:5569

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

3463 msgstr ""

3464

3474 -#: diff.c:5570

3465 +#: diff.c:5571

3466 msgid "<when>"

3467 msgstr ""

3468

3478 -#: diff.c:5571

3469 +#: diff.c:5572

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

3471 msgstr ""

3472

3482 -#: diff.c:5574

3473 +#: diff.c:5575

3474 msgid "<format>"

3475 msgstr ""

3476

3486 -#: diff.c:5575

3477 +#: diff.c:5576

3478 msgid "specify how differences in submodules are shown"

3479 msgstr ""

3480

3490 -#: diff.c:5579

3481 +#: diff.c:5580

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

3483 msgstr ""

3484

3494 -#: diff.c:5582

3485 +#: diff.c:5583

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

3487 msgstr ""

3488

3498 -#: diff.c:5584

3489 +#: diff.c:5585

3490 msgid "<string>"

3491 msgstr ""

3492

3502 -#: diff.c:5585

3493 +#: diff.c:5586

3494 msgid ""

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

3496 "string"

3497 msgstr ""

3498

3508 -#: diff.c:5588

3499 +#: diff.c:5589

3500 msgid ""

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

3502 "regex"

3503 msgstr ""

3504

3514 -#: diff.c:5591

3505 +#: diff.c:5592

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

3507 msgstr ""

3508

3518 -#: diff.c:5594

3509 +#: diff.c:5595

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

3511 msgstr ""

3512

3522 -#: diff.c:5597

3513 +#: diff.c:5598

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

3515 msgstr ""

3516

3526 -#: diff.c:5598

3517 +#: diff.c:5599

3518 msgid "<object-id>"

3519 msgstr ""

3520

3530 -#: diff.c:5599

3521 +#: diff.c:5600

3522 msgid ""

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

3524 "object"

3525 msgstr ""

3526

3536 -#: diff.c:5601

3527 +#: diff.c:5602

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

3529 msgstr ""

3530

3540 -#: diff.c:5602

3531 +#: diff.c:5603

3532 msgid "select files by diff type"

3533 msgstr ""

3534

3544 -#: diff.c:5604

3535 +#: diff.c:5605

3536 msgid "<file>"

3537 msgstr ""

3538

3548 -#: diff.c:5605

3539 +#: diff.c:5606

3540 msgid "Output to a specific file"

3541 msgstr ""

3542

3552 -#: diff.c:6262

3543 +#: diff.c:6263

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

3545 msgstr ""

3546

3556 -#: diff.c:6265

3547 +#: diff.c:6266

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

3549 msgstr ""

3550

3560 -#: diff.c:6268

3551 +#: diff.c:6269

3552 #, c-format

3553 msgid ""

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

@@ -5712,7 +5703,7 @@ msgstr ""

5703 msgid "ignoring ref with broken name %s"

5704 msgstr ""

5705

5715 -#: ref-filter.c:2156 refs.c:660

5706 +#: ref-filter.c:2156 refs.c:676

5707 #, c-format

5708 msgid "ignoring broken ref %s"

5709 msgstr ""

@@ -5737,65 +5728,80 @@ msgstr ""

5728 msgid "%s does not point to a valid object!"

5729 msgstr ""

5730

5740 -#: refs.c:575

5731 +#: refs.c:566

5732 +#, c-format

5733 +msgid ""

5734 +"Using '%s' as the name for the initial branch. This default branch name\n"

5735 +"is subject to change. To configure the initial branch name to use in all\n"

5736 +"of your new repositories, which will suppress this warning, call:\n"

5737 +"\n"

5738 +"\tgit config --global init.defaultBranch <name>\n"

5739 +"\n"

5740 +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"

5741 +"'development'. The just-created branch can be renamed via this command:\n"

5742 +"\n"

5743 +"\tgit branch -m <name>\n"

5744 +msgstr ""

5745 +

5746 +#: refs.c:588

5747 #, c-format

5748 msgid "could not retrieve `%s`"

5749 msgstr ""

5750

5745 -#: refs.c:582

5751 +#: refs.c:598

5752 #, c-format

5753 msgid "invalid branch name: %s = %s"

5754 msgstr ""

5755

5750 -#: refs.c:658

5756 +#: refs.c:674

5757 #, c-format

5758 msgid "ignoring dangling symref %s"

5759 msgstr ""

5760

5755 -#: refs.c:895

5761 +#: refs.c:911

5762 #, c-format

5763 msgid "log for ref %s has gap after %s"

5764 msgstr ""

5765

5760 -#: refs.c:901

5766 +#: refs.c:917

5767 #, c-format

5768 msgid "log for ref %s unexpectedly ended on %s"

5769 msgstr ""

5770

5765 -#: refs.c:960

5771 +#: refs.c:976

5772 #, c-format

5773 msgid "log for %s is empty"

5774 msgstr ""

5775

5770 -#: refs.c:1052

5776 +#: refs.c:1068

5777 #, c-format

5778 msgid "refusing to update ref with bad name '%s'"

5779 msgstr ""

5780

5775 -#: refs.c:1123

5781 +#: refs.c:1139

5782 #, c-format

5783 msgid "update_ref failed for ref '%s': %s"

5784 msgstr ""

5785

5780 -#: refs.c:1947

5786 +#: refs.c:1963

5787 #, c-format

5788 msgid "multiple updates for ref '%s' not allowed"

5789 msgstr ""

5790

5785 -#: refs.c:2027

5791 +#: refs.c:2043

5792 msgid "ref updates forbidden inside quarantine environment"

5793 msgstr ""

5794

5789 -#: refs.c:2038

5795 +#: refs.c:2054

5796 msgid "ref updates aborted by hook"

5797 msgstr ""

5798

5793 -#: refs.c:2138 refs.c:2168

5799 +#: refs.c:2154 refs.c:2184

5800 #, c-format

5801 msgid "'%s' exists; cannot create '%s'"

5802 msgstr ""

5803

5798 -#: refs.c:2144 refs.c:2179

5804 +#: refs.c:2160 refs.c:2195

5805 #, c-format

5806 msgid "cannot process '%s' and '%s' at the same time"

5807 msgstr ""

@@ -6053,7 +6059,7 @@ msgstr[1] ""

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

6060 msgstr ""

6061

6056 -#: remote.c:2348

6062 +#: remote.c:2349

6063 #, c-format

6064 msgid "cannot parse expected object name '%s'"

6065 msgstr ""

@@ -7713,7 +7719,7 @@ msgstr ""

7719 msgid "process for submodule '%s' failed"

7720 msgstr ""

7721

7716 -#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469

7722 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469

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

7724 msgstr ""

7725

@@ -9407,7 +9413,7 @@ msgstr ""

9413 msgid "allow fall back on 3way merging if needed"

9414 msgstr ""

9415

9410 -#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16

9416 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16

9417 #: builtin/repack.c:335 builtin/stash.c:815

9418 msgid "be quiet"

9419 msgstr ""

@@ -9460,7 +9466,7 @@ msgstr ""

9466 msgid "n"

9467 msgstr ""

9468

9463 -#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136

9469 +#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136

9470 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438

9471 #: builtin/verify-tag.c:38

9472 msgid "format"

@@ -10194,38 +10200,38 @@ msgstr ""

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

10201 msgstr ""

10202

10197 -#: builtin/branch.c:542

10203 +#: builtin/branch.c:544

10204 msgid "Branch rename failed"

10205 msgstr ""

10206

10201 -#: builtin/branch.c:544

10207 +#: builtin/branch.c:546

10208 msgid "Branch copy failed"

10209 msgstr ""

10210

10205 -#: builtin/branch.c:548

10211 +#: builtin/branch.c:550

10212 #, c-format

10213 msgid "Created a copy of a misnamed branch '%s'"

10214 msgstr ""

10215

10210 -#: builtin/branch.c:551

10216 +#: builtin/branch.c:553

10217 #, c-format

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

10219 msgstr ""

10220

10215 -#: builtin/branch.c:557

10221 +#: builtin/branch.c:559

10222 #, c-format

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

10224 msgstr ""

10225

10220 -#: builtin/branch.c:566

10226 +#: builtin/branch.c:568

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

10228 msgstr ""

10229

10224 -#: builtin/branch.c:568

10230 +#: builtin/branch.c:570

10231 msgid "Branch is copied, but update of config-file failed"

10232 msgstr ""

10233

10228 -#: builtin/branch.c:584

10234 +#: builtin/branch.c:586

10235 #, c-format

10236 msgid ""

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

@@ -10233,215 +10239,215 @@ msgid ""

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

10240 msgstr ""

10241

10236 -#: builtin/branch.c:618

10242 +#: builtin/branch.c:620

10243 msgid "Generic options"

10244 msgstr ""

10245

10240 -#: builtin/branch.c:620

10246 +#: builtin/branch.c:622

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

10248 msgstr ""

10249

10244 -#: builtin/branch.c:621

10250 +#: builtin/branch.c:623

10251 msgid "suppress informational messages"

10252 msgstr ""

10253

10248 -#: builtin/branch.c:622

10254 +#: builtin/branch.c:624

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

10256 msgstr ""

10257

10252 -#: builtin/branch.c:624

10258 +#: builtin/branch.c:626

10259 msgid "do not use"

10260 msgstr ""

10261

10256 -#: builtin/branch.c:626 builtin/rebase.c:532

10262 +#: builtin/branch.c:628 builtin/rebase.c:532

10263 msgid "upstream"

10264 msgstr ""

10265

10260 -#: builtin/branch.c:626

10266 +#: builtin/branch.c:628

10267 msgid "change the upstream info"

10268 msgstr ""

10269

10264 -#: builtin/branch.c:627

10270 +#: builtin/branch.c:629

10271 msgid "unset the upstream info"

10272 msgstr ""

10273

10268 -#: builtin/branch.c:628

10274 +#: builtin/branch.c:630

10275 msgid "use colored output"

10276 msgstr ""

10277

10272 -#: builtin/branch.c:629

10278 +#: builtin/branch.c:631

10279 msgid "act on remote-tracking branches"

10280 msgstr ""

10281

10276 -#: builtin/branch.c:631 builtin/branch.c:633

10282 +#: builtin/branch.c:633 builtin/branch.c:635

10283 msgid "print only branches that contain the commit"

10284 msgstr ""

10285

10280 -#: builtin/branch.c:632 builtin/branch.c:634

10286 +#: builtin/branch.c:634 builtin/branch.c:636

10287 msgid "print only branches that don't contain the commit"

10288 msgstr ""

10289

10284 -#: builtin/branch.c:637

10290 +#: builtin/branch.c:639

10291 msgid "Specific git-branch actions:"

10292 msgstr ""

10293

10288 -#: builtin/branch.c:638

10294 +#: builtin/branch.c:640

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

10296 msgstr ""

10297

10292 -#: builtin/branch.c:640

10298 +#: builtin/branch.c:642

10299 msgid "delete fully merged branch"

10300 msgstr ""

10301

10296 -#: builtin/branch.c:641

10302 +#: builtin/branch.c:643

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

10304 msgstr ""

10305

10300 -#: builtin/branch.c:642

10306 +#: builtin/branch.c:644

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

10308 msgstr ""

10309

10304 -#: builtin/branch.c:643

10310 +#: builtin/branch.c:645

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

10312 msgstr ""

10313

10308 -#: builtin/branch.c:644

10314 +#: builtin/branch.c:646

10315 msgid "copy a branch and its reflog"

10316 msgstr ""

10317

10312 -#: builtin/branch.c:645

10318 +#: builtin/branch.c:647

10319 msgid "copy a branch, even if target exists"

10320 msgstr ""

10321

10316 -#: builtin/branch.c:646

10322 +#: builtin/branch.c:648

10323 msgid "list branch names"

10324 msgstr ""

10325

10320 -#: builtin/branch.c:647

10326 +#: builtin/branch.c:649

10327 msgid "show current branch name"

10328 msgstr ""

10329

10324 -#: builtin/branch.c:648

10330 +#: builtin/branch.c:650

10331 msgid "create the branch's reflog"

10332 msgstr ""

10333

10328 -#: builtin/branch.c:650

10334 +#: builtin/branch.c:652

10335 msgid "edit the description for the branch"

10336 msgstr ""

10337

10332 -#: builtin/branch.c:651

10338 +#: builtin/branch.c:653

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

10340 msgstr ""

10341

10336 -#: builtin/branch.c:652

10342 +#: builtin/branch.c:654

10343 msgid "print only branches that are merged"

10344 msgstr ""

10345

10340 -#: builtin/branch.c:653

10346 +#: builtin/branch.c:655

10347 msgid "print only branches that are not merged"

10348 msgstr ""

10349

10344 -#: builtin/branch.c:654

10350 +#: builtin/branch.c:656

10351 msgid "list branches in columns"

10352 msgstr ""

10353

10348 -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415

10354 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415

10355 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584

10356 #: builtin/tag.c:434

10357 msgid "object"

10358 msgstr ""

10359

10354 -#: builtin/branch.c:657

10360 +#: builtin/branch.c:659

10361 msgid "print only branches of the object"

10362 msgstr ""

10363

10358 -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441

10364 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441

10365 msgid "sorting and filtering are case insensitive"

10366 msgstr ""

10367

10362 -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439

10368 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439

10369 #: builtin/verify-tag.c:38

10370 msgid "format to use for the output"

10371 msgstr ""

10372

10367 -#: builtin/branch.c:682 builtin/clone.c:790

10373 +#: builtin/branch.c:684 builtin/clone.c:790

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

10375 msgstr ""

10376

10371 -#: builtin/branch.c:706

10377 +#: builtin/branch.c:708

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

10379 msgstr ""

10380

10375 -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784

10381 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786

10382 msgid "branch name required"

10383 msgstr ""

10384

10379 -#: builtin/branch.c:751

10385 +#: builtin/branch.c:753

10386 msgid "Cannot give description to detached HEAD"

10387 msgstr ""

10388

10383 -#: builtin/branch.c:756

10389 +#: builtin/branch.c:758

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

10391 msgstr ""

10392

10387 -#: builtin/branch.c:763

10393 +#: builtin/branch.c:765

10394 #, c-format

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

10396 msgstr ""

10397

10392 -#: builtin/branch.c:766

10398 +#: builtin/branch.c:768

10399 #, c-format

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

10401 msgstr ""

10402

10397 -#: builtin/branch.c:781

10403 +#: builtin/branch.c:783

10404 msgid "too many branches for a copy operation"

10405 msgstr ""

10406

10401 -#: builtin/branch.c:790

10407 +#: builtin/branch.c:792

10408 msgid "too many arguments for a rename operation"

10409 msgstr ""

10410

10405 -#: builtin/branch.c:795

10411 +#: builtin/branch.c:797

10412 msgid "too many arguments to set new upstream"

10413 msgstr ""

10414

10409 -#: builtin/branch.c:799

10415 +#: builtin/branch.c:801

10416 #, c-format

10417 msgid ""

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

10419 msgstr ""

10420

10415 -#: builtin/branch.c:802 builtin/branch.c:825

10421 +#: builtin/branch.c:804 builtin/branch.c:827

10422 #, c-format

10423 msgid "no such branch '%s'"

10424 msgstr ""

10425

10420 -#: builtin/branch.c:806

10426 +#: builtin/branch.c:808

10427 #, c-format

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

10429 msgstr ""

10430

10425 -#: builtin/branch.c:819

10431 +#: builtin/branch.c:821

10432 msgid "too many arguments to unset upstream"

10433 msgstr ""

10434

10429 -#: builtin/branch.c:823

10435 +#: builtin/branch.c:825

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

10437 msgstr ""

10438

10433 -#: builtin/branch.c:829

10439 +#: builtin/branch.c:831

10440 #, c-format

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

10442 msgstr ""

10443

10438 -#: builtin/branch.c:839

10444 +#: builtin/branch.c:841

10445 msgid ""

10446 "The -a, and -r, options to 'git branch' do not take a branch name.\n"

10447 "Did you mean to use: -a|-r --list <pattern>?"

10448 msgstr ""

10449

10444 -#: builtin/branch.c:843

10450 +#: builtin/branch.c:845

10451 msgid ""

10452 "the '--set-upstream' option is no longer supported. Please use '--track' or "

10453 "'--set-upstream-to' instead."

@@ -11465,7 +11471,7 @@ msgstr ""

11471 msgid "don't create a checkout"

11472 msgstr ""

11473

11468 -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553

11474 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555

11475 msgid "create a bare repository"

11476 msgstr ""

11477

@@ -11497,11 +11503,11 @@ msgstr ""

11503 msgid "number of submodules cloned in parallel"

11504 msgstr ""

11505

11500 -#: builtin/clone.c:112 builtin/init-db.c:550

11506 +#: builtin/clone.c:112 builtin/init-db.c:552

11507 msgid "template-directory"

11508 msgstr ""

11509

11504 -#: builtin/clone.c:113 builtin/init-db.c:551

11510 +#: builtin/clone.c:113 builtin/init-db.c:553

11511 msgid "directory from which templates will be used"

11512 msgstr ""

11513

@@ -11515,7 +11521,7 @@ msgstr ""

11521 msgid "use --reference only while cloning"

11522 msgstr ""

11523

11518 -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561

11524 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563

11525 #: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358

11526 msgid "name"

11527 msgstr ""

@@ -11572,11 +11578,11 @@ msgstr ""

11578 msgid "any cloned submodules will be shallow"

11579 msgstr ""

11580

11575 -#: builtin/clone.c:138 builtin/init-db.c:559

11581 +#: builtin/clone.c:138 builtin/init-db.c:561

11582 msgid "gitdir"

11583 msgstr ""

11584

11579 -#: builtin/clone.c:139 builtin/init-db.c:560

11585 +#: builtin/clone.c:139 builtin/init-db.c:562

11586 msgid "separate git dir from working tree"

11587 msgstr ""

11588

@@ -11796,12 +11802,12 @@ msgstr ""

11802 msgid "--local is ignored"

11803 msgstr ""

11804

11799 -#: builtin/clone.c:1308 builtin/clone.c:1316

11805 +#: builtin/clone.c:1311 builtin/clone.c:1319

11806 #, c-format

11807 msgid "Remote branch %s not found in upstream %s"

11808 msgstr ""

11809

11804 -#: builtin/clone.c:1319

11810 +#: builtin/clone.c:1322

11811 msgid "You appear to have cloned an empty repository."

11812 msgstr ""

11813

@@ -12309,8 +12315,8 @@ msgid "terminate entries with NUL"

12315 msgstr ""

12316

12317 #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541

12312 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

12313 -#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336

12318 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201

12319 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336

12320 msgid "mode"

12321 msgstr ""

12322

@@ -13199,91 +13205,91 @@ msgstr ""

13205 msgid "Error: Cannot export nested tags unless --mark-tags is specified."

13206 msgstr ""

13207

13202 -#: builtin/fast-export.c:1178

13208 +#: builtin/fast-export.c:1177

13209 msgid "--anonymize-map token cannot be empty"

13210 msgstr ""

13211

13206 -#: builtin/fast-export.c:1198

13212 +#: builtin/fast-export.c:1197

13213 msgid "show progress after <n> objects"

13214 msgstr ""

13215

13210 -#: builtin/fast-export.c:1200

13216 +#: builtin/fast-export.c:1199

13217 msgid "select handling of signed tags"

13218 msgstr ""

13219

13214 -#: builtin/fast-export.c:1203

13220 +#: builtin/fast-export.c:1202

13221 msgid "select handling of tags that tag filtered objects"

13222 msgstr ""

13223

13218 -#: builtin/fast-export.c:1206

13224 +#: builtin/fast-export.c:1205

13225 msgid "select handling of commit messages in an alternate encoding"

13226 msgstr ""

13227

13222 -#: builtin/fast-export.c:1209

13228 +#: builtin/fast-export.c:1208

13229 msgid "Dump marks to this file"

13230 msgstr ""

13231

13226 -#: builtin/fast-export.c:1211

13232 +#: builtin/fast-export.c:1210

13233 msgid "Import marks from this file"

13234 msgstr ""

13235

13230 -#: builtin/fast-export.c:1215

13236 +#: builtin/fast-export.c:1214

13237 msgid "Import marks from this file if it exists"

13238 msgstr ""

13239

13234 -#: builtin/fast-export.c:1217

13240 +#: builtin/fast-export.c:1216

13241 msgid "Fake a tagger when tags lack one"

13242 msgstr ""

13243

13238 -#: builtin/fast-export.c:1219

13244 +#: builtin/fast-export.c:1218

13245 msgid "Output full tree for each commit"

13246 msgstr ""

13247

13242 -#: builtin/fast-export.c:1221

13248 +#: builtin/fast-export.c:1220

13249 msgid "Use the done feature to terminate the stream"

13250 msgstr ""

13251

13246 -#: builtin/fast-export.c:1222

13252 +#: builtin/fast-export.c:1221

13253 msgid "Skip output of blob data"

13254 msgstr ""

13255

13250 -#: builtin/fast-export.c:1223 builtin/log.c:1816

13256 +#: builtin/fast-export.c:1222 builtin/log.c:1816

13257 msgid "refspec"

13258 msgstr ""

13259

13254 -#: builtin/fast-export.c:1224

13260 +#: builtin/fast-export.c:1223

13261 msgid "Apply refspec to exported refs"

13262 msgstr ""

13263

13258 -#: builtin/fast-export.c:1225

13264 +#: builtin/fast-export.c:1224

13265 msgid "anonymize output"

13266 msgstr ""

13267

13262 -#: builtin/fast-export.c:1226

13268 +#: builtin/fast-export.c:1225

13269 msgid "from:to"

13270 msgstr ""

13271

13266 -#: builtin/fast-export.c:1227

13272 +#: builtin/fast-export.c:1226

13273 msgid "convert <from> to <to> in anonymized output"

13274 msgstr ""

13275

13270 -#: builtin/fast-export.c:1230

13276 +#: builtin/fast-export.c:1229

13277 msgid "Reference parents which are not in fast-export stream by object id"

13278 msgstr ""

13279

13274 -#: builtin/fast-export.c:1232

13280 +#: builtin/fast-export.c:1231

13281 msgid "Show original object ids of blobs/commits"

13282 msgstr ""

13283

13278 -#: builtin/fast-export.c:1234

13284 +#: builtin/fast-export.c:1233

13285 msgid "Label tags with mark ids"

13286 msgstr ""

13287

13282 -#: builtin/fast-export.c:1257

13288 +#: builtin/fast-export.c:1256

13289 msgid "--anonymize-map without --anonymize does not make sense"

13290 msgstr ""

13291

13286 -#: builtin/fast-export.c:1272

13292 +#: builtin/fast-export.c:1271

13293 msgid "Cannot pass both --import-marks and --import-marks-if-exists"

13294 msgstr ""

13295

@@ -14928,7 +14934,7 @@ msgstr ""

14934 msgid "bad %s"

14935 msgstr ""

14936

14931 -#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623

14937 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625

14938 #, c-format

14939 msgid "unknown hash algorithm '%s'"

14940 msgstr ""

@@ -14993,108 +14999,108 @@ msgstr ""

14999 msgid "not copying templates from '%s': %s"

15000 msgstr ""

15001

14996 -#: builtin/init-db.c:274

15002 +#: builtin/init-db.c:275

15003 #, c-format

15004 msgid "invalid initial branch name: '%s'"

15005 msgstr ""

15006

15001 -#: builtin/init-db.c:366

15007 +#: builtin/init-db.c:367

15008 #, c-format

15009 msgid "unable to handle file type %d"

15010 msgstr ""

15011

15006 -#: builtin/init-db.c:369

15012 +#: builtin/init-db.c:370

15013 #, c-format

15014 msgid "unable to move %s to %s"

15015 msgstr ""

15016

15011 -#: builtin/init-db.c:385

15017 +#: builtin/init-db.c:386

15018 msgid "attempt to reinitialize repository with different hash"

15019 msgstr ""

15020

15015 -#: builtin/init-db.c:409 builtin/init-db.c:412

15021 +#: builtin/init-db.c:410 builtin/init-db.c:413

15022 #, c-format

15023 msgid "%s already exists"

15024 msgstr ""

15025

15020 -#: builtin/init-db.c:443

15026 +#: builtin/init-db.c:445

15027 #, c-format

15028 msgid "re-init: ignored --initial-branch=%s"

15029 msgstr ""

15030

15025 -#: builtin/init-db.c:474

15031 +#: builtin/init-db.c:476

15032 #, c-format

15033 msgid "Reinitialized existing shared Git repository in %s%s\n"

15034 msgstr ""

15035

15030 -#: builtin/init-db.c:475

15036 +#: builtin/init-db.c:477

15037 #, c-format

15038 msgid "Reinitialized existing Git repository in %s%s\n"

15039 msgstr ""

15040

15035 -#: builtin/init-db.c:479

15041 +#: builtin/init-db.c:481

15042 #, c-format

15043 msgid "Initialized empty shared Git repository in %s%s\n"

15044 msgstr ""

15045

15040 -#: builtin/init-db.c:480

15046 +#: builtin/init-db.c:482

15047 #, c-format

15048 msgid "Initialized empty Git repository in %s%s\n"

15049 msgstr ""

15050

15045 -#: builtin/init-db.c:529

15051 +#: builtin/init-db.c:531

15052 msgid ""

15053 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

15054 "shared[=<permissions>]] [<directory>]"

15055 msgstr ""

15056

15051 -#: builtin/init-db.c:555

15057 +#: builtin/init-db.c:557

15058 msgid "permissions"

15059 msgstr ""

15060

15055 -#: builtin/init-db.c:556

15061 +#: builtin/init-db.c:558

15062 msgid "specify that the git repository is to be shared amongst several users"

15063 msgstr ""

15064

15059 -#: builtin/init-db.c:562

15065 +#: builtin/init-db.c:564

15066 msgid "override the name of the initial branch"

15067 msgstr ""

15068

15063 -#: builtin/init-db.c:563 builtin/verify-pack.c:74

15069 +#: builtin/init-db.c:565 builtin/verify-pack.c:74

15070 msgid "hash"

15071 msgstr ""

15072

15067 -#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75

15073 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75

15074 msgid "specify the hash algorithm to use"

15075 msgstr ""

15076

15071 -#: builtin/init-db.c:571

15077 +#: builtin/init-db.c:573

15078 msgid "--separate-git-dir and --bare are mutually exclusive"

15079 msgstr ""

15080

15075 -#: builtin/init-db.c:600 builtin/init-db.c:605

15081 +#: builtin/init-db.c:602 builtin/init-db.c:607

15082 #, c-format

15083 msgid "cannot mkdir %s"

15084 msgstr ""

15085

15080 -#: builtin/init-db.c:609 builtin/init-db.c:664

15086 +#: builtin/init-db.c:611 builtin/init-db.c:666

15087 #, c-format

15088 msgid "cannot chdir to %s"

15089 msgstr ""

15090

15085 -#: builtin/init-db.c:636

15091 +#: builtin/init-db.c:638

15092 #, c-format

15093 msgid ""

15094 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

15095 "dir=<directory>)"

15096 msgstr ""

15097

15092 -#: builtin/init-db.c:688

15098 +#: builtin/init-db.c:690

15099 #, c-format

15100 msgid "Cannot access work tree '%s'"

15101 msgstr ""

15102

15097 -#: builtin/init-db.c:693

15103 +#: builtin/init-db.c:695

15104 msgid "--separate-git-dir incompatible with bare repository"

15105 msgstr ""

15106

l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed)