dc46d27a5e · matheusbsbs/matheus-bagliano

@@ -57,6 +57,7 @@

57 # revision | révision

58 # shallow | superficiel

59 # shell | interpréteur de commandes

60 +# sparse | clairsemé

61 # stash | remisage

62 # to stash | remiser

63 # tag | étiquette

@@ -69,14 +70,14 @@

70 # upstream | amont

71 # viewer | visualiseur

72 # worktree / |

72 -# work(ing) tree | copie de travail

73 +# work(ing) tree | arbre de travail

74 #

75 msgid ""

76 msgstr ""

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

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

78 -"POT-Creation-Date: 2020-03-11 15:26+0800\n"

79 -"PO-Revision-Date: 2020-03-11 21:03+0100\n"

79 +"POT-Creation-Date: 2020-05-15 09:11+0800\n"

80 +"PO-Revision-Date: 2020-05-15 21:35+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"

@@ -91,9 +92,9 @@ msgstr ""

92 msgid "Huh (%s)?"

93 msgstr "Hein (%s) ?"

94

94 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

95 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

96 -#: builtin/rebase.c:2086 builtin/rebase.c:2130

95 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

96 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

97 +#: builtin/rebase.c:1919

98 msgid "could not read index"

99 msgstr "impossible de lire l'index"

100

@@ -121,8 +122,7 @@ msgstr "Mise à jour"

122 msgid "could not stage '%s'"

123 msgstr "impossible d'indexer '%s'"

124

124 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

125 -#: builtin/rebase.c:899

125 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

126 msgid "could not write index"

127 msgstr "impossible d'écrire l'index"

128

@@ -138,8 +138,8 @@ msgstr[1] "%d chemins mis à jour\n"

138 msgid "note: %s is untracked now.\n"

139 msgstr "note : %s n'est plus suivi à présent.\n"

140

141 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

142 -#: builtin/reset.c:144

141 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

142 +#: builtin/reset.c:145

143 #, c-format

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

145 msgstr "échec de make_cache_entry pour le chemin '%s'"

@@ -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:822 git-add--interactive.perl:1851

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

269 msgid "*** Commands ***"

270 msgstr "*** Commandes ***"

271

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

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

273 msgid "What now"

274 msgstr "Et maintenant ?"

275

@@ -281,12 +281,13 @@ msgstr "indexé"

281 msgid "unstaged"

282 msgstr "non-indexé"

283

284 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

285 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

286 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

284 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

285 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

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 git-add--interactive.perl:213

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

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

291 msgid "path"

292 msgstr "chemin"

293

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

295 msgid "could not refresh index"

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

297

297 -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

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

299 #, c-format

300 msgid "Bye.\n"

301 msgstr "Au revoir.\n"

302

302 -#: add-patch.c:33 git-add--interactive.perl:1428

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

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

307 -#: add-patch.c:34 git-add--interactive.perl:1429

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

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

312 -#: add-patch.c:35 git-add--interactive.perl:1430

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

314 #, c-format, perl-format

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

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

317

317 -#: add-patch.c:37

318 +#: add-patch.c:38

319 msgid ""

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

321 "staging."

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

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

324 "marquée comme indexée."

325

325 -#: add-patch.c:40

326 +#: add-patch.c:41

327 msgid ""

328 "y - stage this hunk\n"

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

@@ -336,22 +337,22 @@ msgstr ""

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

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

339

339 -#: add-patch.c:54 git-add--interactive.perl:1433

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

341 #, c-format, perl-format

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

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

344

344 -#: add-patch.c:55 git-add--interactive.perl:1434

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

346 #, c-format, perl-format

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

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

349

349 -#: add-patch.c:56 git-add--interactive.perl:1435

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

351 #, c-format, perl-format

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

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

354

354 -#: add-patch.c:58

355 +#: add-patch.c:59

356 msgid ""

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

358 "stashing."

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

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

361 "marquée comme remisée."

362

362 -#: add-patch.c:61

363 +#: add-patch.c:62

364 msgid ""

365 "y - stash this hunk\n"

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

@@ -373,22 +374,22 @@ msgstr ""

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

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

376

376 -#: add-patch.c:77 git-add--interactive.perl:1438

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

378 #, c-format, perl-format

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

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

381

381 -#: add-patch.c:78 git-add--interactive.perl:1439

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

383 #, c-format, perl-format

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

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

386

386 -#: add-patch.c:79 git-add--interactive.perl:1440

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

388 #, c-format, perl-format

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

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

391

391 -#: add-patch.c:81

392 +#: add-patch.c:82

393 msgid ""

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

395 "unstaging."

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

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

398 "marquée comme desindexée."

399

399 -#: add-patch.c:84

400 +#: add-patch.c:85

401 msgid ""

402 "y - unstage this hunk\n"

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

@@ -410,22 +411,22 @@ msgstr ""

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

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

413

413 -#: add-patch.c:99 git-add--interactive.perl:1443

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

415 #, c-format, perl-format

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

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

418

418 -#: add-patch.c:100 git-add--interactive.perl:1444

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

420 #, c-format, perl-format

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

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

423

423 -#: add-patch.c:101 git-add--interactive.perl:1445

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

425 #, c-format, perl-format

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

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

428

428 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211

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

430 msgid ""

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

432 "applying."

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

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

435 "marquée comme appliquée."

436

436 -#: add-patch.c:106

437 +#: add-patch.c:107

438 msgid ""

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

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

@@ -447,25 +448,25 @@ msgstr ""

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

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

450

450 -#: add-patch.c:121 git-add--interactive.perl:1448

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

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

453 #, c-format, perl-format

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

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

456

456 -#: add-patch.c:122 git-add--interactive.perl:1449

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

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

459 #, c-format, perl-format

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

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

462

462 -#: add-patch.c:123 git-add--interactive.perl:1450

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

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

465 #, c-format, perl-format

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

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

468

468 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190

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

470 msgid ""

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

472 "discarding."

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

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

475 "marquée comme éliminée."

476

476 -#: add-patch.c:128 add-patch.c:193

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

478 msgid ""

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

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

@@ -487,24 +488,24 @@ msgstr ""

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

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

490

490 -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

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

492 #, c-format, perl-format

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

494 msgstr ""

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

496

496 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

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

498 #, c-format, perl-format

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

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

501

501 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

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

503 #, c-format, perl-format

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

505 msgstr ""

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

507

507 -#: add-patch.c:150

508 +#: add-patch.c:151

509 msgid ""

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

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

@@ -518,27 +519,27 @@ msgstr ""

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

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

521

521 -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

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

523 #, c-format, perl-format

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

525 msgstr ""

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

527 "%s,?] ? "

528

528 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

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

530 #, c-format, perl-format

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

532 msgstr ""

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

534 "%s,?] ? "

535

535 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

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

537 #, c-format, perl-format

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

539 msgstr ""

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

541

541 -#: add-patch.c:171

542 +#: add-patch.c:172

543 msgid ""

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

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

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

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

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

555

555 -#: add-patch.c:214

556 +#: add-patch.c:215

557 msgid ""

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

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

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

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

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

569

569 -#: add-patch.c:318

570 +#: add-patch.c:319

571 #, c-format

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

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

574

574 -#: add-patch.c:337 add-patch.c:341

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

576 #, c-format

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

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

579

579 -#: add-patch.c:395

580 +#: add-patch.c:396

581 msgid "could not parse diff"

582 msgstr "impossible d'analyser la diff"

583

583 -#: add-patch.c:414

584 +#: add-patch.c:415

585 msgid "could not parse colored diff"

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

587

587 -#: add-patch.c:428

588 +#: add-patch.c:429

589 #, c-format

590 msgid "failed to run '%s'"

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

592

592 -#: add-patch.c:587

593 +#: add-patch.c:588

594 msgid "mismatched output from interactive.diffFilter"

595 msgstr "sortie sans correspondance depuis interactive.diffFilter"

596

596 -#: add-patch.c:588

597 +#: add-patch.c:589

598 msgid ""

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

600 "between its input and output lines."

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

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

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

604

604 -#: add-patch.c:761

605 +#: add-patch.c:762

606 #, c-format

607 msgid ""

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

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

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

612 "%.*s"

613

613 -#: add-patch.c:776

614 +#: add-patch.c:777

615 #, c-format

616 msgid ""

617 "hunks do not overlap:\n"

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

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

625 "%.*s"

626

626 -#: add-patch.c:1052 git-add--interactive.perl:1112

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

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

629 msgstr ""

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

631

631 -#: add-patch.c:1056

632 +#: add-patch.c:1057

633 #, c-format

634 msgid ""

635 "---\n"

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

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

644

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

645 -#: add-patch.c:1070 git-add--interactive.perl:1126

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

647 msgid ""

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

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

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

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

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

655

655 -#: add-patch.c:1103

656 +#: add-patch.c:1104

657 msgid "could not parse hunk header"

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

659

659 -#: add-patch.c:1148

660 +#: add-patch.c:1149

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

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

663

@@ -779,37 +780,44 @@ msgstr "Désolé, impossible d'éditer cette section"

780 msgid "'git apply' failed"

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

782

782 -#: advice.c:115

783 +#: advice.c:140

784 +#, c-format

785 +msgid ""

786 +"\n"

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

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

789 +

790 +#: advice.c:156

791 #, c-format

792 msgid "%shint: %.*s%s\n"

793 msgstr "%sastuce: %.*s%s\n"

794

787 -#: advice.c:168

795 +#: advice.c:247

796 msgid "Cherry-picking is not possible because you have unmerged files."

797 msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."

798

791 -#: advice.c:170

799 +#: advice.c:249

800 msgid "Committing is not possible because you have unmerged files."

801 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."

802

795 -#: advice.c:172

803 +#: advice.c:251

804 msgid "Merging is not possible because you have unmerged files."

805 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."

806

799 -#: advice.c:174

807 +#: advice.c:253

808 msgid "Pulling is not possible because you have unmerged files."

809 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."

810

803 -#: advice.c:176

811 +#: advice.c:255

812 msgid "Reverting is not possible because you have unmerged files."

813 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."

814

807 -#: advice.c:178

815 +#: advice.c:257

816 #, c-format

817 msgid "It is not possible to %s because you have unmerged files."

818 msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."

819

812 -#: advice.c:186

820 +#: advice.c:265

821 msgid ""

822 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

823 "as appropriate to mark resolution and make a commit."

@@ -817,23 +825,23 @@ msgstr ""

825 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"

826 "si nécessaire pour marquer la résolution et valider."

827

820 -#: advice.c:194

828 +#: advice.c:273

829 msgid "Exiting because of an unresolved conflict."

830 msgstr "Abandon à cause de conflit non résolu."

831

824 -#: advice.c:199 builtin/merge.c:1335

832 +#: advice.c:278 builtin/merge.c:1353

833 msgid "You have not concluded your merge (MERGE_HEAD exists)."

834 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."

835

828 -#: advice.c:201

836 +#: advice.c:280

837 msgid "Please, commit your changes before merging."

838 msgstr "Veuillez valider vos changements avant de fusionner."

839

832 -#: advice.c:202

840 +#: advice.c:281

841 msgid "Exiting because of unfinished merge."

842 msgstr "Abandon à cause d'une fusion non terminée."

843

836 -#: advice.c:208

844 +#: advice.c:287

845 #, c-format

846 msgid ""

847 "Note: switching to '%s'.\n"

@@ -1135,7 +1143,7 @@ msgstr "le patch a échoué : %s:%ld"

1143 msgid "cannot checkout %s"

1144 msgstr "extraction de %s impossible"

1145

1138 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1146 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1147 #, c-format

1148 msgid "failed to read %s"

1149 msgstr "échec de la lecture de %s"

@@ -1336,7 +1344,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..."

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

1345 msgstr "troncature du nom de fichier .rej en %.*s.rej"

1346

1339 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1347 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1348 #, c-format

1349 msgid "cannot open %s"

1350 msgstr "impossible d'ouvrir %s"

@@ -1402,7 +1410,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

1410 msgid "apply changes matching the given path"

1411 msgstr "appliquer les modifications qui correspondent au chemin donné"

1412

1405 -#: apply.c:4973 builtin/am.c:2260

1413 +#: apply.c:4973 builtin/am.c:2259

1414 msgid "num"

1415 msgstr "num"

1416

@@ -1460,7 +1468,7 @@ msgid "build a temporary index based on embedded index information"

1468 msgstr ""

1469 "construire un index temporaire fondé sur l'information de l'index embarqué"

1470

1463 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1471 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1472 msgid "paths are separated with NUL character"

1473 msgstr "les chemins sont séparés par un caractère NUL"

1474

@@ -1468,9 +1476,9 @@ msgstr "les chemins sont séparés par un caractère NUL"

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

1477 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"

1478

1471 -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

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

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

1473 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

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

1482 msgid "action"

1483 msgstr "action"

1484

@@ -1501,8 +1509,8 @@ msgid "allow overlapping hunks"

1509 msgstr "accepter les recouvrements de sections"

1510

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

1504 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

1505 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

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

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

1514 msgid "be verbose"

1515 msgstr "mode verbeux"

1516

@@ -1516,7 +1524,7 @@ msgstr ""

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

1525 msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"

1526

1519 -#: apply.c:5032 builtin/am.c:2248

1527 +#: apply.c:5032 builtin/am.c:2247

1528 msgid "root"

1529 msgstr "racine"

1530

@@ -1524,6 +1532,55 @@ msgstr "racine"

1532 msgid "prepend <root> to all filenames"

1533 msgstr "préfixer tous les noms de fichier avec <root>"

1534

1535 +#: archive-tar.c:125 archive-zip.c:351

1536 +#, c-format

1537 +msgid "cannot stream blob %s"

1538 +msgstr "impossible de transmettre le blob %s en flux"

1539 +

1540 +#: archive-tar.c:266 archive-zip.c:369

1541 +#, c-format

1542 +msgid "unsupported file mode: 0%o (SHA1: %s)"

1543 +msgstr "mode de fichier non supporté :0%o (SHA1: %s)"

1544 +

1545 +#: archive-tar.c:293 archive-zip.c:359

1546 +#, c-format

1547 +msgid "cannot read %s"

1548 +msgstr "impossible de lire %s"

1549 +

1550 +#: archive-tar.c:465

1551 +#, c-format

1552 +msgid "unable to start '%s' filter"

1553 +msgstr "impossible de démarrer le filtre '%s'"

1554 +

1555 +#: archive-tar.c:468

1556 +msgid "unable to redirect descriptor"

1557 +msgstr "impossible de rediriger un descripteur"

1558 +

1559 +#: archive-tar.c:475

1560 +#, c-format

1561 +msgid "'%s' filter reported error"

1562 +msgstr "le filtre '%s' a retourné une erreur"

1563 +

1564 +#: archive-zip.c:319

1565 +#, c-format

1566 +msgid "path is not valid UTF-8: %s"

1567 +msgstr "le chemin n'est pas codé en UTF-8 valide : %s"

1568 +

1569 +#: archive-zip.c:323

1570 +#, c-format

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

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

1573 +

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

1575 +#, c-format

1576 +msgid "deflate error (%d)"

1577 +msgstr "erreur de compression (%d)"

1578 +

1579 +#: archive-zip.c:615

1580 +#, c-format

1581 +msgid "timestamp too large for this system: %<PRIuMAX>"

1582 +msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"

1583 +

1584 #: archive.c:14

1585 msgid "git archive [<options>] <tree-ish> [<path>...]"

1586 msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

@@ -1543,172 +1600,123 @@ msgstr ""

1600 msgid "git archive --remote <repo> [--exec <cmd>] --list"

1601 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

1602

1546 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1603 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1604 #, c-format

1605 msgid "pathspec '%s' did not match any files"

1606 msgstr "le chemin '%s' ne correspond à aucun fichier"

1607

1551 -#: archive.c:396

1608 +#: archive.c:401

1609 #, c-format

1610 msgid "no such ref: %.*s"

1611 msgstr "référence inexistante : %.*s"

1612

1556 -#: archive.c:401

1613 +#: archive.c:407

1614 #, c-format

1615 msgid "not a valid object name: %s"

1616 msgstr "nom d'objet invalide : %s"

1617

1561 -#: archive.c:414

1618 +#: archive.c:420

1619 #, c-format

1620 msgid "not a tree object: %s"

1621 msgstr "objet arbre invalide : %s"

1622

1566 -#: archive.c:426

1623 +#: archive.c:432

1624 msgid "current working directory is untracked"

1625 msgstr "l'arbre de travail actuel est non-suivi"

1626

1570 -#: archive.c:457

1627 +#: archive.c:464

1628 msgid "fmt"

1629 msgstr "fmt"

1630

1574 -#: archive.c:457

1631 +#: archive.c:464

1632 msgid "archive format"

1633 msgstr "format d'archive"

1634

1578 -#: archive.c:458 builtin/log.c:1653

1635 +#: archive.c:465 builtin/log.c:1674

1636 msgid "prefix"

1637 msgstr "préfixe"

1638

1582 -#: archive.c:459

1639 +#: archive.c:466

1640 msgid "prepend prefix to each pathname in the archive"

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

1642

1586 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1643 +#: 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

1588 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

1589 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

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

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

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

1648 #: parse-options.h:190

1649 msgid "file"

1650 msgstr "fichier"

1651

1595 -#: archive.c:461 builtin/archive.c:90

1652 +#: archive.c:468 builtin/archive.c:90

1653 msgid "write the archive to this file"

1654 msgstr "écrire l'archive dans ce fichier"

1655

1599 -#: archive.c:463

1656 +#: archive.c:470

1657 msgid "read .gitattributes in working directory"

1658 msgstr "lire .gitattributes dans le répertoire de travail"

1659

1603 -#: archive.c:464

1660 +#: archive.c:471

1661 msgid "report archived files on stderr"

1662 msgstr "afficher les fichiers archivés sur stderr"

1663

1607 -#: archive.c:465

1664 +#: archive.c:472

1665 msgid "store only"

1666 msgstr "stockage seulement"

1667

1611 -#: archive.c:466

1668 +#: archive.c:473

1669 msgid "compress faster"

1670 msgstr "compression rapide"

1671

1615 -#: archive.c:474

1672 +#: archive.c:481

1673 msgid "compress better"

1674 msgstr "compression efficace"

1675

1619 -#: archive.c:477

1676 +#: archive.c:484

1677 msgid "list supported archive formats"

1678 msgstr "afficher les formats d'archive supportés"

1679

1623 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1680 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1681 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1682 msgid "repo"

1683 msgstr "dépôt"

1684

1628 -#: archive.c:480 builtin/archive.c:92

1685 +#: archive.c:487 builtin/archive.c:92

1686 msgid "retrieve the archive from remote repository <repo>"

1687 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"

1688

1632 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

1689 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1690 #: builtin/notes.c:498

1691 msgid "command"

1692 msgstr "commande"

1693

1637 -#: archive.c:482 builtin/archive.c:94

1694 +#: archive.c:489 builtin/archive.c:94

1695 msgid "path to the remote git-upload-archive command"

1696 msgstr "chemin vers la commande distante git-upload-archive"

1697

1641 -#: archive.c:489

1698 +#: archive.c:496

1699 msgid "Unexpected option --remote"

1700 msgstr "Option --remote inattendue"

1701

1645 -#: archive.c:491

1702 +#: archive.c:498

1703 msgid "Option --exec can only be used together with --remote"

1704 msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"

1705

1649 -#: archive.c:493

1706 +#: archive.c:500

1707 msgid "Unexpected option --output"

1708 msgstr "Option --output inattendue"

1709

1653 -#: archive.c:515

1710 +#: archive.c:522

1711 #, c-format

1712 msgid "Unknown archive format '%s'"

1713 msgstr "Format d'archive inconnu '%s'"

1714

1658 -#: archive.c:522

1715 +#: archive.c:529

1716 #, c-format

1717 msgid "Argument not supported for format '%s': -%d"

1718 msgstr "Argument non supporté pour le format '%s' : -%d"

1719

1663 -#: archive-tar.c:125 archive-zip.c:351

1664 -#, c-format

1665 -msgid "cannot stream blob %s"

1666 -msgstr "impossible de transmettre le blob %s en flux"

1667 -

1668 -#: archive-tar.c:266 archive-zip.c:369

1669 -#, c-format

1670 -msgid "unsupported file mode: 0%o (SHA1: %s)"

1671 -msgstr "mode de fichier non supporté :0%o (SHA1: %s)"

1672 -

1673 -#: archive-tar.c:293 archive-zip.c:359

1674 -#, c-format

1675 -msgid "cannot read %s"

1676 -msgstr "impossible de lire %s"

1677 -

1678 -#: archive-tar.c:465

1679 -#, c-format

1680 -msgid "unable to start '%s' filter"

1681 -msgstr "impossible de démarrer le filtre '%s'"

1682 -

1683 -#: archive-tar.c:468

1684 -msgid "unable to redirect descriptor"

1685 -msgstr "impossible de rediriger un descripteur"

1686 -

1687 -#: archive-tar.c:475

1688 -#, c-format

1689 -msgid "'%s' filter reported error"

1690 -msgstr "le filtre '%s' a retourné une erreur"

1691 -

1692 -#: archive-zip.c:319

1693 -#, c-format

1694 -msgid "path is not valid UTF-8: %s"

1695 -msgstr "le chemin n'est pas codé en UTF-8 valide : %s"

1696 -

1697 -#: archive-zip.c:323

1698 -#, c-format

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

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

1701 -

1702 -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1703 -#, c-format

1704 -msgid "deflate error (%d)"

1705 -msgstr "erreur de compression (%d)"

1706 -

1707 -#: archive-zip.c:615

1708 -#, c-format

1709 -msgid "timestamp too large for this system: %<PRIuMAX>"

1710 -msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"

1711 -

1720 #: attr.c:212

1721 #, c-format

1722 msgid "%.*s is not a valid attribute name"

@@ -1802,12 +1810,12 @@ msgstr "Bissection : une base de fusion doit être testée\n"

1810 msgid "a %s revision is needed"

1811 msgstr "une révision %s est nécessaire"

1812

1805 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1813 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1814 #, c-format

1815 msgid "could not create file '%s'"

1816 msgstr "impossible de créer le fichier '%s'"

1817

1810 -#: bisect.c:966 builtin/merge.c:149

1818 +#: bisect.c:966 builtin/merge.c:151

1819 #, c-format

1820 msgid "could not read file '%s'"

1821 msgstr "impossible de lire le fichier '%s'"

@@ -1847,41 +1855,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1855 msgstr[0] "Bissection : %d révision à tester après ceci %s\n"

1856 msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"

1857

1850 -#: blame.c:2700

1858 +#: blame.c:2777

1859 msgid "--contents and --reverse do not blend well."

1860 msgstr "--contents et --reverse ne font pas bon ménage."

1861

1854 -#: blame.c:2714

1862 +#: blame.c:2791

1863 msgid "cannot use --contents with final commit object name"

1864 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"

1865

1858 -#: blame.c:2735

1866 +#: blame.c:2812

1867 msgid "--reverse and --first-parent together require specified latest commit"

1868 msgstr ""

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

1870 "dernier commit"

1871

1864 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1865 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1866 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1867 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

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

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

1874 +#: 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

1876 #: builtin/shortlog.c:192

1877 msgid "revision walk setup failed"

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

1879

1872 -#: blame.c:2762

1880 +#: blame.c:2839

1881 msgid ""

1882 "--reverse --first-parent together require range along first-parent chain"

1883 msgstr ""

1884 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "

1885 "premier parent"

1886

1879 -#: blame.c:2773

1887 +#: blame.c:2850

1888 #, c-format

1889 msgid "no such path %s in %s"

1890 msgstr "pas de chemin %s dans %s"

1891

1884 -#: blame.c:2784

1892 +#: blame.c:2861

1893 #, c-format

1894 msgid "cannot read blob %s for path %s"

1895 msgstr "impossible de lire le blob %s pour le chemin %s"

@@ -2024,12 +2032,12 @@ msgstr "Nom d'objet ambigu : '%s'."

2032 msgid "Not a valid branch point: '%s'."

2033 msgstr "Point d'embranchement invalide : '%s'."

2034

2027 -#: branch.c:364

2035 +#: branch.c:365

2036 #, c-format

2037 msgid "'%s' is already checked out at '%s'"

2038 msgstr "'%s' est déjà extrait dans '%s'"

2039

2032 -#: branch.c:387

2040 +#: branch.c:388

2041 #, c-format

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

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

@@ -2044,8 +2052,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

2054

2047 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

2048 -#: builtin/commit.c:815

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

2056 +#: builtin/commit.c:814

2057 #, c-format

2058 msgid "could not open '%s'"

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

@@ -2097,7 +2105,7 @@ msgstr "rev-list a disparu"

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

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

2107

2100 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

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

2109 #, c-format

2110 msgid "unrecognized argument: %s"

2111 msgstr "argument non reconnu : %s"

@@ -2120,318 +2128,271 @@ msgstr "l'index de groupe a disparu"

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

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

2130

2123 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2124 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2125 -#, c-format

2126 -msgid "could not parse %s"

2127 -msgstr "impossible d'analyser %s"

2128 -

2129 -#: commit.c:53

2130 -#, c-format

2131 -msgid "%s %s is not a commit!"

2132 -msgstr "%s %s n'est pas un commit !"

2133 -

2134 -#: commit.c:193

2135 -msgid ""

2136 -"Support for <GIT_DIR>/info/grafts is deprecated\n"

2137 -"and will be removed in a future Git version.\n"

2138 -"\n"

2139 -"Please use \"git replace --convert-graft-file\"\n"

2140 -"to convert the grafts into replace refs.\n"

2141 -"\n"

2142 -"Turn this message off by running\n"

2143 -"\"git config advice.graftFileDeprecated false\""

2144 -msgstr ""

2145 -"Le support de <GIT_DIR>/info/grafts est déconseillé\n"

2146 -"et sera supprimé dans une version future de Git.\n"

2147 -"\n"

2148 -"Veuillez utiliser \"git replace --convert-graft-file\"\n"

2149 -"pour convertir les grafts en référence de remplacement.\n"

2150 -"\n"

2151 -"Supprimez ce message en lançant\n"

2152 -"\"git config advice.graftFileDeprecated false\""

2153 -

2154 -#: commit.c:1153

2155 -#, c-format

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

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

2158 -

2159 -#: commit.c:1157

2160 -#, c-format

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

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

2163 -

2164 -#: commit.c:1160

2165 -#, c-format

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

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

2168 -

2169 -#: commit.c:1163

2170 -#, c-format

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

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

2173 -

2174 -#: commit.c:1417

2175 -msgid ""

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

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

2178 -"variable i18n.commitencoding to the encoding your project uses.\n"

2179 -msgstr ""

2180 -"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"

2181 -"Vous souhaitez peut-être le modifier après correction du message ou régler "

2182 -"la\n"

2183 -"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "

2184 -"projet.\n"

2185 -

2186 -#: commit-graph.c:122

2131 +#: commit-graph.c:183

2132 msgid "commit-graph file is too small"

2133 msgstr "le graphe de commit est trop petit"

2134

2190 -#: commit-graph.c:189

2135 +#: commit-graph.c:248

2136 #, c-format

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

2138 msgstr ""

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

2140

2196 -#: commit-graph.c:196

2141 +#: commit-graph.c:255

2142 #, c-format

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

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

2145

2201 -#: commit-graph.c:203

2146 +#: commit-graph.c:262

2147 #, c-format

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

2149 msgstr ""

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

2151 "version %X"

2152

2208 -#: commit-graph.c:226

2153 +#: commit-graph.c:284

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

2155 msgstr ""

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

2157 "le fichier est peut être incomplet"

2158

2214 -#: commit-graph.c:237

2159 +#: commit-graph.c:294

2160 #, c-format

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

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

2163

2219 -#: commit-graph.c:280

2164 +#: commit-graph.c:362

2165 #, c-format

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

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

2168

2224 -#: commit-graph.c:343

2169 +#: commit-graph.c:436

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

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

2172

2228 -#: commit-graph.c:353

2173 +#: commit-graph.c:446

2174 msgid "commit-graph chain does not match"

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

2176

2232 -#: commit-graph.c:401

2177 +#: commit-graph.c:494

2178 #, c-format

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

2180 msgstr ""

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

2182

2238 -#: commit-graph.c:425

2183 +#: commit-graph.c:518

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

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

2186

2242 -#: commit-graph.c:558 commit-graph.c:618

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

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

2189 msgstr ""

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

2191 "corrompu"

2192

2248 -#: commit-graph.c:579

2193 +#: commit-graph.c:672

2194 #, c-format

2195 msgid "could not find commit %s"

2196 msgstr "impossible de trouver le commit %s"

2197

2253 -#: commit-graph.c:852 builtin/am.c:1292

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

2199 #, c-format

2200 msgid "unable to parse commit %s"

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

2202

2258 -#: commit-graph.c:1011 builtin/pack-objects.c:2782

2203 +#: commit-graph.c:1096

2204 +msgid "Writing changed paths Bloom filters index"

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

2206 +

2207 +#: commit-graph.c:1121

2208 +msgid "Writing changed paths Bloom filters data"

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

2210 +

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

2212 #, c-format

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

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

2215

2263 -#: commit-graph.c:1043

2216 +#: commit-graph.c:1196

2217 msgid "Loading known commits in commit graph"

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

2219

2267 -#: commit-graph.c:1060

2220 +#: commit-graph.c:1213

2221 msgid "Expanding reachable commits in commit graph"

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

2223

2271 -#: commit-graph.c:1079

2224 +#: commit-graph.c:1233

2225 msgid "Clearing commit marks in commit graph"

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

2227

2275 -#: commit-graph.c:1098

2228 +#: commit-graph.c:1252

2229 msgid "Computing commit graph generation numbers"

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

2231

2279 -#: commit-graph.c:1173

2232 +#: commit-graph.c:1300

2233 +msgid "Computing commit changed paths Bloom filters"

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

2235 +

2236 +#: commit-graph.c:1359

2237 #, c-format

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

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

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

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

2242

2286 -#: commit-graph.c:1186

2243 +#: commit-graph.c:1372

2244 #, c-format

2245 msgid "error adding pack %s"

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

2247

2291 -#: commit-graph.c:1190

2248 +#: commit-graph.c:1376

2249 #, c-format

2250 msgid "error opening index for %s"

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

2252

2296 -#: commit-graph.c:1214

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

2303 -#: commit-graph.c:1234

2260 +#: commit-graph.c:1426

2261 #, c-format

2262 msgid "invalid commit object id: %s"

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

2264

2308 -#: commit-graph.c:1249

2265 +#: commit-graph.c:1442

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

2267 msgstr ""

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

2269

2313 -#: commit-graph.c:1264

2270 +#: commit-graph.c:1457

2271 msgid "Counting distinct commits in commit graph"

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

2273

2317 -#: commit-graph.c:1294

2274 +#: commit-graph.c:1489

2275 msgid "Finding extra edges in commit graph"

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

2277

2321 -#: commit-graph.c:1340

2278 +#: commit-graph.c:1538

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

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

2281

2325 -#: commit-graph.c:1373 midx.c:814

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

2283 #, c-format

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

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

2286

2330 -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2287 +#: commit-graph.c:1585

2288 +msgid "unable to create temporary graph layer"

2289 +msgstr "impossible de créer une couche de graphe temporaire"

2290 +

2291 +#: commit-graph.c:1590

2292 #, c-format

2332 -msgid "unable to create '%s'"

2333 -msgstr "impossible de créer '%s'"

2293 +msgid "unable to adjust shared permissions for '%s'"

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

2295

2335 -#: commit-graph.c:1445

2296 +#: commit-graph.c:1667

2297 #, c-format

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

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

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

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

2302

2342 -#: commit-graph.c:1486

2303 +#: commit-graph.c:1712

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

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

2306

2346 -#: commit-graph.c:1498

2307 +#: commit-graph.c:1728

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

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

2310

2350 -#: commit-graph.c:1518

2311 +#: commit-graph.c:1748

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

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

2314

2354 -#: commit-graph.c:1631

2315 +#: commit-graph.c:1874

2316 msgid "Scanning merged commits"

2317 msgstr "Analyse des commits de fusion"

2318

2358 -#: commit-graph.c:1642

2319 +#: commit-graph.c:1885

2320 #, c-format

2321 msgid "unexpected duplicate commit id %s"

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

2323

2363 -#: commit-graph.c:1665

2324 +#: commit-graph.c:1908

2325 msgid "Merging commit-graph"

2326 msgstr "fusion du graphe de commits"

2327

2367 -#: commit-graph.c:1844

2328 +#: commit-graph.c:2096

2329 #, c-format

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

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

2332

2372 -#: commit-graph.c:1855

2333 +#: commit-graph.c:2107

2334 msgid "too many commits to write graph"

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

2336

2376 -#: commit-graph.c:1944

2337 +#: commit-graph.c:2200

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

2339 msgstr ""

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

2341 "vraisemblablement corrompu"

2342

2382 -#: commit-graph.c:1954

2343 +#: commit-graph.c:2210

2344 #, c-format

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

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

2347

2387 -#: commit-graph.c:1964 commit-graph.c:1979

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

2349 #, c-format

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

2351 msgstr ""

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

2353 "%u != %u"

2354

2394 -#: commit-graph.c:1971

2355 +#: commit-graph.c:2227

2356 #, c-format

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

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

2359

2399 -#: commit-graph.c:1989

2360 +#: commit-graph.c:2245

2361 msgid "Verifying commits in commit graph"

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

2363

2403 -#: commit-graph.c:2003

2364 +#: commit-graph.c:2259

2365 #, c-format

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

2367 msgstr ""

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

2369 "graphe de commit"

2370

2410 -#: commit-graph.c:2010

2371 +#: commit-graph.c:2266

2372 #, c-format

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

2374 msgstr ""

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

2376 "%s"

2377

2417 -#: commit-graph.c:2020

2378 +#: commit-graph.c:2276

2379 #, c-format

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

2381 msgstr ""

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

2383

2423 -#: commit-graph.c:2029

2384 +#: commit-graph.c:2285

2385 #, c-format

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

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

2388

2428 -#: commit-graph.c:2042

2389 +#: commit-graph.c:2298

2390 #, c-format

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

2392 msgstr ""

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

2394

2434 -#: commit-graph.c:2047

2395 +#: commit-graph.c:2303

2396 #, c-format

2397 msgid ""

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

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

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

2401 "non-nul ailleurs"

2402

2442 -#: commit-graph.c:2051

2403 +#: commit-graph.c:2307

2404 #, c-format

2405 msgid ""

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

@@ -2447,23 +2408,86 @@ msgstr ""

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

2409 "mais nul ailleurs"

2410

2450 -#: commit-graph.c:2066

2411 +#: commit-graph.c:2322

2412 #, c-format

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

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

2415

2455 -#: commit-graph.c:2072

2416 +#: commit-graph.c:2328

2417 #, c-format

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

2419 msgstr ""

2420 "la date de validation pour le commit %s dans le graphe de commit est "

2421 "%<PRIuMAX> != %<PRIuMAX>"

2422

2423 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2424 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2425 +#, c-format

2426 +msgid "could not parse %s"

2427 +msgstr "impossible d'analyser %s"

2428 +

2429 +#: commit.c:54

2430 +#, c-format

2431 +msgid "%s %s is not a commit!"

2432 +msgstr "%s %s n'est pas un commit !"

2433 +

2434 +#: commit.c:194

2435 +msgid ""

2436 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

2437 +"and will be removed in a future Git version.\n"

2438 +"\n"

2439 +"Please use \"git replace --convert-graft-file\"\n"

2440 +"to convert the grafts into replace refs.\n"

2441 +"\n"

2442 +"Turn this message off by running\n"

2443 +"\"git config advice.graftFileDeprecated false\""

2444 +msgstr ""

2445 +"Le support de <GIT_DIR>/info/grafts est déconseillé\n"

2446 +"et sera supprimé dans une version future de Git.\n"

2447 +"\n"

2448 +"Veuillez utiliser \"git replace --convert-graft-file\"\n"

2449 +"pour convertir les grafts en référence de remplacement.\n"

2450 +"\n"

2451 +"Supprimez ce message en lançant\n"

2452 +"\"git config advice.graftFileDeprecated false\""

2453 +

2454 +#: commit.c:1168

2455 +#, c-format

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

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

2458 +

2459 +#: commit.c:1172

2460 +#, c-format

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

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

2463 +

2464 +#: commit.c:1175

2465 +#, c-format

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

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

2468 +

2469 +#: commit.c:1178

2470 +#, c-format

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

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

2473 +

2474 +#: commit.c:1432

2475 +msgid ""

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

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

2478 +"variable i18n.commitencoding to the encoding your project uses.\n"

2479 +msgstr ""

2480 +"Avertissement : le message de validation ne se conforme pas à UTF-8.\n"

2481 +"Vous souhaitez peut-être le modifier après correction du message ou régler "

2482 +"la\n"

2483 +"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "

2484 +"projet.\n"

2485 +

2486 #: compat/obstack.c:406 compat/obstack.c:408

2487 msgid "memory exhausted"

2488 msgstr "plus de mémoire"

2489

2466 -#: config.c:124

2490 +#: config.c:125

2491 #, c-format

2492 msgid ""

2493 "exceeded maximum include depth (%d) while including\n"

@@ -2478,306 +2502,306 @@ msgstr ""

2502 "\t%s\n"

2503 "possibilité d'inclusions multiples."

2504

2481 -#: config.c:140

2505 +#: config.c:141

2506 #, c-format

2507 msgid "could not expand include path '%s'"

2508 msgstr "expansion impossible du chemin d'inclusion '%s'"

2509

2486 -#: config.c:151

2510 +#: config.c:152

2511 msgid "relative config includes must come from files"

2512 msgstr "les inclusions de configuration relatives doivent venir de fichiers"

2513

2490 -#: config.c:197

2514 +#: config.c:198

2515 msgid "relative config include conditionals must come from files"

2516 msgstr ""

2517 "les conditions d'inclusion de configuration relative doivent venir de "

2518 "fichiers"

2519

2496 -#: config.c:376

2520 +#: config.c:378

2521 #, c-format

2522 msgid "key does not contain a section: %s"

2523 msgstr "la clé ne contient pas de section: %s"

2524

2501 -#: config.c:382

2525 +#: config.c:384

2526 #, c-format

2527 msgid "key does not contain variable name: %s"

2528 msgstr "la clé ne contient pas de nom de variable : %s"

2529

2506 -#: config.c:406 sequencer.c:2444

2530 +#: config.c:408 sequencer.c:2456

2531 #, c-format

2532 msgid "invalid key: %s"

2533 msgstr "clé invalide : %s"

2534

2511 -#: config.c:412

2535 +#: config.c:414

2536 #, c-format

2537 msgid "invalid key (newline): %s"

2538 msgstr "clé invalide (retour chariot) : %s"

2539

2516 -#: config.c:448 config.c:460

2540 +#: config.c:450 config.c:462

2541 #, c-format

2542 msgid "bogus config parameter: %s"

2543 msgstr "paramètre de configuration mal formé: %s"

2544

2521 -#: config.c:495

2545 +#: config.c:497

2546 #, c-format

2547 msgid "bogus format in %s"

2548 msgstr "formatage mal formé dans %s"

2549

2526 -#: config.c:821

2550 +#: config.c:836

2551 #, c-format

2552 msgid "bad config line %d in blob %s"

2553 msgstr "ligne %d de config incorrecte dans le blob %s"

2554

2531 -#: config.c:825

2555 +#: config.c:840

2556 #, c-format

2557 msgid "bad config line %d in file %s"

2558 msgstr "ligne %d de config incorrecte dans le fichier %s"

2559

2536 -#: config.c:829

2560 +#: config.c:844

2561 #, c-format

2562 msgid "bad config line %d in standard input"

2563 msgstr "ligne %d de config incorrecte dans l'entrée standard"

2564

2541 -#: config.c:833

2565 +#: config.c:848

2566 #, c-format

2567 msgid "bad config line %d in submodule-blob %s"

2568 msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"

2569

2546 -#: config.c:837

2570 +#: config.c:852

2571 #, c-format

2572 msgid "bad config line %d in command line %s"

2573 msgstr "ligne %d de config incorrecte dans la ligne de commande %s"

2574

2551 -#: config.c:841

2575 +#: config.c:856

2576 #, c-format

2577 msgid "bad config line %d in %s"

2578 msgstr "ligne %d de config incorrecte dans %s"

2579

2556 -#: config.c:978

2580 +#: config.c:993

2581 msgid "out of range"

2582 msgstr "hors plage"

2583

2560 -#: config.c:978

2584 +#: config.c:993

2585 msgid "invalid unit"

2586 msgstr "unité invalide"

2587

2564 -#: config.c:979

2588 +#: config.c:994

2589 #, c-format

2590 msgid "bad numeric config value '%s' for '%s': %s"

2591 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"

2592

2569 -#: config.c:998

2593 +#: config.c:1013

2594 #, c-format

2595 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2596 msgstr ""

2597 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "

2598 "%s : %s"

2599

2576 -#: config.c:1001

2600 +#: config.c:1016

2601 #, c-format

2602 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2603 msgstr ""

2604 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "

2605 "%s : %s"

2606

2583 -#: config.c:1004

2607 +#: config.c:1019

2608 #, c-format

2609 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2610 msgstr ""

2611 "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "

2612 "standard : %s"

2613

2590 -#: config.c:1007

2614 +#: config.c:1022

2615 #, c-format

2616 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2617 msgstr ""

2618 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "

2619 "sous-module %s : %s"

2620

2597 -#: config.c:1010

2621 +#: config.c:1025

2622 #, c-format

2623 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2624 msgstr ""

2625 "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "

2626 "commande %s : %s"

2627

2604 -#: config.c:1013

2628 +#: config.c:1028

2629 #, c-format

2630 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2631 msgstr ""

2632 "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"

2633

2610 -#: config.c:1108

2634 +#: config.c:1123

2635 #, c-format

2636 msgid "failed to expand user dir in: '%s'"

2637 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"

2638

2615 -#: config.c:1117

2639 +#: config.c:1132

2640 #, c-format

2641 msgid "'%s' for '%s' is not a valid timestamp"

2642 msgstr "'%s' pour '%s' n'est pas un horodatage valide"

2643

2620 -#: config.c:1208

2644 +#: config.c:1223

2645 #, c-format

2646 msgid "abbrev length out of range: %d"

2647 msgstr "longueur d'abbrev hors plage : %d"

2648

2625 -#: config.c:1222 config.c:1233

2649 +#: config.c:1237 config.c:1248

2650 #, c-format

2651 msgid "bad zlib compression level %d"

2652 msgstr "niveau de compression zlib incorrect %d"

2653

2630 -#: config.c:1325

2654 +#: config.c:1340

2655 msgid "core.commentChar should only be one character"

2656 msgstr "core.commentChar ne devrait être qu'un unique caractère"

2657

2634 -#: config.c:1358

2658 +#: config.c:1373

2659 #, c-format

2660 msgid "invalid mode for object creation: %s"

2661 msgstr "mode invalide pour la création d'objet : %s"

2662

2639 -#: config.c:1430

2663 +#: config.c:1445

2664 #, c-format

2665 msgid "malformed value for %s"

2666 msgstr "valeur mal formée pour %s"

2667

2644 -#: config.c:1456

2668 +#: config.c:1471

2669 #, c-format

2670 msgid "malformed value for %s: %s"

2671 msgstr "valeur mal formée pour %s : %s"

2672

2649 -#: config.c:1457

2673 +#: config.c:1472

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

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

2676

2653 -#: config.c:1518 builtin/pack-objects.c:3541

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

2678 #, c-format

2679 msgid "bad pack compression level %d"

2680 msgstr "niveau de compression du paquet %d"

2681

2658 -#: config.c:1639

2682 +#: config.c:1655

2683 #, c-format

2684 msgid "unable to load config blob object '%s'"

2685 msgstr "impossible de charger l'objet blob de config '%s'"

2686

2663 -#: config.c:1642

2687 +#: config.c:1658

2688 #, c-format

2689 msgid "reference '%s' does not point to a blob"

2690 msgstr "la référence '%s' ne pointe pas sur un blob"

2691

2668 -#: config.c:1659

2692 +#: config.c:1675

2693 #, c-format

2694 msgid "unable to resolve config blob '%s'"

2695 msgstr "impossible de résoudre le blob de config '%s'"

2696

2673 -#: config.c:1689

2697 +#: config.c:1705

2698 #, c-format

2699 msgid "failed to parse %s"

2700 msgstr "échec de l'analyse de %s"

2701

2678 -#: config.c:1743

2702 +#: config.c:1759

2703 msgid "unable to parse command-line config"

2704 msgstr "lecture de la configuration de ligne de commande impossible"

2705

2682 -#: config.c:2097

2706 +#: config.c:2113

2707 msgid "unknown error occurred while reading the configuration files"

2708 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"

2709

2686 -#: config.c:2267

2710 +#: config.c:2283

2711 #, c-format

2712 msgid "Invalid %s: '%s'"

2713 msgstr "%s invalide : '%s'"

2714

2691 -#: config.c:2312

2715 +#: config.c:2328

2716 #, c-format

2717 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2718 msgstr ""

2719 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "

2720 "100"

2721

2698 -#: config.c:2358

2722 +#: config.c:2374

2723 #, c-format

2724 msgid "unable to parse '%s' from command-line config"

2725 msgstr ""

2726 "impossible d'analyser '%s' depuis le configuration en ligne de commande"

2727

2704 -#: config.c:2360

2728 +#: config.c:2376

2729 #, c-format

2730 msgid "bad config variable '%s' in file '%s' at line %d"

2731 msgstr ""

2732 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"

2733

2710 -#: config.c:2441

2734 +#: config.c:2457

2735 #, c-format

2736 msgid "invalid section name '%s'"

2737 msgstr "nom de section invalide '%s'"

2738

2715 -#: config.c:2473

2739 +#: config.c:2489

2740 #, c-format

2741 msgid "%s has multiple values"

2742 msgstr "%s a des valeurs multiples"

2743

2720 -#: config.c:2502

2744 +#: config.c:2518

2745 #, c-format

2746 msgid "failed to write new configuration file %s"

2747 msgstr "impossible d'écrire le fichier de configuration %s"

2748

2725 -#: config.c:2754 config.c:3078

2749 +#: config.c:2770 config.c:3094

2750 #, c-format

2751 msgid "could not lock config file %s"

2752 msgstr "impossible de verrouiller le fichier de configuration %s"

2753

2730 -#: config.c:2765

2754 +#: config.c:2781

2755 #, c-format

2756 msgid "opening %s"

2757 msgstr "ouverture de %s"

2758

2735 -#: config.c:2800 builtin/config.c:344

2759 +#: config.c:2816 builtin/config.c:344

2760 #, c-format

2761 msgid "invalid pattern: %s"

2762 msgstr "motif invalide : %s"

2763

2740 -#: config.c:2825

2764 +#: config.c:2841

2765 #, c-format

2766 msgid "invalid config file %s"

2767 msgstr "fichier de configuration invalide %s"

2768

2745 -#: config.c:2838 config.c:3091

2769 +#: config.c:2854 config.c:3107

2770 #, c-format

2771 msgid "fstat on %s failed"

2772 msgstr "échec de fstat sur %s"

2773

2750 -#: config.c:2849

2774 +#: config.c:2865

2775 #, c-format

2776 msgid "unable to mmap '%s'"

2777 msgstr "impossible de réaliser un map de '%s'"

2778

2755 -#: config.c:2858 config.c:3096

2779 +#: config.c:2874 config.c:3112

2780 #, c-format

2781 msgid "chmod on %s failed"

2782 msgstr "échec de chmod sur %s"

2783

2760 -#: config.c:2943 config.c:3193

2784 +#: config.c:2959 config.c:3209

2785 #, c-format

2786 msgid "could not write config file %s"

2787 msgstr "impossible d'écrire le fichier de configuration %s"

2788

2765 -#: config.c:2977

2789 +#: config.c:2993

2790 #, c-format

2791 msgid "could not set '%s' to '%s'"

2792 msgstr "impossible de régler '%s' à '%s'"

2793

2770 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2794 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2795 #, c-format

2796 msgid "could not unset '%s'"

2797 msgstr "impossible de désinitialiser '%s'"

2798

2775 -#: config.c:3069

2799 +#: config.c:3085

2800 #, c-format

2801 msgid "invalid section name: %s"

2802 msgstr "nom de section invalide : %s"

2803

2780 -#: config.c:3236

2804 +#: config.c:3252

2805 #, c-format

2806 msgid "missing value for '%s'"

2807 msgstr "valeur manquante pour '%s'"

@@ -2943,19 +2967,19 @@ msgstr "chemin étrange '%s' bloqué"

2967 msgid "unable to fork"

2968 msgstr "fork impossible"

2969

2946 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2970 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45

2971 msgid "Checking connectivity"

2972 msgstr "Vérification de la connectivité"

2973

2950 -#: connected.c:110

2974 +#: connected.c:119

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

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

2977

2954 -#: connected.c:130

2978 +#: connected.c:139

2979 msgid "failed write to rev-list"

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

2981

2958 -#: connected.c:137

2982 +#: connected.c:146

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

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

2985

@@ -3058,15 +3082,15 @@ msgstr "la lecture depuis le filtre externe '%s' a échoué"

3082 msgid "external filter '%s' failed"

3083 msgstr "le filtre externe '%s' a échoué"

3084

3061 -#: convert.c:839

3085 +#: convert.c:840

3086 msgid "unexpected filter type"

3087 msgstr "type de filtre inattendu"

3088

3065 -#: convert.c:850

3089 +#: convert.c:851

3090 msgid "path name too long for external filter"

3091 msgstr "nom de chemin trop long pour un filtre externe"

3092

3069 -#: convert.c:924

3093 +#: convert.c:943

3094 #, c-format

3095 msgid ""

3096 "external filter '%s' is not available anymore although not all paths have "

@@ -3075,20 +3099,48 @@ msgstr ""

3099 "le filtre externe '%s' n'est plus disponible bien que tous les chemins "

3100 "n'aient pas été filtrés"

3101

3078 -#: convert.c:1223

3102 +#: convert.c:1243

3103 msgid "true/false are no valid working-tree-encodings"

3104 msgstr "true/false ne sont pas des encodages d'arbre de travail valides"

3105

3082 -#: convert.c:1411 convert.c:1445

3106 +#: convert.c:1431 convert.c:1465

3107 #, c-format

3108 msgid "%s: clean filter '%s' failed"

3109 msgstr "%s : le filtre clean '%s' a échoué"

3110

3087 -#: convert.c:1489

3111 +#: convert.c:1511

3112 #, c-format

3113 msgid "%s: smudge filter %s failed"

3114 msgstr "%s : le filtre smudge '%s' a échoué"

3115

3116 +#: credential.c:96

3117 +#, c-format

3118 +msgid "skipping credential lookup for key: credential.%s"

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

3120 +

3121 +#: credential.c:112

3122 +msgid "refusing to work with credential missing host field"

3123 +msgstr "refus de travailler avec un champ host manquant dans l'identification"

3124 +

3125 +#: credential.c:114

3126 +msgid "refusing to work with credential missing protocol field"

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

3128 +

3129 +#: credential.c:396

3130 +#, c-format

3131 +msgid "url contains a newline in its %s component: %s"

3132 +msgstr "L'url contient un retour chariot dans composant %s : %s"

3133 +

3134 +#: credential.c:440

3135 +#, c-format

3136 +msgid "url has no scheme: %s"

3137 +msgstr "l'url n'a pas de schéma : %s"

3138 +

3139 +#: credential.c:513

3140 +#, c-format

3141 +msgid "credential url cannot be parsed: %s"

3142 +msgstr "impossible d'analyser l'url d'identification : %s"

3143 +

3144 #: date.c:138

3145 msgid "in the future"

3146 msgstr "dans le futur"

@@ -3183,15 +3235,6 @@ msgstr ""

3235 msgid "Marked %d islands, done.\n"

3236 msgstr "Marquage de %d îlots, fait.\n"

3237

3186 -#: diffcore-order.c:24

3187 -#, c-format

3188 -msgid "failed to read orderfile '%s'"

3189 -msgstr "impossible de lire le fichier de commande '%s'"

3190 -

3191 -#: diffcore-rename.c:543

3192 -msgid "Performing inexact rename detection"

3193 -msgstr "Détection de renommage inexact en cours"

3194 -

3238 #: diff-no-index.c:238

3239 msgid "git diff --no-index [<options>] <path> <path>"

3240 msgstr "git diff --no-index [<options>] <chemin> <chemin>"

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

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

3300 "%s"

3301

3259 -#: diff.c:4202

3302 +#: diff.c:4238

3303 #, c-format

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

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

3306

3264 -#: diff.c:4547

3307 +#: diff.c:4583

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

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

3310

3268 -#: diff.c:4550

3311 +#: diff.c:4586

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

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

3314

3272 -#: diff.c:4628

3315 +#: diff.c:4664

3316 msgid "--follow requires exactly one pathspec"

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

3318

3276 -#: diff.c:4676

3319 +#: diff.c:4712

3320 #, c-format

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

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

3323

3281 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

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

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

3326 #, c-format

3327 msgid "%s expects a numerical value"

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

3329

3287 -#: diff.c:4713

3330 +#: diff.c:4749

3331 #, c-format

3332 msgid ""

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

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

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

3337 "%s"

3338

3296 -#: diff.c:4798

3339 +#: diff.c:4834

3340 #, c-format

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

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

3343

3301 -#: diff.c:4822

3344 +#: diff.c:4858

3345 #, c-format

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

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

3348

3306 -#: diff.c:4836

3349 +#: diff.c:4872

3350 #, c-format

3351 msgid "unable to resolve '%s'"

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

3353

3311 -#: diff.c:4886 diff.c:4892

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

3355 #, c-format

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

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

3358

3316 -#: diff.c:4904

3359 +#: diff.c:4940

3360 #, c-format

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

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

3363

3321 -#: diff.c:4925

3364 +#: diff.c:4961

3365 #, c-format

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

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

3368

3326 -#: diff.c:4944

3369 +#: diff.c:4980

3370 #, c-format

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

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

3373

3331 -#: diff.c:4984

3374 +#: diff.c:5020

3375 msgid ""

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

3377 "\"histogram\""

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

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

3380 "\"histogram\""

3381

3339 -#: diff.c:5020 diff.c:5040

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

3383 #, c-format

3384 msgid "invalid argument to %s"

3385 msgstr "argument invalide pour %s"

3386

3344 -#: diff.c:5178

3387 +#: diff.c:5214

3388 #, c-format

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

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

3391

3349 -#: diff.c:5234

3392 +#: diff.c:5270

3393 #, c-format

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

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

3396

3354 -#: diff.c:5257

3397 +#: diff.c:5293

3398 msgid "Diff output format options"

3399 msgstr "Options de format de sortie de diff"

3400

3358 -#: diff.c:5259 diff.c:5265

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

3402 msgid "generate patch"

3403 msgstr "générer la rustine"

3404

3362 -#: diff.c:5262 builtin/log.c:173

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

3406 msgid "suppress diff output"

3407 msgstr "supprimer la sortie des différences"

3408

3366 -#: diff.c:5267 diff.c:5381 diff.c:5388

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

3410 msgid "<n>"

3411 msgstr "<n>"

3412

3370 -#: diff.c:5268 diff.c:5271

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

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

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

3416

3374 -#: diff.c:5273

3417 +#: diff.c:5309

3418 msgid "generate the diff in raw format"

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

3420

3378 -#: diff.c:5276

3421 +#: diff.c:5312

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

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

3424

3382 -#: diff.c:5280

3425 +#: diff.c:5316

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

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

3428

3386 -#: diff.c:5284

3429 +#: diff.c:5320

3430 msgid "machine friendly --stat"

3431 msgstr "--stat pour traitement automatique"

3432

3390 -#: diff.c:5287

3433 +#: diff.c:5323

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

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

3436

3394 -#: diff.c:5289 diff.c:5297

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

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

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

3440

3398 -#: diff.c:5290

3441 +#: diff.c:5326

3442 msgid ""

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

3444 msgstr ""

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

3446 "chaque sous-répertoire"

3447

3405 -#: diff.c:5294

3448 +#: diff.c:5330

3449 msgid "synonym for --dirstat=cumulative"

3450 msgstr "synonyme pour --dirstat=cumulative"

3451

3409 -#: diff.c:5298

3452 +#: diff.c:5334

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

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

3455

3413 -#: diff.c:5302

3456 +#: diff.c:5338

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

3458 msgstr ""

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

3460 "erreurs d'espace"

3461

3419 -#: diff.c:5305

3462 +#: diff.c:5341

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

3464 msgstr ""

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

3466 "de mode"

3467

3425 -#: diff.c:5308

3468 +#: diff.c:5344

3469 msgid "show only names of changed files"

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

3471

3429 -#: diff.c:5311

3472 +#: diff.c:5347

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

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

3475

3433 -#: diff.c:5313

3476 +#: diff.c:5349

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

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

3479

3437 -#: diff.c:5314

3480 +#: diff.c:5350

3481 msgid "generate diffstat"

3482 msgstr "générer un diffstat"

3483

3441 -#: diff.c:5316 diff.c:5319 diff.c:5322

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

3485 msgid "<width>"

3486 msgstr "<largeur>"

3487

3445 -#: diff.c:5317

3488 +#: diff.c:5353

3489 msgid "generate diffstat with a given width"

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

3491

3449 -#: diff.c:5320

3492 +#: diff.c:5356

3493 msgid "generate diffstat with a given name width"

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

3495

3453 -#: diff.c:5323

3496 +#: diff.c:5359

3497 msgid "generate diffstat with a given graph width"

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

3499

3457 -#: diff.c:5325

3500 +#: diff.c:5361

3501 msgid "<count>"

3502 msgstr "<compte>"

3503

3461 -#: diff.c:5326

3504 +#: diff.c:5362

3505 msgid "generate diffstat with limited lines"

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

3507

3465 -#: diff.c:5329

3508 +#: diff.c:5365

3509 msgid "generate compact summary in diffstat"

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

3511

3469 -#: diff.c:5332

3512 +#: diff.c:5368

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

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

3515

3473 -#: diff.c:5335

3516 +#: diff.c:5371

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

3518 msgstr ""

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

3520 "\"index\""

3521

3479 -#: diff.c:5337

3522 +#: diff.c:5373

3523 msgid "show colored diff"

3524 msgstr "afficher un diff coloré"

3525

3483 -#: diff.c:5338

3526 +#: diff.c:5374

3527 msgid "<kind>"

3528 msgstr "<sorte>"

3529

3487 -#: diff.c:5339

3530 +#: diff.c:5375

3531 msgid ""

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

3533 "diff"

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

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

3536 "'nouveau' dans le diff"

3537

3495 -#: diff.c:5342

3538 +#: diff.c:5378

3539 msgid ""

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

3541 "--numstat"

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

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

3544 "champs dans --raw ou --numstat"

3545

3503 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

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

3547 msgid "<prefix>"

3548 msgstr "<préfixe>"

3549

3507 -#: diff.c:5346

3550 +#: diff.c:5382

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

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

3553

3511 -#: diff.c:5349

3554 +#: diff.c:5385

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

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

3557

3515 -#: diff.c:5352

3558 +#: diff.c:5388

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

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

3561

3519 -#: diff.c:5355

3562 +#: diff.c:5391

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

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

3565

3523 -#: diff.c:5358

3566 +#: diff.c:5394

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

3568 msgstr ""

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

3570 "indiqué"

3571

3529 -#: diff.c:5362 diff.c:5367 diff.c:5372

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

3573 msgid "<char>"

3574 msgstr "<caractère>"

3575

3533 -#: diff.c:5363

3576 +#: diff.c:5399

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

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

3579

3537 -#: diff.c:5368

3580 +#: diff.c:5404

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

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

3583

3541 -#: diff.c:5373

3584 +#: diff.c:5409

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

3586 msgstr ""

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

3588

3546 -#: diff.c:5376

3589 +#: diff.c:5412

3590 msgid "Diff rename options"

3591 msgstr "Options de renommage de diff"

3592

3550 -#: diff.c:5377

3593 +#: diff.c:5413

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

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

3596

3554 -#: diff.c:5378

3597 +#: diff.c:5414

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

3599 msgstr ""

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

3601 "création"

3602

3560 -#: diff.c:5382

3603 +#: diff.c:5418

3604 msgid "detect renames"

3605 msgstr "détecter les renommages"

3606

3564 -#: diff.c:5386

3607 +#: diff.c:5422

3608 msgid "omit the preimage for deletes"

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

3610

3568 -#: diff.c:5389

3611 +#: diff.c:5425

3612 msgid "detect copies"

3613 msgstr "détecter les copies"

3614

3572 -#: diff.c:5393

3615 +#: diff.c:5429

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

3617 msgstr ""

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

3619

3577 -#: diff.c:5395

3620 +#: diff.c:5431

3621 msgid "disable rename detection"

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

3623

3581 -#: diff.c:5398

3624 +#: diff.c:5434

3625 msgid "use empty blobs as rename source"

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

3627

3585 -#: diff.c:5400

3628 +#: diff.c:5436

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

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

3631

3589 -#: diff.c:5403

3632 +#: diff.c:5439

3633 msgid ""

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

3635 "given limit"

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

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

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

3639

3597 -#: diff.c:5405

3640 +#: diff.c:5441

3641 msgid "Diff algorithm options"

3642 msgstr "Options de l'algorithme de diff"

3643

3601 -#: diff.c:5407

3644 +#: diff.c:5443

3645 msgid "produce the smallest possible diff"

3646 msgstr "produire le diff le plus petit possible"

3647

3605 -#: diff.c:5410

3648 +#: diff.c:5446

3649 msgid "ignore whitespace when comparing lines"

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

3651

3609 -#: diff.c:5413

3652 +#: diff.c:5449

3653 msgid "ignore changes in amount of whitespace"

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

3655

3613 -#: diff.c:5416

3656 +#: diff.c:5452

3657 msgid "ignore changes in whitespace at EOL"

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

3659

3617 -#: diff.c:5419

3660 +#: diff.c:5455

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

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

3663

3621 -#: diff.c:5422

3664 +#: diff.c:5458

3665 msgid "ignore changes whose lines are all blank"

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

3667

3625 -#: diff.c:5425

3668 +#: diff.c:5461

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

3670 msgstr ""

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

3672 "lecture"

3673

3631 -#: diff.c:5428

3674 +#: diff.c:5464

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

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

3677

3635 -#: diff.c:5432

3678 +#: diff.c:5468

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

3680 msgstr ""

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

3682

3640 -#: diff.c:5434

3683 +#: diff.c:5470

3684 msgid "<algorithm>"

3685 msgstr "<algorithme>"

3686

3644 -#: diff.c:5435

3687 +#: diff.c:5471

3688 msgid "choose a diff algorithm"

3689 msgstr "choisir un algorithme de différence"

3690

3648 -#: diff.c:5437

3691 +#: diff.c:5473

3692 msgid "<text>"

3693 msgstr "<texte>"

3694

3652 -#: diff.c:5438

3695 +#: diff.c:5474

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

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

3698

3656 -#: diff.c:5440 diff.c:5449 diff.c:5452

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

3700 msgid "<mode>"

3701 msgstr "<mode>"

3702

3660 -#: diff.c:5441

3703 +#: diff.c:5477

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

3705 msgstr ""

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

3707 "mots modifiés"

3708

3666 -#: diff.c:5443 diff.c:5446 diff.c:5491

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

3710 msgid "<regex>"

3711 msgstr "<regex>"

3712

3670 -#: diff.c:5444

3713 +#: diff.c:5480

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

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

3716

3674 -#: diff.c:5447

3717 +#: diff.c:5483

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

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

3720

3678 -#: diff.c:5450

3721 +#: diff.c:5486

3722 msgid "moved lines of code are colored differently"

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

3724

3682 -#: diff.c:5453

3725 +#: diff.c:5489

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

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

3728

3686 -#: diff.c:5456

3729 +#: diff.c:5492

3730 msgid "Other diff options"

3731 msgstr "Autres options diff"

3732

3690 -#: diff.c:5458

3733 +#: diff.c:5494

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

3735 msgstr ""

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

3737 "afficher les chemins relatifs"

3738

3696 -#: diff.c:5462

3739 +#: diff.c:5498

3740 msgid "treat all files as text"

3741 msgstr "traiter les fichiers comme texte"

3742

3700 -#: diff.c:5464

3743 +#: diff.c:5500

3744 msgid "swap two inputs, reverse the diff"

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

3746

3704 -#: diff.c:5466

3747 +#: diff.c:5502

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

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

3750

3708 -#: diff.c:5468

3751 +#: diff.c:5504

3752 msgid "disable all output of the program"

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

3754

3712 -#: diff.c:5470

3755 +#: diff.c:5506

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

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

3758

3716 -#: diff.c:5472

3759 +#: diff.c:5508

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

3761 msgstr ""

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

3763 "fichiers binaires"

3764

3722 -#: diff.c:5474

3765 +#: diff.c:5510

3766 msgid "<when>"

3767 msgstr "<quand>"

3768

3726 -#: diff.c:5475

3769 +#: diff.c:5511

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

3771 msgstr ""

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

3773

3731 -#: diff.c:5478

3774 +#: diff.c:5514

3775 msgid "<format>"

3776 msgstr "<format>"

3777

3735 -#: diff.c:5479

3778 +#: diff.c:5515

3779 msgid "specify how differences in submodules are shown"

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

3781

3739 -#: diff.c:5483

3782 +#: diff.c:5519

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

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

3785

3743 -#: diff.c:5486

3786 +#: diff.c:5522

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

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

3789

3747 -#: diff.c:5488

3790 +#: diff.c:5524

3791 msgid "<string>"

3792 msgstr "<chaîne>"

3793

3751 -#: diff.c:5489

3794 +#: diff.c:5525

3795 msgid ""

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

3797 "string"

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

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

3800 "chaîne spécifiée"

3801

3759 -#: diff.c:5492

3802 +#: diff.c:5528

3803 msgid ""

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

3805 "regex"

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

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

3808 "spécifiée"

3809

3767 -#: diff.c:5495

3810 +#: diff.c:5531

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

3812 msgstr ""

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

3814 "ou -G"

3815

3773 -#: diff.c:5498

3816 +#: diff.c:5534

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

3818 msgstr ""

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

3820

3778 -#: diff.c:5501

3821 +#: diff.c:5537

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

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

3824

3782 -#: diff.c:5502

3825 +#: diff.c:5538

3826 msgid "<object-id>"

3827 msgstr "<id-objet>"

3828

3786 -#: diff.c:5503

3829 +#: diff.c:5539

3830 msgid ""

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

3832 "object"

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

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

3835 "indiqué"

3836

3794 -#: diff.c:5505

3837 +#: diff.c:5541

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

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

3840

3798 -#: diff.c:5506

3841 +#: diff.c:5542

3842 msgid "select files by diff type"

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

3844

3802 -#: diff.c:5508

3845 +#: diff.c:5544

3846 msgid "<file>"

3847 msgstr "<fichier>"

3848

3806 -#: diff.c:5509

3849 +#: diff.c:5545

3850 msgid "Output to a specific file"

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

3852

3810 -#: diff.c:6164

3853 +#: diff.c:6200

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

3855 msgstr ""

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

3857 "fichiers."

3858

3816 -#: diff.c:6167

3859 +#: diff.c:6203

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

3861 msgstr ""

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

3863 "grand nombre de fichiers."

3864

3822 -#: diff.c:6170

3865 +#: diff.c:6206

3866 #, c-format

3867 msgid ""

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

@@ -3827,6 +3870,15 @@ msgstr ""

3870 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "

3871 "commande."

3872

3873 +#: diffcore-order.c:24

3874 +#, c-format

3875 +msgid "failed to read orderfile '%s'"

3876 +msgstr "impossible de lire le fichier de commande '%s'"

3877 +

3878 +#: diffcore-rename.c:592

3879 +msgid "Performing inexact rename detection"

3880 +msgstr "Détection de renommage inexact en cours"

3881 +

3882 #: dir.c:555

3883 #, c-format

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

@@ -3859,35 +3911,35 @@ msgstr "désactivation de la correspondance de motif de cone"

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

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

3913

3862 -#: dir.c:2144

3914 +#: dir.c:2275

3915 #, c-format

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

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

3918

3867 -#: dir.c:2479

3919 +#: dir.c:2575

3920 msgid "failed to get kernel name and information"

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

3922

3871 -#: dir.c:2603

3923 +#: dir.c:2699

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

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

3926

3875 -#: dir.c:3407

3927 +#: dir.c:3481

3928 #, c-format

3929 msgid "index file corrupt in repo %s"

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

3931

3880 -#: dir.c:3452 dir.c:3457

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

3933 #, c-format

3934 msgid "could not create directories for %s"

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

3936

3885 -#: dir.c:3486

3937 +#: dir.c:3560

3938 #, c-format

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

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

3941

3890 -#: editor.c:73

3942 +#: editor.c:74

3943 #, c-format

3944 msgid "hint: Waiting for your editor to close the file...%c"

3945 msgstr ""

@@ -3898,17 +3950,17 @@ msgstr ""

3950 msgid "Filtering content"

3951 msgstr "Filtrage du contenu"

3952

3901 -#: entry.c:476

3953 +#: entry.c:479

3954 #, c-format

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

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

3957

3906 -#: environment.c:149

3958 +#: environment.c:150

3959 #, c-format

3960 msgid "bad git namespace path \"%s\""

3961 msgstr "Espaces de nom de Git \"%s\""

3962

3911 -#: environment.c:331

3963 +#: environment.c:337

3964 #, c-format

3965 msgid "could not set GIT_DIR to '%s'"

3966 msgstr "impossible de régler GIT_DIR à '%s'"

@@ -3918,245 +3970,245 @@ msgstr "impossible de régler GIT_DIR à '%s'"

3970 msgid "too many args to run %s"

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

3972

3921 -#: fetch-pack.c:150

3973 +#: fetch-pack.c:151

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

3975 msgstr "git fetch-pack : liste superficielle attendue"

3976

3925 -#: fetch-pack.c:153

3977 +#: fetch-pack.c:154

3978 msgid "git fetch-pack: expected a flush packet after shallow list"

3979 msgstr ""

3980 "git fetch-pack : paquet de vidage attendu après une liste superficielle"

3981

3930 -#: fetch-pack.c:164

3982 +#: fetch-pack.c:165

3983 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3984 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

3985

3934 -#: fetch-pack.c:184

3986 +#: fetch-pack.c:185

3987 #, c-format

3988 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3989 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

3990

3939 -#: fetch-pack.c:195

3991 +#: fetch-pack.c:196

3992 msgid "unable to write to remote"

3993 msgstr "impossible d'écrire sur un distant"

3994

3943 -#: fetch-pack.c:257

3995 +#: fetch-pack.c:258

3996 msgid "--stateless-rpc requires multi_ack_detailed"

3997 msgstr "--stateless-rpc nécessite multi_ack_detailed"

3998

3947 -#: fetch-pack.c:356 fetch-pack.c:1340

3999 +#: fetch-pack.c:357 fetch-pack.c:1364

4000 #, c-format

4001 msgid "invalid shallow line: %s"

4002 msgstr "ligne de superficiel invalide : %s"

4003

3952 -#: fetch-pack.c:362 fetch-pack.c:1346

4004 +#: fetch-pack.c:363 fetch-pack.c:1370

4005 #, c-format

4006 msgid "invalid unshallow line: %s"

4007 msgstr "ligne de fin de superficiel invalide : %s"

4008

3957 -#: fetch-pack.c:364 fetch-pack.c:1348

4009 +#: fetch-pack.c:365 fetch-pack.c:1372

4010 #, c-format

4011 msgid "object not found: %s"

4012 msgstr "objet non trouvé : %s"

4013

3962 -#: fetch-pack.c:367 fetch-pack.c:1351

4014 +#: fetch-pack.c:368 fetch-pack.c:1375

4015 #, c-format

4016 msgid "error in object: %s"

4017 msgstr "Erreur dans l'objet : %s"

4018

3967 -#: fetch-pack.c:369 fetch-pack.c:1353

4019 +#: fetch-pack.c:370 fetch-pack.c:1377

4020 #, c-format

4021 msgid "no shallow found: %s"

4022 msgstr "Pas de superficiel trouvé : %s"

4023

3972 -#: fetch-pack.c:372 fetch-pack.c:1357

4024 +#: fetch-pack.c:373 fetch-pack.c:1381

4025 #, c-format

4026 msgid "expected shallow/unshallow, got %s"

4027 msgstr "superficiel/non superficiel attendu, %s trouvé"

4028

3977 -#: fetch-pack.c:414

4029 +#: fetch-pack.c:415

4030 #, c-format

4031 msgid "got %s %d %s"

4032 msgstr "réponse %s %d %s"

4033

3982 -#: fetch-pack.c:431

4034 +#: fetch-pack.c:432

4035 #, c-format

4036 msgid "invalid commit %s"

4037 msgstr "commit invalide %s"

4038

3987 -#: fetch-pack.c:462

4039 +#: fetch-pack.c:463

4040 msgid "giving up"

4041 msgstr "abandon"

4042

3991 -#: fetch-pack.c:475 progress.c:323

4043 +#: fetch-pack.c:476 progress.c:340

4044 msgid "done"

4045 msgstr "fait"

4046

3995 -#: fetch-pack.c:487

4047 +#: fetch-pack.c:488

4048 #, c-format

4049 msgid "got %s (%d) %s"

4050 msgstr "%s trouvé (%d) %s"

4051

4000 -#: fetch-pack.c:533

4052 +#: fetch-pack.c:534

4053 #, c-format

4054 msgid "Marking %s as complete"

4055 msgstr "Marquage de %s comme terminé"

4056

4005 -#: fetch-pack.c:754

4057 +#: fetch-pack.c:755

4058 #, c-format

4059 msgid "already have %s (%s)"

4060 msgstr "%s déjà possédé (%s)"

4061

4010 -#: fetch-pack.c:818

4062 +#: fetch-pack.c:819

4063 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4064 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"

4065

4014 -#: fetch-pack.c:826

4066 +#: fetch-pack.c:827

4067 msgid "protocol error: bad pack header"

4068 msgstr "erreur de protocole : mauvais entête de paquet"

4069

4018 -#: fetch-pack.c:900

4070 +#: fetch-pack.c:901

4071 #, c-format

4072 msgid "fetch-pack: unable to fork off %s"

4073 msgstr "fetch-pack : impossible de dupliquer %s"

4074

4023 -#: fetch-pack.c:916

4075 +#: fetch-pack.c:917

4076 #, c-format

4077 msgid "%s failed"

4078 msgstr "échec de %s"

4079

4028 -#: fetch-pack.c:918

4080 +#: fetch-pack.c:919

4081 msgid "error in sideband demultiplexer"

4082 msgstr "erreur dans le démultiplexer latéral"

4083

4032 -#: fetch-pack.c:965

4084 +#: fetch-pack.c:966

4085 #, c-format

4086 msgid "Server version is %.*s"

4087 msgstr "La version du serveur est %.*s"

4088

4037 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

4038 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

4039 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

4040 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

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

4093 #, c-format

4094 msgid "Server supports %s"

4095 msgstr "Le serveur supporte %s"

4096

4045 -#: fetch-pack.c:972

4097 +#: fetch-pack.c:973

4098 msgid "Server does not support shallow clients"

4099 msgstr "Le serveur ne supporte les clients superficiels"

4100

4049 -#: fetch-pack.c:1032

4101 +#: fetch-pack.c:1033

4102 msgid "Server does not support --shallow-since"

4103 msgstr "Le receveur ne gère pas --shallow-since"

4104

4053 -#: fetch-pack.c:1037

4105 +#: fetch-pack.c:1038

4106 msgid "Server does not support --shallow-exclude"

4107 msgstr "Le receveur ne gère pas --shallow-exclude"

4108

4057 -#: fetch-pack.c:1041

4109 +#: fetch-pack.c:1042

4110 msgid "Server does not support --deepen"

4111 msgstr "Le receveur ne gère pas --deepen"

4112

4061 -#: fetch-pack.c:1058

4113 +#: fetch-pack.c:1059

4114 msgid "no common commits"

4115 msgstr "pas de commit commun"

4116

4065 -#: fetch-pack.c:1070 fetch-pack.c:1536

4117 +#: fetch-pack.c:1071 fetch-pack.c:1563

4118 msgid "git fetch-pack: fetch failed."

4119 msgstr "git fetch-pack : échec de le récupération."

4120

4069 -#: fetch-pack.c:1209

4121 +#: fetch-pack.c:1211

4122 msgid "Server does not support shallow requests"

4123 msgstr "Le serveur ne supporte les requêtes superficielles"

4124

4073 -#: fetch-pack.c:1216

4125 +#: fetch-pack.c:1218

4126 msgid "Server supports filter"

4127 msgstr "Le serveur supporte filter"

4128

4077 -#: fetch-pack.c:1239

4129 +#: fetch-pack.c:1242

4130 msgid "unable to write request to remote"

4131 msgstr "impossible d'écrire la requête sur le distant"

4132

4081 -#: fetch-pack.c:1257

4133 +#: fetch-pack.c:1260

4134 #, c-format

4135 msgid "error reading section header '%s'"

4136 msgstr "erreur à la lecture de l'entête de section '%s'"

4137

4086 -#: fetch-pack.c:1263

4138 +#: fetch-pack.c:1266

4139 #, c-format

4140 msgid "expected '%s', received '%s'"

4141 msgstr "'%s' attendu, '%s' reçu"

4142

4091 -#: fetch-pack.c:1303

4143 +#: fetch-pack.c:1327

4144 #, c-format

4145 msgid "unexpected acknowledgment line: '%s'"

4146 msgstr "ligne d'acquittement inattendue : '%s'"

4147

4096 -#: fetch-pack.c:1308

4148 +#: fetch-pack.c:1332

4149 #, c-format

4150 msgid "error processing acks: %d"

4151 msgstr "erreur lors du traitement des acquittements : %d"

4152

4101 -#: fetch-pack.c:1318

4153 +#: fetch-pack.c:1342

4154 msgid "expected packfile to be sent after 'ready'"

4155 msgstr "fichier paquet attendu à envoyer après 'ready'"

4156

4105 -#: fetch-pack.c:1320

4157 +#: fetch-pack.c:1344

4158 msgid "expected no other sections to be sent after no 'ready'"

4159 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

4160

4109 -#: fetch-pack.c:1362

4161 +#: fetch-pack.c:1386

4162 #, c-format

4163 msgid "error processing shallow info: %d"

4164 msgstr "erreur lors du traitement de l'information de superficialité : %d"

4165

4114 -#: fetch-pack.c:1409

4166 +#: fetch-pack.c:1433

4167 #, c-format

4168 msgid "expected wanted-ref, got '%s'"

4169 msgstr "wanted-ref attendu, '%s' trouvé"

4170

4119 -#: fetch-pack.c:1414

4171 +#: fetch-pack.c:1438

4172 #, c-format

4173 msgid "unexpected wanted-ref: '%s'"

4174 msgstr "wanted-ref inattendu : '%s'"

4175

4124 -#: fetch-pack.c:1419

4176 +#: fetch-pack.c:1443

4177 #, c-format

4178 msgid "error processing wanted refs: %d"

4179 msgstr "erreur lors du traitement des références voulues : %d"

4180

4129 -#: fetch-pack.c:1762

4181 +#: fetch-pack.c:1789

4182 msgid "no matching remote head"

4183 msgstr "pas de HEAD distante correspondante"

4184

4133 -#: fetch-pack.c:1785 builtin/clone.c:689

4185 +#: fetch-pack.c:1812 builtin/clone.c:692

4186 msgid "remote did not send all necessary objects"

4187 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4188

4137 -#: fetch-pack.c:1812

4189 +#: fetch-pack.c:1839

4190 #, c-format

4191 msgid "no such remote ref %s"

4192 msgstr "référence distante inconnue %s"

4193

4142 -#: fetch-pack.c:1815

4194 +#: fetch-pack.c:1842

4195 #, c-format

4196 msgid "Server does not allow request for unadvertised object %s"

4197 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"

4198

4147 -#: gpg-interface.c:408

4148 -msgid "gpg failed to sign the data"

4149 -msgstr "gpg n'a pas pu signer les données"

4150 -

4151 -#: gpg-interface.c:434

4199 +#: gpg-interface.c:272

4200 msgid "could not create temporary file"

4201 msgstr "impossible de créer un fichier temporaire"

4202

4155 -#: gpg-interface.c:437

4203 +#: gpg-interface.c:275

4204 #, c-format

4205 msgid "failed writing detached signature to '%s'"

4206 msgstr "impossible d'écrire la signature détachée dans '%s'"

4207

4208 +#: gpg-interface.c:457

4209 +msgid "gpg failed to sign the data"

4210 +msgstr "gpg n'a pas pu signer les données"

4211 +

4212 #: graph.c:98

4213 #, c-format

4214 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -4175,7 +4227,7 @@ msgstr ""

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

4228 msgstr "'%s' : lecture de %s impossible"

4229

4178 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4230 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4231 #: builtin/rm.c:135

4232 #, c-format

4233 msgid "failed to stat '%s'"

@@ -4252,7 +4304,7 @@ msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

4304 msgid "These are common Git commands used in various situations:"

4305 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"

4306

4255 -#: help.c:363 git.c:98

4307 +#: help.c:363 git.c:99

4308 #, c-format

4309 msgid "unsupported command listing type '%s'"

4310 msgstr "type de liste de commandes non supporté '%s'"

@@ -4261,21 +4313,21 @@ msgstr "type de liste de commandes non supporté '%s'"

4313 msgid "The common Git guides are:"

4314 msgstr "Les guides Git populaires sont :"

4315

4264 -#: help.c:512

4316 +#: help.c:427

4317 msgid "See 'git help <command>' to read about a specific subcommand"

4318 msgstr ""

4319 "Référez-vous à 'git help <commande>' pour des informations sur une sous-"

4320 "commande spécifique"

4321

4270 -#: help.c:517

4322 +#: help.c:432

4323 msgid "External commands"

4324 msgstr "Commandes externes"

4325

4274 -#: help.c:532

4326 +#: help.c:447

4327 msgid "Command aliases"

4328 msgstr "Alias de commande"

4329

4278 -#: help.c:596

4330 +#: help.c:511

4331 #, c-format

4332 msgid ""

4333 "'%s' appears to be a git command, but we were not\n"

@@ -4284,33 +4336,33 @@ msgstr ""

4336 "'%s' semble être une commande git, mais elle n'a pas pu\n"

4337 "être exécutée. Peut-être git-%s est-elle cassée ?"

4338

4287 -#: help.c:655

4339 +#: help.c:570

4340 msgid "Uh oh. Your system reports no Git commands at all."

4341 msgstr "Ahem. Votre système n'indique aucune commande Git."

4342

4291 -#: help.c:677

4343 +#: help.c:592

4344 #, c-format

4345 msgid "WARNING: You called a Git command named '%s', which does not exist."

4346 msgstr ""

4347 "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."

4348

4297 -#: help.c:682

4349 +#: help.c:597

4350 #, c-format

4351 msgid "Continuing under the assumption that you meant '%s'."

4352 msgstr "Continuons en supposant que vous avez voulu dire '%s'."

4353

4302 -#: help.c:687

4354 +#: help.c:602

4355 #, c-format

4356 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4357 msgstr ""

4358 "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."

4359

4308 -#: help.c:695

4360 +#: help.c:610

4361 #, c-format

4362 msgid "git: '%s' is not a git command. See 'git --help'."

4363 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."

4364

4313 -#: help.c:699

4365 +#: help.c:614

4366 msgid ""

4367 "\n"

4368 "The most similar command is"

@@ -4324,16 +4376,16 @@ msgstr[1] ""

4376 "\n"

4377 "Les commandes les plus ressemblantes sont"

4378

4327 -#: help.c:714

4379 +#: help.c:653

4380 msgid "git version [<options>]"

4381 msgstr "git version [<options>]"

4382

4331 -#: help.c:783

4383 +#: help.c:708

4384 #, c-format

4385 msgid "%s: %s - %s"

4386 msgstr "%s: %s - %s"

4387

4336 -#: help.c:787

4388 +#: help.c:712

4389 msgid ""

4390 "\n"

4391 "Did you mean this?"

@@ -4401,38 +4453,11 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

4453 msgid "name consists only of disallowed characters: %s"

4454 msgstr "le nom n'est constitué que de caractères interdits : %s"

4455

4404 -#: ident.c:436 builtin/commit.c:635

4456 +#: ident.c:436 builtin/commit.c:634

4457 #, c-format

4458 msgid "invalid date format: %s"

4459 msgstr "format de date invalide : %s"

4460

4409 -#: list-objects.c:127

4410 -#, c-format

4411 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4412 -msgstr ""

4413 -"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"

4414 -

4415 -#: list-objects.c:140

4416 -#, c-format

4417 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4418 -msgstr ""

4419 -"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"

4420 -

4421 -#: list-objects.c:375

4422 -#, c-format

4423 -msgid "unable to load root tree for commit %s"

4424 -msgstr "impossible de charger l'arbre racine pour le commit %s"

4425 -

4426 -#: list-objects-filter.c:492

4427 -#, c-format

4428 -msgid "unable to access sparse blob in '%s'"

4429 -msgstr "impossible d'accéder au blob clairsemé dans '%s'"

4430 -

4431 -#: list-objects-filter.c:495

4432 -#, c-format

4433 -msgid "unable to parse sparse filter data in %s"

4434 -msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"

4435 -

4461 #: list-objects-filter-options.c:58

4462 msgid "expected 'tree:<depth>'"

4463 msgstr "attendu : 'tree:<profondeur>'"

@@ -4460,7 +4485,34 @@ msgstr "quelque chose attendu après combine :"

4485 msgid "multiple filter-specs cannot be combined"

4486 msgstr "impossible de combiner des spécificateurs multiples de filtre"

4487

4463 -#: lockfile.c:151

4488 +#: list-objects-filter.c:492

4489 +#, c-format

4490 +msgid "unable to access sparse blob in '%s'"

4491 +msgstr "impossible d'accéder au blob clairsemé dans '%s'"

4492 +

4493 +#: list-objects-filter.c:495

4494 +#, c-format

4495 +msgid "unable to parse sparse filter data in %s"

4496 +msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"

4497 +

4498 +#: list-objects.c:127

4499 +#, c-format

4500 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4501 +msgstr ""

4502 +"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"

4503 +

4504 +#: list-objects.c:140

4505 +#, c-format

4506 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4507 +msgstr ""

4508 +"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"

4509 +

4510 +#: list-objects.c:375

4511 +#, c-format

4512 +msgid "unable to load root tree for commit %s"

4513 +msgstr "impossible de charger l'arbre racine pour le commit %s"

4514 +

4515 +#: lockfile.c:152

4516 #, c-format

4517 msgid ""

4518 "Unable to create '%s.lock': %s.\n"

@@ -4479,20 +4531,14 @@ msgstr ""

4531 "un processus git peut avoir planté :\n"

4532 "supprimez le fichier manuellement pour poursuivre."

4533

4482 -#: lockfile.c:159

4534 +#: lockfile.c:160

4535 #, c-format

4536 msgid "Unable to create '%s.lock': %s"

4537 msgstr "Impossible de créer '%s.lock' : %s"

4538

4487 -#: merge.c:41

4488 -msgid "failed to read the cache"

4489 -msgstr "impossible de lire le cache"

4490 -

4491 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4492 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4493 -#: builtin/stash.c:265

4494 -msgid "unable to write new index file"

4495 -msgstr "impossible d'écrire le nouveau fichier d'index"

4539 +#: ls-refs.c:109

4540 +msgid "expected flush after ls-refs arguments"

4541 +msgstr "vidage attendu après les arguments ls-refs"

4542

4543 #: merge-recursive.c:356

4544 msgid "(bad commit)\n"

@@ -4805,7 +4851,7 @@ msgstr "ajout/ajout"

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

4852 msgstr "%s sauté (fusion identique à l'existant)"

4853

4808 -#: merge-recursive.c:3089 git-submodule.sh:1003

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

4855 msgid "submodule"

4856 msgstr "sous-module"

4857

@@ -4925,10 +4971,20 @@ msgstr ""

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

4972 msgstr "Impossible d'analyser l'objet '%s'"

4973

4928 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

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

4975 msgid "Unable to write index."

4976 msgstr "Impossible d'écrire l'index."

4977

4978 +#: merge.c:41

4979 +msgid "failed to read the cache"

4980 +msgstr "impossible de lire le cache"

4981 +

4982 +#: 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

4984 +#: builtin/stash.c:265

4985 +msgid "unable to write new index file"

4986 +msgstr "impossible d'écrire le nouveau fichier d'index"

4987 +

4988 #: midx.c:68

4989 #, c-format

4990 msgid "multi-pack-index file %s is too small"

@@ -4983,58 +5039,62 @@ msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5039 msgstr ""

5040 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

5041

4986 -#: midx.c:210

5042 +#: midx.c:208

5043 #, c-format

5044 msgid "bad pack-int-id: %u (%u total packs)"

5045 msgstr "mauvais pack-int-id : %u (%u paquets au total)"

5046

4991 -#: midx.c:260

5047 +#: midx.c:258

5048 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5049 msgstr ""

5050 "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"

5051

4996 -#: midx.c:288

5052 +#: midx.c:286

5053 msgid "error preparing packfile from multi-pack-index"

5054 msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

5055

5000 -#: midx.c:472

5056 +#: midx.c:470

5057 #, c-format

5058 msgid "failed to add packfile '%s'"

5059 msgstr "échec de l'ajout du fichier paquet '%s'"

5060

5005 -#: midx.c:478

5061 +#: midx.c:476

5062 #, c-format

5063 msgid "failed to open pack-index '%s'"

5064 msgstr "échec à l'ouverture du fichier paquet '%s'"

5065

5010 -#: midx.c:538

5066 +#: midx.c:536

5067 #, c-format

5068 msgid "failed to locate object %d in packfile"

5069 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

5070

5015 -#: midx.c:842

5071 +#: midx.c:840

5072 msgid "Adding packfiles to multi-pack-index"

5073 msgstr "Ajout de fichiers paquet à un index multi-paquet"

5074

5019 -#: midx.c:875

5075 +#: midx.c:873

5076 #, c-format

5077 msgid "did not see pack-file %s to drop"

5078 msgstr "fichier paquet à éliminer %s non trouvé"

5079

5024 -#: midx.c:973

5080 +#: midx.c:925

5081 +msgid "no pack files to index."

5082 +msgstr "Aucun fichier paquet à l'index."

5083 +

5084 +#: midx.c:977

5085 msgid "Writing chunks to multi-pack-index"

5086 msgstr "Écriture des sections dans l'index multi-paquet"

5087

5028 -#: midx.c:1052

5088 +#: midx.c:1056

5089 #, c-format

5090 msgid "failed to clear multi-pack-index at %s"

5091 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

5092

5033 -#: midx.c:1108

5093 +#: midx.c:1112

5094 msgid "Looking for referenced packfiles"

5095 msgstr "Recherche de fichiers paquets référencés"

5096

5037 -#: midx.c:1123

5097 +#: midx.c:1127

5098 #, c-format

5099 msgid ""

5100 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

@@ -5042,51 +5102,55 @@ msgstr ""

5102 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

5103 "étalement[%d]"

5104

5045 -#: midx.c:1128

5105 +#: midx.c:1132

5106 +msgid "the midx contains no oid"

5107 +msgstr "le midx ne contient aucun oid"

5108 +

5109 +#: midx.c:1141

5110 msgid "Verifying OID order in multi-pack-index"

5111 msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"

5112

5049 -#: midx.c:1137

5113 +#: midx.c:1150

5114 #, c-format

5115 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5116 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

5117

5054 -#: midx.c:1157

5118 +#: midx.c:1170

5119 msgid "Sorting objects by packfile"

5120 msgstr "Classement des objets par fichier paquet"

5121

5058 -#: midx.c:1164

5122 +#: midx.c:1177

5123 msgid "Verifying object offsets"

5124 msgstr "Vérification des décalages des objets"

5125

5062 -#: midx.c:1180

5126 +#: midx.c:1193

5127 #, c-format

5128 msgid "failed to load pack entry for oid[%d] = %s"

5129 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

5130

5067 -#: midx.c:1186

5131 +#: midx.c:1199

5132 #, c-format

5133 msgid "failed to load pack-index for packfile %s"

5134 msgstr "impossible de lire le fichier paquet %s"

5135

5072 -#: midx.c:1195

5136 +#: midx.c:1208

5137 #, c-format

5138 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5139 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

5140

5077 -#: midx.c:1220

5141 +#: midx.c:1233

5142 msgid "Counting referenced objects"

5143 msgstr "Comptage des objets référencés"

5144

5081 -#: midx.c:1230

5145 +#: midx.c:1243

5146 msgid "Finding and deleting unreferenced packfiles"

5147 msgstr "Recherche et effacement des fichiers paquets non-référencés"

5148

5085 -#: midx.c:1388

5149 +#: midx.c:1433

5150 msgid "could not start pack-objects"

5151 msgstr "Impossible de démarrer le groupement d'objets"

5152

5089 -#: midx.c:1407

5153 +#: midx.c:1452

5154 msgid "could not finish pack-objects"

5155 msgstr "Impossible de finir le groupement d'objets"

5156

@@ -5169,6 +5233,11 @@ msgstr "impossible d'analyser l'objet : %s"

5233 msgid "hash mismatch %s"

5234 msgstr "incohérence de hachage %s"

5235

5236 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5237 +#, c-format

5238 +msgid "unable to get size of %s"

5239 +msgstr "impossible de récupérer la taille de %s"

5240 +

5241 #: packfile.c:629

5242 msgid "offset before end of packfile (broken .idx?)"

5243 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

@@ -5184,10 +5253,25 @@ msgid "offset beyond end of pack index for %s (truncated index?)"

5253 msgstr ""

5254 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

5255

5187 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5256 +#: parse-options-cb.c:20 parse-options-cb.c:24

5257 #, c-format

5189 -msgid "unable to get size of %s"

5190 -msgstr "impossible de récupérer la taille de %s"

5258 +msgid "option `%s' expects a numerical value"

5259 +msgstr "l'option '%s' attend une valeur numérique"

5260 +

5261 +#: parse-options-cb.c:41

5262 +#, c-format

5263 +msgid "malformed expiration date '%s'"

5264 +msgstr "date d'expiration malformée : '%s'"

5265 +

5266 +#: parse-options-cb.c:54

5267 +#, c-format

5268 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5269 +msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""

5270 +

5271 +#: parse-options-cb.c:130 parse-options-cb.c:147

5272 +#, c-format

5273 +msgid "malformed object name '%s'"

5274 +msgstr "nom d'objet malformé '%s'"

5275

5276 #: parse-options.c:38

5277 #, c-format

@@ -5229,26 +5313,31 @@ msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"

5313 msgid "did you mean `--%s` (with two dashes)?"

5314 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"

5315

5232 -#: parse-options.c:857

5316 +#: parse-options.c:663 parse-options.c:963

5317 +#, c-format

5318 +msgid "alias of --%s"

5319 +msgstr "alias pour --%s"

5320 +

5321 +#: parse-options.c:854

5322 #, c-format

5323 msgid "unknown option `%s'"

5324 msgstr "option inconnue « %s »"

5325

5237 -#: parse-options.c:859

5326 +#: parse-options.c:856

5327 #, c-format

5328 msgid "unknown switch `%c'"

5329 msgstr "bascule inconnue « %c »"

5330

5242 -#: parse-options.c:861

5331 +#: parse-options.c:858

5332 #, c-format

5333 msgid "unknown non-ascii option in string: `%s'"

5334 msgstr "option non-ascii inconnue dans la chaîne : '%s'"

5335

5247 -#: parse-options.c:885

5336 +#: parse-options.c:882

5337 msgid "..."

5338 msgstr "..."

5339

5251 -#: parse-options.c:904

5340 +#: parse-options.c:901

5341 #, c-format

5342 msgid "usage: %s"

5343 msgstr "usage : %s"

@@ -5256,45 +5345,20 @@ msgstr "usage : %s"

5345 #. TRANSLATORS: the colon here should align with the

5346 #. one in "usage: %s" translation.

5347 #.

5259 -#: parse-options.c:910

5348 +#: parse-options.c:907

5349 #, c-format

5350 msgid " or: %s"

5351 msgstr " ou : %s"

5352

5264 -#: parse-options.c:913

5353 +#: parse-options.c:910

5354 #, c-format

5355 msgid " %s"

5356 msgstr " %s"

5357

5269 -#: parse-options.c:952

5358 +#: parse-options.c:949

5359 msgid "-NUM"

5360 msgstr "-NUM"

5361

5273 -#: parse-options.c:966

5274 -#, c-format

5275 -msgid "alias of --%s"

5276 -msgstr "alias pour --%s"

5277 -

5278 -#: parse-options-cb.c:20 parse-options-cb.c:24

5279 -#, c-format

5280 -msgid "option `%s' expects a numerical value"

5281 -msgstr "l'option '%s' attend une valeur numérique"

5282 -

5283 -#: parse-options-cb.c:41

5284 -#, c-format

5285 -msgid "malformed expiration date '%s'"

5286 -msgstr "date d'expiration malformée : '%s'"

5287 -

5288 -#: parse-options-cb.c:54

5289 -#, c-format

5290 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5291 -msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""

5292 -

5293 -#: parse-options-cb.c:130 parse-options-cb.c:147

5294 -#, c-format

5295 -msgid "malformed object name '%s'"

5296 -msgstr "nom d'objet malformé '%s'"

5297 -

5362 #: path.c:915

5363 #, c-format

5364 msgid "Could not make %s writable by group"

@@ -5357,29 +5421,29 @@ msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

5421 msgid "%s: 'literal' and 'glob' are incompatible"

5422 msgstr "%s : 'literal' et 'glob' sont incompatibles"

5423

5360 -#: pathspec.c:442

5424 +#: pathspec.c:445

5425 #, c-format

5426 msgid "%s: '%s' is outside repository at '%s'"

5427 msgstr "%s : '%s' est hors du dépôt à '%s'"

5428

5365 -#: pathspec.c:517

5429 +#: pathspec.c:521

5430 #, c-format

5431 msgid "'%s' (mnemonic: '%c')"

5432 msgstr "'%s' (mnémonique : '%c')"

5433

5370 -#: pathspec.c:527

5434 +#: pathspec.c:531

5435 #, c-format

5436 msgid "%s: pathspec magic not supported by this command: %s"

5437 msgstr ""

5438 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

5439 "commande : %s"

5440

5377 -#: pathspec.c:594

5441 +#: pathspec.c:598

5442 #, c-format

5443 msgid "pathspec '%s' is beyond a symbolic link"

5444 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

5445

5382 -#: pathspec.c:639

5446 +#: pathspec.c:643

5447 #, c-format

5448 msgid "line is badly quoted: %s"

5449 msgstr "la ligne est mal citée : %s"

@@ -5446,7 +5510,7 @@ msgstr "Rafraîchissement de l'index"

5510 msgid "unable to create threaded lstat: %s"

5511 msgstr "impossible de créer le lstat en fil : %s"

5512

5449 -#: pretty.c:981

5513 +#: pretty.c:982

5514 msgid "unable to parse --pretty format"

5515 msgstr "impossible d'analyser le format --pretty"

5516

@@ -5459,29 +5523,40 @@ msgstr "Dépôt distant sans URL"

5523 msgid "promisor remote name cannot begin with '/': %s"

5524 msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"

5525

5462 -#: range-diff.c:75

5526 +#: prune-packed.c:35

5527 +msgid "Removing duplicate objects"

5528 +msgstr "Suppression des objets dupliqués"

5529 +

5530 +#: range-diff.c:77

5531 msgid "could not start `log`"

5532 msgstr "impossible de démarrer `log`"

5533

5466 -#: range-diff.c:77

5534 +#: range-diff.c:79

5535 msgid "could not read `log` output"

5536 msgstr "impossible de lire la sortie de `log`"

5537

5470 -#: range-diff.c:96 sequencer.c:5020

5538 +#: range-diff.c:98 sequencer.c:5143

5539 #, c-format

5540 msgid "could not parse commit '%s'"

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

5542

5475 -#: range-diff.c:122

5543 +#: range-diff.c:112

5544 +#, c-format

5545 +msgid ""

5546 +"could not parse first line of `log` output: did not start with 'commit ': "

5547 +"'%s'"

5548 +msgstr "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'"

5549 +

5550 +#: range-diff.c:137

5551 #, c-format

5552 msgid "could not parse git header '%.*s'"

5553 msgstr "impossible d'analyser l'entête git '%.*s'"

5554

5480 -#: range-diff.c:285

5555 +#: range-diff.c:301

5556 msgid "failed to generate diff"

5557 msgstr "échec de la génération de diff"

5558

5484 -#: range-diff.c:518 range-diff.c:520

5559 +#: range-diff.c:534 range-diff.c:536

5560 #, c-format

5561 msgid "could not parse log for '%s'"

5562 msgstr "impossible d'analyser le journal pour '%s'"

@@ -5599,9 +5674,9 @@ msgstr "entrées de préparation non ordonnées pour '%s'"

5674

5675 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5676 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5602 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5603 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5604 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5677 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5678 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5679 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5680 #: builtin/submodule--helper.c:332

5681 msgid "index file corrupt"

5682 msgstr "fichier d'index corrompu"

@@ -5656,12 +5731,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'"

5731 msgid "broken index, expect %s in %s, got %s"

5732 msgstr "index cassé, %s attendu dans %s, %s obtenu"

5733

5659 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5734 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5735 #, c-format

5736 msgid "could not close '%s'"

5737 msgstr "impossible de fermer '%s'"

5738

5664 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5739 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5740 #, c-format

5741 msgid "could not stat '%s'"

5742 msgstr "stat impossible de '%s'"

@@ -5794,14 +5869,14 @@ msgstr ""

5869 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"

5870 "\n"

5871

5797 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5798 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

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

5873 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258

5874 #, c-format

5875 msgid "could not write '%s'"

5876 msgstr "impossible d'écrire '%s'"

5877

5803 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5804 -#: builtin/rebase.c:234

5878 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5879 +#: builtin/rebase.c:240

5880 #, c-format

5881 msgid "could not write '%s'."

5882 msgstr "impossible d'écrire '%s'."

@@ -5833,192 +5908,74 @@ msgstr ""

5908 "Les comportements disponibles sont : ignore, warn, error.\n"

5909 "\n"

5910

5836 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5837 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5838 -#: builtin/rebase.c:246

5911 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5912 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5913 +#: builtin/rebase.c:252

5914 #, c-format

5915 msgid "could not read '%s'."

5916 msgstr "impossible de lire '%s'."

5917

5843 -#: refs.c:262

5844 -#, c-format

5845 -msgid "%s does not point to a valid object!"

5846 -msgstr "%s ne pointe pas sur un objet valide!"

5918 +# à priori on parle d'une branche ici

5919 +#: ref-filter.c:42 wt-status.c:1936

5920 +msgid "gone"

5921 +msgstr "disparue"

5922

5848 -#: refs.c:667

5923 +#: ref-filter.c:43

5924 #, c-format

5850 -msgid "ignoring dangling symref %s"

5851 -msgstr "symref pendant %s ignoré"

5925 +msgid "ahead %d"

5926 +msgstr "en avance de %d"

5927

5853 -#: refs.c:669 ref-filter.c:2098

5928 +#: ref-filter.c:44

5929 #, c-format

5855 -msgid "ignoring broken ref %s"

5856 -msgstr "réf cassé %s ignoré"

5930 +msgid "behind %d"

5931 +msgstr "en retard de %d"

5932

5858 -#: refs.c:804

5933 +#: ref-filter.c:45

5934 #, c-format

5860 -msgid "could not open '%s' for writing: %s"

5861 -msgstr "impossible d'ouvrir '%s' en écriture : %s"

5935 +msgid "ahead %d, behind %d"

5936 +msgstr "en avance de %d, en retard de %d"

5937

5863 -#: refs.c:814 refs.c:865

5938 +#: ref-filter.c:165

5939 #, c-format

5865 -msgid "could not read ref '%s'"

5866 -msgstr "impossible de lire la réf '%s'"

5940 +msgid "expected format: %%(color:<color>)"

5941 +msgstr "format attendu : %%(color:<couleur>)"

5942

5868 -#: refs.c:820

5943 +#: ref-filter.c:167

5944 #, c-format

5870 -msgid "ref '%s' already exists"

5871 -msgstr "la référence '%s' existe déjà"

5945 +msgid "unrecognized color: %%(color:%s)"

5946 +msgstr "couleur non reconnue : %%(color:%s)"

5947

5873 -#: refs.c:825

5948 +#: ref-filter.c:189

5949 #, c-format

5875 -msgid "unexpected object ID when writing '%s'"

5876 -msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5950 +msgid "Integer value expected refname:lstrip=%s"

5951 +msgstr "Valeur entière attendue refname:lstrip=%s"

5952

5878 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5879 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5880 -#: wrapper.c:620

5953 +#: ref-filter.c:193

5954 #, c-format

5882 -msgid "could not write to '%s'"

5883 -msgstr "impossible d'écrire dans '%s'"

5955 +msgid "Integer value expected refname:rstrip=%s"

5956 +msgstr "Valeur entière attendue refname:rstrip=%s"

5957

5885 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5886 -#: builtin/rebase.c:1029

5958 +#: ref-filter.c:195

5959 #, c-format

5888 -msgid "could not open '%s' for writing"

5889 -msgstr "impossible d'ouvrir '%s' en écriture"

5960 +msgid "unrecognized %%(%s) argument: %s"

5961 +msgstr "argument %%(%s) non reconnu : %s"

5962

5891 -#: refs.c:867

5963 +#: ref-filter.c:250

5964 #, c-format

5893 -msgid "unexpected object ID when deleting '%s'"

5894 -msgstr "id d'objet inattendu pendant la suppression de '%s'"

5965 +msgid "%%(objecttype) does not take arguments"

5966 +msgstr "%%(objecttype) n'accepte pas d'argument"

5967

5896 -#: refs.c:998

5968 +#: ref-filter.c:272

5969 #, c-format

5898 -msgid "log for ref %s has gap after %s"

5899 -msgstr "le journal pour la réf %s contient un trou après %s"

5970 +msgid "unrecognized %%(objectsize) argument: %s"

5971 +msgstr "argument %%(objectsize) non reconnu : %s"

5972

5901 -#: refs.c:1004

5973 +#: ref-filter.c:280

5974 #, c-format

5903 -msgid "log for ref %s unexpectedly ended on %s"

5904 -msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

5975 +msgid "%%(deltabase) does not take arguments"

5976 +msgstr "%%(deltabase) n'accepte pas d'argument"

5977

5906 -#: refs.c:1063

5907 -#, c-format

5908 -msgid "log for %s is empty"

5909 -msgstr "le journal pour la réf %s est vide"

5910 -

5911 -#: refs.c:1155

5912 -#, c-format

5913 -msgid "refusing to update ref with bad name '%s'"

5914 -msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

5915 -

5916 -#: refs.c:1231

5917 -#, c-format

5918 -msgid "update_ref failed for ref '%s': %s"

5919 -msgstr "échec de update_ref pour la réf '%s' : %s"

5920 -

5921 -#: refs.c:2023

5922 -#, c-format

5923 -msgid "multiple updates for ref '%s' not allowed"

5924 -msgstr "mises à jour multiples pour la réf '%s' non permises"

5925 -

5926 -#: refs.c:2055

5927 -msgid "ref updates forbidden inside quarantine environment"

5928 -msgstr "mises à jour des références interdites en environnement de quarantaine"

5929 -

5930 -#: refs.c:2151 refs.c:2181

5931 -#, c-format

5932 -msgid "'%s' exists; cannot create '%s'"

5933 -msgstr "'%s' existe ; impossible de créer '%s'"

5934 -

5935 -#: refs.c:2157 refs.c:2192

5936 -#, c-format

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

5938 -msgstr "impossible de traiter '%s' et '%s' en même temps"

5939 -

5940 -#: refs/files-backend.c:1233

5941 -#, c-format

5942 -msgid "could not remove reference %s"

5943 -msgstr "impossible de supprimer la référence %s"

5944 -

5945 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5946 -#: refs/packed-backend.c:1551

5947 -#, c-format

5948 -msgid "could not delete reference %s: %s"

5949 -msgstr "Impossible de supprimer la référence %s : %s"

5950 -

5951 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5952 -#, c-format

5953 -msgid "could not delete references: %s"

5954 -msgstr "impossible de supprimer les références : %s"

5955 -

5956 -#: refspec.c:137

5957 -#, c-format

5958 -msgid "invalid refspec '%s'"

5959 -msgstr "spécificateur de réference invalide : '%s'"

5960 -

5961 -# à priori on parle d'une branche ici

5962 -#: ref-filter.c:42 wt-status.c:1938

5963 -msgid "gone"

5964 -msgstr "disparue"

5965 -

5966 -#: ref-filter.c:43

5967 -#, c-format

5968 -msgid "ahead %d"

5969 -msgstr "en avance de %d"

5970 -

5971 -#: ref-filter.c:44

5972 -#, c-format

5973 -msgid "behind %d"

5974 -msgstr "en retard de %d"

5975 -

5976 -#: ref-filter.c:45

5977 -#, c-format

5978 -msgid "ahead %d, behind %d"

5979 -msgstr "en avance de %d, en retard de %d"

5980 -

5981 -#: ref-filter.c:165

5982 -#, c-format

5983 -msgid "expected format: %%(color:<color>)"

5984 -msgstr "format attendu : %%(color:<couleur>)"

5985 -

5986 -#: ref-filter.c:167

5987 -#, c-format

5988 -msgid "unrecognized color: %%(color:%s)"

5989 -msgstr "couleur non reconnue : %%(color:%s)"

5990 -

5991 -#: ref-filter.c:189

5992 -#, c-format

5993 -msgid "Integer value expected refname:lstrip=%s"

5994 -msgstr "Valeur entière attendue refname:lstrip=%s"

5995 -

5996 -#: ref-filter.c:193

5997 -#, c-format

5998 -msgid "Integer value expected refname:rstrip=%s"

5999 -msgstr "Valeur entière attendue refname:rstrip=%s"

6000 -

6001 -#: ref-filter.c:195

6002 -#, c-format

6003 -msgid "unrecognized %%(%s) argument: %s"

6004 -msgstr "argument %%(%s) non reconnu : %s"

6005 -

6006 -#: ref-filter.c:250

6007 -#, c-format

6008 -msgid "%%(objecttype) does not take arguments"

6009 -msgstr "%%(objecttype) n'accepte pas d'argument"

6010 -

6011 -#: ref-filter.c:272

6012 -#, c-format

6013 -msgid "unrecognized %%(objectsize) argument: %s"

6014 -msgstr "argument %%(objectsize) non reconnu : %s"

6015 -

6016 -#: ref-filter.c:280

6017 -#, c-format

6018 -msgid "%%(deltabase) does not take arguments"

6019 -msgstr "%%(deltabase) n'accepte pas d'argument"

6020 -

6021 -#: ref-filter.c:292

5978 +#: ref-filter.c:292

5979 #, c-format

5980 msgid "%%(body) does not take arguments"

5981 msgstr "%%(body) n'accepte pas d'argument"

@@ -6145,116 +6102,234 @@ msgstr "format : atome %%(end) utilisé sans atome correspondant"

6102 msgid "malformed format string %s"

6103 msgstr "Chaîne de formatage mal formée %s"

6104

6148 -#: ref-filter.c:1488

6105 +#: ref-filter.c:1486

6106 #, c-format

6107 msgid "no branch, rebasing %s"

6108 msgstr "aucune branche, rebasage de %s"

6109

6153 -#: ref-filter.c:1491

6110 +#: ref-filter.c:1489

6111 #, c-format

6112 msgid "no branch, rebasing detached HEAD %s"

6113 msgstr "aucune branche, rebasage de la HEAD détachée %s"

6114

6158 -#: ref-filter.c:1494

6115 +#: ref-filter.c:1492

6116 #, c-format

6117 msgid "no branch, bisect started on %s"

6118 msgstr "aucune branche, bisect a démarré sur %s"

6119

6163 -#: ref-filter.c:1504

6120 +#: ref-filter.c:1502

6121 msgid "no branch"

6122 msgstr "aucune branche"

6123

6167 -#: ref-filter.c:1540 ref-filter.c:1749

6124 +#: ref-filter.c:1538 ref-filter.c:1747

6125 #, c-format

6126 msgid "missing object %s for %s"

6127 msgstr "objet manquant %s pour %s"

6128

6172 -#: ref-filter.c:1550

6129 +#: ref-filter.c:1548

6130 #, c-format

6131 msgid "parse_object_buffer failed on %s for %s"

6132 msgstr "échec de parse_object_buffer sur %s pour %s"

6133

6177 -#: ref-filter.c:2004

6134 +#: ref-filter.c:2001

6135 #, c-format

6136 msgid "malformed object at '%s'"

6137 msgstr "objet malformé à '%s'"

6138

6182 -#: ref-filter.c:2093

6139 +#: ref-filter.c:2090

6140 #, c-format

6141 msgid "ignoring ref with broken name %s"

6142 msgstr "réf avec un nom cassé %s ignoré"

6143

6187 -#: ref-filter.c:2389

6144 +#: ref-filter.c:2095 refs.c:625

6145 +#, c-format

6146 +msgid "ignoring broken ref %s"

6147 +msgstr "réf cassé %s ignoré"

6148 +

6149 +#: ref-filter.c:2395

6150 #, c-format

6151 msgid "format: %%(end) atom missing"

6152 msgstr "format: atome %%(end) manquant"

6153

6192 -#: ref-filter.c:2489

6154 +#: ref-filter.c:2495

6155 #, c-format

6156 msgid "option `%s' is incompatible with --merged"

6157 msgstr "l'option « %s » est incompatible avec --merged"

6158

6197 -#: ref-filter.c:2492

6159 +#: ref-filter.c:2498

6160 #, c-format

6161 msgid "option `%s' is incompatible with --no-merged"

6162 msgstr "l'option « %s » est incompatible avec --no-merged"

6163

6202 -#: ref-filter.c:2502

6164 +#: ref-filter.c:2508

6165 #, c-format

6166 msgid "malformed object name %s"

6167 msgstr "nom d'objet malformé %s"

6168

6207 -#: ref-filter.c:2507

6169 +#: ref-filter.c:2513

6170 #, c-format

6171 msgid "option `%s' must point to a commit"

6172 msgstr "l'option '%s' doit pointer sur un commit"

6173

6212 -#: remote.c:366

6174 +#: refs.c:262

6175 +#, c-format

6176 +msgid "%s does not point to a valid object!"

6177 +msgstr "%s ne pointe pas sur un objet valide!"

6178 +

6179 +#: refs.c:623

6180 +#, c-format

6181 +msgid "ignoring dangling symref %s"

6182 +msgstr "symref pendant %s ignoré"

6183 +

6184 +#: refs.c:760

6185 +#, c-format

6186 +msgid "could not open '%s' for writing: %s"

6187 +msgstr "impossible d'ouvrir '%s' en écriture : %s"

6188 +

6189 +#: refs.c:770 refs.c:821

6190 +#, c-format

6191 +msgid "could not read ref '%s'"

6192 +msgstr "impossible de lire la réf '%s'"

6193 +

6194 +#: refs.c:776

6195 +#, c-format

6196 +msgid "ref '%s' already exists"

6197 +msgstr "la référence '%s' existe déjà"

6198 +

6199 +#: refs.c:781

6200 +#, c-format

6201 +msgid "unexpected object ID when writing '%s'"

6202 +msgstr "id d'objet inattendu pendant l'écriture de '%s'"

6203 +

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

6207 +#, c-format

6208 +msgid "could not write to '%s'"

6209 +msgstr "impossible d'écrire dans '%s'"

6210 +

6211 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6212 +#: builtin/rebase.c:852

6213 +#, c-format

6214 +msgid "could not open '%s' for writing"

6215 +msgstr "impossible d'ouvrir '%s' en écriture"

6216 +

6217 +#: refs.c:823

6218 +#, c-format

6219 +msgid "unexpected object ID when deleting '%s'"

6220 +msgstr "id d'objet inattendu pendant la suppression de '%s'"

6221 +

6222 +#: refs.c:954

6223 +#, c-format

6224 +msgid "log for ref %s has gap after %s"

6225 +msgstr "le journal pour la réf %s contient un trou après %s"

6226 +

6227 +#: refs.c:960

6228 +#, c-format

6229 +msgid "log for ref %s unexpectedly ended on %s"

6230 +msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

6231 +

6232 +#: refs.c:1019

6233 +#, c-format

6234 +msgid "log for %s is empty"

6235 +msgstr "le journal pour la réf %s est vide"

6236 +

6237 +#: refs.c:1111

6238 +#, c-format

6239 +msgid "refusing to update ref with bad name '%s'"

6240 +msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

6241 +

6242 +#: refs.c:1187

6243 +#, c-format

6244 +msgid "update_ref failed for ref '%s': %s"

6245 +msgstr "échec de update_ref pour la réf '%s' : %s"

6246 +

6247 +#: refs.c:1979

6248 +#, c-format

6249 +msgid "multiple updates for ref '%s' not allowed"

6250 +msgstr "mises à jour multiples pour la réf '%s' non permises"

6251 +

6252 +#: refs.c:2011

6253 +msgid "ref updates forbidden inside quarantine environment"

6254 +msgstr "mises à jour des références interdites en environnement de quarantaine"

6255 +

6256 +#: refs.c:2107 refs.c:2137

6257 +#, c-format

6258 +msgid "'%s' exists; cannot create '%s'"

6259 +msgstr "'%s' existe ; impossible de créer '%s'"

6260 +

6261 +#: refs.c:2113 refs.c:2148

6262 +#, c-format

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

6264 +msgstr "impossible de traiter '%s' et '%s' en même temps"

6265 +

6266 +#: refs/files-backend.c:1233

6267 +#, c-format

6268 +msgid "could not remove reference %s"

6269 +msgstr "impossible de supprimer la référence %s"

6270 +

6271 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6272 +#: refs/packed-backend.c:1551

6273 +#, c-format

6274 +msgid "could not delete reference %s: %s"

6275 +msgstr "Impossible de supprimer la référence %s : %s"

6276 +

6277 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6278 +#, c-format

6279 +msgid "could not delete references: %s"

6280 +msgstr "impossible de supprimer les références : %s"

6281 +

6282 +#: refspec.c:137

6283 +#, c-format

6284 +msgid "invalid refspec '%s'"

6285 +msgstr "spécificateur de réference invalide : '%s'"

6286 +

6287 +#: remote.c:355

6288 #, c-format

6289 msgid "config remote shorthand cannot begin with '/': %s"

6290 msgstr ""

6291 "un raccourci de configuration de distant ne peut pas commencer par '/' : %s"

6292

6218 -#: remote.c:414

6293 +#: remote.c:403

6294 msgid "more than one receivepack given, using the first"

6295 msgstr "plus d'un receivepack fournis, utilisation du premier"

6296

6222 -#: remote.c:422

6297 +#: remote.c:411

6298 msgid "more than one uploadpack given, using the first"

6299 msgstr "plus d'un uploadpack fournis, utilisation du premier"

6300

6226 -#: remote.c:612

6301 +#: remote.c:594

6302 #, c-format

6303 msgid "Cannot fetch both %s and %s to %s"

6304 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

6305

6231 -#: remote.c:616

6306 +#: remote.c:598

6307 #, c-format

6308 msgid "%s usually tracks %s, not %s"

6309 msgstr "%s suit habituellement %s, pas %s"

6310

6236 -#: remote.c:620

6311 +#: remote.c:602

6312 #, c-format

6313 msgid "%s tracks both %s and %s"

6314 msgstr "%s suit à la fois %s et %s"

6315

6241 -#: remote.c:688

6316 +#: remote.c:670

6317 #, c-format

6318 msgid "key '%s' of pattern had no '*'"

6319 msgstr "la clé '%s' du modèle n'a pas de '*'"

6320

6246 -#: remote.c:698

6321 +#: remote.c:680

6322 #, c-format

6323 msgid "value '%s' of pattern has no '*'"

6324 msgstr "la valeur '%s' du modèle n'a pas de '*'"

6325

6251 -#: remote.c:1004

6326 +#: remote.c:986

6327 #, c-format

6328 msgid "src refspec %s does not match any"

6329 msgstr ""

6330 "le spécificateur de référence source %s ne correspond à aucune référence"

6331

6257 -#: remote.c:1009

6332 +#: remote.c:991

6333 #, c-format

6334 msgid "src refspec %s matches more than one"

6335 msgstr ""

@@ -6264,7 +6339,7 @@ msgstr ""

6339 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6340 #. the <src>.

6341 #.

6267 -#: remote.c:1024

6342 +#: remote.c:1006

6343 #, c-format

6344 msgid ""

6345 "The destination you provided is not a full refname (i.e.,\n"

@@ -6288,7 +6363,7 @@ msgstr ""

6363 "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "

6364 "totalement qualifiée."

6365

6291 -#: remote.c:1044

6366 +#: remote.c:1026

6367 #, c-format

6368 msgid ""

6369 "The <src> part of the refspec is a commit object.\n"

@@ -6299,7 +6374,7 @@ msgstr ""

6374 "Souhaitiez-vous créer une nouvelle branche en poussant sur\n"

6375 "'%s:refs/heads/%s' ?"

6376

6302 -#: remote.c:1049

6377 +#: remote.c:1031

6378 #, c-format

6379 msgid ""

6380 "The <src> part of the refspec is a tag object.\n"

@@ -6310,7 +6385,7 @@ msgstr ""

6385 "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"

6386 "'%s:refs/tags/%s' ?"

6387

6313 -#: remote.c:1054

6388 +#: remote.c:1036

6389 #, c-format

6390 msgid ""

6391 "The <src> part of the refspec is a tree object.\n"

@@ -6321,7 +6396,7 @@ msgstr ""

6396 "Souhaitiez-vous créer un nouvel arbre en poussant sur\n"

6397 "'%s:refs/tags/%s' ?"

6398

6324 -#: remote.c:1059

6399 +#: remote.c:1041

6400 #, c-format

6401 msgid ""

6402 "The <src> part of the refspec is a blob object.\n"

@@ -6332,119 +6407,119 @@ msgstr ""

6407 "Souhaitiez-vous créer un nouveau blob en poussant sur\n"

6408 "'%s:refs/tags/%s' ?"

6409

6335 -#: remote.c:1095

6410 +#: remote.c:1077

6411 #, c-format

6412 msgid "%s cannot be resolved to branch"

6413 msgstr "'%s' ne peut pas être résolue comme une branche"

6414

6340 -#: remote.c:1106

6415 +#: remote.c:1088

6416 #, c-format

6417 msgid "unable to delete '%s': remote ref does not exist"

6418 msgstr "suppression d '%s' impossible : la référence distante n'existe pas"

6419

6345 -#: remote.c:1118

6420 +#: remote.c:1100

6421 #, c-format

6422 msgid "dst refspec %s matches more than one"

6423 msgstr ""

6424 "le spécificateur de référence dst %s correspond à plus d'un spécificateur de "

6425 "références"

6426

6352 -#: remote.c:1125

6427 +#: remote.c:1107

6428 #, c-format

6429 msgid "dst ref %s receives from more than one src"

6430 msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"

6431

6357 -#: remote.c:1628 remote.c:1729

6432 +#: remote.c:1610 remote.c:1711

6433 msgid "HEAD does not point to a branch"

6434 msgstr "HEAD ne pointe pas sur une branche"

6435

6361 -#: remote.c:1637

6436 +#: remote.c:1619

6437 #, c-format

6438 msgid "no such branch: '%s'"

6439 msgstr "pas de branche '%s'"

6440

6366 -#: remote.c:1640

6441 +#: remote.c:1622

6442 #, c-format

6443 msgid "no upstream configured for branch '%s'"

6444 msgstr "aucune branche amont configurée pour la branche '%s'"

6445

6371 -#: remote.c:1646

6446 +#: remote.c:1628

6447 #, c-format

6448 msgid "upstream branch '%s' not stored as a remote-tracking branch"

6449 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

6450

6376 -#: remote.c:1661

6451 +#: remote.c:1643

6452 #, c-format

6453 msgid "push destination '%s' on remote '%s' has no local tracking branch"

6454 msgstr ""

6455 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

6456 "branche locale de suivi"

6457

6383 -#: remote.c:1673

6458 +#: remote.c:1655

6459 #, c-format

6460 msgid "branch '%s' has no remote for pushing"

6461 msgstr "la branche '%s' n'a aucune branche distante de poussée"

6462

6388 -#: remote.c:1683

6463 +#: remote.c:1665

6464 #, c-format

6465 msgid "push refspecs for '%s' do not include '%s'"

6466 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

6467

6393 -#: remote.c:1696

6468 +#: remote.c:1678

6469 msgid "push has no destination (push.default is 'nothing')"

6470 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

6471

6397 -#: remote.c:1718

6472 +#: remote.c:1700

6473 msgid "cannot resolve 'simple' push to a single destination"

6474 msgstr ""

6475 "impossible de résoudre une poussée 'simple' pour une destination unique"

6476

6402 -#: remote.c:1844

6477 +#: remote.c:1826

6478 #, c-format

6479 msgid "couldn't find remote ref %s"

6480 msgstr "impossible de trouver la référence distante %s"

6481

6407 -#: remote.c:1857

6482 +#: remote.c:1839

6483 #, c-format

6484 msgid "* Ignoring funny ref '%s' locally"

6485 msgstr "* Référence bizarre '%s' ignorée localement"

6486

6412 -#: remote.c:2020

6487 +#: remote.c:2002

6488 #, c-format

6489 msgid "Your branch is based on '%s', but the upstream is gone.\n"

6490 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

6491

6417 -#: remote.c:2024

6492 +#: remote.c:2006

6493 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

6494 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

6495

6421 -#: remote.c:2027

6496 +#: remote.c:2009

6497 #, c-format

6498 msgid "Your branch is up to date with '%s'.\n"

6499 msgstr "Votre branche est à jour avec '%s'.\n"

6500

6426 -#: remote.c:2031

6501 +#: remote.c:2013

6502 #, c-format

6503 msgid "Your branch and '%s' refer to different commits.\n"

6504 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

6505

6431 -#: remote.c:2034

6506 +#: remote.c:2016

6507 #, c-format

6508 msgid " (use \"%s\" for details)\n"

6509 msgstr " (utilisez \"%s\" pour plus de détails)\n"

6510

6436 -#: remote.c:2038

6511 +#: remote.c:2020

6512 #, c-format

6513 msgid "Your branch is ahead of '%s' by %d commit.\n"

6514 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

6515 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

6516 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

6517

6443 -#: remote.c:2044

6518 +#: remote.c:2026

6519 msgid " (use \"git push\" to publish your local commits)\n"

6520 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

6521

6447 -#: remote.c:2047

6522 +#: remote.c:2029

6523 #, c-format

6524 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

6525 msgid_plural ""

@@ -6456,11 +6531,11 @@ msgstr[1] ""

6531 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

6532 "en avance rapide.\n"

6533

6459 -#: remote.c:2055

6534 +#: remote.c:2037

6535 msgid " (use \"git pull\" to update your local branch)\n"

6536 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

6537

6463 -#: remote.c:2058

6538 +#: remote.c:2040

6539 #, c-format

6540 msgid ""

6541 "Your branch and '%s' have diverged,\n"

@@ -6475,12 +6550,12 @@ msgstr[1] ""

6550 "Votre branche et '%s' ont divergé,\n"

6551 "et ont %d et %d commits différents chacune respectivement.\n"

6552

6478 -#: remote.c:2068

6553 +#: remote.c:2050

6554 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

6555 msgstr ""

6556 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

6557

6483 -#: remote.c:2251

6558 +#: remote.c:2233

6559 #, c-format

6560 msgid "cannot parse expected object name '%s'"

6561 msgstr "impossible d'analyser le nom attendu d'objet '%s'"

@@ -6500,6 +6575,11 @@ msgstr "référence de remplacement dupliquée : %s"

6575 msgid "replace depth too high for object %s"

6576 msgstr "profondeur de remplacement trop grande pour l'objet %s"

6577

6578 +#: repository.c:94 builtin/init-db.c:188

6579 +#, c-format

6580 +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."

6582 +

6583 #: rerere.c:217 rerere.c:226 rerere.c:229

6584 msgid "corrupt MERGE_RR"

6585 msgstr "MERGE_RR corrompu"

@@ -6558,7 +6638,7 @@ msgstr "impossible de délier '%s' qui est errant"

6638 msgid "Recorded preimage for '%s'"

6639 msgstr "Pré-image enregistrée pour '%s'"

6640

6561 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6641 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6642 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6643 #, c-format

6644 msgid "could not create directory '%s'"

@@ -6593,20 +6673,29 @@ msgstr "Résolution pour '%s' oubliée\n"

6673 msgid "unable to open rr-cache directory"

6674 msgstr "impossible d'ouvrir le répertoire rr-cache"

6675

6596 -#: revision.c:2497

6676 +#: reset.c:42

6677 +msgid "could not determine HEAD revision"

6678 +msgstr "impossible de déterminer la révision HEAD"

6679 +

6680 +#: reset.c:70 reset.c:76 sequencer.c:3318

6681 +#, c-format

6682 +msgid "failed to find tree of %s"

6683 +msgstr "impossible de trouver l'arbre de %s"

6684 +

6685 +#: revision.c:2655

6686 msgid "your current branch appears to be broken"

6687 msgstr "votre branche actuelle semble cassée"

6688

6600 -#: revision.c:2500

6689 +#: revision.c:2658

6690 #, c-format

6691 msgid "your current branch '%s' does not have any commits yet"

6692 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

6693

6605 -#: revision.c:2708

6694 +#: revision.c:2866

6695 msgid "--first-parent is incompatible with --bisect"

6696 msgstr "--first-parent est incompatible avec --bisect"

6697

6609 -#: revision.c:2712

6698 +#: revision.c:2870

6699 msgid "-L does not yet support diff formats besides -p and -s"

6700 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

6701

@@ -6629,31 +6718,31 @@ msgstr ""

6718 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

6719 "false`."

6720

6632 -#: send-pack.c:144

6721 +#: send-pack.c:145

6722 msgid "unexpected flush packet while reading remote unpack status"

6723 msgstr ""

6724 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

6725 "distant"

6726

6638 -#: send-pack.c:146

6727 +#: send-pack.c:147

6728 #, c-format

6729 msgid "unable to parse remote unpack status: %s"

6730 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

6731

6643 -#: send-pack.c:148

6732 +#: send-pack.c:149

6733 #, c-format

6734 msgid "remote unpack failed: %s"

6735 msgstr "le dépaquetage a échoué : %s"

6736

6648 -#: send-pack.c:309

6737 +#: send-pack.c:308

6738 msgid "failed to sign the push certificate"

6739 msgstr "impossible de signer le certificat de poussée"

6740

6652 -#: send-pack.c:423

6741 +#: send-pack.c:399

6742 msgid "the receiving end does not support --signed push"

6743 msgstr "Le receveur ne gère pas les poussées avec --signed"

6744

6656 -#: send-pack.c:425

6745 +#: send-pack.c:401

6746 msgid ""

6747 "not sending a push certificate since the receiving end does not support --"

6748 "signed push"

@@ -6661,47 +6750,47 @@ msgstr ""

6750 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

6751 "poussées avec --signed"

6752

6664 -#: send-pack.c:437

6753 +#: send-pack.c:413

6754 msgid "the receiving end does not support --atomic push"

6755 msgstr "Le receveur ne gère pas les poussées avec --atomic"

6756

6668 -#: send-pack.c:442

6757 +#: send-pack.c:418

6758 msgid "the receiving end does not support push options"

6759 msgstr "Le receveur ne gère pas les options de poussées"

6760

6672 -#: sequencer.c:191

6761 +#: sequencer.c:192

6762 #, c-format

6763 msgid "invalid commit message cleanup mode '%s'"

6764 msgstr "mode de nettoyage invalide de message de validation '%s'"

6765

6677 -#: sequencer.c:296

6766 +#: sequencer.c:297

6767 #, c-format

6768 msgid "could not delete '%s'"

6769 msgstr "Impossible de supprimer '%s'"

6770

6682 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6771 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6772 #, c-format

6773 msgid "could not remove '%s'"

6774 msgstr "impossible de supprimer '%s'"

6775

6687 -#: sequencer.c:325

6776 +#: sequencer.c:326

6777 msgid "revert"

6778 msgstr "revert"

6779

6691 -#: sequencer.c:327

6780 +#: sequencer.c:328

6781 msgid "cherry-pick"

6782 msgstr "cherry-pick"

6783

6695 -#: sequencer.c:329

6784 +#: sequencer.c:330

6785 msgid "rebase"

6786 msgstr "rebase"

6787

6699 -#: sequencer.c:331

6788 +#: sequencer.c:332

6789 #, c-format

6790 msgid "unknown action: %d"

6791 msgstr "action inconnue : %d"

6792

6704 -#: sequencer.c:389

6793 +#: sequencer.c:390

6794 msgid ""

6795 "after resolving the conflicts, mark the corrected paths\n"

6796 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6709,7 +6798,7 @@ msgstr ""

6798 "après résolution des conflits, marquez les chemins corrigés\n"

6799 "avec 'git add <chemins>' ou 'git rm <chemins>'"

6800

6712 -#: sequencer.c:392

6801 +#: sequencer.c:393

6802 msgid ""

6803 "after resolving the conflicts, mark the corrected paths\n"

6804 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6719,44 +6808,43 @@ msgstr ""

6808 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

6809 "puis validez le résultat avec 'git commit'"

6810

6722 -#: sequencer.c:405 sequencer.c:2901

6811 +#: sequencer.c:406 sequencer.c:2921

6812 #, c-format

6813 msgid "could not lock '%s'"

6814 msgstr "impossible de verrouiller '%s'"

6815

6727 -#: sequencer.c:412

6816 +#: sequencer.c:413

6817 #, c-format

6818 msgid "could not write eol to '%s'"

6819 msgstr "impossible d'écrire la fin de ligne dans '%s'"

6820

6732 -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6733 -#: sequencer.c:3185

6821 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6822 +#: sequencer.c:3203

6823 #, c-format

6824 msgid "failed to finalize '%s'"

6825 msgstr "échec lors de la finalisation de '%s'"

6826

6738 -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6739 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6740 -#: builtin/rebase.c:593

6827 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6828 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6829 #, c-format

6830 msgid "could not read '%s'"

6831 msgstr "impossible de lire '%s'"

6832

6745 -#: sequencer.c:466

6833 +#: sequencer.c:457

6834 #, c-format

6835 msgid "your local changes would be overwritten by %s."

6836 msgstr "vos modifications locales seraient écrasées par %s."

6837

6750 -#: sequencer.c:470

6838 +#: sequencer.c:461

6839 msgid "commit your changes or stash them to proceed."

6840 msgstr "validez vos modifications ou les remiser pour continuer."

6841

6754 -#: sequencer.c:502

6842 +#: sequencer.c:493

6843 #, c-format

6844 msgid "%s: fast-forward"

6845 msgstr "%s : avance rapide"

6846

6759 -#: sequencer.c:541 builtin/tag.c:565

6847 +#: sequencer.c:532 builtin/tag.c:566

6848 #, c-format

6849 msgid "Invalid cleanup mode %s"

6850 msgstr "Mode de nettoyage invalide %s"

@@ -6764,65 +6852,65 @@ msgstr "Mode de nettoyage invalide %s"

6852 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6853 #. "rebase".

6854 #.

6767 -#: sequencer.c:635

6855 +#: sequencer.c:626

6856 #, c-format

6857 msgid "%s: Unable to write new index file"

6858 msgstr "%s: Impossible d'écrire le nouveau fichier index"

6859

6772 -#: sequencer.c:652

6860 +#: sequencer.c:643

6861 msgid "unable to update cache tree"

6862 msgstr "impossible de mettre à jour l'arbre de cache"

6863

6776 -#: sequencer.c:666

6864 +#: sequencer.c:657

6865 msgid "could not resolve HEAD commit"

6866 msgstr "impossible de résoudre le commit HEAD"

6867

6780 -#: sequencer.c:746

6868 +#: sequencer.c:737

6869 #, c-format

6870 msgid "no key present in '%.*s'"

6871 msgstr "aucune clé présente dans '%.*s'"

6872

6785 -#: sequencer.c:757

6873 +#: sequencer.c:748

6874 #, c-format

6875 msgid "unable to dequote value of '%s'"

6876 msgstr "Impossible de décoter la valeur de '%s'"

6877

6790 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6791 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6878 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6879 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6880 #, c-format

6881 msgid "could not open '%s' for reading"

6882 msgstr "impossible d'ouvrir '%s' en lecture"

6883

6796 -#: sequencer.c:804

6884 +#: sequencer.c:795

6885 msgid "'GIT_AUTHOR_NAME' already given"

6886 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

6887

6800 -#: sequencer.c:809

6888 +#: sequencer.c:800

6889 msgid "'GIT_AUTHOR_EMAIL' already given"

6890 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

6891

6804 -#: sequencer.c:814

6892 +#: sequencer.c:805

6893 msgid "'GIT_AUTHOR_DATE' already given"

6894 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

6895

6808 -#: sequencer.c:818

6896 +#: sequencer.c:809

6897 #, c-format

6898 msgid "unknown variable '%s'"

6899 msgstr "variable inconnue '%s'"

6900

6813 -#: sequencer.c:823

6901 +#: sequencer.c:814

6902 msgid "missing 'GIT_AUTHOR_NAME'"

6903 msgstr "'GIT_AUTHOR_NAME' manquant"

6904

6817 -#: sequencer.c:825

6905 +#: sequencer.c:816

6906 msgid "missing 'GIT_AUTHOR_EMAIL'"

6907 msgstr "'GIT_AUTHOR_EMAIL' manquant"

6908

6821 -#: sequencer.c:827

6909 +#: sequencer.c:818

6910 msgid "missing 'GIT_AUTHOR_DATE'"

6911 msgstr "'GIT_AUTHOR_DATE' manquant"

6912

6825 -#: sequencer.c:876

6913 +#: sequencer.c:867

6914 #, c-format

6915 msgid ""

6916 "you have staged changes in your working tree\n"

@@ -6851,11 +6939,11 @@ msgstr ""

6939 "\n"

6940 " git rebase --continue\n"

6941

6854 -#: sequencer.c:1148

6942 +#: sequencer.c:1141

6943 msgid "'prepare-commit-msg' hook failed"

6944 msgstr "échec du crochet 'prepare-commit-msg'"

6945

6858 -#: sequencer.c:1154

6946 +#: sequencer.c:1147

6947 msgid ""

6948 "Your name and email address were configured automatically based\n"

6949 "on your username and hostname. Please check that they are accurate.\n"

@@ -6884,7 +6972,7 @@ msgstr ""

6972 "\n"

6973 " git commit --amend --reset-author\n"

6974

6887 -#: sequencer.c:1167

6975 +#: sequencer.c:1160

6976 msgid ""

6977 "Your name and email address were configured automatically based\n"

6978 "on your username and hostname. Please check that they are accurate.\n"

@@ -6910,325 +6998,330 @@ msgstr ""

6998 "\n"

6999 " git commit --amend --reset-author\n"

7000

6913 -#: sequencer.c:1209

7001 +#: sequencer.c:1202

7002 msgid "couldn't look up newly created commit"

7003 msgstr "impossible de retrouver le commit nouvellement créé"

7004

6917 -#: sequencer.c:1211

7005 +#: sequencer.c:1204

7006 msgid "could not parse newly created commit"

7007 msgstr "impossible d'analyser le commit nouvellement créé"

7008

6921 -#: sequencer.c:1257

7009 +#: sequencer.c:1250

7010 msgid "unable to resolve HEAD after creating commit"

7011 msgstr "impossible de résoudre HEAD après création du commit"

7012

6925 -#: sequencer.c:1259

7013 +#: sequencer.c:1252

7014 msgid "detached HEAD"

7015 msgstr "HEAD détachée"

7016

6929 -#: sequencer.c:1263

7017 +#: sequencer.c:1256

7018 msgid " (root-commit)"

7019 msgstr " (commit racine)"

7020

6933 -#: sequencer.c:1284

7021 +#: sequencer.c:1277

7022 msgid "could not parse HEAD"

7023 msgstr "impossible de lire HEAD"

7024

6937 -#: sequencer.c:1286

7025 +#: sequencer.c:1279

7026 #, c-format

7027 msgid "HEAD %s is not a commit!"

7028 msgstr "HEAD %s n'est pas un commit !"

7029

6942 -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

7030 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

7031 msgid "could not parse HEAD commit"

7032 msgstr "impossible d'analyser le commit HEAD"

7033

6946 -#: sequencer.c:1342 sequencer.c:1968

7034 +#: sequencer.c:1335 sequencer.c:1980

7035 msgid "unable to parse commit author"

7036 msgstr "impossible d'analyser l'auteur du commit"

7037

6950 -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

7038 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

7039 msgid "git write-tree failed to write a tree"

7040 msgstr "git write-tree a échoué à écrire un arbre"

7041

6954 -#: sequencer.c:1386 sequencer.c:1447

7042 +#: sequencer.c:1379 sequencer.c:1450

7043 #, c-format

7044 msgid "unable to read commit message from '%s'"

7045 msgstr "impossible de lire le message de validation de '%s'"

7046

6959 -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6960 -#: builtin/merge.c:911

7047 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

7048 +#: builtin/merge.c:919

7049 msgid "failed to write commit object"

7050 msgstr "échec de l'écriture de l'objet commit"

7051

6964 -#: sequencer.c:1474

7052 +#: sequencer.c:1433 sequencer.c:4118

7053 +#, c-format

7054 +msgid "could not update %s"

7055 +msgstr "impossible de mettre à jour %s"

7056 +

7057 +#: sequencer.c:1481

7058 #, c-format

7059 msgid "could not parse commit %s"

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

7061

6969 -#: sequencer.c:1479

7062 +#: sequencer.c:1486

7063 #, c-format

7064 msgid "could not parse parent commit %s"

7065 msgstr "impossible d'analyser le commit parent %s"

7066

6974 -#: sequencer.c:1562 sequencer.c:1673

7067 +#: sequencer.c:1569 sequencer.c:1680

7068 #, c-format

7069 msgid "unknown command: %d"

7070 msgstr "commande inconnue : %d"

7071

6979 -#: sequencer.c:1620 sequencer.c:1645

7072 +#: sequencer.c:1627 sequencer.c:1652

7073 #, c-format

7074 msgid "This is a combination of %d commits."

7075 msgstr "Ceci est la combinaison de %d commits."

7076

6984 -#: sequencer.c:1630

7077 +#: sequencer.c:1637

7078 msgid "need a HEAD to fixup"

7079 msgstr "une HEAD est nécessaire à la correction"

7080

6988 -#: sequencer.c:1632 sequencer.c:3212

7081 +#: sequencer.c:1639 sequencer.c:3230

7082 msgid "could not read HEAD"

7083 msgstr "Impossible de lire HEAD"

7084

6992 -#: sequencer.c:1634

7085 +#: sequencer.c:1641

7086 msgid "could not read HEAD's commit message"

7087 msgstr "impossible de lire le message de validation de HEAD"

7088

6996 -#: sequencer.c:1640

7089 +#: sequencer.c:1647

7090 #, c-format

7091 msgid "cannot write '%s'"

7092 msgstr "impossible d'écrire '%s'"

7093

7001 -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

7094 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496

7095 msgid "This is the 1st commit message:"

7096 msgstr "Ceci est le premier message de validation :"

7097

7005 -#: sequencer.c:1655

7098 +#: sequencer.c:1662

7099 #, c-format

7100 msgid "could not read commit message of %s"

7101 msgstr "impossible de lire le message de validation de %s"

7102

7010 -#: sequencer.c:1662

7103 +#: sequencer.c:1669

7104 #, c-format

7105 msgid "This is the commit message #%d:"

7106 msgstr "Ceci est le message de validation numéro %d :"

7107

7015 -#: sequencer.c:1668

7108 +#: sequencer.c:1675

7109 #, c-format

7110 msgid "The commit message #%d will be skipped:"

7111 msgstr "Le message de validation %d sera ignoré :"

7112

7020 -#: sequencer.c:1756

7113 +#: sequencer.c:1763

7114 msgid "your index file is unmerged."

7115 msgstr "votre fichier d'index n'est pas fusionné."

7116

7024 -#: sequencer.c:1763

7117 +#: sequencer.c:1770

7118 msgid "cannot fixup root commit"

7119 msgstr "impossible de réparer le commit racine"

7120

7028 -#: sequencer.c:1782

7121 +#: sequencer.c:1789

7122 #, c-format

7123 msgid "commit %s is a merge but no -m option was given."

7124 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

7125

7033 -#: sequencer.c:1790 sequencer.c:1798

7126 +#: sequencer.c:1797 sequencer.c:1805

7127 #, c-format

7128 msgid "commit %s does not have parent %d"

7129 msgstr "le commit %s n'a pas de parent %d"

7130

7038 -#: sequencer.c:1804

7131 +#: sequencer.c:1811

7132 #, c-format

7133 msgid "cannot get commit message for %s"

7134 msgstr "impossible d'obtenir un message de validation pour %s"

7135

7136 #. TRANSLATORS: The first %s will be a "todo" command like

7137 #. "revert" or "pick", the second %s a SHA1.

7045 -#: sequencer.c:1823

7138 +#: sequencer.c:1830

7139 #, c-format

7140 msgid "%s: cannot parse parent commit %s"

7141 msgstr "%s : impossible d'analyser le commit parent %s"

7142

7050 -#: sequencer.c:1888

7143 +#: sequencer.c:1895

7144 #, c-format

7145 msgid "could not rename '%s' to '%s'"

7146 msgstr "impossible de renommer '%s' en '%s'"

7147

7055 -#: sequencer.c:1943

7148 +#: sequencer.c:1952

7149 #, c-format

7150 msgid "could not revert %s... %s"

7151 msgstr "impossible d'annuler %s... %s"

7152

7060 -#: sequencer.c:1944

7153 +#: sequencer.c:1953

7154 #, c-format

7155 msgid "could not apply %s... %s"

7156 msgstr "impossible d'appliquer %s... %s"

7157

7065 -#: sequencer.c:1961

7158 +#: sequencer.c:1972

7159 #, c-format

7160 msgid "dropping %s %s -- patch contents already upstream\n"

7161 msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"

7162

7070 -#: sequencer.c:2018

7163 +#: sequencer.c:2030

7164 #, c-format

7165 msgid "git %s: failed to read the index"

7166 msgstr "git %s : échec à la lecture de l'index"

7167

7075 -#: sequencer.c:2025

7168 +#: sequencer.c:2037

7169 #, c-format

7170 msgid "git %s: failed to refresh the index"

7171 msgstr "git %s : échec du rafraîchissement de l'index"

7172

7080 -#: sequencer.c:2102

7173 +#: sequencer.c:2114

7174 #, c-format

7175 msgid "%s does not accept arguments: '%s'"

7176 msgstr "%s n'accepte pas d'argument : '%s'"

7177

7085 -#: sequencer.c:2111

7178 +#: sequencer.c:2123

7179 #, c-format

7180 msgid "missing arguments for %s"

7181 msgstr "argument manquant pour %s"

7182

7090 -#: sequencer.c:2142

7183 +#: sequencer.c:2154

7184 #, c-format

7185 msgid "could not parse '%s'"

7186 msgstr "impossible d'analyser '%s'"

7187

7095 -#: sequencer.c:2203

7188 +#: sequencer.c:2215

7189 #, c-format

7190 msgid "invalid line %d: %.*s"

7191 msgstr "ligne %d invalide : %.*s"

7192

7100 -#: sequencer.c:2214

7193 +#: sequencer.c:2226

7194 #, c-format

7195 msgid "cannot '%s' without a previous commit"

7196 msgstr "'%s' impossible avec le commit précédent"

7197

7105 -#: sequencer.c:2298

7198 +#: sequencer.c:2310

7199 msgid "cancelling a cherry picking in progress"

7200 msgstr "annulation d'un picorage en cours"

7201

7109 -#: sequencer.c:2305

7202 +#: sequencer.c:2317

7203 msgid "cancelling a revert in progress"

7204 msgstr "annulation d'un retour en cours"

7205

7113 -#: sequencer.c:2349

7206 +#: sequencer.c:2361

7207 msgid "please fix this using 'git rebase --edit-todo'."

7208 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

7209

7117 -#: sequencer.c:2351

7210 +#: sequencer.c:2363

7211 #, c-format

7212 msgid "unusable instruction sheet: '%s'"

7213 msgstr "feuille d'instruction inutilisable : '%s'"

7214

7122 -#: sequencer.c:2356

7215 +#: sequencer.c:2368

7216 msgid "no commits parsed."

7217 msgstr "aucun commit analysé."

7218

7126 -#: sequencer.c:2367

7219 +#: sequencer.c:2379

7220 msgid "cannot cherry-pick during a revert."

7221 msgstr "impossible de picorer pendant l'annulation d'un commit."

7222

7130 -#: sequencer.c:2369

7223 +#: sequencer.c:2381

7224 msgid "cannot revert during a cherry-pick."

7225 msgstr "impossible d'annuler un commit pendant un picorage."

7226

7134 -#: sequencer.c:2447

7227 +#: sequencer.c:2459

7228 #, c-format

7229 msgid "invalid value for %s: %s"

7230 msgstr "valeur invalide pour %s : %s"

7231

7139 -#: sequencer.c:2540

7232 +#: sequencer.c:2556

7233 msgid "unusable squash-onto"

7234 msgstr "\"écrase-sur\" inutilisable"

7235

7143 -#: sequencer.c:2556

7236 +#: sequencer.c:2576

7237 #, c-format

7238 msgid "malformed options sheet: '%s'"

7239 msgstr "feuille d'options malformée : %s"

7240

7148 -#: sequencer.c:2644 sequencer.c:4361

7241 +#: sequencer.c:2664 sequencer.c:4469

7242 msgid "empty commit set passed"

7243 msgstr "l'ensemble de commits spécifié est vide"

7244

7152 -#: sequencer.c:2660

7245 +#: sequencer.c:2680

7246 msgid "revert is already in progress"

7247 msgstr "un retour est déjà en cours"

7248

7156 -#: sequencer.c:2662

7249 +#: sequencer.c:2682

7250 #, c-format

7251 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7252 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""

7253

7161 -#: sequencer.c:2665

7254 +#: sequencer.c:2685

7255 msgid "cherry-pick is already in progress"

7256 msgstr "un picorage est déjà en cours"

7257

7165 -#: sequencer.c:2667

7258 +#: sequencer.c:2687

7259 #, c-format

7260 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7261 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""

7262

7170 -#: sequencer.c:2681

7263 +#: sequencer.c:2701

7264 #, c-format

7265 msgid "could not create sequencer directory '%s'"

7266 msgstr "impossible de créer le répertoire de séquenceur '%s'"

7267

7175 -#: sequencer.c:2696

7268 +#: sequencer.c:2716

7269 msgid "could not lock HEAD"

l10n: fr v2.27.0 rnd 1