fe7f7ad36c · 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: 2022-01-11 09:38+0800\n"

11 +"POT-Creation-Date: 2022-01-17 08:31+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"

@@ -788,8 +788,8 @@ msgstr ""

788 #: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757

789 #: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361

790 #: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155

791 -#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033

792 -#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560

791 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038

792 +#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560

793 #: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778

794 #: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073

795 #: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

@@ -1807,7 +1807,7 @@ msgstr ""

1807

1808 #: branch.c:313

1809 #, c-format

1810 -msgid "cannot force update the branch '%s'checked out at '%s'"

1810 +msgid "cannot force update the branch '%s' checked out at '%s'"

1811 msgstr ""

1812

1813 #: branch.c:336

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

5409 msgid "%s: unsupported file type"

5410 msgstr ""

5411

5412 -#: object-file.c:2329 builtin/fetch.c:1448

5412 +#: object-file.c:2329 builtin/fetch.c:1453

5413 #, c-format

5414 msgid "%s is not a valid object"

5415 msgstr ""

@@ -6587,41 +6587,41 @@ msgstr ""

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

6588 msgstr ""

6589

6590 -#: refs.c:2069

6590 +#: refs.c:2067

6591 #, c-format

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

6593 msgstr ""

6594

6595 -#: refs.c:2152

6595 +#: refs.c:2150

6596 msgid "ref updates forbidden inside quarantine environment"

6597 msgstr ""

6598

6599 -#: refs.c:2163

6599 +#: refs.c:2161

6600 msgid "ref updates aborted by hook"

6601 msgstr ""

6602

6603 -#: refs.c:2271 refs.c:2301

6603 +#: refs.c:2269 refs.c:2299

6604 #, c-format

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

6606 msgstr ""

6607

6608 -#: refs.c:2277 refs.c:2312

6608 +#: refs.c:2275 refs.c:2310

6609 #, c-format

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

6611 msgstr ""

6612

6613 -#: refs/files-backend.c:1268

6613 +#: refs/files-backend.c:1267

6614 #, c-format

6615 msgid "could not remove reference %s"

6616 msgstr ""

6617

6618 -#: refs/files-backend.c:1282 refs/packed-backend.c:1549

6618 +#: refs/files-backend.c:1281 refs/packed-backend.c:1549

6619 #: refs/packed-backend.c:1559

6620 #, c-format

6621 msgid "could not delete reference %s: %s"

6622 msgstr ""

6623

6624 -#: refs/files-backend.c:1285 refs/packed-backend.c:1562

6624 +#: refs/files-backend.c:1284 refs/packed-backend.c:1562

6625 #, c-format

6626 msgid "could not delete references: %s"

6627 msgstr ""

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

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

7575 msgstr ""

7576

7577 -#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772

7577 +#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416

7578 +#: builtin/grep.c:772

7579 #, c-format

7580 msgid "cannot open '%s'"

7581 msgstr ""

@@ -8461,7 +8462,7 @@ msgstr ""

8462 msgid "invalid remote service path"

8463 msgstr ""

8464

8464 -#: transport-helper.c:661 transport.c:1474

8465 +#: transport-helper.c:661 transport.c:1479

8466 msgid "operation not supported by protocol"

8467 msgstr ""

8468

@@ -12380,7 +12381,7 @@ msgstr ""

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

12382 msgstr ""

12383

12383 -#: builtin/clone.c:924 builtin/fetch.c:2047

12384 +#: builtin/clone.c:924 builtin/fetch.c:2052

12385 #, c-format

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

12387 msgstr ""

@@ -14161,77 +14162,77 @@ msgstr ""

14162 msgid "accept refspecs from stdin"

14163 msgstr ""

14164

14164 -#: builtin/fetch.c:587

14165 +#: builtin/fetch.c:592

14166 msgid "couldn't find remote ref HEAD"

14167 msgstr ""

14168

14168 -#: builtin/fetch.c:761

14169 +#: builtin/fetch.c:766

14170 #, c-format

14171 msgid "configuration fetch.output contains invalid value %s"

14172 msgstr ""

14173

14173 -#: builtin/fetch.c:862

14174 +#: builtin/fetch.c:867

14175 #, c-format

14176 msgid "object %s not found"

14177 msgstr ""

14178

14178 -#: builtin/fetch.c:866

14179 +#: builtin/fetch.c:871

14180 msgid "[up to date]"

14181 msgstr ""

14182

14182 -#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968

14183 +#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973

14184 msgid "[rejected]"

14185 msgstr ""

14186

14186 -#: builtin/fetch.c:880

14187 +#: builtin/fetch.c:885

14188 msgid "can't fetch in current branch"

14189 msgstr ""

14190

14190 -#: builtin/fetch.c:881

14191 +#: builtin/fetch.c:886

14192 msgid "checked out in another worktree"

14193 msgstr ""

14194

14194 -#: builtin/fetch.c:891

14195 +#: builtin/fetch.c:896

14196 msgid "[tag update]"

14197 msgstr ""

14198

14198 -#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951

14199 -#: builtin/fetch.c:963

14199 +#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956

14200 +#: builtin/fetch.c:968

14201 msgid "unable to update local ref"

14202 msgstr ""

14203

14203 -#: builtin/fetch.c:896

14204 +#: builtin/fetch.c:901

14205 msgid "would clobber existing tag"

14206 msgstr ""

14207

14207 -#: builtin/fetch.c:918

14208 +#: builtin/fetch.c:923

14209 msgid "[new tag]"

14210 msgstr ""

14211

14211 -#: builtin/fetch.c:921

14212 +#: builtin/fetch.c:926

14213 msgid "[new branch]"

14214 msgstr ""

14215

14215 -#: builtin/fetch.c:924

14216 +#: builtin/fetch.c:929

14217 msgid "[new ref]"

14218 msgstr ""

14219

14219 -#: builtin/fetch.c:963

14220 +#: builtin/fetch.c:968

14221 msgid "forced update"

14222 msgstr ""

14223

14223 -#: builtin/fetch.c:968

14224 +#: builtin/fetch.c:973

14225 msgid "non-fast-forward"

14226 msgstr ""

14227

14227 -#: builtin/fetch.c:1071

14228 +#: builtin/fetch.c:1076

14229 msgid ""

14230 "fetch normally indicates which branches had a forced update,\n"

14231 "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"

14232 "flag or run 'git config fetch.showForcedUpdates true'"

14233 msgstr ""

14234

14234 -#: builtin/fetch.c:1075

14235 +#: builtin/fetch.c:1080

14236 #, c-format

14237 msgid ""

14238 "it took %.2f seconds to check forced updates; you can use\n"

@@ -14240,168 +14241,168 @@ msgid ""

14241 "to avoid this check\n"

14242 msgstr ""

14243

14243 -#: builtin/fetch.c:1107

14244 +#: builtin/fetch.c:1112

14245 #, c-format

14246 msgid "%s did not send all necessary objects\n"

14247 msgstr ""

14248

14248 -#: builtin/fetch.c:1136

14249 +#: builtin/fetch.c:1141

14250 #, c-format

14251 msgid "rejected %s because shallow roots are not allowed to be updated"

14252 msgstr ""

14253

14253 -#: builtin/fetch.c:1226 builtin/fetch.c:1374

14254 +#: builtin/fetch.c:1231 builtin/fetch.c:1379

14255 #, c-format

14256 msgid "From %.*s\n"

14257 msgstr ""

14258

14258 -#: builtin/fetch.c:1247

14259 +#: builtin/fetch.c:1252

14260 #, c-format

14261 msgid ""

14262 "some local refs could not be updated; try running\n"

14263 " 'git remote prune %s' to remove any old, conflicting branches"

14264 msgstr ""

14265

14265 -#: builtin/fetch.c:1344

14266 +#: builtin/fetch.c:1349

14267 #, c-format

14268 msgid " (%s will become dangling)"

14269 msgstr ""

14270

14270 -#: builtin/fetch.c:1345

14271 +#: builtin/fetch.c:1350

14272 #, c-format

14273 msgid " (%s has become dangling)"

14274 msgstr ""

14275

14275 -#: builtin/fetch.c:1377

14276 +#: builtin/fetch.c:1382

14277 msgid "[deleted]"

14278 msgstr ""

14279

14279 -#: builtin/fetch.c:1378 builtin/remote.c:1128

14280 +#: builtin/fetch.c:1383 builtin/remote.c:1128

14281 msgid "(none)"

14282 msgstr ""

14283

14283 -#: builtin/fetch.c:1400

14284 +#: builtin/fetch.c:1405

14285 #, c-format

14286 msgid "refusing to fetch into branch '%s' checked out at '%s'"

14287 msgstr ""

14288

14288 -#: builtin/fetch.c:1420

14289 +#: builtin/fetch.c:1425

14290 #, c-format

14291 msgid "option \"%s\" value \"%s\" is not valid for %s"

14292 msgstr ""

14293

14293 -#: builtin/fetch.c:1423

14294 +#: builtin/fetch.c:1428

14295 #, c-format

14296 msgid "option \"%s\" is ignored for %s\n"

14297 msgstr ""

14298

14298 -#: builtin/fetch.c:1450

14299 +#: builtin/fetch.c:1455

14300 #, c-format

14301 msgid "the object %s does not exist"

14302 msgstr ""

14303

14303 -#: builtin/fetch.c:1638

14304 +#: builtin/fetch.c:1643

14305 msgid "multiple branches detected, incompatible with --set-upstream"

14306 msgstr ""

14307

14307 -#: builtin/fetch.c:1650

14308 +#: builtin/fetch.c:1655

14309 #, c-format

14310 msgid ""

14311 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "

14312 "any branch."

14313 msgstr ""

14314

14314 -#: builtin/fetch.c:1663

14315 +#: builtin/fetch.c:1668

14316 msgid "not setting upstream for a remote remote-tracking branch"

14317 msgstr ""

14318

14318 -#: builtin/fetch.c:1665

14319 +#: builtin/fetch.c:1670

14320 msgid "not setting upstream for a remote tag"

14321 msgstr ""

14322

14322 -#: builtin/fetch.c:1667

14323 +#: builtin/fetch.c:1672

14324 msgid "unknown branch type"

14325 msgstr ""

14326

14326 -#: builtin/fetch.c:1669

14327 +#: builtin/fetch.c:1674

14328 msgid ""

14329 "no source branch found;\n"

14330 "you need to specify exactly one branch with the --set-upstream option"

14331 msgstr ""

14332

14332 -#: builtin/fetch.c:1799 builtin/fetch.c:1862

14333 +#: builtin/fetch.c:1804 builtin/fetch.c:1867

14334 #, c-format

14335 msgid "Fetching %s\n"

14336 msgstr ""

14337

14337 -#: builtin/fetch.c:1809 builtin/fetch.c:1864

14338 +#: builtin/fetch.c:1814 builtin/fetch.c:1869

14339 #, c-format

14340 msgid "could not fetch %s"

14341 msgstr ""

14342

14342 -#: builtin/fetch.c:1821

14343 +#: builtin/fetch.c:1826

14344 #, c-format

14345 msgid "could not fetch '%s' (exit code: %d)\n"

14346 msgstr ""

14347

14347 -#: builtin/fetch.c:1925

14348 +#: builtin/fetch.c:1930

14349 msgid ""

14350 "no remote repository specified; please specify either a URL or a\n"

14351 "remote name from which new revisions should be fetched"

14352 msgstr ""

14353

14353 -#: builtin/fetch.c:1961

14354 +#: builtin/fetch.c:1966

14355 msgid "you need to specify a tag name"

14356 msgstr ""

14357

14357 -#: builtin/fetch.c:2027

14358 +#: builtin/fetch.c:2032

14359 msgid "--negotiate-only needs one or more --negotiate-tip=*"

14360 msgstr ""

14361

14361 -#: builtin/fetch.c:2031

14362 +#: builtin/fetch.c:2036

14363 msgid "negative depth in --deepen is not supported"

14364 msgstr ""

14365

14365 -#: builtin/fetch.c:2040

14366 +#: builtin/fetch.c:2045

14367 msgid "--unshallow on a complete repository does not make sense"

14368 msgstr ""

14369

14369 -#: builtin/fetch.c:2057

14370 +#: builtin/fetch.c:2062

14371 msgid "fetch --all does not take a repository argument"

14372 msgstr ""

14373

14373 -#: builtin/fetch.c:2059

14374 +#: builtin/fetch.c:2064

14375 msgid "fetch --all does not make sense with refspecs"

14376 msgstr ""

14377

14377 -#: builtin/fetch.c:2068

14378 +#: builtin/fetch.c:2073

14379 #, c-format

14380 msgid "no such remote or remote group: %s"

14381 msgstr ""

14382

14382 -#: builtin/fetch.c:2076

14383 +#: builtin/fetch.c:2081

14384 msgid "fetching a group and specifying refspecs does not make sense"

14385 msgstr ""

14386

14386 -#: builtin/fetch.c:2092

14387 +#: builtin/fetch.c:2097

14388 msgid "must supply remote when using --negotiate-only"

14389 msgstr ""

14390

14390 -#: builtin/fetch.c:2097

14391 +#: builtin/fetch.c:2102

14392 msgid "protocol does not support --negotiate-only, exiting"

14393 msgstr ""

14394

14394 -#: builtin/fetch.c:2116

14395 +#: builtin/fetch.c:2121

14396 msgid ""

14397 "--filter can only be used with the remote configured in extensions."

14398 "partialclone"

14399 msgstr ""

14400

14400 -#: builtin/fetch.c:2120

14401 +#: builtin/fetch.c:2125

14402 msgid "--atomic can only be used when fetching from one remote"

14403 msgstr ""

14404

14404 -#: builtin/fetch.c:2124

14405 +#: builtin/fetch.c:2129

14406 msgid "--stdin can only be used when fetching from one remote"

14407 msgstr ""

14408

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