6b822f7359 · matheusbsbs/matheus-bagliano

@@ -74,8 +74,8 @@ msgid ""

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2018-09-04 08:50+0800\n"

78 -"PO-Revision-Date: 2018-09-05 22:18+0200\n"

77 +"POT-Creation-Date: 2018-11-20 10:05+0800\n"

78 +"PO-Revision-Date: 2018-11-28 20:44+0100\n"

79 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"

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

81 "Language: fr\n"

@@ -84,37 +84,37 @@ msgstr ""

84 "Content-Transfer-Encoding: 8bit\n"

85 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"

86

87 -#: advice.c:97

87 +#: advice.c:99

88 #, c-format

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

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

91

92 -#: advice.c:150

92 +#: advice.c:152

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

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

95

96 -#: advice.c:152

96 +#: advice.c:154

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

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

99

100 -#: advice.c:154

100 +#: advice.c:156

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

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

103

104 -#: advice.c:156

104 +#: advice.c:158

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

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

107

108 -#: advice.c:158

108 +#: advice.c:160

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

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

111

112 -#: advice.c:160

112 +#: advice.c:162

113 #, c-format

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

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

116

117 -#: advice.c:168

117 +#: advice.c:170

118 msgid ""

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

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

@@ -122,23 +122,23 @@ msgstr ""

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

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

124

125 -#: advice.c:176

125 +#: advice.c:178

126 msgid "Exiting because of an unresolved conflict."

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

128

129 -#: advice.c:181 builtin/merge.c:1286

129 +#: advice.c:183 builtin/merge.c:1289

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

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

132

133 -#: advice.c:183

133 +#: advice.c:185

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

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

136

137 -#: advice.c:184

137 +#: advice.c:186

138 msgid "Exiting because of unfinished merge."

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

140

141 -#: advice.c:190

141 +#: advice.c:192

142 #, c-format

143 msgid ""

144 "Note: checking out '%s'.\n"

@@ -247,22 +247,22 @@ msgstr ""

247 msgid "invalid mode on line %d: %s"

248 msgstr "mode invalide dans la ligne %d : %s"

249

250 -#: apply.c:1306

250 +#: apply.c:1307

251 #, c-format

252 msgid "inconsistent header lines %d and %d"

253 msgstr "lignes d'entête inconsistantes %d et %d"

254

255 -#: apply.c:1478

255 +#: apply.c:1479

256 #, c-format

257 msgid "recount: unexpected line: %.*s"

258 msgstr "recomptage : ligne inattendue : %.*s"

259

260 -#: apply.c:1547

260 +#: apply.c:1548

261 #, c-format

262 msgid "patch fragment without header at line %d: %.*s"

263 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"

264

265 -#: apply.c:1567

265 +#: apply.c:1568

266 #, c-format

267 msgid ""

268 "git diff header lacks filename information when removing %d leading pathname "

@@ -277,83 +277,83 @@ msgstr[1] ""

277 "information de nom de fichier manquante dans l'en-tête de git diff lors de "

278 "la suppression de %d composants de préfixe de chemin (ligne %d)"

279

280 -#: apply.c:1580

280 +#: apply.c:1581

281 #, c-format

282 msgid "git diff header lacks filename information (line %d)"

283 msgstr ""

284 "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"

285

286 -#: apply.c:1768

286 +#: apply.c:1769

287 msgid "new file depends on old contents"

288 msgstr "le nouveau fichier dépend de contenus anciens"

289

290 -#: apply.c:1770

290 +#: apply.c:1771

291 msgid "deleted file still has contents"

292 msgstr "le fichier supprimé a encore du contenu"

293

294 -#: apply.c:1804

294 +#: apply.c:1805

295 #, c-format

296 msgid "corrupt patch at line %d"

297 msgstr "patch corrompu à la ligne %d"

298

299 -#: apply.c:1841

299 +#: apply.c:1842

300 #, c-format

301 msgid "new file %s depends on old contents"

302 msgstr "le nouveau fichier %s dépend de contenus anciens"

303

304 -#: apply.c:1843

304 +#: apply.c:1844

305 #, c-format

306 msgid "deleted file %s still has contents"

307 msgstr "le fichier supprimé %s a encore du contenu"

308

309 -#: apply.c:1846

309 +#: apply.c:1847

310 #, c-format

311 msgid "** warning: file %s becomes empty but is not deleted"

312 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"

313

314 -#: apply.c:1993

314 +#: apply.c:1994

315 #, c-format

316 msgid "corrupt binary patch at line %d: %.*s"

317 msgstr "patch binaire corrompu à la ligne %d : %.*s"

318

319 -#: apply.c:2030

319 +#: apply.c:2031

320 #, c-format

321 msgid "unrecognized binary patch at line %d"

322 msgstr "patch binaire non reconnu à la ligne %d"

323

324 -#: apply.c:2190

324 +#: apply.c:2193

325 #, c-format

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

327 msgstr "patch totalement incompréhensible à la ligne %d"

328

329 -#: apply.c:2276

329 +#: apply.c:2279

330 #, c-format

331 msgid "unable to read symlink %s"

332 msgstr "lecture du lien symbolique %s impossible"

333

334 -#: apply.c:2280

334 +#: apply.c:2283

335 #, c-format

336 msgid "unable to open or read %s"

337 msgstr "ouverture ou lecture de %s impossible"

338

339 -#: apply.c:2939

339 +#: apply.c:2942

340 #, c-format

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

342 msgstr "début de ligne invalide : '%c'"

343

344 -#: apply.c:3060

344 +#: apply.c:3063

345 #, c-format

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

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

348 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."

349 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."

350

351 -#: apply.c:3072

351 +#: apply.c:3075

352 #, c-format

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

354 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"

355

356 -#: apply.c:3078

356 +#: apply.c:3081

357 #, c-format

358 msgid ""

359 "while searching for:\n"

@@ -362,462 +362,463 @@ msgstr ""

362 "pendant la recherche de :\n"

363 "%.*s"

364

365 -#: apply.c:3100

365 +#: apply.c:3103

366 #, c-format

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

368 msgstr "données de patch binaire manquantes pour '%s'"

369

370 -#: apply.c:3108

370 +#: apply.c:3111

371 #, c-format

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

373 msgstr ""

374 "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "

375 "inverse"

376

377 -#: apply.c:3154

377 +#: apply.c:3158

378 #, c-format

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

380 msgstr ""

381 "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"

382

383 -#: apply.c:3164

383 +#: apply.c:3168

384 #, c-format

385 msgid ""

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

387 msgstr ""

388 "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."

389

390 -#: apply.c:3172

390 +#: apply.c:3176

391 #, c-format

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

393 msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"

394

395 -#: apply.c:3190

395 +#: apply.c:3194

396 #, c-format

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

398 msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"

399

400 -#: apply.c:3203

400 +#: apply.c:3207

401 #, c-format

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

403 msgstr "le patch binaire ne s'applique par correctement à '%s'"

404

405 -#: apply.c:3209

405 +#: apply.c:3213

406 #, c-format

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

408 msgstr ""

409 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "

410 "trouvé)"

411

412 -#: apply.c:3230

412 +#: apply.c:3234

413 #, c-format

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

415 msgstr "le patch a échoué : %s:%ld"

416

417 -#: apply.c:3352

417 +#: apply.c:3356

418 #, c-format

419 msgid "cannot checkout %s"

420 msgstr "extraction de %s impossible"

421

422 -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

422 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

423 #, c-format

424 msgid "failed to read %s"

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

426

427 -#: apply.c:3412

427 +#: apply.c:3416

428 #, c-format

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

430 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"

431

432 -#: apply.c:3441 apply.c:3681

432 +#: apply.c:3445 apply.c:3688

433 #, c-format

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

435 msgstr "le chemin %s a été renommé/supprimé"

436

437 -#: apply.c:3524 apply.c:3696

437 +#: apply.c:3531 apply.c:3703

438 #, c-format

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

440 msgstr "%s : n'existe pas dans l'index"

441

442 -#: apply.c:3533 apply.c:3704

442 +#: apply.c:3540 apply.c:3711

443 #, c-format

444 msgid "%s: does not match index"

445 msgstr "%s : ne correspond pas à l'index"

446

447 -#: apply.c:3568

447 +#: apply.c:3575

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

449 msgstr ""

450 "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "

451 "points."

452

453 -#: apply.c:3571

453 +#: apply.c:3578

454 #, c-format

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

456 msgstr "Retour à une fusion à 3 points…\n"

457

458 -#: apply.c:3587 apply.c:3591

458 +#: apply.c:3594 apply.c:3598

459 #, c-format

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

461 msgstr "impossible de lire le contenu actuel de '%s'"

462

463 -#: apply.c:3603

463 +#: apply.c:3610

464 #, c-format

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

466 msgstr "Echec du retour à une fusion à 3 points…\n"

467

468 -#: apply.c:3617

468 +#: apply.c:3624

469 #, c-format

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

471 msgstr "Patch %s appliqué avec des conflits.\n"

472

473 -#: apply.c:3622

473 +#: apply.c:3629

474 #, c-format

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

476 msgstr "Patch %s appliqué proprement.\n"

477

478 -#: apply.c:3648

478 +#: apply.c:3655

479 msgid "removal patch leaves file contents"

480 msgstr "le patch de suppression laisse un contenu dans le fichier"

481

482 -#: apply.c:3721

482 +#: apply.c:3728

483 #, c-format

484 msgid "%s: wrong type"

485 msgstr "%s : type erroné"

486

487 -#: apply.c:3723

487 +#: apply.c:3730

488 #, c-format

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

490 msgstr "%s est de type %o, mais %o attendu"

491

492 -#: apply.c:3874 apply.c:3876

492 +#: apply.c:3881 apply.c:3883

493 #, c-format

494 msgid "invalid path '%s'"

495 msgstr "chemin invalide '%s'"

496

497 -#: apply.c:3932

497 +#: apply.c:3939

498 #, c-format

499 msgid "%s: already exists in index"

500 msgstr "%s : existe déjà dans l'index"

501

502 -#: apply.c:3935

502 +#: apply.c:3942

503 #, c-format

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

505 msgstr "%s : existe déjà dans la copie de travail"

506

507 -#: apply.c:3955

507 +#: apply.c:3962

508 #, c-format

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

510 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"

511

512 -#: apply.c:3960

512 +#: apply.c:3967

513 #, c-format

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

515 msgstr ""

516 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"

517

518 -#: apply.c:3980

518 +#: apply.c:3987

519 #, c-format

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

521 msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"

522

523 -#: apply.c:3984

523 +#: apply.c:3991

524 #, c-format

525 msgid "%s: patch does not apply"

526 msgstr "%s : le patch ne s'applique pas"

527

528 -#: apply.c:3999

528 +#: apply.c:4006

529 #, c-format

530 msgid "Checking patch %s..."

531 msgstr "Vérification du patch %s..."

532

533 -#: apply.c:4091

533 +#: apply.c:4098

534 #, c-format

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

536 msgstr ""

537 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"

538

539 -#: apply.c:4098

539 +#: apply.c:4105

540 #, c-format

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

542 msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"

543

544 -#: apply.c:4101

544 +#: apply.c:4108

545 #, c-format

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

547 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."

548

549 -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

549 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

550 #, c-format

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

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

553

554 -#: apply.c:4110

554 +#: apply.c:4117

555 #, c-format

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

557 msgstr "impossible d'ajouter %s à l'index temporaire"

558

559 -#: apply.c:4120

559 +#: apply.c:4127

560 #, c-format

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

562 msgstr "impossible d'écrire l'index temporaire dans %s"

563

564 -#: apply.c:4258

564 +#: apply.c:4265

565 #, c-format

566 msgid "unable to remove %s from index"

567 msgstr "suppression de %s dans l'index impossible"

568

569 -#: apply.c:4292

569 +#: apply.c:4299

570 #, c-format

571 msgid "corrupt patch for submodule %s"

572 msgstr "patch corrompu pour le sous-module %s"

573

574 -#: apply.c:4298

574 +#: apply.c:4305

575 #, c-format

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

577 msgstr "stat du fichier nouvellement créé '%s' impossible"

578

579 -#: apply.c:4306

579 +#: apply.c:4313

580 #, c-format

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

582 msgstr ""

583 "création du magasin de stockage pour le fichier nouvellement créé %s "

584 "impossible"

585

586 -#: apply.c:4312 apply.c:4457

586 +#: apply.c:4319 apply.c:4464

587 #, c-format

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

589 msgstr "ajout de l'élément de cache %s impossible"

590

591 -#: apply.c:4355

591 +#: apply.c:4362

592 #, c-format

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

594 msgstr "échec de l'écriture dans '%s'"

595

596 -#: apply.c:4359

596 +#: apply.c:4366

597 #, c-format

598 msgid "closing file '%s'"

599 msgstr "fermeture du fichier '%s'"

600

601 -#: apply.c:4429

601 +#: apply.c:4436

602 #, c-format

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

604 msgstr "écriture du fichier '%s' mode %o impossible"

605

606 -#: apply.c:4527

606 +#: apply.c:4534

607 #, c-format

608 msgid "Applied patch %s cleanly."

609 msgstr "Patch %s appliqué proprement."

610

611 -#: apply.c:4535

611 +#: apply.c:4542

612 msgid "internal error"

613 msgstr "erreur interne"

614

615 -#: apply.c:4538

615 +#: apply.c:4545

616 #, c-format

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

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

619 msgstr[0] "Application du patch %%s avec %d rejet..."

620 msgstr[1] "Application du patch %%s avec %d rejets..."

621

622 -#: apply.c:4549

622 +#: apply.c:4556

623 #, c-format

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

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

626

627 -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

627 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

631

632 -#: apply.c:4571

632 +#: apply.c:4578

633 #, c-format

634 msgid "Hunk #%d applied cleanly."

635 msgstr "Section n°%d appliquée proprement."

636

637 -#: apply.c:4575

637 +#: apply.c:4582

638 #, c-format

639 msgid "Rejected hunk #%d."

640 msgstr "Section n°%d rejetée."

641

642 -#: apply.c:4685

642 +#: apply.c:4692

643 #, c-format

644 msgid "Skipped patch '%s'."

645 msgstr "Chemin '%s' non traité."

646

647 -#: apply.c:4693

647 +#: apply.c:4700

648 msgid "unrecognized input"

649 msgstr "entrée non reconnue"

650

651 -#: apply.c:4712

651 +#: apply.c:4719

652 msgid "unable to read index file"

653 msgstr "lecture du fichier d'index impossible"

654

655 -#: apply.c:4849

655 +#: apply.c:4874

656 #, c-format

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

658 msgstr "ouverture impossible du patch '%s' :%s"

659

660 -#: apply.c:4876

660 +#: apply.c:4901

661 #, c-format

662 msgid "squelched %d whitespace error"

663 msgid_plural "squelched %d whitespace errors"

664 msgstr[0] "%d erreur d'espace ignorée"

665 msgstr[1] "%d erreurs d'espace ignorées"

666

667 -#: apply.c:4882 apply.c:4897

667 +#: apply.c:4907 apply.c:4922

668 #, c-format

669 msgid "%d line adds whitespace errors."

670 msgid_plural "%d lines add whitespace errors."

671 msgstr[0] "%d ligne a ajouté des erreurs d'espace."

672 msgstr[1] "%d lignes ont ajouté des erreurs d'espace."

673

674 -#: apply.c:4890

674 +#: apply.c:4915

675 #, c-format

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

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

678 msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."

679 msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."

680

681 -#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

681 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

682 msgid "Unable to write new index file"

683 msgstr "Impossible d'écrire le nouveau fichier d'index"

684

685 -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

686 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

687 -#: builtin/pull.c:198 builtin/submodule--helper.c:406

688 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

689 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

690 -#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

685 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

686 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

687 +#: builtin/pull.c:199 builtin/submodule--helper.c:406

688 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

689 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

690 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

691 msgid "path"

692 msgstr "chemin"

693

694 -#: apply.c:4934

694 +#: apply.c:4959

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

696 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

697

698 -#: apply.c:4937

698 +#: apply.c:4962

699 msgid "apply changes matching the given path"

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

701

702 -#: apply.c:4939 builtin/am.c:2263

702 +#: apply.c:4964 builtin/am.c:2218

703 msgid "num"

704 msgstr "num"

705

706 -#: apply.c:4940

706 +#: apply.c:4965

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

708 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"

709

710 -#: apply.c:4943

710 +#: apply.c:4968

711 msgid "ignore additions made by the patch"

712 msgstr "ignorer les additions réalisées par le patch"

713

714 -#: apply.c:4945

714 +#: apply.c:4970

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

716 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"

717

718 -#: apply.c:4949

718 +#: apply.c:4974

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

720 msgstr ""

721 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"

722

723 -#: apply.c:4951

723 +#: apply.c:4976

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

725 msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"

726

727 -#: apply.c:4953

727 +#: apply.c:4978

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

729 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"

730

731 -#: apply.c:4955

731 +#: apply.c:4980

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

733 msgstr "s'assurer que le patch est applicable sur l'index actuel"

734

735 -#: apply.c:4957

735 +#: apply.c:4982

736 msgid "mark new files with `git add --intent-to-add`"

737 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"

738

739 -#: apply.c:4959

739 +#: apply.c:4984

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

741 msgstr "appliquer les patch sans toucher à la copie de travail"

742

743 -#: apply.c:4961

743 +#: apply.c:4986

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

745 msgstr "accepter un patch qui touche hors de la copie de travail"

746

747 -#: apply.c:4964

747 +#: apply.c:4989

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

749 msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"

750

751 -#: apply.c:4966

751 +#: apply.c:4991

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

753 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"

754

755 -#: apply.c:4968

755 +#: apply.c:4993

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

757 msgstr ""

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

759

760 -#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

760 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

761 msgid "paths are separated with NUL character"

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

763

764 -#: apply.c:4973

764 +#: apply.c:4998

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

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

767

768 -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

769 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

770 -#: builtin/pack-objects.c:3202

768 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

769 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

770 +#: builtin/pack-objects.c:3310 builtin/rebase.c:839

771 msgid "action"

772 msgstr "action"

773

774 -#: apply.c:4975

774 +#: apply.c:5000

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

776 msgstr ""

777 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "

778 "d'espace"

779

780 -#: apply.c:4978 apply.c:4981

780 +#: apply.c:5003 apply.c:5006

781 msgid "ignore changes in whitespace when finding context"

782 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"

783

784 -#: apply.c:4984

784 +#: apply.c:5009

785 msgid "apply the patch in reverse"

786 msgstr "appliquer le patch en sens inverse"

787

788 -#: apply.c:4986

788 +#: apply.c:5011

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

790 msgstr "ne pas s'attendre à au moins une ligne de contexte"

791

792 -#: apply.c:4988

792 +#: apply.c:5013

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

794 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"

795

796 -#: apply.c:4990

796 +#: apply.c:5015

797 msgid "allow overlapping hunks"

798 msgstr "accepter les recouvrements de sections"

799

800 -#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

801 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

802 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

800 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

801 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

802 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

803 +#: builtin/rebase--interactive.c:157

804 msgid "be verbose"

805 msgstr "mode verbeux"

806

806 -#: apply.c:4993

807 +#: apply.c:5018

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

809 msgstr ""

810 "tolérer des erreurs de détection de retours chariot manquants en fin de "

811 "fichier"

812

812 -#: apply.c:4996

813 +#: apply.c:5021

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

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

816

816 -#: apply.c:4998 builtin/am.c:2251

817 +#: apply.c:5023 builtin/am.c:2206

818 msgid "root"

819 msgstr "racine"

820

820 -#: apply.c:4999

821 +#: apply.c:5024

822 msgid "prepend <root> to all filenames"

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

824

@@ -840,114 +841,114 @@ msgstr ""

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

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

843

843 -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

844 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

845 #, c-format

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

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

848

848 -#: archive.c:446

849 +#: archive.c:453

850 msgid "fmt"

851 msgstr "fmt"

852

852 -#: archive.c:446

853 +#: archive.c:453

854 msgid "archive format"

855 msgstr "format d'archive"

856

856 -#: archive.c:447 builtin/log.c:1473

857 +#: archive.c:454 builtin/log.c:1536

858 msgid "prefix"

859 msgstr "préfixe"

860

860 -#: archive.c:448

861 +#: archive.c:455

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

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

864

864 -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

865 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

866 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

867 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

868 -#: parse-options.h:165

865 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

866 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

867 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

868 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

869 +#: parse-options.h:162

870 msgid "file"

871 msgstr "fichier"

872

872 -#: archive.c:450 builtin/archive.c:89

873 +#: archive.c:457 builtin/archive.c:89

874 msgid "write the archive to this file"

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

876

876 -#: archive.c:452

877 +#: archive.c:459

878 msgid "read .gitattributes in working directory"

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

880

880 -#: archive.c:453

881 +#: archive.c:460

882 msgid "report archived files on stderr"

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

884

884 -#: archive.c:454

885 +#: archive.c:461

886 msgid "store only"

887 msgstr "stockage seulement"

888

888 -#: archive.c:455

889 +#: archive.c:462

890 msgid "compress faster"

891 msgstr "compression rapide"

892

892 -#: archive.c:463

893 +#: archive.c:470

894 msgid "compress better"

895 msgstr "compression efficace"

896

896 -#: archive.c:466

897 +#: archive.c:473

898 msgid "list supported archive formats"

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

900

900 -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

901 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

901 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

902 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

903 msgid "repo"

904 msgstr "dépôt"

905

905 -#: archive.c:469 builtin/archive.c:91

906 +#: archive.c:476 builtin/archive.c:91

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

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

909

909 -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

910 -#: builtin/notes.c:491

910 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

911 +#: builtin/notes.c:496

912 msgid "command"

913 msgstr "commande"

914

914 -#: archive.c:471 builtin/archive.c:93

915 +#: archive.c:478 builtin/archive.c:93

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

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

918

918 -#: archive.c:478

919 +#: archive.c:485

920 msgid "Unexpected option --remote"

921 msgstr "Option --remote inattendue"

922

922 -#: archive.c:480

923 +#: archive.c:487

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

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

926

926 -#: archive.c:482

927 +#: archive.c:489

928 msgid "Unexpected option --output"

929 msgstr "Option --output inattendue"

930

930 -#: archive.c:504

931 +#: archive.c:511

932 #, c-format

933 msgid "Unknown archive format '%s'"

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

935

935 -#: archive.c:511

936 +#: archive.c:518

937 #, c-format

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

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

940

940 -#: archive-tar.c:125 archive-zip.c:344

941 +#: archive-tar.c:125 archive-zip.c:345

942 #, c-format

943 msgid "cannot stream blob %s"

944 msgstr "impossible de transmettre le blob %s en flux"

945

945 -#: archive-tar.c:260 archive-zip.c:361

946 +#: archive-tar.c:260 archive-zip.c:363

947 #, c-format

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

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

950

950 -#: archive-tar.c:287 archive-zip.c:352

951 +#: archive-tar.c:287 archive-zip.c:353

952 #, c-format

953 msgid "cannot read %s"

954 msgstr "impossible de lire %s"

@@ -966,32 +967,32 @@ msgstr "impossible de rediriger un descripteur"

967 msgid "'%s' filter reported error"

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

969

969 -#: archive-zip.c:313

970 +#: archive-zip.c:314

971 #, c-format

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

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

974

974 -#: archive-zip.c:317

975 +#: archive-zip.c:318

976 #, c-format

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

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

979

979 -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

980 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

981 #, c-format

982 msgid "deflate error (%d)"

983 msgstr "erreur de compression (%d)"

984

984 -#: archive-zip.c:605

985 +#: archive-zip.c:609

986 #, c-format

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

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

989

989 -#: attr.c:218

990 +#: attr.c:212

991 #, c-format

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

993 msgstr "%.*s n'est pas un nom valide d'attribut"

994

994 -#: attr.c:415

995 +#: attr.c:409

996 msgid ""

997 "Negative patterns are ignored in git attributes\n"

998 "Use '\\!' for literal leading exclamation."

@@ -999,22 +1000,22 @@ msgstr ""

1000 "Les motifs de négation sont ignorés dans les attributs git\n"

1001 "Utilisez '\\!' pour un point d'exclamation littéral."

1002

1002 -#: bisect.c:467

1003 +#: bisect.c:468

1004 #, c-format

1005 msgid "Badly quoted content in file '%s': %s"

1006 msgstr "Contenu mal cité dans le fichier '%s' : %s"

1007

1007 -#: bisect.c:675

1008 +#: bisect.c:676

1009 #, c-format

1010 msgid "We cannot bisect more!\n"

1011 msgstr "Impossible de pousser la bissection plus loin !\n"

1012

1012 -#: bisect.c:729

1013 +#: bisect.c:730

1014 #, c-format

1015 msgid "Not a valid commit name %s"

1016 msgstr "%s n'est pas un nom de commit valide"

1017

1017 -#: bisect.c:753

1018 +#: bisect.c:754

1019 #, c-format

1020 msgid ""

1021 "The merge base %s is bad.\n"

@@ -1023,7 +1024,7 @@ msgstr ""

1024 "La base de fusion %s est mauvaise.\n"

1025 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"

1026

1026 -#: bisect.c:758

1027 +#: bisect.c:759

1028 #, c-format

1029 msgid ""

1030 "The merge base %s is new.\n"

@@ -1032,7 +1033,7 @@ msgstr ""

1033 "La base de fusion %s est nouvelle.\n"

1034 "La propriété a changé entre %s et [%s].\n"

1035

1035 -#: bisect.c:763

1036 +#: bisect.c:764

1037 #, c-format

1038 msgid ""

1039 "The merge base %s is %s.\n"

@@ -1041,7 +1042,7 @@ msgstr ""

1042 "La base de fusion %s est %s.\n"

1043 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"

1044

1044 -#: bisect.c:771

1045 +#: bisect.c:772

1046 #, c-format

1047 msgid ""

1048 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1052,7 +1053,7 @@ msgstr ""

1053 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"

1054 "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"

1055

1055 -#: bisect.c:784

1056 +#: bisect.c:785

1057 #, c-format

1058 msgid ""

1059 "the merge base between %s and [%s] must be skipped.\n"

@@ -1064,36 +1065,36 @@ msgstr ""

1065 "et %s.\n"

1066 "On continue tout de même."

1067

1067 -#: bisect.c:817

1068 +#: bisect.c:818

1069 #, c-format

1070 msgid "Bisecting: a merge base must be tested\n"

1071 msgstr "Bissection : une base de fusion doit être testée\n"

1072

1072 -#: bisect.c:857

1073 +#: bisect.c:858

1074 #, c-format

1075 msgid "a %s revision is needed"

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

1077

1077 -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

1078 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1079 #, c-format

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

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

1082

1082 -#: bisect.c:927 builtin/merge.c:137

1083 +#: bisect.c:928 builtin/merge.c:138

1084 #, c-format

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

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

1087

1087 -#: bisect.c:957

1088 +#: bisect.c:958

1089 msgid "reading bisect refs failed"

1090 msgstr "impossible de lire les références de bissection"

1091

1091 -#: bisect.c:976

1092 +#: bisect.c:977

1093 #, c-format

1094 msgid "%s was both %s and %s\n"

1095 msgstr "%s était à la fois %s et %s\n"

1096

1096 -#: bisect.c:984

1097 +#: bisect.c:985

1098 #, c-format

1099 msgid ""

1100 "No testable commit found.\n"

@@ -1102,7 +1103,7 @@ msgstr ""

1103 "Aucun commit testable n'a été trouvé\n"

1104 "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"

1105

1105 -#: bisect.c:1003

1106 +#: bisect.c:1004

1107 #, c-format

1108 msgid "(roughly %d step)"

1109 msgid_plural "(roughly %d steps)"

@@ -1112,48 +1113,48 @@ msgstr[1] "(à peu près %d étapes)"

1113 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1114 #. steps)" translation.

1115 #.

1115 -#: bisect.c:1009

1116 +#: bisect.c:1010

1117 #, c-format

1118 msgid "Bisecting: %d revision left to test after this %s\n"

1119 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1122

1122 -#: blame.c:1784

1123 +#: blame.c:1787

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

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

1126

1126 -#: blame.c:1798

1127 +#: blame.c:1801

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

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

1130

1130 -#: blame.c:1819

1131 +#: blame.c:1822

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

1133 msgstr ""

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

1135 "dernier commit"

1136

1136 -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1137 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1138 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1139 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1137 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1138 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1139 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1140 +#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150

1141 #: builtin/shortlog.c:192

1142 msgid "revision walk setup failed"

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

1144

1144 -#: blame.c:1846

1145 +#: blame.c:1849

1146 msgid ""

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

1148 msgstr ""

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

1150 "premier parent"

1151

1151 -#: blame.c:1857

1152 +#: blame.c:1860

1153 #, c-format

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

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

1156

1156 -#: blame.c:1868

1157 +#: blame.c:1871

1158 #, c-format

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

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

@@ -1316,7 +1317,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

1319

1319 -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1320 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1321 +#: builtin/commit.c:774

1322 #, c-format

1323 msgid "could not open '%s'"

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

@@ -1343,38 +1345,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1347

1346 -#: bundle.c:260

1348 +#: bundle.c:267

1349 +msgid "unable to dup bundle descriptor"

1350 +msgstr "impossible de dupliquer le descripteur de liasse"

1351 +

1352 +#: bundle.c:274

1353 msgid "Could not spawn pack-objects"

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

1355

1350 -#: bundle.c:271

1356 +#: bundle.c:285

1357 msgid "pack-objects died"

1358 msgstr "les objets groupés ont disparu"

1359

1354 -#: bundle.c:313

1360 +#: bundle.c:327

1361 msgid "rev-list died"

1362 msgstr "rev-list a disparu"

1363

1358 -#: bundle.c:362

1364 +#: bundle.c:376

1365 #, c-format

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

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

1368

1363 -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1369 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1370 #, c-format

1371 msgid "unrecognized argument: %s"

1372 msgstr "argument non reconnu : %s"

1373

1368 -#: bundle.c:461

1374 +#: bundle.c:464

1375 msgid "Refusing to create empty bundle."

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

1377

1372 -#: bundle.c:473

1378 +#: bundle.c:474

1379 #, c-format

1380 msgid "cannot create '%s'"

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

1382

1377 -#: bundle.c:501

1383 +#: bundle.c:498

1384 msgid "index-pack died"

1385 msgstr "l'index de groupe a disparu"

1386

@@ -1383,19 +1389,19 @@ msgstr "l'index de groupe a disparu"

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

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

1391

1386 -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1387 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1392 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1393 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1394 #: builtin/replace.c:448

1395 #, c-format

1396 msgid "could not parse %s"

1397 msgstr "impossible d'analyser %s"

1398

1393 -#: commit.c:50

1399 +#: commit.c:52

1400 #, c-format

1401 msgid "%s %s is not a commit!"

1402 msgstr "%s %s n'est pas un commit !"

1403

1398 -#: commit.c:191

1404 +#: commit.c:193

1405 msgid ""

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

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

@@ -1415,7 +1421,27 @@ msgstr ""

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

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

1423

1418 -#: commit.c:1629

1424 +#: commit.c:1115

1425 +#, c-format

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

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

1428 +

1429 +#: commit.c:1118

1430 +#, c-format

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

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

1433 +

1434 +#: commit.c:1121

1435 +#, c-format

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

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

1438 +

1439 +#: commit.c:1124

1440 +#, c-format

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

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

1443 +

1444 +#: commit.c:1378

1445 msgid ""

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

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

@@ -1427,76 +1453,92 @@ msgstr ""

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

1454 "projet.\n"

1455

1430 -#: commit-graph.c:83

1456 +#: commit-graph.c:108

1457 #, c-format

1458 msgid "graph file %s is too small"

1459 msgstr "le fichier de graphe %s est trop petit"

1460

1435 -#: commit-graph.c:90

1461 +#: commit-graph.c:115

1462 #, c-format

1463 msgid "graph signature %X does not match signature %X"

1464 msgstr "la signature de graphe %X ne correspond pas à la signature %X"

1465

1440 -#: commit-graph.c:97

1466 +#: commit-graph.c:122

1467 #, c-format

1468 msgid "graph version %X does not match version %X"

1469 msgstr "la version %X du graphe ne correspond pas à la version %X"

1470

1445 -#: commit-graph.c:104

1471 +#: commit-graph.c:129

1472 #, c-format

1473 msgid "hash version %X does not match version %X"

1474 msgstr "la version %X du condensé ne correspond pas à la version %X"

1475

1450 -#: commit-graph.c:128

1476 +#: commit-graph.c:153

1477 #, c-format

1478 msgid "improper chunk offset %08x%08x"

1479 msgstr "décalage de bloc %08x%08x inadéquat"

1480

1455 -#: commit-graph.c:164

1481 +#: commit-graph.c:189

1482 #, c-format

1483 msgid "chunk id %08x appears multiple times"

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

1485

1460 -#: commit-graph.c:261

1486 +#: commit-graph.c:308

1487 #, c-format

1488 msgid "could not find commit %s"

1489 msgstr "impossible de trouver le commit %s"

1490

1465 -#: commit-graph.c:565 builtin/pack-objects.c:2568

1491 +#: commit-graph.c:617 builtin/pack-objects.c:2652

1492 #, c-format

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

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

1495

1470 -#: commit-graph.c:730

1496 +#: commit-graph.c:651

1497 +msgid "Annotating commits in commit graph"

1498 +msgstr "Annotation des commits dans un graphe de commit"

1499 +

1500 +#: commit-graph.c:691

1501 +msgid "Computing commit graph generation numbers"

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

1503 +

1504 +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1505 +msgid "Finding commits for commit graph"

1506 +msgstr "Recherche de commits pour un graphe de commits"

1507 +

1508 +#: commit-graph.c:812

1509 #, c-format

1510 msgid "error adding pack %s"

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

1512

1475 -#: commit-graph.c:732

1513 +#: commit-graph.c:814

1514 #, c-format

1515 msgid "error opening index for %s"

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

1517

1480 -#: commit-graph.c:773

1518 +#: commit-graph.c:868

1519 #, c-format

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

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

1522

1485 -#: commit-graph.c:800

1523 +#: commit-graph.c:895

1524 msgid "too many commits to write graph"

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

1526

1489 -#: commit-graph.c:806

1527 +#: commit-graph.c:902 midx.c:769

1528 #, c-format

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

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

1531

1494 -#: commit-graph.c:904

1532 +#: commit-graph.c:1002

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

1534 msgstr ""

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

1536 "vraisemblablement corrompu"

1537

1538 +#: commit-graph.c:1046

1539 +msgid "Verifying commits in commit graph"

1540 +msgstr "Verification des commits dans le graphe de commits"

1541 +

1542 #: compat/obstack.c:405 compat/obstack.c:407

1543 msgid "memory exhausted"

1544 msgstr "plus de mémoire"

@@ -1541,7 +1583,7 @@ msgstr "la clé ne contient pas de section: %s"

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

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

1585

1544 -#: config.c:378 sequencer.c:2206

1586 +#: config.c:378 sequencer.c:2296

1587 #, c-format

1588 msgid "invalid key: %s"

1589 msgstr "clé invalide : %s"

@@ -1674,155 +1716,155 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère"

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

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

1718

1677 -#: config.c:1403

1719 +#: config.c:1395

1720 #, c-format

1721 msgid "malformed value for %s"

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

1723

1682 -#: config.c:1429

1724 +#: config.c:1421

1725 #, c-format

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

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

1728

1687 -#: config.c:1430

1729 +#: config.c:1422

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

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

1732

1691 -#: config.c:1489 builtin/pack-objects.c:3279

1733 +#: config.c:1481 builtin/pack-objects.c:3389

1734 #, c-format

1735 msgid "bad pack compression level %d"

1736 msgstr "niveau de compression du paquet %d"

1737

1696 -#: config.c:1610

1738 +#: config.c:1602

1739 #, c-format

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

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

1742

1701 -#: config.c:1613

1743 +#: config.c:1605

1744 #, c-format

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

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

1747

1706 -#: config.c:1630

1748 +#: config.c:1622

1749 #, c-format

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

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

1752

1711 -#: config.c:1660

1753 +#: config.c:1652

1754 #, c-format

1755 msgid "failed to parse %s"

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

1757

1716 -#: config.c:1700

1758 +#: config.c:1705

1759 msgid "unable to parse command-line config"

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

1761

1720 -#: config.c:2032

1762 +#: config.c:2037

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

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

1765

1724 -#: config.c:2202

1766 +#: config.c:2207

1767 #, c-format

1768 msgid "Invalid %s: '%s'"

1769 msgstr "%s invalide : '%s'"

1770

1729 -#: config.c:2245

1771 +#: config.c:2250

1772 #, c-format

1773 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1774 msgstr ""

1775 "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "

1776 "défaut"

1777

1736 -#: config.c:2271

1778 +#: config.c:2276

1779 #, c-format

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

1781 msgstr ""

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

1783 "100"

1784

1743 -#: config.c:2296

1785 +#: config.c:2319

1786 #, c-format

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

1788 msgstr ""

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

1790

1749 -#: config.c:2298

1791 +#: config.c:2321

1792 #, c-format

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

1794 msgstr ""

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

1796

1755 -#: config.c:2379

1797 +#: config.c:2402

1798 #, c-format

1799 msgid "invalid section name '%s'"

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

1801

1760 -#: config.c:2411

1802 +#: config.c:2434

1803 #, c-format

1804 msgid "%s has multiple values"

1805 msgstr "%s a des valeurs multiples"

1806

1765 -#: config.c:2440

1807 +#: config.c:2463

1808 #, c-format

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

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

1811

1770 -#: config.c:2691 config.c:3015

1812 +#: config.c:2714 config.c:3038

1813 #, c-format

1814 msgid "could not lock config file %s"

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

1816

1775 -#: config.c:2702

1817 +#: config.c:2725

1818 #, c-format

1819 msgid "opening %s"

1820 msgstr "ouverture de %s"

1821

1780 -#: config.c:2737 builtin/config.c:324

1822 +#: config.c:2760 builtin/config.c:327

1823 #, c-format

1824 msgid "invalid pattern: %s"

1825 msgstr "motif invalide : %s"

1826

1785 -#: config.c:2762

1827 +#: config.c:2785

1828 #, c-format

1829 msgid "invalid config file %s"

1830 msgstr "fichier de configuration invalide %s"

1831

1790 -#: config.c:2775 config.c:3028

1832 +#: config.c:2798 config.c:3051

1833 #, c-format

1834 msgid "fstat on %s failed"

1835 msgstr "échec de fstat sur %s"

1836

1795 -#: config.c:2786

1837 +#: config.c:2809

1838 #, c-format

1839 msgid "unable to mmap '%s'"

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

1841

1800 -#: config.c:2795 config.c:3033

1842 +#: config.c:2818 config.c:3056

1843 #, c-format

1844 msgid "chmod on %s failed"

1845 msgstr "échec de chmod sur %s"

1846

1805 -#: config.c:2880 config.c:3130

1847 +#: config.c:2903 config.c:3153

1848 #, c-format

1849 msgid "could not write config file %s"

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

1851

1810 -#: config.c:2914

1852 +#: config.c:2937

1853 #, c-format

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

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

1856

1815 -#: config.c:2916 builtin/remote.c:781

1857 +#: config.c:2939 builtin/remote.c:782

1858 #, c-format

1859 msgid "could not unset '%s'"

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

1861

1820 -#: config.c:3006

1862 +#: config.c:3029

1863 #, c-format

1864 msgid "invalid section name: %s"

1865 msgstr "nom de section invalide : %s"

1866

1825 -#: config.c:3173

1867 +#: config.c:3196

1868 #, c-format

1869 msgid "missing value for '%s'"

1870 msgstr "valeur manquante pour '%s'"

@@ -1875,7 +1917,7 @@ msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"

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

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

1919

1878 -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1920 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1921 #, c-format

1922 msgid "remote error: %s"

1923 msgstr "erreur distante : %s"

@@ -1993,7 +2035,7 @@ msgstr "chemin étrange '%s' bloqué"

2035 msgid "unable to fork"

2036 msgstr "fork impossible"

2037

1996 -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

2038 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2039 msgid "Checking connectivity"

2040 msgstr "Vérification de la connectivité"

2041

@@ -2129,12 +2171,12 @@ msgstr ""

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

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

2173

2132 -#: convert.c:1402 convert.c:1436

2174 +#: convert.c:1398 convert.c:1432

2175 #, c-format

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

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

2178

2137 -#: convert.c:1480

2179 +#: convert.c:1476

2180 #, c-format

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

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

@@ -2207,12 +2249,36 @@ msgid_plural "%<PRIuMAX> years ago"

2249 msgstr[0] "il y a %<PRIuMAX> an"

2250 msgstr[1] "il y a %<PRIuMAX> ans"

2251

2252 +#: delta-islands.c:268

2253 +msgid "Propagating island marks"

2254 +msgstr "Propagation des marques d'îlots"

2255 +

2256 +#: delta-islands.c:286

2257 +#, c-format

2258 +msgid "bad tree object %s"

2259 +msgstr "objet arbre invalide %s"

2260 +

2261 +#: delta-islands.c:330

2262 +#, c-format

2263 +msgid "failed to load island regex for '%s': %s"

2264 +msgstr "impossible de charger la regex île pour '%s' : %s"

2265 +

2266 +#: delta-islands.c:386

2267 +#, c-format

2268 +msgid "island regex from config has too many capture groups (max=%d)"

2269 +msgstr "l'expression rationnelle depuis la configuration a trop de groupes de capture (max=%d)"

2270 +

2271 +#: delta-islands.c:462

2272 +#, c-format

2273 +msgid "Marked %d islands, done.\n"

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

2275 +

2276 #: diffcore-order.c:24

2277 #, c-format

2278 msgid "failed to read orderfile '%s'"

2279 msgstr "impossible de lire le fichier de commande '%s'"

2280

2215 -#: diffcore-rename.c:536

2281 +#: diffcore-rename.c:544

2282 msgid "Performing inexact rename detection"

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

2284

@@ -2268,24 +2334,24 @@ msgstr ""

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

2335 "%s"

2336

2271 -#: diff.c:4096

2337 +#: diff.c:4140

2338 #, c-format

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

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

2341

2276 -#: diff.c:4427

2342 +#: diff.c:4482

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

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

2345

2280 -#: diff.c:4430

2346 +#: diff.c:4485

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

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

2349

2284 -#: diff.c:4508

2350 +#: diff.c:4563

2351 msgid "--follow requires exactly one pathspec"

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

2353

2288 -#: diff.c:4674

2354 +#: diff.c:4729

2355 #, c-format

2356 msgid ""

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

@@ -2294,24 +2360,24 @@ msgstr ""

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

2361 "%s"

2362

2297 -#: diff.c:4688

2363 +#: diff.c:4743

2364 #, c-format

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

2366 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"

2367

2302 -#: diff.c:5766

2368 +#: diff.c:5823

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

2370 msgstr ""

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

2372 "fichiers."

2373

2308 -#: diff.c:5769

2374 +#: diff.c:5826

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

2376 msgstr ""

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

2378 "grand nombre de fichiers."

2379

2314 -#: diff.c:5772

2380 +#: diff.c:5829

2381 #, c-format

2382 msgid ""

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

@@ -2319,46 +2385,46 @@ msgstr ""

2385 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "

2386 "commande."

2387

2322 -#: dir.c:569

2388 +#: dir.c:576

2389 #, c-format

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

2391 msgstr ""

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

2393

2328 -#: dir.c:958

2394 +#: dir.c:965

2395 #, c-format

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

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

2398

2333 -#: dir.c:1873

2399 +#: dir.c:1880

2400 #, c-format

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

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

2403

2338 -#: dir.c:2115

2404 +#: dir.c:2122

2405 msgid "failed to get kernel name and information"

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

2407

2342 -#: dir.c:2239

2408 +#: dir.c:2246

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

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

2411

2346 -#: dir.c:3037

2412 +#: dir.c:3047

2413 #, c-format

2414 msgid "index file corrupt in repo %s"

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

2416

2351 -#: dir.c:3082 dir.c:3087

2417 +#: dir.c:3092 dir.c:3097

2418 #, c-format

2419 msgid "could not create directories for %s"

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

2421

2356 -#: dir.c:3116

2422 +#: dir.c:3126

2423 #, c-format

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

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

2426

2361 -#: editor.c:61

2427 +#: editor.c:73

2428 #, c-format

2429 msgid "hint: Waiting for your editor to close the file...%c"

2430 msgstr ""

@@ -2369,7 +2435,7 @@ msgstr ""

2435 msgid "Filtering content"

2436 msgstr "Filtrage du contenu"

2437

2372 -#: entry.c:437

2438 +#: entry.c:465

2439 #, c-format

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

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

@@ -2393,77 +2459,77 @@ msgstr "trop d'arguments pour lancer %s"

2459 msgid "Remote with no URL"

2460 msgstr "Dépôt distant sans URL"

2461

2396 -#: fetch-pack.c:152

2462 +#: fetch-pack.c:151

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

2464 msgstr "git fetch-pack : list courte attendue"

2465

2400 -#: fetch-pack.c:164

2466 +#: fetch-pack.c:163

2467 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2468 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

2469

2404 -#: fetch-pack.c:184

2470 +#: fetch-pack.c:183

2471 #, c-format

2472 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2473 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

2474

2409 -#: fetch-pack.c:254

2475 +#: fetch-pack.c:253

2476 msgid "--stateless-rpc requires multi_ack_detailed"

2477 msgstr "--stateless-rpc nécessite multi_ack_detailed"

2478

2413 -#: fetch-pack.c:342 fetch-pack.c:1257

2479 +#: fetch-pack.c:347 fetch-pack.c:1277

2480 #, c-format

2481 msgid "invalid shallow line: %s"

2482 msgstr "ligne de superficiel invalide : %s"

2483

2418 -#: fetch-pack.c:348 fetch-pack.c:1263

2484 +#: fetch-pack.c:353 fetch-pack.c:1283

2485 #, c-format

2486 msgid "invalid unshallow line: %s"

2487 msgstr "ligne de fin de superficiel invalide : %s"

2488

2423 -#: fetch-pack.c:350 fetch-pack.c:1265

2489 +#: fetch-pack.c:355 fetch-pack.c:1285

2490 #, c-format

2491 msgid "object not found: %s"

2492 msgstr "objet non trouvé : %s"

2493

2428 -#: fetch-pack.c:353 fetch-pack.c:1268

2494 +#: fetch-pack.c:358 fetch-pack.c:1288

2495 #, c-format

2496 msgid "error in object: %s"

2497 msgstr "Erreur dans l'objet : %s"

2498

2433 -#: fetch-pack.c:355 fetch-pack.c:1270

2499 +#: fetch-pack.c:360 fetch-pack.c:1290

2500 #, c-format

2501 msgid "no shallow found: %s"

2502 msgstr "Pas de superficiel trouvé : %s"

2503

2438 -#: fetch-pack.c:358 fetch-pack.c:1273

2504 +#: fetch-pack.c:363 fetch-pack.c:1293

2505 #, c-format

2506 msgid "expected shallow/unshallow, got %s"

2507 msgstr "superficiel/non superficiel attendu, %s trouvé"

2508

2443 -#: fetch-pack.c:399

2509 +#: fetch-pack.c:404

2510 #, c-format

2511 msgid "got %s %d %s"

2512 msgstr "réponse %s %d %s"

2513

2448 -#: fetch-pack.c:416

2514 +#: fetch-pack.c:421

2515 #, c-format

2516 msgid "invalid commit %s"

2517 msgstr "commit invalide %s"

2518

2453 -#: fetch-pack.c:447

2519 +#: fetch-pack.c:452

2520 msgid "giving up"

2521 msgstr "abandon"

2522

2457 -#: fetch-pack.c:459 progress.c:229

2523 +#: fetch-pack.c:464 progress.c:229

2524 msgid "done"

2525 msgstr "fait"

2526

2461 -#: fetch-pack.c:471

2527 +#: fetch-pack.c:476

2528 #, c-format

2529 msgid "got %s (%d) %s"

2530 msgstr "%s trouvé (%d) %s"

2531

2466 -#: fetch-pack.c:517

2532 +#: fetch-pack.c:522

2533 #, c-format

2534 msgid "Marking %s as complete"

2535 msgstr "Marquage de %s comme terminé"

@@ -2531,7 +2597,7 @@ msgstr "Le serveur supporte allow-reachable-sha1-in-want"

2597 msgid "Server supports ofs-delta"

2598 msgstr "Le serveur supporte ofs-delta"

2599

2534 -#: fetch-pack.c:971 fetch-pack.c:1150

2600 +#: fetch-pack.c:971 fetch-pack.c:1158

2601 msgid "Server supports filter"

2602 msgstr "Le serveur supporte filter"

2603

@@ -2552,85 +2618,93 @@ msgstr "Le receveur ne gère pas --shallow-exclude"

2618 msgid "Server does not support --deepen"

2619 msgstr "Le receveur ne gère pas --deepen"

2620

2555 -#: fetch-pack.c:1004

2621 +#: fetch-pack.c:1008

2622 msgid "no common commits"

2623 msgstr "pas de commit commun"

2624

2559 -#: fetch-pack.c:1016 fetch-pack.c:1393

2625 +#: fetch-pack.c:1020 fetch-pack.c:1418

2626 msgid "git fetch-pack: fetch failed."

2627 msgstr "git fetch-pack : échec de le récupération."

2628

2563 -#: fetch-pack.c:1145

2629 +#: fetch-pack.c:1153

2630 msgid "Server does not support shallow requests"

2631 msgstr "Le serveur ne supporte les requêtes superficielles"

2632

2567 -#: fetch-pack.c:1191

2633 +#: fetch-pack.c:1199

2634 #, c-format

2635 msgid "error reading section header '%s'"

2636 msgstr "erreur à la lecture de l'entête de section '%s'"

2637

2572 -#: fetch-pack.c:1197

2638 +#: fetch-pack.c:1205

2639 #, c-format

2640 msgid "expected '%s', received '%s'"

2641 msgstr "'%s' attendu, '%s' reçu"

2642

2577 -#: fetch-pack.c:1236

2643 +#: fetch-pack.c:1244

2644 #, c-format

2645 msgid "unexpected acknowledgment line: '%s'"

2646 msgstr "ligne d'acquittement inattendue : '%s'"

2647

2582 -#: fetch-pack.c:1241

2648 +#: fetch-pack.c:1249

2649 #, c-format

2650 msgid "error processing acks: %d"

2651 msgstr "erreur lors du traitement des acquittements : %d"

2652

2587 -#: fetch-pack.c:1278

2653 +#: fetch-pack.c:1259

2654 +msgid "expected packfile to be sent after 'ready'"

2655 +msgstr "fichier paquet attendu à envoyer après 'ready'"

2656 +

2657 +#: fetch-pack.c:1261

2658 +msgid "expected no other sections to be sent after no 'ready'"

2659 +msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

2660 +

2661 +#: fetch-pack.c:1298

2662 #, c-format

2663 msgid "error processing shallow info: %d"

2664 msgstr "erreur lors du traitement de l'information de superficialité : %d"

2665

2592 -#: fetch-pack.c:1294

2666 +#: fetch-pack.c:1314

2667 #, c-format

2668 msgid "expected wanted-ref, got '%s'"

2669 msgstr "wanted-ref attendu, '%s' trouvé"

2670

2597 -#: fetch-pack.c:1304

2671 +#: fetch-pack.c:1324

2672 #, c-format

2673 msgid "unexpected wanted-ref: '%s'"

2674 msgstr "wanted-ref inattendu : '%s'"

2675

2602 -#: fetch-pack.c:1308

2676 +#: fetch-pack.c:1328

2677 #, c-format

2678 msgid "error processing wanted refs: %d"

2679 msgstr "erreur lors du traitement des références voulues : %d"

2680

2607 -#: fetch-pack.c:1603

2681 +#: fetch-pack.c:1642

2682 msgid "no matching remote head"

2683 msgstr "pas de HEAD distante correspondante"

2684

2611 -#: fetch-pack.c:1621 builtin/clone.c:664

2685 +#: fetch-pack.c:1660 builtin/clone.c:664

2686 msgid "remote did not send all necessary objects"

2687 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

2688

2615 -#: fetch-pack.c:1647

2689 +#: fetch-pack.c:1686

2690 #, c-format

2691 msgid "no such remote ref %s"

2692 msgstr "référence distante inconnue %s"

2693

2620 -#: fetch-pack.c:1650

2694 +#: fetch-pack.c:1689

2695 #, c-format

2696 msgid "Server does not allow request for unadvertised object %s"

2697 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"

2698

2625 -#: gpg-interface.c:253

2699 +#: gpg-interface.c:318

2700 msgid "gpg failed to sign the data"

2701 msgstr "gpg n'a pas pu signer les données"

2702

2629 -#: gpg-interface.c:279

2703 +#: gpg-interface.c:344

2704 msgid "could not create temporary file"

2705 msgstr "impossible de créer un fichier temporaire"

2706

2633 -#: gpg-interface.c:282

2707 +#: gpg-interface.c:347

2708 #, c-format

2709 msgid "failed writing detached signature to '%s'"

2710 msgstr "impossible d'écrire la signature détachée dans '%s'"

@@ -2640,18 +2714,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

2714 msgid "ignore invalid color '%.*s' in log.graphColors"

2715 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"

2716

2643 -#: grep.c:2115

2717 +#: grep.c:2113

2718 #, c-format

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

2720 msgstr "'%s' : lecture de %s impossible"

2721

2648 -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2722 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2723 #: builtin/rm.c:134

2724 #, c-format

2725 msgid "failed to stat '%s'"

2726 msgstr "échec du stat de '%s'"

2727

2654 -#: grep.c:2143

2728 +#: grep.c:2141

2729 #, c-format

2730 msgid "'%s': short read"

2731 msgstr "'%s' : lecture tronquée"

@@ -2709,29 +2783,41 @@ msgstr "Commandes bas niveau / Synchronisation de dépôts"

2783 msgid "Low-level Commands / Internal Helpers"

2784 msgstr "Commandes bas niveau / Assistants internes"

2785

2712 -#: help.c:293

2786 +#: help.c:296

2787 #, c-format

2788 msgid "available git commands in '%s'"

2789 msgstr "commandes git disponibles dans '%s'"

2790

2717 -#: help.c:300

2791 +#: help.c:303

2792 msgid "git commands available from elsewhere on your $PATH"

2793 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

2794

2721 -#: help.c:309

2795 +#: help.c:312

2796 msgid "These are common Git commands used in various situations:"

2797 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"

2798

2725 -#: help.c:358 git.c:90

2799 +#: help.c:361 git.c:90

2800 #, c-format

2801 msgid "unsupported command listing type '%s'"

2802 msgstr "type de liste de commandes non supporté '%s'"

2803

2730 -#: help.c:405

2804 +#: help.c:408

2805 msgid "The common Git guides are:"

2806 msgstr "Les guides Git populaires sont :"

2807

2734 -#: help.c:552

2808 +#: help.c:517

2809 +msgid "See 'git help <command>' to read about a specific subcommand"

2810 +msgstr "Référez-vous à 'git help <commande>' pour des informations sur une sous-commande spécifique"

2811 +

2812 +#: help.c:522

2813 +msgid "External commands"

2814 +msgstr "Commandes externes"

2815 +

2816 +#: help.c:530

2817 +msgid "Command aliases"

2818 +msgstr "Alias de commande"

2819 +

2820 +#: help.c:594

2821 #, c-format

2822 msgid ""

2823 "'%s' appears to be a git command, but we were not\n"

@@ -2740,33 +2826,33 @@ msgstr ""

2826 "'%s' semble être une commande git, mais elle n'a pas pu\n"

2827 "être exécutée. Peut-être git-%s est-elle cassée ?"

2828

2743 -#: help.c:611

2829 +#: help.c:653

2830 msgid "Uh oh. Your system reports no Git commands at all."

2831 msgstr "Ahem. Votre système n'indique aucune commande Git."

2832

2747 -#: help.c:633

2833 +#: help.c:675

2834 #, c-format

2835 msgid "WARNING: You called a Git command named '%s', which does not exist."

2836 msgstr ""

2837 "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."

2838

2753 -#: help.c:638

2839 +#: help.c:680

2840 #, c-format

2841 msgid "Continuing under the assumption that you meant '%s'."

2842 msgstr "Continuons en supposant que vous avez voulu dire '%s'."

2843

2758 -#: help.c:643

2844 +#: help.c:685

2845 #, c-format

2846 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2847 msgstr ""

2848 "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."

2849

2764 -#: help.c:651

2850 +#: help.c:693

2851 #, c-format

2852 msgid "git: '%s' is not a git command. See 'git --help'."

2853 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."

2854

2769 -#: help.c:655

2855 +#: help.c:697

2856 msgid ""

2857 "\n"

2858 "The most similar command is"

@@ -2780,16 +2866,16 @@ msgstr[1] ""

2866 "\n"

2867 "Les commandes les plus ressemblantes sont"

2868

2783 -#: help.c:670

2869 +#: help.c:712

2870 msgid "git version [<options>]"

2871 msgstr "git version [<options>]"

2872

2787 -#: help.c:738

2873 +#: help.c:780

2874 #, c-format

2875 msgid "%s: %s - %s"

2876 msgstr "%s: %s - %s"

2877

2792 -#: help.c:742

2878 +#: help.c:784

2879 msgid ""

2880 "\n"

2881 "Did you mean this?"

@@ -2803,7 +2889,7 @@ msgstr[1] ""

2889 "\n"

2890 "Vouliez-vous dire un de ceux-là ?"

2891

2806 -#: ident.c:342

2892 +#: ident.c:345

2893 msgid ""

2894 "\n"

2895 "*** Please tell me who you are.\n"

@@ -2829,44 +2915,48 @@ msgstr ""

2915 "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"

2916 "\n"

2917

2832 -#: ident.c:366

2918 +#: ident.c:369

2919 msgid "no email was given and auto-detection is disabled"

2920 msgstr "aucun courriel fourni et l'auto-détection est désactivée"

2921

2836 -#: ident.c:371

2922 +#: ident.c:374

2923 #, c-format

2924 msgid "unable to auto-detect email address (got '%s')"

2925 msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"

2926

2841 -#: ident.c:381

2927 +#: ident.c:384

2928 msgid "no name was given and auto-detection is disabled"

2929 msgstr "aucun nom fourni et l'auto-détection est désactivée"

2930

2845 -#: ident.c:387

2931 +#: ident.c:390

2932 #, c-format

2933 msgid "unable to auto-detect name (got '%s')"

2934 msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"

2935

2850 -#: ident.c:395

2936 +#: ident.c:398

2937 #, c-format

2938 msgid "empty ident name (for <%s>) not allowed"

2939 msgstr "nom d'identifiant vide (pour <%s>) non permis"

2940

2855 -#: ident.c:401

2941 +#: ident.c:404

2942 #, c-format

2943 msgid "name consists only of disallowed characters: %s"

2944 msgstr "le nom n'est constitué que de caractères interdits : %s"

2945

2860 -#: ident.c:416 builtin/commit.c:600

2946 +#: ident.c:419 builtin/commit.c:606

2947 #, c-format

2948 msgid "invalid date format: %s"

2949 msgstr "format de date invalide : %s"

2950

2865 -#: list-objects-filter-options.c:36

2951 +#: list-objects-filter-options.c:35

2952 msgid "multiple filter-specs cannot be combined"

2953 msgstr "impossible de combiner des spécificateurs multiples de filtre"

2954

2869 -#: list-objects-filter-options.c:126

2955 +#: list-objects-filter-options.c:58

2956 +msgid "only 'tree:0' is supported"

2957 +msgstr "seul 'tree:0' est supporté"

2958 +

2959 +#: list-objects-filter-options.c:137

2960 msgid "cannot change partial clone promisor remote"

2961 msgstr "impossible de modifier le prometteur distant de clone partiel"

2962

@@ -2894,120 +2984,120 @@ msgstr ""

2984 msgid "Unable to create '%s.lock': %s"

2985 msgstr "Impossible de créer '%s.lock' : %s"

2986

2897 -#: merge.c:40

2987 +#: merge.c:41

2988 msgid "failed to read the cache"

2989 msgstr "impossible de lire le cache"

2990

2901 -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2902 -#: builtin/checkout.c:608 builtin/clone.c:763

2991 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2992 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2993 msgid "unable to write new index file"

2994 msgstr "impossible d'écrire le nouveau fichier d'index"

2995

2906 -#: merge-recursive.c:303

2996 +#: merge-recursive.c:323

2997 msgid "(bad commit)\n"

2998 msgstr "(mauvais commit)\n"

2999

2910 -#: merge-recursive.c:325

3000 +#: merge-recursive.c:345

3001 #, c-format

3002 msgid "add_cacheinfo failed for path '%s'; merge aborting."

3003 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3004

2915 -#: merge-recursive.c:333

3005 +#: merge-recursive.c:353

3006 #, c-format

3007 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

3008 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3009

2920 -#: merge-recursive.c:415

3010 +#: merge-recursive.c:435

3011 msgid "error building trees"

3012 msgstr "erreur de construction des arbres"

3013

2924 -#: merge-recursive.c:886

3014 +#: merge-recursive.c:906

3015 #, c-format

3016 msgid "failed to create path '%s'%s"

3017 msgstr "impossible de créer le chemin '%s' %s"

3018

2929 -#: merge-recursive.c:897

3019 +#: merge-recursive.c:917

3020 #, c-format

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

3022 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"

3023

2934 -#: merge-recursive.c:911 merge-recursive.c:930

3024 +#: merge-recursive.c:931 merge-recursive.c:950

3025 msgid ": perhaps a D/F conflict?"

3026 msgstr ": peut-être un conflit D/F ?"

3027

2938 -#: merge-recursive.c:920

3028 +#: merge-recursive.c:940

3029 #, c-format

3030 msgid "refusing to lose untracked file at '%s'"

3031 msgstr "refus de perdre le fichier non suivi '%s'"

3032

2943 -#: merge-recursive.c:962 builtin/cat-file.c:39

3033 +#: merge-recursive.c:982 builtin/cat-file.c:39

3034 #, c-format

3035 msgid "cannot read object %s '%s'"

3036 msgstr "impossible de lire l'objet %s '%s'"

3037

2948 -#: merge-recursive.c:964

3038 +#: merge-recursive.c:984

3039 #, c-format

3040 msgid "blob expected for %s '%s'"

3041 msgstr "blob attendu pour %s '%s'"

3042

2953 -#: merge-recursive.c:988

3043 +#: merge-recursive.c:1008

3044 #, c-format

3045 msgid "failed to open '%s': %s"

3046 msgstr "échec à l'ouverture de '%s' : %s"

3047

2958 -#: merge-recursive.c:999

3048 +#: merge-recursive.c:1019

3049 #, c-format

3050 msgid "failed to symlink '%s': %s"

3051 msgstr "échec à la création du lien symbolique '%s' : %s"

3052

2963 -#: merge-recursive.c:1004

3053 +#: merge-recursive.c:1024

3054 #, c-format

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

3056 msgstr "ne sait pas traiter %06o %s '%s'"

3057

2968 -#: merge-recursive.c:1191

3058 +#: merge-recursive.c:1212

3059 #, c-format

3060 msgid "Failed to merge submodule %s (not checked out)"

3061 msgstr "Échec de la fusion du sous-module %s (non extrait)"

3062

2973 -#: merge-recursive.c:1198

3063 +#: merge-recursive.c:1219

3064 #, c-format

3065 msgid "Failed to merge submodule %s (commits not present)"

3066 msgstr "Échec de fusion du sous-module %s (commits non présents)"

3067

2978 -#: merge-recursive.c:1205

3068 +#: merge-recursive.c:1226

3069 #, c-format

3070 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3071 msgstr ""

3072 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

3073 "base de fusion)"

3074

2985 -#: merge-recursive.c:1213 merge-recursive.c:1225

3075 +#: merge-recursive.c:1234 merge-recursive.c:1246

3076 #, c-format

3077 msgid "Fast-forwarding submodule %s to the following commit:"

3078 msgstr "Avance rapide du sous-module %s au commit suivant :"

3079

2990 -#: merge-recursive.c:1216 merge-recursive.c:1228

3080 +#: merge-recursive.c:1237 merge-recursive.c:1249

3081 #, c-format

3082 msgid "Fast-forwarding submodule %s"

3083 msgstr "Avance rapide du sous-module %s"

3084

2995 -#: merge-recursive.c:1250

3085 +#: merge-recursive.c:1271

3086 #, c-format

3087 msgid "Failed to merge submodule %s (merge following commits not found)"

3088 msgstr ""

3089 "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

3090

3001 -#: merge-recursive.c:1254

3091 +#: merge-recursive.c:1275

3092 #, c-format

3093 msgid "Failed to merge submodule %s (not fast-forward)"

3094 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

3095

3006 -#: merge-recursive.c:1255

3096 +#: merge-recursive.c:1276

3097 msgid "Found a possible merge resolution for the submodule:\n"

3098 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

3099

3010 -#: merge-recursive.c:1258

3100 +#: merge-recursive.c:1279

3101 #, c-format

3102 msgid ""

3103 "If this is correct simply add it to the index for example\n"

@@ -3024,33 +3114,33 @@ msgstr ""

3114 "\n"

3115 "qui acceptera cette suggestion.\n"

3116

3027 -#: merge-recursive.c:1267

3117 +#: merge-recursive.c:1288

3118 #, c-format

3119 msgid "Failed to merge submodule %s (multiple merges found)"

3120 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

3121

3032 -#: merge-recursive.c:1326

3122 +#: merge-recursive.c:1358

3123 msgid "Failed to execute internal merge"

3124 msgstr "Échec à l'exécution de la fusion interne"

3125

3036 -#: merge-recursive.c:1331

3126 +#: merge-recursive.c:1363

3127 #, c-format

3128 msgid "Unable to add %s to database"

3129 msgstr "Impossible d'ajouter %s à la base de données"

3130

3041 -#: merge-recursive.c:1363

3131 +#: merge-recursive.c:1395

3132 #, c-format

3133 msgid "Auto-merging %s"

3134 msgstr "Fusion automatique de %s"

3135

3046 -#: merge-recursive.c:1434

3136 +#: merge-recursive.c:1416

3137 #, c-format

3138 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3139 msgstr ""

3140 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

3141 "place."

3142

3053 -#: merge-recursive.c:1501

3143 +#: merge-recursive.c:1483

3144 #, c-format

3145 msgid ""

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

@@ -3059,7 +3149,7 @@ msgstr ""

3149 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

3150 "%s laissée dans l'arbre."

3151

3062 -#: merge-recursive.c:1506

3152 +#: merge-recursive.c:1488

3153 #, c-format

3154 msgid ""

3155 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3068,7 +3158,7 @@ msgstr ""

3158 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

3159 "%s de %s laissée dans l'arbre."

3160

3071 -#: merge-recursive.c:1513

3161 +#: merge-recursive.c:1495

3162 #, c-format

3163 msgid ""

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

@@ -3077,7 +3167,7 @@ msgstr ""

3167 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

3168 "%s laissée dans l'arbre dans le fichier %s."

3169

3080 -#: merge-recursive.c:1518

3170 +#: merge-recursive.c:1500

3171 #, c-format

3172 msgid ""

3173 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3086,31 +3176,31 @@ msgstr ""

3176 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

3177 "%s de %s laissée dans l'arbre dans le fichier %s."

3178

3089 -#: merge-recursive.c:1552

3179 +#: merge-recursive.c:1534

3180 msgid "rename"

3181 msgstr "renommage"

3182

3093 -#: merge-recursive.c:1552

3183 +#: merge-recursive.c:1534

3184 msgid "renamed"

3185 msgstr "renommé"

3186

3097 -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3098 -#: merge-recursive.c:3129

3187 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3188 +#: merge-recursive.c:3124

3189 #, c-format

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

3191 msgstr "Refus de perdre le fichier modifié %s"

3192

3103 -#: merge-recursive.c:1620

3193 +#: merge-recursive.c:1602

3194 #, c-format

3195 msgid "%s is a directory in %s adding as %s instead"

3196 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"

3197

3108 -#: merge-recursive.c:1625

3198 +#: merge-recursive.c:1607

3199 #, c-format

3200 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3201 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

3202

3113 -#: merge-recursive.c:1651

3203 +#: merge-recursive.c:1633

3204 #, c-format

3205 msgid ""

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

@@ -3119,28 +3209,28 @@ msgstr ""

3209 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "

3210 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"

3211

3122 -#: merge-recursive.c:1656

3212 +#: merge-recursive.c:1638

3213 msgid " (left unresolved)"

3214 msgstr " (laissé non résolu)"

3215

3126 -#: merge-recursive.c:1720

3216 +#: merge-recursive.c:1699

3217 #, c-format

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

3219 msgstr ""

3220 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"

3221 ">'%s' dans %s"

3222

3133 -#: merge-recursive.c:1759

3223 +#: merge-recursive.c:1734

3224 #, c-format

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

3226 msgstr "Renommage de %s en %s et de %s en %s à la place"

3227

3138 -#: merge-recursive.c:1771

3228 +#: merge-recursive.c:1746

3229 #, c-format

3230 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3231 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3232

3143 -#: merge-recursive.c:1977

3233 +#: merge-recursive.c:1952

3234 #, c-format

3235 msgid ""

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

@@ -3151,7 +3241,7 @@ msgstr ""

3241 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

3242 "sans aucune destination récupérant la majorité des fichiers."

3243

3154 -#: merge-recursive.c:2009

3244 +#: merge-recursive.c:1984

3245 #, c-format

3246 msgid ""

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

@@ -3160,7 +3250,7 @@ msgstr ""

3250 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

3251 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

3252

3163 -#: merge-recursive.c:2019

3253 +#: merge-recursive.c:1994

3254 #, c-format

3255 msgid ""

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

@@ -3169,7 +3259,7 @@ msgstr ""

3259 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

3260 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

3261

3172 -#: merge-recursive.c:2111

3262 +#: merge-recursive.c:2086

3263 #, c-format

3264 msgid ""

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

@@ -3178,7 +3268,7 @@ msgstr ""

3268 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

3269 "Renommage de répertoire %s->%s dans %s"

3270

3181 -#: merge-recursive.c:2356

3271 +#: merge-recursive.c:2331

3272 #, c-format

3273 msgid ""

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

@@ -3187,87 +3277,87 @@ msgstr ""

3277 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

3278 "renommé."

3279

3190 -#: merge-recursive.c:2762

3280 +#: merge-recursive.c:2737

3281 #, c-format

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

3283 msgstr ""

3284 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"

3285

3196 -#: merge-recursive.c:2777

3286 +#: merge-recursive.c:2763

3287 #, c-format

3288 msgid "Adding merged %s"

3289 msgstr "Ajout de %s fusionné"

3290

3201 -#: merge-recursive.c:2784 merge-recursive.c:3132

3291 +#: merge-recursive.c:2770 merge-recursive.c:3127

3292 #, c-format

3293 msgid "Adding as %s instead"

3294 msgstr "Ajout plutôt comme %s"

3295

3206 -#: merge-recursive.c:2941

3296 +#: merge-recursive.c:2934

3297 #, c-format

3298 msgid "cannot read object %s"

3299 msgstr "impossible de lire l'objet %s"

3300

3211 -#: merge-recursive.c:2944

3301 +#: merge-recursive.c:2937

3302 #, c-format

3303 msgid "object %s is not a blob"

3304 msgstr "l'objet %s n'est pas un blob"

3305

3216 -#: merge-recursive.c:3013

3306 +#: merge-recursive.c:3006

3307 msgid "modify"

3308 msgstr "modification"

3309

3220 -#: merge-recursive.c:3013

3310 +#: merge-recursive.c:3006

3311 msgid "modified"

3312 msgstr "modifié"

3313

3224 -#: merge-recursive.c:3024

3314 +#: merge-recursive.c:3017

3315 msgid "content"

3316 msgstr "contenu"

3317

3228 -#: merge-recursive.c:3031

3318 +#: merge-recursive.c:3024

3319 msgid "add/add"

3320 msgstr "ajout/ajout"

3321

3232 -#: merge-recursive.c:3076

3322 +#: merge-recursive.c:3071

3323 #, c-format

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

3325 msgstr "%s sauté (fusion identique à l'existant)"

3326

3237 -#: merge-recursive.c:3098 git-submodule.sh:865

3327 +#: merge-recursive.c:3093 git-submodule.sh:858

3328 msgid "submodule"

3329 msgstr "sous-module"

3330

3241 -#: merge-recursive.c:3099

3331 +#: merge-recursive.c:3094

3332 #, c-format

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

3334 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"

3335

3246 -#: merge-recursive.c:3221

3336 +#: merge-recursive.c:3216

3337 #, c-format

3338 msgid "Removing %s"

3339 msgstr "Suppression de %s"

3340

3251 -#: merge-recursive.c:3247

3341 +#: merge-recursive.c:3242

3342 msgid "file/directory"

3343 msgstr "fichier/répertoire"

3344

3255 -#: merge-recursive.c:3253

3345 +#: merge-recursive.c:3248

3346 msgid "directory/file"

3347 msgstr "répertoire/fichier"

3348

3259 -#: merge-recursive.c:3260

3349 +#: merge-recursive.c:3255

3350 #, c-format

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

3352 msgstr ""

3353 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"

3354

3265 -#: merge-recursive.c:3269

3355 +#: merge-recursive.c:3264

3356 #, c-format

3357 msgid "Adding %s"

3358 msgstr "Ajout de %s"

3359

3270 -#: merge-recursive.c:3303

3360 +#: merge-recursive.c:3300

3361 #, c-format

3362 msgid ""

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

@@ -3277,40 +3367,167 @@ msgstr ""

3367 "fusion :\n"

3368 " %s"

3369

3280 -#: merge-recursive.c:3314

3370 +#: merge-recursive.c:3311

3371 msgid "Already up to date!"

3372 msgstr "Déjà à jour !"

3373

3284 -#: merge-recursive.c:3323

3374 +#: merge-recursive.c:3320

3375 #, c-format

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

3377 msgstr "échec de fusion des arbres %s et %s"

3378

3289 -#: merge-recursive.c:3422

3379 +#: merge-recursive.c:3419

3380 msgid "Merging:"

3381 msgstr "Fusion :"

3382

3293 -#: merge-recursive.c:3435

3383 +#: merge-recursive.c:3432

3384 #, c-format

3385 msgid "found %u common ancestor:"

3386 msgid_plural "found %u common ancestors:"

3387 msgstr[0] "%u ancêtre commun trouvé :"

3388 msgstr[1] "%u ancêtres communs trouvés :"

3389

3300 -#: merge-recursive.c:3474

3390 +#: merge-recursive.c:3471

3391 msgid "merge returned no commit"

3392 msgstr "la fusion n'a pas retourné de commit"

3393

3304 -#: merge-recursive.c:3540

3394 +#: merge-recursive.c:3537

3395 #, c-format

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

3397 msgstr "Impossible d'analyser l'objet '%s'"

3398

3309 -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3399 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3400 msgid "Unable to write index."

3401 msgstr "Impossible d'écrire l'index."

3402

3313 -#: notes-merge.c:274

3403 +#: midx.c:65

3404 +#, c-format

3405 +msgid "multi-pack-index file %s is too small"

3406 +msgstr "le fichier d'index multi-paquet %s est trop petit"

3407 +

3408 +#: midx.c:81

3409 +#, c-format

3410 +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3411 +msgstr "la signature de d'index multi-paquet 0x%08x ne correspond pas à la signature 0x%08x"

3412 +

3413 +#: midx.c:86

3414 +#, c-format

3415 +msgid "multi-pack-index version %d not recognized"

3416 +msgstr "la version d'index multi-paquet %d n'est pas reconnue"

3417 +

3418 +#: midx.c:91

3419 +#, c-format

3420 +msgid "hash version %u does not match"

3421 +msgstr "la version %u du condensé ne correspond pas"

3422 +

3423 +#: midx.c:105

3424 +msgid "invalid chunk offset (too large)"

3425 +msgstr "décalage de section invalide (trop grand)"

3426 +

3427 +#: midx.c:129

3428 +msgid "terminating multi-pack-index chunk id appears earlier than expected"

3429 +msgstr "identifiant de terminaison de tronçon d'index multi-paquet terminant apparaît plus tôt qu'attendu"

3430 +

3431 +#: midx.c:142

3432 +msgid "multi-pack-index missing required pack-name chunk"

3433 +msgstr "index multi-paquet manque de tronçon de nom de paquet"

3434 +

3435 +#: midx.c:144

3436 +msgid "multi-pack-index missing required OID fanout chunk"

3437 +msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"

3438 +

3439 +#: midx.c:146

3440 +msgid "multi-pack-index missing required OID lookup chunk"

3441 +msgstr "index multi-paquet manque de tronçon de recherche OID"

3442 +

3443 +#: midx.c:148

3444 +msgid "multi-pack-index missing required object offsets chunk"

3445 +msgstr "index multi-paquet manque de tronçon de décalage d'objet"

3446 +

3447 +#: midx.c:162

3448 +#, c-format

3449 +msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3450 +msgstr "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

3451 +

3452 +#: midx.c:205

3453 +#, c-format

3454 +msgid "bad pack-int-id: %u (%u total packs"

3455 +msgstr "mauvais pack-int-id : %u (%u paquets au total)"

3456 +

3457 +#: midx.c:246

3458 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3459 +msgstr "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"

3460 +

3461 +#: midx.c:271

3462 +msgid "error preparing packfile from multi-pack-index"

3463 +msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

3464 +

3465 +#: midx.c:407

3466 +#, c-format

3467 +msgid "failed to add packfile '%s'"

3468 +msgstr "échec de l'ajout du fichier paquet '%s'"

3469 +

3470 +#: midx.c:413

3471 +#, c-format

3472 +msgid "failed to open pack-index '%s'"

3473 +msgstr "échec à l'ouverture du fichier paquet '%s'"

3474 +

3475 +#: midx.c:507

3476 +#, c-format

3477 +msgid "failed to locate object %d in packfile"

3478 +msgstr "échec de localisation de l'objet %d dans le fichier paquet"

3479 +

3480 +#: midx.c:943

3481 +#, c-format

3482 +msgid "failed to clear multi-pack-index at %s"

3483 +msgstr "échec du nettoyage de l'index de multi-paquet à %s"

3484 +

3485 +#: midx.c:981

3486 +#, c-format

3487 +msgid ""

3488 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3489 +msgstr "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = étalement[%d]"

3490 +

3491 +#: midx.c:992

3492 +#, c-format

3493 +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3494 +msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

3495 +

3496 +#: midx.c:996

3497 +msgid "Verifying object offsets"

3498 +msgstr "Vérification des décalages des objets"

3499 +

3500 +#: midx.c:1004

3501 +#, c-format

3502 +msgid "failed to load pack entry for oid[%d] = %s"

3503 +msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

3504 +

3505 +#: midx.c:1010

3506 +#, c-format

3507 +msgid "failed to load pack-index for packfile %s"

3508 +msgstr "impossible de lire le fichier paquet %s"

3509 +

3510 +#: midx.c:1019

3511 +#, c-format

3512 +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3513 +msgstr "décalage d'objet incorrecte pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

3514 +

3515 +#: name-hash.c:532

3516 +#, c-format

3517 +msgid "unable to create lazy_dir thread: %s"

3518 +msgstr "impossible de créer le fil lazy_dir : %s"

3519 +

3520 +#: name-hash.c:554

3521 +#, c-format

3522 +msgid "unable to create lazy_name thread: %s"

3523 +msgstr "impossible de créer le fil lazy_name : %s"

3524 +

3525 +#: name-hash.c:560

3526 +#, c-format

3527 +msgid "unable to join lazy_name thread: %s"

3528 +msgstr "impossible de joindre le fil lazy_name : %s"

3529 +

3530 +#: notes-merge.c:275

3531 #, c-format

3532 msgid ""

3533 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3321,7 +3538,7 @@ msgstr ""

3538 "Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "

3539 "pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."

3540

3324 -#: notes-merge.c:281

3541 +#: notes-merge.c:282

3542 #, c-format

3543 msgid "You have not concluded your notes merge (%s exists)."

3544 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."

@@ -3374,16 +3591,16 @@ msgstr "impossible d'analyser l'objet : %s"

3591 msgid "sha1 mismatch %s"

3592 msgstr "incohérence de sha1 %s"

3593

3377 -#: packfile.c:563

3594 +#: packfile.c:607

3595 msgid "offset before end of packfile (broken .idx?)"

3596 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

3597

3381 -#: packfile.c:1745

3598 +#: packfile.c:1864

3599 #, c-format

3600 msgid "offset before start of pack index for %s (corrupt index?)"

3601 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

3602

3386 -#: packfile.c:1749

3603 +#: packfile.c:1868

3604 #, c-format

3605 msgid "offset beyond end of pack index for %s (truncated index?)"

3606 msgstr ""

@@ -3415,17 +3632,17 @@ msgstr " %s"

3632 msgid "-NUM"

3633 msgstr "-NUM"

3634

3418 -#: parse-options-cb.c:44

3635 +#: parse-options-cb.c:37

3636 #, c-format

3637 msgid "malformed expiration date '%s'"

3638 msgstr "date d'expiration malformée : '%s'"

3639

3423 -#: parse-options-cb.c:112

3640 +#: parse-options-cb.c:109

3641 #, c-format

3642 msgid "malformed object name '%s'"

3643 msgstr "nom d'objet malformé '%s'"

3644

3428 -#: path.c:892

3645 +#: path.c:894

3646 #, c-format

3647 msgid "Could not make %s writable by group"

3648 msgstr "Impossible de rendre %s inscriptible pour le groupe"

@@ -3549,33 +3766,46 @@ msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"

3766 msgid "protocol error: bad line length %d"

3767 msgstr "erreur de protocole : mauvaise longueur de ligne %d"

3768

3769 +#: preload-index.c:118

3770 +msgid "Refreshing index"

3771 +msgstr "Rafraîchissement de l'index"

3772 +

3773 +#: preload-index.c:137

3774 +#, c-format

3775 +msgid "unable to create threaded lstat: %s"

3776 +msgstr "impossible de créer le lstat en fil : %s"

3777 +

3778 #: pretty.c:962

3779 msgid "unable to parse --pretty format"

3780 msgstr "impossible d'analyser le format --pretty"

3781

3556 -#: range-diff.c:48

3782 +#: range-diff.c:56

3783 msgid "could not start `log`"

3784 msgstr "impossible de démarrer `log`"

3785

3560 -#: range-diff.c:51

3786 +#: range-diff.c:59

3787 msgid "could not read `log` output"

3788 msgstr "impossible de lire la sortie de `log`"

3789

3564 -#: range-diff.c:66 sequencer.c:4540

3790 +#: range-diff.c:74 sequencer.c:4764

3791 #, c-format

3792 msgid "could not parse commit '%s'"

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

3794

3569 -#: range-diff.c:196

3795 +#: range-diff.c:224

3796 msgid "failed to generate diff"

3797 msgstr "échec de la génération de diff"

3798

3573 -#: range-diff.c:421 range-diff.c:423

3799 +#: range-diff.c:455 range-diff.c:457

3800 #, c-format

3801 msgid "could not parse log for '%s'"

3802 msgstr "impossible d'analyser le journal pour '%s'"

3803

3578 -#: read-cache.c:1579

3804 +#: read-cache.c:1490

3805 +msgid "Refresh index"

3806 +msgstr "Rafraîchir l'index"

3807 +

3808 +#: read-cache.c:1604

3809 #, c-format

3810 msgid ""

3811 "index.version set, but the value is invalid.\n"

@@ -3584,7 +3814,7 @@ msgstr ""

3814 "version d'index renseignée, mais la valeur est invalide.\n"

3815 "Utilisation de la version %i"

3816

3587 -#: read-cache.c:1589

3817 +#: read-cache.c:1614

3818 #, c-format

3819 msgid ""

3820 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -3593,135 +3823,260 @@ msgstr ""

3823 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

3824 "Utilisation de la version %i"

3825

3596 -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3826 +#: read-cache.c:1792

3827 +#, c-format

3828 +msgid "malformed name field in the index, near path '%s'"

3829 +msgstr "champ de nom malformé dans l'index, près du chemin '%s'"

3830 +

3831 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3832 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3833 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3834 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3835 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3836 +msgid "index file corrupt"

3837 +msgstr "fichier d'index corrompu"

3838 +

3839 +#: read-cache.c:2101

3840 +#, c-format

3841 +msgid "unable to create load_cache_entries thread: %s"

3842 +msgstr "impossible de créer le fil load_cache_entries : %s"

3843 +

3844 +#: read-cache.c:2114

3845 +#, c-format

3846 +msgid "unable to join load_cache_entries thread: %s"

3847 +msgstr "impossible de joindre le fil load_cach_entries : %s"

3848 +

3849 +#: read-cache.c:2200

3850 +#, c-format

3851 +msgid "unable to create load_index_extensions thread: %s"

3852 +msgstr "impossible de créer le fil load_index_extensions : %s"

3853 +

3854 +#: read-cache.c:2227

3855 +#, c-format

3856 +msgid "unable to join load_index_extensions thread: %s"

3857 +msgstr "impossible de joindre le fil load_index_extensions : %s"

3858 +

3859 +#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3860 #, c-format

3861 msgid "could not close '%s'"

3862 msgstr "impossible de fermer '%s'"

3863

3601 -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3864 +#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592

3865 #, c-format

3866 msgid "could not stat '%s'"

3867 msgstr "stat impossible de '%s'"

3868

3606 -#: read-cache.c:2666

3869 +#: read-cache.c:3039

3870 #, c-format

3871 msgid "unable to open git dir: %s"

3872 msgstr "impossible d'ouvrir le répertoire git : %s"

3873

3611 -#: read-cache.c:2678

3874 +#: read-cache.c:3051

3875 #, c-format

3876 msgid "unable to unlink: %s"

3877 msgstr "échec lors de l'unlink : %s"

3878

3879 +#: rebase-interactive.c:10

3880 +msgid ""

3881 +"\n"

3882 +"Commands:\n"

3883 +"p, pick <commit> = use commit\n"

3884 +"r, reword <commit> = use commit, but edit the commit message\n"

3885 +"e, edit <commit> = use commit, but stop for amending\n"

3886 +"s, squash <commit> = use commit, but meld into previous commit\n"

3887 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

3888 +"x, exec <command> = run command (the rest of the line) using shell\n"

3889 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

3890 +"d, drop <commit> = remove commit\n"

3891 +"l, label <label> = label current HEAD with a name\n"

3892 +"t, reset <label> = reset HEAD to a label\n"

3893 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3894 +". create a merge commit using the original merge commit's\n"

3895 +". message (or the oneline, if no original merge commit was\n"

3896 +". specified). Use -c <commit> to reword the commit message.\n"

3897 +"\n"

3898 +"These lines can be re-ordered; they are executed from top to bottom.\n"

3899 +msgstr ""

3900 +"\n"

3901 +"Commandes :\n"

3902 +" p, pick <commit> = utiliser le commit\n"

3903 +" r, reword <commit> = utiliser le commit, mais reformuler son message\n"

3904 +" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"

3905 +" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n"

3906 +" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"

3907 +" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"

3908 +" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --contine')\n"

3909 +" d, drop <commit> = supprimer le commit\n"

3910 +" l, label <label> = étiqueter la HEAD courante avec un nom\n"

3911 +" t, reset <label> = réinitialiser HEAD à label\n"

3912 +" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n"

3913 +" créer un commit de fusion utilisant le message de fusion original\n"

3914 +" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n"

3915 +" Utilisez -c <commit> pour reformuler le message de validation.\n"

3916 +"\n"

3917 +"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"

3918 +

3919 +#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

3920 +msgid ""

3921 +"\n"

3922 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

3923 +msgstr ""

3924 +"\n"

3925 +"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "

3926 +"commit.\n"

3927 +

3928 +#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

3929 +msgid ""

3930 +"\n"

3931 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

3932 +msgstr ""

3933 +"\n"

3934 +"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"

3935 +

3936 +#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

3937 +msgid ""

3938 +"\n"

3939 +"You are editing the todo file of an ongoing interactive rebase.\n"

3940 +"To continue rebase after editing, run:\n"

3941 +" git rebase --continue\n"

3942 +"\n"

3943 +msgstr ""

3944 +"\n"

3945 +"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "

3946 +"cours.\n"

3947 +"Pour continuer le rebasage après édition, lancez :\n"

3948 +" git rebase --continue\n"

3949 +"\n"

3950 +

3951 +#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

3952 +msgid ""

3953 +"\n"

3954 +"However, if you remove everything, the rebase will be aborted.\n"

3955 +"\n"

3956 +msgstr ""

3957 +"\n"

3958 +"Cependant, si vous effacez tout, le rebasage sera annulé.\n"

3959 +"\n"

3960 +

3961 +#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

3962 +msgid "Note that empty commits are commented out"

3963 +msgstr "Veuillez noter que les commits vides sont en commentaire"

3964 +

3965 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3966 +#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3967 +#, c-format

3968 +msgid "could not read '%s'."

3969 +msgstr "impossible de lire '%s'."

3970 +

3971 #: refs.c:192

3972 #, c-format

3973 msgid "%s does not point to a valid object!"

3974 msgstr "%s ne pointe pas sur un objet valide!"

3975

3621 -#: refs.c:579

3976 +#: refs.c:583

3977 #, c-format

3978 msgid "ignoring dangling symref %s"

3979 msgstr "symref pendant %s ignoré"

3980

3626 -#: refs.c:581 ref-filter.c:2067

3981 +#: refs.c:585 ref-filter.c:1951

3982 #, c-format

3983 msgid "ignoring broken ref %s"

3984 msgstr "réf cassé %s ignoré"

3985

3631 -#: refs.c:685

3986 +#: refs.c:711

3987 #, c-format

3988 msgid "could not open '%s' for writing: %s"

3989 msgstr "impossible d'ouvrir '%s' en écriture : %s"

3990

3636 -#: refs.c:695 refs.c:746

3991 +#: refs.c:721 refs.c:772

3992 #, c-format

3993 msgid "could not read ref '%s'"

3994 msgstr "impossible de lire la réf '%s'"

3995

3641 -#: refs.c:701

3996 +#: refs.c:727

3997 #, c-format

3998 msgid "ref '%s' already exists"

3999 msgstr "la référence '%s' existe déjà"

4000

3646 -#: refs.c:706

4001 +#: refs.c:732

4002 #, c-format

4003 msgid "unexpected object ID when writing '%s'"

4004 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

4005

3651 -#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3652 -#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

4006 +#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

4007 +#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

4008 #: wrapper.c:656

4009 #, c-format

4010 msgid "could not write to '%s'"

4011 msgstr "impossible d'écrire dans '%s'"

4012

3658 -#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3659 -#: builtin/am.c:780

4013 +#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

4014 +#: builtin/am.c:728

4015 #, c-format

4016 msgid "could not open '%s' for writing"

4017 msgstr "impossible d'ouvrir '%s' en écriture"

4018

3664 -#: refs.c:748

4019 +#: refs.c:774

4020 #, c-format

4021 msgid "unexpected object ID when deleting '%s'"

4022 msgstr "id d'objet inattendu pendant la suppression de '%s'"

4023

3669 -#: refs.c:879

4024 +#: refs.c:905

4025 #, c-format

4026 msgid "log for ref %s has gap after %s"

4027 msgstr "le journal pour la réf %s contient un trou après %s"

4028

3674 -#: refs.c:885

4029 +#: refs.c:911

4030 #, c-format

4031 msgid "log for ref %s unexpectedly ended on %s"

4032 msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

4033

3679 -#: refs.c:943

4034 +#: refs.c:969

4035 #, c-format

4036 msgid "log for %s is empty"

4037 msgstr "le journal pour la réf %s est vide"

4038

3684 -#: refs.c:1035

4039 +#: refs.c:1061

4040 #, c-format

4041 msgid "refusing to update ref with bad name '%s'"

4042 msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

4043

3689 -#: refs.c:1111

4044 +#: refs.c:1137

4045 #, c-format

4046 msgid "update_ref failed for ref '%s': %s"

4047 msgstr "échec de update_ref pour la réf '%s' : %s"

4048

3694 -#: refs.c:1853

4049 +#: refs.c:1911

4050 #, c-format

4051 msgid "multiple updates for ref '%s' not allowed"

4052 msgstr "mises à jour multiples pour la réf '%s' non permises"

4053

3699 -#: refs.c:1885

4054 +#: refs.c:1943

4055 msgid "ref updates forbidden inside quarantine environment"

4056 msgstr "mises à jour des références interdites en environnement de quarantaine"

4057

3703 -#: refs.c:1981 refs.c:2011

4058 +#: refs.c:2039 refs.c:2069

4059 #, c-format

4060 msgid "'%s' exists; cannot create '%s'"

4061 msgstr "'%s' existe ; impossible de créer '%s'"

4062

3708 -#: refs.c:1987 refs.c:2022

4063 +#: refs.c:2045 refs.c:2080

4064 #, c-format

4065 msgid "cannot process '%s' and '%s' at the same time"

4066 msgstr "impossible de traiter '%s' et '%s' en même temps"

4067

3713 -#: refs/files-backend.c:1191

4068 +#: refs/files-backend.c:1227

4069 #, c-format

4070 msgid "could not remove reference %s"

4071 msgstr "impossible de supprimer la référence %s"

4072

3718 -#: refs/files-backend.c:1205 refs/packed-backend.c:1532

4073 +#: refs/files-backend.c:1241 refs/packed-backend.c:1532

4074 #: refs/packed-backend.c:1542

4075 #, c-format

4076 msgid "could not delete reference %s: %s"

4077 msgstr "Impossible de supprimer la référence %s : %s"

4078

3724 -#: refs/files-backend.c:1208 refs/packed-backend.c:1545

4079 +#: refs/files-backend.c:1244 refs/packed-backend.c:1545

4080 #, c-format

4081 msgid "could not delete references: %s"

4082 msgstr "impossible de supprimer les références : %s"

@@ -3732,191 +4087,197 @@ msgid "invalid refspec '%s'"

4087 msgstr "spécificateur de réference invalide : '%s'"

4088

4089 # à priori on parle d'une branche ici

3735 -#: ref-filter.c:38 wt-status.c:1850

4090 +#: ref-filter.c:39 wt-status.c:1855

4091 msgid "gone"

4092 msgstr "disparue"

4093

3739 -#: ref-filter.c:39

4094 +#: ref-filter.c:40

4095 #, c-format

4096 msgid "ahead %d"

4097 msgstr "en avance de %d"

4098

3744 -#: ref-filter.c:40

4099 +#: ref-filter.c:41

4100 #, c-format

4101 msgid "behind %d"

4102 msgstr "en retard de %d"

4103

3749 -#: ref-filter.c:41

4104 +#: ref-filter.c:42

4105 #, c-format

4106 msgid "ahead %d, behind %d"

4107 msgstr "en avance de %d, en retard de %d"

4108

3754 -#: ref-filter.c:137

4109 +#: ref-filter.c:138

4110 #, c-format

4111 msgid "expected format: %%(color:<color>)"

4112 msgstr "format attendu : %%(color:<couleur>)"

4113

3759 -#: ref-filter.c:139

4114 +#: ref-filter.c:140

4115 #, c-format

4116 msgid "unrecognized color: %%(color:%s)"

4117 msgstr "couleur non reconnue : %%(color:%s)"

4118

3764 -#: ref-filter.c:161

4119 +#: ref-filter.c:162

4120 #, c-format

4121 msgid "Integer value expected refname:lstrip=%s"

4122 msgstr "Valeur entière attendue refname:lstrip=%s"

4123

3769 -#: ref-filter.c:165

4124 +#: ref-filter.c:166

4125 #, c-format

4126 msgid "Integer value expected refname:rstrip=%s"

4127 msgstr "Valeur entière attendue refname:rstrip=%s"

4128

3774 -#: ref-filter.c:167

4129 +#: ref-filter.c:168

4130 #, c-format

4131 msgid "unrecognized %%(%s) argument: %s"

4132 msgstr "argument %%(%s) non reconnu : %s"

4133

3779 -#: ref-filter.c:222

4134 +#: ref-filter.c:223

4135 #, c-format

4136 msgid "%%(objecttype) does not take arguments"

4137 msgstr "%%(objecttype) n'accepte pas d'argument"

4138

3784 -#: ref-filter.c:234

4139 +#: ref-filter.c:235

4140 #, c-format

4141 msgid "%%(objectsize) does not take arguments"

4142 msgstr "%%(objectsize) n'accepte pas d'argument"

4143

3789 -#: ref-filter.c:246

4144 +#: ref-filter.c:247

4145 #, c-format

4146 msgid "%%(body) does not take arguments"

4147 msgstr "%%(body) n'accepte pas d'argument"

4148

3794 -#: ref-filter.c:255

4149 +#: ref-filter.c:256

4150 #, c-format

4151 msgid "%%(subject) does not take arguments"

4152 msgstr "%%(subject) n'accepte pas d'argument"

4153

3799 -#: ref-filter.c:275

4154 +#: ref-filter.c:278

4155 #, c-format

4156 msgid "unknown %%(trailers) argument: %s"

4157 msgstr "argument %%(trailers) inconnu : %s"

4158

3804 -#: ref-filter.c:304

4159 +#: ref-filter.c:307

4160 #, c-format

4161 msgid "positive value expected contents:lines=%s"

4162 msgstr "valeur positive attendue contents:lines=%s"

4163

3809 -#: ref-filter.c:306

4164 +#: ref-filter.c:309

4165 #, c-format

4166 msgid "unrecognized %%(contents) argument: %s"

4167 msgstr "argument %%(contents) non reconnu : %s"

4168

3814 -#: ref-filter.c:321

4169 +#: ref-filter.c:324

4170 #, c-format

4171 msgid "positive value expected objectname:short=%s"

4172 msgstr "valeur positive attendue objectname:short=%s"

4173

3819 -#: ref-filter.c:325

4174 +#: ref-filter.c:328

4175 #, c-format

4176 msgid "unrecognized %%(objectname) argument: %s"

4177 msgstr "argument %%(objectname) non reconnu : %s"

4178

3824 -#: ref-filter.c:355

4179 +#: ref-filter.c:358

4180 #, c-format

4181 msgid "expected format: %%(align:<width>,<position>)"

4182 msgstr "format attendu : %%(align:<largeur>,<position>)"

4183

3829 -#: ref-filter.c:367

4184 +#: ref-filter.c:370

4185 #, c-format

4186 msgid "unrecognized position:%s"

4187 msgstr "position non reconnue : %s"

4188

3834 -#: ref-filter.c:374

4189 +#: ref-filter.c:377

4190 #, c-format

4191 msgid "unrecognized width:%s"

4192 msgstr "largeur non reconnue : %s"

4193

3839 -#: ref-filter.c:383

4194 +#: ref-filter.c:386

4195 #, c-format

4196 msgid "unrecognized %%(align) argument: %s"

4197 msgstr "argument %%(align) non reconnu : %s"

4198

3844 -#: ref-filter.c:391

4199 +#: ref-filter.c:394

4200 #, c-format

4201 msgid "positive width expected with the %%(align) atom"

4202 msgstr "valeur positive attendue avec l'atome %%(align)"

4203

3849 -#: ref-filter.c:409

4204 +#: ref-filter.c:412

4205 #, c-format

4206 msgid "unrecognized %%(if) argument: %s"

4207 msgstr "argument %%(if) non reconnu : %s"

4208

3854 -#: ref-filter.c:505

4209 +#: ref-filter.c:508

4210 #, c-format

4211 msgid "malformed field name: %.*s"

4212 msgstr "nom de champ malformé %.*s"

4213

3859 -#: ref-filter.c:532

4214 +#: ref-filter.c:535

4215 #, c-format

4216 msgid "unknown field name: %.*s"

4217 msgstr "nom de champ inconnu : %.*s"

4218

3864 -#: ref-filter.c:656

4219 +#: ref-filter.c:539

4220 +#, c-format

4221 +msgid ""

4222 +"not a git repository, but the field '%.*s' requires access to object data"

4223 +msgstr "pas un dépôt git, mais le champ '%.*s' nécessite l'accès au données d'objet"

4224 +

4225 +#: ref-filter.c:663

4226 #, c-format

4227 msgid "format: %%(if) atom used without a %%(then) atom"

4228 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"

4229

3869 -#: ref-filter.c:719

4230 +#: ref-filter.c:726

4231 #, c-format

4232 msgid "format: %%(then) atom used without an %%(if) atom"

4233 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"

4234

3874 -#: ref-filter.c:721

4235 +#: ref-filter.c:728

4236 #, c-format

4237 msgid "format: %%(then) atom used more than once"

4238 msgstr "format : atome %%(then) utilisé plus d'une fois"

4239

3879 -#: ref-filter.c:723

4240 +#: ref-filter.c:730

4241 #, c-format

4242 msgid "format: %%(then) atom used after %%(else)"

4243 msgstr "format: atome %%(then) utilisé après %%(else)"

4244

3884 -#: ref-filter.c:751

4245 +#: ref-filter.c:758

4246 #, c-format

4247 msgid "format: %%(else) atom used without an %%(if) atom"

4248 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"

4249

3889 -#: ref-filter.c:753

4250 +#: ref-filter.c:760

4251 #, c-format

4252 msgid "format: %%(else) atom used without a %%(then) atom"

4253 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"

4254

3894 -#: ref-filter.c:755

4255 +#: ref-filter.c:762

4256 #, c-format

4257 msgid "format: %%(else) atom used more than once"

4258 msgstr "format : atome %%(else) utilisé plus d'une fois"

4259

3899 -#: ref-filter.c:770

4260 +#: ref-filter.c:777

4261 #, c-format

4262 msgid "format: %%(end) atom used without corresponding atom"

4263 msgstr "format : atome %%(end) utilisé sans atome correspondant"

4264

3904 -#: ref-filter.c:827

4265 +#: ref-filter.c:834

4266 #, c-format

4267 msgid "malformed format string %s"

4268 msgstr "Chaîne de formatage mal formée %s"

4269

3909 -#: ref-filter.c:1416

4270 +#: ref-filter.c:1424

4271 #, c-format

4272 msgid "(no branch, rebasing %s)"

4273 msgstr "(aucune branche, rebasage de %s)"

4274

3914 -#: ref-filter.c:1419

4275 +#: ref-filter.c:1427

4276 #, c-format

4277 msgid "(no branch, rebasing detached HEAD %s)"

4278 msgstr "(aucune branche, rebasage de la HEAD détachée %s)"

4279

3919 -#: ref-filter.c:1422

4280 +#: ref-filter.c:1430

4281 #, c-format

4282 msgid "(no branch, bisect started on %s)"

4283 msgstr "(aucune branche, bisect a démarré sur %s)"

@@ -3924,7 +4285,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)"

4285 #. TRANSLATORS: make sure this matches "HEAD

4286 #. detached at " in wt-status.c

4287 #.

3927 -#: ref-filter.c:1430

4288 +#: ref-filter.c:1438

4289 #, c-format

4290 msgid "(HEAD detached at %s)"

4291 msgstr "(HEAD détachée sur %s)"

@@ -3932,145 +4293,145 @@ msgstr "(HEAD détachée sur %s)"

4293 #. TRANSLATORS: make sure this matches "HEAD

4294 #. detached from " in wt-status.c

4295 #.

3935 -#: ref-filter.c:1437

4296 +#: ref-filter.c:1445

4297 #, c-format

4298 msgid "(HEAD detached from %s)"

4299 msgstr "(HEAD détachée depuis %s)"

4300

3940 -#: ref-filter.c:1441

4301 +#: ref-filter.c:1449

4302 msgid "(no branch)"

4303 msgstr "(aucune branche)"

4304

3944 -#: ref-filter.c:1475 ref-filter.c:1623

4305 +#: ref-filter.c:1483 ref-filter.c:1638

4306 #, c-format

4307 msgid "missing object %s for %s"

4308 msgstr "objet manquant %s pour %s"

4309

3949 -#: ref-filter.c:1483

4310 +#: ref-filter.c:1491

4311 #, c-format

4312 msgid "parse_object_buffer failed on %s for %s"

4313 msgstr "echec de parse_object_buffer sur %s pour %s"

4314

3954 -#: ref-filter.c:1980

4315 +#: ref-filter.c:1857

4316 #, c-format

4317 msgid "malformed object at '%s'"

4318 msgstr "objet malformé à '%s'"

4319

3959 -#: ref-filter.c:2062

4320 +#: ref-filter.c:1946

4321 #, c-format

4322 msgid "ignoring ref with broken name %s"

4323 msgstr "réf avec un nom cassé %s ignoré"

4324

3964 -#: ref-filter.c:2340

4325 +#: ref-filter.c:2232

4326 #, c-format

4327 msgid "format: %%(end) atom missing"

4328 msgstr "format: atome %%(end) manquant"

4329

3969 -#: ref-filter.c:2444

4330 +#: ref-filter.c:2338

4331 #, c-format

4332 msgid "malformed object name %s"

4333 msgstr "nom d'objet malformé %s"

4334

3974 -#: remote.c:606

4335 +#: remote.c:607

4336 #, c-format

4337 msgid "Cannot fetch both %s and %s to %s"

4338 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

4339

3979 -#: remote.c:610

4340 +#: remote.c:611

4341 #, c-format

4342 msgid "%s usually tracks %s, not %s"

4343 msgstr "%s suit habituellement %s, pas %s"

4344

3984 -#: remote.c:614

4345 +#: remote.c:615

4346 #, c-format

4347 msgid "%s tracks both %s and %s"

4348 msgstr "%s suit à la fois %s et %s"

4349

3989 -#: remote.c:622

4350 +#: remote.c:623

4351 msgid "Internal error"

4352 msgstr "Erreur interne"

4353

3993 -#: remote.c:1536 remote.c:1637

4354 +#: remote.c:1569 remote.c:1670

4355 msgid "HEAD does not point to a branch"

4356 msgstr "HEAD ne pointe pas sur une branche"

4357

3997 -#: remote.c:1545

4358 +#: remote.c:1578

4359 #, c-format

4360 msgid "no such branch: '%s'"

4361 msgstr "pas de branche '%s'"

4362

4002 -#: remote.c:1548

4363 +#: remote.c:1581

4364 #, c-format

4365 msgid "no upstream configured for branch '%s'"

4366 msgstr "aucune branche amont configurée pour la branche '%s'"

4367

4007 -#: remote.c:1554

4368 +#: remote.c:1587

4369 #, c-format

4370 msgid "upstream branch '%s' not stored as a remote-tracking branch"

4371 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

4372

4012 -#: remote.c:1569

4373 +#: remote.c:1602

4374 #, c-format

4375 msgid "push destination '%s' on remote '%s' has no local tracking branch"

4376 msgstr ""

4377 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

4378 "branche locale de suivi"

4379

4019 -#: remote.c:1581

4380 +#: remote.c:1614

4381 #, c-format

4382 msgid "branch '%s' has no remote for pushing"

4383 msgstr "la branche '%s' n'a aucune branche distante de poussée"

4384

4024 -#: remote.c:1591

4385 +#: remote.c:1624

4386 #, c-format

4387 msgid "push refspecs for '%s' do not include '%s'"

4388 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

4389

4029 -#: remote.c:1604

4390 +#: remote.c:1637

4391 msgid "push has no destination (push.default is 'nothing')"

4392 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

4393

4033 -#: remote.c:1626

4394 +#: remote.c:1659

4395 msgid "cannot resolve 'simple' push to a single destination"

4396 msgstr ""

4397 "impossible de résoudre une poussée 'simple' pour une destination unique"

4398

4038 -#: remote.c:1951

4399 +#: remote.c:1935

4400 #, c-format

4401 msgid "Your branch is based on '%s', but the upstream is gone.\n"

4402 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

4403

4043 -#: remote.c:1955

4404 +#: remote.c:1939

4405 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

4406 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

4407

4047 -#: remote.c:1958

4408 +#: remote.c:1942

4409 #, c-format

4410 msgid "Your branch is up to date with '%s'.\n"

4411 msgstr "Votre branche est à jour avec '%s'.\n"

4412

4052 -#: remote.c:1962

4413 +#: remote.c:1946

4414 #, c-format

4415 msgid "Your branch and '%s' refer to different commits.\n"

4416 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

4417

4057 -#: remote.c:1965

4418 +#: remote.c:1949

4419 #, c-format

4420 msgid " (use \"%s\" for details)\n"

4421 msgstr " (utilisez \"%s\" pour plus de détails)\n"

4422

4062 -#: remote.c:1969

4423 +#: remote.c:1953

4424 #, c-format

4425 msgid "Your branch is ahead of '%s' by %d commit.\n"

4426 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

4427 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

4428 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

4429

4069 -#: remote.c:1975

4430 +#: remote.c:1959

4431 msgid " (use \"git push\" to publish your local commits)\n"

4432 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

4433

4073 -#: remote.c:1978

4434 +#: remote.c:1962

4435 #, c-format

4436 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

4437 msgid_plural ""

@@ -4082,11 +4443,11 @@ msgstr[1] ""

4443 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

4444 "en avance rapide.\n"

4445

4085 -#: remote.c:1986

4446 +#: remote.c:1970

4447 msgid " (use \"git pull\" to update your local branch)\n"

4448 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

4449

4089 -#: remote.c:1989

4450 +#: remote.c:1973

4451 #, c-format

4452 msgid ""

4453 "Your branch and '%s' have diverged,\n"

@@ -4101,78 +4462,181 @@ msgstr[1] ""

4462 "Votre branche et '%s' ont divergé,\n"

4463 "et ont %d et %d commits différents chacune respectivement.\n"

4464

4104 -#: remote.c:1999

4465 +#: remote.c:1983

4466 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

4467 msgstr ""

4468 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

4469

4109 -#: replace-object.c:20

4470 +#: replace-object.c:21

4471 #, c-format

4472 msgid "bad replace ref name: %s"

4473 msgstr "mauvaise références de remplacement : %s"

4474

4114 -#: replace-object.c:29

4475 +#: replace-object.c:30

4476 #, c-format

4477 msgid "duplicate replace ref: %s"

4478 msgstr "référence de remplacement dupliquée : %s"

4479

4119 -#: replace-object.c:72

4480 +#: replace-object.c:73

4481 #, c-format

4482 msgid "replace depth too high for object %s"

4483 msgstr "profondeur de remplacement trop grande pour l'objet %s"

4484

4124 -#: revision.c:2305

4125 -msgid "your current branch appears to be broken"

4126 -msgstr "votre branche actuelle semble cassée"

4485 +#: rerere.c:217 rerere.c:226 rerere.c:229

4486 +msgid "corrupt MERGE_RR"

4487 +msgstr "MERGE_RR corrompu"

4488

4128 -#: revision.c:2308

4489 +#: rerere.c:264 rerere.c:269

4490 +msgid "unable to write rerere record"

4491 +msgstr "impossible d'écrire l'enregistrement rerere"

4492 +

4493 +#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4494 #, c-format

4130 -msgid "your current branch '%s' does not have any commits yet"

4131 -msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

4495 +msgid "could not write '%s'"

4496 +msgstr "impossible d'écrire '%s'"

4497

4133 -#: revision.c:2505

4134 -msgid "--first-parent is incompatible with --bisect"

4135 -msgstr "--first-parent est incompatible avec --bisect"

4498 +#: rerere.c:495

4499 +#, c-format

4500 +msgid "there were errors while writing '%s' (%s)"

4501 +msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"

4502

4137 -#: run-command.c:728

4138 -msgid "open /dev/null failed"

4139 -msgstr "échec de l'ouverture de /dev/null"

4503 +#: rerere.c:498

4504 +#, c-format

4505 +msgid "failed to flush '%s'"

4506 +msgstr "échec du flush de '%s'"

4507

4141 -#: run-command.c:1271

4508 +#: rerere.c:503 rerere.c:1039

4509 #, c-format

4143 -msgid ""

4144 -"The '%s' hook was ignored because it's not set as executable.\n"

4145 -"You can disable this warning with `git config advice.ignoredHook false`."

4146 -msgstr ""

4147 -"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

4148 -"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

4149 -"false`."

4510 +msgid "could not parse conflict hunks in '%s'"

4511 +msgstr "impossible d'analyser la section en conflit dans '%s'"

4512

4151 -#: send-pack.c:142

4152 -msgid "unexpected flush packet while reading remote unpack status"

4153 -msgstr ""

4154 -"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

4155 -"distant"

4513 +#: rerere.c:684

4514 +#, c-format

4515 +msgid "failed utime() on '%s'"

4516 +msgstr "échec de utime() sur '%s'"

4517

4157 -#: send-pack.c:144

4518 +#: rerere.c:694

4519 #, c-format

4159 -msgid "unable to parse remote unpack status: %s"

4160 -msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

4520 +msgid "writing '%s' failed"

4521 +msgstr "échec de l'écriture de '%s'"

4522

4162 -#: send-pack.c:146

4523 +#: rerere.c:714

4524 +#, c-format

4525 +msgid "Staged '%s' using previous resolution."

4526 +msgstr "'%s' indexé en utilisant la résolution pré-existante."

4527 +

4528 +#: rerere.c:753

4529 +#, c-format

4530 +msgid "Recorded resolution for '%s'."

4531 +msgstr "Résolution enregistrée pour '%s'."

4532 +

4533 +#: rerere.c:788

4534 +#, c-format

4535 +msgid "Resolved '%s' using previous resolution."

4536 +msgstr "'%s' résolu en utilisant la résolution pré-existante."

4537 +

4538 +#: rerere.c:803

4539 +#, c-format

4540 +msgid "cannot unlink stray '%s'"

4541 +msgstr "impossible de délier '%s' qui est errant"

4542 +

4543 +#: rerere.c:807

4544 +#, c-format

4545 +msgid "Recorded preimage for '%s'"

4546 +msgstr "Pré-image enregistrée pour '%s'"

4547 +

4548 +#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4549 +#: builtin/submodule--helper.c:1423

4550 +#, c-format

4551 +msgid "could not create directory '%s'"

4552 +msgstr "impossible de créer le répertoire '%s'"

4553 +

4554 +#: rerere.c:1057

4555 +#, c-format

4556 +msgid "failed to update conflicted state in '%s'"

4557 +msgstr "échec de la mise à jour de l'état en conflit dans '%s'"

4558 +

4559 +#: rerere.c:1068 rerere.c:1075

4560 +#, c-format

4561 +msgid "no remembered resolution for '%s'"

4562 +msgstr "Aucune résolution enregistrée pour '%s'"

4563 +

4564 +#: rerere.c:1077

4565 +#, c-format

4566 +msgid "cannot unlink '%s'"

4567 +msgstr "impossible de délier '%s'"

4568 +

4569 +#: rerere.c:1087

4570 +#, c-format

4571 +msgid "Updated preimage for '%s'"

4572 +msgstr "Pré-image mise à jour pour '%s'"

4573 +

4574 +#: rerere.c:1096

4575 +#, c-format

4576 +msgid "Forgot resolution for '%s'\n"

4577 +msgstr "Résolution pour '%s' oubliée\n"

4578 +

4579 +#: rerere.c:1199

4580 +msgid "unable to open rr-cache directory"

4581 +msgstr "impossible d'ouvrir le répertoire rr-cache"

4582 +

4583 +#: revision.c:2324

4584 +msgid "your current branch appears to be broken"

4585 +msgstr "votre branche actuelle semble cassée"

4586 +

4587 +#: revision.c:2327

4588 +#, c-format

4589 +msgid "your current branch '%s' does not have any commits yet"

4590 +msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

4591 +

4592 +#: revision.c:2523

4593 +msgid "--first-parent is incompatible with --bisect"

4594 +msgstr "--first-parent est incompatible avec --bisect"

4595 +

4596 +#: run-command.c:740

4597 +msgid "open /dev/null failed"

4598 +msgstr "échec de l'ouverture de /dev/null"

4599 +

4600 +#: run-command.c:1229

4601 +#, c-format

4602 +msgid "cannot create async thread: %s"

4603 +msgstr "impossible de créer un fil asynchrone : %s"

4604 +

4605 +#: run-command.c:1293

4606 +#, c-format

4607 +msgid ""

4608 +"The '%s' hook was ignored because it's not set as executable.\n"

4609 +"You can disable this warning with `git config advice.ignoredHook false`."

4610 +msgstr ""

4611 +"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

4612 +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

4613 +"false`."

4614 +

4615 +#: send-pack.c:142

4616 +msgid "unexpected flush packet while reading remote unpack status"

4617 +msgstr ""

4618 +"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

4619 +"distant"

4620 +

4621 +#: send-pack.c:144

4622 +#, c-format

4623 +msgid "unable to parse remote unpack status: %s"

4624 +msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

4625 +

4626 +#: send-pack.c:146

4627 #, c-format

4628 msgid "remote unpack failed: %s"

4629 msgstr "le dépaquetage a échoué : %s"

4630

4167 -#: send-pack.c:309

4631 +#: send-pack.c:308

4632 msgid "failed to sign the push certificate"

4633 msgstr "impossible de signer le certificat de poussée"

4634

4171 -#: send-pack.c:422

4635 +#: send-pack.c:421

4636 msgid "the receiving end does not support --signed push"

4637 msgstr "Le receveur ne gère pas les poussées avec --signed"

4638

4175 -#: send-pack.c:424

4639 +#: send-pack.c:423

4640 msgid ""

4641 "not sending a push certificate since the receiving end does not support --"

4642 "signed push"

@@ -4180,42 +4644,42 @@ msgstr ""

4644 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

4645 "poussées avec --signed"

4646

4183 -#: send-pack.c:436

4647 +#: send-pack.c:435

4648 msgid "the receiving end does not support --atomic push"

4649 msgstr "Le receveur ne gère pas les poussées avec --atomic"

4650

4187 -#: send-pack.c:441

4651 +#: send-pack.c:440

4652 msgid "the receiving end does not support push options"

4653 msgstr "Le receveur ne gère pas les options de poussées"

4654

4191 -#: sequencer.c:177

4655 +#: sequencer.c:183

4656 #, c-format

4657 msgid "invalid commit message cleanup mode '%s'"

4658 msgstr "mode de nettoyage invalide de message de validation '%s'"

4659

4196 -#: sequencer.c:278

4660 +#: sequencer.c:287

4661 #, c-format

4662 msgid "could not delete '%s'"

4663 msgstr "Impossible de supprimer '%s'"

4664

4201 -#: sequencer.c:304

4665 +#: sequencer.c:313

4666 msgid "revert"

4667 msgstr "revert"

4668

4205 -#: sequencer.c:306

4669 +#: sequencer.c:315

4670 msgid "cherry-pick"

4671 msgstr "cherry-pick"

4672

4209 -#: sequencer.c:308

4673 +#: sequencer.c:317

4674 msgid "rebase -i"

4675 msgstr "rebase -i"

4676

4213 -#: sequencer.c:310

4677 +#: sequencer.c:319

4678 #, c-format

4679 msgid "unknown action: %d"

4680 msgstr "action inconnue : %d"

4681

4218 -#: sequencer.c:367

4682 +#: sequencer.c:376

4683 msgid ""

4684 "after resolving the conflicts, mark the corrected paths\n"

4685 "with 'git add <paths>' or 'git rm <paths>'"

@@ -4223,7 +4687,7 @@ msgstr ""

4687 "après résolution des conflits, marquez les chemins corrigés\n"

4688 "avec 'git add <chemins>' ou 'git rm <chemins>'"

4689

4226 -#: sequencer.c:370

4690 +#: sequencer.c:379

4691 msgid ""

4692 "after resolving the conflicts, mark the corrected paths\n"

4693 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -4233,39 +4697,39 @@ msgstr ""

4697 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

4698 "puis validez le résultat avec 'git commit'"

4699

4236 -#: sequencer.c:383 sequencer.c:2488

4700 +#: sequencer.c:392 sequencer.c:2632

4701 #, c-format

4702 msgid "could not lock '%s'"

4703 msgstr "impossible de verrouiller '%s'"

4704

4241 -#: sequencer.c:390

4705 +#: sequencer.c:399

4706 #, c-format

4707 msgid "could not write eol to '%s'"

4708 msgstr "impossible d'écrire la fin de ligne dans '%s'"

4709

4246 -#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4247 -#: sequencer.c:2741

4710 +#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4711 +#: sequencer.c:2885

4712 #, c-format

4713 msgid "failed to finalize '%s'"

4714 msgstr "échec lors de la finalisation de '%s'"

4715

4252 -#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4253 -#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4254 -#: builtin/merge.c:1081

4716 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4717 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4718 +#: builtin/merge.c:1084 builtin/rebase.c:152

4719 #, c-format

4720 msgid "could not read '%s'"

4721 msgstr "impossible de lire '%s'"

4722

4259 -#: sequencer.c:444

4723 +#: sequencer.c:453

4724 #, c-format

4725 msgid "your local changes would be overwritten by %s."

4726 msgstr "vos modifications locales seraient écrasées par %s."

4727

4264 -#: sequencer.c:448

4728 +#: sequencer.c:457

4729 msgid "commit your changes or stash them to proceed."

4730 msgstr "validez vos modifications ou les remiser pour continuer."

4731

4268 -#: sequencer.c:477

4732 +#: sequencer.c:486

4733 #, c-format

4734 msgid "%s: fast-forward"

4735 msgstr "%s : avance rapide"

@@ -4273,35 +4737,70 @@ msgstr "%s : avance rapide"

4737 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

4738 #. "rebase -i".

4739 #.

4276 -#: sequencer.c:566

4740 +#: sequencer.c:575

4741 #, c-format

4742 msgid "%s: Unable to write new index file"

4743 msgstr "%s: Impossible d'écrire le nouveau fichier index"

4744

4281 -#: sequencer.c:582

4745 +#: sequencer.c:591

4746 msgid "unable to update cache tree"

4747 msgstr "impossible de mettre à jour l'arbre de cache"

4748

4285 -#: sequencer.c:595

4749 +#: sequencer.c:604

4750 msgid "could not resolve HEAD commit"

4751 msgstr "impossible de résoudre le commit HEAD"

4752

4289 -#: sequencer.c:723 sequencer.c:740

4753 +#: sequencer.c:684

4754 +#, c-format

4755 +msgid "no key present in '%.*s'"

4756 +msgstr "aucune clé présente dans '%.*s'"

4757 +

4758 +#: sequencer.c:695

4759 #, c-format

4291 -msgid "could not parse '%s' (looking for '%s')"

4292 -msgstr "impossible d'analyser '%s' (à la recherche de '%s')"

4760 +msgid "unable to dequote value of '%s'"

4761 +msgstr "Impossible de décoter la valeur de '%s'"

4762

4294 -#: sequencer.c:731

4763 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4764 +#: builtin/am.c:811 builtin/merge.c:1081

4765 #, c-format

4296 -msgid "bad quoting on %s value in '%s'"

4297 -msgstr "Mauvaise citation sur la valeur %s dans '%s'"

4766 +msgid "could not open '%s' for reading"

4767 +msgstr "impossible d'ouvrir '%s' en lecture"

4768 +

4769 +#: sequencer.c:742

4770 +msgid "'GIT_AUTHOR_NAME' already given"

4771 +msgstr "'GIT_AUTHOR_NAME' déjà fourni"

4772

4773 #: sequencer.c:747

4774 +msgid "'GIT_AUTHOR_EMAIL' already given"

4775 +msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

4776 +

4777 +#: sequencer.c:752

4778 +msgid "'GIT_AUTHOR_DATE' already given"

4779 +msgstr "'GIT_AUTHOR_DATE' déjà fourni"

4780 +

4781 +#: sequencer.c:756

4782 +#, c-format

4783 +msgid "unknown variable '%s'"

4784 +msgstr "variable inconnue '%s'"

4785 +

4786 +#: sequencer.c:761

4787 +msgid "missing 'GIT_AUTHOR_NAME'"

4788 +msgstr "'GIT_AUTHOR_NAME' manquant"

4789 +

4790 +#: sequencer.c:763

4791 +msgid "missing 'GIT_AUTHOR_EMAIL'"

4792 +msgstr "'GIT_AUTHOR_EMAIL' manquant"

4793 +

4794 +#: sequencer.c:765

4795 +msgid "missing 'GIT_AUTHOR_DATE'"

4796 +msgstr "'GIT_AUTHOR_DATE' manquant"

4797 +

4798 +#: sequencer.c:825

4799 #, c-format

4800 msgid "invalid date format '%s' in '%s'"

4801 msgstr "format de date invalide '%s' dans '%s'"

4802

4304 -#: sequencer.c:761

4803 +#: sequencer.c:842

4804 #, c-format

4805 msgid ""

4806 "you have staged changes in your working tree\n"

@@ -4330,15 +4829,15 @@ msgstr ""

4829 "\n"

4830 " git rebase --continue\n"

4831

4333 -#: sequencer.c:830

4832 +#: sequencer.c:935

4833 msgid "writing root commit"

4834 msgstr "écriture du commit racine"

4835

4337 -#: sequencer.c:1055

4836 +#: sequencer.c:1142

4837 msgid "'prepare-commit-msg' hook failed"

4838 msgstr "échec du crochet 'prepare-commit-msg'"

4839

4341 -#: sequencer.c:1062

4840 +#: sequencer.c:1149

4841 msgid ""

4842 "Your name and email address were configured automatically based\n"

4843 "on your username and hostname. Please check that they are accurate.\n"

@@ -4366,7 +4865,7 @@ msgstr ""

4865 "\n"

4866 " git commit --amend --reset-author\n"

4867

4369 -#: sequencer.c:1075

4868 +#: sequencer.c:1162

4869 msgid ""

4870 "Your name and email address were configured automatically based\n"

4871 "on your username and hostname. Please check that they are accurate.\n"

@@ -4392,307 +4891,302 @@ msgstr ""

4891 "\n"

4892 " git commit --amend --reset-author\n"

4893

4395 -#: sequencer.c:1115

4894 +#: sequencer.c:1202

4895 msgid "couldn't look up newly created commit"

4896 msgstr "impossible de retrouver le commit nouvellement créé"

4897

4399 -#: sequencer.c:1117

4898 +#: sequencer.c:1204

4899 msgid "could not parse newly created commit"

4900 msgstr "impossible d'analyser le commit nouvellement créé"

4901

4403 -#: sequencer.c:1163

4902 +#: sequencer.c:1250

4903 msgid "unable to resolve HEAD after creating commit"

4904 msgstr "impossible de résoudre HEAD après création du commit"

4905

4407 -#: sequencer.c:1165

4906 +#: sequencer.c:1252

4907 msgid "detached HEAD"

4908 msgstr "HEAD détachée"

4909

4411 -#: sequencer.c:1169

4910 +#: sequencer.c:1256

4911 msgid " (root-commit)"

4912 msgstr " (commit racine)"

4913

4415 -#: sequencer.c:1190

4914 +#: sequencer.c:1277

4915 msgid "could not parse HEAD"

4916 msgstr "impossible de lire HEAD"

4917

4419 -#: sequencer.c:1192

4918 +#: sequencer.c:1279

4919 #, c-format

4920 msgid "HEAD %s is not a commit!"

4921 msgstr "HEAD %s n'est pas un commit !"

4922

4424 -#: sequencer.c:1196 builtin/commit.c:1528

4923 +#: sequencer.c:1283 builtin/commit.c:1543

4924 msgid "could not parse HEAD commit"

4925 msgstr "impossible d'analyser le commit HEAD"

4926

4428 -#: sequencer.c:1247 sequencer.c:1845

4927 +#: sequencer.c:1334 sequencer.c:1934

4928 msgid "unable to parse commit author"

4929 msgstr "impossible d'analyser l'auteur du commit"

4930

4432 -#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4931 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4932 msgid "git write-tree failed to write a tree"

4933 msgstr "git write-tree a échoué à écrire un arbre"

4934

4436 -#: sequencer.c:1274 sequencer.c:1329

4935 +#: sequencer.c:1361 sequencer.c:1416

4936 #, c-format

4937 msgid "unable to read commit message from '%s'"

4938 msgstr "impossible de lire le message de validation de '%s'"

4939

4441 -#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4442 -#: builtin/merge.c:880

4940 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4941 +#: builtin/merge.c:883

4942 msgid "failed to write commit object"

4943 msgstr "échec de l'écriture de l'objet commit"

4944

4446 -#: sequencer.c:1356

4945 +#: sequencer.c:1443

4946 #, c-format

4947 msgid "could not parse commit %s"

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

4949

4451 -#: sequencer.c:1361

4950 +#: sequencer.c:1448

4951 #, c-format

4952 msgid "could not parse parent commit %s"

4953 msgstr "impossible d'analyser le commit parent %s"

4954

4456 -#: sequencer.c:1457 sequencer.c:1565

4955 +#: sequencer.c:1546 sequencer.c:1654

4956 #, c-format

4957 msgid "unknown command: %d"

4958 msgstr "commande inconnue : %d"

4959

4461 -#: sequencer.c:1512 sequencer.c:1537

4960 +#: sequencer.c:1601 sequencer.c:1626

4961 #, c-format

4962 msgid "This is a combination of %d commits."

4963 msgstr "Ceci est la combinaison de %d commits."

4964

4466 -#: sequencer.c:1522 sequencer.c:4520

4965 +#: sequencer.c:1611 sequencer.c:4744

4966 msgid "need a HEAD to fixup"

4967 msgstr "une HEAD est nécessaire à la correction"

4968

4470 -#: sequencer.c:1524 sequencer.c:2768

4969 +#: sequencer.c:1613 sequencer.c:2912

4970 msgid "could not read HEAD"

4971 msgstr "Impossible de lire HEAD"

4972

4474 -#: sequencer.c:1526

4973 +#: sequencer.c:1615

4974 msgid "could not read HEAD's commit message"

4975 msgstr "impossible de lire le message de validation de HEAD"

4976

4478 -#: sequencer.c:1532

4977 +#: sequencer.c:1621

4978 #, c-format

4979 msgid "cannot write '%s'"

4980 msgstr "impossible d'écrire '%s'"

4981

4483 -#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4982 +#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4983 msgid "This is the 1st commit message:"

4984 msgstr "Ceci est le premier message de validation :"

4985

4487 -#: sequencer.c:1547

4986 +#: sequencer.c:1636

4987 #, c-format

4988 msgid "could not read commit message of %s"

4989 msgstr "impossible de lire le message de validation de %s"

4990

4492 -#: sequencer.c:1554

4991 +#: sequencer.c:1643

4992 #, c-format

4993 msgid "This is the commit message #%d:"

4994 msgstr "Ceci est le message de validation numéro %d :"

4995

4497 -#: sequencer.c:1560

4996 +#: sequencer.c:1649

4997 #, c-format

4998 msgid "The commit message #%d will be skipped:"

4999 msgstr "Le message de validation %d sera ignoré :"

5000

4502 -#: sequencer.c:1643

5001 +#: sequencer.c:1732

5002 msgid "your index file is unmerged."

5003 msgstr "votre fichier d'index n'est pas fusionné."

5004

4506 -#: sequencer.c:1650

5005 +#: sequencer.c:1739

5006 msgid "cannot fixup root commit"

5007 msgstr "impossible de réparer le commit racine"

5008

4510 -#: sequencer.c:1669

5009 +#: sequencer.c:1758

5010 #, c-format

5011 msgid "commit %s is a merge but no -m option was given."

5012 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

5013

4515 -#: sequencer.c:1677

5014 +#: sequencer.c:1766

5015 #, c-format

5016 msgid "commit %s does not have parent %d"

5017 msgstr "le commit %s n'a pas de parent %d"

5018

4520 -#: sequencer.c:1681

5019 +#: sequencer.c:1770

5020 #, c-format

5021 msgid "mainline was specified but commit %s is not a merge."

5022 msgstr ""

5023 "une branche principale a été spécifiée mais le commit %s n'est pas une "

5024 "fusion."

5025

4527 -#: sequencer.c:1687

5026 +#: sequencer.c:1776

5027 #, c-format

5028 msgid "cannot get commit message for %s"

5029 msgstr "impossible d'obtenir un message de validation pour %s"

5030

5031 #. TRANSLATORS: The first %s will be a "todo" command like

5032 #. "revert" or "pick", the second %s a SHA1.

4534 -#: sequencer.c:1706

5033 +#: sequencer.c:1795

5034 #, c-format

5035 msgid "%s: cannot parse parent commit %s"

5036 msgstr "%s : impossible d'analyser le commit parent %s"

5037

4539 -#: sequencer.c:1771

5038 +#: sequencer.c:1860

5039 #, c-format

5040 msgid "could not rename '%s' to '%s'"

5041 msgstr "impossible de renommer '%s' en '%s'"

5042

4544 -#: sequencer.c:1826

5043 +#: sequencer.c:1915

5044 #, c-format

5045 msgid "could not revert %s... %s"

5046 msgstr "impossible d'annuler %s... %s"

5047

4549 -#: sequencer.c:1827

5048 +#: sequencer.c:1916

5049 #, c-format

5050 msgid "could not apply %s... %s"

5051 msgstr "impossible d'appliquer %s... %s"

5052

4554 -#: sequencer.c:1885

5053 +#: sequencer.c:1974

5054 #, c-format

5055 msgid "git %s: failed to read the index"

5056 msgstr "git %s : échec à la lecture de l'index"

5057

4559 -#: sequencer.c:1892

5058 +#: sequencer.c:1981

5059 #, c-format

5060 msgid "git %s: failed to refresh the index"

5061 msgstr "git %s : échec du rafraîchissement de l'index"

5062

4564 -#: sequencer.c:1972

5063 +#: sequencer.c:2062

5064 #, c-format

5065 msgid "%s does not accept arguments: '%s'"

5066 msgstr "%s n'accepte pas d'argument : '%s'"

5067

4569 -#: sequencer.c:1981

5068 +#: sequencer.c:2071

5069 #, c-format

5070 msgid "missing arguments for %s"

5071 msgstr "argument manquant pour %s"

5072

4574 -#: sequencer.c:2040

5073 +#: sequencer.c:2130

5074 #, c-format

5075 msgid "invalid line %d: %.*s"

5076 msgstr "ligne %d invalide : %.*s"

5077

4579 -#: sequencer.c:2048

5078 +#: sequencer.c:2138

5079 #, c-format

5080 msgid "cannot '%s' without a previous commit"

5081 msgstr "'%s' impossible avec le commit précédent"

5082

4584 -#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4585 -#, c-format

4586 -msgid "could not read '%s'."

4587 -msgstr "impossible de lire '%s'."

4588 -

4589 -#: sequencer.c:2119

5083 +#: sequencer.c:2209

5084 msgid "please fix this using 'git rebase --edit-todo'."

5085 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

5086

4593 -#: sequencer.c:2121

5087 +#: sequencer.c:2211

5088 #, c-format

5089 msgid "unusable instruction sheet: '%s'"

5090 msgstr "feuille d'instruction inutilisable : '%s'"

5091

4598 -#: sequencer.c:2126

5092 +#: sequencer.c:2216

5093 msgid "no commits parsed."

5094 msgstr "aucun commit analysé."

5095

4602 -#: sequencer.c:2137

5096 +#: sequencer.c:2227

5097 msgid "cannot cherry-pick during a revert."

5098 msgstr "impossible de picorer pendant l'annulation d'un commit."

5099

4606 -#: sequencer.c:2139

5100 +#: sequencer.c:2229

5101 msgid "cannot revert during a cherry-pick."

5102 msgstr "impossible d'annuler un commit pendant un picorage."

5103

4610 -#: sequencer.c:2209

5104 +#: sequencer.c:2299

5105 #, c-format

5106 msgid "invalid value for %s: %s"

5107 msgstr "valeur invalide pour %s : %s"

5108

4615 -#: sequencer.c:2285

5109 +#: sequencer.c:2380

5110 msgid "unusable squash-onto"

5111 msgstr "\"écrase-sur\" inutilisable"

5112

4619 -#: sequencer.c:2301

5113 +#: sequencer.c:2396

5114 #, c-format

5115 msgid "malformed options sheet: '%s'"

5116 msgstr "feuille d'options malformée : %s"

5117

4624 -#: sequencer.c:2335 sequencer.c:3775

5118 +#: sequencer.c:2479 sequencer.c:4005

5119 msgid "empty commit set passed"

5120 msgstr "l'ensemble de commits spécifié est vide"

5121

4628 -#: sequencer.c:2343

5122 +#: sequencer.c:2487

5123 msgid "a cherry-pick or revert is already in progress"

5124 msgstr "un picorage ou un retour est déjà en cours"

5125

4632 -#: sequencer.c:2344

5126 +#: sequencer.c:2488

5127 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

5128 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

5129

4636 -#: sequencer.c:2347

5130 +#: sequencer.c:2491

5131 #, c-format

5132 msgid "could not create sequencer directory '%s'"

5133 msgstr "impossible de créer le répertoire de séquenceur '%s'"

5134

4641 -#: sequencer.c:2361

5135 +#: sequencer.c:2505

5136 msgid "could not lock HEAD"

5137 msgstr "impossible de verrouiller HEAD"

5138

4645 -#: sequencer.c:2416 sequencer.c:3543

5139 +#: sequencer.c:2560 sequencer.c:3761

5140 msgid "no cherry-pick or revert in progress"

5141 msgstr "aucun picorage ou retour en cours"

5142

4649 -#: sequencer.c:2418

5143 +#: sequencer.c:2562

5144 msgid "cannot resolve HEAD"

5145 msgstr "impossible de résoudre HEAD"

5146

4653 -#: sequencer.c:2420 sequencer.c:2455

5147 +#: sequencer.c:2564 sequencer.c:2599

5148 msgid "cannot abort from a branch yet to be born"

5149 msgstr "impossible d'abandonner depuis une branche non encore créée"

5150

4657 -#: sequencer.c:2441 builtin/grep.c:721

5151 +#: sequencer.c:2585 builtin/grep.c:721

5152 #, c-format

5153 msgid "cannot open '%s'"

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

5155

4662 -#: sequencer.c:2443

5156 +#: sequencer.c:2587

5157 #, c-format

5158 msgid "cannot read '%s': %s"

5159 msgstr "impossible de lire '%s' : %s"

5160

4667 -#: sequencer.c:2444

5161 +#: sequencer.c:2588

5162 msgid "unexpected end of file"

5163 msgstr "fin de fichier inattendue"

5164

4671 -#: sequencer.c:2450

5165 +#: sequencer.c:2594

5166 #, c-format

5167 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5168 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

5169

4676 -#: sequencer.c:2461

5170 +#: sequencer.c:2605

5171 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5172 msgstr ""

5173 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

5174

4681 -#: sequencer.c:2565 sequencer.c:3461

5175 +#: sequencer.c:2709 sequencer.c:3679

5176 #, c-format

5177 msgid "could not update %s"

5178 msgstr "impossible de mettre à jour %s"

5179

4686 -#: sequencer.c:2603 sequencer.c:3441

5180 +#: sequencer.c:2747 sequencer.c:3659

5181 msgid "cannot read HEAD"

5182 msgstr "impossible de lire HEAD"

5183

4690 -#: sequencer.c:2618

5184 +#: sequencer.c:2762

5185 #, c-format

5186 msgid "unable to copy '%s' to '%s'"

5187 msgstr "impossible de copier '%s' vers '%s'"

5188

4695 -#: sequencer.c:2626

5189 +#: sequencer.c:2770

5190 #, c-format

5191 msgid ""

5192 "You can amend the commit now, with\n"

@@ -4711,26 +5205,27 @@ msgstr ""

5205 "\n"

5206 " git rebase --continue\n"

5207

4714 -#: sequencer.c:2636

5208 +#: sequencer.c:2780

5209 #, c-format

5210 msgid "Could not apply %s... %.*s"

5211 msgstr "impossible d'appliquer %s... %.*s"

5212

4719 -#: sequencer.c:2643

5213 +#: sequencer.c:2787

5214 #, c-format

5215 msgid "Could not merge %.*s"

5216 msgstr "Impossible de fusionner %.*s"

5217

4724 -#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

5218 +#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5219 #, c-format

5220 msgid "could not copy '%s' to '%s'"

5221 msgstr "impossible de copier '%s' vers '%s'"

5222

4729 -#: sequencer.c:2680 sequencer.c:3095

5223 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999

5224 +#: builtin/rebase.c:1350 builtin/rebase.c:1404

5225 msgid "could not read index"

5226 msgstr "impossible de lire l'index"

5227

4733 -#: sequencer.c:2685

5228 +#: sequencer.c:2829

5229 #, c-format

5230 msgid ""

5231 "execution failed: %s\n"

@@ -4745,11 +5240,11 @@ msgstr ""

5240 "git rebase --continue\n"

5241 "\n"

5242

4748 -#: sequencer.c:2691

5243 +#: sequencer.c:2835

5244 msgid "and made changes to the index and/or the working tree\n"

5245 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

5246

4752 -#: sequencer.c:2697

5247 +#: sequencer.c:2841

5248 #, c-format

5249 msgid ""

5250 "execution succeeded: %s\n"

@@ -4766,82 +5261,77 @@ msgstr ""

5261 " git rebase --continue\n"

5262 "\n"

5263

4769 -#: sequencer.c:2758

5264 +#: sequencer.c:2902

5265 #, c-format

5266 msgid "illegal label name: '%.*s'"

5267 msgstr "nom de label illégal '%.*s'"

5268

4774 -#: sequencer.c:2810

5269 +#: sequencer.c:2954

5270 msgid "writing fake root commit"

5271 msgstr "écriture d'un commit racine bidon"

5272

4778 -#: sequencer.c:2815

5273 +#: sequencer.c:2959

5274 msgid "writing squash-onto"

5275 msgstr "écriture de 'écraser-sur'"

5276

4782 -#: sequencer.c:2850

5277 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590

5278 #, c-format

5279 msgid "failed to find tree of %s"

5280 msgstr "impossible de trouver l'arbre de %s"

5281

4787 -#: sequencer.c:2868

5282 +#: sequencer.c:3015 builtin/rebase.c:603

5283 msgid "could not write index"

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

5285

4791 -#: sequencer.c:2895

5286 +#: sequencer.c:3042

5287 #, c-format

5288 msgid "could not resolve '%s'"

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

5290

4796 -#: sequencer.c:2921

5291 +#: sequencer.c:3068

5292 msgid "cannot merge without a current revision"

5293 msgstr "impossible de fusionner avec une révision courante"

5294

4800 -#: sequencer.c:2943

5295 +#: sequencer.c:3090

5296 #, c-format

5297 msgid "unable to parse '%.*s'"

5298 msgstr "impossible d'analyser '%.*s'"

5299

4805 -#: sequencer.c:2952

5300 +#: sequencer.c:3099

5301 #, c-format

5302 msgid "nothing to merge: '%.*s'"

5303 msgstr "rien à fusionner : '%.*s'"

5304

4810 -#: sequencer.c:2964

5305 +#: sequencer.c:3111

5306 msgid "octopus merge cannot be executed on top of a [new root]"

5307 msgstr ""

5308 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

5309

4815 -#: sequencer.c:2979

5310 +#: sequencer.c:3126

5311 #, c-format

5312 msgid "could not get commit message of '%s'"

5313 msgstr "impossible de lire le message de validation de '%s'"

5314

4820 -#: sequencer.c:2989 sequencer.c:3015

4821 -#, c-format

4822 -msgid "could not write '%s'"

4823 -msgstr "impossible d'écrire '%s'"

4824 -

4825 -#: sequencer.c:3127

5315 +#: sequencer.c:3274

5316 #, c-format

5317 msgid "could not even attempt to merge '%.*s'"

5318 msgstr "impossible de seulement essayer de fusionner '%.*s'"

5319

4830 -#: sequencer.c:3143

5320 +#: sequencer.c:3290

5321 msgid "merge: Unable to write new index file"

5322 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

5323

4834 -#: sequencer.c:3211

5324 +#: sequencer.c:3358 builtin/rebase.c:268

5325 #, c-format

5326 msgid "Applied autostash.\n"

5327 msgstr "Autoremisage appliqué.\n"

5328

4839 -#: sequencer.c:3223

5329 +#: sequencer.c:3370

5330 #, c-format

5331 msgid "cannot store %s"

5332 msgstr "impossible de stocker %s"

5333

4844 -#: sequencer.c:3226 git-rebase.sh:188

5334 +#: sequencer.c:3373 builtin/rebase.c:284

5335 #, c-format

5336 msgid ""

5337 "Applying autostash resulted in conflicts.\n"

@@ -4852,7 +5342,31 @@ msgstr ""

5342 "Vos modifications sont à l'abri dans la remise.\n"

5343 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

5344

4855 -#: sequencer.c:3257

5345 +#: sequencer.c:3427

5346 +#, c-format

5347 +msgid "could not checkout %s"

5348 +msgstr "extraction de %s impossible"

5349 +

5350 +#: sequencer.c:3441

5351 +#, c-format

5352 +msgid "%s: not a valid OID"

5353 +msgstr "%s n'est pas un OID valide"

5354 +

5355 +#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5356 +msgid "could not detach HEAD"

5357 +msgstr "Impossible de détacher HEAD"

5358 +

5359 +#: sequencer.c:3461

5360 +#, c-format

5361 +msgid "Stopped at HEAD\n"

5362 +msgstr "arrêt à HEAD\n"

5363 +

5364 +#: sequencer.c:3463

5365 +#, c-format

5366 +msgid "Stopped at %s\n"

5367 +msgstr "Arrêté à %s\n"

5368 +

5369 +#: sequencer.c:3471

5370 #, c-format

5371 msgid ""

5372 "Could not execute the todo command\n"

@@ -4873,48 +5387,48 @@ msgstr ""

5387 " git rebase --edit-todo\n"

5388 " git rebase --continue\n"

5389

4876 -#: sequencer.c:3325

5390 +#: sequencer.c:3543

5391 #, c-format

5392 msgid "Stopped at %s... %.*s\n"

5393 msgstr "arrêt à %s... %.*s\n"

5394

4881 -#: sequencer.c:3404

5395 +#: sequencer.c:3622

5396 #, c-format

5397 msgid "unknown command %d"

5398 msgstr "commande inconnue %d"

5399

4886 -#: sequencer.c:3449

5400 +#: sequencer.c:3667

5401 msgid "could not read orig-head"

5402 msgstr "impossible de lire orig-head"

5403

4890 -#: sequencer.c:3454 sequencer.c:4517

5404 +#: sequencer.c:3672 sequencer.c:4741

5405 msgid "could not read 'onto'"

5406 msgstr "impossible de lire 'onto'"

5407

4894 -#: sequencer.c:3468

5408 +#: sequencer.c:3686

5409 #, c-format

5410 msgid "could not update HEAD to %s"

5411 msgstr "impossible de mettre à jour HEAD sur %s"

5412

4899 -#: sequencer.c:3554

5413 +#: sequencer.c:3772

5414 msgid "cannot rebase: You have unstaged changes."

5415 msgstr "impossible de rebaser : vous avez des modifications non indexées."

5416

4903 -#: sequencer.c:3563

5417 +#: sequencer.c:3781

5418 msgid "cannot amend non-existing commit"

5419 msgstr "impossible de corriger un commit non-existant"

5420

4907 -#: sequencer.c:3565

5421 +#: sequencer.c:3783

5422 #, c-format

5423 msgid "invalid file: '%s'"

5424 msgstr "fichier invalide : '%s'"

5425

4912 -#: sequencer.c:3567

5426 +#: sequencer.c:3785

5427 #, c-format

5428 msgid "invalid contents: '%s'"

5429 msgstr "contenu invalide : '%s'"

5430

4917 -#: sequencer.c:3570

5431 +#: sequencer.c:3788

5432 msgid ""

5433 "\n"

5434 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4924,54 +5438,54 @@ msgstr ""

5438 "Vous avez des modifications non validées dans votre copie de travail.\n"

5439 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

5440

4927 -#: sequencer.c:3595 sequencer.c:3633

5441 +#: sequencer.c:3824 sequencer.c:3862

5442 #, c-format

5443 msgid "could not write file: '%s'"

5444 msgstr "impossible d'écrire le fichier : '%s'"

5445

4932 -#: sequencer.c:3648

5446 +#: sequencer.c:3877

5447 msgid "could not remove CHERRY_PICK_HEAD"

5448 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

5449

4936 -#: sequencer.c:3655

5450 +#: sequencer.c:3884

5451 msgid "could not commit staged changes."

5452 msgstr "impossible de valider les modifications indexées."

5453

4940 -#: sequencer.c:3752

5454 +#: sequencer.c:3982

5455 #, c-format

5456 msgid "%s: can't cherry-pick a %s"

5457 msgstr "%s : impossible de picorer un %s"

5458

4945 -#: sequencer.c:3756

5459 +#: sequencer.c:3986

5460 #, c-format

5461 msgid "%s: bad revision"

5462 msgstr "%s : mauvaise révision"

5463

4950 -#: sequencer.c:3791

5464 +#: sequencer.c:4021

5465 msgid "can't revert as initial commit"

5466 msgstr "impossible d'annuler en tant que commit initial"

5467

4954 -#: sequencer.c:4238

5468 +#: sequencer.c:4466

5469 msgid "make_script: unhandled options"

5470 msgstr "make_script : options non gérées"

5471

4958 -#: sequencer.c:4241

5472 +#: sequencer.c:4469

5473 msgid "make_script: error preparing revisions"

5474 msgstr "make_script : erreur lors de la préparation des révisions"

5475

4962 -#: sequencer.c:4281 sequencer.c:4337

5476 +#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5477 #, c-format

5478 msgid "unusable todo list: '%s'"

5479 msgstr "liste à faire inutilisable : '%s'"

5480

4967 -#: sequencer.c:4396

5481 +#: sequencer.c:4620

5482 #, c-format

5483 msgid ""

5484 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5485 msgstr ""

5486 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

5487

4974 -#: sequencer.c:4466

5488 +#: sequencer.c:4690

5489 #, c-format

5490 msgid ""

5491 "Warning: some commits may have been dropped accidentally.\n"

@@ -4980,7 +5494,7 @@ msgstr ""

5494 "Attention : certains commits ont pu être accidentellement supprimés.\n"

5495 "Commits supprimés (du plus jeune au plus vieux) :\n"

5496

4983 -#: sequencer.c:4473

5497 +#: sequencer.c:4697

5498 #, c-format

5499 msgid ""

5500 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4998,7 +5512,7 @@ msgstr ""

5512 "Les comportements disponibles sont : ignore, warn, error.\n"

5513 "\n"

5514

5001 -#: sequencer.c:4486

5515 +#: sequencer.c:4710

5516 #, c-format

5517 msgid ""

5518 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -5009,7 +5523,31 @@ msgstr ""

5523 "rebase --continue'.\n"

5524 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

5525

5012 -#: sequencer.c:4660

5526 +#: sequencer.c:4848 sequencer.c:4886

5527 +msgid "nothing to do"

5528 +msgstr "rien à faire"

5529 +

5530 +#: sequencer.c:4852

5531 +#, c-format

5532 +msgid "Rebase %s onto %s (%d command)"

5533 +msgid_plural "Rebase %s onto %s (%d commands)"

5534 +msgstr[0] "Rebasage de %s sur %s (%d commande)"

5535 +msgstr[1] "Rebasage de %s sur %s (%d commandes)"

5536 +

5537 +#: sequencer.c:4864

5538 +#, c-format

5539 +msgid "could not copy '%s' to '%s'."

5540 +msgstr "impossible de copier '%s' vers '%s'."

5541 +

5542 +#: sequencer.c:4868 sequencer.c:4897

5543 +msgid "could not transform the todo list"

5544 +msgstr "impossible de générer la liste à-faire"

5545 +

5546 +#: sequencer.c:4900

5547 +msgid "could not skip unnecessary pick commands"

5548 +msgstr "impossible d'éviter les commandes de picorage non nécessaires"

5549 +

5550 +#: sequencer.c:4983

5551 msgid "the script was already rearranged."

5552 msgstr "le script a déjà été réarrangé."

5553

@@ -5067,84 +5605,84 @@ msgstr ""

5605 msgid "this operation must be run in a work tree"

5606 msgstr "Cette opération doit être effectuée dans un arbre de travail"

5607

5070 -#: setup.c:503

5608 +#: setup.c:527

5609 #, c-format

5610 msgid "Expected git repo version <= %d, found %d"

5611 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

5612

5075 -#: setup.c:511

5613 +#: setup.c:535

5614 msgid "unknown repository extensions found:"

5615 msgstr "extensions de dépôt inconnues trouvées :"

5616

5079 -#: setup.c:530

5617 +#: setup.c:554

5618 #, c-format

5619 msgid "error opening '%s'"

5620 msgstr "erreur à l'ouverture de '%s'"

5621

5084 -#: setup.c:532

5622 +#: setup.c:556

5623 #, c-format

5624 msgid "too large to be a .git file: '%s'"

5625 msgstr "trop gros pour être une fichier .git : '%s'"

5626

5089 -#: setup.c:534

5627 +#: setup.c:558

5628 #, c-format

5629 msgid "error reading %s"

5630 msgstr "erreur à la lecture de %s"

5631

5094 -#: setup.c:536

5632 +#: setup.c:560

5633 #, c-format

5634 msgid "invalid gitfile format: %s"

5635 msgstr "format de fichier git invalide : %s"

5636

5099 -#: setup.c:538

5637 +#: setup.c:562

5638 #, c-format

5639 msgid "no path in gitfile: %s"

5640 msgstr "aucun chemin dans le fichier git : %s"

5641

5104 -#: setup.c:540

5642 +#: setup.c:564

5643 #, c-format

5644 msgid "not a git repository: %s"

5645 msgstr "ce n'est pas un dépôt git : %s"

5646

5109 -#: setup.c:639

5647 +#: setup.c:663

5648 #, c-format

5649 msgid "'$%s' too big"

5650 msgstr "'$%s' trop gros"

5651

5114 -#: setup.c:653

5652 +#: setup.c:677

5653 #, c-format

5654 msgid "not a git repository: '%s'"

5655 msgstr "ce n'est pas un dépôt git : '%s'"

5656

5119 -#: setup.c:682 setup.c:684 setup.c:715

5657 +#: setup.c:706 setup.c:708 setup.c:739

5658 #, c-format

5659 msgid "cannot chdir to '%s'"

5660 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"

5661

5124 -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

5662 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5663 msgid "cannot come back to cwd"

5664 msgstr "impossible de revenir au répertoire de travail courant"

5665

5128 -#: setup.c:813

5666 +#: setup.c:837

5667 #, c-format

5668 msgid "not a git repository (or any of the parent directories): %s"

5669 msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

5670

5133 -#: setup.c:824

5671 +#: setup.c:848

5672 #, c-format

5673 msgid "failed to stat '%*s%s%s'"

5674 msgstr "échec du stat de '%*s%s%s'"

5675

5138 -#: setup.c:1054

5676 +#: setup.c:1078

5677 msgid "Unable to read current working directory"

5678 msgstr "Impossible d'accéder au répertoire de travail courant"

5679

5142 -#: setup.c:1066 setup.c:1072

5680 +#: setup.c:1090 setup.c:1096

5681 #, c-format

5682 msgid "cannot change to '%s'"

5683 msgstr "impossible de modifier en '%s'"

5684

5147 -#: setup.c:1085

5685 +#: setup.c:1109

5686 #, c-format

5687 msgid ""

5688 "not a git repository (or any parent up to mount point %s)\n"

@@ -5155,7 +5693,7 @@ msgstr ""

5693 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

5694 "n'est pas défini)."

5695

5158 -#: setup.c:1168

5696 +#: setup.c:1192

5697 #, c-format

5698 msgid ""

5699 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -5165,15 +5703,15 @@ msgstr ""

5703 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

5704 "écriture."

5705

5168 -#: setup.c:1211

5706 +#: setup.c:1235

5707 msgid "open /dev/null or dup failed"

5708 msgstr "échec de l'ouverture ou au dup de /dev/null"

5709

5172 -#: setup.c:1226

5710 +#: setup.c:1250

5711 msgid "fork failed"

5712 msgstr "échec de la bifurcation"

5713

5176 -#: setup.c:1231

5714 +#: setup.c:1255

5715 msgid "setsid failed"

5716 msgstr "échec du setsid"

5717

@@ -5251,12 +5789,12 @@ msgstr "échec de mmap"

5789 msgid "object file %s is empty"

5790 msgstr "le fichier objet %s est vide"

5791

5254 -#: sha1-file.c:1093 sha1-file.c:2206

5792 +#: sha1-file.c:1093 sha1-file.c:2215

5793 #, c-format

5794 msgid "corrupt loose object '%s'"

5795 msgstr "objet libre corrompu '%s'"

5796

5259 -#: sha1-file.c:1095 sha1-file.c:2210

5797 +#: sha1-file.c:1095 sha1-file.c:2219

5798 #, c-format

5799 msgid "garbage at end of loose object '%s'"

5800 msgstr "données incorrectes à la fin de l'objet libre '%s'"

@@ -5352,7 +5890,7 @@ msgstr "échec de deflateEnd sur l'objet %s (%d)"

5890 msgid "confused by unstable object source data for %s"

5891 msgstr "données de source d'objet instable pour %s"

5892

5355 -#: sha1-file.c:1685 builtin/pack-objects.c:899

5893 +#: sha1-file.c:1685 builtin/pack-objects.c:918

5894 #, c-format

5895 msgid "failed utime() on %s"

5896 msgstr "échec de utime() sur %s"

@@ -5370,76 +5908,76 @@ msgstr "commit corrompu"

5908 msgid "corrupt tag"

5909 msgstr "étiquette corrompue"

5910

5373 -#: sha1-file.c:1906

5911 +#: sha1-file.c:1912

5912 #, c-format

5913 msgid "read error while indexing %s"

5914 msgstr "erreur de lecture à l'indexation de %s"

5915

5378 -#: sha1-file.c:1909

5916 +#: sha1-file.c:1915

5917 #, c-format

5918 msgid "short read while indexing %s"

5919 msgstr "lecture tronquée pendant l'indexation de %s"

5920

5383 -#: sha1-file.c:1980 sha1-file.c:1989

5921 +#: sha1-file.c:1988 sha1-file.c:1997

5922 #, c-format

5923 msgid "%s: failed to insert into database"

5924 msgstr "%s : échec de l'insertion dans la base de données"

5925

5388 -#: sha1-file.c:1995

5926 +#: sha1-file.c:2003

5927 #, c-format

5928 msgid "%s: unsupported file type"

5929 msgstr "%s : type de fichier non supporté"

5930

5393 -#: sha1-file.c:2019

5931 +#: sha1-file.c:2027

5932 #, c-format

5933 msgid "%s is not a valid object"

5934 msgstr "%s n'est pas un objet valide"

5935

5398 -#: sha1-file.c:2021

5936 +#: sha1-file.c:2029

5937 #, c-format

5938 msgid "%s is not a valid '%s' object"

5939 msgstr "%s n'est pas un objet '%s' valide"

5940

5403 -#: sha1-file.c:2048 builtin/index-pack.c:158

5941 +#: sha1-file.c:2056 builtin/index-pack.c:154

5942 #, c-format

5943 msgid "unable to open %s"

5944 msgstr "impossible d'ouvrir %s"

5945

5408 -#: sha1-file.c:2217 sha1-file.c:2269

5946 +#: sha1-file.c:2226 sha1-file.c:2278

5947 #, c-format

5948 msgid "sha1 mismatch for %s (expected %s)"

5949 msgstr "incohérence de sha1 pour %s (%s attendu)"

5950

5413 -#: sha1-file.c:2241

5951 +#: sha1-file.c:2250

5952 #, c-format

5953 msgid "unable to mmap %s"

5954 msgstr "impossible de mmap %s"

5955

5418 -#: sha1-file.c:2246

5956 +#: sha1-file.c:2255

5957 #, c-format

5958 msgid "unable to unpack header of %s"

5959 msgstr "impossible de dépaqueter l'entête de %s"

5960

5423 -#: sha1-file.c:2252

5961 +#: sha1-file.c:2261

5962 #, c-format

5963 msgid "unable to parse header of %s"

5964 msgstr "impossible d'analyser l'entête de %s"

5965

5428 -#: sha1-file.c:2263

5966 +#: sha1-file.c:2272

5967 #, c-format

5968 msgid "unable to unpack contents of %s"

5969 msgstr "impossible de dépaqueter le contenu de %s"

5970

5433 -#: sha1-name.c:444

5971 +#: sha1-name.c:476

5972 #, c-format

l10n: fr.po v2.20 rnd 1