0c7696ed67 · matheusbsbs/matheus-bagliano

@@ -76,8 +76,8 @@ msgid ""

76 msgstr ""

77 "Project-Id-Version: git\n"

78 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

79 -"POT-Creation-Date: 2020-05-27 07:23+0800\n"

80 -"PO-Revision-Date: 2020-05-27 11:04+0200\n"

79 +"POT-Creation-Date: 2020-07-10 09:53+0800\n"

80 +"PO-Revision-Date: 2020-07-12 18:00+0200\n"

81 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"

82 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"

83 "Language: fr\n"

@@ -180,21 +180,21 @@ msgstr[1] "%d chemins ajoutés\n"

180 msgid "ignoring unmerged: %s"

181 msgstr "fichier non-fusionné ignoré : %s"

182

183 -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

183 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

184 #, c-format

185 msgid "Only binary files changed.\n"

186 msgstr "Seuls des fichiers binaires ont changé.\n"

187

188 -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

188 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

189 #, c-format

190 msgid "No changes.\n"

191 msgstr "Aucune modification.\n"

192

193 -#: add-interactive.c:935 git-add--interactive.perl:1376

193 +#: add-interactive.c:935 git-add--interactive.perl:1378

194 msgid "Patch update"

195 msgstr "Mise à jour par patch"

196

197 -#: add-interactive.c:974 git-add--interactive.perl:1754

197 +#: add-interactive.c:974 git-add--interactive.perl:1771

198 msgid "Review diff"

199 msgstr "Réviser la différence"

200

@@ -265,11 +265,11 @@ msgstr "sélectionner un élément par son numéro"

265 msgid "(empty) select nothing"

266 msgstr "(vide) ne rien sélectionner"

267

268 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851

268 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868

269 msgid "*** Commands ***"

270 msgstr "*** Commandes ***"

271

272 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848

272 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865

273 msgid "What now"

274 msgstr "Et maintenant ?"

275

@@ -286,7 +286,7 @@ msgstr "non-indexé"

286 #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

287 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

288 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

289 -#: builtin/submodule--helper.c:2148 bugreport.c:129

289 +#: builtin/submodule--helper.c:2148 bugreport.c:135

290 #: git-add--interactive.perl:213

291 msgid "path"

292 msgstr "chemin"

@@ -295,27 +295,32 @@ msgstr "chemin"

295 msgid "could not refresh index"

296 msgstr "impossible de rafraîchir l'index"

297

298 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765

298 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782

299 #, c-format

300 msgid "Bye.\n"

301 msgstr "Au revoir.\n"

302

303 -#: add-patch.c:34 git-add--interactive.perl:1428

303 +#: add-patch.c:34 git-add--interactive.perl:1430

304 #, c-format, perl-format

305 msgid "Stage mode change [y,n,q,a,d%s,?]? "

306 msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "

307

308 -#: add-patch.c:35 git-add--interactive.perl:1429

308 +#: add-patch.c:35 git-add--interactive.perl:1431

309 #, c-format, perl-format

310 msgid "Stage deletion [y,n,q,a,d%s,?]? "

311 msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "

312

313 -#: add-patch.c:36 git-add--interactive.perl:1430

313 +#: add-patch.c:36 git-add--interactive.perl:1432

314 +#, c-format, perl-format

315 +msgid "Stage addition [y,n,q,a,d%s,?]? "

316 +msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "

317 +

318 +#: add-patch.c:37 git-add--interactive.perl:1433

319 #, c-format, perl-format

320 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

321 msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "

322

318 -#: add-patch.c:38

323 +#: add-patch.c:39

324 msgid ""

325 "If the patch applies cleanly, the edited hunk will immediately be marked for "

326 "staging."

@@ -323,7 +328,7 @@ msgstr ""

328 "Si le patch s'applique proprement, la section éditée sera immédiatement "

329 "marquée comme indexée."

330

326 -#: add-patch.c:41

331 +#: add-patch.c:42

332 msgid ""

333 "y - stage this hunk\n"

334 "n - do not stage this hunk\n"

@@ -337,22 +342,27 @@ msgstr ""

342 "a - indexer cette section et toutes les suivantes de ce fichier\n"

343 "d - ne pas indexer cette section ni les suivantes de ce fichier\n"

344

340 -#: add-patch.c:55 git-add--interactive.perl:1433

345 +#: add-patch.c:56 git-add--interactive.perl:1436

346 #, c-format, perl-format

347 msgid "Stash mode change [y,n,q,a,d%s,?]? "

348 msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "

349

345 -#: add-patch.c:56 git-add--interactive.perl:1434

350 +#: add-patch.c:57 git-add--interactive.perl:1437

351 #, c-format, perl-format

352 msgid "Stash deletion [y,n,q,a,d%s,?]? "

353 msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "

354

350 -#: add-patch.c:57 git-add--interactive.perl:1435

355 +#: add-patch.c:58 git-add--interactive.perl:1438

356 +#, c-format, perl-format

357 +msgid "Stash addition [y,n,q,a,d%s,?]? "

358 +msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "

359 +

360 +#: add-patch.c:59 git-add--interactive.perl:1439

361 #, c-format, perl-format

362 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

363 msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "

364

355 -#: add-patch.c:59

365 +#: add-patch.c:61

366 msgid ""

367 "If the patch applies cleanly, the edited hunk will immediately be marked for "

368 "stashing."

@@ -360,7 +370,7 @@ msgstr ""

370 "Si le patch s'applique proprement, la section éditée sera immédiatement "

371 "marquée comme remisée."

372

363 -#: add-patch.c:62

373 +#: add-patch.c:64

374 msgid ""

375 "y - stash this hunk\n"

376 "n - do not stash this hunk\n"

@@ -374,22 +384,27 @@ msgstr ""

384 "a - remiser cette section et toutes les suivantes de ce fichier\n"

385 "d - ne pas remiser cette section ni les suivantes de ce fichier\n"

386

377 -#: add-patch.c:78 git-add--interactive.perl:1438

387 +#: add-patch.c:80 git-add--interactive.perl:1442

388 #, c-format, perl-format

389 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

390 msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "

391

382 -#: add-patch.c:79 git-add--interactive.perl:1439

392 +#: add-patch.c:81 git-add--interactive.perl:1443

393 #, c-format, perl-format

394 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

395 msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "

396

387 -#: add-patch.c:80 git-add--interactive.perl:1440

397 +#: add-patch.c:82 git-add--interactive.perl:1444

398 +#, c-format, perl-format

399 +msgid "Unstage addition [y,n,q,a,d%s,?]? "

400 +msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "

401 +

402 +#: add-patch.c:83 git-add--interactive.perl:1445

403 #, c-format, perl-format

404 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

405 msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "

406

392 -#: add-patch.c:82

407 +#: add-patch.c:85

408 msgid ""

409 "If the patch applies cleanly, the edited hunk will immediately be marked for "

410 "unstaging."

@@ -397,7 +412,7 @@ msgstr ""

412 "Si le patch s'applique proprement, la section éditée sera immédiatement "

413 "marquée comme desindexée."

414

400 -#: add-patch.c:85

415 +#: add-patch.c:88

416 msgid ""

417 "y - unstage this hunk\n"

418 "n - do not unstage this hunk\n"

@@ -411,22 +426,27 @@ msgstr ""

426 "a - désindexer cette section et toutes les suivantes de ce fichier\n"

427 "d - ne pas désindexer cette section ni les suivantes de ce fichier\n"

428

414 -#: add-patch.c:100 git-add--interactive.perl:1443

429 +#: add-patch.c:103 git-add--interactive.perl:1448

430 #, c-format, perl-format

431 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

432 msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "

433

419 -#: add-patch.c:101 git-add--interactive.perl:1444

434 +#: add-patch.c:104 git-add--interactive.perl:1449

435 #, c-format, perl-format

436 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

437 msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "

438

424 -#: add-patch.c:102 git-add--interactive.perl:1445

439 +#: add-patch.c:105 git-add--interactive.perl:1450

440 +#, c-format, perl-format

441 +msgid "Apply addition to index [y,n,q,a,d%s,?]? "

442 +msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "

443 +

444 +#: add-patch.c:106 git-add--interactive.perl:1451

445 #, c-format, perl-format

446 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

447 msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "

448

429 -#: add-patch.c:104 add-patch.c:169 add-patch.c:212

449 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221

450 msgid ""

451 "If the patch applies cleanly, the edited hunk will immediately be marked for "

452 "applying."

@@ -434,7 +454,7 @@ msgstr ""

454 "Si le patch s'applique proprement, la section éditée sera immédiatement "

455 "marquée comme appliquée."

456

437 -#: add-patch.c:107

457 +#: add-patch.c:111

458 msgid ""

459 "y - apply this hunk to index\n"

460 "n - do not apply this hunk to index\n"

@@ -448,25 +468,31 @@ msgstr ""

468 "a - appliquer cette section et toutes les suivantes de ce fichier\n"

469 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

470

451 -#: add-patch.c:122 git-add--interactive.perl:1448

452 -#: git-add--interactive.perl:1463

471 +#: add-patch.c:126 git-add--interactive.perl:1454

472 +#: git-add--interactive.perl:1472

473 #, c-format, perl-format

474 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

475 msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "

476

457 -#: add-patch.c:123 git-add--interactive.perl:1449

458 -#: git-add--interactive.perl:1464

477 +#: add-patch.c:127 git-add--interactive.perl:1455

478 +#: git-add--interactive.perl:1473

479 #, c-format, perl-format

480 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

481 msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "

482

463 -#: add-patch.c:124 git-add--interactive.perl:1450

464 -#: git-add--interactive.perl:1465

483 +#: add-patch.c:128 git-add--interactive.perl:1456

484 +#: git-add--interactive.perl:1474

485 +#, c-format, perl-format

486 +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

487 +msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "

488 +

489 +#: add-patch.c:129 git-add--interactive.perl:1457

490 +#: git-add--interactive.perl:1475

491 #, c-format, perl-format

492 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

493 msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "

494

469 -#: add-patch.c:126 add-patch.c:148 add-patch.c:191

495 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199

496 msgid ""

497 "If the patch applies cleanly, the edited hunk will immediately be marked for "

498 "discarding."

@@ -474,7 +500,7 @@ msgstr ""

500 "Si le patch s'applique proprement, la section éditée sera immédiatement "

501 "marquée comme éliminée."

502

477 -#: add-patch.c:129 add-patch.c:194

503 +#: add-patch.c:134 add-patch.c:202

504 msgid ""

505 "y - discard this hunk from worktree\n"

506 "n - do not discard this hunk from worktree\n"

@@ -488,24 +514,29 @@ msgstr ""

514 "a - supprimer cette section et toutes les suivantes de ce fichier\n"

515 "d - ne pas supprimer cette section ni les suivantes de ce fichier\n"

516

491 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

517 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

518 #, c-format, perl-format

519 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

520 msgstr ""

521 "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "

522

497 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

523 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

524 #, c-format, perl-format

525 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

526 msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "

527

502 -#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

528 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

529 +#, c-format, perl-format

530 +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

531 +msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "

532 +

533 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

534 #, c-format, perl-format

535 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

536 msgstr ""

537 "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

538

508 -#: add-patch.c:151

539 +#: add-patch.c:157

540 msgid ""

541 "y - discard this hunk from index and worktree\n"

542 "n - do not discard this hunk from index and worktree\n"

@@ -519,27 +550,32 @@ msgstr ""

550 "a - éliminer cette section et toutes les suivantes de ce fichier\n"

551 "d - ne pas éliminer cette section ni les suivantes de ce fichier\n"

552

522 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

553 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

554 #, c-format, perl-format

555 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

556 msgstr ""

557 "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"

558 "%s,?] ? "

559

529 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

560 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

561 #, c-format, perl-format

562 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

563 msgstr ""

564 "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"

565 "%s,?] ? "

566

536 -#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

567 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

568 +#, c-format, perl-format

569 +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

570 +msgstr "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

571 +

572 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

573 #, c-format, perl-format

574 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

575 msgstr ""

576 "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

577

542 -#: add-patch.c:172

578 +#: add-patch.c:179

579 msgid ""

580 "y - apply this hunk to index and worktree\n"

581 "n - do not apply this hunk to index and worktree\n"

@@ -553,7 +589,7 @@ msgstr ""

589 "a - appliquer cette section et toutes les suivantes de ce fichier\n"

590 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

591

556 -#: add-patch.c:215

592 +#: add-patch.c:224

593 msgid ""

594 "y - apply this hunk to worktree\n"

595 "n - do not apply this hunk to worktree\n"

@@ -567,34 +603,34 @@ msgstr ""

603 "a - appliquer cette section et toutes les suivantes de ce fichier\n"

604 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

605

570 -#: add-patch.c:319

606 +#: add-patch.c:328

607 #, c-format

608 msgid "could not parse hunk header '%.*s'"

609 msgstr "impossible d'analyser l'entête de section '%.*s'"

610

575 -#: add-patch.c:338 add-patch.c:342

611 +#: add-patch.c:347 add-patch.c:351

612 #, c-format

613 msgid "could not parse colored hunk header '%.*s'"

614 msgstr "impossible d'analyser l'entête coloré de section '%.*s'"

615

580 -#: add-patch.c:396

616 +#: add-patch.c:405

617 msgid "could not parse diff"

618 msgstr "impossible d'analyser la diff"

619

584 -#: add-patch.c:415

620 +#: add-patch.c:424

621 msgid "could not parse colored diff"

622 msgstr "impossible d'analyser la diff colorée"

623

588 -#: add-patch.c:429

624 +#: add-patch.c:438

625 #, c-format

626 msgid "failed to run '%s'"

627 msgstr "échec pour lancer '%s'"

628

593 -#: add-patch.c:588

629 +#: add-patch.c:602

630 msgid "mismatched output from interactive.diffFilter"

631 msgstr "sortie sans correspondance depuis interactive.diffFilter"

632

597 -#: add-patch.c:589

633 +#: add-patch.c:603

634 msgid ""

635 "Your filter must maintain a one-to-one correspondence\n"

636 "between its input and output lines."

@@ -602,7 +638,7 @@ msgstr ""

638 "Votre filtre doit maintenir une correspondance un-pour-un\n"

639 "entre les lignes en entrée et en sortie."

640

605 -#: add-patch.c:762

641 +#: add-patch.c:776

642 #, c-format

643 msgid ""

644 "expected context line #%d in\n"

@@ -611,7 +647,7 @@ msgstr ""

647 "ligne de contexte attendue #%d dans\n"

648 "%.*s"

649

614 -#: add-patch.c:777

650 +#: add-patch.c:791

651 #, c-format

652 msgid ""

653 "hunks do not overlap:\n"

@@ -624,12 +660,12 @@ msgstr ""

660 "\tne se termine pas par :\n"

661 "%.*s"

662

627 -#: add-patch.c:1053 git-add--interactive.perl:1112

663 +#: add-patch.c:1067 git-add--interactive.perl:1114

664 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

665 msgstr ""

666 "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"

667

632 -#: add-patch.c:1057

668 +#: add-patch.c:1071

669 #, c-format

670 msgid ""

671 "---\n"

@@ -643,7 +679,7 @@ msgstr ""

679 "Les lignes commençant par %c seront éliminées.\n"

680

681 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

646 -#: add-patch.c:1071 git-add--interactive.perl:1126

682 +#: add-patch.c:1085 git-add--interactive.perl:1128

683 msgid ""

684 "If it does not apply cleanly, you will be given an opportunity to\n"

685 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -653,11 +689,11 @@ msgstr ""

689 "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"

690 "alors l'édition sera abandonnée et la section conservée.\n"

691

656 -#: add-patch.c:1104

692 +#: add-patch.c:1118

693 msgid "could not parse hunk header"

694 msgstr "impossible d'analyser l'entête de section"

695

660 -#: add-patch.c:1149

696 +#: add-patch.c:1163

697 msgid "'git apply --cached' failed"

698 msgstr "'git apply --cached' a échoué"

699

@@ -673,26 +709,26 @@ msgstr "'git apply --cached' a échoué"

709 #. Consider translating (saying "no" discards!) as

710 #. (saying "n" for "no" discards!) if the translation

711 #. of the word "no" does not start with n.

676 -#: add-patch.c:1218 git-add--interactive.perl:1239

712 +#: add-patch.c:1232 git-add--interactive.perl:1241

713 msgid ""

714 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

715 msgstr ""

716 "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "

717 "l'élimine !) [y|n] ? "

718

683 -#: add-patch.c:1261

719 +#: add-patch.c:1275

720 msgid "The selected hunks do not apply to the index!"

721 msgstr "Les sections sélectionnées ne s'applique pas à l'index !"

722

687 -#: add-patch.c:1262 git-add--interactive.perl:1343

723 +#: add-patch.c:1276 git-add--interactive.perl:1345

724 msgid "Apply them to the worktree anyway? "

725 msgstr "Les appliquer quand même à l'arbre de travail ? "

726

691 -#: add-patch.c:1269 git-add--interactive.perl:1346

727 +#: add-patch.c:1283 git-add--interactive.perl:1348

728 msgid "Nothing was applied.\n"

729 msgstr "Rien n'a été appliqué.\n"

730

695 -#: add-patch.c:1326

731 +#: add-patch.c:1340

732 msgid ""

733 "j - leave this hunk undecided, see next undecided hunk\n"

734 "J - leave this hunk undecided, see next hunk\n"

@@ -714,69 +750,69 @@ msgstr ""

750 "e - éditer manuellement la section actuelle\n"

751 "? - afficher l'aide\n"

752

717 -#: add-patch.c:1447 add-patch.c:1457

753 +#: add-patch.c:1463 add-patch.c:1473

754 msgid "No previous hunk"

755 msgstr "Pas de section précédente"

756

721 -#: add-patch.c:1452 add-patch.c:1462

757 +#: add-patch.c:1468 add-patch.c:1478

758 msgid "No next hunk"

759 msgstr "Pas de section suivante"

760

725 -#: add-patch.c:1468

761 +#: add-patch.c:1484

762 msgid "No other hunks to goto"

763 msgstr "Aucune autre section à atteindre"

764

729 -#: add-patch.c:1479 git-add--interactive.perl:1577

765 +#: add-patch.c:1495 git-add--interactive.perl:1594

766 msgid "go to which hunk (<ret> to see more)? "

767 msgstr "aller à quelle section (<ret> pour voir plus) ? "

768

733 -#: add-patch.c:1480 git-add--interactive.perl:1579

769 +#: add-patch.c:1496 git-add--interactive.perl:1596

770 msgid "go to which hunk? "

771 msgstr "aller à quelle section ? "

772

737 -#: add-patch.c:1491

773 +#: add-patch.c:1507

774 #, c-format

775 msgid "Invalid number: '%s'"

776 msgstr "Numéro invalide : '%s'"

777

742 -#: add-patch.c:1496

778 +#: add-patch.c:1512

779 #, c-format

780 msgid "Sorry, only %d hunk available."

781 msgid_plural "Sorry, only %d hunks available."

782 msgstr[0] "Désolé, %d seule section disponible."

783 msgstr[1] "Désolé, Seulement %d sections disponibles."

784

749 -#: add-patch.c:1505

785 +#: add-patch.c:1521

786 msgid "No other hunks to search"

787 msgstr "aucune autre section à rechercher"

788

753 -#: add-patch.c:1511 git-add--interactive.perl:1623

789 +#: add-patch.c:1527 git-add--interactive.perl:1640

790 msgid "search for regex? "

791 msgstr "rechercher la regex ? "

792

757 -#: add-patch.c:1526

793 +#: add-patch.c:1542

794 #, c-format

795 msgid "Malformed search regexp %s: %s"

796 msgstr "Regex de recherche malformée %s : %s"

797

762 -#: add-patch.c:1543

798 +#: add-patch.c:1559

799 msgid "No hunk matches the given pattern"

800 msgstr "Aucune section ne correspond au motif donné"

801

766 -#: add-patch.c:1550

802 +#: add-patch.c:1566

803 msgid "Sorry, cannot split this hunk"

804 msgstr "Désolé, impossible de découper cette section"

805

770 -#: add-patch.c:1554

806 +#: add-patch.c:1570

807 #, c-format

808 msgid "Split into %d hunks."

809 msgstr "Découpée en %d sections."

810

775 -#: add-patch.c:1558

811 +#: add-patch.c:1574

812 msgid "Sorry, cannot edit this hunk"

813 msgstr "Désolé, impossible d'éditer cette section"

814

779 -#: add-patch.c:1609

815 +#: add-patch.c:1625

816 msgid "'git apply' failed"

817 msgstr "'git apply' a échoué"

818

@@ -785,7 +821,9 @@ msgstr "'git apply' a échoué"

821 msgid ""

822 "\n"

823 "Disable this message with \"git config advice.%s false\""

788 -msgstr "\nDésactivez ce message avec \"git config advice.%s false\""

824 +msgstr ""

825 +"\n"

826 +"Désactivez ce message avec \"git config advice.%s false\""

827

828 #: advice.c:156

829 #, c-format

@@ -1478,7 +1516,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"

1516

1517 #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

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

1481 -#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1519 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1520 msgid "action"

1521 msgstr "action"

1522

@@ -1571,7 +1609,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s"

1609 msgid "path too long (%d chars, SHA1: %s): %s"

1610 msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"

1611

1574 -#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1612 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1613 #, c-format

1614 msgid "deflate error (%d)"

1615 msgstr "erreur de compression (%d)"

@@ -1641,8 +1679,8 @@ msgid "prepend prefix to each pathname in the archive"

1679 msgstr "préfixer chaque chemin de fichier dans l'archive"

1680

1681 #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1644 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1645 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1682 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1683 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

1684 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1685 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1686 #: parse-options.h:190

@@ -1869,10 +1907,10 @@ msgstr ""

1907 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

1908 "dernier commit"

1909

1872 -#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1910 +#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1911 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1912 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1875 -#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1913 +#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1914 #: builtin/shortlog.c:192

1915 msgid "revision walk setup failed"

1916 msgstr "échec de la préparation du parcours des révisions"

@@ -2042,84 +2080,88 @@ msgstr "'%s' est déjà extrait dans '%s'"

2080 msgid "HEAD of working tree %s is not updated"

2081 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"

2082

2045 -#: bundle.c:36

2083 +#: bundle.c:47

2084 #, c-format

2085 msgid "'%s' does not look like a v2 bundle file"

2086 msgstr "'%s' ne semble pas être un fichier bundle v2"

2087

2050 -#: bundle.c:64

2088 +#: bundle.c:69

2089 +msgid "unknown hash algorithm length"

2090 +msgstr "longueur d'algorithme d'empreinte inconnue"

2091 +

2092 +#: bundle.c:84

2093 #, c-format

2094 msgid "unrecognized header: %s%s (%d)"

2095 msgstr "en-tête non reconnu : %s%s (%d)"

2096

2055 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2097 +#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2098 #: builtin/commit.c:814

2099 #, c-format

2100 msgid "could not open '%s'"

2101 msgstr "impossible d'ouvrir '%s'"

2102

2061 -#: bundle.c:143

2103 +#: bundle.c:163

2104 msgid "Repository lacks these prerequisite commits:"

2105 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"

2106

2065 -#: bundle.c:146

2107 +#: bundle.c:166

2108 msgid "need a repository to verify a bundle"

2109 msgstr "la vérification d'un colis requiert un dépôt"

2110

2069 -#: bundle.c:197

2111 +#: bundle.c:217

2112 #, c-format

2113 msgid "The bundle contains this ref:"

2114 msgid_plural "The bundle contains these %d refs:"

2115 msgstr[0] "Le colis contient cette référence :"

2116 msgstr[1] "Le colis contient ces %d références :"

2117

2076 -#: bundle.c:204

2118 +#: bundle.c:224

2119 msgid "The bundle records a complete history."

2120 msgstr "Le colis enregistre l'historique complet."

2121

2080 -#: bundle.c:206

2122 +#: bundle.c:226

2123 #, c-format

2124 msgid "The bundle requires this ref:"

2125 msgid_plural "The bundle requires these %d refs:"

2126 msgstr[0] "Le colis exige cette référence :"

2127 msgstr[1] "Le colis exige ces %d références :"

2128

2087 -#: bundle.c:273

2129 +#: bundle.c:293

2130 msgid "unable to dup bundle descriptor"

2131 msgstr "impossible de dupliquer le descripteur de liasse"

2132

2091 -#: bundle.c:280

2133 +#: bundle.c:300

2134 msgid "Could not spawn pack-objects"

2135 msgstr "Impossible de créer des objets groupés"

2136

2095 -#: bundle.c:291

2137 +#: bundle.c:311

2138 msgid "pack-objects died"

2139 msgstr "les objets groupés ont disparu"

2140

2099 -#: bundle.c:333

2141 +#: bundle.c:353

2142 msgid "rev-list died"

2143 msgstr "rev-list a disparu"

2144

2103 -#: bundle.c:382

2145 +#: bundle.c:402

2146 #, c-format

2147 msgid "ref '%s' is excluded by the rev-list options"

2148 msgstr "la référence '%s' est exclue par les options de rev-list"

2149

2108 -#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2150 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2151 #, c-format

2152 msgid "unrecognized argument: %s"

2153 msgstr "argument non reconnu : %s"

2154

2113 -#: bundle.c:469

2155 +#: bundle.c:489

2156 msgid "Refusing to create empty bundle."

2157 msgstr "Refus de créer un colis vide."

2158

2117 -#: bundle.c:479

2159 +#: bundle.c:499

2160 #, c-format

2161 msgid "cannot create '%s'"

2162 msgstr "impossible de créer '%s'"

2163

2122 -#: bundle.c:504

2164 +#: bundle.c:524

2165 msgid "index-pack died"

2166 msgstr "l'index de groupe a disparu"

2167

@@ -2128,271 +2170,263 @@ msgstr "l'index de groupe a disparu"

2170 msgid "invalid color value: %.*s"

2171 msgstr "Valeur invalide de couleur : %.*s"

2172

2131 -#: commit-graph.c:183

2173 +#: commit-graph.c:238

2174 msgid "commit-graph file is too small"

2175 msgstr "le graphe de commit est trop petit"

2176

2135 -#: commit-graph.c:248

2177 +#: commit-graph.c:303

2178 #, c-format

2179 msgid "commit-graph signature %X does not match signature %X"

2180 msgstr ""

2181 "la signature du graphe de commit %X ne correspond pas à la signature %X"

2182

2141 -#: commit-graph.c:255

2183 +#: commit-graph.c:310

2184 #, c-format

2185 msgid "commit-graph version %X does not match version %X"

2186 msgstr "la version %X du graphe de commit ne correspond pas à la version %X"

2187

2146 -#: commit-graph.c:262

2188 +#: commit-graph.c:317

2189 #, c-format

2190 msgid "commit-graph hash version %X does not match version %X"

2191 msgstr ""

2192 "l'empreinte de la version %X du graphe de commit ne correspond pas à la "

2193 "version %X"

2194

2153 -#: commit-graph.c:284

2195 +#: commit-graph.c:339

2196 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2197 msgstr ""

2198 "entrée de table de consultation de morceaux de graphe de commite manquante ; "

2199 "le fichier est peut être incomplet"

2200

2159 -#: commit-graph.c:294

2201 +#: commit-graph.c:349

2202 #, c-format

2203 msgid "commit-graph improper chunk offset %08x%08x"

2204 msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"

2205

2164 -#: commit-graph.c:362

2206 +#: commit-graph.c:417

2207 #, c-format

2208 msgid "commit-graph chunk id %08x appears multiple times"

2209 msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois"

2210

2169 -#: commit-graph.c:436

2211 +#: commit-graph.c:491

2212 msgid "commit-graph has no base graphs chunk"

2213 msgstr "le graphe de commit n'a pas de section de graphes de base"

2214

2173 -#: commit-graph.c:446

2215 +#: commit-graph.c:501

2216 msgid "commit-graph chain does not match"

2217 msgstr "la chaîne de graphe de commit ne correspond pas"

2218

2177 -#: commit-graph.c:494

2219 +#: commit-graph.c:549

2220 #, c-format

2221 msgid "invalid commit-graph chain: line '%s' not a hash"

2222 msgstr ""

2223 "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"

2224

2183 -#: commit-graph.c:518

2225 +#: commit-graph.c:573

2226 msgid "unable to find all commit-graph files"

2227 msgstr "impossible de trouver tous les fichiers du graphe de commit"

2228

2187 -#: commit-graph.c:651 commit-graph.c:711

2229 +#: commit-graph.c:706 commit-graph.c:770

2230 msgid "invalid commit position. commit-graph is likely corrupt"

2231 msgstr ""

2232 "position de commit invalide. Le graphe de commit est vraisemblablement "

2233 "corrompu"

2234

2193 -#: commit-graph.c:672

2235 +#: commit-graph.c:727

2236 #, c-format

2237 msgid "could not find commit %s"

2238 msgstr "impossible de trouver le commit %s"

2239

2198 -#: commit-graph.c:948 builtin/am.c:1292

2240 +#: commit-graph.c:1009 builtin/am.c:1292

2241 #, c-format

2242 msgid "unable to parse commit %s"

2243 msgstr "impossible d'analyser le commit %s"

2244

2203 -#: commit-graph.c:1096

2245 +#: commit-graph.c:1157

2246 msgid "Writing changed paths Bloom filters index"

2247 msgstr "Écriture de l'index des filtres Bloom des chemins modifiés"

2248

2207 -#: commit-graph.c:1121

2249 +#: commit-graph.c:1182

2250 msgid "Writing changed paths Bloom filters data"

2251 msgstr "Écriture des données des filtres Bloom des chemins modifiés"

2252

2211 -#: commit-graph.c:1160 builtin/pack-objects.c:2783

2253 +#: commit-graph.c:1221 builtin/pack-objects.c:2832

2254 #, c-format

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

2256 msgstr "impossible d'obtenir le type de l'objet %s"

2257

2216 -#: commit-graph.c:1196

2258 +#: commit-graph.c:1257

2259 msgid "Loading known commits in commit graph"

2260 msgstr "Lecture des commits connus dans un graphe de commit"

2261

2220 -#: commit-graph.c:1213

2262 +#: commit-graph.c:1274

2263 msgid "Expanding reachable commits in commit graph"

2264 msgstr "Expansion des commits joignables dans un graphe de commit"

2265

2224 -#: commit-graph.c:1233

2266 +#: commit-graph.c:1294

2267 msgid "Clearing commit marks in commit graph"

2268 msgstr "Suppression les marques de commit dans le graphe de commits"

2269

2228 -#: commit-graph.c:1252

2270 +#: commit-graph.c:1313

2271 msgid "Computing commit graph generation numbers"

2272 msgstr "Calcul des chiffres de génération du graphe de commits"

2273

2232 -#: commit-graph.c:1300

2274 +#: commit-graph.c:1367

2275 msgid "Computing commit changed paths Bloom filters"

2276 msgstr "Calcul des filtres Bloom des chemins modifiés du commit"

2277

2236 -#: commit-graph.c:1359

2278 +#: commit-graph.c:1423

2279 +msgid "Collecting referenced commits"

2280 +msgstr "Collecte des commits référencés"

2281 +

2282 +#: commit-graph.c:1447

2283 #, c-format

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

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

2286 msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"

2287 msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"

2288

2243 -#: commit-graph.c:1372

2289 +#: commit-graph.c:1460

2290 #, c-format

2291 msgid "error adding pack %s"

2292 msgstr "erreur à l'ajout du packet %s"

2293

2248 -#: commit-graph.c:1376

2294 +#: commit-graph.c:1464

2295 #, c-format

2296 msgid "error opening index for %s"

2297 msgstr "erreur à l'ouverture de l'index pour %s"

2298

2253 -#: commit-graph.c:1405

2254 -#, c-format

2255 -msgid "Finding commits for commit graph from %d ref"

2256 -msgid_plural "Finding commits for commit graph from %d refs"

2257 -msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"

2258 -msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"

2259 -

2260 -#: commit-graph.c:1426

2261 -#, c-format

2262 -msgid "invalid commit object id: %s"

2263 -msgstr "identifiant d'objet commit invalide : %s"

2264 -

2265 -#: commit-graph.c:1442

2299 +#: commit-graph.c:1503

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

2301 msgstr ""

2302 "Recherche de commits pour un graphe de commits parmi les objets empaquetés"

2303

2270 -#: commit-graph.c:1457

2304 +#: commit-graph.c:1518

2305 msgid "Counting distinct commits in commit graph"

2306 msgstr "Comptage des commits distincts dans un graphe de commit"

2307

2274 -#: commit-graph.c:1489

2308 +#: commit-graph.c:1550

2309 msgid "Finding extra edges in commit graph"

2310 msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"

2311

2278 -#: commit-graph.c:1538

2312 +#: commit-graph.c:1599

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

2314 msgstr "échec à l'écriture le nombre correct d'id de base de fusion"

2315

2282 -#: commit-graph.c:1572 midx.c:812

2316 +#: commit-graph.c:1633 midx.c:812

2317 #, c-format

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

2319 msgstr "impossible de créer les répertoires de premier niveau de %s"

2320

2287 -#: commit-graph.c:1585

2321 +#: commit-graph.c:1646

2322 msgid "unable to create temporary graph layer"

2323 msgstr "impossible de créer une couche de graphe temporaire"

2324

2291 -#: commit-graph.c:1590

2325 +#: commit-graph.c:1651

2326 #, c-format

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

2328 msgstr "impossible de régler les droits partagés pour '%s'"

2329

2296 -#: commit-graph.c:1667

2330 +#: commit-graph.c:1728

2331 #, c-format

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

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

2334 msgstr[0] "Écriture le graphe de commits en %d passe"

2335 msgstr[1] "Écriture le graphe de commits en %d passes"

2336

2303 -#: commit-graph.c:1712

2337 +#: commit-graph.c:1773

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

2339 msgstr "impossible d'ouvrir le fichier de graphe de commit"

2340

2307 -#: commit-graph.c:1728

2341 +#: commit-graph.c:1789

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

2343 msgstr "échec du renommage du fichier de graphe de commits"

2344

2311 -#: commit-graph.c:1748

2345 +#: commit-graph.c:1809

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

2347 msgstr "impossible de renommer le fichier temporaire de graphe de commits"

2348

2315 -#: commit-graph.c:1874

2349 +#: commit-graph.c:1935

2350 msgid "Scanning merged commits"

2351 msgstr "Analyse des commits de fusion"

2352

2319 -#: commit-graph.c:1885

2353 +#: commit-graph.c:1946

2354 #, c-format

2355 msgid "unexpected duplicate commit id %s"

2356 msgstr "id de commit %s dupliqué inattendu"

2357

2324 -#: commit-graph.c:1908

2358 +#: commit-graph.c:1969

2359 msgid "Merging commit-graph"

2360 msgstr "fusion du graphe de commits"

2361

2328 -#: commit-graph.c:2096

2362 +#: commit-graph.c:2156

2363 #, c-format

2364 msgid "the commit graph format cannot write %d commits"

2365 msgstr "le graphe de commits ne peut pas écrire %d commits"

2366

2333 -#: commit-graph.c:2107

2367 +#: commit-graph.c:2167

2368 msgid "too many commits to write graph"

2369 msgstr "trop de commits pour écrire un graphe"

2370

2337 -#: commit-graph.c:2200

2371 +#: commit-graph.c:2260

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

2373 msgstr ""

2374 "le graphe de commit a une somme de contrôle incorrecte et est "

2375 "vraisemblablement corrompu"

2376

2343 -#: commit-graph.c:2210

2377 +#: commit-graph.c:2270

2378 #, c-format

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

2380 msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"

2381

2348 -#: commit-graph.c:2220 commit-graph.c:2235

2382 +#: commit-graph.c:2280 commit-graph.c:2295

2383 #, c-format

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

2385 msgstr ""

2386 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "

2387 "%u != %u"

2388

2355 -#: commit-graph.c:2227

2389 +#: commit-graph.c:2287

2390 #, c-format

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

2392 msgstr "échec de l'analyse le commit %s depuis le graphe de commits"

2393

2360 -#: commit-graph.c:2245

2394 +#: commit-graph.c:2305

2395 msgid "Verifying commits in commit graph"

2396 msgstr "Verification des commits dans le graphe de commits"

2397

2364 -#: commit-graph.c:2259

2398 +#: commit-graph.c:2320

2399 #, c-format

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

2401 msgstr ""

2402 "échec de l'analyse du commit %s depuis la base de données d'objets pour le "

2403 "graphe de commit"

2404

2371 -#: commit-graph.c:2266

2405 +#: commit-graph.c:2327

2406 #, c-format

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

2408 msgstr ""

2409 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "

2410 "%s"

2411

2378 -#: commit-graph.c:2276

2412 +#: commit-graph.c:2337

2413 #, c-format

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

2415 msgstr ""

2416 "la liste des parents du graphe de commit pour le commit %s est trop longue"

2417

2384 -#: commit-graph.c:2285

2418 +#: commit-graph.c:2346

2419 #, c-format

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

2421 msgstr "le parent du graphe de commit pour %s est %s != %s"

2422

2389 -#: commit-graph.c:2298

2423 +#: commit-graph.c:2360

2424 #, c-format

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

2426 msgstr ""

2427 "la liste de parents du graphe de commit pour le commit %s se termine trop tôt"

2428

2395 -#: commit-graph.c:2303

2429 +#: commit-graph.c:2365

2430 #, c-format

2431 msgid ""

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

@@ -2400,7 +2434,7 @@ msgstr ""

2434 "le graphe de commit a un numéro de génération nul pour le commit %s, mais "

2435 "non-nul ailleurs"

2436

2403 -#: commit-graph.c:2307

2437 +#: commit-graph.c:2369

2438 #, c-format

2439 msgid ""

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

@@ -2408,12 +2442,12 @@ msgstr ""

2442 "le graphe de commit a un numéro de génération non-nul pour le commit %s, "

2443 "mais nul ailleurs"

2444

2411 -#: commit-graph.c:2322

2445 +#: commit-graph.c:2385

2446 #, c-format

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

2448 msgstr "la génération du graphe de commit pour le commit %s est %u != %u"

2449

2416 -#: commit-graph.c:2328

2450 +#: commit-graph.c:2391

2451 #, c-format

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

2453 msgstr ""

@@ -2451,27 +2485,27 @@ msgstr ""

2485 "Supprimez ce message en lançant\n"

2486 "\"git config advice.graftFileDeprecated false\""

2487

2454 -#: commit.c:1168

2488 +#: commit.c:1172

2489 #, c-format

2490 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2491 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."

2492

2459 -#: commit.c:1172

2493 +#: commit.c:1176

2494 #, c-format

2495 msgid "Commit %s has a bad GPG signature allegedly by %s."

2496 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."

2497

2464 -#: commit.c:1175

2498 +#: commit.c:1179

2499 #, c-format

2500 msgid "Commit %s does not have a GPG signature."

2501 msgstr "La validation %s n'a pas de signature GPG."

2502

2469 -#: commit.c:1178

2503 +#: commit.c:1182

2504 #, c-format

2505 msgid "Commit %s has a good GPG signature by %s\n"

2506 msgstr "La validation %s a une signature GPG correcte par %s\n"

2507

2474 -#: commit.c:1432

2508 +#: commit.c:1436

2509 msgid ""

2510 "Warning: commit message did not conform to UTF-8.\n"

2511 "You may want to amend it after fixing the message, or set the config\n"

@@ -2674,7 +2708,7 @@ msgstr "valeur mal formée pour %s : %s"

2708 msgid "must be one of nothing, matching, simple, upstream or current"

2709 msgstr "doit être parmi nothing, matching, simple, upstream ou current"

2710

2677 -#: config.c:1533 builtin/pack-objects.c:3542

2711 +#: config.c:1533 builtin/pack-objects.c:3617

2712 #, c-format

2713 msgid "bad pack compression level %d"

2714 msgstr "niveau de compression du paquet %d"

@@ -2827,72 +2861,81 @@ msgstr ""

2861 msgid "server doesn't support '%s'"

2862 msgstr "Le serveur ne supporte pas '%s'"

2863

2830 -#: connect.c:103

2864 +#: connect.c:118

2865 #, c-format

2866 msgid "server doesn't support feature '%s'"

2867 msgstr "Le serveur ne supporte pas la fonctionnalité '%s'"

2868

2835 -#: connect.c:114

2869 +#: connect.c:129

2870 msgid "expected flush after capabilities"

2871 msgstr "vidage attendu après les capacités"

2872

2839 -#: connect.c:233

2873 +#: connect.c:263

2874 #, c-format

2875 msgid "ignoring capabilities after first line '%s'"

2876 msgstr "capacités ignorées après la première ligne '%s'"

2877

2844 -#: connect.c:252

2878 +#: connect.c:284

2879 msgid "protocol error: unexpected capabilities^{}"

2880 msgstr "erreur de protocole : capabilities^{} inattendu"

2881

2848 -#: connect.c:273

2882 +#: connect.c:306

2883 #, c-format

2884 msgid "protocol error: expected shallow sha-1, got '%s'"

2885 msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"

2886

2853 -#: connect.c:275

2887 +#: connect.c:308

2888 msgid "repository on the other end cannot be shallow"

2889 msgstr "le dépôt distant ne peut pas être superficiel"

2890

2857 -#: connect.c:313

2891 +#: connect.c:347

2892 msgid "invalid packet"

2893 msgstr "paquet invalide"

2894

2861 -#: connect.c:333

2895 +#: connect.c:367

2896 #, c-format

2897 msgid "protocol error: unexpected '%s'"

2898 msgstr "erreur de protocole : '%s' attendu"

2899

2866 -#: connect.c:441

2900 +#: connect.c:473

2901 +#, c-format

2902 +msgid "unknown object format '%s' specified by server"

2903 +msgstr "format d'objet spécifié par le serveur inconnu '%s'"

2904 +

2905 +#: connect.c:500

2906 #, c-format

2907 msgid "invalid ls-refs response: %s"

2908 msgstr "réponse à ls-ref invalide : %s"

2909

2871 -#: connect.c:445

2910 +#: connect.c:504

2911 msgid "expected flush after ref listing"

2912 msgstr "vidage attendu après le listage de références"

2913

2875 -#: connect.c:544

2914 +#: connect.c:507

2915 +msgid "expected response end packet after ref listing"

2916 +msgstr "paquet de fin de réponse attendu après le listage de références"

2917 +

2918 +#: connect.c:640

2919 #, c-format

2920 msgid "protocol '%s' is not supported"

2921 msgstr "le protocole '%s' n'est pas supporté"

2922

2880 -#: connect.c:595

2923 +#: connect.c:691

2924 msgid "unable to set SO_KEEPALIVE on socket"

2925 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"

2926

2884 -#: connect.c:635 connect.c:698

2927 +#: connect.c:731 connect.c:794

2928 #, c-format

2929 msgid "Looking up %s ... "

2930 msgstr "Recherche de %s… "

2931

2889 -#: connect.c:639

2932 +#: connect.c:735

2933 #, c-format

2934 msgid "unable to look up %s (port %s) (%s)"

2935 msgstr "impossible de rechercher %s (port %s) (%s)"

2936

2937 #. TRANSLATORS: this is the end of "Looking up %s ... "

2895 -#: connect.c:643 connect.c:714

2938 +#: connect.c:739 connect.c:810

2939 #, c-format

2940 msgid ""

2941 "done.\n"

@@ -2901,7 +2944,7 @@ msgstr ""

2944 "fait.\n"

2945 "Connexion à %s (port %s)… "

2946

2904 -#: connect.c:665 connect.c:742

2947 +#: connect.c:761 connect.c:838

2948 #, c-format

2949 msgid ""

2950 "unable to connect to %s:\n"

@@ -2911,75 +2954,75 @@ msgstr ""

2954 "%s"

2955

2956 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2914 -#: connect.c:671 connect.c:748

2957 +#: connect.c:767 connect.c:844

2958 msgid "done."

2959 msgstr "fait."

2960

2918 -#: connect.c:702

2961 +#: connect.c:798

2962 #, c-format

2963 msgid "unable to look up %s (%s)"

2964 msgstr "impossible de rechercher %s (%s)"

2965

2923 -#: connect.c:708

2966 +#: connect.c:804

2967 #, c-format

2968 msgid "unknown port %s"

2969 msgstr "port inconnu %s"

2970

2928 -#: connect.c:845 connect.c:1175

2971 +#: connect.c:941 connect.c:1271

2972 #, c-format

2973 msgid "strange hostname '%s' blocked"

2974 msgstr "nom d'hôte étrange '%s' bloqué"

2975

2933 -#: connect.c:847

2976 +#: connect.c:943

2977 #, c-format

2978 msgid "strange port '%s' blocked"

2979 msgstr "port étrange '%s' bloqué"

2980

2938 -#: connect.c:857

2981 +#: connect.c:953

2982 #, c-format

2983 msgid "cannot start proxy %s"

2984 msgstr "impossible de démarrer un proxy %s"

2985

2943 -#: connect.c:928

2986 +#: connect.c:1024

2987 msgid "no path specified; see 'git help pull' for valid url syntax"

2988 msgstr ""

2989 "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "

2990 "d'URL valide"

2991

2949 -#: connect.c:1123

2992 +#: connect.c:1219

2993 msgid "ssh variant 'simple' does not support -4"

2994 msgstr "la variante ssh 'simple' ne supporte pas -4"

2995

2953 -#: connect.c:1135

2996 +#: connect.c:1231

2997 msgid "ssh variant 'simple' does not support -6"

2998 msgstr "la variante ssh 'simple' ne supporte pas -6"

2999

2957 -#: connect.c:1152

3000 +#: connect.c:1248

3001 msgid "ssh variant 'simple' does not support setting port"

3002 msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"

3003

2961 -#: connect.c:1264

3004 +#: connect.c:1360

3005 #, c-format

3006 msgid "strange pathname '%s' blocked"

3007 msgstr "chemin étrange '%s' bloqué"

3008

2966 -#: connect.c:1311

3009 +#: connect.c:1407

3010 msgid "unable to fork"

3011 msgstr "fork impossible"

3012

2970 -#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45

3013 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

3014 msgid "Checking connectivity"

3015 msgstr "Vérification de la connectivité"

3016

2974 -#: connected.c:119

3017 +#: connected.c:121

3018 msgid "Could not run 'git rev-list'"

3019 msgstr "Impossible de lancer 'git rev-list'"

3020

2978 -#: connected.c:139

3021 +#: connected.c:141

3022 msgid "failed write to rev-list"

3023 msgstr "impossible d'écrire dans la rev-list"

3024

2982 -#: connected.c:146

3025 +#: connected.c:148

3026 msgid "failed to close rev-list's stdin"

3027 msgstr "impossible de fermer l'entrée standard du rev-list"

3028

@@ -3116,7 +3159,9 @@ msgstr "%s : le filtre smudge '%s' a échoué"

3159 #: credential.c:96

3160 #, c-format

3161 msgid "skipping credential lookup for key: credential.%s"

3119 -msgstr "vérification des informations d'identification sautée pour la clé : credential.%s"

3162 +msgstr ""

3163 +"vérification des informations d'identification sautée pour la clé : "

3164 +"credential.%s"

3165

3166 #: credential.c:112

3167 msgid "refusing to work with credential missing host field"

@@ -3124,7 +3169,8 @@ msgstr "refus de travailler avec un champ host manquant dans l'identification"

3169

3170 #: credential.c:114

3171 msgid "refusing to work with credential missing protocol field"

3127 -msgstr "refus de travailler avec un champ protocol manquant dans l'identification"

3172 +msgstr ""

3173 +"refus de travailler avec un champ protocol manquant dans l'identification"

3174

3175 #: credential.c:396

3176 #, c-format

@@ -3247,18 +3293,18 @@ msgstr ""

3293 "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "

3294 "arbre de travail"

3295

3250 -#: diff.c:155

3296 +#: diff.c:156

3297 #, c-format

3298 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3299 msgstr ""

3300 " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"

3301

3256 -#: diff.c:160

3302 +#: diff.c:161

3303 #, c-format

3304 msgid " Unknown dirstat parameter '%s'\n"

3305 msgstr " Paramètre dirstat inconnu '%s'\n"

3306

3261 -#: diff.c:296

3307 +#: diff.c:297

3308 msgid ""

3309 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3310 "'dimmed-zebra', 'plain'"

@@ -3266,7 +3312,7 @@ msgstr ""

3312 "le paramètre de couleur de déplacement doit être parmi 'no', 'default', "

3313 "'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"

3314

3269 -#: diff.c:324

3315 +#: diff.c:325

3316 #, c-format

3317 msgid ""

3318 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3276,7 +3322,7 @@ msgstr ""

3322 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"

3323 "change'"

3324

3279 -#: diff.c:332

3325 +#: diff.c:333

3326 msgid ""

3327 "color-moved-ws: allow-indentation-change cannot be combined with other "

3328 "whitespace modes"

@@ -3284,13 +3330,13 @@ msgstr ""

3330 "color-moved-ws : allow-indentation-change ne peut pas être combiné avec "

3331 "d'autres modes d'espace"

3332

3287 -#: diff.c:405

3333 +#: diff.c:410

3334 #, c-format

3335 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

3336 msgstr ""

3337 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"

3338

3293 -#: diff.c:465

3339 +#: diff.c:470

3340 #, c-format

3341 msgid ""

3342 "Found errors in 'diff.dirstat' config variable:\n"

@@ -3299,35 +3345,35 @@ msgstr ""

3345 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"

3346 "%s"

3347

3302 -#: diff.c:4238

3348 +#: diff.c:4243

3349 #, c-format

3350 msgid "external diff died, stopping at %s"

3351 msgstr "l'application de diff externe a disparu, arrêt à %s"

3352

3307 -#: diff.c:4583

3353 +#: diff.c:4589

3354 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3355 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"

3356

3311 -#: diff.c:4586

3357 +#: diff.c:4592

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

3359 msgstr "-G, -S et --find-object sont mutuellement exclusifs"

3360

3315 -#: diff.c:4664

3361 +#: diff.c:4670

3362 msgid "--follow requires exactly one pathspec"

3363 msgstr "--follow a besoin d'une spécification de chemin unique"

3364

3319 -#: diff.c:4712

3365 +#: diff.c:4718

3366 #, c-format

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

3368 msgstr "valeur invalide de --stat : %s"

3369

3324 -#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3370 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

3371 #: parse-options.c:197 parse-options.c:201

3372 #, c-format

3373 msgid "%s expects a numerical value"

3374 msgstr "%s attend une valeur numérique"

3375

3330 -#: diff.c:4749

3376 +#: diff.c:4755

3377 #, c-format

3378 msgid ""

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

@@ -3336,42 +3382,42 @@ msgstr ""

3382 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"

3383 "%s"

3384

3339 -#: diff.c:4834

3385 +#: diff.c:4840

3386 #, c-format

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

3388 msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"

3389

3344 -#: diff.c:4858

3390 +#: diff.c:4864

3391 #, c-format

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

3393 msgstr "valeur inconnue après ws-error-highlight=%.*s"

3394

3349 -#: diff.c:4872

3395 +#: diff.c:4878

3396 #, c-format

3397 msgid "unable to resolve '%s'"

3398 msgstr "impossible de résoudre '%s'"

3399

3354 -#: diff.c:4922 diff.c:4928

3400 +#: diff.c:4928 diff.c:4934

3401 #, c-format

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

3403 msgstr "forme <n>/<m> attendue par %s"

3404

3359 -#: diff.c:4940

3405 +#: diff.c:4946

3406 #, c-format

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

3408 msgstr "caractère attendu par %s, '%s' trouvé"

3409

3364 -#: diff.c:4961

3410 +#: diff.c:4967

3411 #, c-format

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

3413 msgstr "mauvais argument --color-moved : %s"

3414

3369 -#: diff.c:4980

3415 +#: diff.c:4986

3416 #, c-format

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

3418 msgstr "mode invalide '%s' dans --color-moved-ws"

3419

3374 -#: diff.c:5020

3420 +#: diff.c:5026

3421 msgid ""

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

3423 "\"histogram\""

@@ -3379,155 +3425,155 @@ msgstr ""

3425 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "

3426 "\"histogram\""

3427

3382 -#: diff.c:5056 diff.c:5076

3428 +#: diff.c:5062 diff.c:5082

3429 #, c-format

3430 msgid "invalid argument to %s"

3431 msgstr "argument invalide pour %s"

3432

3387 -#: diff.c:5214

3433 +#: diff.c:5219

3434 #, c-format

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

3436 msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"

3437

3392 -#: diff.c:5270

3438 +#: diff.c:5275

3439 #, c-format

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

3441 msgstr "mauvais argument pour --word-diff : %s"

3442

3397 -#: diff.c:5293

3443 +#: diff.c:5298

3444 msgid "Diff output format options"

3445 msgstr "Options de format de sortie de diff"

3446

3401 -#: diff.c:5295 diff.c:5301

3447 +#: diff.c:5300 diff.c:5306

3448 msgid "generate patch"

3449 msgstr "générer la rustine"

3450

3405 -#: diff.c:5298 builtin/log.c:177

3451 +#: diff.c:5303 builtin/log.c:177

3452 msgid "suppress diff output"

3453 msgstr "supprimer la sortie des différences"

3454

3409 -#: diff.c:5303 diff.c:5417 diff.c:5424

3455 +#: diff.c:5308 diff.c:5422 diff.c:5429

3456 msgid "<n>"

3457 msgstr "<n>"

3458

3413 -#: diff.c:5304 diff.c:5307

3459 +#: diff.c:5309 diff.c:5312

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

3461 msgstr "générer les diffs avec <n> lignes de contexte"

3462

3417 -#: diff.c:5309

3463 +#: diff.c:5314

3464 msgid "generate the diff in raw format"

3465 msgstr "générer le diff en format brut"

3466

3421 -#: diff.c:5312

3467 +#: diff.c:5317

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

3469 msgstr "synonyme de '-p --raw'"

3470

3425 -#: diff.c:5316

3471 +#: diff.c:5321

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

3473 msgstr "synonyme de '-p --stat'"

3474

3429 -#: diff.c:5320

3475 +#: diff.c:5325

3476 msgid "machine friendly --stat"

3477 msgstr "--stat pour traitement automatique"

3478

3433 -#: diff.c:5323

3479 +#: diff.c:5328

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

3481 msgstr "afficher seulement la dernière ligne de --stat"

3482

3437 -#: diff.c:5325 diff.c:5333

3483 +#: diff.c:5330 diff.c:5338

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

3485 msgstr "<param1,param2>..."

3486

3441 -#: diff.c:5326

3487 +#: diff.c:5331

3488 msgid ""

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

3490 msgstr ""

3491 "afficher la distribution des quantités de modifications relatives pour "

3492 "chaque sous-répertoire"

3493

3448 -#: diff.c:5330

3494 +#: diff.c:5335

3495 msgid "synonym for --dirstat=cumulative"

3496 msgstr "synonyme pour --dirstat=cumulative"

3497

3452 -#: diff.c:5334

3498 +#: diff.c:5339

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

3500 msgstr "synonyme pour --dirstat=files,param1,param2..."

3501

3456 -#: diff.c:5338

3502 +#: diff.c:5343

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

3504 msgstr ""

3505 "avertir si les modifications introduisent des marqueurs de conflit ou des "

3506 "erreurs d'espace"

3507

3462 -#: diff.c:5341

3508 +#: diff.c:5346

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

3510 msgstr ""

3511 "résumé succinct tel que les créations, les renommages et les modifications "

3512 "de mode"

3513

3468 -#: diff.c:5344

3514 +#: diff.c:5349

3515 msgid "show only names of changed files"

3516 msgstr "n'afficher que les noms de fichiers modifiés"

3517

3472 -#: diff.c:5347

3518 +#: diff.c:5352

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

3520 msgstr "n'afficher que les noms et les status des fichiers modifiés"

3521

3476 -#: diff.c:5349

3522 +#: diff.c:5354

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

3524 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"

3525

3480 -#: diff.c:5350

3526 +#: diff.c:5355

3527 msgid "generate diffstat"

3528 msgstr "générer un diffstat"

3529

3484 -#: diff.c:5352 diff.c:5355 diff.c:5358

3530 +#: diff.c:5357 diff.c:5360 diff.c:5363

3531 msgid "<width>"

3532 msgstr "<largeur>"

3533

3488 -#: diff.c:5353

3534 +#: diff.c:5358

3535 msgid "generate diffstat with a given width"

3536 msgstr "générer un diffstat avec la largeur indiquée"

3537

3492 -#: diff.c:5356

3538 +#: diff.c:5361

3539 msgid "generate diffstat with a given name width"

3540 msgstr "génerer un diffstat avec la largeur de nom indiquée"

3541

3496 -#: diff.c:5359

3542 +#: diff.c:5364

3543 msgid "generate diffstat with a given graph width"

3544 msgstr "génerer un diffstat avec la largeur de graphe indiquée"

3545

3500 -#: diff.c:5361

3546 +#: diff.c:5366

3547 msgid "<count>"

3548 msgstr "<compte>"

3549

3504 -#: diff.c:5362

3550 +#: diff.c:5367

3551 msgid "generate diffstat with limited lines"

3552 msgstr "générer un diffstat avec des lignes limitées"

3553

3508 -#: diff.c:5365

3554 +#: diff.c:5370

3555 msgid "generate compact summary in diffstat"

3556 msgstr "générer une résumé compact dans le diffstat"

3557

3512 -#: diff.c:5368

3558 +#: diff.c:5373

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

3560 msgstr "produire un diff binaire qui peut être appliqué"

3561

3516 -#: diff.c:5371

3562 +#: diff.c:5376

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

3564 msgstr ""

3565 "afficher les noms complets des objets pre- et post-image sur les lignes "

3566 "\"index\""

3567

3522 -#: diff.c:5373

3568 +#: diff.c:5378

3569 msgid "show colored diff"

3570 msgstr "afficher un diff coloré"

3571

3526 -#: diff.c:5374

3572 +#: diff.c:5379

3573 msgid "<kind>"

3574 msgstr "<sorte>"

3575

3530 -#: diff.c:5375

3576 +#: diff.c:5380

3577 msgid ""

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

3579 "diff"

@@ -3535,7 +3581,7 @@ msgstr ""

3581 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "

3582 "'nouveau' dans le diff"

3583

3538 -#: diff.c:5378

3584 +#: diff.c:5383

3585 msgid ""

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

3587 "--numstat"

@@ -3543,93 +3589,93 @@ msgstr ""

3589 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "

3590 "champs dans --raw ou --numstat"

3591

3546 -#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3592 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3593 msgid "<prefix>"

3594 msgstr "<préfixe>"

3595

3550 -#: diff.c:5382

3596 +#: diff.c:5387

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

3598 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""

3599

3554 -#: diff.c:5385

3600 +#: diff.c:5390

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

3602 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""

3603

3558 -#: diff.c:5388

3604 +#: diff.c:5393

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

3606 msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"

3607

3562 -#: diff.c:5391

3608 +#: diff.c:5396

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

3610 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"

3611

3566 -#: diff.c:5394

3612 +#: diff.c:5399

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

3614 msgstr ""

3615 "afficher le contexte entre les sections à concurrence du nombre de ligne "

3616 "indiqué"

3617

3572 -#: diff.c:5398 diff.c:5403 diff.c:5408

3618 +#: diff.c:5403 diff.c:5408 diff.c:5413

3619 msgid "<char>"

3620 msgstr "<caractère>"

3621

3576 -#: diff.c:5399

3622 +#: diff.c:5404

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

3624 msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"

3625

3580 -#: diff.c:5404

3626 +#: diff.c:5409

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

3628 msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"

3629

3584 -#: diff.c:5409

3630 +#: diff.c:5414

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

3632 msgstr ""

3633 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"

3634

3589 -#: diff.c:5412

3635 +#: diff.c:5417

3636 msgid "Diff rename options"

3637 msgstr "Options de renommage de diff"

3638

3593 -#: diff.c:5413

3639 +#: diff.c:5418

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

3641 msgstr "<n>[/<m>]"

3642

3597 -#: diff.c:5414

3643 +#: diff.c:5419

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

3645 msgstr ""

3646 "casser les modifications d'une réécrire complète en paires de suppression et "

3647 "création"

3648

3603 -#: diff.c:5418

3649 +#: diff.c:5423

3650 msgid "detect renames"

3651 msgstr "détecter les renommages"

3652

3607 -#: diff.c:5422

3653 +#: diff.c:5427

3654 msgid "omit the preimage for deletes"

3655 msgstr "supprimer la pré-image pour les suppressions"

3656

3611 -#: diff.c:5425

3657 +#: diff.c:5430

3658 msgid "detect copies"

3659 msgstr "détecter les copies"

3660

3615 -#: diff.c:5429

3661 +#: diff.c:5434

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

3663 msgstr ""

3664 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"

3665

3620 -#: diff.c:5431

3666 +#: diff.c:5436

3667 msgid "disable rename detection"

3668 msgstr "désactiver la détection de renommage"

3669

3624 -#: diff.c:5434

3670 +#: diff.c:5439

3671 msgid "use empty blobs as rename source"

3672 msgstr "utiliser des blobs vides comme source de renommage"

3673

3628 -#: diff.c:5436

3674 +#: diff.c:5441

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

3676 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"

3677

3632 -#: diff.c:5439

3678 +#: diff.c:5444

3679 msgid ""

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

3681 "given limit"

@@ -3637,161 +3683,161 @@ msgstr ""

3683 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"

3684 "copie excède la limite indiquée"

3685

3640 -#: diff.c:5441

3686 +#: diff.c:5446

3687 msgid "Diff algorithm options"

3688 msgstr "Options de l'algorithme de diff"

3689

3644 -#: diff.c:5443

3690 +#: diff.c:5448

3691 msgid "produce the smallest possible diff"

3692 msgstr "produire le diff le plus petit possible"

3693

3648 -#: diff.c:5446

3694 +#: diff.c:5451

3695 msgid "ignore whitespace when comparing lines"

3696 msgstr "ignorer les espaces lors de la comparaison de ligne"

3697

3652 -#: diff.c:5449

3698 +#: diff.c:5454

3699 msgid "ignore changes in amount of whitespace"

3700 msgstr "ignorer des modifications du nombre d'espaces"

3701

3656 -#: diff.c:5452

3702 +#: diff.c:5457

3703 msgid "ignore changes in whitespace at EOL"

3704 msgstr "ignorer des modifications d'espace en fin de ligne"

3705

3660 -#: diff.c:5455

3706 +#: diff.c:5460

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

3708 msgstr "ignore le retour chariot en fin de ligne"

3709

3664 -#: diff.c:5458

3710 +#: diff.c:5463

3711 msgid "ignore changes whose lines are all blank"

3712 msgstr "ignorer les modifications dont les lignes sont vides"

3713

3668 -#: diff.c:5461

3714 +#: diff.c:5466

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

3716 msgstr ""

3717 "heuristique qui déplace les limites de sections de diff pour faciliter la "

3718 "lecture"

3719

3674 -#: diff.c:5464

3720 +#: diff.c:5469

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

3722 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""

3723

3678 -#: diff.c:5468

3724 +#: diff.c:5473

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

3726 msgstr ""

3727 "générer un diff en utilisant l'algorithme de différence \"histogramme\""

3728

3683 -#: diff.c:5470

3729 +#: diff.c:5475

3730 msgid "<algorithm>"

3731 msgstr "<algorithme>"

3732

3687 -#: diff.c:5471

3733 +#: diff.c:5476

3734 msgid "choose a diff algorithm"

3735 msgstr "choisir un algorithme de différence"

3736

3691 -#: diff.c:5473

3737 +#: diff.c:5478

3738 msgid "<text>"

3739 msgstr "<texte>"

3740

3695 -#: diff.c:5474

3741 +#: diff.c:5479

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

3743 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""

3744

3699 -#: diff.c:5476 diff.c:5485 diff.c:5488

3745 +#: diff.c:5481 diff.c:5490 diff.c:5493

3746 msgid "<mode>"

3747 msgstr "<mode>"

3748

3703 -#: diff.c:5477

3749 +#: diff.c:5482

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

3751 msgstr ""

3752 "afficher des différences par mot, en utilisant <mode> pour délimiter les "

3753 "mots modifiés"

3754

3709 -#: diff.c:5479 diff.c:5482 diff.c:5527

3755 +#: diff.c:5484 diff.c:5487 diff.c:5532

3756 msgid "<regex>"

3757 msgstr "<regex>"

3758

3713 -#: diff.c:5480

3759 +#: diff.c:5485

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

3761 msgstr "utiliser <regex> pour décider ce qu'est un mot"

3762

3717 -#: diff.c:5483

3763 +#: diff.c:5488

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

3765 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

3766

3721 -#: diff.c:5486

3767 +#: diff.c:5491

3768 msgid "moved lines of code are colored differently"

3769 msgstr "les lignes déplacées sont colorées différemment"

3770

3725 -#: diff.c:5489

3771 +#: diff.c:5494

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

3773 msgstr "comment les espaces sont ignorés dans --color-moved"

3774

3729 -#: diff.c:5492

3775 +#: diff.c:5497

3776 msgid "Other diff options"

3777 msgstr "Autres options diff"

3778

3733 -#: diff.c:5494

3779 +#: diff.c:5499

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

3781 msgstr ""

3782 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3783 "afficher les chemins relatifs"

3784

3739 -#: diff.c:5498

3785 +#: diff.c:5503

3786 msgid "treat all files as text"

3787 msgstr "traiter les fichiers comme texte"

3788

3743 -#: diff.c:5500

3789 +#: diff.c:5505

3790 msgid "swap two inputs, reverse the diff"

3791 msgstr "échanger les entrées, inverser le diff"

3792

3747 -#: diff.c:5502

3793 +#: diff.c:5507

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

3795 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3796

3751 -#: diff.c:5504

3797 +#: diff.c:5509

3798 msgid "disable all output of the program"

3799 msgstr "désactiver tous les affichages du programme"

3800

3755 -#: diff.c:5506

3801 +#: diff.c:5511

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

3803 msgstr "autoriser l'exécution d'un assistant externe de diff"

3804

3759 -#: diff.c:5508

3805 +#: diff.c:5513

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

3807 msgstr ""

3808 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3809 "fichiers binaires"

3810

3765 -#: diff.c:5510

3811 +#: diff.c:5515

3812 msgid "<when>"

3813 msgstr "<quand>"

3814

3769 -#: diff.c:5511

3815 +#: diff.c:5516

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

3817 msgstr ""

3818 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3819

3774 -#: diff.c:5514

3820 +#: diff.c:5519

3821 msgid "<format>"

3822 msgstr "<format>"

3823

3778 -#: diff.c:5515

3824 +#: diff.c:5520

3825 msgid "specify how differences in submodules are shown"

3826 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3827

3782 -#: diff.c:5519

3828 +#: diff.c:5524

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

3830 msgstr "masquer les entrées 'git add -N' de l'index"

3831

3786 -#: diff.c:5522

3832 +#: diff.c:5527

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

3834 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

3835

3790 -#: diff.c:5524

3836 +#: diff.c:5529

3837 msgid "<string>"

3838 msgstr "<chaîne>"

3839

3794 -#: diff.c:5525

3840 +#: diff.c:5530

3841 msgid ""

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

3843 "string"

@@ -3799,7 +3845,7 @@ msgstr ""

3845 "rechercher les différences qui modifient le nombre d'occurrences de la "

3846 "chaîne spécifiée"

3847

3802 -#: diff.c:5528

3848 +#: diff.c:5533

3849 msgid ""

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

3851 "regex"

@@ -3807,26 +3853,26 @@ msgstr ""

3853 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

3854 "spécifiée"

3855

3810 -#: diff.c:5531

3856 +#: diff.c:5536

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

3858 msgstr ""

3859 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

3860 "ou -G"

3861

3816 -#: diff.c:5534

3862 +#: diff.c:5539

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

3864 msgstr ""

3865 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

3866

3821 -#: diff.c:5537

3867 +#: diff.c:5542

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

3869 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

3870

3825 -#: diff.c:5538

3871 +#: diff.c:5543

3872 msgid "<object-id>"

3873 msgstr "<id-objet>"

3874

3829 -#: diff.c:5539

3875 +#: diff.c:5544

3876 msgid ""

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

3878 "object"

@@ -3834,35 +3880,35 @@ msgstr ""

3880 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

3881 "indiqué"

3882

3837 -#: diff.c:5541

3883 +#: diff.c:5546

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

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

3886

3841 -#: diff.c:5542

3887 +#: diff.c:5547

3888 msgid "select files by diff type"

3889 msgstr "sélectionner les fichiers par types de diff"

3890

3845 -#: diff.c:5544

3891 +#: diff.c:5549

3892 msgid "<file>"

3893 msgstr "<fichier>"

3894

3849 -#: diff.c:5545

3895 +#: diff.c:5550

3896 msgid "Output to a specific file"

3897 msgstr "Sortie vers un fichier spécifié"

3898

3853 -#: diff.c:6200

3899 +#: diff.c:6205

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

3901 msgstr ""

3902 "détection de renommage inexact annulée à cause d'un trop grand nombre de "

3903 "fichiers."

3904

3859 -#: diff.c:6203

3905 +#: diff.c:6208

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

3907 msgstr ""

3908 "recherche uniquement des copies par modification de chemin à cause d'un trop "

3909 "grand nombre de fichiers."

3910

3865 -#: diff.c:6206

3911 +#: diff.c:6211

3912 #, c-format

3913 msgid ""

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

@@ -3879,62 +3925,62 @@ msgstr "impossible de lire le fichier de commande '%s'"

3925 msgid "Performing inexact rename detection"

3926 msgstr "Détection de renommage inexact en cours"

3927

3882 -#: dir.c:555

3928 +#: dir.c:573

3929 #, c-format

3930 msgid "pathspec '%s' did not match any file(s) known to git"

3931 msgstr ""

3932 "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"

3933

3888 -#: dir.c:695 dir.c:724 dir.c:737

3934 +#: dir.c:713 dir.c:742 dir.c:755

3935 #, c-format

3936 msgid "unrecognized pattern: '%s'"

3937 msgstr "motif non reconnu : '%s'"

3938

3893 -#: dir.c:754 dir.c:768

3939 +#: dir.c:772 dir.c:786

3940 #, c-format

3941 msgid "unrecognized negative pattern: '%s'"

3942 msgstr "motif négatif non reconnu : '%s'"

3943

3898 -#: dir.c:786

3944 +#: dir.c:804

3945 #, c-format

3946 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3947 msgstr ""

3948 "votre fichier d'extraction partielle pourrait présenter des problèmes : le "

3949 "motif '%s' est répété"

3950

3905 -#: dir.c:796

3951 +#: dir.c:814

3952 msgid "disabling cone pattern matching"

3953 msgstr "désactivation de la correspondance de motif de cone"

3954

3909 -#: dir.c:1173

3955 +#: dir.c:1191

3956 #, c-format

3957 msgid "cannot use %s as an exclude file"

3958 msgstr "impossible d'utiliser %s comme fichier d'exclusion"

3959

3914 -#: dir.c:2275

3960 +#: dir.c:2296

3961 #, c-format

3962 msgid "could not open directory '%s'"

3963 msgstr "impossible d'ouvrir le répertoire '%s'"

3964

3919 -#: dir.c:2575

3965 +#: dir.c:2596

3966 msgid "failed to get kernel name and information"

3967 msgstr "echec de l'obtention d'information de kernel"

3968

3923 -#: dir.c:2699

3969 +#: dir.c:2720

3970 msgid "untracked cache is disabled on this system or location"

3971 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit"

3972

3927 -#: dir.c:3481

3973 +#: dir.c:3502

3974 #, c-format

3975 msgid "index file corrupt in repo %s"

3976 msgstr "fichier d'index corrompu dans le dépôt %s"

3977

3932 -#: dir.c:3526 dir.c:3531

3978 +#: dir.c:3547 dir.c:3552

3979 #, c-format

3980 msgid "could not create directories for %s"

3981 msgstr "impossible de créer les répertoires pour %s"

3982

3937 -#: dir.c:3560

3983 +#: dir.c:3581

3984 #, c-format

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

3986 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"

@@ -3946,11 +3992,11 @@ msgstr ""

3992 "suggestion : en attente de la fermeture du fichier par votre éditeur de "

3993 "texte…%c"

3994

3949 -#: entry.c:178

3995 +#: entry.c:177

3996 msgid "Filtering content"

3997 msgstr "Filtrage du contenu"

3998

3953 -#: entry.c:479

3999 +#: entry.c:478

4000 #, c-format

4001 msgid "could not stat file '%s'"

4002 msgstr "impossible de stat le fichier '%s'"

@@ -3970,228 +4016,246 @@ msgstr "impossible de régler GIT_DIR à '%s'"

4016 msgid "too many args to run %s"

4017 msgstr "trop d'arguments pour lancer %s"

4018

3973 -#: fetch-pack.c:151

4019 +#: fetch-pack.c:152

4020 msgid "git fetch-pack: expected shallow list"

4021 msgstr "git fetch-pack : liste superficielle attendue"

4022

3977 -#: fetch-pack.c:154

4023 +#: fetch-pack.c:155

4024 msgid "git fetch-pack: expected a flush packet after shallow list"

4025 msgstr ""

4026 "git fetch-pack : paquet de vidage attendu après une liste superficielle"

4027

3982 -#: fetch-pack.c:165

4028 +#: fetch-pack.c:166

4029 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4030 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

4031

3986 -#: fetch-pack.c:185

4032 +#: fetch-pack.c:186

4033 #, c-format

4034 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4035 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

4036

3991 -#: fetch-pack.c:196

4037 +#: fetch-pack.c:197

4038 msgid "unable to write to remote"

4039 msgstr "impossible d'écrire sur un distant"

4040

3995 -#: fetch-pack.c:258

4041 +#: fetch-pack.c:259

4042 msgid "--stateless-rpc requires multi_ack_detailed"

4043 msgstr "--stateless-rpc nécessite multi_ack_detailed"

4044

3999 -#: fetch-pack.c:357 fetch-pack.c:1364

4045 +#: fetch-pack.c:358 fetch-pack.c:1408

4046 #, c-format

4047 msgid "invalid shallow line: %s"

4048 msgstr "ligne de superficiel invalide : %s"

4049

4004 -#: fetch-pack.c:363 fetch-pack.c:1370

4050 +#: fetch-pack.c:364 fetch-pack.c:1414

4051 #, c-format

4052 msgid "invalid unshallow line: %s"

4053 msgstr "ligne de fin de superficiel invalide : %s"

4054

4009 -#: fetch-pack.c:365 fetch-pack.c:1372

4055 +#: fetch-pack.c:366 fetch-pack.c:1416

4056 #, c-format

4057 msgid "object not found: %s"

4058 msgstr "objet non trouvé : %s"

4059

4014 -#: fetch-pack.c:368 fetch-pack.c:1375

4060 +#: fetch-pack.c:369 fetch-pack.c:1419

4061 #, c-format

4062 msgid "error in object: %s"

4063 msgstr "Erreur dans l'objet : %s"

4064

4019 -#: fetch-pack.c:370 fetch-pack.c:1377

4065 +#: fetch-pack.c:371 fetch-pack.c:1421

4066 #, c-format

4067 msgid "no shallow found: %s"

4068 msgstr "Pas de superficiel trouvé : %s"

4069

4024 -#: fetch-pack.c:373 fetch-pack.c:1381

4070 +#: fetch-pack.c:374 fetch-pack.c:1425

4071 #, c-format

4072 msgid "expected shallow/unshallow, got %s"

4073 msgstr "superficiel/non superficiel attendu, %s trouvé"

4074

4029 -#: fetch-pack.c:415

4075 +#: fetch-pack.c:416

4076 #, c-format

4077 msgid "got %s %d %s"

4078 msgstr "réponse %s %d %s"

4079

4034 -#: fetch-pack.c:432

4080 +#: fetch-pack.c:433

4081 #, c-format

4082 msgid "invalid commit %s"

4083 msgstr "commit invalide %s"

4084

4039 -#: fetch-pack.c:463

4085 +#: fetch-pack.c:464

4086 msgid "giving up"

4087 msgstr "abandon"

4088

4043 -#: fetch-pack.c:476 progress.c:336

4089 +#: fetch-pack.c:477 progress.c:336

4090 msgid "done"

4091 msgstr "fait"

4092

4047 -#: fetch-pack.c:488

4093 +#: fetch-pack.c:489

4094 #, c-format

4095 msgid "got %s (%d) %s"

4096 msgstr "%s trouvé (%d) %s"

4097

4052 -#: fetch-pack.c:534

4098 +#: fetch-pack.c:535

4099 #, c-format

4100 msgid "Marking %s as complete"

4101 msgstr "Marquage de %s comme terminé"

4102

4057 -#: fetch-pack.c:755

4103 +#: fetch-pack.c:756

4104 #, c-format

4105 msgid "already have %s (%s)"

4106 msgstr "%s déjà possédé (%s)"

4107

4062 -#: fetch-pack.c:819

4108 +#: fetch-pack.c:821

4109 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4110 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"

4111

4066 -#: fetch-pack.c:827

4112 +#: fetch-pack.c:829

4113 msgid "protocol error: bad pack header"

4114 msgstr "erreur de protocole : mauvais entête de paquet"

4115

4070 -#: fetch-pack.c:901

4116 +#: fetch-pack.c:910

4117 #, c-format

4118 msgid "fetch-pack: unable to fork off %s"

4119 msgstr "fetch-pack : impossible de dupliquer %s"

4120

4075 -#: fetch-pack.c:917

4121 +#: fetch-pack.c:927

4122 #, c-format

4123 msgid "%s failed"

4124 msgstr "échec de %s"

4125

4080 -#: fetch-pack.c:919

4126 +#: fetch-pack.c:929

4127 msgid "error in sideband demultiplexer"

4128 msgstr "erreur dans le démultiplexer latéral"

4129

4084 -#: fetch-pack.c:966

4130 +#: fetch-pack.c:976

4131 #, c-format

4132 msgid "Server version is %.*s"

4133 msgstr "La version du serveur est %.*s"

4134

4089 -#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

4090 -#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

4091 -#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

4092 -#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

4135 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

4136 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

4137 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

4138 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4139 #, c-format

4140 msgid "Server supports %s"

4141 msgstr "Le serveur supporte %s"

4142

4097 -#: fetch-pack.c:973

4143 +#: fetch-pack.c:983

4144 msgid "Server does not support shallow clients"

4145 msgstr "Le serveur ne supporte les clients superficiels"

4146

4101 -#: fetch-pack.c:1033

4147 +#: fetch-pack.c:1043

4148 msgid "Server does not support --shallow-since"

4149 msgstr "Le receveur ne gère pas --shallow-since"

4150

4105 -#: fetch-pack.c:1038

4151 +#: fetch-pack.c:1048

4152 msgid "Server does not support --shallow-exclude"

4153 msgstr "Le receveur ne gère pas --shallow-exclude"

4154

4109 -#: fetch-pack.c:1042

4155 +#: fetch-pack.c:1052

4156 msgid "Server does not support --deepen"

4157 msgstr "Le receveur ne gère pas --deepen"

4158

4113 -#: fetch-pack.c:1059

4159 +#: fetch-pack.c:1054

4160 +msgid "Server does not support this repository's object format"

4161 +msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"

4162 +

4163 +#: fetch-pack.c:1071

4164 msgid "no common commits"

4165 msgstr "pas de commit commun"

4166

4117 -#: fetch-pack.c:1071 fetch-pack.c:1563

4167 +#: fetch-pack.c:1083 fetch-pack.c:1639

4168 msgid "git fetch-pack: fetch failed."

4169 msgstr "git fetch-pack : échec de le récupération."

4170

4171 #: fetch-pack.c:1211

4172 +#, c-format

4173 +msgid "mismatched algorithms: client %s; server %s"

4174 +msgstr "non-correspondance des algorithmes : client %s ; serveur %s"

4175 +

4176 +#: fetch-pack.c:1215

4177 +#, c-format

4178 +msgid "the server does not support algorithm '%s'"

4179 +msgstr "Le serveur ne supporte pas l'algorithme '%s'"

4180 +

4181 +#: fetch-pack.c:1235

4182 msgid "Server does not support shallow requests"

4123 -msgstr "Le serveur ne supporte les requêtes superficielles"

4183 +msgstr "Le serveur ne supporte pas les requêtes superficielles"

4184

4125 -#: fetch-pack.c:1218

4185 +#: fetch-pack.c:1242

4186 msgid "Server supports filter"

4187 msgstr "Le serveur supporte filter"

4188

4129 -#: fetch-pack.c:1242

4189 +#: fetch-pack.c:1286

4190 msgid "unable to write request to remote"

4191 msgstr "impossible d'écrire la requête sur le distant"

4192

4133 -#: fetch-pack.c:1260

4193 +#: fetch-pack.c:1304

4194 #, c-format

4195 msgid "error reading section header '%s'"

4196 msgstr "erreur à la lecture de l'entête de section '%s'"

4197

4138 -#: fetch-pack.c:1266

4198 +#: fetch-pack.c:1310

4199 #, c-format

4200 msgid "expected '%s', received '%s'"

4201 msgstr "'%s' attendu, '%s' reçu"

4202

4143 -#: fetch-pack.c:1327

4203 +#: fetch-pack.c:1371

4204 #, c-format

4205 msgid "unexpected acknowledgment line: '%s'"

4206 msgstr "ligne d'acquittement inattendue : '%s'"

4207

4148 -#: fetch-pack.c:1332

4208 +#: fetch-pack.c:1376

4209 #, c-format

4210 msgid "error processing acks: %d"

4211 msgstr "erreur lors du traitement des acquittements : %d"

4212

4153 -#: fetch-pack.c:1342

4213 +#: fetch-pack.c:1386

4214 msgid "expected packfile to be sent after 'ready'"

4215 msgstr "fichier paquet attendu à envoyer après 'ready'"

4216

4157 -#: fetch-pack.c:1344

4217 +#: fetch-pack.c:1388

4218 msgid "expected no other sections to be sent after no 'ready'"

4219 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

4220

4161 -#: fetch-pack.c:1386

4221 +#: fetch-pack.c:1430

4222 #, c-format

4223 msgid "error processing shallow info: %d"

4224 msgstr "erreur lors du traitement de l'information de superficialité : %d"

4225

4166 -#: fetch-pack.c:1433

4226 +#: fetch-pack.c:1477

4227 #, c-format

4228 msgid "expected wanted-ref, got '%s'"

4229 msgstr "wanted-ref attendu, '%s' trouvé"

4230

4171 -#: fetch-pack.c:1438

4231 +#: fetch-pack.c:1482

4232 #, c-format

4233 msgid "unexpected wanted-ref: '%s'"

4234 msgstr "wanted-ref inattendu : '%s'"

4235

4176 -#: fetch-pack.c:1443

4236 +#: fetch-pack.c:1487

4237 #, c-format

4238 msgid "error processing wanted refs: %d"

4239 msgstr "erreur lors du traitement des références voulues : %d"

4240

4181 -#: fetch-pack.c:1789

4241 +#: fetch-pack.c:1517

4242 +msgid "git fetch-pack: expected response end packet"

4243 +msgstr "git fetch-pack : paquet de fin de réponse attendu"

4244 +

4245 +#: fetch-pack.c:1921

4246 msgid "no matching remote head"

4247 msgstr "pas de HEAD distante correspondante"

4248

4185 -#: fetch-pack.c:1812 builtin/clone.c:692

4249 +#: fetch-pack.c:1944 builtin/clone.c:692

4250 msgid "remote did not send all necessary objects"

4251 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4252

4189 -#: fetch-pack.c:1839

4253 +#: fetch-pack.c:1971

4254 #, c-format

4255 msgid "no such remote ref %s"

4256 msgstr "référence distante inconnue %s"

4257

4194 -#: fetch-pack.c:1842

4258 +#: fetch-pack.c:1974

4259 #, c-format

4260 msgid "Server does not allow request for unadvertised object %s"

4261 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"

@@ -4227,7 +4291,7 @@ msgstr ""

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

4292 msgstr "'%s' : lecture de %s impossible"

4293

4230 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4294 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4295 #: builtin/rm.c:135

4296 #, c-format

4297 msgid "failed to stat '%s'"

@@ -4376,16 +4440,16 @@ msgstr[1] ""

4440 "\n"

4441 "Les commandes les plus ressemblantes sont"

4442

4379 -#: help.c:653

4443 +#: help.c:654

4444 msgid "git version [<options>]"

4445 msgstr "git version [<options>]"

4446

4383 -#: help.c:708

4447 +#: help.c:709

4448 #, c-format

4449 msgid "%s: %s - %s"

4450 msgstr "%s: %s - %s"

4451

4388 -#: help.c:712

4452 +#: help.c:713

4453 msgid ""

4454 "\n"

4455 "Did you mean this?"

@@ -4485,6 +4549,10 @@ msgstr "quelque chose attendu après combine :"

4549 msgid "multiple filter-specs cannot be combined"

4550 msgstr "impossible de combiner des spécificateurs multiples de filtre"

4551

4552 +#: list-objects-filter-options.c:330

4553 +msgid "unable to upgrade repository format to support partial clone"

4554 +msgstr "impossible de mettre à jour le format de dépôt pour supporter les clones partiels"

4555 +

4556 #: list-objects-filter.c:492

4557 #, c-format

4558 msgid "unable to access sparse blob in '%s'"

@@ -4851,7 +4919,7 @@ msgstr "ajout/ajout"

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

4920 msgstr "%s sauté (fusion identique à l'existant)"

4921

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

4922 +#: merge-recursive.c:3101 git-submodule.sh:959

4923 msgid "submodule"

4924 msgstr "sous-module"

4925

@@ -4980,7 +5048,7 @@ msgid "failed to read the cache"

5048 msgstr "impossible de lire le cache"

5049

5050 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4983 -#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

5051 +#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

5052 #: builtin/stash.c:265

5053 msgid "unable to write new index file"

5054 msgstr "impossible d'écrire le nouveau fichier d'index"

@@ -5233,21 +5301,21 @@ msgstr "impossible d'analyser l'objet : %s"

5301 msgid "hash mismatch %s"

5302 msgstr "incohérence de hachage %s"

5303

5236 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5304 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5305 #, c-format

5306 msgid "unable to get size of %s"

5307 msgstr "impossible de récupérer la taille de %s"

5308

5241 -#: packfile.c:629

5309 +#: packfile.c:630

5310 msgid "offset before end of packfile (broken .idx?)"

5311 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

5312

5245 -#: packfile.c:1899

5313 +#: packfile.c:1900

5314 #, c-format

5315 msgid "offset before start of pack index for %s (corrupt index?)"

5316 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

5317

5250 -#: packfile.c:1903

5318 +#: packfile.c:1904

5319 #, c-format

5320 msgid "offset beyond end of pack index for %s (truncated index?)"

5321 msgstr ""

@@ -5457,46 +5525,50 @@ msgid "unable to write delim packet"

5525 msgstr "impossible d'écrire le paquet de délimitation"

5526

5527 #: pkt-line.c:106

5528 +msgid "unable to write stateless separator packet"

5529 +msgstr "impossible d'écrire le paquet de séparateur sans état"

5530 +

5531 +#: pkt-line.c:113

5532 msgid "flush packet write failed"

5533 msgstr "échec de l'écriture du vidage de paquet"

5534

5463 -#: pkt-line.c:146 pkt-line.c:232

5535 +#: pkt-line.c:153 pkt-line.c:239

5536 msgid "protocol error: impossibly long line"

5537 msgstr "erreur de protocole : ligne impossiblement trop longue"

5538

5467 -#: pkt-line.c:162 pkt-line.c:164

5539 +#: pkt-line.c:169 pkt-line.c:171

5540 msgid "packet write with format failed"

5541 msgstr "échec de l'écriture d'un paquet avec format"

5542

5471 -#: pkt-line.c:196

5543 +#: pkt-line.c:203

5544 msgid "packet write failed - data exceeds max packet size"

5545 msgstr ""

5546 "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "

5547 "d'un paquet"

5548

5477 -#: pkt-line.c:203 pkt-line.c:210

5549 +#: pkt-line.c:210 pkt-line.c:217

5550 msgid "packet write failed"

5551 msgstr "échec de l'écriture d'un paquet"

5552

5481 -#: pkt-line.c:295

5553 +#: pkt-line.c:302

5554 msgid "read error"

5555 msgstr "erreur de lecture"

5556

5485 -#: pkt-line.c:303

5557 +#: pkt-line.c:310

5558 msgid "the remote end hung up unexpectedly"

5559 msgstr "L'hôte distant a fermé la connexion de manière inattendue"

5560

5489 -#: pkt-line.c:331

5561 +#: pkt-line.c:338

5562 #, c-format

5563 msgid "protocol error: bad line length character: %.4s"

5564 msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"

5565

5494 -#: pkt-line.c:341 pkt-line.c:346

5566 +#: pkt-line.c:352 pkt-line.c:357

5567 #, c-format

5568 msgid "protocol error: bad line length %d"

5569 msgstr "erreur de protocole : mauvaise longueur de ligne %d"

5570

5499 -#: pkt-line.c:362

5571 +#: pkt-line.c:373

5572 #, c-format

5573 msgid "remote error: %s"

5574 msgstr "erreur distante : %s"

@@ -5545,7 +5617,9 @@ msgstr "impossible d'analyser le commit '%s'"

5617 msgid ""

5618 "could not parse first line of `log` output: did not start with 'commit ': "

5619 "'%s'"

5548 -msgstr "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'"

5620 +msgstr ""

5621 +"impossible d'analyser la première ligne de la sortie de `log` : ne commence "

5622 +"pas par 'commit' : '%s'"

5623

5624 #: range-diff.c:137

5625 #, c-format

@@ -5674,7 +5748,7 @@ msgstr "entrées de préparation non ordonnées pour '%s'"

5748

5749 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5750 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5677 -#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5751 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5752 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5753 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5754 #: builtin/submodule--helper.c:332

@@ -5731,7 +5805,7 @@ msgstr "impossible de rafraîchir l'index partagé '%s'"

5805 msgid "broken index, expect %s in %s, got %s"

5806 msgstr "index cassé, %s attendu dans %s, %s obtenu"

5807

5734 -#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5808 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5809 #, c-format

5810 msgid "could not close '%s'"

5811 msgstr "impossible de fermer '%s'"

@@ -5916,7 +5990,7 @@ msgid "could not read '%s'."

5990 msgstr "impossible de lire '%s'."

5991

5992 # à priori on parle d'une branche ici

5919 -#: ref-filter.c:42 wt-status.c:1936

5993 +#: ref-filter.c:42 wt-status.c:1977

5994 msgid "gone"

5995 msgstr "disparue"

5996

@@ -6141,7 +6215,7 @@ msgstr "objet malformé à '%s'"

6215 msgid "ignoring ref with broken name %s"

6216 msgstr "réf avec un nom cassé %s ignoré"

6217

6144 -#: ref-filter.c:2095 refs.c:625

6218 +#: ref-filter.c:2095 refs.c:657

6219 #, c-format

6220 msgid "ignoring broken ref %s"

6221 msgstr "réf cassé %s ignoré"

@@ -6171,94 +6245,108 @@ msgstr "nom d'objet malformé %s"

6245 msgid "option `%s' must point to a commit"

6246 msgstr "l'option '%s' doit pointer sur un commit"

6247

6174 -#: refs.c:262

6248 +#: refs.c:264

6249 #, c-format

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

6251 msgstr "%s ne pointe pas sur un objet valide!"

6252

6179 -#: refs.c:623

6253 +#: refs.c:572

6254 +#, c-format

6255 +msgid "could not retrieve `%s`"

6256 +msgstr "impossible de récupérer `%s`"

6257 +

6258 +#: refs.c:579

6259 +#, c-format

6260 +msgid "invalid branch name: %s = %s"

6261 +msgstr "Nom de branche invalide : %s = %s"

6262 +

6263 +#: refs.c:655

6264 #, c-format

6265 msgid "ignoring dangling symref %s"

6266 msgstr "symref pendant %s ignoré"

6267

6184 -#: refs.c:760

6268 +#: refs.c:792

6269 #, c-format

6270 msgid "could not open '%s' for writing: %s"

6271 msgstr "impossible d'ouvrir '%s' en écriture : %s"

6272

6189 -#: refs.c:770 refs.c:821

6273 +#: refs.c:802 refs.c:853

6274 #, c-format

6275 msgid "could not read ref '%s'"

6276 msgstr "impossible de lire la réf '%s'"

6277

6194 -#: refs.c:776

6278 +#: refs.c:808

6279 #, c-format

6280 msgid "ref '%s' already exists"

6281 msgstr "la référence '%s' existe déjà"

6282

6199 -#: refs.c:781

6283 +#: refs.c:813

6284 #, c-format

6285 msgid "unexpected object ID when writing '%s'"

6286 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

6287

6204 -#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6205 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6206 -#: wrapper.c:620

6288 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6289 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6290 +#: wrapper.c:628

6291 #, c-format

6292 msgid "could not write to '%s'"

6293 msgstr "impossible d'écrire dans '%s'"

6294

6211 -#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6295 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6296 #: builtin/rebase.c:852

6297 #, c-format

6298 msgid "could not open '%s' for writing"

6299 msgstr "impossible d'ouvrir '%s' en écriture"

6300

6217 -#: refs.c:823

6301 +#: refs.c:855

6302 #, c-format

6303 msgid "unexpected object ID when deleting '%s'"

6304 msgstr "id d'objet inattendu pendant la suppression de '%s'"

6305

6222 -#: refs.c:954

6306 +#: refs.c:986

6307 #, c-format

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

6309 msgstr "le journal pour la réf %s contient un trou après %s"

6310

6227 -#: refs.c:960

6311 +#: refs.c:992

6312 #, c-format

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

6314 msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

6315

6232 -#: refs.c:1019

6316 +#: refs.c:1051

6317 #, c-format

6318 msgid "log for %s is empty"

6319 msgstr "le journal pour la réf %s est vide"

6320

6237 -#: refs.c:1111

6321 +#: refs.c:1143

6322 #, c-format

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

6324 msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

6325

6242 -#: refs.c:1187

6326 +#: refs.c:1219

6327 #, c-format

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

6329 msgstr "échec de update_ref pour la réf '%s' : %s"

6330

6247 -#: refs.c:1979

6331 +#: refs.c:2011

6332 #, c-format

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

6334 msgstr "mises à jour multiples pour la réf '%s' non permises"

6335

6252 -#: refs.c:2011

6336 +#: refs.c:2098

6337 msgid "ref updates forbidden inside quarantine environment"

6338 msgstr "mises à jour des références interdites en environnement de quarantaine"

6339

6256 -#: refs.c:2107 refs.c:2137

6340 +#: refs.c:2109

6341 +msgid "ref updates aborted by hook"

6342 +msgstr "mises à jour des références annulées par le crochet"

6343 +

6344 +#: refs.c:2209 refs.c:2239

6345 #, c-format

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

6347 msgstr "'%s' existe ; impossible de créer '%s'"

6348

6261 -#: refs.c:2113 refs.c:2148

6349 +#: refs.c:2215 refs.c:2250

6350 #, c-format

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

6352 msgstr "impossible de traiter '%s' et '%s' en même temps"

@@ -6555,7 +6643,7 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"

6643 msgstr ""

6644 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

6645

6558 -#: remote.c:2233

6646 +#: remote.c:2241

6647 #, c-format

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

6649 msgstr "impossible d'analyser le nom attendu d'objet '%s'"

@@ -6578,7 +6666,8 @@ msgstr "profondeur de remplacement trop grande pour l'objet %s"

6666 #: repository.c:94 builtin/init-db.c:188

6667 #, c-format

6668 msgid "The hash algorithm %s is not supported in this build."

6581 -msgstr "L'algorithme d'empreinte %s n'est pas pris en charge par cette version."

6669 +msgstr ""

6670 +"L'algorithme d'empreinte %s n'est pas pris en charge par cette version."

6671

6672 #: rerere.c:217 rerere.c:226 rerere.c:229

6673 msgid "corrupt MERGE_RR"

@@ -6682,20 +6771,20 @@ msgstr "impossible de déterminer la révision HEAD"

6771 msgid "failed to find tree of %s"

6772 msgstr "impossible de trouver l'arbre de %s"

6773

6685 -#: revision.c:2655

6774 +#: revision.c:2661

6775 msgid "your current branch appears to be broken"

6776 msgstr "votre branche actuelle semble cassée"

6777

6689 -#: revision.c:2658

6778 +#: revision.c:2664

6779 #, c-format

6780 msgid "your current branch '%s' does not have any commits yet"

6781 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

6782

6694 -#: revision.c:2866

6783 +#: revision.c:2873

6784 msgid "--first-parent is incompatible with --bisect"

6785 msgstr "--first-parent est incompatible avec --bisect"

6786

6698 -#: revision.c:2870

6787 +#: revision.c:2877

6788 msgid "-L does not yet support diff formats besides -p and -s"

6789 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

6790

@@ -6738,11 +6827,15 @@ msgstr "le dépaquetage a échoué : %s"

6827 msgid "failed to sign the push certificate"

6828 msgstr "impossible de signer le certificat de poussée"

6829

6741 -#: send-pack.c:399

6830 +#: send-pack.c:394

6831 +msgid "the receiving end does not support this repository's hash algorithm"

6832 +msgstr "Le receveur ne gère pas l'algorithme d'empreinte de ce dépôt"

6833 +

6834 +#: send-pack.c:403

6835 msgid "the receiving end does not support --signed push"

6836 msgstr "Le receveur ne gère pas les poussées avec --signed"

6837

6745 -#: send-pack.c:401

6838 +#: send-pack.c:405

6839 msgid ""

6840 "not sending a push certificate since the receiving end does not support --"

6841 "signed push"

@@ -6750,11 +6843,11 @@ msgstr ""

6843 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

6844 "poussées avec --signed"

6845

6753 -#: send-pack.c:413

6846 +#: send-pack.c:417

6847 msgid "the receiving end does not support --atomic push"

6848 msgstr "Le receveur ne gère pas les poussées avec --atomic"

6849

6757 -#: send-pack.c:418

6850 +#: send-pack.c:422

6851 msgid "the receiving end does not support push options"

6852 msgstr "Le receveur ne gère pas les options de poussées"

6853

@@ -6875,7 +6968,7 @@ msgstr "aucune clé présente dans '%.*s'"

6968 msgid "unable to dequote value of '%s'"

6969 msgstr "Impossible de décoter la valeur de '%s'"

6970

6878 -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6971 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6972 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6973 #, c-format

6974 msgid "could not open '%s' for reading"

@@ -7515,7 +7608,8 @@ msgstr "L'application du remisage automatique a créé des conflits."

7608

7609 #: sequencer.c:3765

7610 msgid "Autostash exists; creating a new stash entry."

7518 -msgstr "Un remisage automatique existe ; création d'une nouvelle entrée de remisage."

7611 +msgstr ""

7612 +"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."

7613

7614 #: sequencer.c:3857

7615 #, c-format

@@ -7719,84 +7813,84 @@ msgstr ""

7813 msgid "this operation must be run in a work tree"

7814 msgstr "Cette opération doit être effectuée dans un arbre de travail"

7815

7722 -#: setup.c:569

7816 +#: setup.c:604

7817 #, c-format

7818 msgid "Expected git repo version <= %d, found %d"

7819 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

7820

7727 -#: setup.c:577

7821 +#: setup.c:612

7822 msgid "unknown repository extensions found:"

7823 msgstr "extensions de dépôt inconnues trouvées :"

7824

7731 -#: setup.c:596

7825 +#: setup.c:631

7826 #, c-format

7827 msgid "error opening '%s'"

7828 msgstr "erreur à l'ouverture de '%s'"

7829

7736 -#: setup.c:598

7830 +#: setup.c:633

7831 #, c-format

7832 msgid "too large to be a .git file: '%s'"

7833 msgstr "trop gros pour être une fichier .git : '%s'"

7834

7741 -#: setup.c:600

7835 +#: setup.c:635

7836 #, c-format

7837 msgid "error reading %s"

7838 msgstr "erreur à la lecture de %s"

7839

7746 -#: setup.c:602

7840 +#: setup.c:637

7841 #, c-format

7842 msgid "invalid gitfile format: %s"

7843 msgstr "format de fichier git invalide : %s"

7844

7751 -#: setup.c:604

7845 +#: setup.c:639

7846 #, c-format

7847 msgid "no path in gitfile: %s"

7848 msgstr "aucun chemin dans le fichier git : %s"

7849

7756 -#: setup.c:606

7850 +#: setup.c:641

7851 #, c-format

7852 msgid "not a git repository: %s"

7853 msgstr "ce n'est pas un dépôt git : %s"

7854

7761 -#: setup.c:708

7855 +#: setup.c:743

7856 #, c-format

7857 msgid "'$%s' too big"

7858 msgstr "'$%s' trop gros"

7859

7766 -#: setup.c:722

7860 +#: setup.c:757

7861 #, c-format

7862 msgid "not a git repository: '%s'"

7863 msgstr "ce n'est pas un dépôt git : '%s'"

7864

7771 -#: setup.c:751 setup.c:753 setup.c:784

7865 +#: setup.c:786 setup.c:788 setup.c:819

7866 #, c-format

7867 msgid "cannot chdir to '%s'"

7868 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"

7869

7776 -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869

7870 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

7871 msgid "cannot come back to cwd"

7872 msgstr "impossible de revenir au répertoire de travail courant"

7873

7780 -#: setup.c:883

7874 +#: setup.c:918

7875 #, c-format

7876 msgid "failed to stat '%*s%s%s'"

7877 msgstr "échec du stat de '%*s%s%s'"

7878

7785 -#: setup.c:1121

7879 +#: setup.c:1156

7880 msgid "Unable to read current working directory"

7881 msgstr "Impossible d'accéder au répertoire de travail courant"

7882

7789 -#: setup.c:1130 setup.c:1136

7883 +#: setup.c:1165 setup.c:1171

7884 #, c-format

7885 msgid "cannot change to '%s'"

7886 msgstr "impossible de modifier en '%s'"

7887

7794 -#: setup.c:1141

7888 +#: setup.c:1176

7889 #, c-format

7890 msgid "not a git repository (or any of the parent directories): %s"

7891 msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

7892

7799 -#: setup.c:1147

7893 +#: setup.c:1182

7894 #, c-format

7895 msgid ""

7896 "not a git repository (or any parent up to mount point %s)\n"

@@ -7807,7 +7901,7 @@ msgstr ""

7901 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

7902 "n'est pas défini)."

7903

7810 -#: setup.c:1258

7904 +#: setup.c:1293

7905 #, c-format

7906 msgid ""

7907 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7817,15 +7911,15 @@ msgstr ""

7911 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

7912 "écriture."

7913

7820 -#: setup.c:1304

7914 +#: setup.c:1340

7915 msgid "open /dev/null or dup failed"

7916 msgstr "échec de l'ouverture ou au dup de /dev/null"

7917

7824 -#: setup.c:1319

7918 +#: setup.c:1355

7919 msgid "fork failed"

7920 msgstr "échec de la bifurcation"

7921

7828 -#: setup.c:1324

7922 +#: setup.c:1360

7923 msgid "setsid failed"

7924 msgstr "échec du setsid"

7925

@@ -8009,7 +8103,7 @@ msgstr "échec de deflateEnd sur l'objet %s (%d)"

8103 msgid "confused by unstable object source data for %s"

8104 msgstr "données de source d'objet instable pour %s"

8105

8012 -#: sha1-file.c:1906 builtin/pack-objects.c:1055

8106 +#: sha1-file.c:1906 builtin/pack-objects.c:1085

8107 #, c-format

8108 msgid "failed utime() on %s"

8109 msgstr "échec de utime() sur %s"

@@ -8189,43 +8283,43 @@ msgid "invalid object name '%.*s'."

8283 msgstr "nom d'objet invalide : '%.*s'."

8284

8285 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

8192 -#: strbuf.c:853

8286 +#: strbuf.c:848

8287 #, c-format

8288 msgid "%u.%2.2u GiB"

8289 msgstr "%u.%2.2u Gio"

8290

8291 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

8198 -#: strbuf.c:855

8292 +#: strbuf.c:850

8293 #, c-format

8294 msgid "%u.%2.2u GiB/s"

8295 msgstr "%u.%2.2u Gio/s"

8296

8297 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

8204 -#: strbuf.c:863

8298 +#: strbuf.c:858

8299 #, c-format

8300 msgid "%u.%2.2u MiB"

8301 msgstr "%u.%2.2u Mio"

8302

8303 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

8210 -#: strbuf.c:865

8304 +#: strbuf.c:860

8305 #, c-format

8306 msgid "%u.%2.2u MiB/s"

8307 msgstr "%u.%2.2u Mio/s"

8308

8309 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

8216 -#: strbuf.c:872

8310 +#: strbuf.c:867

8311 #, c-format

8312 msgid "%u.%2.2u KiB"

8313 msgstr "%u.%2.2u Kio"

8314

8315 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

8222 -#: strbuf.c:874

8316 +#: strbuf.c:869

8317 #, c-format

8318 msgid "%u.%2.2u KiB/s"

8319 msgstr "%u.%2.2u Kio/s"

8320

8321 #. TRANSLATORS: IEC 80000-13:2008 byte

8228 -#: strbuf.c:880

8322 +#: strbuf.c:875

8323 #, c-format

8324 msgid "%u byte"

8325 msgid_plural "%u bytes"

@@ -8233,14 +8327,14 @@ msgstr[0] "%u octet"

8327 msgstr[1] "%u octets"

8328

8329 #. TRANSLATORS: IEC 80000-13:2008 byte/second

8236 -#: strbuf.c:882

8330 +#: strbuf.c:877

8331 #, c-format

8332 msgid "%u byte/s"

8333 msgid_plural "%u bytes/s"

8334 msgstr[0] "%u octet/s"

8335 msgstr[1] "%u octets/s"

8336

8243 -#: strbuf.c:1180

8337 +#: strbuf.c:1175

8338 #, c-format

8339 msgid "could not edit '%s'"

8340 msgstr "impossible d'éditer '%s'"

@@ -8492,7 +8586,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'"

8586 msgid "could not read from stdin"

8587 msgstr "Impossible de lire depuis l'entrée standard"

8588

8495 -#: trailer.c:1011 wrapper.c:665

8589 +#: trailer.c:1011 wrapper.c:673

8590 #, c-format

8591 msgid "could not stat %s"

8592 msgstr "stat impossible de %s"

@@ -8516,21 +8610,21 @@ msgstr "impossible de créer un fichier temporaire"

8610 msgid "could not rename temporary file to %s"

8611 msgstr "impossible de renommer un fichier temporaire en %s"

8612

8519 -#: transport-helper.c:61 transport-helper.c:90

8613 +#: transport-helper.c:62 transport-helper.c:91

8614 msgid "full write to remote helper failed"

8615 msgstr "échec de l'écriture totale sur l'assistant distant"

8616

8523 -#: transport-helper.c:144

8617 +#: transport-helper.c:145

8618 #, c-format

8619 msgid "unable to find remote helper for '%s'"

8620 msgstr "Impossible de trouver un assistant distant pour '%s'"

8621

8528 -#: transport-helper.c:160 transport-helper.c:571

8622 +#: transport-helper.c:161 transport-helper.c:575

8623 msgid "can't dup helper output fd"

8624 msgstr ""

8625 "impossible de dupliquer le descripteur de flux de sortie de l'assistant"

8626

8533 -#: transport-helper.c:211

8627 +#: transport-helper.c:214

8628 #, c-format

8629 msgid ""

8630 "unknown mandatory capability %s; this remote helper probably needs newer "

@@ -8539,161 +8633,166 @@ msgstr ""

8633 "capacité obligatoire inconnue %s ; cet assistant distant requiert "

8634 "probablement une une nouvelle version de Git"

8635

8542 -#: transport-helper.c:217

8636 +#: transport-helper.c:220

8637 msgid "this remote helper should implement refspec capability"

8638 msgstr "cet assistant distant devrait supporter la capacité refspec"

8639

8546 -#: transport-helper.c:284 transport-helper.c:425

8640 +#: transport-helper.c:287 transport-helper.c:429

8641 #, c-format

8642 msgid "%s unexpectedly said: '%s'"

8643 msgstr "%s a dit de manière inattendue : '%s'"

8644

8551 -#: transport-helper.c:414

8645 +#: transport-helper.c:417

8646 #, c-format

8647 msgid "%s also locked %s"

8648 msgstr "%s a aussi verrouillé %s"

8649

8556 -#: transport-helper.c:493

8650 +#: transport-helper.c:497

8651 msgid "couldn't run fast-import"

8652 msgstr "impossible de lancer fast-import"

8653

8560 -#: transport-helper.c:516

8654 +#: transport-helper.c:520

8655 msgid "error while running fast-import"

8656 msgstr "erreur au lancement de fast-import"

8657

8564 -#: transport-helper.c:545 transport-helper.c:1135

8658 +#: transport-helper.c:549 transport-helper.c:1156

8659 #, c-format

8660 msgid "could not read ref %s"

8661 msgstr "impossible de lire la réf %s"

8662

8569 -#: transport-helper.c:590

8663 +#: transport-helper.c:594

8664 #, c-format

8665 msgid "unknown response to connect: %s"

8666 msgstr "réponse inconnue à connect : %s"

8667

8574 -#: transport-helper.c:612

8668 +#: transport-helper.c:616

8669 msgid "setting remote service path not supported by protocol"

8670 msgstr ""

8671 "la spécification du chemin de service distant n'est pas supportée par le "

8672 "protocole"

8673

8580 -#: transport-helper.c:614

8674 +#: transport-helper.c:618

8675 msgid "invalid remote service path"

8676 msgstr "chemin de service distant invalide"

8677

8584 -#: transport-helper.c:657 transport.c:1339

8678 +#: transport-helper.c:661 transport.c:1347

8679 msgid "operation not supported by protocol"

8680 msgstr "option non supportée par le protocole"

8681

8588 -#: transport-helper.c:660

8682 +#: transport-helper.c:664

8683 #, c-format

8684 msgid "can't connect to subservice %s"

8685 msgstr "impossible de se connecter au sous-service %s"

8686

8593 -#: transport-helper.c:736

8687 +#: transport-helper.c:740

8688 #, c-format

8689 msgid "expected ok/error, helper said '%s'"

8690 msgstr "ok/error attendu, l'assistant a dit '%s'"

8691

8598 -#: transport-helper.c:789

8692 +#: transport-helper.c:793

8693 #, c-format

8694 msgid "helper reported unexpected status of %s"

8695 msgstr "l'assistant a renvoyé un statut de retour inattendu %s"

8696

8603 -#: transport-helper.c:850

8697 +#: transport-helper.c:854

8698 #, c-format

8699 msgid "helper %s does not support dry-run"

8700 msgstr "l'assistant %s ne gère pas dry-run"

8701

8608 -#: transport-helper.c:853

8702 +#: transport-helper.c:857

8703 #, c-format

8704 msgid "helper %s does not support --signed"

8705 msgstr "l'assistant %s ne gère pas --signed"

8706

8613 -#: transport-helper.c:856

8707 +#: transport-helper.c:860

8708 #, c-format

8709 msgid "helper %s does not support --signed=if-asked"

8710 msgstr "l'assistant %s ne gère pas --signed=if-asked"

8711

8618 -#: transport-helper.c:861

8712 +#: transport-helper.c:865

8713 #, c-format

8714 msgid "helper %s does not support --atomic"

8715 msgstr "l'assistant %s ne gère pas --atomic"

8716

8623 -#: transport-helper.c:867

8717 +#: transport-helper.c:871

8718 #, c-format

8719 msgid "helper %s does not support 'push-option'"

8720 msgstr "l'assistant %s ne gère pas 'push-option'"

8721

8628 -#: transport-helper.c:966

8722 +#: transport-helper.c:970

8723 msgid "remote-helper doesn't support push; refspec needed"

8724 msgstr ""

8725 "l'assistant %s ne gère pas push ; un spécificateur de référence est "

8726 "nécessaire"

8727

8634 -#: transport-helper.c:971

8728 +#: transport-helper.c:975

8729 #, c-format

8730 msgid "helper %s does not support 'force'"

8731 msgstr "l'assistant %s ne gère pas 'force'"

8732

8639 -#: transport-helper.c:1018

8733 +#: transport-helper.c:1022

8734 msgid "couldn't run fast-export"

8735 msgstr "impossible de lancer fast-export"

8736

8643 -#: transport-helper.c:1023

8737 +#: transport-helper.c:1027

8738 msgid "error while running fast-export"

8739 msgstr "erreur au lancement de fast-export"

8740

8647 -#: transport-helper.c:1048

8741 +#: transport-helper.c:1052

8742 #, c-format

8743 msgid ""

8744 "No refs in common and none specified; doing nothing.\n"

8651 -"Perhaps you should specify a branch such as 'master'.\n"

8745 +"Perhaps you should specify a branch.\n"

8746 msgstr ""

8747 "Aucune référence en commun et aucune spécfiée ; rien à faire.\n"

8654 -"Vous devriez peut-être spécifier une branche telle que 'master'.\n"

8748 +"Vous devriez peut-être spécifier une branche.\n"

8749 +

8750 +#: transport-helper.c:1133

8751 +#, c-format

8752 +msgid "unsupported object format '%s'"

8753 +msgstr "format d'objet non géré '%s'"

8754

8656 -#: transport-helper.c:1121

8755 +#: transport-helper.c:1142

8756 #, c-format

8757 msgid "malformed response in ref list: %s"

8758 msgstr "réponse malformée dans le liste de réfs : %s"

8759

8661 -#: transport-helper.c:1273

8760 +#: transport-helper.c:1294

8761 #, c-format

8762 msgid "read(%s) failed"

8763 msgstr "échec de read(%s)"

8764

8666 -#: transport-helper.c:1300

8765 +#: transport-helper.c:1321

8766 #, c-format

8767 msgid "write(%s) failed"

8768 msgstr "échec de write(%s)"

8769

8671 -#: transport-helper.c:1349

8770 +#: transport-helper.c:1370

8771 #, c-format

8772 msgid "%s thread failed"

8773 msgstr "échec du fil d'exécution %s"

8774

8676 -#: transport-helper.c:1353

8775 +#: transport-helper.c:1374

8776 #, c-format

8777 msgid "%s thread failed to join: %s"

8778 msgstr "échec de jonction du fil d'exécution %s : %s"

8779

8681 -#: transport-helper.c:1372 transport-helper.c:1376

8780 +#: transport-helper.c:1393 transport-helper.c:1397

8781 #, c-format

8782 msgid "can't start thread for copying data: %s"

8783 msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"

8784

8686 -#: transport-helper.c:1413

8785 +#: transport-helper.c:1434

8786 #, c-format

8787 msgid "%s process failed to wait"

8788 msgstr "échec du processus %s pour l'attente"

8789

8691 -#: transport-helper.c:1417

8790 +#: transport-helper.c:1438

8791 #, c-format

8792 msgid "%s process failed"

8793 msgstr "échec du processus %s"

8794

8696 -#: transport-helper.c:1435 transport-helper.c:1444

8795 +#: transport-helper.c:1456 transport-helper.c:1465

8796 msgid "can't start thread for copying data"

8797 msgstr "impossible de démarrer le fil d'exécution pour copier les données"

8798

@@ -8707,33 +8806,33 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

8806 msgid "could not read bundle '%s'"

8807 msgstr "impossible de lire la liasse '%s'"

8808

8710 -#: transport.c:214

8809 +#: transport.c:220

8810 #, c-format

8811 msgid "transport: invalid depth option '%s'"

8812 msgstr "transport : option de profondeur invalide '%s'"

8813

8715 -#: transport.c:266

8814 +#: transport.c:272

8815 msgid "see protocol.version in 'git help config' for more details"

8816 msgstr "voir protocol.version dans 'git help config' pour plus d'information"

8817

8719 -#: transport.c:267

8818 +#: transport.c:273

8819 msgid "server options require protocol version 2 or later"

8820 msgstr "les options de serveur exigent une version 2 ou supérieure"

8821

8723 -#: transport.c:632

8822 +#: transport.c:631

8823 msgid "could not parse transport.color.* config"

8824 msgstr "impossible d'analyser la configuration transport.color.*"

8825

8727 -#: transport.c:705

8826 +#: transport.c:704

8827 msgid "support for protocol v2 not implemented yet"

8828 msgstr "le support du protocole v2 n'est pas encore implanté"

8829

8731 -#: transport.c:839

8830 +#: transport.c:838

8831 #, c-format

8832 msgid "unknown value for config '%s': %s"

8833 msgstr "valeur inconnue pour la config '%s' : %s"

8834

8736 -#: transport.c:905

8835 +#: transport.c:904

8836 #, c-format

8837 msgid "transport '%s' not allowed"

8838 msgstr "transport '%s' non permis"

@@ -8742,7 +8841,7 @@ msgstr "transport '%s' non permis"

8841 msgid "git-over-rsync is no longer supported"

8842 msgstr "git-over-rsync n'est plus supporté"

8843

8745 -#: transport.c:1052

8844 +#: transport.c:1059

8845 #, c-format

8846 msgid ""

8847 "The following submodule paths contain changes that can\n"

@@ -8751,7 +8850,7 @@ msgstr ""

8850 "Les chemins suivants de sous-module contiennent des modifications\n"

8851 "qui ne peuvent être trouvées sur aucun distant :\n"

8852

8754 -#: transport.c:1056

8853 +#: transport.c:1063

8854 #, c-format

8855 msgid ""

8856 "\n"

@@ -8778,11 +8877,11 @@ msgstr ""

8877 "pour les pousser vers un serveur distant.\n"

8878 "\n"

8879

8781 -#: transport.c:1064

8880 +#: transport.c:1071

8881 msgid "Aborting."

8882 msgstr "Abandon."

8883

8785 -#: transport.c:1209

8884 +#: transport.c:1216

8885 msgid "failed to push all needed submodules"

8886 msgstr "échec de la poussée de tous les sous-modules nécessaires"

8887

@@ -9008,7 +9107,8 @@ msgid ""

9107 "patterns:\n"

9108 "%s"

9109 msgstr ""

9011 -"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs clairsemés :\n"

9110 +"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "

9111 +"clairsemés :\n"

9112 "%s"

9113

9114 #: unpack-trees.c:180

@@ -9017,7 +9117,8 @@ msgid ""

9117 "The following paths are unmerged and were left despite sparse patterns:\n"

9118 "%s"

9119 msgstr ""

9020 -"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les motifs clairsemés :\n"

9120 +"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "

9121 +"motifs clairsemés :\n"

9122 "%s"

9123

9124 #: unpack-trees.c:182

@@ -9027,7 +9128,8 @@ msgid ""

9128 "patterns:\n"

9129 "%s"

9130 msgstr ""

9030 -"Les chemins suivants étaient déjà présents et ont été laissés malgré les motifs clairsemés :\n"

9131 +"Les chemins suivants étaient déjà présents et ont été laissés malgré les "

9132 +"motifs clairsemés :\n"

9133 "%s"

9134

9135 #: unpack-trees.c:262

@@ -9040,7 +9142,9 @@ msgstr "Abandon\n"

9142 msgid ""

9143 "After fixing the above paths, you may want to run `git sparse-checkout "

9144 "reapply`.\n"

9043 -msgstr "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git sparse-checkout reapply`.\n"

9145 +msgstr ""

9146 +"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "

9147 +"sparse-checkout reapply`.\n"

9148

9149 #: unpack-trees.c:350

9150 msgid "Updating files"

@@ -9060,7 +9164,7 @@ msgstr ""

9164 msgid "Updating index flags"

9165 msgstr "Mise à jour des drapeaux de l'index"

9166

9063 -#: upload-pack.c:1337

9167 +#: upload-pack.c:1415

9168 msgid "expected flush after fetch arguments"

9169 msgstr "vidage attendu après les arguments de récupération"

9170

@@ -9097,50 +9201,50 @@ msgstr "segment de chemin '..' invalide"

9201 msgid "Fetching objects"

9202 msgstr "Récupération des objets"

9203

9100 -#: worktree.c:262 builtin/am.c:2098

9204 +#: worktree.c:248 builtin/am.c:2098

9205 #, c-format

9206 msgid "failed to read '%s'"

9207 msgstr "échec de la lecture de '%s'"

9208

9105 -#: worktree.c:309

9209 +#: worktree.c:295

9210 #, c-format

9211 msgid "'%s' at main working tree is not the repository directory"

9212 msgstr ""

9213 "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"

9214

9111 -#: worktree.c:320

9215 +#: worktree.c:306

9216 #, c-format

9217 msgid "'%s' file does not contain absolute path to the working tree location"

9218 msgstr ""

9219 "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "

9220 "de travail"

9221

9118 -#: worktree.c:332

9222 +#: worktree.c:318

9223 #, c-format

9224 msgid "'%s' does not exist"

9225 msgstr "'%s' n'existe pas"

9226

9123 -#: worktree.c:338

9227 +#: worktree.c:324

9228 #, c-format

9229 msgid "'%s' is not a .git file, error code %d"

9230 msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"

9231

9128 -#: worktree.c:347

9232 +#: worktree.c:333

9233 #, c-format

9234 msgid "'%s' does not point back to '%s'"

9235 msgstr "'%s' ne pointe pas en retour sur '%s'"

9236

9133 -#: wrapper.c:186 wrapper.c:356

9237 +#: wrapper.c:194 wrapper.c:364

9238 #, c-format

9239 msgid "could not open '%s' for reading and writing"

9240 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

9241

9138 -#: wrapper.c:387 wrapper.c:588

9242 +#: wrapper.c:395 wrapper.c:596

9243 #, c-format

9244 msgid "unable to access '%s'"

9245 msgstr "impossible d'accéder à '%s'"

9246

9143 -#: wrapper.c:596

9247 +#: wrapper.c:604

9248 msgid "unable to get current working directory"

9249 msgstr "impossible d'accéder au répertoire de travail courant"

9250

@@ -9534,39 +9638,44 @@ msgstr "Vous êtes en cours de bissection."

9638 msgid " (use \"git bisect reset\" to get back to the original branch)"

9639 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

9640

9537 -#: wt-status.c:1692

9641 +#: wt-status.c:1494

9642 +#, c-format

9643 +msgid "You are in a sparse checkout with %d%% of tracked files present."

9644 +msgstr "Vous êtes dans une extraction partielle avec %d %% de fichiers suivis présents."

9645 +

9646 +#: wt-status.c:1733

9647 msgid "On branch "

9648 msgstr "Sur la branche "

9649

9541 -#: wt-status.c:1699

9650 +#: wt-status.c:1740

9651 msgid "interactive rebase in progress; onto "

9652 msgstr "rebasage interactif en cours ; sur "

9653

9545 -#: wt-status.c:1701

9654 +#: wt-status.c:1742

9655 msgid "rebase in progress; onto "

9656 msgstr "rebasage en cours ; sur "

9657

9549 -#: wt-status.c:1711

9658 +#: wt-status.c:1752

9659 msgid "Not currently on any branch."

9660 msgstr "Actuellement sur aucun branche."

9661

9553 -#: wt-status.c:1728

9662 +#: wt-status.c:1769

9663 msgid "Initial commit"

9664 msgstr "Validation initiale"

9665

9557 -#: wt-status.c:1729

9666 +#: wt-status.c:1770

9667 msgid "No commits yet"

9668 msgstr "Aucun commit"

9669

9561 -#: wt-status.c:1743

9670 +#: wt-status.c:1784

9671 msgid "Untracked files"

9672 msgstr "Fichiers non suivis"

9673

9565 -#: wt-status.c:1745

9674 +#: wt-status.c:1786

9675 msgid "Ignored files"

9676 msgstr "Fichiers ignorés"

9677

9569 -#: wt-status.c:1749

9678 +#: wt-status.c:1790

9679 #, c-format

9680 msgid ""

9681 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -9578,32 +9687,32 @@ msgstr ""

9687 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

9688 "status')."

9689

9581 -#: wt-status.c:1755

9690 +#: wt-status.c:1796

9691 #, c-format

9692 msgid "Untracked files not listed%s"

9693 msgstr "Fichiers non suivis non affichés%s"

9694

9586 -#: wt-status.c:1757

9695 +#: wt-status.c:1798

9696 msgid " (use -u option to show untracked files)"

9697 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

9698

9590 -#: wt-status.c:1763

9699 +#: wt-status.c:1804

9700 msgid "No changes"

9701 msgstr "Aucune modification"

9702

9594 -#: wt-status.c:1768

9703 +#: wt-status.c:1809

9704 #, c-format

9705 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

9706 msgstr ""

9707 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

9708 "\"git commit -a\")\n"

9709

9601 -#: wt-status.c:1771

9710 +#: wt-status.c:1812

9711 #, c-format

9712 msgid "no changes added to commit\n"

9713 msgstr "aucune modification ajoutée à la validation\n"

9714

9606 -#: wt-status.c:1774

9715 +#: wt-status.c:1815

9716 #, c-format

9717 msgid ""

9718 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -9612,66 +9721,66 @@ msgstr ""

9721 "aucune modification ajoutée à la validation mais des fichiers non suivis "

9722 "sont présents (utilisez \"git add\" pour les suivre)\n"

9723

9615 -#: wt-status.c:1777

9724 +#: wt-status.c:1818

9725 #, c-format

9726 msgid "nothing added to commit but untracked files present\n"

9727 msgstr ""

9728 "aucune modification ajoutée à la validation mais des fichiers non suivis "

9729 "sont présents\n"

9730

9622 -#: wt-status.c:1780

9731 +#: wt-status.c:1821

9732 #, c-format

9733 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

9734 msgstr ""

9735 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

9736 "suivre)\n"

9737

9629 -#: wt-status.c:1783 wt-status.c:1788

9738 +#: wt-status.c:1824 wt-status.c:1829

9739 #, c-format

9740 msgid "nothing to commit\n"

9741 msgstr "rien à valider\n"

9742

9634 -#: wt-status.c:1786

9743 +#: wt-status.c:1827

9744 #, c-format

9745 msgid "nothing to commit (use -u to show untracked files)\n"

9746 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

9747

9639 -#: wt-status.c:1790

9748 +#: wt-status.c:1831

9749 #, c-format

9750 msgid "nothing to commit, working tree clean\n"

9751 msgstr "rien à valider, la copie de travail est propre\n"

9752

9644 -#: wt-status.c:1903

9753 +#: wt-status.c:1944

9754 msgid "No commits yet on "

9755 msgstr "Encore aucun commit sur "

9756

9648 -#: wt-status.c:1907

9757 +#: wt-status.c:1948

9758 msgid "HEAD (no branch)"

9759 msgstr "HEAD (aucune branche)"

9760

9652 -#: wt-status.c:1938

9761 +#: wt-status.c:1979

9762 msgid "different"

9763 msgstr "différent"

9764

9656 -#: wt-status.c:1940 wt-status.c:1948

9765 +#: wt-status.c:1981 wt-status.c:1989

9766 msgid "behind "

9767 msgstr "derrière "

9768

9660 -#: wt-status.c:1943 wt-status.c:1946

9769 +#: wt-status.c:1984 wt-status.c:1987

9770 msgid "ahead "

9771 msgstr "devant "

9772

9773 #. TRANSLATORS: the action is e.g. "pull with rebase"

9665 -#: wt-status.c:2468

9774 +#: wt-status.c:2509

9775 #, c-format

9776 msgid "cannot %s: You have unstaged changes."

9777 msgstr "Impossible de %s : vous avez des modifications non indexées."

9778

9670 -#: wt-status.c:2474

9779 +#: wt-status.c:2515

9780 msgid "additionally, your index contains uncommitted changes."

9781 msgstr "de plus, votre index contient des modifications non validées."

9782

9674 -#: wt-status.c:2476

9783 +#: wt-status.c:2517

9784 #, c-format

9785 msgid "cannot %s: Your index contains uncommitted changes."

9786 msgstr "%s impossible : votre index contient des modifications non validées."

@@ -9749,7 +9858,7 @@ msgstr "simuler l'action"

9858 msgid "interactive picking"

9859 msgstr "sélection interactive"

9860

9752 -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308

9861 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

9862 msgid "select hunks interactively"

9863 msgstr "sélection interactive des sections"

9864

@@ -9881,12 +9990,12 @@ msgstr ""

9990 msgid "--chmod param '%s' must be either -x or +x"

9991 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

9992

9884 -#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351

9993 +#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

9994 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506

9995 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9996 msgstr "--pathspec-from-file est incompatible avec pathspec arguments"

9997

9889 -#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357

9998 +#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

9999 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512

10000 msgid "--pathspec-file-nul requires --pathspec-from-file"

10001 msgstr "--pathspec-file-nul nécessite --pathspec-from-file"

@@ -10154,7 +10263,7 @@ msgstr "option historique -- no-op"

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

10264 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

10265

10157 -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16

10266 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

10267 #: builtin/repack.c:306 builtin/stash.c:816

10268 msgid "be quiet"

10269 msgstr "être silencieux"

@@ -10210,7 +10319,7 @@ msgstr "n"

10319

10320 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38

10321 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

10213 -#: bugreport.c:131

10322 +#: bugreport.c:137

10323 msgid "format"

10324 msgstr "format"

10325

@@ -10511,112 +10620,116 @@ msgstr ""

10620 "Les options supportées sont : --term-good|--term-old et --term-bad|--term-"

10621 "new."

10622

10514 -#: builtin/bisect--helper.c:478

10623 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473

10624 +msgid "'' is not a valid term"

10625 +msgstr "'' n'est pas un terme valide"

10626 +

10627 +#: builtin/bisect--helper.c:483

10628 #, c-format

10629 msgid "unrecognized option: '%s'"

10517 -msgstr "option non reconnue : %s"

10630 +msgstr "option non reconnue : '%s'"

10631

10519 -#: builtin/bisect--helper.c:482

10632 +#: builtin/bisect--helper.c:487

10633 #, c-format

10634 msgid "'%s' does not appear to be a valid revision"

10635 msgstr "'%s' ne semble être une révision valide"

10636

10524 -#: builtin/bisect--helper.c:514

10637 +#: builtin/bisect--helper.c:519

10638 msgid "bad HEAD - I need a HEAD"

10639 msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"

10640

10528 -#: builtin/bisect--helper.c:529

10641 +#: builtin/bisect--helper.c:534

10642 #, c-format

10643 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

10644 msgstr ""

10645 "L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."

10646

10534 -#: builtin/bisect--helper.c:550

10647 +#: builtin/bisect--helper.c:555

10648 msgid "won't bisect on cg-seek'ed tree"

10649 msgstr "refus de bissecter sur un arbre 'cg-seeked'"

10650

10538 -#: builtin/bisect--helper.c:553

10651 +#: builtin/bisect--helper.c:558

10652 msgid "bad HEAD - strange symbolic ref"

10653 msgstr "mauvaise HEAD - référence symbolique douteuse"

10654

10542 -#: builtin/bisect--helper.c:577

10655 +#: builtin/bisect--helper.c:582

10656 #, c-format

10657 msgid "invalid ref: '%s'"

10658 msgstr "réference invalide : '%s'"

10659

10547 -#: builtin/bisect--helper.c:633

10660 +#: builtin/bisect--helper.c:638

10661 msgid "perform 'git bisect next'"

10662 msgstr "effectuer 'git bisect next'"

10663

10551 -#: builtin/bisect--helper.c:635

10664 +#: builtin/bisect--helper.c:640

10665 msgid "write the terms to .git/BISECT_TERMS"

10666 msgstr "écrire les termes dans .git/BISECT_TERMS"

10667

10555 -#: builtin/bisect--helper.c:637

10668 +#: builtin/bisect--helper.c:642

10669 msgid "cleanup the bisection state"

10670 msgstr "vérifier l'état de la bissection"

10671

10559 -#: builtin/bisect--helper.c:639

10672 +#: builtin/bisect--helper.c:644

10673 msgid "check for expected revs"

10674 msgstr "vérifier si des révisions sont attendues"

10675

10563 -#: builtin/bisect--helper.c:641

10676 +#: builtin/bisect--helper.c:646

10677 msgid "reset the bisection state"

10678 msgstr "réinitialiser l'état de la bissection"

10679

10567 -#: builtin/bisect--helper.c:643

10680 +#: builtin/bisect--helper.c:648

10681 msgid "write out the bisection state in BISECT_LOG"

10682 msgstr "écrire l'état de la bissection dans BISECT_LOG"

10683

10571 -#: builtin/bisect--helper.c:645

10684 +#: builtin/bisect--helper.c:650

10685 msgid "check and set terms in a bisection state"

10686 msgstr "vérifier et régler les termes dans un état de la bissection"

10687

10575 -#: builtin/bisect--helper.c:647

10688 +#: builtin/bisect--helper.c:652

10689 msgid "check whether bad or good terms exist"

10690 msgstr "vérifier si les termes bons ou mauvais existent"

10691

10579 -#: builtin/bisect--helper.c:649

10692 +#: builtin/bisect--helper.c:654

10693 msgid "print out the bisect terms"

10694 msgstr "afficher les termes de bissection"

10695

10583 -#: builtin/bisect--helper.c:651

10696 +#: builtin/bisect--helper.c:656

10697 msgid "start the bisect session"

10698 msgstr "démarrer une session de bissection"

10699

10587 -#: builtin/bisect--helper.c:653

10700 +#: builtin/bisect--helper.c:658

10701 msgid "update BISECT_HEAD instead of checking out the current commit"

10702 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"

10703

10591 -#: builtin/bisect--helper.c:655

10704 +#: builtin/bisect--helper.c:660

10705 msgid "no log for BISECT_WRITE"

10706 msgstr "pas de journal pour BISECT_WRITE"

10707

10595 -#: builtin/bisect--helper.c:673

10708 +#: builtin/bisect--helper.c:678

10709 msgid "--write-terms requires two arguments"

10710 msgstr "--write-terms exige deux arguments"

10711

10599 -#: builtin/bisect--helper.c:677

10712 +#: builtin/bisect--helper.c:682

10713 msgid "--bisect-clean-state requires no arguments"

10714 msgstr "--bisect-clean-state ne supporte aucun argument"

10715

10603 -#: builtin/bisect--helper.c:684

10716 +#: builtin/bisect--helper.c:689

10717 msgid "--bisect-reset requires either no argument or a commit"

10718 msgstr "--bisect-reset supporte soit aucun argument, soit un commit"

10719

10607 -#: builtin/bisect--helper.c:688

10720 +#: builtin/bisect--helper.c:693

10721 msgid "--bisect-write requires either 4 or 5 arguments"

10722 msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"

10723

10611 -#: builtin/bisect--helper.c:694

10724 +#: builtin/bisect--helper.c:699

10725 msgid "--check-and-set-terms requires 3 arguments"

10726 msgstr "--check-and-set-terms exige 3 arguments"

10727

10615 -#: builtin/bisect--helper.c:700

10728 +#: builtin/bisect--helper.c:705

10729 msgid "--bisect-next-check requires 2 or 3 arguments"

10730 msgstr "--bisect-next-check exige 2 ou 3 arguments"

10731

10619 -#: builtin/bisect--helper.c:706

10732 +#: builtin/bisect--helper.c:711

10733 msgid "--bisect-terms requires 0 or 1 argument"

10734 msgstr "--bisect-terms exige 0 ou 1 argument"

10735

@@ -11233,19 +11346,19 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]"

11346 msgid "git bundle unbundle <file> [<refname>...]"

11347 msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"

11348

11236 -#: builtin/bundle.c:66 builtin/pack-objects.c:3376

11349 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448

11350 msgid "do not show progress meter"

11351 msgstr "ne pas afficher la barre de progression"

11352

11240 -#: builtin/bundle.c:68 builtin/pack-objects.c:3378

11353 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450

11354 msgid "show progress meter"

11355 msgstr "afficher la barre de progression"

11356

11244 -#: builtin/bundle.c:70 builtin/pack-objects.c:3380

11357 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452

11358 msgid "show progress meter during object writing phase"

11359 msgstr "afficher la barre de progression durant la phase d'écrite des objets"

11360

11248 -#: builtin/bundle.c:73 builtin/pack-objects.c:3383

11361 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455

11362 msgid "similar to --all-progress when progress meter is shown"

11363 msgstr "similaire à --all-progress quand la barre de progression est affichée"

11364

@@ -11285,11 +11398,9 @@ msgstr ""

11398

11399 #: builtin/cat-file.c:599

11400 msgid ""

11288 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11289 -"filters]"

11290 -msgstr ""

11291 -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

11292 -"filters]"

11401 +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"

11402 +"symlinks] [--textconv | --filters]"

11403 +msgstr "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"

11404

11405 #: builtin/cat-file.c:620

11406 msgid "only one batch option may be specified"

@@ -11323,7 +11434,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

11434 msgid "for blob objects, run filters on object's content"

11435 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"

11436

11326 -#: builtin/cat-file.c:648 git-submodule.sh:984

11437 +#: builtin/cat-file.c:648 git-submodule.sh:958

11438 msgid "blob"

11439 msgstr "blob"

11440

@@ -11387,8 +11498,8 @@ msgid "terminate input and output records by a NUL character"

11498 msgstr ""

11499 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

11500

11390 -#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537

11391 -#: builtin/worktree.c:502

11501 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537

11502 +#: builtin/worktree.c:561

11503 msgid "suppress progress reporting"

11504 msgstr "supprimer l'état d'avancement"

11505

@@ -11482,7 +11593,7 @@ msgstr "écrire le contenu dans des fichiers temporaires"

11593 #: builtin/checkout-index.c:178 builtin/column.c:31

11594 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403

11595 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

11485 -#: builtin/worktree.c:675

11596 +#: builtin/worktree.c:754

11597 msgid "string"

11598 msgstr "chaîne"

11599

@@ -11599,11 +11710,11 @@ msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"

11710 msgid "path '%s' is unmerged"

11711 msgstr "le chemin '%s' n'est pas fusionné"

11712

11602 -#: builtin/checkout.c:704

11713 +#: builtin/checkout.c:702

11714 msgid "you need to resolve your current index first"

11715 msgstr "vous devez d'abord résoudre votre index courant"

11716

11606 -#: builtin/checkout.c:758

11717 +#: builtin/checkout.c:756

11718 #, c-format

11719 msgid ""

11720 "cannot continue with staged changes in the following files:\n"

@@ -11613,50 +11724,50 @@ msgstr ""

11724 "suivants :\n"

11725 "%s"

11726

11616 -#: builtin/checkout.c:861

11727 +#: builtin/checkout.c:859

11728 #, c-format

11729 msgid "Can not do reflog for '%s': %s\n"

11730 msgstr "Impossible de faire un reflog pour '%s' : %s\n"

11731

11621 -#: builtin/checkout.c:903

11732 +#: builtin/checkout.c:901

11733 msgid "HEAD is now at"

11734 msgstr "HEAD est maintenant sur"

11735

11625 -#: builtin/checkout.c:907 builtin/clone.c:720

11736 +#: builtin/checkout.c:905 builtin/clone.c:720

11737 msgid "unable to update HEAD"

11738 msgstr "impossible de mettre à jour HEAD"

11739

11629 -#: builtin/checkout.c:911

11740 +#: builtin/checkout.c:909

11741 #, c-format

11742 msgid "Reset branch '%s'\n"

11743 msgstr "Remise à zéro de la branche '%s'\n"

11744

11634 -#: builtin/checkout.c:914

11745 +#: builtin/checkout.c:912

11746 #, c-format

11747 msgid "Already on '%s'\n"

11748 msgstr "Déjà sur '%s'\n"

11749

11639 -#: builtin/checkout.c:918

11750 +#: builtin/checkout.c:916

11751 #, c-format

11752 msgid "Switched to and reset branch '%s'\n"

11753 msgstr "Basculement et remise à zéro de la branche '%s'\n"

11754

11644 -#: builtin/checkout.c:920 builtin/checkout.c:1344

11755 +#: builtin/checkout.c:918 builtin/checkout.c:1342

11756 #, c-format

11757 msgid "Switched to a new branch '%s'\n"

11758 msgstr "Basculement sur la nouvelle branche '%s'\n"

11759

11649 -#: builtin/checkout.c:922

11760 +#: builtin/checkout.c:920

11761 #, c-format

11762 msgid "Switched to branch '%s'\n"

11763 msgstr "Basculement sur la branche '%s'\n"

11764

11654 -#: builtin/checkout.c:973

11765 +#: builtin/checkout.c:971

11766 #, c-format

11767 msgid " ... and %d more.\n"

11768 msgstr " ... et %d en plus.\n"

11769

11659 -#: builtin/checkout.c:979

11770 +#: builtin/checkout.c:977

11771 #, c-format

11772 msgid ""

11773 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -11679,7 +11790,7 @@ msgstr[1] ""

11790 "\n"

11791 "%s\n"

11792

11682 -#: builtin/checkout.c:998

11793 +#: builtin/checkout.c:996

11794 #, c-format

11795 msgid ""

11796 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -11708,19 +11819,19 @@ msgstr[1] ""

11819 "git branch <nouvelle-branche> %s\n"

11820 "\n"

11821

11711 -#: builtin/checkout.c:1033

11822 +#: builtin/checkout.c:1031

11823 msgid "internal error in revision walk"

11824 msgstr "erreur interne lors du parcours des révisions"

11825

11715 -#: builtin/checkout.c:1037

11826 +#: builtin/checkout.c:1035

11827 msgid "Previous HEAD position was"

11828 msgstr "La position précédente de HEAD était sur"

11829

11719 -#: builtin/checkout.c:1077 builtin/checkout.c:1339

11830 +#: builtin/checkout.c:1075 builtin/checkout.c:1337

11831 msgid "You are on a branch yet to be born"

11832 msgstr "Vous êtes sur une branche qui doit encore naître"

11833

11723 -#: builtin/checkout.c:1152

11834 +#: builtin/checkout.c:1150

11835 #, c-format

11836 msgid ""

11837 "'%s' could be both a local file and a tracking branch.\n"

@@ -11729,7 +11840,7 @@ msgstr ""

11840 "'%s' pourrait être un fichier local ou un branche de suivi.\n"

11841 "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"

11842

11732 -#: builtin/checkout.c:1159

11843 +#: builtin/checkout.c:1157

11844 msgid ""

11845 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

11846 "you can do so by fully qualifying the name with the --track option:\n"

@@ -11749,51 +11860,51 @@ msgstr ""

11860 "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"

11861 "votre config."

11862

11752 -#: builtin/checkout.c:1169

11863 +#: builtin/checkout.c:1167

11864 #, c-format

11865 msgid "'%s' matched multiple (%d) remote tracking branches"

11866 msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"

11867

11757 -#: builtin/checkout.c:1235

11868 +#: builtin/checkout.c:1233

11869 msgid "only one reference expected"

11870 msgstr "une seule référence attendue"

11871

11761 -#: builtin/checkout.c:1252

11872 +#: builtin/checkout.c:1250

11873 #, c-format

11874 msgid "only one reference expected, %d given."

11875 msgstr "une seule référence attendue, %d fournies."

11876

11766 -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451

11877 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

11878 #, c-format

11879 msgid "invalid reference: %s"

11880 msgstr "référence invalide : %s"

11881

11771 -#: builtin/checkout.c:1311 builtin/checkout.c:1677

11882 +#: builtin/checkout.c:1309 builtin/checkout.c:1675

11883 #, c-format

11884 msgid "reference is not a tree: %s"

11885 msgstr "la référence n'est pas un arbre : %s"

11886

11776 -#: builtin/checkout.c:1358

11887 +#: builtin/checkout.c:1356

11888 #, c-format

11889 msgid "a branch is expected, got tag '%s'"

11890 msgstr "branche attendue, mais étiquette '%s' reçue"

11891

11781 -#: builtin/checkout.c:1360

11892 +#: builtin/checkout.c:1358

11893 #, c-format

11894 msgid "a branch is expected, got remote branch '%s'"

11895 msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"

11896

11786 -#: builtin/checkout.c:1361 builtin/checkout.c:1369

11897 +#: builtin/checkout.c:1359 builtin/checkout.c:1367

11898 #, c-format

11899 msgid "a branch is expected, got '%s'"

11900 msgstr "une branche est attendue, mais '%s' a été reçue"

11901

11791 -#: builtin/checkout.c:1364

11902 +#: builtin/checkout.c:1362

11903 #, c-format

11904 msgid "a branch is expected, got commit '%s'"

11905 msgstr "une branche est attendue, mais un commit '%s' a été reçu"

11906

11796 -#: builtin/checkout.c:1380

11907 +#: builtin/checkout.c:1378

11908 msgid ""

11909 "cannot switch branch while merging\n"

11910 "Consider \"git merge --quit\" or \"git worktree add\"."

@@ -11801,7 +11912,7 @@ msgstr ""

11912 "impossible de basculer de branche pendant une fusion\n"

11913 "Envisagez \"git merge --quit\" ou \"git worktree add\"."

11914

11804 -#: builtin/checkout.c:1384

11915 +#: builtin/checkout.c:1382

11916 msgid ""

11917 "cannot switch branch in the middle of an am session\n"

11918 "Consider \"git am --quit\" or \"git worktree add\"."

@@ -11809,7 +11920,7 @@ msgstr ""

11920 "impossible de basculer de branche pendant une session am\n"

11921 "Envisagez \"git am --quit\" ou \"git worktree add\"."

11922

11812 -#: builtin/checkout.c:1388

11923 +#: builtin/checkout.c:1386

11924 msgid ""

11925 "cannot switch branch while rebasing\n"

11926 "Consider \"git rebase --quit\" or \"git worktree add\"."

@@ -11817,7 +11928,7 @@ msgstr ""

11928 "impossible de basculer de branche pendant un rebasage\n"

11929 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."

11930

11820 -#: builtin/checkout.c:1392

11931 +#: builtin/checkout.c:1390

11932 msgid ""

11933 "cannot switch branch while cherry-picking\n"

11934 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

@@ -11825,7 +11936,7 @@ msgstr ""

11936 "impossible de basculer de branche pendant un picorage\n"

11937 "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."

11938

11828 -#: builtin/checkout.c:1396

11939 +#: builtin/checkout.c:1394

11940 msgid ""

11941 "cannot switch branch while reverting\n"

11942 "Consider \"git revert --quit\" or \"git worktree add\"."

@@ -11833,146 +11944,146 @@ msgstr ""

11944 "impossible de basculer de branche pendant un retour\n"

11945 "Envisagez \"git revert --quit\" ou \"git worktree add\"."

11946

11836 -#: builtin/checkout.c:1400

11947 +#: builtin/checkout.c:1398

11948 msgid "you are switching branch while bisecting"

11949 msgstr "Vous basculez de branche en cours de bissection"

11950

11840 -#: builtin/checkout.c:1407

11951 +#: builtin/checkout.c:1405

11952 msgid "paths cannot be used with switching branches"

11953 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

11954

11844 -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418

11955 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

11956 #, c-format

11957 msgid "'%s' cannot be used with switching branches"

11958 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

11959

11849 -#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428

11850 -#: builtin/checkout.c:1433 builtin/checkout.c:1438

11960 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426

11961 +#: builtin/checkout.c:1431 builtin/checkout.c:1436

11962 #, c-format

11963 msgid "'%s' cannot be used with '%s'"

11964 msgstr "'%s' ne peut pas être utilisé avec '%s'"

11965

11855 -#: builtin/checkout.c:1435

11966 +#: builtin/checkout.c:1433

11967 #, c-format

11968 msgid "'%s' cannot take <start-point>"

11969 msgstr "'%s' n'accepte pas <point-de-départ>"

11970

11860 -#: builtin/checkout.c:1443

11971 +#: builtin/checkout.c:1441

11972 #, c-format

11973 msgid "Cannot switch branch to a non-commit '%s'"

11974 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

11975

11865 -#: builtin/checkout.c:1450

11976 +#: builtin/checkout.c:1448

11977 msgid "missing branch or commit argument"

11978 msgstr "argument de branche ou de commit manquant"

11979

11869 -#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80

11870 -#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288

11980 +#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82

11981 +#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

11982 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561

11983 #: builtin/send-pack.c:173

11984 msgid "force progress reporting"

11985 msgstr "forcer l'affichage de l'état d'avancement"

11986

11876 -#: builtin/checkout.c:1493

11987 +#: builtin/checkout.c:1491

11988 msgid "perform a 3-way merge with the new branch"

11989 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

11990

11880 -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322

11991 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

11992 msgid "style"

11993 msgstr "style"

11994

11884 -#: builtin/checkout.c:1495

11995 +#: builtin/checkout.c:1493

11996 msgid "conflict style (merge or diff3)"

11997 msgstr "style de conflit (merge (fusion) ou diff3)"

11998

11888 -#: builtin/checkout.c:1507 builtin/worktree.c:499

11999 +#: builtin/checkout.c:1505 builtin/worktree.c:558

12000 msgid "detach HEAD at named commit"

12001 msgstr "détacher la HEAD au commit nommé"

12002

11892 -#: builtin/checkout.c:1508

12003 +#: builtin/checkout.c:1506

12004 msgid "set upstream info for new branch"

12005 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

12006

11896 -#: builtin/checkout.c:1510

12007 +#: builtin/checkout.c:1508

12008 msgid "force checkout (throw away local modifications)"

12009 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

12010

11900 -#: builtin/checkout.c:1512

12011 +#: builtin/checkout.c:1510

12012 msgid "new-branch"

12013 msgstr "nouvelle branche"

12014

11904 -#: builtin/checkout.c:1512

12015 +#: builtin/checkout.c:1510

12016 msgid "new unparented branch"

12017 msgstr "nouvelle branche sans parent"

12018

11908 -#: builtin/checkout.c:1514 builtin/merge.c:292

12019 +#: builtin/checkout.c:1512 builtin/merge.c:292

12020 msgid "update ignored files (default)"

12021 msgstr "mettre à jour les fichiers ignorés (par défaut)"

12022

11912 -#: builtin/checkout.c:1517

12023 +#: builtin/checkout.c:1515

12024 msgid "do not check if another worktree is holding the given ref"

12025 msgstr ""

12026 "ne pas vérifier si une autre copie de travail contient le référence fournie"

12027

11917 -#: builtin/checkout.c:1530

12028 +#: builtin/checkout.c:1528

12029 msgid "checkout our version for unmerged files"

12030 msgstr "extraire notre version pour les fichiers non fusionnés"

12031

11921 -#: builtin/checkout.c:1533

12032 +#: builtin/checkout.c:1531

12033 msgid "checkout their version for unmerged files"

12034 msgstr "extraire leur version pour les fichiers non fusionnés"

12035

11925 -#: builtin/checkout.c:1537

12036 +#: builtin/checkout.c:1535

12037 msgid "do not limit pathspecs to sparse entries only"

12038 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

12039

11929 -#: builtin/checkout.c:1592

12040 +#: builtin/checkout.c:1590

12041 #, c-format

12042 msgid "-%c, -%c and --orphan are mutually exclusive"

12043 msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"

12044

11934 -#: builtin/checkout.c:1596

12045 +#: builtin/checkout.c:1594

12046 msgid "-p and --overlay are mutually exclusive"

12047 msgstr "-p et --overlay sont mutuellement exclusifs"

12048

11938 -#: builtin/checkout.c:1633

12049 +#: builtin/checkout.c:1631

12050 msgid "--track needs a branch name"

12051 msgstr "--track requiert un nom de branche"

12052

11942 -#: builtin/checkout.c:1638

12053 +#: builtin/checkout.c:1636

12054 #, c-format

12055 msgid "missing branch name; try -%c"

12056 msgstr "nom de branche manquant ; essayez -%c"

12057

11947 -#: builtin/checkout.c:1670

12058 +#: builtin/checkout.c:1668

12059 #, c-format

12060 msgid "could not resolve %s"

12061 msgstr "impossible de résoudre %s"

12062

11952 -#: builtin/checkout.c:1686

12063 +#: builtin/checkout.c:1684

12064 msgid "invalid path specification"

12065 msgstr "spécification de chemin invalide"

12066

11956 -#: builtin/checkout.c:1693

12067 +#: builtin/checkout.c:1691

12068 #, c-format

12069 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

12070 msgstr ""

12071 "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"

12072

11962 -#: builtin/checkout.c:1697

12073 +#: builtin/checkout.c:1695

12074 #, c-format

12075 msgid "git checkout: --detach does not take a path argument '%s'"

12076 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

12077

11967 -#: builtin/checkout.c:1706

12078 +#: builtin/checkout.c:1704

12079 msgid "--pathspec-from-file is incompatible with --detach"

12080 msgstr "--pathspec-from-file est incompatible avec --detach"

12081

11971 -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503

12082 +#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

12083 msgid "--pathspec-from-file is incompatible with --patch"

12084 msgstr "--pathspec-from-file est incompatible avec --patch"

12085

11975 -#: builtin/checkout.c:1720

12086 +#: builtin/checkout.c:1718

12087 msgid ""

12088 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

12089 "checking out of the index."

@@ -11980,70 +12091,71 @@ msgstr ""

12091 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"

12092 "de l'extraction de l'index."

12093

11983 -#: builtin/checkout.c:1725

12094 +#: builtin/checkout.c:1723

12095 msgid "you must specify path(s) to restore"

12096 msgstr "Vous devez spécifier un ou des chemins à restaurer"

12097

11987 -#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802

11988 -#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170

11989 -#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497

12098 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800

12099 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170

12100 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554

12101 +#: builtin/worktree.c:556

12102 msgid "branch"

12103 msgstr "branche"

12104

11993 -#: builtin/checkout.c:1752

12105 +#: builtin/checkout.c:1750

12106 msgid "create and checkout a new branch"

12107 msgstr "créer et extraire une nouvelle branche"

12108

11997 -#: builtin/checkout.c:1754

12109 +#: builtin/checkout.c:1752

12110 msgid "create/reset and checkout a branch"

12111 msgstr "créer/réinitialiser et extraire une branche"

12112

12001 -#: builtin/checkout.c:1755

12113 +#: builtin/checkout.c:1753

12114 msgid "create reflog for new branch"

12115 msgstr "créer un reflog pour une nouvelle branche"

12116

12005 -#: builtin/checkout.c:1757

12117 +#: builtin/checkout.c:1755

12118 msgid "second guess 'git checkout <no-such-branch>' (default)"

12119 msgstr ""

12120 "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"

12121

12010 -#: builtin/checkout.c:1758

12122 +#: builtin/checkout.c:1756

12123 msgid "use overlay mode (default)"

12124 msgstr "utiliser le mode de superposition (défaut)"

12125

12014 -#: builtin/checkout.c:1803

12126 +#: builtin/checkout.c:1801

12127 msgid "create and switch to a new branch"

12128 msgstr "créer et basculer sur une nouvelle branche"

12129

12018 -#: builtin/checkout.c:1805

12130 +#: builtin/checkout.c:1803

12131 msgid "create/reset and switch to a branch"

12132 msgstr "créer/réinitialiser et basculer sur une branche"

12133

12022 -#: builtin/checkout.c:1807

12134 +#: builtin/checkout.c:1805

12135 msgid "second guess 'git switch <no-such-branch>'"

12136 msgstr "interpréter 'git switch <branche-inexistante>'"

12137

12026 -#: builtin/checkout.c:1809

12138 +#: builtin/checkout.c:1807

12139 msgid "throw away local modifications"

12140 msgstr "laisser tomber les modifications locales"

12141

12030 -#: builtin/checkout.c:1843

12142 +#: builtin/checkout.c:1841

12143 msgid "which tree-ish to checkout from"

12144 msgstr "de quel <arbre-esque> faire l'extraction"

12145

12034 -#: builtin/checkout.c:1845

12146 +#: builtin/checkout.c:1843

12147 msgid "restore the index"

12148 msgstr "restaurer l'index"

12149

12038 -#: builtin/checkout.c:1847

12150 +#: builtin/checkout.c:1845

12151 msgid "restore the working tree (default)"

12152 msgstr "restaurer l'arbre de travail (par défaut)"

12153

12042 -#: builtin/checkout.c:1849

12154 +#: builtin/checkout.c:1847

12155 msgid "ignore unmerged entries"

12156 msgstr "ignorer les entrées non-fusionnées"

12157

12046 -#: builtin/checkout.c:1850

12158 +#: builtin/checkout.c:1848

12159 msgid "use overlay mode"

12160 msgstr "utiliser le mode de superposition"

12161

@@ -12206,11 +12318,7 @@ msgstr "supprimer les fichiers ignorés, aussi"

12318 msgid "remove only ignored files"

12319 msgstr "supprimer seulement les fichiers ignorés"

12320

12209 -#: builtin/clean.c:931

12210 -msgid "-x and -X cannot be used together"

12211 -msgstr "-x et -X ne peuvent pas être utilisés ensemble"

12212 -

12213 -#: builtin/clean.c:935

12321 +#: builtin/clean.c:929

12322 msgid ""

12323 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

12324 "clean"

@@ -12218,7 +12326,7 @@ msgstr ""

12326 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

12327 "nettoyer"

12328

12221 -#: builtin/clean.c:938

12329 +#: builtin/clean.c:932

12330 msgid ""

12331 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

12332 "refusing to clean"

@@ -12226,6 +12334,10 @@ msgstr ""

12334 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "

12335 "nettoyer"

12336

12337 +#: builtin/clean.c:944

12338 +msgid "-x and -X cannot be used together"

12339 +msgstr "-x et -X ne peuvent pas être utilisés ensemble"

12340 +

12341 #: builtin/clone.c:45

12342 msgid "git clone [<options>] [--] <repo> [<dir>]"

12343 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

@@ -12234,7 +12346,7 @@ msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

12346 msgid "don't create a checkout"

12347 msgstr "ne pas créer d'extraction"

12348

12237 -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536

12349 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

12350 msgid "create a bare repository"

12351 msgstr "créer un dépôt nu"

12352

@@ -12266,11 +12378,11 @@ msgstr "initialiser les sous-modules dans le clone"

12378 msgid "number of submodules cloned in parallel"

12379 msgstr "nombre de sous-modules clonés en parallèle"

12380

12269 -#: builtin/clone.c:111 builtin/init-db.c:533

12381 +#: builtin/clone.c:111 builtin/init-db.c:551

12382 msgid "template-directory"

12383 msgstr "répertoire-modèle"

12384

12273 -#: builtin/clone.c:112 builtin/init-db.c:534

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

12386 msgid "directory from which templates will be used"

12387 msgstr "répertoire depuis lequel les modèles vont être utilisés"

12388

@@ -12284,8 +12396,8 @@ msgstr "dépôt de référence"

12396 msgid "use --reference only while cloning"

12397 msgstr "utiliser seulement --reference pour cloner"

12398

12287 -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46

12288 -#: builtin/pack-objects.c:3442 builtin/repack.c:329

12399 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562

12400 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

12401 msgid "name"

12402 msgstr "nom"

12403

@@ -12310,7 +12422,7 @@ msgstr "profondeur"

12422 msgid "create a shallow clone of that depth"

12423 msgstr "créer un clone superficiel de cette profondeur"

12424

12313 -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431

12425 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

12426 #: builtin/pull.c:211

12427 msgid "time"

12428 msgstr "heure"

@@ -12344,11 +12456,11 @@ msgstr ""

12456 msgid "any cloned submodules will be shallow"

12457 msgstr "tous les sous-modules clonés seront superficiels"

12458

12347 -#: builtin/clone.c:137 builtin/init-db.c:542

12459 +#: builtin/clone.c:137 builtin/init-db.c:560

12460 msgid "gitdir"

12461 msgstr "gitdir"

12462

12351 -#: builtin/clone.c:138 builtin/init-db.c:543

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

12464 msgid "separate git dir from working tree"

12465 msgstr "séparer le répertoire git de la copie de travail"

12466

@@ -12480,7 +12592,7 @@ msgstr "impossible de remballer pour nettoyer"

12592 msgid "cannot unlink temporary alternates file"

12593 msgstr "impossible de délier le fichier temporaire alternates"

12594

12483 -#: builtin/clone.c:971 builtin/receive-pack.c:1972

12595 +#: builtin/clone.c:971 builtin/receive-pack.c:1982

12596 msgid "Too many arguments."

12597 msgstr "Trop d'arguments."

12598

@@ -12497,49 +12609,49 @@ msgstr "les options --bare et --origin %s sont incompatibles."

12609 msgid "--bare and --separate-git-dir are incompatible."

12610 msgstr "--bare et --separate-git-dir sont incompatibles."

12611

12500 -#: builtin/clone.c:1004

12612 +#: builtin/clone.c:1007

12613 #, c-format

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

12615 msgstr "le dépôt '%s' n'existe pas"

12616

12505 -#: builtin/clone.c:1010 builtin/fetch.c:1789

12617 +#: builtin/clone.c:1011 builtin/fetch.c:1794

12618 #, c-format

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

12620 msgstr "la profondeur %s n'est pas un entier positif"

12621

12510 -#: builtin/clone.c:1020

12622 +#: builtin/clone.c:1021

12623 #, c-format

12624 msgid "destination path '%s' already exists and is not an empty directory."

12625 msgstr ""

12626 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

12627

12516 -#: builtin/clone.c:1030

12628 +#: builtin/clone.c:1033

12629 #, c-format

12630 msgid "working tree '%s' already exists."

12631 msgstr "la copie de travail '%s' existe déjà."

12632

12521 -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271

12522 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327

12633 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271

12634 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

12635 #, c-format

12636 msgid "could not create leading directories of '%s'"

12637 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

12638

12527 -#: builtin/clone.c:1050

12639 +#: builtin/clone.c:1053

12640 #, c-format

12641 msgid "could not create work tree dir '%s'"

12642 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

12643

12532 -#: builtin/clone.c:1070

12644 +#: builtin/clone.c:1073

12645 #, c-format

12646 msgid "Cloning into bare repository '%s'...\n"

12647 msgstr "Clonage dans le dépôt nu '%s'\n"

12648

12537 -#: builtin/clone.c:1072

12649 +#: builtin/clone.c:1075

12650 #, c-format

12651 msgid "Cloning into '%s'...\n"

12652 msgstr "Clonage dans '%s'...\n"

12653

12542 -#: builtin/clone.c:1096

12654 +#: builtin/clone.c:1099

12655 msgid ""

12656 "clone --recursive is not compatible with both --reference and --reference-if-"

12657 "able"

@@ -12547,41 +12659,41 @@ msgstr ""

12659 "clone --recursive n'est pas compatible avec à la fois --reference et --"

12660 "reference-if-able"

12661

12550 -#: builtin/clone.c:1160

12662 +#: builtin/clone.c:1164

12663 msgid "--depth is ignored in local clones; use file:// instead."

12664 msgstr ""

12665 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

12666

12555 -#: builtin/clone.c:1162

12667 +#: builtin/clone.c:1166

12668 msgid "--shallow-since is ignored in local clones; use file:// instead."

12669 msgstr ""

12670 "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"

12671 "\"."

12672

12561 -#: builtin/clone.c:1164

12673 +#: builtin/clone.c:1168

12674 msgid "--shallow-exclude is ignored in local clones; use file:// instead."

12675 msgstr ""

12676 "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "

12677 "\"file://\"."

12678

12567 -#: builtin/clone.c:1166

12679 +#: builtin/clone.c:1170

12680 msgid "--filter is ignored in local clones; use file:// instead."

12681 msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."

12682

12571 -#: builtin/clone.c:1169

12683 +#: builtin/clone.c:1173

12684 msgid "source repository is shallow, ignoring --local"

12685 msgstr "le dépôt source est superficiel, option --local ignorée"

12686

12575 -#: builtin/clone.c:1174

12687 +#: builtin/clone.c:1178

12688 msgid "--local is ignored"

12689 msgstr "--local est ignoré"

12690

12579 -#: builtin/clone.c:1249 builtin/clone.c:1257

12691 +#: builtin/clone.c:1262 builtin/clone.c:1270

12692 #, c-format

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

12694 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

12695

12584 -#: builtin/clone.c:1260

12696 +#: builtin/clone.c:1273

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

12698 msgstr "Vous semblez avoir cloné un dépôt vide."

12699

@@ -12617,95 +12729,107 @@ msgstr "Remplissage d'espace entre les colonnes"

12729 msgid "--command must be the first argument"

12730 msgstr "--command doit être le premier argument"

12731

12620 -#: builtin/commit-graph.c:11 builtin/commit-graph.c:19

12732 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

12733 msgid ""

12734 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12735 msgstr ""

12736 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

12737

12626 -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24

12738 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

12739 msgid ""

12740 "git commit-graph write [--object-dir <objdir>] [--append] [--"

12741 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

12742 "paths] [--[no-]progress] <split options>"

12631 -msgstr "git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--[no-]progress] <options de division>"

12743 +msgstr ""

12744 +"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--"

12745 +"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

12746 +"paths] [--[no-]progress] <options de division>"

12747

12633 -#: builtin/commit-graph.c:60

12748 +#: builtin/commit-graph.c:62

12749 #, c-format

12750 msgid "could not find object directory matching %s"

12751 msgstr "impossible de trouver le répertoire objet correspondant à %s"

12752

12638 -#: builtin/commit-graph.c:76 builtin/commit-graph.c:152

12639 -#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678

12753 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177

12754 +#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

12755 msgid "dir"

12756 msgstr "répertoire"

12757

12643 -#: builtin/commit-graph.c:77 builtin/commit-graph.c:153

12644 -#: builtin/commit-graph.c:258

12758 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178

12759 +#: builtin/commit-graph.c:277

12760 msgid "The object directory to store the graph"

12761 msgstr "Le répertoire d'objet où stocker le graphe"

12762

12648 -#: builtin/commit-graph.c:79

12763 +#: builtin/commit-graph.c:81

12764 msgid "if the commit-graph is split, only verify the tip file"

12765 msgstr ""

12766 "si le graphe de commit est divisé, vérifier seulement le fichier sommet"

12767

12653 -#: builtin/commit-graph.c:102

12768 +#: builtin/commit-graph.c:104

12769 #, c-format

12770 msgid "Could not open commit-graph '%s'"

12771 msgstr "impossible d'ouvrir le graphe de commit '%s'"

12772

12658 -#: builtin/commit-graph.c:136

12773 +#: builtin/commit-graph.c:138

12774 #, c-format

12775 msgid "unrecognized --split argument, %s"

12776 msgstr "argument de --split non reconnu, %s"

12777

12663 -#: builtin/commit-graph.c:155

12778 +#: builtin/commit-graph.c:151

12779 +#, c-format

12780 +msgid "unexpected non-hex object ID: %s"

12781 +msgstr "ID d'objet non hexadécimal inattendu : %s"

12782 +

12783 +#: builtin/commit-graph.c:156

12784 +#, c-format

12785 +msgid "invalid object: %s"

12786 +msgstr "objet invalide : %s"

12787 +

12788 +#: builtin/commit-graph.c:180

12789 msgid "start walk at all refs"

12790 msgstr "commencer le parcours à toutes les réfs"

12791

12667 -#: builtin/commit-graph.c:157

12792 +#: builtin/commit-graph.c:182

12793 msgid "scan pack-indexes listed by stdin for commits"

12794 msgstr "scanner les index compactés listés sur stdin à la recherche de commits"

12795

12671 -#: builtin/commit-graph.c:159

12796 +#: builtin/commit-graph.c:184

12797 msgid "start walk at commits listed by stdin"

12798 msgstr "commencer le parcours aux commits listés sur stdin"

12799

12675 -#: builtin/commit-graph.c:161

12800 +#: builtin/commit-graph.c:186

12801 msgid "include all commits already in the commit-graph file"

12802 msgstr ""

12803 "inclure tous les commits déjà présents dans le fichier de graphe de commits"

12804

12680 -#: builtin/commit-graph.c:163

12805 +#: builtin/commit-graph.c:188

12806 msgid "enable computation for changed paths"

12807 msgstr "activer le calcul pour les chemins modifiés"

12808

12684 -#: builtin/commit-graph.c:166

12809 +#: builtin/commit-graph.c:191

12810 msgid "allow writing an incremental commit-graph file"

12811 msgstr "permettre d'écrire un fichier incrémental de graphe de commit"

12812

12688 -#: builtin/commit-graph.c:170

12813 +#: builtin/commit-graph.c:195

12814 msgid "maximum number of commits in a non-base split commit-graph"

12815 msgstr ""

12816 "le nombre maximum de commits dans un graphe de commit divisé pas de base"

12817

12693 -#: builtin/commit-graph.c:172

12818 +#: builtin/commit-graph.c:197

12819 msgid "maximum ratio between two levels of a split commit-graph"

12820 msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"

12821

12697 -#: builtin/commit-graph.c:174

12822 +#: builtin/commit-graph.c:199

12823 msgid "only expire files older than a given date-time"

12824 msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnée"

12825

12701 -#: builtin/commit-graph.c:190

12826 +#: builtin/commit-graph.c:215

12827 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"

12828 msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"

12829

12705 -#: builtin/commit-graph.c:229

12706 -#, c-format

12707 -msgid "unexpected non-hex object ID: %s"

12708 -msgstr "ID d'objet non hexadécimal inattendu : %s"

12830 +#: builtin/commit-graph.c:245

12831 +msgid "Collecting commits from input"

12832 +msgstr "Collecte des commits depuis l'entrée"

12833

12834 #: builtin/commit-tree.c:18

12835 msgid ""

@@ -13112,7 +13236,7 @@ msgid "version"

13236 msgstr "version"

13237

13238 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

13115 -#: builtin/worktree.c:646

13239 +#: builtin/worktree.c:722

13240 msgid "machine-readable output"

13241 msgstr "sortie pour traitement automatique"

13242

@@ -13125,8 +13249,8 @@ msgid "terminate entries with NUL"

13249 msgstr "terminer les éléments par NUL"

13250

13251 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

13128 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156

13129 -#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336

13252 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202

13253 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

13254 msgid "mode"

13255 msgstr "mode"

13256

@@ -13824,35 +13948,45 @@ msgstr "--dirty est incompatible avec la spécification de commits ou assimilés

13948 msgid "--broken is incompatible with commit-ishes"

13949 msgstr "--broken est incompatible avec les commits ou assimilés"

13950

13827 -#: builtin/diff.c:84

13951 +#: builtin/diff.c:91

13952 #, c-format

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

13954 msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"

13955

13832 -#: builtin/diff.c:235

13956 +#: builtin/diff.c:242

13957 #, c-format

13958 msgid "invalid option: %s"

13959 msgstr "option invalide : %s"

13960

13837 -#: builtin/diff.c:350

13961 +#: builtin/diff.c:359

13962 +#, c-format

13963 +msgid "%s...%s: no merge base"

13964 +msgstr "%s..%s: pas de base de fusion"

13965 +

13966 +#: builtin/diff.c:469

13967 msgid "Not a git repository"

13968 msgstr "Ce n'est pas un dépôt git !"

13969

13841 -#: builtin/diff.c:394

13970 +#: builtin/diff.c:514

13971 #, c-format

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

13973 msgstr "objet spécifié '%s' invalide."

13974

13846 -#: builtin/diff.c:403

13975 +#: builtin/diff.c:525

13976 #, c-format

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

13978 msgstr "plus de deux blobs spécifiés : '%s'"

13979

13851 -#: builtin/diff.c:408

13980 +#: builtin/diff.c:530

13981 #, c-format

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

13983 msgstr "objet non géré '%s' spécifié."

13984

13985 +#: builtin/diff.c:564

13986 +#, c-format

13987 +msgid "%s...%s: multiple merge bases, using %s"

13988 +msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"

13989 +

13990 #: builtin/difftool.c:30

13991 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

13992 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"

@@ -14004,90 +14138,111 @@ msgstr ""

14138 msgid "git fast-export [rev-list-opts]"

14139 msgstr "git fast-export [options-de-liste-de-révisions]"

14140

14007 -#: builtin/fast-export.c:853

14141 +#: builtin/fast-export.c:868

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

14143 msgstr ""

14144 "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"

14145 "tags ne soit spécifié."

14146

14013 -#: builtin/fast-export.c:1152

14147 +#: builtin/fast-export.c:1178

14148 +msgid "--anonymize-map token cannot be empty"

14149 +msgstr "le jeton --anonymize-map ne peut pas être vide"

14150 +

14151 +#: builtin/fast-export.c:1198

14152 msgid "show progress after <n> objects"

14153 msgstr "afficher la progression après <n> objets"

14154

14017 -#: builtin/fast-export.c:1154

14155 +#: builtin/fast-export.c:1200

14156 msgid "select handling of signed tags"

14157 msgstr "sélectionner la gestion des étiquettes signées"

14158

14021 -#: builtin/fast-export.c:1157

14159 +#: builtin/fast-export.c:1203

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

14161 msgstr ""

14162 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"

14163

14026 -#: builtin/fast-export.c:1160

14164 +#: builtin/fast-export.c:1206

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

14166 msgstr ""

14167 "sélectionner la gestion des messages de validation dans un encodage "

14168 "alternatif"

14169

14032 -#: builtin/fast-export.c:1163

14170 +#: builtin/fast-export.c:1209

14171 msgid "Dump marks to this file"

14172 msgstr "Enregistrer les marques dans ce fichier"

14173

14036 -#: builtin/fast-export.c:1165

14174 +#: builtin/fast-export.c:1211

14175 msgid "Import marks from this file"

14176 msgstr "importer les marques depuis ce fichier"

14177

14040 -#: builtin/fast-export.c:1169

14178 +#: builtin/fast-export.c:1215

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

14180 msgstr "importer les marques depuis ce fichier s'il existe"

14181

14044 -#: builtin/fast-export.c:1171

14182 +#: builtin/fast-export.c:1217

14183 msgid "Fake a tagger when tags lack one"

14184 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"

14185

14048 -#: builtin/fast-export.c:1173

14186 +#: builtin/fast-export.c:1219

14187 msgid "Output full tree for each commit"

14188 msgstr "Afficher l'arbre complet pour chaque commit"

14189

14052 -#: builtin/fast-export.c:1175

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

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

14192 msgstr "Utiliser la fonction \"done\" pour terminer le flux"

14193

14056 -#: builtin/fast-export.c:1176

14194 +#: builtin/fast-export.c:1222

14195 msgid "Skip output of blob data"

14196 msgstr "Sauter l'affichage de données de blob"

14197

14060 -#: builtin/fast-export.c:1177 builtin/log.c:1724

14198 +#: builtin/fast-export.c:1223 builtin/log.c:1724

14199 msgid "refspec"

14200 msgstr "spécificateur de référence"

14201

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

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

14203 msgid "Apply refspec to exported refs"

14204 msgstr "Appliquer le spécificateur de référence aux références exportées"

14205

14068 -#: builtin/fast-export.c:1179

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

14207 msgid "anonymize output"

14208 msgstr "anonymise la sortie"

14209

14072 -#: builtin/fast-export.c:1181

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

14211 +msgid "from:to"

14212 +msgstr "depuis:vers"

14213 +

14214 +#: builtin/fast-export.c:1227

14215 +msgid "convert <from> to <to> in anonymized output"

14216 +msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"

14217 +

14218 +#: builtin/fast-export.c:1230

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

14220 msgstr ""

14221 "les parents références qui ne sont pas dans le flux d'export rapide par id "

14222 "d'objet"

14223

14078 -#: builtin/fast-export.c:1183

14224 +#: builtin/fast-export.c:1232

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

14226 msgstr "Afficher les ids d'objet originaux des blobs/commits"

14227

14082 -#: builtin/fast-export.c:1185

14228 +#: builtin/fast-export.c:1234

14229 msgid "Label tags with mark ids"

14230 msgstr "Marquer les étiquettes avec des ids de marque"

14231

14086 -#: builtin/fast-export.c:1220

14232 +#: builtin/fast-export.c:1257

14233 +msgid "--anonymize-map without --anonymize does not make sense"

14234 +msgstr "--anonymize-map n'a aucune signification sans --anonymize"

14235 +

14236 +#: builtin/fast-export.c:1272

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

14238 msgstr ""

14239 "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"

14240

14241 +#: builtin/fetch-pack.c:245

14242 +#, c-format

14243 +msgid "Lockfile created but not reported: %s"

14244 +msgstr "Fichier verrou créé mais non reporté : %s"

14245 +

14246 #: builtin/fetch.c:35

14247 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

14248 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"

@@ -14416,42 +14571,42 @@ msgstr ""

14571 msgid "You need to specify a tag name."

14572 msgstr "Vous devez spécifier un nom d'étiquette."

14573

14419 -#: builtin/fetch.c:1773

14574 +#: builtin/fetch.c:1778

14575 msgid "Negative depth in --deepen is not supported"

14576 msgstr "Une profondeur négative dans --deepen n'est pas supportée"

14577

14423 -#: builtin/fetch.c:1775

14578 +#: builtin/fetch.c:1780

14579 msgid "--deepen and --depth are mutually exclusive"

14580 msgstr "--deepen et --depth sont mutuellement exclusifs"

14581

14427 -#: builtin/fetch.c:1780

14582 +#: builtin/fetch.c:1785

14583 msgid "--depth and --unshallow cannot be used together"

14584 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

14585

14431 -#: builtin/fetch.c:1782

l10n: fr v2.28.0 round 1