b3f6cd79ab · 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-05-15 09:11+0800\n"

11 +"POT-Creation-Date: 2020-05-27 07:23+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"

@@ -1299,7 +1299,7 @@ msgid "allow overlapping hunks"

1299 msgstr ""

1300

1301 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1302 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774

1302 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

1303 #: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1304 msgid "be verbose"

1305 msgstr ""

@@ -2638,7 +2638,7 @@ msgstr ""

2638 msgid "unable to fork"

2639 msgstr ""

2640

2641 -#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45

2641 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45

2642 msgid "Checking connectivity"

2643 msgstr ""

2644

@@ -3628,7 +3628,7 @@ msgstr ""

3628 msgid "giving up"

3629 msgstr ""

3630

3631 -#: fetch-pack.c:476 progress.c:340

3631 +#: fetch-pack.c:476 progress.c:336

3632 msgid "done"

3633 msgstr ""

3634

@@ -4258,7 +4258,7 @@ msgstr ""

4258 msgid "renamed"

4259 msgstr ""

4260

4261 -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4261 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

4262 #, c-format

4263 msgid "Refusing to lose dirty file at %s"

4264 msgstr ""

@@ -4294,12 +4294,12 @@ msgstr ""

4294 msgid " (left unresolved)"

4295 msgstr ""

4296

4297 -#: merge-recursive.c:1793

4297 +#: merge-recursive.c:1805

4298 #, c-format

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

4300 msgstr ""

4301

4302 -#: merge-recursive.c:2056

4302 +#: merge-recursive.c:2068

4303 #, c-format

4304 msgid ""

4305 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4307,172 +4307,172 @@ msgid ""

4307 "getting a majority of the files."

4308 msgstr ""

4309

4310 -#: merge-recursive.c:2088

4310 +#: merge-recursive.c:2100

4311 #, c-format

4312 msgid ""

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

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

4315 msgstr ""

4316

4317 -#: merge-recursive.c:2098

4317 +#: merge-recursive.c:2110

4318 #, c-format

4319 msgid ""

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

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

4322 msgstr ""

4323

4324 -#: merge-recursive.c:2190

4324 +#: merge-recursive.c:2202

4325 #, c-format

4326 msgid ""

4327 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

4328 ">%s in %s"

4329 msgstr ""

4330

4331 -#: merge-recursive.c:2435

4331 +#: merge-recursive.c:2447

4332 #, c-format

4333 msgid ""

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

4335 "renamed."

4336 msgstr ""

4337

4338 -#: merge-recursive.c:2961

4338 +#: merge-recursive.c:2973

4339 #, c-format

4340 msgid "cannot read object %s"

4341 msgstr ""

4342

4343 -#: merge-recursive.c:2964

4343 +#: merge-recursive.c:2976

4344 #, c-format

4345 msgid "object %s is not a blob"

4346 msgstr ""

4347

4348 -#: merge-recursive.c:3028

4348 +#: merge-recursive.c:3040

4349 msgid "modify"

4350 msgstr ""

4351

4352 -#: merge-recursive.c:3028

4352 +#: merge-recursive.c:3040

4353 msgid "modified"

4354 msgstr ""

4355

4356 -#: merge-recursive.c:3040

4356 +#: merge-recursive.c:3052

4357 msgid "content"

4358 msgstr ""

4359

4360 -#: merge-recursive.c:3044

4360 +#: merge-recursive.c:3056

4361 msgid "add/add"

4362 msgstr ""

4363

4364 -#: merge-recursive.c:3067

4364 +#: merge-recursive.c:3079

4365 #, c-format

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

4367 msgstr ""

4368

4369 -#: merge-recursive.c:3089 git-submodule.sh:985

4369 +#: merge-recursive.c:3101 git-submodule.sh:985

4370 msgid "submodule"

4371 msgstr ""

4372

4373 -#: merge-recursive.c:3090

4373 +#: merge-recursive.c:3102

4374 #, c-format

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

4376 msgstr ""

4377

4378 -#: merge-recursive.c:3120

4378 +#: merge-recursive.c:3132

4379 #, c-format

4380 msgid "Adding as %s instead"

4381 msgstr ""

4382

4383 -#: merge-recursive.c:3203

4383 +#: merge-recursive.c:3215

4384 #, c-format

4385 msgid ""

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

4387 "moving it to %s."

4388 msgstr ""

4389

4390 -#: merge-recursive.c:3206

4390 +#: merge-recursive.c:3218

4391 #, c-format

4392 msgid ""

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

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

4395 msgstr ""

4396

4397 -#: merge-recursive.c:3210

4397 +#: merge-recursive.c:3222

4398 #, c-format

4399 msgid ""

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

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

4402 msgstr ""

4403

4404 -#: merge-recursive.c:3213

4404 +#: merge-recursive.c:3225

4405 #, c-format

4406 msgid ""

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

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

4409 msgstr ""

4410

4411 -#: merge-recursive.c:3327

4411 +#: merge-recursive.c:3339

4412 #, c-format

4413 msgid "Removing %s"

4414 msgstr ""

4415

4416 -#: merge-recursive.c:3350

4416 +#: merge-recursive.c:3362

4417 msgid "file/directory"

4418 msgstr ""

4419

4420 -#: merge-recursive.c:3355

4420 +#: merge-recursive.c:3367

4421 msgid "directory/file"

4422 msgstr ""

4423

4424 -#: merge-recursive.c:3362

4424 +#: merge-recursive.c:3374

4425 #, c-format

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

4427 msgstr ""

4428

4429 -#: merge-recursive.c:3371

4429 +#: merge-recursive.c:3383

4430 #, c-format

4431 msgid "Adding %s"

4432 msgstr ""

4433

4434 -#: merge-recursive.c:3380

4434 +#: merge-recursive.c:3392

4435 #, c-format

4436 msgid "CONFLICT (add/add): Merge conflict in %s"

4437 msgstr ""

4438

4439 -#: merge-recursive.c:3424

4439 +#: merge-recursive.c:3436

4440 msgid "Already up to date!"

4441 msgstr ""

4442

4443 -#: merge-recursive.c:3433

4443 +#: merge-recursive.c:3445

4444 #, c-format

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

4446 msgstr ""

4447

4448 -#: merge-recursive.c:3537

4448 +#: merge-recursive.c:3549

4449 msgid "Merging:"

4450 msgstr ""

4451

4452 -#: merge-recursive.c:3550

4452 +#: merge-recursive.c:3562

4453 #, c-format

4454 msgid "found %u common ancestor:"

4455 msgid_plural "found %u common ancestors:"

4456 msgstr[0] ""

4457 msgstr[1] ""

4458

4459 -#: merge-recursive.c:3600

4459 +#: merge-recursive.c:3612

4460 msgid "merge returned no commit"

4461 msgstr ""

4462

4463 -#: merge-recursive.c:3659

4463 +#: merge-recursive.c:3671

4464 #, c-format

4465 msgid ""

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

4467 " %s"

4468 msgstr ""

4469

4470 -#: merge-recursive.c:3756

4470 +#: merge-recursive.c:3768

4471 #, c-format

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

4473 msgstr ""

4474

4475 -#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885

4475 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4476 msgid "Unable to write index."

4477 msgstr ""

4478

@@ -5305,7 +5305,7 @@ msgid ""

5305 msgstr ""

5306

5307 #: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5308 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258

5308 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5309 #, c-format

5310 msgid "could not write '%s'"

5311 msgstr ""

@@ -13309,243 +13309,243 @@ msgstr ""

13309 msgid "print only refs which don't contain the commit"

13310 msgstr ""

13311

13312 -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148

13312 +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149

13313 msgid "unknown"

13314 msgstr ""

13315

13316 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>

13317 -#: builtin/fsck.c:100 builtin/fsck.c:120

13317 +#: builtin/fsck.c:101 builtin/fsck.c:121

13318 #, c-format

13319 msgid "error in %s %s: %s"

13320 msgstr ""

13321

13322 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>

13323 -#: builtin/fsck.c:114

13323 +#: builtin/fsck.c:115

13324 #, c-format

13325 msgid "warning in %s %s: %s"

13326 msgstr ""

13327

13328 -#: builtin/fsck.c:143 builtin/fsck.c:146

13328 +#: builtin/fsck.c:144 builtin/fsck.c:147

13329 #, c-format

13330 msgid "broken link from %7s %s"

13331 msgstr ""

13332

13333 -#: builtin/fsck.c:155

13333 +#: builtin/fsck.c:156

13334 msgid "wrong object type in link"

13335 msgstr ""

13336

13337 -#: builtin/fsck.c:171

13337 +#: builtin/fsck.c:172

13338 #, c-format

13339 msgid ""

13340 "broken link from %7s %s\n"

13341 " to %7s %s"

13342 msgstr ""

13343

13344 -#: builtin/fsck.c:282

13344 +#: builtin/fsck.c:283

13345 #, c-format

13346 msgid "missing %s %s"

13347 msgstr ""

13348

13349 -#: builtin/fsck.c:309

13349 +#: builtin/fsck.c:310

13350 #, c-format

13351 msgid "unreachable %s %s"

13352 msgstr ""

13353

13354 -#: builtin/fsck.c:329

13354 +#: builtin/fsck.c:330

13355 #, c-format

13356 msgid "dangling %s %s"

13357 msgstr ""

13358

13359 -#: builtin/fsck.c:339

13359 +#: builtin/fsck.c:340

13360 msgid "could not create lost-found"

13361 msgstr ""

13362

13363 -#: builtin/fsck.c:350

13363 +#: builtin/fsck.c:351

13364 #, c-format

13365 msgid "could not finish '%s'"

13366 msgstr ""

13367

13368 -#: builtin/fsck.c:367

13368 +#: builtin/fsck.c:368

13369 #, c-format

13370 msgid "Checking %s"

13371 msgstr ""

13372

13373 -#: builtin/fsck.c:405

13373 +#: builtin/fsck.c:406

13374 #, c-format

13375 msgid "Checking connectivity (%d objects)"

13376 msgstr ""

13377

13378 -#: builtin/fsck.c:424

13378 +#: builtin/fsck.c:425

13379 #, c-format

13380 msgid "Checking %s %s"

13381 msgstr ""

13382

13383 -#: builtin/fsck.c:429

13383 +#: builtin/fsck.c:430

13384 msgid "broken links"

13385 msgstr ""

13386

13387 -#: builtin/fsck.c:438

13387 +#: builtin/fsck.c:439

13388 #, c-format

13389 msgid "root %s"

13390 msgstr ""

13391

13392 -#: builtin/fsck.c:446

13392 +#: builtin/fsck.c:447

13393 #, c-format

13394 msgid "tagged %s %s (%s) in %s"

13395 msgstr ""

13396

13397 -#: builtin/fsck.c:475

13397 +#: builtin/fsck.c:476

13398 #, c-format

13399 msgid "%s: object corrupt or missing"

13400 msgstr ""

13401

13402 -#: builtin/fsck.c:500

13402 +#: builtin/fsck.c:501

13403 #, c-format

13404 msgid "%s: invalid reflog entry %s"

13405 msgstr ""

13406

13407 -#: builtin/fsck.c:514

13407 +#: builtin/fsck.c:515

13408 #, c-format

13409 msgid "Checking reflog %s->%s"

13410 msgstr ""

13411

13412 -#: builtin/fsck.c:548

13412 +#: builtin/fsck.c:549

13413 #, c-format

13414 msgid "%s: invalid sha1 pointer %s"

13415 msgstr ""

13416

13417 -#: builtin/fsck.c:555

13417 +#: builtin/fsck.c:556

13418 #, c-format

13419 msgid "%s: not a commit"

13420 msgstr ""

13421

13422 -#: builtin/fsck.c:609

13422 +#: builtin/fsck.c:610

13423 msgid "notice: No default references"

13424 msgstr ""

13425

13426 -#: builtin/fsck.c:624

13426 +#: builtin/fsck.c:625

13427 #, c-format

13428 msgid "%s: object corrupt or missing: %s"

13429 msgstr ""

13430

13431 -#: builtin/fsck.c:637

13431 +#: builtin/fsck.c:638

13432 #, c-format

13433 msgid "%s: object could not be parsed: %s"

13434 msgstr ""

13435

13436 -#: builtin/fsck.c:657

13436 +#: builtin/fsck.c:658

13437 #, c-format

13438 msgid "bad sha1 file: %s"

13439 msgstr ""

13440

13441 -#: builtin/fsck.c:672

13441 +#: builtin/fsck.c:673

13442 msgid "Checking object directory"

13443 msgstr ""

13444

13445 -#: builtin/fsck.c:675

13445 +#: builtin/fsck.c:676

13446 msgid "Checking object directories"

13447 msgstr ""

13448

13449 -#: builtin/fsck.c:690

13449 +#: builtin/fsck.c:691

13450 #, c-format

13451 msgid "Checking %s link"

13452 msgstr ""

13453

13454 -#: builtin/fsck.c:695 builtin/index-pack.c:843

13454 +#: builtin/fsck.c:696 builtin/index-pack.c:843

13455 #, c-format

13456 msgid "invalid %s"

13457 msgstr ""

13458

13459 -#: builtin/fsck.c:702

13459 +#: builtin/fsck.c:703

13460 #, c-format

13461 msgid "%s points to something strange (%s)"

13462 msgstr ""

13463

13464 -#: builtin/fsck.c:708

13464 +#: builtin/fsck.c:709

13465 #, c-format

13466 msgid "%s: detached HEAD points at nothing"

13467 msgstr ""

13468

13469 -#: builtin/fsck.c:712

13469 +#: builtin/fsck.c:713

13470 #, c-format

13471 msgid "notice: %s points to an unborn branch (%s)"

13472 msgstr ""

13473

13474 -#: builtin/fsck.c:724

13474 +#: builtin/fsck.c:725

13475 msgid "Checking cache tree"

13476 msgstr ""

13477

13478 -#: builtin/fsck.c:729

13478 +#: builtin/fsck.c:730

13479 #, c-format

13480 msgid "%s: invalid sha1 pointer in cache-tree"

13481 msgstr ""

13482

13483 -#: builtin/fsck.c:738

13483 +#: builtin/fsck.c:739

13484 msgid "non-tree in cache-tree"

13485 msgstr ""

13486

13487 -#: builtin/fsck.c:769

13487 +#: builtin/fsck.c:770

13488 msgid "git fsck [<options>] [<object>...]"

13489 msgstr ""

13490

13491 -#: builtin/fsck.c:775

13491 +#: builtin/fsck.c:776

13492 msgid "show unreachable objects"

13493 msgstr ""

13494

13495 -#: builtin/fsck.c:776

13495 +#: builtin/fsck.c:777

13496 msgid "show dangling objects"

13497 msgstr ""

13498

13499 -#: builtin/fsck.c:777

13499 +#: builtin/fsck.c:778

13500 msgid "report tags"

13501 msgstr ""

13502

13503 -#: builtin/fsck.c:778

13503 +#: builtin/fsck.c:779

13504 msgid "report root nodes"

13505 msgstr ""

13506

13507 -#: builtin/fsck.c:779

13507 +#: builtin/fsck.c:780

13508 msgid "make index objects head nodes"

13509 msgstr ""

13510

13511 -#: builtin/fsck.c:780

13511 +#: builtin/fsck.c:781

13512 msgid "make reflogs head nodes (default)"

13513 msgstr ""

13514

13515 -#: builtin/fsck.c:781

13515 +#: builtin/fsck.c:782

13516 msgid "also consider packs and alternate objects"

13517 msgstr ""

13518

13519 -#: builtin/fsck.c:782

13519 +#: builtin/fsck.c:783

13520 msgid "check only connectivity"

13521 msgstr ""

13522

13523 -#: builtin/fsck.c:783

13523 +#: builtin/fsck.c:784

13524 msgid "enable more strict checking"

13525 msgstr ""

13526

13527 -#: builtin/fsck.c:785

13527 +#: builtin/fsck.c:786

13528 msgid "write dangling objects in .git/lost-found"

13529 msgstr ""

13530

13531 -#: builtin/fsck.c:786 builtin/prune.c:134

13531 +#: builtin/fsck.c:787 builtin/prune.c:134

13532 msgid "show progress"

13533 msgstr ""

13534

13535 -#: builtin/fsck.c:787

13535 +#: builtin/fsck.c:788

13536 msgid "show verbose names for reachable objects"

13537 msgstr ""

13538

13539 -#: builtin/fsck.c:846 builtin/index-pack.c:225

13539 +#: builtin/fsck.c:847 builtin/index-pack.c:225

13540 msgid "Checking objects"

13541 msgstr ""

13542

13543 -#: builtin/fsck.c:874

13543 +#: builtin/fsck.c:875

13544 #, c-format

13545 msgid "%s: object missing"

13546 msgstr ""

13547

13548 -#: builtin/fsck.c:885

13548 +#: builtin/fsck.c:886

13549 #, c-format

13550 msgid "invalid parameter: expected sha1, got '%s'"

13551 msgstr ""

@@ -21879,46 +21879,50 @@ msgid "A useful minimum set of commands for Everyday Git"

21879 msgstr ""

21880

21881 #: command-list.h:203

21882 -msgid "A Git Glossary"

21882 +msgid "Frequently asked questions about using Git"

21883 msgstr ""

21884

21885 #: command-list.h:204

21886 -msgid "Hooks used by Git"

21886 +msgid "A Git Glossary"

21887 msgstr ""

21888

21889 #: command-list.h:205

21890 -msgid "Specifies intentionally untracked files to ignore"

21890 +msgid "Hooks used by Git"

21891 msgstr ""

21892

21893 #: command-list.h:206

21894 -msgid "Defining submodule properties"

21894 +msgid "Specifies intentionally untracked files to ignore"

21895 msgstr ""

21896

21897 #: command-list.h:207

21898 -msgid "Git namespaces"

21898 +msgid "Defining submodule properties"

21899 msgstr ""

21900

21901 #: command-list.h:208

21902 -msgid "Git Repository Layout"

21902 +msgid "Git namespaces"

21903 msgstr ""

21904

21905 #: command-list.h:209

21906 -msgid "Specifying revisions and ranges for Git"

21906 +msgid "Git Repository Layout"

21907 msgstr ""

21908

21909 #: command-list.h:210

21910 -msgid "Mounting one repository inside another"

21910 +msgid "Specifying revisions and ranges for Git"

21911 msgstr ""

21912

21913 #: command-list.h:211

21914 -msgid "A tutorial introduction to Git: part two"

21914 +msgid "Mounting one repository inside another"

21915 msgstr ""

21916

21917 #: command-list.h:212

21918 -msgid "A tutorial introduction to Git"

21918 +msgid "A tutorial introduction to Git: part two"

21919 msgstr ""

21920

21921 #: command-list.h:213

21922 +msgid "A tutorial introduction to Git"

21923 +msgstr ""

21924 +

21925 +#: command-list.h:214

21926 msgid "An overview of recommended workflows with Git"

21927 msgstr ""

21928

l10n: git.pot: v2.27.0 round 2 (+1)