3b6137f253 · 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: 2012-07-30 09:18+0800\n"

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

@@ -226,7 +226,7 @@ msgid ""

226 msgstr ""

227

228 #: diff.c:1400

229 -msgid " 0 files changed\n"

229 +msgid " 0 files changed"

230 msgstr ""

231

232 #: diff.c:1404

@@ -331,6 +331,258 @@ msgid_plural ""

331 msgstr[0] ""

332 msgstr[1] ""

333

334 +#: merge-recursive.c:190

335 +#, c-format

336 +msgid "(bad commit)\n"

337 +msgstr ""

338 +

339 +#: merge-recursive.c:206

340 +#, c-format

341 +msgid "addinfo_cache failed for path '%s'"

342 +msgstr ""

343 +

344 +#: merge-recursive.c:268

345 +msgid "error building trees"

346 +msgstr ""

347 +

348 +#: merge-recursive.c:497

349 +msgid "diff setup failed"

350 +msgstr ""

351 +

352 +#: merge-recursive.c:627

353 +msgid "merge-recursive: disk full?"

354 +msgstr ""

355 +

356 +#: merge-recursive.c:690

357 +#, c-format

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

359 +msgstr ""

360 +

361 +#: merge-recursive.c:701

362 +#, c-format

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

364 +msgstr ""

365 +

366 +#. something else exists

367 +#. .. but not some other error (who really cares what?)

368 +#: merge-recursive.c:715 merge-recursive.c:736

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

370 +msgstr ""

371 +

372 +#: merge-recursive.c:726

373 +#, c-format

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

375 +msgstr ""

376 +

377 +#: merge-recursive.c:766

378 +#, c-format

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

380 +msgstr ""

381 +

382 +#: merge-recursive.c:768

383 +#, c-format

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

385 +msgstr ""

386 +

387 +#: merge-recursive.c:791 builtin/clone.c:302

388 +#, c-format

389 +msgid "failed to open '%s'"

390 +msgstr ""

391 +

392 +#: merge-recursive.c:799

393 +#, c-format

394 +msgid "failed to symlink '%s'"

395 +msgstr ""

396 +

397 +#: merge-recursive.c:802

398 +#, c-format

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

400 +msgstr ""

401 +

402 +#: merge-recursive.c:939

403 +msgid "Failed to execute internal merge"

404 +msgstr ""

405 +

406 +#: merge-recursive.c:943

407 +#, c-format

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

409 +msgstr ""

410 +

411 +#: merge-recursive.c:959

412 +msgid "unsupported object type in the tree"

413 +msgstr ""

414 +

415 +#: merge-recursive.c:1038 merge-recursive.c:1052

416 +#, c-format

417 +msgid ""

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

419 +"in tree."

420 +msgstr ""

421 +

422 +#: merge-recursive.c:1044 merge-recursive.c:1057

423 +#, c-format

424 +msgid ""

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

426 +"in tree at %s."

427 +msgstr ""

428 +

429 +#: merge-recursive.c:1098

430 +msgid "rename"

431 +msgstr ""

432 +

433 +#: merge-recursive.c:1098

434 +msgid "renamed"

435 +msgstr ""

436 +

437 +#: merge-recursive.c:1154

438 +#, c-format

439 +msgid "%s is a directory in %s adding as %s instead"

440 +msgstr ""

441 +

442 +#: merge-recursive.c:1176

443 +#, c-format

444 +msgid ""

445 +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

446 +"\"->\"%s\" in \"%s\"%s"

447 +msgstr ""

448 +

449 +#: merge-recursive.c:1181

450 +msgid " (left unresolved)"

451 +msgstr ""

452 +

453 +#: merge-recursive.c:1235

454 +#, c-format

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

456 +msgstr ""

457 +

458 +#: merge-recursive.c:1265

459 +#, c-format

460 +msgid "Renaming %s to %s and %s to %s instead"

461 +msgstr ""

462 +

463 +#: merge-recursive.c:1464

464 +#, c-format

465 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

466 +msgstr ""

467 +

468 +#: merge-recursive.c:1474

469 +#, c-format

470 +msgid "Adding merged %s"

471 +msgstr ""

472 +

473 +#: merge-recursive.c:1479 merge-recursive.c:1677

474 +#, c-format

475 +msgid "Adding as %s instead"

476 +msgstr ""

477 +

478 +#: merge-recursive.c:1530

479 +#, c-format

480 +msgid "cannot read object %s"

481 +msgstr ""

482 +

483 +#: merge-recursive.c:1533

484 +#, c-format

485 +msgid "object %s is not a blob"

486 +msgstr ""

487 +

488 +#: merge-recursive.c:1581

489 +msgid "modify"

490 +msgstr ""

491 +

492 +#: merge-recursive.c:1581

493 +msgid "modified"

494 +msgstr ""

495 +

496 +#: merge-recursive.c:1591

497 +msgid "content"

498 +msgstr ""

499 +

500 +#: merge-recursive.c:1598

501 +msgid "add/add"

502 +msgstr ""

503 +

504 +#: merge-recursive.c:1632

505 +#, c-format

506 +msgid "Skipped %s (merged same as existing)"

507 +msgstr ""

508 +

509 +#: merge-recursive.c:1646

510 +#, c-format

511 +msgid "Auto-merging %s"

512 +msgstr ""

513 +

514 +#: merge-recursive.c:1650 git-submodule.sh:844

515 +msgid "submodule"

516 +msgstr ""

517 +

518 +#: merge-recursive.c:1651

519 +#, c-format

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

521 +msgstr ""

522 +

523 +#: merge-recursive.c:1741

524 +#, c-format

525 +msgid "Removing %s"

526 +msgstr ""

527 +

528 +#: merge-recursive.c:1766

529 +msgid "file/directory"

530 +msgstr ""

531 +

532 +#: merge-recursive.c:1772

533 +msgid "directory/file"

534 +msgstr ""

535 +

536 +#: merge-recursive.c:1777

537 +#, c-format

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

539 +msgstr ""

540 +

541 +#: merge-recursive.c:1787

542 +#, c-format

543 +msgid "Adding %s"

544 +msgstr ""

545 +

546 +#: merge-recursive.c:1804

547 +msgid "Fatal merge failure, shouldn't happen."

548 +msgstr ""

549 +

550 +#: merge-recursive.c:1823

551 +msgid "Already up-to-date!"

552 +msgstr ""

553 +

554 +#: merge-recursive.c:1832

555 +#, c-format

556 +msgid "merging of trees %s and %s failed"

557 +msgstr ""

558 +

559 +#: merge-recursive.c:1862

560 +#, c-format

561 +msgid "Unprocessed path??? %s"

562 +msgstr ""

563 +

564 +#: merge-recursive.c:1907

565 +msgid "Merging:"

566 +msgstr ""

567 +

568 +#: merge-recursive.c:1918

569 +#, c-format

570 +msgid "found %u common ancestor(s):"

571 +msgstr ""

572 +

573 +#: merge-recursive.c:1954

574 +msgid "merge returned no commit"

575 +msgstr ""

576 +

577 +#: merge-recursive.c:2011

578 +#, c-format

579 +msgid "Could not parse object '%s'"

580 +msgstr ""

581 +

582 +#: merge-recursive.c:2023 builtin/merge.c:697

583 +msgid "Unable to write index."

584 +msgstr ""

585 +

586 #: parse-options.c:494

587 msgid "..."

588 msgstr ""

@@ -2021,11 +2273,6 @@ msgstr ""

2273 msgid "reference repository '%s' is not a local directory."

2274 msgstr ""

2275

2024 -#: builtin/clone.c:302

2025 -#, c-format

2026 -msgid "failed to open '%s'"

2027 -msgstr ""

2028 -

2276 #: builtin/clone.c:306

2277 #, c-format

2278 msgid "failed to create directory '%s'"

@@ -3424,10 +3671,6 @@ msgstr ""

3671 msgid "failed to read the cache"

3672 msgstr ""

3673

3427 -#: builtin/merge.c:697

3428 -msgid "Unable to write index."

3429 -msgstr ""

3430 -

3674 #: builtin/merge.c:710

3675 msgid "Not handling anything other than two heads merge."

3676 msgstr ""

@@ -4723,9 +4966,9 @@ msgstr ""

4966 #: git-am.sh:105

4967 #, sh-format

4968 msgid ""

4726 -"When you have resolved this problem run \"$cmdline --resolved\".\n"

4727 -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"

4728 -"To restore the original branch and stop patching run \"$cmdline --abort\"."

4969 +"When you have resolved this problem, run \"$cmdline --resolved\".\n"

4970 +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"

4971 +"To restore the original branch and stop patching, run \"$cmdline --abort\"."

4972 msgstr ""

4973

4974 #: git-am.sh:121

@@ -4736,6 +4979,10 @@ msgstr ""

4979 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

4980 msgstr ""

4981

4982 +#: git-am.sh:139

4983 +msgid "Using index info to reconstruct a base tree..."

4984 +msgstr ""

4985 +

4986 #: git-am.sh:154

4987 msgid ""

4988 "Did you hand edit your patch?\n"

@@ -4746,42 +4993,48 @@ msgstr ""

4993 msgid "Falling back to patching base and 3-way merge..."

4994 msgstr ""

4995

4749 -#: git-am.sh:275

4996 +#: git-am.sh:179

4997 +msgid "Failed to merge in the changes."

4998 +msgstr ""

4999 +

5000 +#: git-am.sh:274

5001 msgid "Only one StGIT patch series can be applied at once"

5002 msgstr ""

5003

4753 -#: git-am.sh:362

5004 +#: git-am.sh:361

5005 #, sh-format

5006 msgid "Patch format $patch_format is not supported."

5007 msgstr ""

5008

4758 -#: git-am.sh:364

5009 +#: git-am.sh:363

5010 msgid "Patch format detection failed."

5011 msgstr ""

5012

4762 -#: git-am.sh:418

4763 -msgid "-d option is no longer supported. Do not use."

5013 +#: git-am.sh:389

5014 +msgid ""

5015 +"The -b/--binary option has been a no-op for long time, and\n"

5016 +"it will be removed. Please do not use it anymore."

5017 msgstr ""

5018

4766 -#: git-am.sh:481

5019 +#: git-am.sh:477

5020 #, sh-format

5021 msgid "previous rebase directory $dotest still exists but mbox given."

5022 msgstr ""

5023

4771 -#: git-am.sh:486

5024 +#: git-am.sh:482

5025 msgid "Please make up your mind. --skip or --abort?"

5026 msgstr ""

5027

4775 -#: git-am.sh:513

5028 +#: git-am.sh:509

5029 msgid "Resolve operation not in progress, we are not resuming."

5030 msgstr ""

5031

4779 -#: git-am.sh:579

5032 +#: git-am.sh:575

5033 #, sh-format

5034 msgid "Dirty index: cannot apply patches (dirty: $files)"

5035 msgstr ""

5036

4784 -#: git-am.sh:683

5037 +#: git-am.sh:679

5038 #, sh-format

5039 msgid ""

5040 "Patch is empty. Was it split wrong?\n"

@@ -4789,53 +5042,53 @@ msgid ""

5042 "To restore the original branch and stop patching run \"$cmdline --abort\"."

5043 msgstr ""

5044

4792 -#: git-am.sh:710

5045 +#: git-am.sh:706

5046 msgid "Patch does not have a valid e-mail address."

5047 msgstr ""

5048

4796 -#: git-am.sh:757

5049 +#: git-am.sh:753

5050 msgid "cannot be interactive without stdin connected to a terminal."

5051 msgstr ""

5052

4800 -#: git-am.sh:761

5053 +#: git-am.sh:757

5054 msgid "Commit Body is:"

5055 msgstr ""

5056

5057 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

5058 #. in your translation. The program will only accept English

5059 #. input at this point.

4807 -#: git-am.sh:768

5060 +#: git-am.sh:764

5061 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

5062 msgstr ""

5063

4811 -#: git-am.sh:804

5064 +#: git-am.sh:800

5065 #, sh-format

5066 msgid "Applying: $FIRSTLINE"

5067 msgstr ""

5068

4816 -#: git-am.sh:825

5069 +#: git-am.sh:821

5070 msgid ""

5071 "No changes - did you forget to use 'git add'?\n"

5072 "If there is nothing left to stage, chances are that something else\n"

5073 "already introduced the same changes; you might want to skip this patch."

5074 msgstr ""

5075

4823 -#: git-am.sh:833

5076 +#: git-am.sh:829

5077 msgid ""

5078 "You still have unmerged paths in your index\n"

5079 "did you forget to use 'git add'?"

5080 msgstr ""

5081

4829 -#: git-am.sh:849

5082 +#: git-am.sh:845

5083 msgid "No changes -- Patch already applied."

5084 msgstr ""

5085

4833 -#: git-am.sh:859

5086 +#: git-am.sh:855

5087 #, sh-format

5088 msgid "Patch failed at $msgnum $FIRSTLINE"

5089 msgstr ""

5090

4838 -#: git-am.sh:880

5091 +#: git-am.sh:876

5092 msgid "applying to an empty history"

5093 msgstr ""

5094

@@ -5018,6 +5271,112 @@ msgstr ""

5271 msgid "Cannot rebase onto multiple branches"

5272 msgstr ""

5273

5274 +#: git-rebase.sh:52

5275 +msgid ""

5276 +"When you have resolved this problem, run \"git rebase --continue\".\n"

5277 +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

5278 +"To check out the original branch and stop rebasing, run \"git rebase --abort"

5279 +"\"."

5280 +msgstr ""

5281 +

5282 +#: git-rebase.sh:159

5283 +msgid "The pre-rebase hook refused to rebase."

5284 +msgstr ""

5285 +

5286 +#: git-rebase.sh:164

5287 +msgid "It looks like git-am is in progress. Cannot rebase."

5288 +msgstr ""

5289 +

5290 +#: git-rebase.sh:295

5291 +msgid "The --exec option must be used with the --interactive option"

5292 +msgstr ""

5293 +

5294 +#: git-rebase.sh:300

5295 +msgid "No rebase in progress?"

5296 +msgstr ""

5297 +

5298 +#: git-rebase.sh:313

5299 +msgid "Cannot read HEAD"

5300 +msgstr ""

5301 +

5302 +#: git-rebase.sh:316

5303 +msgid ""

5304 +"You must edit all merge conflicts and then\n"

5305 +"mark them as resolved using git add"

5306 +msgstr ""

5307 +

5308 +#: git-rebase.sh:334

5309 +#, sh-format

5310 +msgid "Could not move back to $head_name"

5311 +msgstr ""

5312 +

5313 +#: git-rebase.sh:350

5314 +#, sh-format

5315 +msgid ""

5316 +"It seems that there is already a $state_dir_base directory, and\n"

5317 +"I wonder if you are in the middle of another rebase. If that is the\n"

5318 +"case, please try\n"

5319 +"\t$cmd_live_rebase\n"

5320 +"If that is not the case, please\n"

5321 +"\t$cmd_clear_stale_rebase\n"

5322 +"and run me again. I am stopping in case you still have something\n"

5323 +"valuable there."

5324 +msgstr ""

5325 +

5326 +#: git-rebase.sh:395

5327 +#, sh-format

5328 +msgid "invalid upstream $upstream_name"

5329 +msgstr ""

5330 +

5331 +#: git-rebase.sh:419

5332 +#, sh-format

5333 +msgid "$onto_name: there are more than one merge bases"

5334 +msgstr ""

5335 +

5336 +#: git-rebase.sh:422 git-rebase.sh:426

5337 +#, sh-format

5338 +msgid "$onto_name: there is no merge base"

5339 +msgstr ""

5340 +

5341 +#: git-rebase.sh:431

5342 +#, sh-format

5343 +msgid "Does not point to a valid commit: $onto_name"

5344 +msgstr ""

5345 +

5346 +#: git-rebase.sh:454

5347 +#, sh-format

5348 +msgid "fatal: no such branch: $branch_name"

5349 +msgstr ""

5350 +

5351 +#: git-rebase.sh:474

5352 +msgid "Please commit or stash them."

5353 +msgstr ""

5354 +

5355 +#: git-rebase.sh:492

5356 +#, sh-format

5357 +msgid "Current branch $branch_name is up to date."

5358 +msgstr ""

5359 +

5360 +#: git-rebase.sh:495

5361 +#, sh-format

5362 +msgid "Current branch $branch_name is up to date, rebase forced."

5363 +msgstr ""

5364 +

5365 +#: git-rebase.sh:506

5366 +#, sh-format

5367 +msgid "Changes from $mb to $onto:"

5368 +msgstr ""

5369 +

5370 +#. Detach HEAD and reset the tree

5371 +#: git-rebase.sh:515

5372 +msgid "First, rewinding head to replay your work on top of it..."

5373 +msgstr ""

5374 +

5375 +#: git-rebase.sh:523

5376 +#, sh-format

5377 +msgid "Fast-forwarded $branch_name to $onto_name."

5378 +msgstr ""

5379 +

5380 #: git-stash.sh:51

5381 msgid "git stash clear with parameters is unimplemented"

5382 msgstr ""

@@ -5291,7 +5650,7 @@ msgid "Failed to recurse into submodule path '$sm_path'"

5650 msgstr ""

5651

5652 #: git-submodule.sh:754

5294 -msgid "--cached cannot be used with --files"

5653 +msgid "The --cached option cannot be used with the --files option"

5654 msgstr ""

5655

5656 #. unexpected type

@@ -5319,10 +5678,6 @@ msgstr ""

5678 msgid "blob"

5679 msgstr ""

5680

5322 -#: git-submodule.sh:844

5323 -msgid "submodule"

5324 -msgstr ""

5325 -

5681 #: git-submodule.sh:881

5682 msgid "# Submodules changed but not updated:"

5683 msgstr ""

l10n: Update git.pot (76 new, 4 removed messages)