a4d94835af · 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: 2017-02-04 13:02+0800\n"

11 +"POT-Creation-Date: 2017-02-18 01:00+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"

@@ -220,349 +220,349 @@ msgstr ""

220 msgid "patch with only garbage at line %d"

221 msgstr ""

222

223 -#: apply.c:2274

223 +#: apply.c:2265

224 #, c-format

225 msgid "unable to read symlink %s"

226 msgstr ""

227

228 -#: apply.c:2278

228 +#: apply.c:2269

229 #, c-format

230 msgid "unable to open or read %s"

231 msgstr ""

232

233 -#: apply.c:2931

233 +#: apply.c:2922

234 #, c-format

235 msgid "invalid start of line: '%c'"

236 msgstr ""

237

238 -#: apply.c:3050

238 +#: apply.c:3041

239 #, c-format

240 msgid "Hunk #%d succeeded at %d (offset %d line)."

241 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

242 msgstr[0] ""

243 msgstr[1] ""

244

245 -#: apply.c:3062

245 +#: apply.c:3053

246 #, c-format

247 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

248 msgstr ""

249

250 -#: apply.c:3068

250 +#: apply.c:3059

251 #, c-format

252 msgid ""

253 "while searching for:\n"

254 "%.*s"

255 msgstr ""

256

257 -#: apply.c:3090

257 +#: apply.c:3081

258 #, c-format

259 msgid "missing binary patch data for '%s'"

260 msgstr ""

261

262 -#: apply.c:3098

262 +#: apply.c:3089

263 #, c-format

264 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

265 msgstr ""

266

267 -#: apply.c:3144

267 +#: apply.c:3135

268 #, c-format

269 msgid "cannot apply binary patch to '%s' without full index line"

270 msgstr ""

271

272 -#: apply.c:3154

272 +#: apply.c:3145

273 #, c-format

274 msgid ""

275 "the patch applies to '%s' (%s), which does not match the current contents."

276 msgstr ""

277

278 -#: apply.c:3162

278 +#: apply.c:3153

279 #, c-format

280 msgid "the patch applies to an empty '%s' but it is not empty"

281 msgstr ""

282

283 -#: apply.c:3180

283 +#: apply.c:3171

284 #, c-format

285 msgid "the necessary postimage %s for '%s' cannot be read"

286 msgstr ""

287

288 -#: apply.c:3193

288 +#: apply.c:3184

289 #, c-format

290 msgid "binary patch does not apply to '%s'"

291 msgstr ""

292

293 -#: apply.c:3199

293 +#: apply.c:3190

294 #, c-format

295 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

296 msgstr ""

297

298 -#: apply.c:3220

298 +#: apply.c:3211

299 #, c-format

300 msgid "patch failed: %s:%ld"

301 msgstr ""

302

303 -#: apply.c:3342

303 +#: apply.c:3333

304 #, c-format

305 msgid "cannot checkout %s"

306 msgstr ""

307

308 -#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248

308 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

309 #, c-format

310 msgid "failed to read %s"

311 msgstr ""

312

313 -#: apply.c:3398

313 +#: apply.c:3389

314 #, c-format

315 msgid "reading from '%s' beyond a symbolic link"

316 msgstr ""

317

318 -#: apply.c:3427 apply.c:3667

318 +#: apply.c:3418 apply.c:3658

319 #, c-format

320 msgid "path %s has been renamed/deleted"

321 msgstr ""

322

323 -#: apply.c:3510 apply.c:3681

323 +#: apply.c:3501 apply.c:3672

324 #, c-format

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

326 msgstr ""

327

328 -#: apply.c:3519 apply.c:3689

328 +#: apply.c:3510 apply.c:3680

329 #, c-format

330 msgid "%s: does not match index"

331 msgstr ""

332

333 -#: apply.c:3554

333 +#: apply.c:3545

334 msgid "repository lacks the necessary blob to fall back on 3-way merge."

335 msgstr ""

336

337 -#: apply.c:3557

337 +#: apply.c:3548

338 #, c-format

339 msgid "Falling back to three-way merge...\n"

340 msgstr ""

341

342 -#: apply.c:3573 apply.c:3577

342 +#: apply.c:3564 apply.c:3568

343 #, c-format

344 msgid "cannot read the current contents of '%s'"

345 msgstr ""

346

347 -#: apply.c:3589

347 +#: apply.c:3580

348 #, c-format

349 msgid "Failed to fall back on three-way merge...\n"

350 msgstr ""

351

352 -#: apply.c:3603

352 +#: apply.c:3594

353 #, c-format

354 msgid "Applied patch to '%s' with conflicts.\n"

355 msgstr ""

356

357 -#: apply.c:3608

357 +#: apply.c:3599

358 #, c-format

359 msgid "Applied patch to '%s' cleanly.\n"

360 msgstr ""

361

362 -#: apply.c:3634

362 +#: apply.c:3625

363 msgid "removal patch leaves file contents"

364 msgstr ""

365

366 -#: apply.c:3706

366 +#: apply.c:3697

367 #, c-format

368 msgid "%s: wrong type"

369 msgstr ""

370

371 -#: apply.c:3708

371 +#: apply.c:3699

372 #, c-format

373 msgid "%s has type %o, expected %o"

374 msgstr ""

375

376 -#: apply.c:3859 apply.c:3861

376 +#: apply.c:3850 apply.c:3852

377 #, c-format

378 msgid "invalid path '%s'"

379 msgstr ""

380

381 -#: apply.c:3917

381 +#: apply.c:3908

382 #, c-format

383 msgid "%s: already exists in index"

384 msgstr ""

385

386 -#: apply.c:3920

386 +#: apply.c:3911

387 #, c-format

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

389 msgstr ""

390

391 -#: apply.c:3940

391 +#: apply.c:3931

392 #, c-format

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

394 msgstr ""

395

396 -#: apply.c:3945

396 +#: apply.c:3936

397 #, c-format

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

399 msgstr ""

400

401 -#: apply.c:3965

401 +#: apply.c:3956

402 #, c-format

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

404 msgstr ""

405

406 -#: apply.c:3969

406 +#: apply.c:3960

407 #, c-format

408 msgid "%s: patch does not apply"

409 msgstr ""

410

411 -#: apply.c:3984

411 +#: apply.c:3975

412 #, c-format

413 msgid "Checking patch %s..."

414 msgstr ""

415

416 -#: apply.c:4075

416 +#: apply.c:4066

417 #, c-format

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

419 msgstr ""

420

421 -#: apply.c:4082

421 +#: apply.c:4073

422 #, c-format

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

424 msgstr ""

425

426 -#: apply.c:4085

426 +#: apply.c:4076

427 #, c-format

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

429 msgstr ""

430

431 -#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135

431 +#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

432 #, c-format

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

434 msgstr ""

435

436 -#: apply.c:4094

436 +#: apply.c:4085

437 #, c-format

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

439 msgstr ""

440

441 -#: apply.c:4104

441 +#: apply.c:4095

442 #, c-format

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

444 msgstr ""

445

446 -#: apply.c:4242

446 +#: apply.c:4233

447 #, c-format

448 msgid "unable to remove %s from index"

449 msgstr ""

450

451 -#: apply.c:4277

451 +#: apply.c:4268

452 #, c-format

453 msgid "corrupt patch for submodule %s"

454 msgstr ""

455

456 -#: apply.c:4283

456 +#: apply.c:4274

457 #, c-format

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

459 msgstr ""

460

461 -#: apply.c:4291

461 +#: apply.c:4282

462 #, c-format

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

464 msgstr ""

465

466 -#: apply.c:4297 apply.c:4441

466 +#: apply.c:4288 apply.c:4432

467 #, c-format

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

469 msgstr ""

470

471 -#: apply.c:4338

471 +#: apply.c:4329

472 #, c-format

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

474 msgstr ""

475

476 -#: apply.c:4342

476 +#: apply.c:4333

477 #, c-format

478 msgid "closing file '%s'"

479 msgstr ""

480

481 -#: apply.c:4412

481 +#: apply.c:4403

482 #, c-format

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

484 msgstr ""

485

486 -#: apply.c:4510

486 +#: apply.c:4501

487 #, c-format

488 msgid "Applied patch %s cleanly."

489 msgstr ""

490

491 -#: apply.c:4518

491 +#: apply.c:4509

492 msgid "internal error"

493 msgstr ""

494

495 -#: apply.c:4521

495 +#: apply.c:4512

496 #, c-format

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

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

499 msgstr[0] ""

500 msgstr[1] ""

501

502 -#: apply.c:4532

502 +#: apply.c:4523

503 #, c-format

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

505 msgstr ""

506

507 -#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

507 +#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

508 #, c-format

509 msgid "cannot open %s"

510 msgstr ""

511

512 -#: apply.c:4554

512 +#: apply.c:4545

513 #, c-format

514 msgid "Hunk #%d applied cleanly."

515 msgstr ""

516

517 -#: apply.c:4558

517 +#: apply.c:4549

518 #, c-format

519 msgid "Rejected hunk #%d."

520 msgstr ""

521

522 -#: apply.c:4668

522 +#: apply.c:4659

523 #, c-format

524 msgid "Skipped patch '%s'."

525 msgstr ""

526

527 -#: apply.c:4676

527 +#: apply.c:4667

528 msgid "unrecognized input"

529 msgstr ""

530

531 -#: apply.c:4695

531 +#: apply.c:4686

532 msgid "unable to read index file"

533 msgstr ""

534

535 -#: apply.c:4833

535 +#: apply.c:4824

536 #, c-format

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

538 msgstr ""

539

540 -#: apply.c:4858

540 +#: apply.c:4849

541 #, c-format

542 msgid "squelched %d whitespace error"

543 msgid_plural "squelched %d whitespace errors"

544 msgstr[0] ""

545 msgstr[1] ""

546

547 -#: apply.c:4864 apply.c:4879

547 +#: apply.c:4855 apply.c:4870

548 #, c-format

549 msgid "%d line adds whitespace errors."

550 msgid_plural "%d lines add whitespace errors."

551 msgstr[0] ""

552 msgstr[1] ""

553

554 -#: apply.c:4872

554 +#: apply.c:4863

555 #, c-format

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

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

558 msgstr[0] ""

559 msgstr[1] ""

560

561 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

561 +#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

562 msgid "Unable to write new index file"

563 msgstr ""

564

565 -#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

565 +#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

566 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

567 #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

568 #: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

@@ -571,121 +571,121 @@ msgstr ""

571 msgid "path"

572 msgstr ""

573

574 -#: apply.c:4920

574 +#: apply.c:4911

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

576 msgstr ""

577

578 -#: apply.c:4923

578 +#: apply.c:4914

579 msgid "apply changes matching the given path"

580 msgstr ""

581

582 -#: apply.c:4925 builtin/am.c:2286

582 +#: apply.c:4916 builtin/am.c:2286

583 msgid "num"

584 msgstr ""

585

586 -#: apply.c:4926

586 +#: apply.c:4917

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

588 msgstr ""

589

590 -#: apply.c:4929

590 +#: apply.c:4920

591 msgid "ignore additions made by the patch"

592 msgstr ""

593

594 -#: apply.c:4931

594 +#: apply.c:4922

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

596 msgstr ""

597

598 -#: apply.c:4935

598 +#: apply.c:4926

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

600 msgstr ""

601

602 -#: apply.c:4937

602 +#: apply.c:4928

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

604 msgstr ""

605

606 -#: apply.c:4939

606 +#: apply.c:4930

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

608 msgstr ""

609

610 -#: apply.c:4941

610 +#: apply.c:4932

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

612 msgstr ""

613

614 -#: apply.c:4943

614 +#: apply.c:4934

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

616 msgstr ""

617

618 -#: apply.c:4945

618 +#: apply.c:4936

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

620 msgstr ""

621

622 -#: apply.c:4947

622 +#: apply.c:4938

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

624 msgstr ""

625

626 -#: apply.c:4949

626 +#: apply.c:4940

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

628 msgstr ""

629

630 -#: apply.c:4951

630 +#: apply.c:4942

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

632 msgstr ""

633

634 -#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505

634 +#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

635 msgid "paths are separated with NUL character"

636 msgstr ""

637

638 -#: apply.c:4956

638 +#: apply.c:4947

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

640 msgstr ""

641

642 -#: apply.c:4957 builtin/am.c:2265

642 +#: apply.c:4948 builtin/am.c:2265

643 msgid "action"

644 msgstr ""

645

646 -#: apply.c:4958

646 +#: apply.c:4949

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

648 msgstr ""

649

650 -#: apply.c:4961 apply.c:4964

650 +#: apply.c:4952 apply.c:4955

651 msgid "ignore changes in whitespace when finding context"

652 msgstr ""

653

654 -#: apply.c:4967

654 +#: apply.c:4958

655 msgid "apply the patch in reverse"

656 msgstr ""

657

658 -#: apply.c:4969

658 +#: apply.c:4960

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

660 msgstr ""

661

662 -#: apply.c:4971

662 +#: apply.c:4962

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

664 msgstr ""

665

666 -#: apply.c:4973

666 +#: apply.c:4964

667 msgid "allow overlapping hunks"

668 msgstr ""

669

670 -#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

670 +#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

671 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

672 #: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

673 msgid "be verbose"

674 msgstr ""

675

676 -#: apply.c:4976

676 +#: apply.c:4967

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

678 msgstr ""

679

680 -#: apply.c:4979

680 +#: apply.c:4970

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

682 msgstr ""

683

684 -#: apply.c:4981 builtin/am.c:2274

684 +#: apply.c:4972 builtin/am.c:2274

685 msgid "root"

686 msgstr ""

687

688 -#: apply.c:4982

688 +#: apply.c:4973

689 msgid "prepend <root> to all filenames"

690 msgstr ""

691

@@ -729,7 +729,7 @@ msgstr ""

729

730 #: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

731 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

732 -#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542

732 +#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

733 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

734 #: parse-options.h:153

735 msgid "file"

@@ -1459,29 +1459,29 @@ msgstr ""

1459 msgid "Failed to parse --submodule option parameter: '%s'"

1460 msgstr ""

1461

1462 -#: diff.c:4695

1462 +#: diff.c:4696

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

1464 msgstr ""

1465

1466 -#: diff.c:4698

1466 +#: diff.c:4699

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

1468 msgstr ""

1469

1470 -#: diff.c:4701

1470 +#: diff.c:4702

1471 #, c-format

1472 msgid ""

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

1474 msgstr ""

1475

1476 -#: dir.c:1863

1476 +#: dir.c:1862

1477 msgid "failed to get kernel name and information"

1478 msgstr ""

1479

1480 -#: dir.c:1982

1480 +#: dir.c:1981

1481 msgid "Untracked cache is disabled on this system or location."

1482 msgstr ""

1483

1484 -#: dir.c:2760

1484 +#: dir.c:2759

1485 #, c-format

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

1487 msgstr ""

@@ -1676,7 +1676,7 @@ msgstr ""

1676 msgid "'%s': unable to read %s"

1677 msgstr ""

1678

1679 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

1679 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1680 #, c-format

1681 msgid "failed to stat '%s'"

1682 msgstr ""

@@ -1897,119 +1897,119 @@ msgstr ""

1897 msgid "Renaming %s to %s and %s to %s instead"

1898 msgstr ""

1899

1900 -#: merge-recursive.c:1538

1900 +#: merge-recursive.c:1535

1901 #, c-format

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

1903 msgstr ""

1904

1905 -#: merge-recursive.c:1553

1905 +#: merge-recursive.c:1550

1906 #, c-format

1907 msgid "Adding merged %s"

1908 msgstr ""

1909

1910 -#: merge-recursive.c:1560 merge-recursive.c:1774

1910 +#: merge-recursive.c:1557 merge-recursive.c:1771

1911 #, c-format

1912 msgid "Adding as %s instead"

1913 msgstr ""

1914

1915 -#: merge-recursive.c:1617

1915 +#: merge-recursive.c:1614

1916 #, c-format

1917 msgid "cannot read object %s"

1918 msgstr ""

1919

1920 -#: merge-recursive.c:1620

1920 +#: merge-recursive.c:1617

1921 #, c-format

1922 msgid "object %s is not a blob"

1923 msgstr ""

1924

1925 -#: merge-recursive.c:1673

1925 +#: merge-recursive.c:1670

1926 msgid "modify"

1927 msgstr ""

1928

1929 -#: merge-recursive.c:1673

1929 +#: merge-recursive.c:1670

1930 msgid "modified"

1931 msgstr ""

1932

1933 -#: merge-recursive.c:1683

1933 +#: merge-recursive.c:1680

1934 msgid "content"

1935 msgstr ""

1936

1937 -#: merge-recursive.c:1690

1937 +#: merge-recursive.c:1687

1938 msgid "add/add"

1939 msgstr ""

1940

1941 -#: merge-recursive.c:1726

1941 +#: merge-recursive.c:1723

1942 #, c-format

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

1944 msgstr ""

1945

1946 -#: merge-recursive.c:1740

1946 +#: merge-recursive.c:1737

1947 #, c-format

1948 msgid "Auto-merging %s"

1949 msgstr ""

1950

1951 -#: merge-recursive.c:1744 git-submodule.sh:930

1951 +#: merge-recursive.c:1741 git-submodule.sh:930

1952 msgid "submodule"

1953 msgstr ""

1954

1955 -#: merge-recursive.c:1745

1955 +#: merge-recursive.c:1742

1956 #, c-format

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

1958 msgstr ""

1959

1960 -#: merge-recursive.c:1839

1960 +#: merge-recursive.c:1836

1961 #, c-format

1962 msgid "Removing %s"

1963 msgstr ""

1964

1965 -#: merge-recursive.c:1865

1965 +#: merge-recursive.c:1862

1966 msgid "file/directory"

1967 msgstr ""

1968

1969 -#: merge-recursive.c:1871

1969 +#: merge-recursive.c:1868

1970 msgid "directory/file"

1971 msgstr ""

1972

1973 -#: merge-recursive.c:1877

1973 +#: merge-recursive.c:1874

1974 #, c-format

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

1976 msgstr ""

1977

1978 -#: merge-recursive.c:1886

1978 +#: merge-recursive.c:1883

1979 #, c-format

1980 msgid "Adding %s"

1981 msgstr ""

1982

1983 -#: merge-recursive.c:1923

1983 +#: merge-recursive.c:1920

1984 msgid "Already up-to-date!"

1985 msgstr ""

1986

1987 -#: merge-recursive.c:1932

1987 +#: merge-recursive.c:1929

1988 #, c-format

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

1990 msgstr ""

1991

1992 -#: merge-recursive.c:2015

1992 +#: merge-recursive.c:2012

1993 msgid "Merging:"

1994 msgstr ""

1995

1996 -#: merge-recursive.c:2028

1996 +#: merge-recursive.c:2025

1997 #, c-format

1998 msgid "found %u common ancestor:"

1999 msgid_plural "found %u common ancestors:"

2000 msgstr[0] ""

2001 msgstr[1] ""

2002

2003 -#: merge-recursive.c:2067

2003 +#: merge-recursive.c:2064

2004 msgid "merge returned no commit"

2005 msgstr ""

2006

2007 -#: merge-recursive.c:2130

2007 +#: merge-recursive.c:2127

2008 #, c-format

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

2010 msgstr ""

2011

2012 -#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

2012 +#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2013 msgid "Unable to write index."

2014 msgstr ""

2015

@@ -2047,7 +2047,7 @@ msgstr ""

2047 msgid "Bad %s value: '%s'"

2048 msgstr ""

2049

2050 -#: object.c:242

2050 +#: object.c:240

2051 #, c-format

2052 msgid "unable to parse object: %s"

2053 msgstr ""

@@ -3249,7 +3249,7 @@ msgstr ""

3249 msgid "Aborting."

3250 msgstr ""

3251

3252 -#: transport-helper.c:1075

3252 +#: transport-helper.c:1082

3253 #, c-format

3254 msgid "Could not read ref %s"

3255 msgstr ""

@@ -5750,7 +5750,7 @@ msgid "remove whole directories"

5750 msgstr ""

5751

5752 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

5753 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

5753 +#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

5754 msgid "pattern"

5755 msgstr ""

5756

@@ -6961,31 +6961,31 @@ msgstr ""

6961 msgid "--dirty is incompatible with commit-ishes"

6962 msgstr ""

6963

6964 -#: builtin/diff.c:86

6964 +#: builtin/diff.c:83

6965 #, c-format

6966 msgid "'%s': not a regular file or symlink"

6967 msgstr ""

6968

6969 -#: builtin/diff.c:237

6969 +#: builtin/diff.c:234

6970 #, c-format

6971 msgid "invalid option: %s"

6972 msgstr ""

6973

6974 -#: builtin/diff.c:361

6974 +#: builtin/diff.c:358

6975 msgid "Not a git repository"

6976 msgstr ""

6977

6978 -#: builtin/diff.c:404

6978 +#: builtin/diff.c:401

6979 #, c-format

6980 msgid "invalid object '%s' given."

6981 msgstr ""

6982

6983 -#: builtin/diff.c:413

6983 +#: builtin/diff.c:410

6984 #, c-format

6985 msgid "more than two blobs given: '%s'"

6986 msgstr ""

6987

6988 -#: builtin/diff.c:420

6988 +#: builtin/diff.c:417

6989 #, c-format

6990 msgid "unhandled object '%s' given."

6991 msgstr ""

@@ -8768,103 +8768,103 @@ msgid ""

8768 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

8769 msgstr ""

8770

8771 -#: builtin/ls-files.c:458

8771 +#: builtin/ls-files.c:460

8772 msgid "git ls-files [<options>] [<file>...]"

8773 msgstr ""

8774

8775 -#: builtin/ls-files.c:507

8775 +#: builtin/ls-files.c:509

8776 msgid "identify the file status with tags"

8777 msgstr ""

8778

8779 -#: builtin/ls-files.c:509

8779 +#: builtin/ls-files.c:511

8780 msgid "use lowercase letters for 'assume unchanged' files"

8781 msgstr ""

8782

8783 -#: builtin/ls-files.c:511

8783 +#: builtin/ls-files.c:513

8784 msgid "show cached files in the output (default)"

8785 msgstr ""

8786

8787 -#: builtin/ls-files.c:513

8787 +#: builtin/ls-files.c:515

8788 msgid "show deleted files in the output"

8789 msgstr ""

8790

8791 -#: builtin/ls-files.c:515

8791 +#: builtin/ls-files.c:517

8792 msgid "show modified files in the output"

8793 msgstr ""

8794

8795 -#: builtin/ls-files.c:517

8795 +#: builtin/ls-files.c:519

8796 msgid "show other files in the output"

8797 msgstr ""

8798

8799 -#: builtin/ls-files.c:519

8799 +#: builtin/ls-files.c:521

8800 msgid "show ignored files in the output"

8801 msgstr ""

8802

8803 -#: builtin/ls-files.c:522

8803 +#: builtin/ls-files.c:524

8804 msgid "show staged contents' object name in the output"

8805 msgstr ""

8806

8807 -#: builtin/ls-files.c:524

8807 +#: builtin/ls-files.c:526

8808 msgid "show files on the filesystem that need to be removed"

8809 msgstr ""

8810

8811 -#: builtin/ls-files.c:526

8811 +#: builtin/ls-files.c:528

8812 msgid "show 'other' directories' names only"

8813 msgstr ""

8814

8815 -#: builtin/ls-files.c:528

8815 +#: builtin/ls-files.c:530

8816 msgid "show line endings of files"

8817 msgstr ""

8818

8819 -#: builtin/ls-files.c:530

8819 +#: builtin/ls-files.c:532

8820 msgid "don't show empty directories"

8821 msgstr ""

8822

8823 -#: builtin/ls-files.c:533

8823 +#: builtin/ls-files.c:535

8824 msgid "show unmerged files in the output"

8825 msgstr ""

8826

8827 -#: builtin/ls-files.c:535

8827 +#: builtin/ls-files.c:537

8828 msgid "show resolve-undo information"

8829 msgstr ""

8830

8831 -#: builtin/ls-files.c:537

8831 +#: builtin/ls-files.c:539

8832 msgid "skip files matching pattern"

8833 msgstr ""

8834

8835 -#: builtin/ls-files.c:540

8835 +#: builtin/ls-files.c:542

8836 msgid "exclude patterns are read from <file>"

8837 msgstr ""

8838

8839 -#: builtin/ls-files.c:543

8839 +#: builtin/ls-files.c:545

8840 msgid "read additional per-directory exclude patterns in <file>"

8841 msgstr ""

8842

8843 -#: builtin/ls-files.c:545

8843 +#: builtin/ls-files.c:547

8844 msgid "add the standard git exclusions"

8845 msgstr ""

8846

8847 -#: builtin/ls-files.c:548

8847 +#: builtin/ls-files.c:550

8848 msgid "make the output relative to the project top directory"

8849 msgstr ""

8850

8851 -#: builtin/ls-files.c:551

8851 +#: builtin/ls-files.c:553

8852 msgid "recurse through submodules"

8853 msgstr ""

8854

8855 -#: builtin/ls-files.c:553

8855 +#: builtin/ls-files.c:555

8856 msgid "if any <file> is not in the index, treat this as an error"

8857 msgstr ""

8858

8859 -#: builtin/ls-files.c:554

8859 +#: builtin/ls-files.c:556

8860 msgid "tree-ish"

8861 msgstr ""

8862

8863 -#: builtin/ls-files.c:555

8863 +#: builtin/ls-files.c:557

8864 msgid "pretend that paths removed since <tree-ish> are still present"

8865 msgstr ""

8866

8867 -#: builtin/ls-files.c:557

8867 +#: builtin/ls-files.c:559

8868 msgid "show debugging data"

8869 msgstr ""

8870

@@ -10180,11 +10180,11 @@ msgstr ""

10180 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

10181 msgstr ""

10182

10183 -#: builtin/prune.c:106 builtin/worktree.c:128

10183 +#: builtin/prune.c:106

10184 msgid "report pruned objects"

10185 msgstr ""

10186

10187 -#: builtin/prune.c:109 builtin/worktree.c:130

10187 +#: builtin/prune.c:109

10188 msgid "expire objects older than <time>"

10189 msgstr ""

10190

@@ -12685,6 +12685,14 @@ msgstr ""

12685 msgid "Removing worktrees/%s: gitdir file points to non-existent location"

12686 msgstr ""

12687

12688 +#: builtin/worktree.c:128

12689 +msgid "report pruned working trees"

12690 +msgstr ""

12691 +

12692 +#: builtin/worktree.c:130

12693 +msgid "expire working trees older than <time>"

12694 +msgstr ""

12695 +

12696 #: builtin/worktree.c:204

12697 #, c-format

12698 msgid "'%s' already exists"

l10n: git.pot: v2.12.0 round 2 (2 new)