26ce3a3cc8 · matheusbsbs/matheus-bagliano

@@ -50,6 +50,7 @@

50 # to prune | éliminer

51 # to push | pousser

52 # to rebase | rebaser

53 +# trailers | lignes terminales

54 # repository | dépôt

55 # remote | distante (ou serveur distant)

56 # revision | révision

@@ -73,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"

76 -"POT-Creation-Date: 2017-07-24 21:54+0800\n"

77 -"PO-Revision-Date: 2017-09-14 14:01+0200\n"

77 +"POT-Creation-Date: 2017-10-17 09:44+0800\n"

78 +"PO-Revision-Date: 2017-10-18 20:28+0200\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"

@@ -125,7 +126,7 @@ msgstr ""

126 msgid "Exiting because of an unresolved conflict."

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

128

128 -#: advice.c:117 builtin/merge.c:1184

129 +#: advice.c:117 builtin/merge.c:1211

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

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

132

@@ -179,89 +180,89 @@ msgstr "option d'espace non reconnue '%s'"

180 msgid "unrecognized whitespace ignore option '%s'"

181 msgstr "option d'ignorance d'espace non reconnue '%s'"

182

182 -#: apply.c:126

183 +#: apply.c:125

184 msgid "--reject and --3way cannot be used together."

185 msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."

186

186 -#: apply.c:128

187 +#: apply.c:127

188 msgid "--cached and --3way cannot be used together."

189 msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."

190

190 -#: apply.c:131

191 +#: apply.c:130

192 msgid "--3way outside a repository"

193 msgstr "--3way hors d'un dépôt"

194

194 -#: apply.c:142

195 +#: apply.c:141

196 msgid "--index outside a repository"

197 msgstr "--index hors d'un dépôt"

198

198 -#: apply.c:145

199 +#: apply.c:144

200 msgid "--cached outside a repository"

201 msgstr "--cached hors d'un dépôt"

202

202 -#: apply.c:836

203 +#: apply.c:845

204 #, c-format

205 msgid "Cannot prepare timestamp regexp %s"

206 msgstr "Impossible de préparer la regexp d'horodatage %s"

207

207 -#: apply.c:845

208 +#: apply.c:854

209 #, c-format

210 msgid "regexec returned %d for input: %s"

211 msgstr "regexec a retourné %d pour l'entrée : %s"

212

212 -#: apply.c:929

213 +#: apply.c:928

214 #, c-format

215 msgid "unable to find filename in patch at line %d"

216 msgstr "nom de fichier du patch introuvable à la ligne %d"

217

217 -#: apply.c:967

218 +#: apply.c:966

219 #, c-format

220 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

221 msgstr ""

222 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "

223 "ligne %d"

224

224 -#: apply.c:973

225 +#: apply.c:972

226 #, c-format

227 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

228 msgstr ""

229 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "

230 "à la ligne %d"

231

231 -#: apply.c:974

232 +#: apply.c:973

233 #, c-format

234 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

235 msgstr ""

236 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "

237 "à la ligne %d"

238

238 -#: apply.c:979

239 +#: apply.c:978

240 #, c-format

241 msgid "git apply: bad git-diff - expected /dev/null on line %d"

242 msgstr ""

243 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"

244

244 -#: apply.c:1008

245 +#: apply.c:1007

246 #, c-format

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

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

249

249 -#: apply.c:1326

250 +#: apply.c:1325

251 #, c-format

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

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

254

254 -#: apply.c:1498

255 +#: apply.c:1497

256 #, c-format

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

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

259

259 -#: apply.c:1567

260 +#: apply.c:1566

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

264 -#: apply.c:1587

265 +#: apply.c:1586

266 #, c-format

267 msgid ""

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

@@ -276,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

279 -#: apply.c:1600

280 +#: apply.c:1599

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

285 -#: apply.c:1770

286 +#: apply.c:1787

287 msgid "new file depends on old contents"

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

289

289 -#: apply.c:1772

290 +#: apply.c:1789

291 msgid "deleted file still has contents"

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

293

293 -#: apply.c:1806

294 +#: apply.c:1823

295 #, c-format

296 msgid "corrupt patch at line %d"

297 msgstr "patch corrompu à la ligne %d"

298

298 -#: apply.c:1843

299 +#: apply.c:1860

300 #, c-format

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

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

303

303 -#: apply.c:1845

304 +#: apply.c:1862

305 #, c-format

306 msgid "deleted file %s still has contents"

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

308

308 -#: apply.c:1848

309 +#: apply.c:1865

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

313 -#: apply.c:1995

314 +#: apply.c:2012

315 #, c-format

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

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

318

318 -#: apply.c:2032

319 +#: apply.c:2049

320 #, c-format

321 msgid "unrecognized binary patch at line %d"

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

323

323 -#: apply.c:2193

324 +#: apply.c:2209

325 #, c-format

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

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

328

328 -#: apply.c:2276

329 +#: apply.c:2295

330 #, c-format

331 msgid "unable to read symlink %s"

332 msgstr "lecture du lien symbolique %s impossible"

333

333 -#: apply.c:2280

334 +#: apply.c:2299

335 #, c-format

336 msgid "unable to open or read %s"

337 msgstr "ouverture ou lecture de %s impossible"

338

338 -#: apply.c:2933

339 +#: apply.c:2958

340 #, c-format

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

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

343

343 -#: apply.c:3052

344 +#: apply.c:3077

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

350 -#: apply.c:3064

351 +#: apply.c:3089

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

355 -#: apply.c:3070

356 +#: apply.c:3095

357 #, c-format

358 msgid ""

359 "while searching for:\n"

@@ -361,456 +362,457 @@ msgstr ""

362 "pendant la recherche de :\n"

363 "%.*s"

364

364 -#: apply.c:3092

365 +#: apply.c:3117

366 #, c-format

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

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

369

369 -#: apply.c:3100

370 +#: apply.c:3125

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

376 -#: apply.c:3146

377 +#: apply.c:3171

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

382 -#: apply.c:3156

383 +#: apply.c:3181

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

389 -#: apply.c:3164

390 +#: apply.c:3189

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

394 -#: apply.c:3182

395 +#: apply.c:3207

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

399 -#: apply.c:3195

400 +#: apply.c:3220

401 #, c-format

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

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

404

404 -#: apply.c:3201

405 +#: apply.c:3226

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

411 -#: apply.c:3222

412 +#: apply.c:3247

413 #, c-format

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

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

416

416 -#: apply.c:3344

417 +#: apply.c:3369

418 #, c-format

419 msgid "cannot checkout %s"

420 msgstr "extraction de %s impossible"

421

421 -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277

422 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

423 #, c-format

424 msgid "failed to read %s"

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

426

426 -#: apply.c:3400

427 +#: apply.c:3426

428 #, c-format

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

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

431

431 -#: apply.c:3429 apply.c:3669

432 +#: apply.c:3455 apply.c:3695

433 #, c-format

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

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

436

436 -#: apply.c:3512 apply.c:3683

437 +#: apply.c:3538 apply.c:3709

438 #, c-format

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

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

441

441 -#: apply.c:3521 apply.c:3691

442 +#: apply.c:3547 apply.c:3717

443 #, c-format

444 msgid "%s: does not match index"

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

446

446 -#: apply.c:3556

447 +#: apply.c:3582

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

452 -#: apply.c:3559

453 +#: apply.c:3585

454 #, c-format

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

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

457

457 -#: apply.c:3575 apply.c:3579

458 +#: apply.c:3601 apply.c:3605

459 #, c-format

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

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

462

462 -#: apply.c:3591

463 +#: apply.c:3617

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

467 -#: apply.c:3605

468 +#: apply.c:3631

469 #, c-format

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

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

472

472 -#: apply.c:3610

473 +#: apply.c:3636

474 #, c-format

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

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

477

477 -#: apply.c:3636

478 +#: apply.c:3662

479 msgid "removal patch leaves file contents"

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

481

481 -#: apply.c:3708

482 +#: apply.c:3734

483 #, c-format

484 msgid "%s: wrong type"

485 msgstr "%s : type erroné"

486

486 -#: apply.c:3710

487 +#: apply.c:3736

488 #, c-format

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

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

491

491 -#: apply.c:3860 apply.c:3862

492 +#: apply.c:3886 apply.c:3888

493 #, c-format

494 msgid "invalid path '%s'"

495 msgstr "chemin invalide '%s'"

496

496 -#: apply.c:3918

497 +#: apply.c:3944

498 #, c-format

499 msgid "%s: already exists in index"

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

501

501 -#: apply.c:3921

502 +#: apply.c:3947

503 #, c-format

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

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

506

506 -#: apply.c:3941

507 +#: apply.c:3967

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

511 -#: apply.c:3946

512 +#: apply.c:3972

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

517 -#: apply.c:3966

518 +#: apply.c:3992

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

522 -#: apply.c:3970

523 +#: apply.c:3996

524 #, c-format

525 msgid "%s: patch does not apply"

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

527

527 -#: apply.c:3985

528 +#: apply.c:4011

529 #, c-format

530 msgid "Checking patch %s..."

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

532

532 -#: apply.c:4076

533 +#: apply.c:4102

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

538 -#: apply.c:4083

539 +#: apply.c:4109

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

543 -#: apply.c:4086

544 +#: apply.c:4112

545 #, c-format

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

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

548

548 -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138

549 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

550 #, c-format

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

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

553

553 -#: apply.c:4095

554 +#: apply.c:4121

555 #, c-format

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

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

558

558 -#: apply.c:4105

559 +#: apply.c:4131

560 #, c-format

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

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

563

563 -#: apply.c:4243

564 +#: apply.c:4269

565 #, c-format

566 msgid "unable to remove %s from index"

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

568

568 -#: apply.c:4278

569 +#: apply.c:4304

570 #, c-format

571 msgid "corrupt patch for submodule %s"

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

573

573 -#: apply.c:4284

574 +#: apply.c:4310

575 #, c-format

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

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

578

578 -#: apply.c:4292

579 +#: apply.c:4318

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

585 -#: apply.c:4298 apply.c:4442

586 +#: apply.c:4324 apply.c:4468

587 #, c-format

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

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

590

590 -#: apply.c:4339

591 +#: apply.c:4365

592 #, c-format

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

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

595

595 -#: apply.c:4343

596 +#: apply.c:4369

597 #, c-format

598 msgid "closing file '%s'"

599 msgstr "fermeture du fichier '%s'"

600

600 -#: apply.c:4413

601 +#: apply.c:4439

602 #, c-format

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

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

605

605 -#: apply.c:4511

606 +#: apply.c:4537

607 #, c-format

608 msgid "Applied patch %s cleanly."

609 msgstr "Patch %s appliqué proprement."

610

610 -#: apply.c:4519

611 +#: apply.c:4545

612 msgid "internal error"

613 msgstr "erreur interne"

614

614 -#: apply.c:4522

615 +#: apply.c:4548

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

621 -#: apply.c:4533

622 +#: apply.c:4559

623 #, c-format

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

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

626

626 -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988

627 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

631

631 -#: apply.c:4555

632 +#: apply.c:4581

633 #, c-format

634 msgid "Hunk #%d applied cleanly."

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

636

636 -#: apply.c:4559

637 +#: apply.c:4585

638 #, c-format

639 msgid "Rejected hunk #%d."

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

641

641 -#: apply.c:4669

642 +#: apply.c:4695

643 #, c-format

644 msgid "Skipped patch '%s'."

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

646

646 -#: apply.c:4677

647 +#: apply.c:4703

648 msgid "unrecognized input"

649 msgstr "entrée non reconnue"

650

650 -#: apply.c:4696

651 +#: apply.c:4722

652 msgid "unable to read index file"

653 msgstr "lecture du fichier d'index impossible"

654

654 -#: apply.c:4833

655 +#: apply.c:4859

656 #, c-format

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

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

659

659 -#: apply.c:4860

660 +#: apply.c:4886

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

666 -#: apply.c:4866 apply.c:4881

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

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

673 -#: apply.c:4874

674 +#: apply.c:4900

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

680 -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

681 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

682 msgid "Unable to write new index file"

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

684

684 -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

685 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187

686 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

687 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

688 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

685 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

686 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

687 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

688 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

689 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

690 #: git-add--interactive.perl:197

691 msgid "path"

692 msgstr "chemin"

693

693 -#: apply.c:4922

694 +#: apply.c:4948

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

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

697

697 -#: apply.c:4925

698 +#: apply.c:4951

699 msgid "apply changes matching the given path"

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

701

701 -#: apply.c:4927 builtin/am.c:2266

702 +#: apply.c:4953 builtin/am.c:2265

703 msgid "num"

704 msgstr "num"

705

705 -#: apply.c:4928

706 +#: apply.c:4954

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

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

709

709 -#: apply.c:4931

710 +#: apply.c:4957

711 msgid "ignore additions made by the patch"

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

713

713 -#: apply.c:4933

714 +#: apply.c:4959

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

717 -#: apply.c:4937

718 +#: apply.c:4963

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

722 -#: apply.c:4939

723 +#: apply.c:4965

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

726 -#: apply.c:4941

727 +#: apply.c:4967

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

730 -#: apply.c:4943

731 +#: apply.c:4969

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

734 -#: apply.c:4945

735 +#: apply.c:4971

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

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

738

738 -#: apply.c:4947

739 +#: apply.c:4973

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

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

742

742 -#: apply.c:4949

743 +#: apply.c:4975

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

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

746

746 -#: apply.c:4951

747 +#: apply.c:4977

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

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

750

750 -#: apply.c:4953

751 +#: apply.c:4979

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

753 msgstr ""

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

755

755 -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515

756 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

757 msgid "paths are separated with NUL character"

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

759

759 -#: apply.c:4958

760 +#: apply.c:4984

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

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

763

763 -#: apply.c:4959 builtin/am.c:2245

764 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

765 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

766 msgid "action"

767 msgstr "action"

768

767 -#: apply.c:4960

769 +#: apply.c:4986

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

771 msgstr ""

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

773 "d'espace"

774

773 -#: apply.c:4963 apply.c:4966

775 +#: apply.c:4989 apply.c:4992

776 msgid "ignore changes in whitespace when finding context"

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

778

777 -#: apply.c:4969

779 +#: apply.c:4995

780 msgid "apply the patch in reverse"

781 msgstr "appliquer le patch en sens inverse"

782

781 -#: apply.c:4971

783 +#: apply.c:4997

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

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

786

785 -#: apply.c:4973

787 +#: apply.c:4999

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

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

790

789 -#: apply.c:4975

791 +#: apply.c:5001

792 msgid "allow overlapping hunks"

793 msgstr "accepter les recouvrements de sections"

794

793 -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21

794 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651

795 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125

795 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

796 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

797 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

798 msgid "be verbose"

799 msgstr "mode verbeux"

800

799 -#: apply.c:4978

801 +#: apply.c:5004

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

803 msgstr ""

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

805 "fichier"

806

805 -#: apply.c:4981

807 +#: apply.c:5007

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

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

810

809 -#: apply.c:4983 builtin/am.c:2254

811 +#: apply.c:5009 builtin/am.c:2253

812 msgid "root"

813 msgstr "racine"

814

813 -#: apply.c:4984

815 +#: apply.c:5010

816 msgid "prepend <root> to all filenames"

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

818

@@ -833,108 +835,108 @@ msgstr ""

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

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

837

836 -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300

838 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

839 #, c-format

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

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

842

841 -#: archive.c:418

843 +#: archive.c:436

844 msgid "fmt"

845 msgstr "fmt"

846

845 -#: archive.c:418

847 +#: archive.c:436

848 msgid "archive format"

849 msgstr "format d'archive"

850

849 -#: archive.c:419 builtin/log.c:1446

851 +#: archive.c:437 builtin/log.c:1452

852 msgid "prefix"

853 msgstr "préfixe"

854

853 -#: archive.c:420

855 +#: archive.c:438

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

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

858

857 -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

858 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080

859 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552

860 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120

859 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

860 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

861 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

862 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

863 #: parse-options.h:153

864 msgid "file"

865 msgstr "fichier"

866

865 -#: archive.c:422 builtin/archive.c:89

867 +#: archive.c:440 builtin/archive.c:89

868 msgid "write the archive to this file"

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

870

869 -#: archive.c:424

871 +#: archive.c:442

872 msgid "read .gitattributes in working directory"

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

874

873 -#: archive.c:425

875 +#: archive.c:443

876 msgid "report archived files on stderr"

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

878

877 -#: archive.c:426

879 +#: archive.c:444

880 msgid "store only"

881 msgstr "stockage seulement"

882

881 -#: archive.c:427

883 +#: archive.c:445

884 msgid "compress faster"

885 msgstr "compression rapide"

886

885 -#: archive.c:435

887 +#: archive.c:453

888 msgid "compress better"

889 msgstr "compression efficace"

890

889 -#: archive.c:438

891 +#: archive.c:456

892 msgid "list supported archive formats"

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

894

893 -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108

894 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

895 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

896 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

897 msgid "repo"

898 msgstr "dépôt"

899

898 -#: archive.c:441 builtin/archive.c:91

900 +#: archive.c:459 builtin/archive.c:91

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

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

903

902 -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488

904 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

905 msgid "command"

906 msgstr "commande"

907

906 -#: archive.c:443 builtin/archive.c:93

908 +#: archive.c:461 builtin/archive.c:93

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

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

911

910 -#: archive.c:450

912 +#: archive.c:468

913 msgid "Unexpected option --remote"

914 msgstr "Option --remote inattendue"

915

914 -#: archive.c:452

916 +#: archive.c:470

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

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

919

918 -#: archive.c:454

920 +#: archive.c:472

921 msgid "Unexpected option --output"

922 msgstr "Option --output inattendue"

923

922 -#: archive.c:476

924 +#: archive.c:494

925 #, c-format

926 msgid "Unknown archive format '%s'"

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

928

927 -#: archive.c:483

929 +#: archive.c:501

930 #, c-format

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

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

933

932 -#: attr.c:214

934 +#: attr.c:218

935 #, c-format

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

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

938

937 -#: attr.c:410

939 +#: attr.c:415

940 msgid ""

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

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

@@ -1012,31 +1014,31 @@ msgstr ""

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

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

1016

1015 -#: bisect.c:849

1017 +#: bisect.c:850

1018 #, c-format

1019 msgid "a %s revision is needed"

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

1021

1020 -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256

1022 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

1023 #, c-format

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

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

1026

1025 -#: bisect.c:917

1027 +#: bisect.c:918

1028 #, c-format

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

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

1031

1030 -#: bisect.c:947

1032 +#: bisect.c:948

1033 msgid "reading bisect refs failed"

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

1035

1034 -#: bisect.c:967

1036 +#: bisect.c:968

1037 #, c-format

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

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

1040

1039 -#: bisect.c:975

1041 +#: bisect.c:976

1042 #, c-format

1043 msgid ""

1044 "No testable commit found.\n"

@@ -1045,7 +1047,7 @@ msgstr ""

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

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

1049

1048 -#: bisect.c:994

1050 +#: bisect.c:995

1051 #, c-format

1052 msgid "(roughly %d step)"

1053 msgid_plural "(roughly %d steps)"

@@ -1055,7 +1057,7 @@ msgstr[1] "(à peu près %d étapes)"

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

1058 #. steps)" translation.

1059 #.

1058 -#: bisect.c:1000

1060 +#: bisect.c:1001

1061 #, c-format

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

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

@@ -1076,10 +1078,10 @@ msgstr ""

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

1079 "dernier commit"

1080

1079 -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166

1080 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907

1081 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360

1082 -#: builtin/shortlog.c:177

1081 +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

1082 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

1083 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

1084 +#: builtin/shortlog.c:191

1085 msgid "revision walk setup failed"

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

1087

@@ -1120,50 +1122,53 @@ msgstr "La branche %s ne peut pas être sa propre branche amont."

1122

1123 #: branch.c:93

1124 #, c-format

1123 -msgid "Branch %s set up to track remote branch %s from %s by rebasing."

1125 +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1126 msgstr ""

1125 -"La branche %s est paramétrée pour suivre la branche distante %s de %s en "

1126 -"rebasant."

1127 +"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "

1128 +"en rebasant."

1129

1130 #: branch.c:94

1131 #, c-format

1130 -msgid "Branch %s set up to track remote branch %s from %s."

1132 +msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1133 msgstr ""

1132 -"La branche %s est paramétrée pour suivre la branche distante %s depuis %s."

1134 +"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "

1135 +"'%s'."

1136

1137 #: branch.c:98

1138 #, c-format

1136 -msgid "Branch %s set up to track local branch %s by rebasing."

1139 +msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1140 msgstr ""

1138 -"La branche %s est paramétrée pour suivre la branche locale %s en rebasant."

1141 +"La branche '%s' est paramétrée pour suivre la branche locale '%'s en "

1142 +"rebasant."

1143

1144 #: branch.c:99

1145 #, c-format

1142 -msgid "Branch %s set up to track local branch %s."

1143 -msgstr "La branche %s est paramétrée pour suivre la branche locale %s."

1146 +msgid "Branch '%s' set up to track local branch '%s'."

1147 +msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."

1148

1149 #: branch.c:104

1150 #, c-format

1147 -msgid "Branch %s set up to track remote ref %s by rebasing."

1151 +msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1152 msgstr ""

1149 -"La branche %s est paramétrée pour suivre la référence distante %s en "

1153 +"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "

1154 "rebasant."

1155

1156 #: branch.c:105

1157 #, c-format

1154 -msgid "Branch %s set up to track remote ref %s."

1155 -msgstr "La branche %s est paramétrée pour suivre la référence distante %s."

1158 +msgid "Branch '%s' set up to track remote ref '%s'."

1159 +msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."

1160

1161 #: branch.c:109

1162 #, c-format

1159 -msgid "Branch %s set up to track local ref %s by rebasing."

1163 +msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1164 msgstr ""

1161 -"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."

1165 +"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "

1166 +"rebasant."

1167

1168 #: branch.c:110

1169 #, c-format

1165 -msgid "Branch %s set up to track local ref %s."

1166 -msgstr "La branche %s est paramétrée pour suivre la référence locale %s."

1170 +msgid "Branch '%s' set up to track local ref '%s'."

1171 +msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."

1172

1173 #: branch.c:119

1174 msgid "Unable to write upstream branch configuration"

@@ -1184,23 +1189,23 @@ msgstr "'%s' n'est pas un nom de branche valide."

1189 msgid "A branch named '%s' already exists."

1190 msgstr "Une branche nommée '%s' existe déjà."

1191

1187 -#: branch.c:198

1192 +#: branch.c:197

1193 msgid "Cannot force update the current branch."

1194 msgstr "Impossible de forcer la mise à jour de la branche courante."

1195

1191 -#: branch.c:218

1196 +#: branch.c:217

1197 #, c-format

1198 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1199 msgstr ""

1200 "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "

1201 "pas une branche."

1202

1198 -#: branch.c:220

1203 +#: branch.c:219

1204 #, c-format

1205 msgid "the requested upstream branch '%s' does not exist"

1206 msgstr "la branche amont demandée '%s' n'existe pas"

1207

1203 -#: branch.c:222

1208 +#: branch.c:221

1209 msgid ""

1210 "\n"

1211 "If you are planning on basing your work on an upstream\n"

@@ -1220,22 +1225,22 @@ msgstr ""

1225 "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"

1226 "pour paramétrer le suivi distant en même temps que vous poussez."

1227

1223 -#: branch.c:265

1228 +#: branch.c:264

1229 #, c-format

1230 msgid "Not a valid object name: '%s'."

1231 msgstr "Nom d'objet invalide : '%s'."

1232

1228 -#: branch.c:285

1233 +#: branch.c:284

1234 #, c-format

1235 msgid "Ambiguous object name: '%s'."

1236 msgstr "Nom d'objet ambigu : '%s'."

1237

1233 -#: branch.c:290

1238 +#: branch.c:289

1239 #, c-format

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

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

1242

1238 -#: branch.c:344

1243 +#: branch.c:343

1244 #, c-format

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

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

@@ -1255,7 +1260,9 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

1262

1258 -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778

1263 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1264 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1265 +#: sequencer.c:2949 builtin/commit.c:782

1266 #, c-format

1267 msgid "could not open '%s'"

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

@@ -1264,56 +1271,56 @@ msgstr "impossible d'ouvrir '%s'"

1271 msgid "Repository lacks these prerequisite commits:"

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

1273

1267 -#: bundle.c:186

1274 +#: bundle.c:193

1275 #, c-format

1276 msgid "The bundle contains this ref:"

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

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

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

1280

1274 -#: bundle.c:193

1281 +#: bundle.c:200

1282 msgid "The bundle records a complete history."

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

1284

1278 -#: bundle.c:195

1285 +#: bundle.c:202

1286 #, c-format

1287 msgid "The bundle requires this ref:"

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

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

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

1291

1285 -#: bundle.c:254

1292 +#: bundle.c:261

1293 msgid "Could not spawn pack-objects"

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

1295

1289 -#: bundle.c:265

1296 +#: bundle.c:272

1297 msgid "pack-objects died"

1298 msgstr "les objets groupés ont disparu"

1299

1293 -#: bundle.c:307

1300 +#: bundle.c:314

1301 msgid "rev-list died"

1302 msgstr "rev-list a disparu"

1303

1297 -#: bundle.c:356

1304 +#: bundle.c:363

1305 #, c-format

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

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

1308

1302 -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282

1309 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1310 #, c-format

1311 msgid "unrecognized argument: %s"

1312 msgstr "argument non reconnu : %s"

1313

1307 -#: bundle.c:454

1314 +#: bundle.c:461

1315 msgid "Refusing to create empty bundle."

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

1317

1311 -#: bundle.c:466

1318 +#: bundle.c:473

1319 #, c-format

1320 msgid "cannot create '%s'"

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

1322

1316 -#: bundle.c:494

1323 +#: bundle.c:501

1324 msgid "index-pack died"

1325 msgstr "l'index de groupe a disparu"

1326

@@ -1322,8 +1329,8 @@ msgstr "l'index de groupe a disparu"

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

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

1331

1325 -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456

1326 -#: builtin/am.c:1469 builtin/am.c:2107

1332 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1333 +#: builtin/am.c:1467 builtin/am.c:2105

1334 #, c-format

1335 msgid "could not parse %s"

1336 msgstr "impossible d'analyser %s"

@@ -1333,7 +1340,7 @@ msgstr "impossible d'analyser %s"

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

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

1342

1336 -#: commit.c:1511

1343 +#: commit.c:1517

1344 msgid ""

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

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

@@ -1349,171 +1356,171 @@ msgstr ""

1356 msgid "memory exhausted"

1357 msgstr "plus de mémoire"

1358

1352 -#: config.c:186

1359 +#: config.c:187

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

1361 msgstr ""

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

1363 "fichiers"

1364

1358 -#: config.c:720

1365 +#: config.c:721

1366 #, c-format

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

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

1369

1363 -#: config.c:724

1370 +#: config.c:725

1371 #, c-format

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

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

1374

1368 -#: config.c:728

1375 +#: config.c:729

1376 #, c-format

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

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

1379

1373 -#: config.c:732

1380 +#: config.c:733

1381 #, c-format

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

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

1384

1378 -#: config.c:736

1385 +#: config.c:737

1386 #, c-format

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

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

1389

1383 -#: config.c:740

1390 +#: config.c:741

1391 #, c-format

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

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

1394

1388 -#: config.c:868

1395 +#: config.c:869

1396 msgid "out of range"

1397 msgstr "hors plage"

1398

1392 -#: config.c:868

1399 +#: config.c:869

1400 msgid "invalid unit"

1401 msgstr "unité invalide"

1402

1396 -#: config.c:874

1403 +#: config.c:875

1404 #, c-format

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

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

1407

1401 -#: config.c:879

1408 +#: config.c:880

1409 #, c-format

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

1411 msgstr ""

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

1413 "%s : %s"

1414

1408 -#: config.c:882

1415 +#: config.c:883

1416 #, c-format

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

1418 msgstr ""

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

1420 "%s : %s"

1421

1415 -#: config.c:885

1422 +#: config.c:886

1423 #, c-format

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

1425 msgstr ""

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

1427 "standard : %s"

1428

1422 -#: config.c:888

1429 +#: config.c:889

1430 #, c-format

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

1432 msgstr ""

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

1434 "sous-module %s : %s"

1435

1429 -#: config.c:891

1436 +#: config.c:892

1437 #, c-format

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

1439 msgstr ""

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

1441 "commande %s : %s"

1442

1436 -#: config.c:894

1443 +#: config.c:895

1444 #, c-format

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

1446 msgstr ""

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

1448

1442 -#: config.c:989

1449 +#: config.c:990

1450 #, c-format

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

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

1453

1447 -#: config.c:1084 config.c:1095

1454 +#: config.c:1085 config.c:1096

1455 #, c-format

1456 msgid "bad zlib compression level %d"

1457 msgstr "niveau de compression zlib incorrect %d"

1458

1452 -#: config.c:1212

1459 +#: config.c:1213

1460 #, c-format

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

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

1463

1457 -#: config.c:1368

1464 +#: config.c:1372

1465 #, c-format

1466 msgid "bad pack compression level %d"

1467 msgstr "niveau de compression du paquet %d"

1468

1462 -#: config.c:1564

1469 +#: config.c:1568

1470 msgid "unable to parse command-line config"

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

1472

1466 -#: config.c:1894

1473 +#: config.c:1900

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

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

1476

1470 -#: config.c:2064

1477 +#: config.c:2087

1478 #, c-format

1479 msgid "Invalid %s: '%s'"

1480 msgstr "%s invalide : '%s'"

1481

1475 -#: config.c:2085

1482 +#: config.c:2130

1483 #, c-format

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

1485 msgstr ""

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

1487 "défaut"

1488

1482 -#: config.c:2111

1489 +#: config.c:2156

1490 #, c-format

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

1492 msgstr ""

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

1494 "100"

1495

1489 -#: config.c:2122

1496 +#: config.c:2167

1497 #, c-format

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

1499 msgstr ""

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

1501

1495 -#: config.c:2124

1502 +#: config.c:2169

1503 #, c-format

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

1505 msgstr ""

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

1507

1501 -#: config.c:2183

1508 +#: config.c:2228

1509 #, c-format

1510 msgid "%s has multiple values"

1511 msgstr "%s a des valeurs multiples"

1512

1506 -#: config.c:2517 config.c:2745

1513 +#: config.c:2571 config.c:2789

1514 #, c-format

1515 msgid "fstat on %s failed"

1516 msgstr "échec de fstat sur %s"

1517

1511 -#: config.c:2635

1518 +#: config.c:2678

1519 #, c-format

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

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

1522

1516 -#: config.c:2637 builtin/remote.c:775

1523 +#: config.c:2680 builtin/remote.c:776

1524 #, c-format

1525 msgid "could not unset '%s'"

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

@@ -1534,19 +1541,19 @@ msgstr ""

1541 "Veuillez vérifier que vous avez les droits d'accès\n"

1542 "et que le dépôt existe."

1543

1537 -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141

1544 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1545 msgid "Checking connectivity"

1546 msgstr "Vérification de la connectivité"

1547

1541 -#: connected.c:75

1548 +#: connected.c:76

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

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

1551

1545 -#: connected.c:95

1552 +#: connected.c:96

1553 msgid "failed write to rev-list"

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

1555

1549 -#: connected.c:102

1556 +#: connected.c:103

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

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

1559

@@ -1657,29 +1664,37 @@ msgstr "impossible de lire le fichier de commande '%s'"

1664 msgid "Performing inexact rename detection"

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

1666

1660 -#: diff.c:63

1667 +#: diff.c:74

1668 #, c-format

1669 msgid "option '%s' requires a value"

1670 msgstr "le commutateur '%s' a besoin d'une valeur"

1671

1665 -#: diff.c:125

1672 +#: diff.c:152

1673 #, c-format

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

1675 msgstr ""

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

1677

1671 -#: diff.c:130

1678 +#: diff.c:157

1679 #, c-format

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

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

1682

1676 -#: diff.c:282

1683 +#: diff.c:281

1684 +msgid ""

1685 +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1686 +"'plain'"

1687 +msgstr ""

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

1689 +"'zebra', 'dimmed_zebra', 'plain'"

1690 +

1691 +#: diff.c:341

1692 #, c-format

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

1694 msgstr ""

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

1696

1682 -#: diff.c:342

1697 +#: diff.c:398

1698 #, c-format

1699 msgid ""

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

@@ -1688,20 +1703,20 @@ msgstr ""

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

1704 "%s"

1705

1691 -#: diff.c:3101

1706 +#: diff.c:3861

1707 #, c-format

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

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

1710

1696 -#: diff.c:3427

1711 +#: diff.c:4189

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

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

1714

1700 -#: diff.c:3517

1715 +#: diff.c:4279

1716 msgid "--follow requires exactly one pathspec"

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

1718

1704 -#: diff.c:3680

1719 +#: diff.c:4445

1720 #, c-format

1721 msgid ""

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

@@ -1710,24 +1725,24 @@ msgstr ""

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

1726 "%s"

1727

1713 -#: diff.c:3694

1728 +#: diff.c:4459

1729 #, c-format

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

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

1732

1718 -#: diff.c:4716

1733 +#: diff.c:5505

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

1735 msgstr ""

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

1737 "fichiers."

1738

1724 -#: diff.c:4719

1739 +#: diff.c:5508

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

1741 msgstr ""

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

1743 "grand nombre de fichiers."

1744

1730 -#: diff.c:4722

1745 +#: diff.c:5511

1746 #, c-format

1747 msgid ""

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

@@ -1735,207 +1750,211 @@ msgstr ""

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

1751 "commande."

1752

1738 -#: dir.c:1948

1753 +#: dir.c:1983

1754 msgid "failed to get kernel name and information"

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

1756

1742 -#: dir.c:2067

1757 +#: dir.c:2102

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

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

1760

1746 -#: dir.c:2846 dir.c:2851

1761 +#: dir.c:2885 dir.c:2890

1762 #, c-format

1763 msgid "could not create directories for %s"

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

1765

1751 -#: dir.c:2876

1766 +#: dir.c:2915

1767 #, c-format

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

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

1770

1756 -#: entry.c:281

1771 +#: entry.c:176

1772 +msgid "Filtering content"

1773 +msgstr "Filtrage du contenu"

1774 +

1775 +#: entry.c:433

1776 #, c-format

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

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

1779

1761 -#: fetch-pack.c:251

1780 +#: fetch-pack.c:252

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

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

1783

1765 -#: fetch-pack.c:263

1784 +#: fetch-pack.c:264

1785 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1786 msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"

1787

1769 -#: fetch-pack.c:282 builtin/archive.c:63

1788 +#: fetch-pack.c:283 builtin/archive.c:63

1789 #, c-format

1790 msgid "remote error: %s"

1791 msgstr "erreur distante : %s"

1792

1774 -#: fetch-pack.c:283

1793 +#: fetch-pack.c:284

1794 #, c-format

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

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

1797

1779 -#: fetch-pack.c:335

1798 +#: fetch-pack.c:336

1799 msgid "--stateless-rpc requires multi_ack_detailed"

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

1801

1783 -#: fetch-pack.c:421

1802 +#: fetch-pack.c:422

1803 #, c-format

1804 msgid "invalid shallow line: %s"

1805 msgstr "ligne de superficiel invalide : %s"

1806

1788 -#: fetch-pack.c:427

1807 +#: fetch-pack.c:428

1808 #, c-format

1809 msgid "invalid unshallow line: %s"

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

1811

1793 -#: fetch-pack.c:429

1812 +#: fetch-pack.c:430

1813 #, c-format

1814 msgid "object not found: %s"

1815 msgstr "objet non trouvé : %s"

1816

1798 -#: fetch-pack.c:432

1817 +#: fetch-pack.c:433

1818 #, c-format

1819 msgid "error in object: %s"

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

1821

1803 -#: fetch-pack.c:434

1822 +#: fetch-pack.c:435

1823 #, c-format

1824 msgid "no shallow found: %s"

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

1826

1808 -#: fetch-pack.c:437

1827 +#: fetch-pack.c:438

1828 #, c-format

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

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

1831

1813 -#: fetch-pack.c:476

1832 +#: fetch-pack.c:477

1833 #, c-format

1834 msgid "got %s %d %s"

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

1836

1818 -#: fetch-pack.c:490

1837 +#: fetch-pack.c:491

1838 #, c-format

1839 msgid "invalid commit %s"

1840 msgstr "commit invalide %s"

1841

1823 -#: fetch-pack.c:523

1842 +#: fetch-pack.c:524

1843 msgid "giving up"

1844 msgstr "abandon"

1845

1827 -#: fetch-pack.c:533 progress.c:237

1846 +#: fetch-pack.c:534 progress.c:242

1847 msgid "done"

1848 msgstr "fait"

1849

1831 -#: fetch-pack.c:545

1850 +#: fetch-pack.c:546

1851 #, c-format

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

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

1854

1836 -#: fetch-pack.c:591

1855 +#: fetch-pack.c:592

1856 #, c-format

1857 msgid "Marking %s as complete"

1858 msgstr "Marquage de %s comme terminé"

1859

1841 -#: fetch-pack.c:775

1860 +#: fetch-pack.c:776

1861 #, c-format

1862 msgid "already have %s (%s)"

1863 msgstr "%s déjà possédé (%s)"

1864

1846 -#: fetch-pack.c:813

1865 +#: fetch-pack.c:814

1866 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1867 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"

1868

1850 -#: fetch-pack.c:821

1869 +#: fetch-pack.c:822

1870 msgid "protocol error: bad pack header"

1871 msgstr "erreur de protocole : mauvais entête de paquet"

1872

1854 -#: fetch-pack.c:877

1873 +#: fetch-pack.c:878

1874 #, c-format

1875 msgid "fetch-pack: unable to fork off %s"

1876 msgstr "fetch-pack : impossible de dupliquer %s"

1877

1859 -#: fetch-pack.c:893

1878 +#: fetch-pack.c:894

1879 #, c-format

1880 msgid "%s failed"

1881 msgstr "échec de %s"

1882

1864 -#: fetch-pack.c:895

1883 +#: fetch-pack.c:896

1884 msgid "error in sideband demultiplexer"

1885 msgstr "erreur dans le démultiplexer latéral"

1886

1868 -#: fetch-pack.c:922

1887 +#: fetch-pack.c:923

1888 msgid "Server does not support shallow clients"

1889 msgstr "Le serveur ne supporte les clients superficiels"

1890

1872 -#: fetch-pack.c:926

1891 +#: fetch-pack.c:927

1892 msgid "Server supports multi_ack_detailed"

1893 msgstr "Le serveur supporte multi_ack_detailed"

1894

1876 -#: fetch-pack.c:929

1895 +#: fetch-pack.c:930

1896 msgid "Server supports no-done"

1897 msgstr "Le serveur support no-done"

1898

1880 -#: fetch-pack.c:935

1899 +#: fetch-pack.c:936

1900 msgid "Server supports multi_ack"

1901 msgstr "Le serveur supporte multi_ack"

1902

1884 -#: fetch-pack.c:939

1903 +#: fetch-pack.c:940

1904 msgid "Server supports side-band-64k"

1905 msgstr "Le serveur supporte side-band-64k"

1906

1888 -#: fetch-pack.c:943

1907 +#: fetch-pack.c:944

1908 msgid "Server supports side-band"

1909 msgstr "Le serveru supporte side-band"

1910

1892 -#: fetch-pack.c:947

1911 +#: fetch-pack.c:948

1912 msgid "Server supports allow-tip-sha1-in-want"

1913 msgstr "Le serveur supporte allow-tip-sha1-in-want"

1914

1896 -#: fetch-pack.c:951

1915 +#: fetch-pack.c:952

1916 msgid "Server supports allow-reachable-sha1-in-want"

1917 msgstr "Le serveur supporte allow-reachable-sha1-in-want"

1918

1900 -#: fetch-pack.c:961

1919 +#: fetch-pack.c:962

1920 msgid "Server supports ofs-delta"

1921 msgstr "Le serveur support ofs-delta"

1922

1904 -#: fetch-pack.c:968

1923 +#: fetch-pack.c:969

1924 #, c-format

1925 msgid "Server version is %.*s"

1926 msgstr "La version du serveur est %.*s"

1927

1909 -#: fetch-pack.c:974

1928 +#: fetch-pack.c:975

1929 msgid "Server does not support --shallow-since"

1930 msgstr "Le receveur ne gère pas --shallow-since"

1931

1913 -#: fetch-pack.c:978

1932 +#: fetch-pack.c:979

1933 msgid "Server does not support --shallow-exclude"

1934 msgstr "Le receveur ne gère pas --shallow-exclude"

1935

1917 -#: fetch-pack.c:980

1936 +#: fetch-pack.c:981

1937 msgid "Server does not support --deepen"

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

1939

1921 -#: fetch-pack.c:991

1940 +#: fetch-pack.c:992

1941 msgid "no common commits"

1942 msgstr "pas de commit commun"

1943

1925 -#: fetch-pack.c:1003

1944 +#: fetch-pack.c:1004

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

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

1947

1929 -#: fetch-pack.c:1165

1948 +#: fetch-pack.c:1166

1949 msgid "no matching remote head"

1950 msgstr "pas de HEAD distante correspondante"

1951

1933 -#: fetch-pack.c:1187

1952 +#: fetch-pack.c:1188

1953 #, c-format

1954 msgid "no such remote ref %s"

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

1956

1938 -#: fetch-pack.c:1190

1957 +#: fetch-pack.c:1191

1958 #, c-format

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

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

@@ -1948,7 +1967,7 @@ msgstr "gpg n'a pas pu signer les données"

1967 msgid "could not create temporary file"

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

1969

1951 -#: gpg-interface.c:213

1970 +#: gpg-interface.c:214

1971 #, c-format

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

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

@@ -1958,17 +1977,17 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

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

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

1979

1961 -#: grep.c:1981

1980 +#: grep.c:1970

1981 #, c-format

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

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

1984

1966 -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

1985 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1986 #, c-format

1987 msgid "failed to stat '%s'"

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

1989

1971 -#: grep.c:2009

1990 +#: grep.c:1998

1991 #, c-format

1992 msgid "'%s': short read"

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

@@ -2008,13 +2027,13 @@ msgstr ""

2027 #: help.c:363

2028 #, c-format

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

2011 -msgstr "Continuons en supposant que vous avez voulu dire '%s'<"

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

2031

2032 #: help.c:368

2033 #, c-format

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

2035 msgstr ""

2017 -"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<"

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

2037

2038 #: help.c:376

2039 #, c-format

@@ -2112,12 +2131,12 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

2133

2115 -#: ident.c:416 builtin/commit.c:612

2134 +#: ident.c:416 builtin/commit.c:616

2135 #, c-format

2136 msgid "invalid date format: %s"

2137 msgstr "format de date invalide : %s"

2138

2120 -#: lockfile.c:152

2139 +#: lockfile.c:151

2140 #, c-format

2141 msgid ""

2142 "Unable to create '%s.lock': %s.\n"

@@ -2136,7 +2155,7 @@ msgstr ""

2155 "un processus git peut avoir planté :\n"

2156 "supprimez le fichier manuellement pour poursuivre."

2157

2139 -#: lockfile.c:160

2158 +#: lockfile.c:159

2159 #, c-format

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

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

@@ -2145,78 +2164,78 @@ msgstr "Impossible de créer '%s.lock' : %s"

2164 msgid "failed to read the cache"

2165 msgstr "impossible de lire le cache"

2166

2148 -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

2149 -#: builtin/checkout.c:591 builtin/clone.c:753

2167 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

2168 +#: builtin/checkout.c:595 builtin/clone.c:754

2169 msgid "unable to write new index file"

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

2171

2153 -#: merge-recursive.c:210

2172 +#: merge-recursive.c:235

2173 msgid "(bad commit)\n"

2174 msgstr "(mauvais commit)\n"

2175

2157 -#: merge-recursive.c:232 merge-recursive.c:240

2176 +#: merge-recursive.c:257 merge-recursive.c:265

2177 #, c-format

2178 msgid "addinfo_cache failed for path '%s'"

2179 msgstr "échec de addinfo_cache pour le chemin '%s'"

2180

2162 -#: merge-recursive.c:304

2181 +#: merge-recursive.c:329

2182 msgid "error building trees"

2183 msgstr "erreur de construction des arbres"

2184

2166 -#: merge-recursive.c:728

2185 +#: merge-recursive.c:752

2186 #, c-format

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

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

2189

2171 -#: merge-recursive.c:739

2190 +#: merge-recursive.c:763

2191 #, c-format

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

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

2194

2176 -#: merge-recursive.c:753 merge-recursive.c:772

2195 +#: merge-recursive.c:777 merge-recursive.c:796

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

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

2198

2180 -#: merge-recursive.c:762

2199 +#: merge-recursive.c:786

2200 #, c-format

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

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

2203

2185 -#: merge-recursive.c:804 builtin/cat-file.c:36

2204 +#: merge-recursive.c:828 builtin/cat-file.c:37

2205 #, c-format

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

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

2208

2190 -#: merge-recursive.c:806

2209 +#: merge-recursive.c:830

2210 #, c-format

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

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

2213

2195 -#: merge-recursive.c:830

2214 +#: merge-recursive.c:854

2215 #, c-format

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

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

2218

2200 -#: merge-recursive.c:841

2219 +#: merge-recursive.c:865

2220 #, c-format

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

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

2223

2205 -#: merge-recursive.c:846

2224 +#: merge-recursive.c:870

2225 #, c-format

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

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

2228

2210 -#: merge-recursive.c:986

2229 +#: merge-recursive.c:1010

2230 msgid "Failed to execute internal merge"

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

2232

2214 -#: merge-recursive.c:990

2233 +#: merge-recursive.c:1014

2234 #, c-format

2235 msgid "Unable to add %s to database"

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

2237

2219 -#: merge-recursive.c:1093

2238 +#: merge-recursive.c:1117

2239 #, c-format

2240 msgid ""

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

@@ -2225,7 +2244,7 @@ msgstr ""

2244 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

2245 "%s laissée dans l'arbre."

2246

2228 -#: merge-recursive.c:1098

2247 +#: merge-recursive.c:1122

2248 #, c-format

2249 msgid ""

2250 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2234,7 +2253,7 @@ msgstr ""

2253 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

2254 "%s de %s laissée dans l'arbre."

2255

2237 -#: merge-recursive.c:1105

2256 +#: merge-recursive.c:1129

2257 #, c-format

2258 msgid ""

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

@@ -2243,7 +2262,7 @@ msgstr ""

2262 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

2263 "%s laissée dans l'arbre dans le fichier %s."

2264

2246 -#: merge-recursive.c:1110

2265 +#: merge-recursive.c:1134

2266 #, c-format

2267 msgid ""

2268 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2252,20 +2271,20 @@ msgstr ""

2271 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

2272 "%s de %s laissée dans l'arbre dans le fichier %s."

2273

2255 -#: merge-recursive.c:1144

2274 +#: merge-recursive.c:1168

2275 msgid "rename"

2276 msgstr "renommage"

2277

2259 -#: merge-recursive.c:1144

2278 +#: merge-recursive.c:1168

2279 msgid "renamed"

2280 msgstr "renommé"

2281

2263 -#: merge-recursive.c:1201

2282 +#: merge-recursive.c:1225

2283 #, c-format

2284 msgid "%s is a directory in %s adding as %s instead"

2285 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"

2286

2268 -#: merge-recursive.c:1226

2287 +#: merge-recursive.c:1250

2288 #, c-format

2289 msgid ""

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

@@ -2274,141 +2293,141 @@ msgstr ""

2293 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "

2294 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"

2295

2277 -#: merge-recursive.c:1231

2296 +#: merge-recursive.c:1255

2297 msgid " (left unresolved)"

2298 msgstr " (laissé non résolu)"

2299

2281 -#: merge-recursive.c:1293

2300 +#: merge-recursive.c:1317

2301 #, c-format

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

2303 msgstr ""

2304 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"

2305 ">'%s' dans %s"

2306

2288 -#: merge-recursive.c:1326

2307 +#: merge-recursive.c:1350

2308 #, c-format

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

2310 msgstr "Renommage de %s en %s et de %s en %s à la place"

2311

2293 -#: merge-recursive.c:1529

2312 +#: merge-recursive.c:1553

2313 #, c-format

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

2315 msgstr ""

2316 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"

2317

2299 -#: merge-recursive.c:1544

2318 +#: merge-recursive.c:1568

2319 #, c-format

2320 msgid "Adding merged %s"

2321 msgstr "Ajout de %s fusionné"

2322

2304 -#: merge-recursive.c:1551 merge-recursive.c:1781

2323 +#: merge-recursive.c:1575 merge-recursive.c:1805

2324 #, c-format

2325 msgid "Adding as %s instead"

2326 msgstr "Ajout plutôt comme %s"

2327

2309 -#: merge-recursive.c:1608

2328 +#: merge-recursive.c:1632

2329 #, c-format

2330 msgid "cannot read object %s"

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

2332

2314 -#: merge-recursive.c:1611

2333 +#: merge-recursive.c:1635

2334 #, c-format

2335 msgid "object %s is not a blob"

2336 msgstr "l'objet %s n'est pas un blob"

2337

2319 -#: merge-recursive.c:1680

2338 +#: merge-recursive.c:1704

2339 msgid "modify"

2340 msgstr "modification"

2341

2323 -#: merge-recursive.c:1680

2342 +#: merge-recursive.c:1704

2343 msgid "modified"

2344 msgstr "modifié"

2345

2327 -#: merge-recursive.c:1690

2346 +#: merge-recursive.c:1714

2347 msgid "content"

2348 msgstr "contenu"

2349

2331 -#: merge-recursive.c:1697

2350 +#: merge-recursive.c:1721

2351 msgid "add/add"

2352 msgstr "ajout/ajout"

2353

2335 -#: merge-recursive.c:1733

2354 +#: merge-recursive.c:1757

2355 #, c-format

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

2357 msgstr "%s sauté (fusion identique à l'existant)"

2358

2340 -#: merge-recursive.c:1747

2359 +#: merge-recursive.c:1771

2360 #, c-format

2361 msgid "Auto-merging %s"

2362 msgstr "Fusion automatique de %s"

2363

2345 -#: merge-recursive.c:1751 git-submodule.sh:945

2364 +#: merge-recursive.c:1775 git-submodule.sh:944

2365 msgid "submodule"

2366 msgstr "sous-module"

2367

2349 -#: merge-recursive.c:1752

2368 +#: merge-recursive.c:1776

2369 #, c-format

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

2371 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"

2372

2354 -#: merge-recursive.c:1846

2373 +#: merge-recursive.c:1870

2374 #, c-format

2375 msgid "Removing %s"

2376 msgstr "Suppression de %s"

2377

2359 -#: merge-recursive.c:1872

2378 +#: merge-recursive.c:1896

2379 msgid "file/directory"

2380 msgstr "fichier/répertoire"

2381

2363 -#: merge-recursive.c:1878

2382 +#: merge-recursive.c:1902

2383 msgid "directory/file"

2384 msgstr "répertoire/fichier"

2385

2367 -#: merge-recursive.c:1884

2386 +#: merge-recursive.c:1908

2387 #, c-format

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

2389 msgstr ""

2390 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"

2391

2373 -#: merge-recursive.c:1893

2392 +#: merge-recursive.c:1917

2393 #, c-format

2394 msgid "Adding %s"

2395 msgstr "Ajout de %s"

2396

2378 -#: merge-recursive.c:1930

2379 -msgid "Already up-to-date!"

2397 +#: merge-recursive.c:1954

2398 +msgid "Already up to date!"

2399 msgstr "Déjà à jour !"

2400

2382 -#: merge-recursive.c:1939

2401 +#: merge-recursive.c:1963

2402 #, c-format

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

2404 msgstr "échec de fusion des arbres %s et %s"

2405

2387 -#: merge-recursive.c:2022

2406 +#: merge-recursive.c:2060

2407 msgid "Merging:"

2408 msgstr "Fusion :"

2409

2391 -#: merge-recursive.c:2035

2410 +#: merge-recursive.c:2073

2411 #, c-format

2412 msgid "found %u common ancestor:"

2413 msgid_plural "found %u common ancestors:"

2414 msgstr[0] "%u ancêtre commun trouvé :"

2415 msgstr[1] "%u ancêtres communs trouvés :"

2416

2398 -#: merge-recursive.c:2074

2417 +#: merge-recursive.c:2112

2418 msgid "merge returned no commit"

2419 msgstr "la fusion n'a pas retourné de commit"

2420

2402 -#: merge-recursive.c:2137

2421 +#: merge-recursive.c:2175

2422 #, c-format

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

2424 msgstr "Impossible d'analyser l'objet '%s'"

2425

2407 -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793

2426 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2427 msgid "Unable to write index."

2428 msgstr "Impossible d'écrire l'index."

2429

2411 -#: notes-merge.c:273

2430 +#: notes-merge.c:272

2431 #, c-format

2432 msgid ""

2433 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2419,7 +2438,7 @@ msgstr ""

2438 "Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "

2439 "pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."

2440

2422 -#: notes-merge.c:280

2441 +#: notes-merge.c:279

2442 #, c-format

2443 msgid "You have not concluded your notes merge (%s exists)."

2444 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."

@@ -2447,16 +2466,31 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

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

2467 msgstr "Mauvaise valeur de %s : '%s'"

2468

2450 -#: object.c:240

2469 +#: object.c:239

2470 #, c-format

2471 msgid "unable to parse object: %s"

2472 msgstr "impossible d'analyser l'objet : %s"

2473

2474 +#: packfile.c:556

2475 +msgid "offset before end of packfile (broken .idx?)"

2476 +msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

2477 +

2478 +#: packfile.c:1683

2479 +#, c-format

2480 +msgid "offset before start of pack index for %s (corrupt index?)"

2481 +msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

2482 +

2483 +#: packfile.c:1687

2484 +#, c-format

2485 +msgid "offset beyond end of pack index for %s (truncated index?)"

2486 +msgstr ""

2487 +"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

2488 +

2489 #: parse-options.c:573

2490 msgid "..."

2491 msgstr "..."

2492

2459 -#: parse-options.c:591

2493 +#: parse-options.c:592

2494 #, c-format

2495 msgid "usage: %s"

2496 msgstr "usage : %s"

@@ -2464,17 +2498,17 @@ msgstr "usage : %s"

2498 #. TRANSLATORS: the colon here should align with the

2499 #. one in "usage: %s" translation.

2500 #.

2467 -#: parse-options.c:597

2501 +#: parse-options.c:598

2502 #, c-format

2503 msgid " or: %s"

2504 msgstr " ou : %s"

2505

2472 -#: parse-options.c:600

2506 +#: parse-options.c:601

2507 #, c-format

2508 msgid " %s"

2509 msgstr " %s"

2510

2477 -#: parse-options.c:634

2511 +#: parse-options.c:640

2512 msgid "-NUM"

2513 msgstr "-NUM"

2514

@@ -2483,7 +2517,7 @@ msgstr "-NUM"

2517 msgid "malformed object name '%s'"

2518 msgstr "nom d'objet malformé '%s'"

2519

2486 -#: path.c:890

2520 +#: path.c:891

2521 #, c-format

2522 msgid "Could not make %s writable by group"

2523 msgstr "Impossible de rendre %s inscriptible pour le groupe"

@@ -2562,7 +2596,7 @@ msgstr ""

2596 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

2597 "commande : %s"

2598

2565 -#: pathspec.c:575

2599 +#: pathspec.c:571

2600 msgid ""

2601 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2602 "use . instead if you meant to match all paths"

@@ -2571,12 +2605,12 @@ msgstr ""

2605 "invalides dans les prochaines versions. Veuillez utiliser . à la place pour "

2606 "correspondre à tous le chemins"

2607

2574 -#: pathspec.c:599

2608 +#: pathspec.c:595

2609 #, c-format

2610 msgid "pathspec '%s' is beyond a symbolic link"

2611 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

2612

2579 -#: pretty.c:963

2613 +#: pretty.c:962

2614 msgid "unable to parse --pretty format"

2615 msgstr "impossible d'analyser le format --pretty"

2616

@@ -2598,50 +2632,51 @@ msgstr ""

2632 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

2633 "Utilisation de la version %i"

2634

2601 -#: read-cache.c:2308 builtin/merge.c:1019

2635 +#: read-cache.c:2316 builtin/merge.c:1046

2636 #, c-format

2637 msgid "could not close '%s'"

2638 msgstr "impossible de fermer '%s'"

2639

2606 -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

2640 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2641 #, c-format

2642 msgid "could not stat '%s'"

2643 msgstr "stat impossible de '%s'"

2644

2611 -#: read-cache.c:2396

2645 +#: read-cache.c:2407

2646 #, c-format

2647 msgid "unable to open git dir: %s"

2648 msgstr "impossible d'ouvrir le répertoire git : %s"

2649

2616 -#: read-cache.c:2408

2650 +#: read-cache.c:2419

2651 #, c-format

2652 msgid "unable to unlink: %s"

2653 msgstr "échec lors de l'unlink : %s"

2654

2621 -#: refs.c:622

2655 +#: refs.c:638

2656 #, c-format

2657 msgid "Could not open '%s' for writing"

2658 msgstr "Impossible d'ouvrir '%s' en écriture"

2659

2626 -#: refs.c:1769

2660 +#: refs.c:1792

2661 msgid "ref updates forbidden inside quarantine environment"

2662 msgstr "mises à jour des références interdites en environnement de quarantaine"

2663

2630 -#: refs/files-backend.c:1664

2664 +#: refs/files-backend.c:1136

2665 +#, c-format

2666 +msgid "could not remove reference %s"

2667 +msgstr "impossible de supprimer la référence %s"

2668 +

2669 +#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2670 +#: refs/packed-backend.c:1440

2671 #, c-format

2672 msgid "could not delete reference %s: %s"

2673 msgstr "Impossible de supprimer la référence %s : %s"

2674

2635 -#: refs/files-backend.c:1667

2675 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2676 #, c-format

2677 msgid "could not delete references: %s"

2678 msgstr "impossible de supprimer les références : %s"

2679

2640 -#: refs/files-backend.c:1676

2641 -#, c-format

2642 -msgid "could not remove reference %s"

2643 -msgstr "impossible de supprimer la référence %s"

2644 -

2680 # à priori on parle d'une branche ici

2681 #: ref-filter.c:35 wt-status.c:1811

2682 msgid "gone"

@@ -2672,147 +2707,147 @@ msgstr "format attendu : %%(color:<couleur>)"

2707 msgid "unrecognized color: %%(color:%s)"

2708 msgstr "couleur non reconnue : %%(color:%s)"

2709

2675 -#: ref-filter.c:121

2710 +#: ref-filter.c:127

2711 #, c-format

2712 msgid "Integer value expected refname:lstrip=%s"

2713 msgstr "Valeur entière attendue refname:lstrip=%s"

2714

2680 -#: ref-filter.c:125

2715 +#: ref-filter.c:131

2716 #, c-format

2717 msgid "Integer value expected refname:rstrip=%s"

2718 msgstr "Valeur entière attendue refname:rstrip=%s"

2719

2685 -#: ref-filter.c:127

2720 +#: ref-filter.c:133

2721 #, c-format

2722 msgid "unrecognized %%(%s) argument: %s"

2723 msgstr "argument %%(%s) non reconnu : %s"

2724

2690 -#: ref-filter.c:167

2725 +#: ref-filter.c:173

2726 #, c-format

2727 msgid "%%(body) does not take arguments"

2728 msgstr "%%(body) n'accepte pas d'argument"

2729

2695 -#: ref-filter.c:174

2730 +#: ref-filter.c:180

2731 #, c-format

2732 msgid "%%(subject) does not take arguments"

2733 msgstr "%%(subject) n'accepte pas d'argument"

2734

2700 -#: ref-filter.c:181

2735 +#: ref-filter.c:198

2736 #, c-format

2702 -msgid "%%(trailers) does not take arguments"

2703 -msgstr "%%(trailers) n'accepte pas d'argument"

2737 +msgid "unknown %%(trailers) argument: %s"

2738 +msgstr "argument %%(trailers) inconnu : %s"

2739

2705 -#: ref-filter.c:200

2740 +#: ref-filter.c:221

2741 #, c-format

2742 msgid "positive value expected contents:lines=%s"

2743 msgstr "valeur positive attendue contents:lines=%s"

2744

2710 -#: ref-filter.c:202

2745 +#: ref-filter.c:223

2746 #, c-format

2747 msgid "unrecognized %%(contents) argument: %s"

2748 msgstr "argument %%(contents) non reconnu : %s"

2749

2715 -#: ref-filter.c:215

2750 +#: ref-filter.c:236

2751 #, c-format

2752 msgid "positive value expected objectname:short=%s"

2753 msgstr "valeur positive attendue objectname:short=%s"

2754

2720 -#: ref-filter.c:219

2755 +#: ref-filter.c:240

2756 #, c-format

2757 msgid "unrecognized %%(objectname) argument: %s"

2758 msgstr "argument %%(objectname) non reconnu : %s"

2759

2725 -#: ref-filter.c:246

2760 +#: ref-filter.c:267

2761 #, c-format

2762 msgid "expected format: %%(align:<width>,<position>)"

2763 msgstr "format attendu : %%(align:<largeur>,<position>)"

2764

2730 -#: ref-filter.c:258

2765 +#: ref-filter.c:279

2766 #, c-format

2767 msgid "unrecognized position:%s"

2768 msgstr "position non reconnue : %s"

2769

2735 -#: ref-filter.c:262

2770 +#: ref-filter.c:283

2771 #, c-format

2772 msgid "unrecognized width:%s"

2773 msgstr "largeur non reconnue : %s"

2774

2740 -#: ref-filter.c:268

2775 +#: ref-filter.c:289

2776 #, c-format

2777 msgid "unrecognized %%(align) argument: %s"

2778 msgstr "argument %%(align) non reconnu : %s"

2779

2745 -#: ref-filter.c:272

2780 +#: ref-filter.c:293

2781 #, c-format

2782 msgid "positive width expected with the %%(align) atom"

2783 msgstr "valeur positive attendue avec l'atome %%(align)"

2784

2750 -#: ref-filter.c:287

2785 +#: ref-filter.c:308

2786 #, c-format

2787 msgid "unrecognized %%(if) argument: %s"

2788 msgstr "argument %%(if) non reconnu : %s"

2789

2755 -#: ref-filter.c:378

2790 +#: ref-filter.c:398

2791 #, c-format

2792 msgid "malformed field name: %.*s"

2793 msgstr "nom de champ malformé %.*s"

2794

2760 -#: ref-filter.c:404

2795 +#: ref-filter.c:424

2796 #, c-format

2797 msgid "unknown field name: %.*s"

2798 msgstr "nom de champ inconnu : %.*s"

2799

2765 -#: ref-filter.c:508

2800 +#: ref-filter.c:536

2801 #, c-format

2802 msgid "format: %%(if) atom used without a %%(then) atom"

2803 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"

2804

2770 -#: ref-filter.c:568

2805 +#: ref-filter.c:596

2806 #, c-format

2807 msgid "format: %%(then) atom used without an %%(if) atom"

2808 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"

2809

2775 -#: ref-filter.c:570

2810 +#: ref-filter.c:598

2811 #, c-format

2812 msgid "format: %%(then) atom used more than once"

2813 msgstr "format : atome %%(then) utilisé plus d'une fois"

2814

2780 -#: ref-filter.c:572

2815 +#: ref-filter.c:600

2816 #, c-format

2817 msgid "format: %%(then) atom used after %%(else)"

2818 msgstr "format: atome %%(then) utilisé après %%(else)"

2819

2785 -#: ref-filter.c:598

2820 +#: ref-filter.c:626

2821 #, c-format

2822 msgid "format: %%(else) atom used without an %%(if) atom"

2823 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"

2824

2790 -#: ref-filter.c:600

2825 +#: ref-filter.c:628

2826 #, c-format

2827 msgid "format: %%(else) atom used without a %%(then) atom"

2828 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"

2829

2795 -#: ref-filter.c:602

2830 +#: ref-filter.c:630

2831 #, c-format

2832 msgid "format: %%(else) atom used more than once"

2833 msgstr "format : atome %%(else) utilisé plus d'une fois"

2834

2800 -#: ref-filter.c:615

2835 +#: ref-filter.c:643

2836 #, c-format

2837 msgid "format: %%(end) atom used without corresponding atom"

2838 msgstr "format : atome %%(end) utilisé sans atome correspondant"

2839

2805 -#: ref-filter.c:670

2840 +#: ref-filter.c:698

2841 #, c-format

2842 msgid "malformed format string %s"

2843 msgstr "Chaîne de formatage mal formée %s"

2844

2810 -#: ref-filter.c:1254

2845 +#: ref-filter.c:1283

2846 #, c-format

2847 msgid "(no branch, rebasing %s)"

2848 msgstr "(aucune branche, rebasage de %s)"

2849

2815 -#: ref-filter.c:1257

2850 +#: ref-filter.c:1286

2851 #, c-format

2852 msgid "(no branch, bisect started on %s)"

2853 msgstr "(aucune branche, bisect a démarré sur %s)"

@@ -2820,7 +2855,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)"

2855 #. TRANSLATORS: make sure this matches "HEAD

2856 #. detached at " in wt-status.c

2857 #.

2823 -#: ref-filter.c:1265

2858 +#: ref-filter.c:1294

2859 #, c-format

2860 msgid "(HEAD detached at %s)"

2861 msgstr "(HEAD détachée sur %s)"

@@ -2828,110 +2863,110 @@ msgstr "(HEAD détachée sur %s)"

2863 #. TRANSLATORS: make sure this matches "HEAD

2864 #. detached from " in wt-status.c

2865 #.

2831 -#: ref-filter.c:1272

2866 +#: ref-filter.c:1301

2867 #, c-format

2868 msgid "(HEAD detached from %s)"

2869 msgstr "(HEAD détachée depuis %s)"

2870

2836 -#: ref-filter.c:1276

2871 +#: ref-filter.c:1305

2872 msgid "(no branch)"

2873 msgstr "(aucune branche)"

2874

2840 -#: ref-filter.c:1426 ref-filter.c:1457

2875 +#: ref-filter.c:1454 ref-filter.c:1485

2876 #, c-format

2877 msgid "missing object %s for %s"

2878 msgstr "objet manquant %s pour %s"

2879

2845 -#: ref-filter.c:1429 ref-filter.c:1460

2880 +#: ref-filter.c:1457 ref-filter.c:1488

2881 #, c-format

2882 msgid "parse_object_buffer failed on %s for %s"

2883 msgstr "echec de parse_object_buffer sur %s pour %s"

2884

2850 -#: ref-filter.c:1760

2885 +#: ref-filter.c:1788

2886 #, c-format

2887 msgid "malformed object at '%s'"

2888 msgstr "objet malformé à '%s'"

2889

2855 -#: ref-filter.c:1827

2890 +#: ref-filter.c:1855

2891 #, c-format

2892 msgid "ignoring ref with broken name %s"

2893 msgstr "réf avec un nom cassé %s ignoré"

2894

2860 -#: ref-filter.c:1832

2895 +#: ref-filter.c:1860

2896 #, c-format

2897 msgid "ignoring broken ref %s"

2898 msgstr "réf cassé %s ignoré"

2899

2865 -#: ref-filter.c:2095

2900 +#: ref-filter.c:2122

2901 #, c-format

2902 msgid "format: %%(end) atom missing"

2903 msgstr "format: atome %%(end) manquant"

2904

2870 -#: ref-filter.c:2176

2905 +#: ref-filter.c:2216

2906 #, c-format

2907 msgid "malformed object name %s"

2908 msgstr "nom d'objet malformé %s"

2909

2875 -#: remote.c:747

2910 +#: remote.c:750

2911 #, c-format

2912 msgid "Cannot fetch both %s and %s to %s"

2913 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

2914

2880 -#: remote.c:751

2915 +#: remote.c:754

2916 #, c-format

2917 msgid "%s usually tracks %s, not %s"

2918 msgstr "%s suit habituellement %s, pas %s"

2919

2885 -#: remote.c:755

2920 +#: remote.c:758

2921 #, c-format

2922 msgid "%s tracks both %s and %s"

2923 msgstr "%s suit à la fois %s et %s"

2924

2890 -#: remote.c:763

2925 +#: remote.c:766

2926 msgid "Internal error"

2927 msgstr "Erreur interne"

2928

2894 -#: remote.c:1680 remote.c:1782

2929 +#: remote.c:1681 remote.c:1783

2930 msgid "HEAD does not point to a branch"

2931 msgstr "HEAD ne pointe pas sur une branche"

2932

2898 -#: remote.c:1689

2933 +#: remote.c:1690

2934 #, c-format

2935 msgid "no such branch: '%s'"

2936 msgstr "pas de branche '%s'"

2937

2903 -#: remote.c:1692

2938 +#: remote.c:1693

2939 #, c-format

2940 msgid "no upstream configured for branch '%s'"

2941 msgstr "aucune branche amont configurée pour la branche '%s'"

2942

2908 -#: remote.c:1698

2943 +#: remote.c:1699

2944 #, c-format

2945 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2946 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

2947

2913 -#: remote.c:1713

2948 +#: remote.c:1714

2949 #, c-format

2950 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2951 msgstr ""

2952 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

2953 "branche locale de suivi"

2954

2920 -#: remote.c:1725

2955 +#: remote.c:1726

2956 #, c-format

2957 msgid "branch '%s' has no remote for pushing"

2958 msgstr "la branche '%s' n'a aucune branche distante de poussée"

2959

2925 -#: remote.c:1736

2960 +#: remote.c:1737

2961 #, c-format

2962 msgid "push refspecs for '%s' do not include '%s'"

2963 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

2964

2930 -#: remote.c:1749

2965 +#: remote.c:1750

2966 msgid "push has no destination (push.default is 'nothing')"

2967 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

2968

2934 -#: remote.c:1771

2969 +#: remote.c:1772

2970 msgid "cannot resolve 'simple' push to a single destination"

2971 msgstr ""

2972 "impossible de résoudre une poussée 'simple' pour une destination unique"

@@ -2947,7 +2982,7 @@ msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

2982

2983 #: remote.c:2083

2984 #, c-format

2950 -msgid "Your branch is up-to-date with '%s'.\n"

2985 +msgid "Your branch is up to date with '%s'.\n"

2986 msgstr "Votre branche est à jour avec '%s'.\n"

2987

2988 #: remote.c:2087

@@ -2997,16 +3032,16 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"

3032 msgstr ""

3033 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

3034

3000 -#: revision.c:2187

3035 +#: revision.c:2256

3036 msgid "your current branch appears to be broken"

3037 msgstr "votre branche actuelle semble cassée"

3038

3004 -#: revision.c:2190

3039 +#: revision.c:2259

3040 #, c-format

3041 msgid "your current branch '%s' does not have any commits yet"

3042 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

3043

3009 -#: revision.c:2384

3044 +#: revision.c:2453

3045 msgid "--first-parent is incompatible with --bisect"

3046 msgstr "--first-parent est incompatible avec --bisect"

3047

@@ -3048,24 +3083,24 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"

3083 msgid "the receiving end does not support push options"

3084 msgstr "Le receveur ne gère pas les options de poussées"

3085

3051 -#: sequencer.c:216

3086 +#: sequencer.c:218

3087 msgid "revert"

3088 msgstr "revert"

3089

3055 -#: sequencer.c:218

3090 +#: sequencer.c:220

3091 msgid "cherry-pick"

3092 msgstr "cherry-pick"

3093

3059 -#: sequencer.c:220

3094 +#: sequencer.c:222

3095 msgid "rebase -i"

3096 msgstr "rebase -i"

3097

3063 -#: sequencer.c:222

3098 +#: sequencer.c:224

3099 #, c-format

3100 msgid "Unknown action: %d"

3101 msgstr "Action inconnue : %d"

3102

3068 -#: sequencer.c:279

3103 +#: sequencer.c:281

3104 msgid ""

3105 "after resolving the conflicts, mark the corrected paths\n"

3106 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3073,7 +3108,7 @@ msgstr ""

3108 "après résolution des conflits, marquez les chemins corrigés\n"

3109 "avec 'git add <chemins>' ou 'git rm <chemins>'"

3110

3076 -#: sequencer.c:282

3111 +#: sequencer.c:284

3112 msgid ""

3113 "after resolving the conflicts, mark the corrected paths\n"

3114 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3083,42 +3118,43 @@ msgstr ""

3118 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

3119 "puis validez le résultat avec 'git commit'"

3120

3086 -#: sequencer.c:295 sequencer.c:1685

3121 +#: sequencer.c:297 sequencer.c:1704

3122 #, c-format

3123 msgid "could not lock '%s'"

3124 msgstr "impossible de verrouiller '%s'"

3125

3091 -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

3126 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3127 +#: sequencer.c:2733 sequencer.c:2749

3128 #, c-format

3129 msgid "could not write to '%s'"

3130 msgstr "impossible d'écrire dans '%s'"

3131

3096 -#: sequencer.c:302

3132 +#: sequencer.c:304

3133 #, c-format

3134 msgid "could not write eol to '%s'"

3135 msgstr "impossible d'écrire la fin de ligne dans '%s'"

3136

3101 -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

3137 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3138 #, c-format

3139 msgid "failed to finalize '%s'."

3140 msgstr "échec lors de la finalisation de '%s'."

3141

3106 -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

3107 -#: builtin/commit.c:750 builtin/merge.c:1017

3142 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3143 +#: builtin/commit.c:754 builtin/merge.c:1044

3144 #, c-format

3145 msgid "could not read '%s'"

3146 msgstr "impossible de lire '%s'"

3147

3112 -#: sequencer.c:356

3148 +#: sequencer.c:358

3149 #, c-format

3150 msgid "your local changes would be overwritten by %s."

3151 msgstr "vos modifications locales seraient écrasées par %s."

3152

3117 -#: sequencer.c:360

3153 +#: sequencer.c:362

3154 msgid "commit your changes or stash them to proceed."

3155 msgstr "validez vos modifications ou les remiser pour continuer."

3156

3121 -#: sequencer.c:389

3157 +#: sequencer.c:391

3158 #, c-format

3159 msgid "%s: fast-forward"

3160 msgstr "%s : avance rapide"

@@ -3126,20 +3162,20 @@ msgstr "%s : avance rapide"

3162 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3163 #. "rebase -i".

3164 #.

3129 -#: sequencer.c:472

3165 +#: sequencer.c:474

3166 #, c-format

3167 msgid "%s: Unable to write new index file"

3168 msgstr "%s: Impossible d'écrire le nouveau fichier index"

3169

3134 -#: sequencer.c:491

3170 +#: sequencer.c:493

3171 msgid "could not resolve HEAD commit\n"

3172 msgstr "impossible de résoudre le commit HEAD\n"

3173

3138 -#: sequencer.c:511

3174 +#: sequencer.c:513

3175 msgid "unable to update cache tree\n"

3176 msgstr "impossible de mettre à jour l'arbre de cache\n"

3177

3142 -#: sequencer.c:595

3178 +#: sequencer.c:597

3179 #, c-format

3180 msgid ""

3181 "you have staged changes in your working tree\n"

@@ -3168,17 +3204,17 @@ msgstr ""

3204 "\n"

3205 " git rebase --continue\n"

3206

3171 -#: sequencer.c:697

3207 +#: sequencer.c:699

3208 #, c-format

3209 msgid "could not parse commit %s\n"

3210 msgstr "impossible d'analyser le commit %s\n"

3211

3176 -#: sequencer.c:702

3212 +#: sequencer.c:704

3213 #, c-format

3214 msgid "could not parse parent commit %s\n"

3215 msgstr "impossible d'analyser le commit parent %s\n"

3216

3181 -#: sequencer.c:824

3217 +#: sequencer.c:826

3218 #, c-format

3219 msgid ""

3220 "unexpected 1st line of squash message:\n"

@@ -3189,7 +3225,7 @@ msgstr ""

3225 "\n"

3226 "\t%.*s"

3227

3192 -#: sequencer.c:830

3228 +#: sequencer.c:832

3229 #, c-format

3230 msgid ""

3231 "invalid 1st line of squash message:\n"

@@ -3200,232 +3236,233 @@ msgstr ""

3236 "\n"

3237 "\t%.*s"

3238

3203 -#: sequencer.c:836 sequencer.c:861

3239 +#: sequencer.c:838 sequencer.c:863

3240 #, c-format

3241 msgid "This is a combination of %d commits."

3242 msgstr "Ceci est la combinaison de %d commits."

3243

3208 -#: sequencer.c:845

3244 +#: sequencer.c:847 sequencer.c:2681

3245 msgid "need a HEAD to fixup"

3246 msgstr "une HEAD est nécessaire à la correction"

3247

3212 -#: sequencer.c:847

3248 +#: sequencer.c:849

3249 msgid "could not read HEAD"

3250 msgstr "Impossible de lire HEAD"

3251

3216 -#: sequencer.c:849

3252 +#: sequencer.c:851

3253 msgid "could not read HEAD's commit message"

3254 msgstr "impossible de lire le message de validation de HEAD"

3255

3220 -#: sequencer.c:855

3256 +#: sequencer.c:857

3257 #, c-format

3258 msgid "cannot write '%s'"

3259 msgstr "impossible d'écrire '%s'"

3260

3225 -#: sequencer.c:864 git-rebase--interactive.sh:445

3261 +#: sequencer.c:866 git-rebase--interactive.sh:446

3262 msgid "This is the 1st commit message:"

3263 msgstr "Ceci est le premier message de validation :"

3264

3229 -#: sequencer.c:872

3265 +#: sequencer.c:874

3266 #, c-format

3267 msgid "could not read commit message of %s"

3268 msgstr "impossible de lire le message de validation de %s"

3269

3234 -#: sequencer.c:879

3270 +#: sequencer.c:881

3271 #, c-format

3272 msgid "This is the commit message #%d:"

3273 msgstr "Ceci est le message de validation numéro %d :"

3274

3239 -#: sequencer.c:884

3275 +#: sequencer.c:886

3276 #, c-format

3277 msgid "The commit message #%d will be skipped:"

3278 msgstr "Le message de validation %d sera ignoré :"

3279

3244 -#: sequencer.c:889

3280 +#: sequencer.c:891

3281 #, c-format

3282 msgid "unknown command: %d"

3283 msgstr "commande inconnue : %d"

3284

3249 -#: sequencer.c:955

3285 +#: sequencer.c:957

3286 msgid "your index file is unmerged."

3287 msgstr "votre fichier d'index n'est pas fusionné."

3288

3253 -#: sequencer.c:973

3289 +#: sequencer.c:975

3290 #, c-format

3291 msgid "commit %s is a merge but no -m option was given."

3292 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

3293

3258 -#: sequencer.c:981

3294 +#: sequencer.c:983

3295 #, c-format

3296 msgid "commit %s does not have parent %d"

3297 msgstr "le commit %s n'a pas de parent %d"

3298

3263 -#: sequencer.c:985

3299 +#: sequencer.c:987

3300 #, c-format

3301 msgid "mainline was specified but commit %s is not a merge."

3302 msgstr ""

3303 "une branche principale a été spécifiée mais le commit %s n'est pas une "

3304 "fusion."

3305

3270 -#: sequencer.c:991

3306 +#: sequencer.c:993

3307 #, c-format

3308 msgid "cannot get commit message for %s"

3309 msgstr "impossible d'obtenir un message de validation pour %s"

3310

3311 #. TRANSLATORS: The first %s will be a "todo" command like

3312 #. "revert" or "pick", the second %s a SHA1.

3277 -#: sequencer.c:1012

3313 +#: sequencer.c:1014

3314 #, c-format

3315 msgid "%s: cannot parse parent commit %s"

3316 msgstr "%s : impossible d'analyser le commit parent %s"

3317

3282 -#: sequencer.c:1075 sequencer.c:1830

3318 +#: sequencer.c:1077 sequencer.c:1853

3319 #, c-format

3320 msgid "could not rename '%s' to '%s'"

3321 msgstr "impossible de renommer '%s' en '%s'"

3322

3287 -#: sequencer.c:1126

3323 +#: sequencer.c:1128

3324 #, c-format

3325 msgid "could not revert %s... %s"

3326 msgstr "impossible d'annuler %s... %s"

3327

3292 -#: sequencer.c:1127

3328 +#: sequencer.c:1129

3329 #, c-format

3330 msgid "could not apply %s... %s"

3331 msgstr "impossible d'appliquer %s... %s"

3332

3297 -#: sequencer.c:1169

3333 +#: sequencer.c:1171

3334 msgid "empty commit set passed"

3335 msgstr "l'ensemble de commits spécifié est vide"

3336

3301 -#: sequencer.c:1179

3337 +#: sequencer.c:1181

3338 #, c-format

3339 msgid "git %s: failed to read the index"

3340 msgstr "git %s : échec à la lecture de l'index"

3341

3306 -#: sequencer.c:1186

3342 +#: sequencer.c:1188

3343 #, c-format

3344 msgid "git %s: failed to refresh the index"

3345 msgstr "git %s : échec du rafraîchissement de l'index"

3346

3311 -#: sequencer.c:1306

3347 +#: sequencer.c:1308

3348 #, c-format

3349 msgid "invalid line %d: %.*s"

3350 msgstr "ligne %d invalide : %.*s"

3351

3316 -#: sequencer.c:1314

3352 +#: sequencer.c:1316

3353 #, c-format

3354 msgid "cannot '%s' without a previous commit"

3355 msgstr "'%s' impossible avec le commit précédent"

3356

3321 -#: sequencer.c:1347

3357 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3358 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3359 #, c-format

3360 msgid "could not read '%s'."

3361 msgstr "impossible de lire '%s'."

3362

3326 -#: sequencer.c:1359

3363 +#: sequencer.c:1361

3364 msgid "please fix this using 'git rebase --edit-todo'."

3365 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3366

3330 -#: sequencer.c:1361

3367 +#: sequencer.c:1363

3368 #, c-format

3369 msgid "unusable instruction sheet: '%s'"

3370 msgstr "feuille d'instruction inutilisable : '%s'"

3371

3335 -#: sequencer.c:1366

3372 +#: sequencer.c:1368

3373 msgid "no commits parsed."

3374 msgstr "aucun commit analysé."

3375

3339 -#: sequencer.c:1377

3376 +#: sequencer.c:1379

3377 msgid "cannot cherry-pick during a revert."

3378 msgstr "impossible de picorer pendant l'annulation d'un commit."

3379

3343 -#: sequencer.c:1379

3380 +#: sequencer.c:1381

3381 msgid "cannot revert during a cherry-pick."

3382 msgstr "impossible d'annuler un commit pendant un picorage."

3383

3347 -#: sequencer.c:1442

3384 +#: sequencer.c:1448

3385 #, c-format

3386 msgid "invalid key: %s"

3387 msgstr "clé invalide : %s"

3388

3352 -#: sequencer.c:1445

3389 +#: sequencer.c:1451

3390 #, c-format

3391 msgid "invalid value for %s: %s"

3392 msgstr "valeur invalide pour %s : %s"

3393

3357 -#: sequencer.c:1502

3394 +#: sequencer.c:1517

3395 #, c-format

3396 msgid "malformed options sheet: '%s'"

3397 msgstr "feuille d'options malformée : %s"

3398

3362 -#: sequencer.c:1540

3399 +#: sequencer.c:1555

3400 msgid "a cherry-pick or revert is already in progress"

3401 msgstr "un picorage ou un retour est déjà en cours"

3402

3366 -#: sequencer.c:1541

3403 +#: sequencer.c:1556

3404 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3405 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

3406

3370 -#: sequencer.c:1544

3407 +#: sequencer.c:1559

3408 #, c-format

3409 msgid "could not create sequencer directory '%s'"

3410 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3411

3375 -#: sequencer.c:1558

3412 +#: sequencer.c:1574

3413 msgid "could not lock HEAD"

3414 msgstr "impossible de verrouiller HEAD"

3415

3379 -#: sequencer.c:1614 sequencer.c:2188

3416 +#: sequencer.c:1632 sequencer.c:2211

3417 msgid "no cherry-pick or revert in progress"

3418 msgstr "aucun picorage ou retour en cours"

3419

3383 -#: sequencer.c:1616

3420 +#: sequencer.c:1634

3421 msgid "cannot resolve HEAD"

3422 msgstr "impossible de résoudre HEAD"

3423

3387 -#: sequencer.c:1618 sequencer.c:1652

3424 +#: sequencer.c:1636 sequencer.c:1671

3425 msgid "cannot abort from a branch yet to be born"

3426 msgstr "impossible d'abandonner depuis une branche non encore créée"

3427

3391 -#: sequencer.c:1638 builtin/grep.c:929

3428 +#: sequencer.c:1657 builtin/grep.c:711

3429 #, c-format

3430 msgid "cannot open '%s'"

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

3432

3396 -#: sequencer.c:1640

3433 +#: sequencer.c:1659

3434 #, c-format

3435 msgid "cannot read '%s': %s"

3436 msgstr "impossible de lire '%s' : %s"

3437

3401 -#: sequencer.c:1641

3438 +#: sequencer.c:1660

3439 msgid "unexpected end of file"

3440 msgstr "fin de fichier inattendue"

3441

3405 -#: sequencer.c:1647

3442 +#: sequencer.c:1666

3443 #, c-format

3444 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3445 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

3446

3410 -#: sequencer.c:1658

3447 +#: sequencer.c:1677

3448 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3449 msgstr ""

3450 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3451

3415 -#: sequencer.c:1795 sequencer.c:2086

3452 +#: sequencer.c:1818 sequencer.c:2109

3453 msgid "cannot read HEAD"

3454 msgstr "impossible de lire HEAD"

3455

3419 -#: sequencer.c:1835 builtin/difftool.c:633

3456 +#: sequencer.c:1858 builtin/difftool.c:640

3457 #, c-format

3458 msgid "could not copy '%s' to '%s'"

3459 msgstr "impossible de copier '%s' vers '%s'"

3460

3424 -#: sequencer.c:1851

3461 +#: sequencer.c:1874

3462 msgid "could not read index"

3463 msgstr "impossible de lire l'index"

3464

3428 -#: sequencer.c:1856

3465 +#: sequencer.c:1879

3466 #, c-format

3467 msgid ""

3468 "execution failed: %s\n"

@@ -3440,11 +3477,11 @@ msgstr ""

3477 "git rebase --continue\n"

3478 "\n"

3479

3443 -#: sequencer.c:1862

3480 +#: sequencer.c:1885

3481 msgid "and made changes to the index and/or the working tree\n"

3482 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3483

3447 -#: sequencer.c:1868

3484 +#: sequencer.c:1891

3485 #, c-format

3486 msgid ""

3487 "execution succeeded: %s\n"

@@ -3461,17 +3498,17 @@ msgstr ""

3498 " git rebase --continue\n"

3499 "\n"

3500

3464 -#: sequencer.c:1925

3501 +#: sequencer.c:1948

3502 #, c-format

3503 msgid "Applied autostash.\n"

3504 msgstr "Autoremisage appliqué.\n"

3505

3469 -#: sequencer.c:1937

3506 +#: sequencer.c:1960

3507 #, c-format

3508 msgid "cannot store %s"

3509 msgstr "impossible de stocker %s"

3510

3474 -#: sequencer.c:1940 git-rebase.sh:173

3511 +#: sequencer.c:1963 git-rebase.sh:175

3512 #, c-format

3513 msgid ""

3514 "Applying autostash resulted in conflicts.\n"

@@ -3482,57 +3519,57 @@ msgstr ""

3519 "Vos modifications sont à l'abri dans la remise.\n"

3520 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

3521

3485 -#: sequencer.c:2022

3522 +#: sequencer.c:2045

3523 #, c-format

3524 msgid "Stopped at %s... %.*s\n"

3525 msgstr "arrêt à %s... %.*s\n"

3526

3490 -#: sequencer.c:2064

3527 +#: sequencer.c:2087

3528 #, c-format

3529 msgid "unknown command %d"

3530 msgstr "commande inconnue %d"

3531

3495 -#: sequencer.c:2094

3532 +#: sequencer.c:2117

3533 msgid "could not read orig-head"

3534 msgstr "impossible de lire orig-head"

3535

3499 -#: sequencer.c:2099

3536 +#: sequencer.c:2122 sequencer.c:2678

3537 msgid "could not read 'onto'"

3538 msgstr "impossible de lire 'onto'"

3539

3503 -#: sequencer.c:2106

3540 +#: sequencer.c:2129

3541 #, c-format

3542 msgid "could not update %s"

3543 msgstr "impossible de mettre à jour %s"

3544

3508 -#: sequencer.c:2113

3545 +#: sequencer.c:2136

3546 #, c-format

3547 msgid "could not update HEAD to %s"

3548 msgstr "impossible de mettre à jour HEAD sur %s"

3549

3513 -#: sequencer.c:2197

3550 +#: sequencer.c:2220

3551 msgid "cannot rebase: You have unstaged changes."

3552 msgstr "impossible de rebaser : vous avez des modifications non indexées."

3553

3517 -#: sequencer.c:2202

3554 +#: sequencer.c:2225

3555 msgid "could not remove CHERRY_PICK_HEAD"

3556 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3557

3521 -#: sequencer.c:2211

3558 +#: sequencer.c:2234

3559 msgid "cannot amend non-existing commit"

3560 msgstr "impossible de corriger un commit non-existant"

3561

3525 -#: sequencer.c:2213

3562 +#: sequencer.c:2236

3563 #, c-format

3564 msgid "invalid file: '%s'"

3565 msgstr "fichier invalide : '%s'"

3566

3530 -#: sequencer.c:2215

3567 +#: sequencer.c:2238

3568 #, c-format

3569 msgid "invalid contents: '%s'"

3570 msgstr "contenu invalide : '%s'"

3571

3535 -#: sequencer.c:2218

3572 +#: sequencer.c:2241

3573 msgid ""

3574 "\n"

3575 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3542,24 +3579,112 @@ msgstr ""

3579 "Vous avez des modifications non validées dans votre copie de travail.\n"

3580 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

3581

3545 -#: sequencer.c:2228

3582 +#: sequencer.c:2251

3583 msgid "could not commit staged changes."

3584 msgstr "impossible de valider les modifications indexées."

3585

3549 -#: sequencer.c:2308

3586 +#: sequencer.c:2331

3587 #, c-format

3588 msgid "%s: can't cherry-pick a %s"

3589 msgstr "%s : impossible de picorer un %s"

3590

3554 -#: sequencer.c:2312

3591 +#: sequencer.c:2335

3592 #, c-format

3593 msgid "%s: bad revision"

3594 msgstr "%s : mauvaise révision"

3595

3559 -#: sequencer.c:2345

3596 +#: sequencer.c:2368

3597 msgid "can't revert as initial commit"

3598 msgstr "impossible d'annuler en tant que commit initial"

3599

3600 +#: sequencer.c:2471

3601 +msgid "make_script: unhandled options"

3602 +msgstr "make_script : options non gérées"

3603 +

3604 +#: sequencer.c:2474

3605 +msgid "make_script: error preparing revisions"

3606 +msgstr "make_script : erreur lors de la préparation des révisions"

3607 +

3608 +#: sequencer.c:2510

3609 +#, c-format

3610 +msgid "unusable todo list: '%s'"

3611 +msgstr "liste à faire inutilisable : '%s'"

3612 +

3613 +#: sequencer.c:2516

3614 +#, c-format

3615 +msgid "unable to open '%s' for writing"

3616 +msgstr "impossible d'ouvrir '%s' en écriture"

3617 +

3618 +#: sequencer.c:2561

3619 +#, c-format

3620 +msgid ""

3621 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3622 +msgstr ""

3623 +"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

3624 +

3625 +#: sequencer.c:2641

3626 +#, c-format

3627 +msgid ""

3628 +"Warning: some commits may have been dropped accidentally.\n"

3629 +"Dropped commits (newer to older):\n"

3630 +msgstr ""

3631 +"Attention : certains commits ont pu être accidentellement supprimés.\n"

3632 +"Commits supprimés (du plus jeune au plus vieux) :\n"

3633 +

3634 +#: sequencer.c:2648

3635 +#, c-format

3636 +msgid ""

3637 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

3638 +"\n"

3639 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

3640 +"warnings.\n"

3641 +"The possible behaviours are: ignore, warn, error.\n"

3642 +"\n"

3643 +msgstr ""

3644 +"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "

3645 +"commit.\n"

3646 +"\n"

3647 +"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "

3648 +"d'avertissements.\n"

3649 +"Les comportements disponibles sont : ignore, warn, error.\n"

3650 +"\n"

3651 +

3652 +#: sequencer.c:2660

3653 +#, c-format

3654 +msgid ""

3655 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

3656 +"continue'.\n"

3657 +"Or you can abort the rebase with 'git rebase --abort'.\n"

3658 +msgstr ""

3659 +"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "

3660 +"rebase --continue'.\n"

3661 +"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

3662 +

3663 +#: sequencer.c:2708

3664 +#, c-format

3665 +msgid "could not parse commit '%s'"

3666 +msgstr "impossible d'analyser le commit '%s'"

3667 +

3668 +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3669 +#: builtin/am.c:775

3670 +#, c-format

3671 +msgid "could not open '%s' for writing"

3672 +msgstr "impossible d'ouvrir '%s' en écriture"

3673 +

3674 +#: sequencer.c:2756

3675 +#, c-format

3676 +msgid "could not truncate '%s'"

3677 +msgstr "impossible de tronquer '%s'"

3678 +

3679 +#: sequencer.c:2848

3680 +msgid "the script was already rearranged."

3681 +msgstr "le script a déjà été réarrangé."

3682 +

3683 +#: sequencer.c:2953

3684 +#, c-format

3685 +msgid "could not finish '%s'"

3686 +msgstr "impossible de finir '%s'"

3687 +

3688 #: setup.c:171

3689 #, c-format

3690 msgid ""

@@ -3592,34 +3717,34 @@ msgstr ""

3717 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3718 "'git <commande> [<révision>...] -- [<chemin>...]'"

3719

3595 -#: setup.c:504

3720 +#: setup.c:499

3721 #, c-format

3722 msgid "Expected git repo version <= %d, found %d"

3723 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

3724

3600 -#: setup.c:512

3725 +#: setup.c:507

3726 msgid "unknown repository extensions found:"

3727 msgstr "extensions de dépôt inconnues trouvées :"

3728

3604 -#: setup.c:810

3729 +#: setup.c:806

3730 #, c-format

3731 msgid "Not a git repository (or any of the parent directories): %s"

3732 msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3733

3609 -#: setup.c:812 builtin/index-pack.c:1652

3734 +#: setup.c:808 builtin/index-pack.c:1653

3735 msgid "Cannot come back to cwd"

3736 msgstr "Impossible de revenir au répertoire de travail courant"

3737

3613 -#: setup.c:1050

3738 +#: setup.c:1046

3739 msgid "Unable to read current working directory"

3740 msgstr "Impossible d'accéder au répertoire de travail courant"

3741

3617 -#: setup.c:1062 setup.c:1068

3742 +#: setup.c:1058 setup.c:1064

3743 #, c-format

3744 msgid "Cannot change to '%s'"

3745 msgstr "Impossible de modifié en '%s'"

3746

3622 -#: setup.c:1081

3747 +#: setup.c:1077

3748 #, c-format

3749 msgid ""

3750 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3630,7 +3755,7 @@ msgstr ""

3755 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

3756 "n'est pas activé)."

3757

3633 -#: setup.c:1173

3758 +#: setup.c:1159

3759 #, c-format

3760 msgid ""

3761 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3640,58 +3765,43 @@ msgstr ""

3765 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

3766 "écriture."

3767

3643 -#: sha1_file.c:560

3768 +#: sha1_file.c:528

3769 #, c-format

3770 msgid "path '%s' does not exist"

3771 msgstr "le chemin '%s' n'existe pas"

3772

3648 -#: sha1_file.c:586

3773 +#: sha1_file.c:554

3774 #, c-format

3775 msgid "reference repository '%s' as a linked checkout is not supported yet."

3776 msgstr ""

3777 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

3778 "encore supporté."

3779

3655 -#: sha1_file.c:592

3780 +#: sha1_file.c:560

3781 #, c-format

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

3783 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

3784

3660 -#: sha1_file.c:598

3785 +#: sha1_file.c:566

3786 #, c-format

3787 msgid "reference repository '%s' is shallow"

3788 msgstr "le dépôt de référence '%s' est superficiel"

3789

3665 -#: sha1_file.c:606

3790 +#: sha1_file.c:574

3791 #, c-format

3792 msgid "reference repository '%s' is grafted"

3793 msgstr "le dépôt de référence '%s' est greffé"

3794

3670 -#: sha1_file.c:1245

3671 -msgid "offset before end of packfile (broken .idx?)"

3672 -msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

3673 -

3674 -#: sha1_file.c:2729

3675 -#, c-format

3676 -msgid "offset before start of pack index for %s (corrupt index?)"

3677 -msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

3678 -

3679 -#: sha1_file.c:2733

3680 -#, c-format

3681 -msgid "offset beyond end of pack index for %s (truncated index?)"

3682 -msgstr ""

3683 -"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

3684 -

3685 -#: sha1_name.c:419

3795 +#: sha1_name.c:420

3796 #, c-format

3797 msgid "short SHA1 %s is ambiguous"

3798 msgstr "le SHA1 court %s est ambigu"

3799

3690 -#: sha1_name.c:430

3800 +#: sha1_name.c:431

3801 msgid "The candidates are:"

3802 msgstr "Les candidats sont :"

3803

3694 -#: sha1_name.c:589

3804 +#: sha1_name.c:590

3805 msgid ""

3806 "Git normally never creates a ref that ends with 40 hex characters\n"

3807 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3716,67 +3826,72 @@ msgstr ""

3826 "message\n"

3827 "en lançant \"git config advice.objectNameWarning false\""

3828

3719 -#: submodule.c:70 submodule.c:104

3829 +#: submodule.c:93 submodule.c:127

3830 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3831 msgstr ""

3832 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

3833 "d'abord"

3834

3725 -#: submodule.c:74 submodule.c:108

3835 +#: submodule.c:97 submodule.c:131

3836 #, c-format

3837 msgid "Could not find section in .gitmodules where path=%s"

3838 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

3839

3730 -#: submodule.c:82

3840 +#: submodule.c:105

3841 #, c-format

3842 msgid "Could not update .gitmodules entry %s"

3843 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

3844

3845 # ici %s est un chemin

3736 -#: submodule.c:115

3846 +#: submodule.c:138

3847 #, c-format

3848 msgid "Could not remove .gitmodules entry for %s"

3849 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

3850

3741 -#: submodule.c:126

3851 +#: submodule.c:149

3852 msgid "staging updated .gitmodules failed"

3853 msgstr "échec de la mise en index du .gitmodules mis à jour"

3854

3745 -#: submodule.c:165

3746 -msgid "negative values not allowed for submodule.fetchJobs"

3747 -msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

3748 -

3749 -#: submodule.c:376

3855 +#: submodule.c:309

3856 #, c-format

3857 msgid "in unpopulated submodule '%s'"

3858 msgstr "dans le sous-module '%s' non populé"

3859

3754 -#: submodule.c:407

3860 +#: submodule.c:340

3861 #, c-format

3862 msgid "Pathspec '%s' is in submodule '%.*s'"

3863 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

3864

3759 -#: submodule.c:1337

3865 +#: submodule.c:799

3866 +#, c-format

3867 +msgid "submodule entry '%s' (%s) is a %s, not a commit"

3868 +msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

3869 +

3870 +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3871 +msgid "Failed to resolve HEAD as a valid ref."

3872 +msgstr "Échec de résolution de HEAD comme référence valide."

3873 +

3874 +#: submodule.c:1304

3875 #, c-format

3876 msgid "'%s' not recognized as a git repository"

3877 msgstr "'%s' n'est pas reconnu comme dépôt git"

3878

3764 -#: submodule.c:1475

3879 +#: submodule.c:1442

3880 #, c-format

3881 msgid "could not start 'git status' in submodule '%s'"

3882 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

3883

3769 -#: submodule.c:1488

3884 +#: submodule.c:1455

3885 #, c-format

3886 msgid "could not run 'git status' in submodule '%s'"

3887 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

3888

3774 -#: submodule.c:1581

3889 +#: submodule.c:1548

3890 #, c-format

3891 msgid "submodule '%s' has dirty index"

3892 msgstr "le sous-module '%s' a un index sale"

3893

3779 -#: submodule.c:1845

3894 +#: submodule.c:1809

3895 #, c-format

3896 msgid ""

3897 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3784,18 +3899,18 @@ msgstr ""

3899 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

3900 "n'est pas supporté"

3901

3787 -#: submodule.c:1857 submodule.c:1913

3902 +#: submodule.c:1821 submodule.c:1877

3903 #, c-format

3904 msgid "could not lookup name for submodule '%s'"

3905 msgstr "impossible de trouve le nom pour le sous-module '%s'"

3906

3792 -#: submodule.c:1861 builtin/submodule--helper.c:678

3793 -#: builtin/submodule--helper.c:688

3907 +#: submodule.c:1825 builtin/submodule--helper.c:671

3908 +#: builtin/submodule--helper.c:681

3909 #, c-format

3910 msgid "could not create directory '%s'"

3911 msgstr "impossible de créer le répertoire '%s'"

3912

3798 -#: submodule.c:1864

3913 +#: submodule.c:1828

3914 #, c-format

3915 msgid ""

3916 "Migrating git directory of '%s%s' from\n"

@@ -3806,94 +3921,98 @@ msgstr ""

3921 "'%s' sur\n"

3922 "'%s'\n"

3923

3809 -#: submodule.c:1948

3924 +#: submodule.c:1912

3925 #, c-format

3926 msgid "could not recurse into submodule '%s'"

3927 msgstr "récursion impossible dans le sous-module '%s'"

3928

3814 -#: submodule.c:1992

3929 +#: submodule.c:1956

3930 msgid "could not start ls-files in .."

3931 msgstr "impossible de démarrer ls-files dans .."

3932

3818 -#: submodule.c:2012

3933 +#: submodule.c:1976

3934 msgid "BUG: returned path string doesn't match cwd?"

3935 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

3936

3822 -#: submodule.c:2031

3937 +#: submodule.c:1995

3938 #, c-format

3939 msgid "ls-tree returned unexpected return code %d"

3940 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

3941

3827 -#: submodule-config.c:420

3942 +#: submodule-config.c:263

3943 +msgid "negative values not allowed for submodule.fetchjobs"

3944 +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

3945 +

3946 +#: submodule-config.c:436

3947 #, c-format

3948 msgid "invalid value for %s"

3949 msgstr "Valeur invalide pour %s"

3950

3832 -#: trailer.c:241

3951 +#: trailer.c:238

3952 #, c-format

3953 msgid "running trailer command '%s' failed"

3954 msgstr "échec de la commande trailer '%s'"

3955

3837 -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3838 -#: trailer.c:544

3956 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553

3957 +#: trailer.c:557

3958 #, c-format

3959 msgid "unknown value '%s' for key '%s'"

3960 msgstr "valeur inconnue '%s' pour la clé '%s'"

3961

3843 -#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3962 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290

3963 #, c-format

3964 msgid "more than one %s"

3965 msgstr "plus d'un %s"

3966

3848 -#: trailer.c:703

3967 +#: trailer.c:730

3968 #, c-format

3969 msgid "empty trailer token in trailer '%.*s'"

3970 msgstr "symbole vide dans la ligne de fin '%.*s'"

3971

3853 -#: trailer.c:723

3972 +#: trailer.c:750

3973 #, c-format

3974 msgid "could not read input file '%s'"

3975 msgstr "impossible de lire le fichier d'entrée '%s'"

3976

3858 -#: trailer.c:726

3977 +#: trailer.c:753

3978 msgid "could not read from stdin"

3979 msgstr "Impossible de lire depuis l'entrée standard"

3980

3862 -#: trailer.c:950 builtin/am.c:45

3981 +#: trailer.c:1008 builtin/am.c:46

3982 #, c-format

3983 msgid "could not stat %s"

3984 msgstr "stat impossible de %s"

3985

3867 -#: trailer.c:952

3986 +#: trailer.c:1010

3987 #, c-format

3988 msgid "file %s is not a regular file"

3989 msgstr "%s n'est pas un fichier régulier"

3990

3872 -#: trailer.c:954

3991 +#: trailer.c:1012

3992 #, c-format

3993 msgid "file %s is not writable by user"

3994 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"

3995

3877 -#: trailer.c:966

3996 +#: trailer.c:1024

3997 msgid "could not open temporary file"

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

3999

3881 -#: trailer.c:1002

4000 +#: trailer.c:1064

4001 #, c-format

4002 msgid "could not rename temporary file to %s"

4003 msgstr "impossible de renommer un fichier temporaire en %s"

4004

3886 -#: transport.c:63

4005 +#: transport.c:62

4006 #, c-format

4007 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4008 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

4009

3891 -#: transport.c:152

4010 +#: transport.c:151

4011 #, c-format

4012 msgid "transport: invalid depth option '%s'"

4013 msgstr "transport : option de profondeur invalide '%s'"

4014

3896 -#: transport.c:890

4015 +#: transport.c:888

4016 #, c-format

4017 msgid ""

4018 "The following submodule paths contain changes that can\n"

@@ -3902,7 +4021,7 @@ msgstr ""

4021 "Les chemins suivant de sous-module contiennent des modifications\n"

4022 "qui ne peuvent être trouvées sur aucun distant :\n"

4023

3905 -#: transport.c:894

4024 +#: transport.c:892

4025 #, c-format

4026 msgid ""

4027 "\n"

@@ -3929,7 +4048,7 @@ msgstr ""

4048 "pour les pousser vers un serveur distant.\n"

4049 "\n"

4050

3932 -#: transport.c:902

4051 +#: transport.c:900

4052 msgid "Aborting."

4053 msgstr "Abandon."

4054

@@ -3950,11 +4069,11 @@ msgstr "mode invalide dans l'entrée d'arbre"

4069 msgid "empty filename in tree entry"

4070 msgstr "nom de fichier vide dans une entrée de l'arbre"

4071

3953 -#: tree-walk.c:113

4072 +#: tree-walk.c:114

4073 msgid "too-short tree file"

4074 msgstr "fichier arbre trop court"

4075

3957 -#: unpack-trees.c:105

4076 +#: unpack-trees.c:106

4077 #, c-format

4078 msgid ""

4079 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3965,7 +4084,7 @@ msgstr ""

4084 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

4085 "branche."

4086

3968 -#: unpack-trees.c:107

4087 +#: unpack-trees.c:108

4088 #, c-format

4089 msgid ""

4090 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3975,7 +4094,7 @@ msgstr ""

4094 "l'extraction :\n"

4095 "%%s"

4096

3978 -#: unpack-trees.c:110

4097 +#: unpack-trees.c:111

4098 #, c-format

4099 msgid ""

4100 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3985,7 +4104,7 @@ msgstr ""

4104 "fusion :\n"

4105 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

4106

3988 -#: unpack-trees.c:112

4107 +#: unpack-trees.c:113

4108 #, c-format

4109 msgid ""

4110 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3995,7 +4114,7 @@ msgstr ""

4114 "fusion :\n"

4115 "%%s"

4116

3998 -#: unpack-trees.c:115

4117 +#: unpack-trees.c:116

4118 #, c-format

4119 msgid ""

4120 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4004,7 +4123,7 @@ msgstr ""

4123 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4124 "%%sVeuillez valider ou remiser vos modifications avant %s."

4125

4007 -#: unpack-trees.c:117

4126 +#: unpack-trees.c:118

4127 #, c-format

4128 msgid ""

4129 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4013,7 +4132,7 @@ msgstr ""

4132 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4133 "%%s"

4134

4016 -#: unpack-trees.c:122

4135 +#: unpack-trees.c:123

4136 #, c-format

4137 msgid ""

4138 "Updating the following directories would lose untracked files in them:\n"

@@ -4023,7 +4142,7 @@ msgstr ""

4142 "contenus :\n"

4143 "%s"

4144

4026 -#: unpack-trees.c:126

4145 +#: unpack-trees.c:127

4146 #, c-format

4147 msgid ""

4148 "The following untracked working tree files would be removed by checkout:\n"

@@ -4033,7 +4152,7 @@ msgstr ""

4152 "l'extraction :\n"

4153 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4154

4036 -#: unpack-trees.c:128

4155 +#: unpack-trees.c:129

4156 #, c-format

4157 msgid ""

4158 "The following untracked working tree files would be removed by checkout:\n"

@@ -4042,7 +4161,7 @@ msgstr ""

4161 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

4162 "%%s"

4163

4045 -#: unpack-trees.c:131

4164 +#: unpack-trees.c:132

4165 #, c-format

4166 msgid ""

4167 "The following untracked working tree files would be removed by merge:\n"

@@ -4052,7 +4171,7 @@ msgstr ""

4171 "la fusion :\n"

4172 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4173

4055 -#: unpack-trees.c:133

4174 +#: unpack-trees.c:134

4175 #, c-format

4176 msgid ""

4177 "The following untracked working tree files would be removed by merge:\n"

@@ -4061,7 +4180,7 @@ msgstr ""

4180 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

4181 "%%s"

4182

4064 -#: unpack-trees.c:136

4183 +#: unpack-trees.c:137

4184 #, c-format

4185 msgid ""

4186 "The following untracked working tree files would be removed by %s:\n"

@@ -4071,7 +4190,7 @@ msgstr ""

4190 "%s :\n"

4191 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4192

4074 -#: unpack-trees.c:138

4193 +#: unpack-trees.c:139

4194 #, c-format

4195 msgid ""

4196 "The following untracked working tree files would be removed by %s:\n"

@@ -4080,7 +4199,7 @@ msgstr ""

4199 "Les fichiers suivants non suivis seraient effacés par %s :\n"

4200 "%%s"

4201

4083 -#: unpack-trees.c:143

4202 +#: unpack-trees.c:144

4203 #, c-format

4204 msgid ""

4205 "The following untracked working tree files would be overwritten by "

@@ -4091,7 +4210,7 @@ msgstr ""

4210 "l'extraction :\n"

4211 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4212

4094 -#: unpack-trees.c:145

4213 +#: unpack-trees.c:146

4214 #, c-format

4215 msgid ""

4216 "The following untracked working tree files would be overwritten by "

@@ -4101,7 +4220,7 @@ msgstr ""

4220 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

4221 "%%s"

4222

4104 -#: unpack-trees.c:148

4223 +#: unpack-trees.c:149

4224 #, c-format

4225 msgid ""

4226 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4111,7 +4230,7 @@ msgstr ""

4230 "la fusion :\n"

4231 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4232

4114 -#: unpack-trees.c:150

4233 +#: unpack-trees.c:151

4234 #, c-format

4235 msgid ""

4236 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4120,7 +4239,7 @@ msgstr ""

4239 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

4240 "%%s"

4241

4123 -#: unpack-trees.c:153

4242 +#: unpack-trees.c:154

4243 #, c-format

4244 msgid ""

4245 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4130,7 +4249,7 @@ msgstr ""

4249 "%s :\n"

4250 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4251

4133 -#: unpack-trees.c:155

4252 +#: unpack-trees.c:156

4253 #, c-format

4254 msgid ""

4255 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4139,22 +4258,22 @@ msgstr ""

4258 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

4259 "%%s"

4260

4142 -#: unpack-trees.c:162

4261 +#: unpack-trees.c:163

4262 #, c-format

4263 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4264 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

4265

4147 -#: unpack-trees.c:165

4266 +#: unpack-trees.c:166

4267 #, c-format

4268 msgid ""

4150 -"Cannot update sparse checkout: the following entries are not up-to-date:\n"

4269 +"Cannot update sparse checkout: the following entries are not up to date:\n"

4270 "%s"

4271 msgstr ""

4272 "Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "

4273 "pas à jour :\n"

4274 "%s"

4275

4157 -#: unpack-trees.c:167

4276 +#: unpack-trees.c:168

4277 #, c-format

4278 msgid ""

4279 "The following working tree files would be overwritten by sparse checkout "

@@ -4165,7 +4284,7 @@ msgstr ""

4284 "jour par l'extraction creuse :\n"

4285 "%s"

4286

4168 -#: unpack-trees.c:169

4287 +#: unpack-trees.c:170

4288 #, c-format

4289 msgid ""

4290 "The following working tree files would be removed by sparse checkout "

@@ -4176,7 +4295,7 @@ msgstr ""

4295 "à jour par extraction creuse :\n"

4296 "%s"

4297

4179 -#: unpack-trees.c:171

4298 +#: unpack-trees.c:172

4299 #, c-format

4300 msgid ""

4301 "Cannot update submodule:\n"

@@ -4185,19 +4304,12 @@ msgstr ""

4304 "Mise à jour impossible pour le sous-module :\n"

4305 "%s"

4306

4188 -#: unpack-trees.c:248

4307 +#: unpack-trees.c:249

4308 #, c-format

4309 msgid "Aborting\n"

4310 msgstr "Abandon\n"

4311

4193 -#: unpack-trees.c:277

4194 -#, c-format

4195 -msgid "submodule update strategy not supported for submodule '%s'"

4196 -msgstr ""

4197 -"stratégie de mise à jour de sous-module non supportée pour le sous-module "

4198 -"'%s'"

4199 -

4200 -#: unpack-trees.c:346

4312 +#: unpack-trees.c:331

4313 msgid "Checking out files"

4314 msgstr "Extraction des fichiers"

4315

@@ -4240,13 +4352,8 @@ msgstr "échec de la lecture de '%s'"

4352 msgid "could not open '%s' for reading and writing"

4353 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4354

4243 -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

4244 -#, c-format

4245 -msgid "could not open '%s' for writing"

4246 -msgstr "impossible d'ouvrir '%s' en écriture"

4247 -

4248 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

4249 -#: builtin/am.c:849 builtin/merge.c:1014

4355 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4356 +#: builtin/am.c:858 builtin/merge.c:1041

4357 #, c-format

4358 msgid "could not open '%s' for reading"

4359 msgstr "impossible d'ouvrir '%s' en lecture"

@@ -4270,202 +4377,202 @@ msgstr "Impossible d'écrire dans %s"

4377 msgid "could not close %s"

4378 msgstr "impossible de fermer %s"

4379

4273 -#: wt-status.c:152

4380 +#: wt-status.c:150

4381 msgid "Unmerged paths:"

4382 msgstr "Chemins non fusionnés :"

4383

4277 -#: wt-status.c:179 wt-status.c:206

4384 +#: wt-status.c:177 wt-status.c:204

4385 #, c-format

4386 msgid " (use \"git reset %s <file>...\" to unstage)"

4387 msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"

4388

4282 -#: wt-status.c:181 wt-status.c:208

4389 +#: wt-status.c:179 wt-status.c:206

4390 msgid " (use \"git rm --cached <file>...\" to unstage)"

4391 msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"

4392

4286 -#: wt-status.c:185

4393 +#: wt-status.c:183

4394 msgid " (use \"git add <file>...\" to mark resolution)"

4395 msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"

4396

4290 -#: wt-status.c:187 wt-status.c:191

4397 +#: wt-status.c:185 wt-status.c:189

4398 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4399 msgstr ""

4400 " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "

4401 "résolu)"

4402

4296 -#: wt-status.c:189

4403 +#: wt-status.c:187

4404 msgid " (use \"git rm <file>...\" to mark resolution)"

4405 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

4406

4300 -#: wt-status.c:200 wt-status.c:981

4407 +#: wt-status.c:198 wt-status.c:979

4408 msgid "Changes to be committed:"

4409 msgstr "Modifications qui seront validées :"

4410

4304 -#: wt-status.c:218 wt-status.c:990

4411 +#: wt-status.c:216 wt-status.c:988

4412 msgid "Changes not staged for commit:"

4413 msgstr "Modifications qui ne seront pas validées :"

4414

4308 -#: wt-status.c:222

4415 +#: wt-status.c:220

4416 msgid " (use \"git add <file>...\" to update what will be committed)"

4417 msgstr ""

4418 " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"

4419

4313 -#: wt-status.c:224

4420 +#: wt-status.c:222

4421 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4422 msgstr ""

4423 " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "

4424 "validé)"

4425

4319 -#: wt-status.c:225

4426 +#: wt-status.c:223

4427 msgid ""

4428 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4429 msgstr ""

4430 " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "

4431 "dans la copie de travail)"

4432

4326 -#: wt-status.c:227

4433 +#: wt-status.c:225

4434 msgid " (commit or discard the untracked or modified content in submodules)"

4435 msgstr ""

4436 " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"

4437

4331 -#: wt-status.c:239

4438 +#: wt-status.c:237

4439 #, c-format

4440 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4441 msgstr ""

4442 " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"

4443

4337 -#: wt-status.c:254

4444 +#: wt-status.c:252

4445 msgid "both deleted:"

4446 msgstr "supprimé des deux côtés :"

4447

4341 -#: wt-status.c:256

4448 +#: wt-status.c:254

4449 msgid "added by us:"

4450 msgstr "ajouté par nous :"

4451

4345 -#: wt-status.c:258

4452 +#: wt-status.c:256

4453 msgid "deleted by them:"

4454 msgstr "supprimé par eux :"

4455

4349 -#: wt-status.c:260

4456 +#: wt-status.c:258

4457 msgid "added by them:"

4458 msgstr "ajouté par eux :"

4459

4353 -#: wt-status.c:262

4460 +#: wt-status.c:260

4461 msgid "deleted by us:"

4462 msgstr "supprimé par nous :"

4463

4357 -#: wt-status.c:264

4464 +#: wt-status.c:262

4465 msgid "both added:"

4466 msgstr "ajouté de deux côtés :"

4467

4361 -#: wt-status.c:266

4468 +#: wt-status.c:264

4469 msgid "both modified:"

4470 msgstr "modifié des deux côtés :"

4471

4365 -#: wt-status.c:276

4472 +#: wt-status.c:274

4473 msgid "new file:"

4474 msgstr "nouveau fichier :"

4475

4369 -#: wt-status.c:278

4476 +#: wt-status.c:276

4477 msgid "copied:"

4478 msgstr "copié :"

4479

4373 -#: wt-status.c:280

4480 +#: wt-status.c:278

4481 msgid "deleted:"

4482 msgstr "supprimé :"

4483

4377 -#: wt-status.c:282

4484 +#: wt-status.c:280

4485 msgid "modified:"

4486 msgstr "modifié :"

4487

4381 -#: wt-status.c:284

4488 +#: wt-status.c:282

4489 msgid "renamed:"

4490 msgstr "renommé :"

4491

4385 -#: wt-status.c:286

4492 +#: wt-status.c:284

4493 msgid "typechange:"

4494 msgstr "modif. type :"

4495

4389 -#: wt-status.c:288

4496 +#: wt-status.c:286

4497 msgid "unknown:"

4498 msgstr "inconnu :"

4499

4393 -#: wt-status.c:290

4500 +#: wt-status.c:288

4501 msgid "unmerged:"

4502 msgstr "non fusionné :"

4503

4397 -#: wt-status.c:372

4504 +#: wt-status.c:370

4505 msgid "new commits, "

4506 msgstr "nouveaux commits, "

4507

4401 -#: wt-status.c:374

4508 +#: wt-status.c:372

4509 msgid "modified content, "

4510 msgstr "contenu modifié, "

4511

4405 -#: wt-status.c:376

4512 +#: wt-status.c:374

4513 msgid "untracked content, "

4514 msgstr "contenu non suivi, "

4515

4409 -#: wt-status.c:821

4516 +#: wt-status.c:819

4517 #, c-format

4518 msgid "Your stash currently has %d entry"

4519 msgid_plural "Your stash currently has %d entries"

4520 msgstr[0] "Votre remisage contient actuellement %d entrée"

4521 msgstr[1] "Votre remisage contient actuellement %d entrées"

4522

4416 -#: wt-status.c:853

4523 +#: wt-status.c:851

4524 msgid "Submodules changed but not updated:"

4525 msgstr "Sous-modules modifiés mais non mis à jour :"

4526

4420 -#: wt-status.c:855

4527 +#: wt-status.c:853

4528 msgid "Submodule changes to be committed:"

4529 msgstr "Changements du sous-module à valider :"

4530

4424 -#: wt-status.c:937

4531 +#: wt-status.c:935

4532 msgid ""

4426 -"Do not touch the line above.\n"

4427 -"Everything below will be removed."

4533 +"Do not modify or remove the line above.\n"

4534 +"Everything below it will be ignored."

4535 msgstr ""

4429 -"Ne touchez pas à la ligne ci-dessus\n"

4536 +"Ne touchez pas à la ligne ci-dessus.\n"

4537 "Tout ce qui suit sera éliminé."

4538

4432 -#: wt-status.c:1049

4539 +#: wt-status.c:1048

4540 msgid "You have unmerged paths."

4541 msgstr "Vous avez des chemins non fusionnés."

4542

4436 -#: wt-status.c:1052

4543 +#: wt-status.c:1051

4544 msgid " (fix conflicts and run \"git commit\")"

4545 msgstr " (réglez les conflits puis lancez \"git commit\")"

4546

4440 -#: wt-status.c:1054

4547 +#: wt-status.c:1053

4548 msgid " (use \"git merge --abort\" to abort the merge)"

4549 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

4550

4444 -#: wt-status.c:1059

4551 +#: wt-status.c:1058

4552 msgid "All conflicts fixed but you are still merging."

4553 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

4554

4448 -#: wt-status.c:1062

4555 +#: wt-status.c:1061

4556 msgid " (use \"git commit\" to conclude merge)"

4557 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

4558

4452 -#: wt-status.c:1072

4559 +#: wt-status.c:1071

4560 msgid "You are in the middle of an am session."

4561 msgstr "Vous êtes au milieu d'une session am."

4562

4456 -#: wt-status.c:1075

4563 +#: wt-status.c:1074

4564 msgid "The current patch is empty."

4565 msgstr "Le patch actuel est vide."

4566

4460 -#: wt-status.c:1079

4567 +#: wt-status.c:1078

4568 msgid " (fix conflicts and then run \"git am --continue\")"

4569 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

4570

4464 -#: wt-status.c:1081

4571 +#: wt-status.c:1080

4572 msgid " (use \"git am --skip\" to skip this patch)"

4573 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

4574

4468 -#: wt-status.c:1083

4575 +#: wt-status.c:1082

4576 msgid " (use \"git am --abort\" to restore the original branch)"

4577 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

4578

@@ -4735,7 +4842,7 @@ msgstr "rien à valider, la copie de travail est propre\n"

4842

4843 #: wt-status.c:1780

4844 msgid "No commits yet on "

4738 -msgstr "Encore aucun commit sur "

4845 +msgstr "Encore aucun commit sur "

4846

4847 #: wt-status.c:1784

4848 msgid "HEAD (no branch)"

@@ -4764,7 +4871,7 @@ msgstr "de plus, votre index contient des modifications non validées."

4871 msgid "cannot %s: Your index contains uncommitted changes."

4872 msgstr "%s impossible : votre index contient des modifications non validées."

4873

4767 -#: compat/precompose_utf8.c:58 builtin/clone.c:436

4874 +#: compat/precompose_utf8.c:58 builtin/clone.c:437

4875 #, c-format

4876 msgid "failed to unlink '%s'"

4877 msgstr "échec lors de l'unlink de '%s'"

@@ -4778,7 +4885,7 @@ msgstr "git add [<options>] [--] <chemin>..."

4885 msgid "unexpected diff status %c"

4886 msgstr "état de diff inattendu %c"

4887

4781 -#: builtin/add.c:87 builtin/commit.c:292

4888 +#: builtin/add.c:87 builtin/commit.c:291

4889 msgid "updating files failed"

4890 msgstr "échec de la mise à jour des fichiers"

4891

@@ -4787,112 +4894,112 @@ msgstr "échec de la mise à jour des fichiers"

4894 msgid "remove '%s'\n"

4895 msgstr "suppression de '%s'\n"

4896

4790 -#: builtin/add.c:151

4897 +#: builtin/add.c:153

4898 msgid "Unstaged changes after refreshing the index:"

4899 msgstr "Modifications non indexées après rafraîchissement de l'index :"

4900

4794 -#: builtin/add.c:211 builtin/rev-parse.c:873

4901 +#: builtin/add.c:213 builtin/rev-parse.c:888

4902 msgid "Could not read the index"

4903 msgstr "Impossible de lire l'index"

4904

4798 -#: builtin/add.c:222

4905 +#: builtin/add.c:224

4906 #, c-format

4907 msgid "Could not open '%s' for writing."

4908 msgstr "Impossible d'ouvrir '%s' en écriture."

4909

4803 -#: builtin/add.c:226

4910 +#: builtin/add.c:228

4911 msgid "Could not write patch"

4912 msgstr "Impossible d'écrire le patch"

4913

4807 -#: builtin/add.c:229

4914 +#: builtin/add.c:231

4915 msgid "editing patch failed"

4916 msgstr "échec de l'édition du patch"

4917

4811 -#: builtin/add.c:232

4918 +#: builtin/add.c:234

4919 #, c-format

4920 msgid "Could not stat '%s'"

4921 msgstr "Stat de '%s' impossible"

4922

4816 -#: builtin/add.c:234

4923 +#: builtin/add.c:236

4924 msgid "Empty patch. Aborted."

4925 msgstr "Patch vide. Abandon."

4926

4820 -#: builtin/add.c:239

4927 +#: builtin/add.c:241

4928 #, c-format

4929 msgid "Could not apply '%s'"

4930 msgstr "Impossible d'appliquer '%s'"

4931

4825 -#: builtin/add.c:249

4932 +#: builtin/add.c:251

4933 msgid "The following paths are ignored by one of your .gitignore files:\n"

4934 msgstr ""

4935 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

4936

4830 -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124

4937 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4938 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4832 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164

4939 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4940 msgid "dry run"

4941 msgstr "simuler l'action"

4942

4836 -#: builtin/add.c:272

4943 +#: builtin/add.c:274

4944 msgid "interactive picking"

4945 msgstr "sélection interactive"

4946

4840 -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299

4947 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4948 msgid "select hunks interactively"

4949 msgstr "sélection interactive des sections"

4950

4844 -#: builtin/add.c:274

4951 +#: builtin/add.c:276

4952 msgid "edit current diff and apply"

4953 msgstr "édition du diff actuel et application"

4954

4848 -#: builtin/add.c:275

4955 +#: builtin/add.c:277

4956 msgid "allow adding otherwise ignored files"

4957 msgstr "permettre l'ajout de fichiers ignorés"

4958

4852 -#: builtin/add.c:276

4959 +#: builtin/add.c:278

4960 msgid "update tracked files"

4961 msgstr "mettre à jour les fichiers suivis"

4962

4856 -#: builtin/add.c:277

4963 +#: builtin/add.c:279

4964 msgid "record only the fact that the path will be added later"

4965 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"

4966

4860 -#: builtin/add.c:278

4967 +#: builtin/add.c:280

4968 msgid "add changes from all tracked and untracked files"

4969 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"

4970

4864 -#: builtin/add.c:281

4971 +#: builtin/add.c:283

4972 msgid "ignore paths removed in the working tree (same as --no-all)"

4973 msgstr ""

4974 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"

4975

4869 -#: builtin/add.c:283

4976 +#: builtin/add.c:285

4977 msgid "don't add, only refresh the index"

4978 msgstr "ne pas ajouter, juste rafraîchir l'index"

4979

4873 -#: builtin/add.c:284

4980 +#: builtin/add.c:286

4981 msgid "just skip files which cannot be added because of errors"

4982 msgstr ""

4983 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "

4984 "d'erreurs"

4985

4879 -#: builtin/add.c:285

4986 +#: builtin/add.c:287

4987 msgid "check if - even missing - files are ignored in dry run"

4988 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

4989

4883 -#: builtin/add.c:286 builtin/update-index.c:952

4990 +#: builtin/add.c:288 builtin/update-index.c:954

4991 msgid "(+/-)x"

4992 msgstr "(+/-)x"

4993

4887 -#: builtin/add.c:286 builtin/update-index.c:953

4994 +#: builtin/add.c:288 builtin/update-index.c:955

4995 msgid "override the executable bit of the listed files"

4996 msgstr "outrepasser le bit exécutable pour les fichiers listés"

4997

4891 -#: builtin/add.c:288

4998 +#: builtin/add.c:290

4999 msgid "warn when adding an embedded repository"

5000 msgstr "avertir lors de l'ajout d'un dépôt embarqué"

5001

4895 -#: builtin/add.c:303

5002 +#: builtin/add.c:305

5003 #, c-format

5004 msgid ""

5005 "You've added another git repository inside your current repository.\n"

@@ -4923,155 +5030,155 @@ msgstr ""

5030 "\n"

5031 "Référez-vous à \"git help submodule\" pour plus d'information."

5032

4926 -#: builtin/add.c:331

5033 +#: builtin/add.c:333

5034 #, c-format

5035 msgid "adding embedded git repository: %s"

5036 msgstr "dépôt git embarqué ajouté : %s"

5037

4931 -#: builtin/add.c:349

5038 +#: builtin/add.c:351

5039 #, c-format

5040 msgid "Use -f if you really want to add them.\n"

5041 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"

5042

4936 -#: builtin/add.c:357

5043 +#: builtin/add.c:359

5044 msgid "adding files failed"

5045 msgstr "échec de l'ajout de fichiers"

5046

4940 -#: builtin/add.c:394

5047 +#: builtin/add.c:396

5048 msgid "-A and -u are mutually incompatible"

5049 msgstr "-A et -u sont mutuellement incompatibles"

5050

4944 -#: builtin/add.c:401

5051 +#: builtin/add.c:403

5052 msgid "Option --ignore-missing can only be used together with --dry-run"

5053 msgstr ""

5054 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

5055

4949 -#: builtin/add.c:405

5056 +#: builtin/add.c:407

5057 #, c-format

5058 msgid "--chmod param '%s' must be either -x or +x"

5059 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

5060

4954 -#: builtin/add.c:420

5061 +#: builtin/add.c:422

5062 #, c-format

5063 msgid "Nothing specified, nothing added.\n"

5064 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

5065

4959 -#: builtin/add.c:421

5066 +#: builtin/add.c:423

5067 #, c-format

5068 msgid "Maybe you wanted to say 'git add .'?\n"

5069 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

5070

4964 -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282

4965 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351

4966 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272

4967 -#: builtin/submodule--helper.c:244

5071 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

5072 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

5073 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

5074 +#: builtin/submodule--helper.c:243

5075 msgid "index file corrupt"

5076 msgstr "fichier d'index corrompu"

5077

4971 -#: builtin/am.c:413

5078 +#: builtin/am.c:414

5079 msgid "could not parse author script"

5080 msgstr "impossible d'analyser le script author"

5081

4975 -#: builtin/am.c:489

5082 +#: builtin/am.c:498

5083 #, c-format

5084 msgid "'%s' was deleted by the applypatch-msg hook"

5085 msgstr "'%s' a été effacé par le crochet applypatch-msg"

5086

4980 -#: builtin/am.c:530

5087 +#: builtin/am.c:539

5088 #, c-format

5089 msgid "Malformed input line: '%s'."

5090 msgstr "Ligne en entrée malformée : '%s'."

5091

4985 -#: builtin/am.c:567

5092 +#: builtin/am.c:576

5093 #, c-format

5094 msgid "Failed to copy notes from '%s' to '%s'"

5095 msgstr "Impossible de copier les notes de '%s' vers '%s'"

5096

4990 -#: builtin/am.c:593

5097 +#: builtin/am.c:602

5098 msgid "fseek failed"

5099 msgstr "échec de fseek"

5100

4994 -#: builtin/am.c:777

5101 +#: builtin/am.c:786

5102 #, c-format

5103 msgid "could not parse patch '%s'"

5104 msgstr "impossible d'analyser le patch '%s'"

5105

4999 -#: builtin/am.c:842

5106 +#: builtin/am.c:851

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

5108 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

5109

5003 -#: builtin/am.c:889

5110 +#: builtin/am.c:899

5111 msgid "invalid timestamp"

5112 msgstr "horodatage invalide"

5113

5007 -#: builtin/am.c:892 builtin/am.c:900

5114 +#: builtin/am.c:904 builtin/am.c:916

5115 msgid "invalid Date line"

5116 msgstr "ligne de Date invalide"

5117

5011 -#: builtin/am.c:897

5118 +#: builtin/am.c:911

5119 msgid "invalid timezone offset"

5120 msgstr "décalage horaire invalide"

5121

5015 -#: builtin/am.c:986

5122 +#: builtin/am.c:1004

5123 msgid "Patch format detection failed."

5124 msgstr "Échec de détection du format du patch."

5125

5019 -#: builtin/am.c:991 builtin/clone.c:401

5126 +#: builtin/am.c:1009 builtin/clone.c:402

5127 #, c-format

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

5129 msgstr "échec de la création du répertoire '%s'"

5130

5024 -#: builtin/am.c:995

5131 +#: builtin/am.c:1013

5132 msgid "Failed to split patches."

5133 msgstr "Échec de découpage des patchs."

5134

5028 -#: builtin/am.c:1120 builtin/commit.c:377

5135 +#: builtin/am.c:1142 builtin/commit.c:376

5136 msgid "unable to write index file"

5137 msgstr "impossible d'écrire le fichier d'index"

5138

5032 -#: builtin/am.c:1171

5139 +#: builtin/am.c:1193

5140 #, c-format

5141 msgid "When you have resolved this problem, run \"%s --continue\"."

5142 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

5143

5037 -#: builtin/am.c:1172

5144 +#: builtin/am.c:1194

5145 #, c-format

5146 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5147 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

5148

5042 -#: builtin/am.c:1173

5149 +#: builtin/am.c:1195

5150 #, c-format

5151 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5152 msgstr ""

5153 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

5154 "abort\"."

5155

5049 -#: builtin/am.c:1304

5156 +#: builtin/am.c:1302

5157 msgid "Patch is empty."

5158 msgstr "Le patch actuel est vide."

5159

5053 -#: builtin/am.c:1370

5160 +#: builtin/am.c:1368

5161 #, c-format

5162 msgid "invalid ident line: %.*s"

5163 msgstr "ligne d'identification invalide : %.*s"

5164

5058 -#: builtin/am.c:1392

5165 +#: builtin/am.c:1390

5166 #, c-format

5167 msgid "unable to parse commit %s"

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

5169

5063 -#: builtin/am.c:1586

5170 +#: builtin/am.c:1584

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

5172 msgstr ""

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

5174 "points."

5175

5069 -#: builtin/am.c:1588

5176 +#: builtin/am.c:1586

5177 msgid "Using index info to reconstruct a base tree..."

5178 msgstr ""

5179 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

5180

5074 -#: builtin/am.c:1607

5181 +#: builtin/am.c:1605

5182 msgid ""

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

5184 "It does not apply to blobs recorded in its index."

@@ -5079,38 +5186,38 @@ msgstr ""

5186 "Avez-vous édité le patch à la main ?\n"

5187 "Il ne s'applique pas aux blobs enregistrés dans son index."

5188

5082 -#: builtin/am.c:1613

5189 +#: builtin/am.c:1611

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

5191 msgstr "Retour à un patch de la base et fusion à 3 points..."

5192

5086 -#: builtin/am.c:1638

5193 +#: builtin/am.c:1636

5194 msgid "Failed to merge in the changes."

5195 msgstr "Échec d'intégration des modifications."

5196

5090 -#: builtin/am.c:1662 builtin/merge.c:632

5197 +#: builtin/am.c:1660 builtin/merge.c:641

5198 msgid "git write-tree failed to write a tree"

5199 msgstr "git write-tree a échoué à écrire un arbre"

5200

5094 -#: builtin/am.c:1669

5201 +#: builtin/am.c:1667

5202 msgid "applying to an empty history"

5203 msgstr "application à un historique vide"

5204

5098 -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803

5099 -#: builtin/merge.c:828

5205 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5206 +#: builtin/merge.c:849

5207 msgid "failed to write commit object"

5208 msgstr "échec de l'écriture de l'objet commit"

5209

5103 -#: builtin/am.c:1715 builtin/am.c:1719

5210 +#: builtin/am.c:1713 builtin/am.c:1717

5211 #, c-format

5212 msgid "cannot resume: %s does not exist."

5213 msgstr "impossible de continuer : %s n'existe pas."

5214

5108 -#: builtin/am.c:1735

5215 +#: builtin/am.c:1733

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

5217 msgstr ""

5218 "impossible d'être interactif sans entrée standard connectée à un terminal."

5219

5113 -#: builtin/am.c:1740

5220 +#: builtin/am.c:1738

5221 msgid "Commit Body is:"

5222 msgstr "Le corps de la validation est :"

5223

@@ -5118,35 +5225,35 @@ msgstr "Le corps de la validation est :"

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

5226 #. input at this point.

5227 #.

5121 -#: builtin/am.c:1750

5228 +#: builtin/am.c:1748

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

5230 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

5231

5125 -#: builtin/am.c:1800

5232 +#: builtin/am.c:1798

5233 #, c-format

5234 msgid "Dirty index: cannot apply patches (dirty: %s)"

5235 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

5236

5130 -#: builtin/am.c:1840 builtin/am.c:1912

5237 +#: builtin/am.c:1838 builtin/am.c:1910

5238 #, c-format

5239 msgid "Applying: %.*s"

5240 msgstr "Application de %.*s"

5241

5135 -#: builtin/am.c:1856

5242 +#: builtin/am.c:1854

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

5244 msgstr "Pas de changement -- Patch déjà appliqué."

5245

5139 -#: builtin/am.c:1864

5246 +#: builtin/am.c:1862

5247 #, c-format

5248 msgid "Patch failed at %s %.*s"

5249 msgstr "le patch a échoué à %s %.*s"

5250

5144 -#: builtin/am.c:1870

5251 +#: builtin/am.c:1868

5252 #, c-format

5253 msgid "The copy of the patch that failed is found in: %s"

5254 msgstr "La copie du patch qui a échoué se trouve dans : %s"

5255

5149 -#: builtin/am.c:1915

5256 +#: builtin/am.c:1913

5257 msgid ""

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

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

@@ -5157,7 +5264,7 @@ msgstr ""

5264 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

5265 "patch."

5266

5160 -#: builtin/am.c:1922

5267 +#: builtin/am.c:1920

5268 msgid ""

5269 "You still have unmerged paths in your index.\n"

5270 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5170,17 +5277,17 @@ msgstr ""

5277 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "

5278 "accepter son état."

5279

5173 -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323

5174 -#: builtin/reset.c:331

5280 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5281 +#: builtin/reset.c:340

5282 #, c-format

5283 msgid "Could not parse object '%s'."

5284 msgstr "Impossible d'analyser l'objet '%s'."

5285

5179 -#: builtin/am.c:2083

5286 +#: builtin/am.c:2081

5287 msgid "failed to clean index"

5288 msgstr "échec du nettoyage de l'index"

5289

5183 -#: builtin/am.c:2117

5290 +#: builtin/am.c:2116

5291 msgid ""

5292 "You seem to have moved HEAD since the last 'am' failure.\n"

5293 "Not rewinding to ORIG_HEAD"

@@ -5188,136 +5295,135 @@ msgstr ""

5295 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

5296 "Pas de retour à ORIG_HEAD"

5297

5191 -#: builtin/am.c:2180

5298 +#: builtin/am.c:2179

5299 #, c-format

5300 msgid "Invalid value for --patch-format: %s"

5301 msgstr "Valeur invalide pour --patch-format : %s"

5302

5196 -#: builtin/am.c:2213

5303 +#: builtin/am.c:2212

5304 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5305 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"

5306

5200 -#: builtin/am.c:2214

5307 +#: builtin/am.c:2213

5308 msgid "git am [<options>] (--continue | --skip | --abort)"

5309 msgstr "git am [<options>] (--continue | --quit | --abort)"

5310

5204 -#: builtin/am.c:2220

5311 +#: builtin/am.c:2219

5312 msgid "run interactively"

5313 msgstr "exécution interactive"

5314

5208 -#: builtin/am.c:2222

5315 +#: builtin/am.c:2221

5316 msgid "historical option -- no-op"

5317 msgstr "option historique -- no-op"

5318

5212 -#: builtin/am.c:2224

5319 +#: builtin/am.c:2223

5320 msgid "allow fall back on 3way merging if needed"

5321 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

5322

5216 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5323 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5324 #: builtin/repack.c:180

5325 msgid "be quiet"

5326 msgstr "être silencieux"

5327

5221 -#: builtin/am.c:2227

5328 +#: builtin/am.c:2226

5329 msgid "add a Signed-off-by line to the commit message"

5330 msgstr "ajouter une ligne Signed-off-by au message de validation"

5331

5225 -#: builtin/am.c:2230

5332 +#: builtin/am.c:2229

5333 msgid "recode into utf8 (default)"

5334 msgstr "recoder en utf-8 (par défaut)"

5335

5229 -#: builtin/am.c:2232

5336 +#: builtin/am.c:2231

5337 msgid "pass -k flag to git-mailinfo"

5338 msgstr "passer l'option -k à git-mailinfo"

5339

5233 -#: builtin/am.c:2234

5340 +#: builtin/am.c:2233

5341 msgid "pass -b flag to git-mailinfo"

5342 msgstr "passer l'option -b à git-mailinfo"

5343

5237 -#: builtin/am.c:2236

5344 +#: builtin/am.c:2235

5345 msgid "pass -m flag to git-mailinfo"

5346 msgstr "passer l'option -m à git-mailinfo"

5347

5241 -#: builtin/am.c:2238

5348 +#: builtin/am.c:2237

5349 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5350 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

5351

5245 -#: builtin/am.c:2241

5352 +#: builtin/am.c:2240

5353 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5354 msgstr ""

5355 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

5356

5250 -#: builtin/am.c:2244

5357 +#: builtin/am.c:2243

5358 msgid "strip everything before a scissors line"

5359 msgstr "retirer tout le contenu avant la ligne des ciseaux"

5360

5254 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5256 -#: builtin/am.c:2273

5361 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5362 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5363 +#: builtin/am.c:2272

5364 msgid "pass it through git-apply"

5365 msgstr "le passer jusqu'à git-apply"

5366

5260 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666

5261 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142

5262 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193

5263 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169

5264 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134

5265 -#: parse-options.h:245

5367 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5368 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5369 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5370 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5371 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5372 msgid "n"

5373 msgstr "n"

5374

5269 -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38

5270 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39

5375 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5376 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5377 msgid "format"

5378 msgstr "format"

5379

5274 -#: builtin/am.c:2270

5380 +#: builtin/am.c:2269

5381 msgid "format the patch(es) are in"

5382 msgstr "format de présentation des patchs"

5383

5278 -#: builtin/am.c:2276

5384 +#: builtin/am.c:2275

5385 msgid "override error message when patch failure occurs"

5386 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

5387

5282 -#: builtin/am.c:2278

5388 +#: builtin/am.c:2277

5389 msgid "continue applying patches after resolving a conflict"

5390 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

5391

5286 -#: builtin/am.c:2281

5392 +#: builtin/am.c:2280

5393 msgid "synonyms for --continue"

5394 msgstr "synonymes de --continue"

5395

5290 -#: builtin/am.c:2284

5396 +#: builtin/am.c:2283

5397 msgid "skip the current patch"

5398 msgstr "sauter le patch courant"

5399

5294 -#: builtin/am.c:2287

5400 +#: builtin/am.c:2286

5401 msgid "restore the original branch and abort the patching operation."

5402 msgstr ""

5403 "restaurer la branche originale et abandonner les applications de patch."

5404

5299 -#: builtin/am.c:2291

5405 +#: builtin/am.c:2290

5406 msgid "lie about committer date"

5407 msgstr "mentir sur la date de validation"

5408

5303 -#: builtin/am.c:2293

5409 +#: builtin/am.c:2292

5410 msgid "use current timestamp for author date"

5411 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

5412

5307 -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233

5308 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414

5413 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5414 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5415 msgid "key-id"

5416 msgstr "id-clé"

5417

5312 -#: builtin/am.c:2296

5418 +#: builtin/am.c:2295

5419 msgid "GPG-sign commits"

5420 msgstr "signer les commits avec GPG"

5421

5316 -#: builtin/am.c:2299

5422 +#: builtin/am.c:2298

5423 msgid "(internal use for git-rebase)"

5424 msgstr "(utilisation interne pour git-rebase)"

5425

5320 -#: builtin/am.c:2317

5426 +#: builtin/am.c:2316

5427 msgid ""

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

5429 "it will be removed. Please do not use it anymore."

@@ -5325,17 +5431,17 @@ msgstr ""

5431 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

5432 "et elle sera supprimée. Veuillez ne plus l'utiliser."

5433

5328 -#: builtin/am.c:2324

5434 +#: builtin/am.c:2323

5435 msgid "failed to read the index"

5436 msgstr "échec à la lecture de l'index"

5437

5332 -#: builtin/am.c:2339

5438 +#: builtin/am.c:2338

5439 #, c-format

5440 msgid "previous rebase directory %s still exists but mbox given."

5441 msgstr ""

5442 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

5443

5338 -#: builtin/am.c:2363

5444 +#: builtin/am.c:2362

5445 #, c-format

5446 msgid ""

5447 "Stray %s directory found.\n"

@@ -5344,7 +5450,7 @@ msgstr ""

5450 "Répertoire abandonné %s trouvé.\n"

5451 "Utilisez \"git am --abort\" pour le supprimer."

5452

5347 -#: builtin/am.c:2369

5453 +#: builtin/am.c:2368

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

5455 msgstr ""

5456 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

@@ -5557,14 +5663,19 @@ msgstr ""

5663 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"

5664

5665 #: builtin/branch.c:31

5666 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

5667 +msgstr ""

5668 +"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"

5669 +

5670 +#: builtin/branch.c:32

5671 msgid "git branch [<options>] [-r | -a] [--points-at]"

5672 msgstr "git branch [<options>] [-r | -a] [--points-at]"

5673

5563 -#: builtin/branch.c:32

5674 +#: builtin/branch.c:33

5675 msgid "git branch [<options>] [-r | -a] [--format]"

5676 msgstr "git branch [<options>] [-r | -a] [--format]"

5677

5567 -#: builtin/branch.c:145

5678 +#: builtin/branch.c:146

5679 #, c-format

5680 msgid ""

5681 "deleting branch '%s' that has been merged to\n"

@@ -5573,7 +5684,7 @@ msgstr ""

5684 "suppression de la branche '%s' qui a été fusionnée dans\n"

5685 " '%s', mais pas dans HEAD."

5686

5576 -#: builtin/branch.c:149

5687 +#: builtin/branch.c:150

5688 #, c-format

5689 msgid ""

5690 "not deleting branch '%s' that is not yet merged to\n"

@@ -5582,12 +5693,12 @@ msgstr ""

5693 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"

5694 " '%s', même si elle est fusionnée dans HEAD."

5695

5585 -#: builtin/branch.c:163

5696 +#: builtin/branch.c:164

5697 #, c-format

5698 msgid "Couldn't look up commit object for '%s'"

5699 msgstr "Impossible de rechercher l'objet commit pour '%s'"

5700

5590 -#: builtin/branch.c:167

5701 +#: builtin/branch.c:168

5702 #, c-format

5703 msgid ""

5704 "The branch '%s' is not fully merged.\n"

@@ -5596,93 +5707,116 @@ msgstr ""

5707 "La branche '%s' n'est pas totalement fusionnée.\n"

5708 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."

5709

5599 -#: builtin/branch.c:180

5710 +#: builtin/branch.c:181

5711 msgid "Update of config-file failed"

5712 msgstr "Échec de la mise à jour du fichier de configuration"

5713

5603 -#: builtin/branch.c:211

5714 +#: builtin/branch.c:212

5715 msgid "cannot use -a with -d"

5716 msgstr "impossible d'utiliser -a avec -d"

5717

5607 -#: builtin/branch.c:217

5718 +#: builtin/branch.c:218

5719 msgid "Couldn't look up commit object for HEAD"

5720 msgstr "Impossible de rechercher l'objet commit pour HEAD"

5721

5611 -#: builtin/branch.c:231

5722 +#: builtin/branch.c:232

5723 #, c-format

5724 msgid "Cannot delete branch '%s' checked out at '%s'"

5725 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"

5726

5616 -#: builtin/branch.c:246

5727 +#: builtin/branch.c:247

5728 #, c-format

5729 msgid "remote-tracking branch '%s' not found."

5730 msgstr "branche de suivi '%s' non trouvée."

5731

5621 -#: builtin/branch.c:247

5732 +#: builtin/branch.c:248

5733 #, c-format

l10n: fr.po: v2.15.0 round 2