5da312d11c · matheusbsbs/matheus-bagliano

@@ -1,7 +1,7 @@

1 # French translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Jean-Noël Avila <jn.avila@free.fr>, 2016.

4 +# Jean-Noël Avila <jn.avila@free.fr>, 2018.

5 # Sébastien Helleu <flashcode@flashtux.org>, 2013.

6 #

7 # French translations of common Git words used in this file:

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

74 msgstr ""

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

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

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

78 -"PO-Revision-Date: 2017-10-18 20:28+0200\n"

77 +"POT-Creation-Date: 2017-12-31 10:45+0800\n"

78 +"PO-Revision-Date: 2018-01-02 22:06+0100\n"

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

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

81 "Language: fr\n"

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

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

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

86

87 -#: advice.c:58

87 +#: advice.c:62

88 #, c-format

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

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

91

92 -#: advice.c:86

92 +#: advice.c:90

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

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

95

96 -#: advice.c:88

96 +#: advice.c:92

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

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

99

100 -#: advice.c:90

100 +#: advice.c:94

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

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

103

104 -#: advice.c:92

104 +#: advice.c:96

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

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

107

108 -#: advice.c:94

108 +#: advice.c:98

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

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

111

112 -#: advice.c:96

112 +#: advice.c:100

113 #, c-format

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

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

116

117 -#: advice.c:104

117 +#: advice.c:108

118 msgid ""

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

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

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

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

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

124

125 -#: advice.c:112

125 +#: advice.c:116

126 msgid "Exiting because of an unresolved conflict."

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

128

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

129 +#: advice.c:121 builtin/merge.c:1213

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

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

132

133 -#: advice.c:119

133 +#: advice.c:123

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

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

136

137 -#: advice.c:120

137 +#: advice.c:124

138 msgid "Exiting because of unfinished merge."

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

140

141 -#: advice.c:126

141 +#: advice.c:130

142 #, c-format

143 msgid ""

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

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

183 -#: apply.c:125

183 +#: apply.c:122

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

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

186

187 -#: apply.c:127

187 +#: apply.c:124

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

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

190

191 -#: apply.c:130

191 +#: apply.c:127

192 msgid "--3way outside a repository"

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

194

195 -#: apply.c:141

195 +#: apply.c:138

196 msgid "--index outside a repository"

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

198

199 -#: apply.c:144

199 +#: apply.c:141

200 msgid "--cached outside a repository"

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

202

203 -#: apply.c:845

203 +#: apply.c:821

204 #, c-format

205 msgid "Cannot prepare timestamp regexp %s"

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

207

208 -#: apply.c:854

208 +#: apply.c:830

209 #, c-format

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

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

212

213 -#: apply.c:928

213 +#: apply.c:904

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

218 -#: apply.c:966

218 +#: apply.c:942

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

225 -#: apply.c:972

225 +#: apply.c:948

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

232 -#: apply.c:973

232 +#: apply.c:949

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

239 -#: apply.c:978

239 +#: apply.c:954

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

245 -#: apply.c:1007

245 +#: apply.c:983

246 #, c-format

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

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

249

250 -#: apply.c:1325

250 +#: apply.c:1301

251 #, c-format

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

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

254

255 -#: apply.c:1497

255 +#: apply.c:1473

256 #, c-format

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

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

259

260 -#: apply.c:1566

260 +#: apply.c:1542

261 #, c-format

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

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

264

265 -#: apply.c:1586

265 +#: apply.c:1562

266 #, c-format

267 msgid ""

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

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

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

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

279

280 -#: apply.c:1599

280 +#: apply.c:1575

281 #, c-format

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

283 msgstr ""

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

285

286 -#: apply.c:1787

286 +#: apply.c:1763

287 msgid "new file depends on old contents"

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

289

290 -#: apply.c:1789

290 +#: apply.c:1765

291 msgid "deleted file still has contents"

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

293

294 -#: apply.c:1823

294 +#: apply.c:1799

295 #, c-format

296 msgid "corrupt patch at line %d"

297 msgstr "patch corrompu à la ligne %d"

298

299 -#: apply.c:1860

299 +#: apply.c:1836

300 #, c-format

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

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

303

304 -#: apply.c:1862

304 +#: apply.c:1838

305 #, c-format

306 msgid "deleted file %s still has contents"

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

308

309 -#: apply.c:1865

309 +#: apply.c:1841

310 #, c-format

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

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

313

314 -#: apply.c:2012

314 +#: apply.c:1988

315 #, c-format

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

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

318

319 -#: apply.c:2049

319 +#: apply.c:2025

320 #, c-format

321 msgid "unrecognized binary patch at line %d"

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

323

324 -#: apply.c:2209

324 +#: apply.c:2185

325 #, c-format

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

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

328

329 -#: apply.c:2295

329 +#: apply.c:2271

330 #, c-format

331 msgid "unable to read symlink %s"

332 msgstr "lecture du lien symbolique %s impossible"

333

334 -#: apply.c:2299

334 +#: apply.c:2275

335 #, c-format

336 msgid "unable to open or read %s"

337 msgstr "ouverture ou lecture de %s impossible"

338

339 -#: apply.c:2958

339 +#: apply.c:2934

340 #, c-format

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

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

343

344 -#: apply.c:3077

344 +#: apply.c:3055

345 #, c-format

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

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

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

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

350

351 -#: apply.c:3089

351 +#: apply.c:3067

352 #, c-format

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

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

355

356 -#: apply.c:3095

356 +#: apply.c:3073

357 #, c-format

358 msgid ""

359 "while searching for:\n"

@@ -362,457 +362,458 @@ msgstr ""

362 "pendant la recherche de :\n"

363 "%.*s"

364

365 -#: apply.c:3117

365 +#: apply.c:3095

366 #, c-format

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

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

369

370 -#: apply.c:3125

370 +#: apply.c:3103

371 #, c-format

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

373 msgstr ""

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

375 "inverse"

376

377 -#: apply.c:3171

377 +#: apply.c:3149

378 #, c-format

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

380 msgstr ""

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

382

383 -#: apply.c:3181

383 +#: apply.c:3159

384 #, c-format

385 msgid ""

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

387 msgstr ""

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

389

390 -#: apply.c:3189

390 +#: apply.c:3167

391 #, c-format

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

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

394

395 -#: apply.c:3207

395 +#: apply.c:3185

396 #, c-format

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

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

399

400 -#: apply.c:3220

400 +#: apply.c:3198

401 #, c-format

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

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

404

405 -#: apply.c:3226

405 +#: apply.c:3204

406 #, c-format

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

408 msgstr ""

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

410 "trouvé)"

411

412 -#: apply.c:3247

412 +#: apply.c:3225

413 #, c-format

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

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

416

417 -#: apply.c:3369

417 +#: apply.c:3347

418 #, c-format

419 msgid "cannot checkout %s"

420 msgstr "extraction de %s impossible"

421

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

422 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

423 #, c-format

424 msgid "failed to read %s"

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

426

427 -#: apply.c:3426

427 +#: apply.c:3404

428 #, c-format

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

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

431

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

432 +#: apply.c:3433 apply.c:3673

433 #, c-format

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

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

436

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

437 +#: apply.c:3516 apply.c:3687

438 #, c-format

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

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

441

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

442 +#: apply.c:3525 apply.c:3695

443 #, c-format

444 msgid "%s: does not match index"

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

446

447 -#: apply.c:3582

447 +#: apply.c:3560

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

449 msgstr ""

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

451 "points."

452

453 -#: apply.c:3585

453 +#: apply.c:3563

454 #, c-format

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

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

457

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

458 +#: apply.c:3579 apply.c:3583

459 #, c-format

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

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

462

463 -#: apply.c:3617

463 +#: apply.c:3595

464 #, c-format

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

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

467

468 -#: apply.c:3631

468 +#: apply.c:3609

469 #, c-format

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

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

472

473 -#: apply.c:3636

473 +#: apply.c:3614

474 #, c-format

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

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

477

478 -#: apply.c:3662

478 +#: apply.c:3640

479 msgid "removal patch leaves file contents"

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

481

482 -#: apply.c:3734

482 +#: apply.c:3712

483 #, c-format

484 msgid "%s: wrong type"

485 msgstr "%s : type erroné"

486

487 -#: apply.c:3736

487 +#: apply.c:3714

488 #, c-format

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

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

491

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

492 +#: apply.c:3864 apply.c:3866

493 #, c-format

494 msgid "invalid path '%s'"

495 msgstr "chemin invalide '%s'"

496

497 -#: apply.c:3944

497 +#: apply.c:3922

498 #, c-format

499 msgid "%s: already exists in index"

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

501

502 -#: apply.c:3947

502 +#: apply.c:3925

503 #, c-format

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

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

506

507 -#: apply.c:3967

507 +#: apply.c:3945

508 #, c-format

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

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

511

512 -#: apply.c:3972

512 +#: apply.c:3950

513 #, c-format

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

515 msgstr ""

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

517

518 -#: apply.c:3992

518 +#: apply.c:3970

519 #, c-format

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

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

522

523 -#: apply.c:3996

523 +#: apply.c:3974

524 #, c-format

525 msgid "%s: patch does not apply"

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

527

528 -#: apply.c:4011

528 +#: apply.c:3989

529 #, c-format

530 msgid "Checking patch %s..."

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

532

533 -#: apply.c:4102

533 +#: apply.c:4080

534 #, c-format

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

536 msgstr ""

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

538

539 -#: apply.c:4109

539 +#: apply.c:4087

540 #, c-format

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

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

543

544 -#: apply.c:4112

544 +#: apply.c:4090

545 #, c-format

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

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

548

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

549 +#: apply.c:4095 builtin/checkout.c:236 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

554 -#: apply.c:4121

554 +#: apply.c:4099

555 #, c-format

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

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

558

559 -#: apply.c:4131

559 +#: apply.c:4109

560 #, c-format

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

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

563

564 -#: apply.c:4269

564 +#: apply.c:4247

565 #, c-format

566 msgid "unable to remove %s from index"

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

568

569 -#: apply.c:4304

569 +#: apply.c:4282

570 #, c-format

571 msgid "corrupt patch for submodule %s"

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

573

574 -#: apply.c:4310

574 +#: apply.c:4288

575 #, c-format

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

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

578

579 -#: apply.c:4318

579 +#: apply.c:4296

580 #, c-format

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

582 msgstr ""

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

584 "impossible"

585

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

586 +#: apply.c:4302 apply.c:4446

587 #, c-format

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

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

590

591 -#: apply.c:4365

591 +#: apply.c:4343

592 #, c-format

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

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

595

596 -#: apply.c:4369

596 +#: apply.c:4347

597 #, c-format

598 msgid "closing file '%s'"

599 msgstr "fermeture du fichier '%s'"

600

601 -#: apply.c:4439

601 +#: apply.c:4417

602 #, c-format

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

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

605

606 -#: apply.c:4537

606 +#: apply.c:4515

607 #, c-format

608 msgid "Applied patch %s cleanly."

609 msgstr "Patch %s appliqué proprement."

610

611 -#: apply.c:4545

611 +#: apply.c:4523

612 msgid "internal error"

613 msgstr "erreur interne"

614

615 -#: apply.c:4548

615 +#: apply.c:4526

616 #, c-format

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

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

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

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

621

622 -#: apply.c:4559

622 +#: apply.c:4537

623 #, c-format

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

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

626

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

627 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

631

632 -#: apply.c:4581

632 +#: apply.c:4559

633 #, c-format

634 msgid "Hunk #%d applied cleanly."

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

636

637 -#: apply.c:4585

637 +#: apply.c:4563

638 #, c-format

639 msgid "Rejected hunk #%d."

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

641

642 -#: apply.c:4695

642 +#: apply.c:4673

643 #, c-format

644 msgid "Skipped patch '%s'."

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

646

647 -#: apply.c:4703

647 +#: apply.c:4681

648 msgid "unrecognized input"

649 msgstr "entrée non reconnue"

650

651 -#: apply.c:4722

651 +#: apply.c:4700

652 msgid "unable to read index file"

653 msgstr "lecture du fichier d'index impossible"

654

655 -#: apply.c:4859

655 +#: apply.c:4837

656 #, c-format

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

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

659

660 -#: apply.c:4886

660 +#: apply.c:4864

661 #, c-format

662 msgid "squelched %d whitespace error"

663 msgid_plural "squelched %d whitespace errors"

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

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

666

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

667 +#: apply.c:4870 apply.c:4885

668 #, c-format

669 msgid "%d line adds whitespace errors."

670 msgid_plural "%d lines add whitespace errors."

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

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

673

674 -#: apply.c:4900

674 +#: apply.c:4878

675 #, c-format

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

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

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

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

680

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

681 +#: apply.c:4894 builtin/add.c:539 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

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

685 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

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

687 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

688 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

689 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

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

691 msgid "path"

692 msgstr "chemin"

693

694 -#: apply.c:4948

694 +#: apply.c:4922

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

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

697

698 -#: apply.c:4951

698 +#: apply.c:4925

699 msgid "apply changes matching the given path"

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

701

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

702 +#: apply.c:4927 builtin/am.c:2266

703 msgid "num"

704 msgstr "num"

705

706 -#: apply.c:4954

706 +#: apply.c:4928

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

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

709

710 -#: apply.c:4957

710 +#: apply.c:4931

711 msgid "ignore additions made by the patch"

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

713

714 -#: apply.c:4959

714 +#: apply.c:4933

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

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

717

718 -#: apply.c:4963

718 +#: apply.c:4937

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

720 msgstr ""

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

722

723 -#: apply.c:4965

723 +#: apply.c:4939

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

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

726

727 -#: apply.c:4967

727 +#: apply.c:4941

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

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

730

731 -#: apply.c:4969

731 +#: apply.c:4943

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

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

734

735 -#: apply.c:4971

735 +#: apply.c:4945

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

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

738

739 -#: apply.c:4973

739 +#: apply.c:4947

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

743 -#: apply.c:4975

743 +#: apply.c:4949

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

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

746

747 -#: apply.c:4977

747 +#: apply.c:4951

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

751 -#: apply.c:4979

751 +#: apply.c:4953

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

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

756 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

757 msgid "paths are separated with NUL character"

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

759

760 -#: apply.c:4984

760 +#: apply.c:4958

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

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

763

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

764 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

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

766 +#: builtin/pack-objects.c:3009

767 msgid "action"

768 msgstr "action"

769

769 -#: apply.c:4986

770 +#: apply.c:4960

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

772 msgstr ""

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

774 "d'espace"

775

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

776 +#: apply.c:4963 apply.c:4966

777 msgid "ignore changes in whitespace when finding context"

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

779

779 -#: apply.c:4995

780 +#: apply.c:4969

781 msgid "apply the patch in reverse"

782 msgstr "appliquer le patch en sens inverse"

783

783 -#: apply.c:4997

784 +#: apply.c:4971

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

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

787

787 -#: apply.c:4999

788 +#: apply.c:4973

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

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

791

791 -#: apply.c:5001

792 +#: apply.c:4975

793 msgid "allow overlapping hunks"

794 msgstr "accepter les recouvrements de sections"

795

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

796 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

797 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

798 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

799 msgid "be verbose"

800 msgstr "mode verbeux"

801

801 -#: apply.c:5004

802 +#: apply.c:4978

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

804 msgstr ""

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

806 "fichier"

807

807 -#: apply.c:5007

808 +#: apply.c:4981

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

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

811

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

812 +#: apply.c:4983 builtin/am.c:2254

813 msgid "root"

814 msgstr "racine"

815

815 -#: apply.c:5010

816 +#: apply.c:4984

817 msgid "prepend <root> to all filenames"

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

819

@@ -835,7 +836,7 @@ msgstr ""

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

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

838

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

839 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

840 #, c-format

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

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

@@ -848,7 +849,7 @@ msgstr "fmt"

849 msgid "archive format"

850 msgstr "format d'archive"

851

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

852 +#: archive.c:437 builtin/log.c:1459

853 msgid "prefix"

854 msgstr "préfixe"

855

@@ -856,9 +857,9 @@ msgstr "préfixe"

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

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

859

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

860 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

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

862 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

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

864 #: parse-options.h:153

865 msgid "file"

@@ -893,7 +894,7 @@ msgid "list supported archive formats"

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

895

896 #: 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 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

898 msgid "repo"

899 msgstr "dépôt"

900

@@ -944,22 +945,22 @@ msgstr ""

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

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

947

947 -#: bisect.c:447

948 +#: bisect.c:458

949 #, c-format

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

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

952

952 -#: bisect.c:655

953 +#: bisect.c:666

954 #, c-format

955 msgid "We cannot bisect more!\n"

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

957

957 -#: bisect.c:708

958 +#: bisect.c:720

959 #, c-format

960 msgid "Not a valid commit name %s"

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

962

962 -#: bisect.c:732

963 +#: bisect.c:744

964 #, c-format

965 msgid ""

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

@@ -968,7 +969,7 @@ msgstr ""

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

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

971

971 -#: bisect.c:737

972 +#: bisect.c:749

973 #, c-format

974 msgid ""

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

@@ -977,7 +978,7 @@ msgstr ""

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

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

980

980 -#: bisect.c:742

981 +#: bisect.c:754

982 #, c-format

983 msgid ""

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

@@ -986,7 +987,7 @@ msgstr ""

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

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

989

989 -#: bisect.c:750

990 +#: bisect.c:762

991 #, c-format

992 msgid ""

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

@@ -997,7 +998,7 @@ msgstr ""

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

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

1000

1000 -#: bisect.c:763

1001 +#: bisect.c:775

1002 #, c-format

1003 msgid ""

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

@@ -1009,36 +1010,36 @@ msgstr ""

1010 "et %s.\n"

1011 "On continue tout de même."

1012

1012 -#: bisect.c:798

1013 +#: bisect.c:810

1014 #, c-format

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

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

1017

1017 -#: bisect.c:850

1018 +#: bisect.c:862

1019 #, c-format

1020 msgid "a %s revision is needed"

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

1022

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

1023 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

1024 #, c-format

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

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

1027

1027 -#: bisect.c:918

1028 +#: bisect.c:930

1029 #, c-format

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

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

1032

1032 -#: bisect.c:948

1033 +#: bisect.c:960

1034 msgid "reading bisect refs failed"

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

1036

1036 -#: bisect.c:968

1037 +#: bisect.c:979

1038 #, c-format

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

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

1041

1041 -#: bisect.c:976

1042 +#: bisect.c:987

1043 #, c-format

1044 msgid ""

1045 "No testable commit found.\n"

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

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

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

1050

1050 -#: bisect.c:995

1051 +#: bisect.c:1006

1052 #, c-format

1053 msgid "(roughly %d step)"

1054 msgid_plural "(roughly %d steps)"

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

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

1059 #. steps)" translation.

1060 #.

1060 -#: bisect.c:1001

1061 +#: bisect.c:1012

1062 #, c-format

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

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

@@ -1078,9 +1079,9 @@ msgstr ""

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

1080 "dernier commit"

1081

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

1082 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

1083 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1084 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1085 #: builtin/shortlog.c:191

1086 msgid "revision walk setup failed"

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

@@ -1179,33 +1180,33 @@ msgstr "Échec de l'écriture de la configuration de branche amont"

1180 msgid "Not tracking: ambiguous information for ref %s"

1181 msgstr "Pas de suivi : information ambiguë pour la référence %s"

1182

1182 -#: branch.c:185

1183 +#: branch.c:189

1184 #, c-format

1185 msgid "'%s' is not a valid branch name."

1186 msgstr "'%s' n'est pas un nom de branche valide."

1187

1187 -#: branch.c:190

1188 +#: branch.c:208

1189 #, c-format

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

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

1192

1192 -#: branch.c:197

1193 +#: branch.c:213

1194 msgid "Cannot force update the current branch."

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

1196

1196 -#: branch.c:217

1197 +#: branch.c:233

1198 #, c-format

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

1200 msgstr ""

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

1202 "pas une branche."

1203

1203 -#: branch.c:219

1204 +#: branch.c:235

1205 #, c-format

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

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

1208

1208 -#: branch.c:221

1209 +#: branch.c:237

1210 msgid ""

1211 "\n"

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

@@ -1225,27 +1226,27 @@ msgstr ""

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

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

1228

1228 -#: branch.c:264

1229 +#: branch.c:280

1230 #, c-format

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

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

1233

1233 -#: branch.c:284

1234 +#: branch.c:300

1235 #, c-format

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

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

1238

1238 -#: branch.c:289

1239 +#: branch.c:305

1240 #, c-format

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

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

1243

1243 -#: branch.c:343

1244 +#: branch.c:359

1245 #, c-format

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

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

1248

1248 -#: branch.c:366

1249 +#: branch.c:382

1250 #, c-format

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

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

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

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

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

1263

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

1264 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1265 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1266 #, c-format

1267 msgid "could not open '%s'"

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

@@ -1306,7 +1306,7 @@ msgstr "rev-list a disparu"

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

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

1309 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1310 #, c-format

1311 msgid "unrecognized argument: %s"

1312 msgstr "argument non reconnu : %s"

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

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

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

1331

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

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

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

1333 +#: builtin/am.c:1471 builtin/am.c:2106

1334 #, c-format

1335 msgid "could not parse %s"

1336 msgstr "impossible d'analyser %s"

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

1343 -#: commit.c:1517

1343 +#: commit.c:1524

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"

@@ -1352,184 +1352,189 @@ msgstr ""

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

1353 "projet.\n"

1354

1355 -#: compat/obstack.c:406 compat/obstack.c:408

1355 +#: compat/obstack.c:405 compat/obstack.c:407

1356 msgid "memory exhausted"

1357 msgstr "plus de mémoire"

1358

1359 -#: config.c:187

1359 +#: config.c:186

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

1365 -#: config.c:721

1365 +#: config.c:720

1366 #, c-format

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

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

1369

1370 -#: config.c:725

1370 +#: config.c:724

1371 #, c-format

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

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

1374

1375 -#: config.c:729

1375 +#: config.c:728

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

1380 -#: config.c:733

1380 +#: config.c:732

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

1385 -#: config.c:737

1385 +#: config.c:736

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

1390 -#: config.c:741

1390 +#: config.c:740

1391 #, c-format

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

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

1394

1395 -#: config.c:869

1395 +#: config.c:868

1396 msgid "out of range"

1397 msgstr "hors plage"

1398

1399 -#: config.c:869

1399 +#: config.c:868

1400 msgid "invalid unit"

1401 msgstr "unité invalide"

1402

1403 -#: config.c:875

1403 +#: config.c:874

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

1408 -#: config.c:880

1408 +#: config.c:879

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

1415 -#: config.c:883

1415 +#: config.c:882

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

1422 -#: config.c:886

1422 +#: config.c:885

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

1429 -#: config.c:889

1429 +#: config.c:888

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

1436 -#: config.c:892

1436 +#: config.c:891

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

1443 -#: config.c:895

1443 +#: config.c:894

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

1449 -#: config.c:990

1449 +#: config.c:989

1450 #, c-format

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

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

1453

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

1454 +#: config.c:998

1455 +#, c-format

1456 +msgid "'%s' for '%s' is not a valid timestamp"

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

1458 +

1459 +#: config.c:1094 config.c:1105

1460 #, c-format

1461 msgid "bad zlib compression level %d"

1462 msgstr "niveau de compression zlib incorrect %d"

1463

1459 -#: config.c:1213

1464 +#: config.c:1222

1465 #, c-format

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

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

1468

1464 -#: config.c:1372

1469 +#: config.c:1378

1470 #, c-format

1471 msgid "bad pack compression level %d"

1472 msgstr "niveau de compression du paquet %d"

1473

1469 -#: config.c:1568

1474 +#: config.c:1574

1475 msgid "unable to parse command-line config"

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

1477

1473 -#: config.c:1900

1478 +#: config.c:1906

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

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

1481

1477 -#: config.c:2087

1482 +#: config.c:2093

1483 #, c-format

1484 msgid "Invalid %s: '%s'"

1485 msgstr "%s invalide : '%s'"

1486

1482 -#: config.c:2130

1487 +#: config.c:2136

1488 #, c-format

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

1490 msgstr ""

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

1492 "défaut"

1493

1489 -#: config.c:2156

1494 +#: config.c:2162

1495 #, c-format

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

1497 msgstr ""

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

1499 "100"

1500

1496 -#: config.c:2167

1501 +#: config.c:2187

1502 #, c-format

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

1504 msgstr ""

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

1506

1502 -#: config.c:2169

1507 +#: config.c:2189

1508 #, c-format

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

1510 msgstr ""

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

1512

1508 -#: config.c:2228

1513 +#: config.c:2248

1514 #, c-format

1515 msgid "%s has multiple values"

1516 msgstr "%s a des valeurs multiples"

1517

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

1518 +#: config.c:2591 config.c:2808

1519 #, c-format

1520 msgid "fstat on %s failed"

1521 msgstr "échec de fstat sur %s"

1522

1518 -#: config.c:2678

1523 +#: config.c:2698

1524 #, c-format

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

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

1527

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

1528 +#: config.c:2700 builtin/remote.c:776

1529 #, c-format

1530 msgid "could not unset '%s'"

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

1532

1528 -#: connect.c:50

1533 +#: connect.c:52

1534 msgid "The remote end hung up upon initial contact"

1535 msgstr "L'hôte distant a fermé la connexion lors du contact initial"

1536

1532 -#: connect.c:52

1537 +#: connect.c:54

1538 msgid ""

1539 "Could not read from remote repository.\n"

1540 "\n"

@@ -1660,7 +1665,7 @@ msgstr[1] "il y a %<PRIuMAX> ans"

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

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

1667

1663 -#: diffcore-rename.c:536

1668 +#: diffcore-rename.c:535

1669 msgid "Performing inexact rename detection"

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

1671

@@ -1694,7 +1699,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1699 msgstr ""

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

1701

1697 -#: diff.c:398

1702 +#: diff.c:401

1703 #, c-format

1704 msgid ""

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

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

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

1709 "%s"

1710

1706 -#: diff.c:3861

1711 +#: diff.c:3799

1712 #, c-format

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

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

1715

1711 -#: diff.c:4189

1716 +#: diff.c:4127

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

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

1719

1715 -#: diff.c:4279

1720 +#: diff.c:4215

1721 msgid "--follow requires exactly one pathspec"

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

1723

1719 -#: diff.c:4445

1724 +#: diff.c:4381

1725 #, c-format

1726 msgid ""

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

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

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

1731 "%s"

1732

1728 -#: diff.c:4459

1733 +#: diff.c:4395

1734 #, c-format

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

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

1737

1733 -#: diff.c:5505

1738 +#: diff.c:5446

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

1740 msgstr ""

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

1742 "fichiers."

1743

1739 -#: diff.c:5508

1744 +#: diff.c:5449

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

1746 msgstr ""

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

1748 "grand nombre de fichiers."

1749

1745 -#: diff.c:5511

1750 +#: diff.c:5452

1751 #, c-format

1752 msgid ""

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

@@ -1750,29 +1755,34 @@ msgstr ""

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

1756 "commande."

1757

1753 -#: dir.c:1983

1758 +#: dir.c:2100

1759 msgid "failed to get kernel name and information"

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

1761

1757 -#: dir.c:2102

1762 +#: dir.c:2219

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

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

1765

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

1766 +#: dir.c:3002 dir.c:3007

1767 #, c-format

1768 msgid "could not create directories for %s"

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

1770

1766 -#: dir.c:2915

1771 +#: dir.c:3032

1772 #, c-format

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

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

1775

1771 -#: entry.c:176

1776 +#: editor.c:61

1777 +#, c-format

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

1779 +msgstr "suggestion : en attente de la fermeture du fichier par votre éditeur de texte…%c"

1780 +

1781 +#: entry.c:177

1782 msgid "Filtering content"

1783 msgstr "Filtrage du contenu"

1784

1775 -#: entry.c:433

1785 +#: entry.c:435

1786 #, c-format

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

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

@@ -1843,7 +1853,7 @@ msgstr "commit invalide %s"

1853 msgid "giving up"

1854 msgstr "abandon"

1855

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

1856 +#: fetch-pack.c:534 progress.c:229

1857 msgid "done"

1858 msgstr "fait"

1859

@@ -1857,104 +1867,104 @@ msgstr "%s trouvé (%d) %s"

1867 msgid "Marking %s as complete"

1868 msgstr "Marquage de %s comme terminé"

1869

1860 -#: fetch-pack.c:776

1870 +#: fetch-pack.c:777

1871 #, c-format

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

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

1874

1865 -#: fetch-pack.c:814

1875 +#: fetch-pack.c:815

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

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

1878

1869 -#: fetch-pack.c:822

1879 +#: fetch-pack.c:823

1880 msgid "protocol error: bad pack header"

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

1882

1873 -#: fetch-pack.c:878

1883 +#: fetch-pack.c:879

1884 #, c-format

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

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

1887

1878 -#: fetch-pack.c:894

1888 +#: fetch-pack.c:895

1889 #, c-format

1890 msgid "%s failed"

1891 msgstr "échec de %s"

1892

1883 -#: fetch-pack.c:896

1893 +#: fetch-pack.c:897

1894 msgid "error in sideband demultiplexer"

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

1896

1887 -#: fetch-pack.c:923

1897 +#: fetch-pack.c:924

1898 msgid "Server does not support shallow clients"

1899 msgstr "Le serveur ne supporte les clients superficiels"

1900

1891 -#: fetch-pack.c:927

1901 +#: fetch-pack.c:928

1902 msgid "Server supports multi_ack_detailed"

1903 msgstr "Le serveur supporte multi_ack_detailed"

1904

1895 -#: fetch-pack.c:930

1905 +#: fetch-pack.c:931

1906 msgid "Server supports no-done"

1907 msgstr "Le serveur support no-done"

1908

1899 -#: fetch-pack.c:936

1909 +#: fetch-pack.c:937

1910 msgid "Server supports multi_ack"

1911 msgstr "Le serveur supporte multi_ack"

1912

1903 -#: fetch-pack.c:940

1913 +#: fetch-pack.c:941

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

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

1916

1907 -#: fetch-pack.c:944

1917 +#: fetch-pack.c:945

1918 msgid "Server supports side-band"

1919 msgstr "Le serveru supporte side-band"

1920

1911 -#: fetch-pack.c:948

1921 +#: fetch-pack.c:949

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

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

1924

1915 -#: fetch-pack.c:952

1925 +#: fetch-pack.c:953

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

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

1928

1919 -#: fetch-pack.c:962

1929 +#: fetch-pack.c:963

1930 msgid "Server supports ofs-delta"

1931 msgstr "Le serveur support ofs-delta"

1932

1923 -#: fetch-pack.c:969

1933 +#: fetch-pack.c:970

1934 #, c-format

1935 msgid "Server version is %.*s"

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

1937

1928 -#: fetch-pack.c:975

1938 +#: fetch-pack.c:976

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

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

1941

1932 -#: fetch-pack.c:979

1942 +#: fetch-pack.c:980

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

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

1945

1936 -#: fetch-pack.c:981

1946 +#: fetch-pack.c:982

1947 msgid "Server does not support --deepen"

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

1949

1940 -#: fetch-pack.c:992

1950 +#: fetch-pack.c:993

1951 msgid "no common commits"

1952 msgstr "pas de commit commun"

1953

1944 -#: fetch-pack.c:1004

1954 +#: fetch-pack.c:1005

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

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

1957

1948 -#: fetch-pack.c:1166

1958 +#: fetch-pack.c:1167

1959 msgid "no matching remote head"

1960 msgstr "pas de HEAD distante correspondante"

1961

1952 -#: fetch-pack.c:1188

1962 +#: fetch-pack.c:1189

1963 #, c-format

1964 msgid "no such remote ref %s"

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

1966

1957 -#: fetch-pack.c:1191

1967 +#: fetch-pack.c:1192

1968 #, c-format

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

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

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

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

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

1989

1980 -#: grep.c:1970

1990 +#: grep.c:2017

1991 #, c-format

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

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

1994

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

1995 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1996 #, c-format

1997 msgid "failed to stat '%s'"

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

1999

1990 -#: grep.c:1998

2000 +#: grep.c:2045

2001 #, c-format

2002 msgid "'%s': short read"

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

@@ -2058,12 +2068,12 @@ msgstr[1] ""

2068 msgid "git version [<options>]"

2069 msgstr "git version [<options>]"

2070

2061 -#: help.c:456

2071 +#: help.c:462

2072 #, c-format

2073 msgid "%s: %s - %s"

2074 msgstr "%s: %s - %s"

2075

2066 -#: help.c:460

2076 +#: help.c:466

2077 msgid ""

2078 "\n"

2079 "Did you mean this?"

@@ -2136,6 +2146,15 @@ msgstr "le nom n'est constitué que de caractères interdits : %s"

2146 msgid "invalid date format: %s"

2147 msgstr "format de date invalide : %s"

2148

2149 +#: list-objects-filter-options.c:30

2150 +msgid "multiple object filter types cannot be combined"

2151 +msgstr "impossible de combiner des types multiples de filtre d'objets"

2152 +

2153 +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2154 +#, c-format

2155 +msgid "invalid filter-spec expression '%s'"

2156 +msgstr "expression de filtre invalide : '%s'"

2157 +

2158 #: lockfile.c:151

2159 #, c-format

2160 msgid ""

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

2183 msgid "failed to read the cache"

2184 msgstr "impossible de lire le cache"

2185

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

2186 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

2187 +#: builtin/checkout.c:600 builtin/clone.c:754

2188 msgid "unable to write new index file"

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

2190

@@ -2361,7 +2380,7 @@ msgstr "%s sauté (fusion identique à l'existant)"

2380 msgid "Auto-merging %s"

2381 msgstr "Fusion automatique de %s"

2382

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

2383 +#: merge-recursive.c:1775 git-submodule.sh:932

2384 msgid "submodule"

2385 msgstr "sous-module"

2386

@@ -2383,47 +2402,47 @@ msgstr "fichier/répertoire"

2402 msgid "directory/file"

2403 msgstr "répertoire/fichier"

2404

2386 -#: merge-recursive.c:1908

2405 +#: merge-recursive.c:1909

2406 #, c-format

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

2408 msgstr ""

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

2410

2392 -#: merge-recursive.c:1917

2411 +#: merge-recursive.c:1918

2412 #, c-format

2413 msgid "Adding %s"

2414 msgstr "Ajout de %s"

2415

2397 -#: merge-recursive.c:1954

2416 +#: merge-recursive.c:1955

2417 msgid "Already up to date!"

2418 msgstr "Déjà à jour !"

2419

2401 -#: merge-recursive.c:1963

2420 +#: merge-recursive.c:1964

2421 #, c-format

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

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

2424

2406 -#: merge-recursive.c:2060

2425 +#: merge-recursive.c:2061

2426 msgid "Merging:"

2427 msgstr "Fusion :"

2428

2410 -#: merge-recursive.c:2073

2429 +#: merge-recursive.c:2074

2430 #, c-format

2431 msgid "found %u common ancestor:"

2432 msgid_plural "found %u common ancestors:"

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

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

2435

2417 -#: merge-recursive.c:2112

2436 +#: merge-recursive.c:2113

2437 msgid "merge returned no commit"

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

2439

2421 -#: merge-recursive.c:2175

2440 +#: merge-recursive.c:2176

2441 #, c-format

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

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

2444

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

2445 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2446 msgid "Unable to write index."

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

2448

@@ -2596,16 +2615,7 @@ msgstr ""

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

2616 "commande : %s"

2617

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"

2603 -msgstr ""

2604 -"les chaines de caractères vides comme spécificateurs de chemin seront "

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

2606 -"correspondre à tous le chemins"

2607 -

2608 -#: pathspec.c:595

2618 +#: pathspec.c:592

2619 #, c-format

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

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

@@ -2614,7 +2624,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"

2624 msgid "unable to parse --pretty format"

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

2626

2617 -#: read-cache.c:1443

2627 +#: read-cache.c:1472

2628 #, c-format

2629 msgid ""

2630 "index.version set, but the value is invalid.\n"

@@ -2623,7 +2633,7 @@ msgstr ""

2633 "version d'index renseignée, mais la valeur est invalide.\n"

2634 "Utilisation de la version %i"

2635

2626 -#: read-cache.c:1453

2636 +#: read-cache.c:1482

2637 #, c-format

2638 msgid ""

2639 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2632,53 +2642,53 @@ msgstr ""

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

2643 "Utilisation de la version %i"

2644

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

2645 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2646 #, c-format

2647 msgid "could not close '%s'"

2648 msgstr "impossible de fermer '%s'"

2649

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

2650 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2651 #, c-format

2652 msgid "could not stat '%s'"

2653 msgstr "stat impossible de '%s'"

2654

2645 -#: read-cache.c:2407

2655 +#: read-cache.c:2455

2656 #, c-format

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

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

2659

2650 -#: read-cache.c:2419

2660 +#: read-cache.c:2467

2661 #, c-format

2662 msgid "unable to unlink: %s"

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

2664

2655 -#: refs.c:638

2665 +#: refs.c:706

2666 #, c-format

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

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

2669

2660 -#: refs.c:1792

2670 +#: refs.c:1850

2671 msgid "ref updates forbidden inside quarantine environment"

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

2673

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

2674 +#: refs/files-backend.c:1189

2675 #, c-format

2676 msgid "could not remove reference %s"

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

2678

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

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

2679 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2680 +#: refs/packed-backend.c:1534

2681 #, c-format

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

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

2684

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

2685 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2686 #, c-format

2687 msgid "could not delete references: %s"

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

2689

2690 # à priori on parle d'une branche ici

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

2691 +#: ref-filter.c:35 wt-status.c:1816

2692 msgid "gone"

2693 msgstr "disparue"

2694

@@ -2697,157 +2707,157 @@ msgstr "en retard de %d"

2707 msgid "ahead %d, behind %d"

2708 msgstr "en avance de %d, en retard de %d"

2709

2700 -#: ref-filter.c:105

2710 +#: ref-filter.c:107

2711 #, c-format

2712 msgid "expected format: %%(color:<color>)"

2713 msgstr "format attendu : %%(color:<couleur>)"

2714

2705 -#: ref-filter.c:107

2715 +#: ref-filter.c:109

2716 #, c-format

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

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

2719

2710 -#: ref-filter.c:127

2720 +#: ref-filter.c:129

2721 #, c-format

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

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

2724

2715 -#: ref-filter.c:131

2725 +#: ref-filter.c:133

2726 #, c-format

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

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

2729

2720 -#: ref-filter.c:133

2730 +#: ref-filter.c:135

2731 #, c-format

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

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

2734

2725 -#: ref-filter.c:173

2735 +#: ref-filter.c:184

2736 #, c-format

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

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

2739

2730 -#: ref-filter.c:180

2740 +#: ref-filter.c:191

2741 #, c-format

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

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

2744

2735 -#: ref-filter.c:198

2745 +#: ref-filter.c:209

2746 #, c-format

2747 msgid "unknown %%(trailers) argument: %s"

2748 msgstr "argument %%(trailers) inconnu : %s"

2749

2740 -#: ref-filter.c:221

2750 +#: ref-filter.c:232

2751 #, c-format

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

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

2754

2745 -#: ref-filter.c:223

2755 +#: ref-filter.c:234

2756 #, c-format

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

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

2759

2750 -#: ref-filter.c:236

2760 +#: ref-filter.c:247

2761 #, c-format

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

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

2764

2755 -#: ref-filter.c:240

2765 +#: ref-filter.c:251

2766 #, c-format

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

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

2769

2760 -#: ref-filter.c:267

2770 +#: ref-filter.c:278

2771 #, c-format

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

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

2774

2765 -#: ref-filter.c:279

2775 +#: ref-filter.c:290

2776 #, c-format

2777 msgid "unrecognized position:%s"

2778 msgstr "position non reconnue : %s"

2779

2770 -#: ref-filter.c:283

2780 +#: ref-filter.c:294

2781 #, c-format

2782 msgid "unrecognized width:%s"

2783 msgstr "largeur non reconnue : %s"

2784

2775 -#: ref-filter.c:289

2785 +#: ref-filter.c:300

2786 #, c-format

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

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

2789

2780 -#: ref-filter.c:293

2790 +#: ref-filter.c:304

2791 #, c-format

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

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

2794

2785 -#: ref-filter.c:308

2795 +#: ref-filter.c:319

2796 #, c-format

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

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

2799

2790 -#: ref-filter.c:398

2800 +#: ref-filter.c:409

2801 #, c-format

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

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

2804

2795 -#: ref-filter.c:424

2805 +#: ref-filter.c:435

2806 #, c-format

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

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

2809

2800 -#: ref-filter.c:536

2810 +#: ref-filter.c:547

2811 #, c-format

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

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

2814

2805 -#: ref-filter.c:596

2815 +#: ref-filter.c:607

2816 #, c-format

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

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

2819

2810 -#: ref-filter.c:598

2820 +#: ref-filter.c:609

2821 #, c-format

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

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

2824

2815 -#: ref-filter.c:600

2825 +#: ref-filter.c:611

2826 #, c-format

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

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

2829

2820 -#: ref-filter.c:626

2830 +#: ref-filter.c:637

2831 #, c-format

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

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

2834

2825 -#: ref-filter.c:628

2835 +#: ref-filter.c:639

2836 #, c-format

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

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

2839

2830 -#: ref-filter.c:630

2840 +#: ref-filter.c:641

2841 #, c-format

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

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

2844

2835 -#: ref-filter.c:643

2845 +#: ref-filter.c:654

2846 #, c-format

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

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

2849

2840 -#: ref-filter.c:698

2850 +#: ref-filter.c:709

2851 #, c-format

2852 msgid "malformed format string %s"

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

2854

2845 -#: ref-filter.c:1283

2855 +#: ref-filter.c:1313

2856 #, c-format

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

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

2859

2850 -#: ref-filter.c:1286

2860 +#: ref-filter.c:1316

2861 #, c-format

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

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

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

2865 #. TRANSLATORS: make sure this matches "HEAD

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

2867 #.

2858 -#: ref-filter.c:1294

2868 +#: ref-filter.c:1324

2869 #, c-format

2870 msgid "(HEAD detached at %s)"

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

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

2873 #. TRANSLATORS: make sure this matches "HEAD

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

2875 #.

2866 -#: ref-filter.c:1301

2876 +#: ref-filter.c:1331

2877 #, c-format

2878 msgid "(HEAD detached from %s)"

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

2880

2871 -#: ref-filter.c:1305

2881 +#: ref-filter.c:1335

2882 msgid "(no branch)"

2883 msgstr "(aucune branche)"

2884

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

2885 +#: ref-filter.c:1488 ref-filter.c:1519

2886 #, c-format

2887 msgid "missing object %s for %s"

2888 msgstr "objet manquant %s pour %s"

2889

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

2890 +#: ref-filter.c:1491 ref-filter.c:1522

2891 #, c-format

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

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

2894

2885 -#: ref-filter.c:1788

2895 +#: ref-filter.c:1822

2896 #, c-format

2897 msgid "malformed object at '%s'"

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

2899

2890 -#: ref-filter.c:1855

2900 +#: ref-filter.c:1889

2901 #, c-format

2902 msgid "ignoring ref with broken name %s"

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

2904

2895 -#: ref-filter.c:1860

2905 +#: ref-filter.c:1894

2906 #, c-format

2907 msgid "ignoring broken ref %s"

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

2909

2900 -#: ref-filter.c:2122

2910 +#: ref-filter.c:2156

2911 #, c-format

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

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

2914

2905 -#: ref-filter.c:2216

2915 +#: ref-filter.c:2250

2916 #, c-format

2917 msgid "malformed object name %s"

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

2919

2910 -#: remote.c:750

2920 +#: remote.c:780

2921 #, c-format

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

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

2924

2915 -#: remote.c:754

2925 +#: remote.c:784

2926 #, c-format

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

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

2929

2920 -#: remote.c:758

2930 +#: remote.c:788

2931 #, c-format

2932 msgid "%s tracks both %s and %s"

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

2934

2925 -#: remote.c:766

2935 +#: remote.c:796

2936 msgid "Internal error"

2937 msgstr "Erreur interne"

2938

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

2939 +#: remote.c:1711 remote.c:1813

2940 msgid "HEAD does not point to a branch"

2941 msgstr "HEAD ne pointe pas sur une branche"

2942

2933 -#: remote.c:1690

2943 +#: remote.c:1720

2944 #, c-format

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

2946 msgstr "pas de branche '%s'"

2947

2938 -#: remote.c:1693

2948 +#: remote.c:1723

2949 #, c-format

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

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

2952

2943 -#: remote.c:1699

2953 +#: remote.c:1729

2954 #, c-format

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

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

2957

2948 -#: remote.c:1714

2958 +#: remote.c:1744

2959 #, c-format

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

2961 msgstr ""

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

2963 "branche locale de suivi"

2964

2955 -#: remote.c:1726

2965 +#: remote.c:1756

2966 #, c-format

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

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

2969

2960 -#: remote.c:1737

2970 +#: remote.c:1767

2971 #, c-format

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

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

2974

2965 -#: remote.c:1750

2975 +#: remote.c:1780

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

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

2978

2969 -#: remote.c:1772

2979 +#: remote.c:1802

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

2981 msgstr ""

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

2983

2974 -#: remote.c:2076

2984 +#: remote.c:2106

2985 #, c-format

2986 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2987 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

2988

2979 -#: remote.c:2080

2989 +#: remote.c:2110

2990 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2991 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

2992

2983 -#: remote.c:2083

2993 +#: remote.c:2113

2994 #, c-format

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

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

2997

2988 -#: remote.c:2087

2998 +#: remote.c:2117

2999 #, c-format

3000 msgid "Your branch is ahead of '%s' by %d commit.\n"

3001 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

3002 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

3003 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

3004

2995 -#: remote.c:2093

3005 +#: remote.c:2123

3006 msgid " (use \"git push\" to publish your local commits)\n"

3007 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

3008

2999 -#: remote.c:2096

3009 +#: remote.c:2126

3010 #, c-format

3011 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

3012 msgid_plural ""

@@ -3008,11 +3018,11 @@ msgstr[1] ""

3018 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

3019 "en avance rapide.\n"

3020

3011 -#: remote.c:2104

3021 +#: remote.c:2134

3022 msgid " (use \"git pull\" to update your local branch)\n"

3023 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

3024

3015 -#: remote.c:2107

3025 +#: remote.c:2137

3026 #, c-format

3027 msgid ""

3028 "Your branch and '%s' have diverged,\n"

@@ -3027,28 +3037,37 @@ msgstr[1] ""

3037 "Votre branche et '%s' ont divergé,\n"

3038 "et ont %d et %d commits différents chacune respectivement.\n"

3039

3030 -#: remote.c:2117

3040 +#: remote.c:2147

3041 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

3042 msgstr ""

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

3044

3035 -#: revision.c:2256

3045 +#: revision.c:2268

3046 msgid "your current branch appears to be broken"

3047 msgstr "votre branche actuelle semble cassée"

3048

3039 -#: revision.c:2259

3049 +#: revision.c:2271

3050 #, c-format

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

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

3053

3044 -#: revision.c:2453

3054 +#: revision.c:2465

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

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

3057

3048 -#: run-command.c:644

3058 +#: run-command.c:645

3059 msgid "open /dev/null failed"

3060 msgstr "échec de l'ouverture de /dev/null"

3061

3062 +#: run-command.c:1188

3063 +#, c-format

3064 +msgid ""

3065 +"The '%s' hook was ignored because it's not set as executable.\n"

3066 +"You can disable this warning with `git config advice.ignoredHook false`."

3067 +msgstr ""

3068 +"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

3069 +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`."

3070 +

3071 #: send-pack.c:151

3072 #, c-format

3073 msgid "unable to parse remote unpack status: %s"

@@ -3118,13 +3137,13 @@ msgstr ""

3137 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

3138 "puis validez le résultat avec 'git commit'"

3139

3121 -#: sequencer.c:297 sequencer.c:1704

3140 +#: sequencer.c:297 sequencer.c:1715

3141 #, c-format

3142 msgid "could not lock '%s'"

3143 msgstr "impossible de verrouiller '%s'"

3144

3126 -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3127 -#: sequencer.c:2733 sequencer.c:2749

3145 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

3146 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

3147 #, c-format

3148 msgid "could not write to '%s'"

3149 msgstr "impossible d'écrire dans '%s'"

@@ -3134,13 +3153,13 @@ msgstr "impossible d'écrire dans '%s'"

3153 msgid "could not write eol to '%s'"

3154 msgstr "impossible d'écrire la fin de ligne dans '%s'"

3155

3137 -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3156 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

3157 #, c-format

3158 msgid "failed to finalize '%s'."

3159 msgstr "échec lors de la finalisation de '%s'."

3160

3142 -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3143 -#: builtin/commit.c:754 builtin/merge.c:1044

3161 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

3162 +#: builtin/commit.c:754 builtin/merge.c:1046

3163 #, c-format

3164 msgid "could not read '%s'"

3165 msgstr "impossible de lire '%s'"

@@ -3162,20 +3181,20 @@ msgstr "%s : avance rapide"

3181 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3182 #. "rebase -i".

3183 #.

3165 -#: sequencer.c:474

3184 +#: sequencer.c:477

3185 #, c-format

3186 msgid "%s: Unable to write new index file"

3187 msgstr "%s: Impossible d'écrire le nouveau fichier index"

3188

3170 -#: sequencer.c:493

3189 +#: sequencer.c:496

3190 msgid "could not resolve HEAD commit\n"

3191 msgstr "impossible de résoudre le commit HEAD\n"

3192

3174 -#: sequencer.c:513

3193 +#: sequencer.c:516

3194 msgid "unable to update cache tree\n"

3195 msgstr "impossible de mettre à jour l'arbre de cache\n"

3196

3178 -#: sequencer.c:597

3197 +#: sequencer.c:600

3198 #, c-format

3199 msgid ""

3200 "you have staged changes in your working tree\n"

@@ -3204,17 +3223,17 @@ msgstr ""

3223 "\n"

3224 " git rebase --continue\n"

3225

3207 -#: sequencer.c:699

3226 +#: sequencer.c:702

3227 #, c-format

3228 msgid "could not parse commit %s\n"

3229 msgstr "impossible d'analyser le commit %s\n"

3230

3212 -#: sequencer.c:704

3231 +#: sequencer.c:707

3232 #, c-format

3233 msgid "could not parse parent commit %s\n"

3234 msgstr "impossible d'analyser le commit parent %s\n"

3235

3217 -#: sequencer.c:826

3236 +#: sequencer.c:836

3237 #, c-format

3238 msgid ""

3239 "unexpected 1st line of squash message:\n"

@@ -3225,7 +3244,7 @@ msgstr ""

3244 "\n"

3245 "\t%.*s"

3246

3228 -#: sequencer.c:832

3247 +#: sequencer.c:842

3248 #, c-format

3249 msgid ""

3250 "invalid 1st line of squash message:\n"

@@ -3236,233 +3255,233 @@ msgstr ""

3255 "\n"

3256 "\t%.*s"

3257

3239 -#: sequencer.c:838 sequencer.c:863

3258 +#: sequencer.c:848 sequencer.c:873

3259 #, c-format

3260 msgid "This is a combination of %d commits."

3261 msgstr "Ceci est la combinaison de %d commits."

3262

3244 -#: sequencer.c:847 sequencer.c:2681

3263 +#: sequencer.c:857 sequencer.c:2742

3264 msgid "need a HEAD to fixup"

3265 msgstr "une HEAD est nécessaire à la correction"

3266

3248 -#: sequencer.c:849

3267 +#: sequencer.c:859

3268 msgid "could not read HEAD"

3269 msgstr "Impossible de lire HEAD"

3270

3252 -#: sequencer.c:851

3271 +#: sequencer.c:861

3272 msgid "could not read HEAD's commit message"

3273 msgstr "impossible de lire le message de validation de HEAD"

3274

3256 -#: sequencer.c:857

3275 +#: sequencer.c:867

3276 #, c-format

3277 msgid "cannot write '%s'"

3278 msgstr "impossible d'écrire '%s'"

3279

3261 -#: sequencer.c:866 git-rebase--interactive.sh:446

3280 +#: sequencer.c:876 git-rebase--interactive.sh:446

3281 msgid "This is the 1st commit message:"

3282 msgstr "Ceci est le premier message de validation :"

3283

3265 -#: sequencer.c:874

3284 +#: sequencer.c:884

3285 #, c-format

3286 msgid "could not read commit message of %s"

3287 msgstr "impossible de lire le message de validation de %s"

3288

3270 -#: sequencer.c:881

3289 +#: sequencer.c:891

3290 #, c-format

3291 msgid "This is the commit message #%d:"

3292 msgstr "Ceci est le message de validation numéro %d :"

3293

3275 -#: sequencer.c:886

3294 +#: sequencer.c:896

3295 #, c-format

3296 msgid "The commit message #%d will be skipped:"

3297 msgstr "Le message de validation %d sera ignoré :"

3298

3280 -#: sequencer.c:891

3299 +#: sequencer.c:901

3300 #, c-format

3301 msgid "unknown command: %d"

3302 msgstr "commande inconnue : %d"

3303

3285 -#: sequencer.c:957

3304 +#: sequencer.c:967

3305 msgid "your index file is unmerged."

3306 msgstr "votre fichier d'index n'est pas fusionné."

3307

3289 -#: sequencer.c:975

3308 +#: sequencer.c:986

3309 #, c-format

3310 msgid "commit %s is a merge but no -m option was given."

3311 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

3312

3294 -#: sequencer.c:983

3313 +#: sequencer.c:994

3314 #, c-format

3315 msgid "commit %s does not have parent %d"

3316 msgstr "le commit %s n'a pas de parent %d"

3317

3299 -#: sequencer.c:987

3318 +#: sequencer.c:998

3319 #, c-format

3320 msgid "mainline was specified but commit %s is not a merge."

3321 msgstr ""

3322 "une branche principale a été spécifiée mais le commit %s n'est pas une "

3323 "fusion."

3324

3306 -#: sequencer.c:993

3325 +#: sequencer.c:1004

3326 #, c-format

3327 msgid "cannot get commit message for %s"

3328 msgstr "impossible d'obtenir un message de validation pour %s"

3329

3330 #. TRANSLATORS: The first %s will be a "todo" command like

3331 #. "revert" or "pick", the second %s a SHA1.

3313 -#: sequencer.c:1014

3332 +#: sequencer.c:1025

3333 #, c-format

3334 msgid "%s: cannot parse parent commit %s"

3335 msgstr "%s : impossible d'analyser le commit parent %s"

3336

3318 -#: sequencer.c:1077 sequencer.c:1853

3337 +#: sequencer.c:1088 sequencer.c:1864

3338 #, c-format

3339 msgid "could not rename '%s' to '%s'"

3340 msgstr "impossible de renommer '%s' en '%s'"

3341

3323 -#: sequencer.c:1128

3342 +#: sequencer.c:1139

3343 #, c-format

3344 msgid "could not revert %s... %s"

3345 msgstr "impossible d'annuler %s... %s"

3346

3328 -#: sequencer.c:1129

3347 +#: sequencer.c:1140

3348 #, c-format

3349 msgid "could not apply %s... %s"

3350 msgstr "impossible d'appliquer %s... %s"

3351

3333 -#: sequencer.c:1171

3352 +#: sequencer.c:1182

3353 msgid "empty commit set passed"

3354 msgstr "l'ensemble de commits spécifié est vide"

3355

3337 -#: sequencer.c:1181

3356 +#: sequencer.c:1192

3357 #, c-format

3358 msgid "git %s: failed to read the index"

3359 msgstr "git %s : échec à la lecture de l'index"

3360

3342 -#: sequencer.c:1188

3361 +#: sequencer.c:1198

3362 #, c-format

3363 msgid "git %s: failed to refresh the index"

3364 msgstr "git %s : échec du rafraîchissement de l'index"

3365

3347 -#: sequencer.c:1308

3366 +#: sequencer.c:1319

3367 #, c-format

3368 msgid "invalid line %d: %.*s"

3369 msgstr "ligne %d invalide : %.*s"

3370

3352 -#: sequencer.c:1316

3371 +#: sequencer.c:1327

3372 #, c-format

3373 msgid "cannot '%s' without a previous commit"

3374 msgstr "'%s' impossible avec le commit précédent"

3375

3357 -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3358 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3376 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3377 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3378 #, c-format

3379 msgid "could not read '%s'."

3380 msgstr "impossible de lire '%s'."

3381

3363 -#: sequencer.c:1361

3382 +#: sequencer.c:1372

3383 msgid "please fix this using 'git rebase --edit-todo'."

3384 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3385

3367 -#: sequencer.c:1363

3386 +#: sequencer.c:1374

3387 #, c-format

3388 msgid "unusable instruction sheet: '%s'"

3389 msgstr "feuille d'instruction inutilisable : '%s'"

3390

3372 -#: sequencer.c:1368

3391 +#: sequencer.c:1379

3392 msgid "no commits parsed."

3393 msgstr "aucun commit analysé."

3394

3376 -#: sequencer.c:1379

3395 +#: sequencer.c:1390

3396 msgid "cannot cherry-pick during a revert."

3397 msgstr "impossible de picorer pendant l'annulation d'un commit."

3398

3380 -#: sequencer.c:1381

3399 +#: sequencer.c:1392

3400 msgid "cannot revert during a cherry-pick."

3401 msgstr "impossible d'annuler un commit pendant un picorage."

3402

3384 -#: sequencer.c:1448

3403 +#: sequencer.c:1459

3404 #, c-format

3405 msgid "invalid key: %s"

3406 msgstr "clé invalide : %s"

3407

3389 -#: sequencer.c:1451

3408 +#: sequencer.c:1462

3409 #, c-format

3410 msgid "invalid value for %s: %s"

3411 msgstr "valeur invalide pour %s : %s"

3412

3394 -#: sequencer.c:1517

3413 +#: sequencer.c:1528

3414 #, c-format

3415 msgid "malformed options sheet: '%s'"

3416 msgstr "feuille d'options malformée : %s"

3417

3399 -#: sequencer.c:1555

3418 +#: sequencer.c:1566

3419 msgid "a cherry-pick or revert is already in progress"

3420 msgstr "un picorage ou un retour est déjà en cours"

3421

3403 -#: sequencer.c:1556

3422 +#: sequencer.c:1567

3423 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3424 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

3425

3407 -#: sequencer.c:1559

3426 +#: sequencer.c:1570

3427 #, c-format

3428 msgid "could not create sequencer directory '%s'"

3429 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3430

3412 -#: sequencer.c:1574

3431 +#: sequencer.c:1585

3432 msgid "could not lock HEAD"

3433 msgstr "impossible de verrouiller HEAD"

3434

3416 -#: sequencer.c:1632 sequencer.c:2211

3435 +#: sequencer.c:1643 sequencer.c:2227

3436 msgid "no cherry-pick or revert in progress"

3437 msgstr "aucun picorage ou retour en cours"

3438

3420 -#: sequencer.c:1634

3439 +#: sequencer.c:1645

3440 msgid "cannot resolve HEAD"

3441 msgstr "impossible de résoudre HEAD"

3442

3424 -#: sequencer.c:1636 sequencer.c:1671

3443 +#: sequencer.c:1647 sequencer.c:1682

3444 msgid "cannot abort from a branch yet to be born"

3445 msgstr "impossible d'abandonner depuis une branche non encore créée"

3446

3428 -#: sequencer.c:1657 builtin/grep.c:711

3447 +#: sequencer.c:1668 builtin/grep.c:713

3448 #, c-format

3449 msgid "cannot open '%s'"

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

3451

3433 -#: sequencer.c:1659

3452 +#: sequencer.c:1670

3453 #, c-format

3454 msgid "cannot read '%s': %s"

3455 msgstr "impossible de lire '%s' : %s"

3456

3438 -#: sequencer.c:1660

3457 +#: sequencer.c:1671

3458 msgid "unexpected end of file"

3459 msgstr "fin de fichier inattendue"

3460

3442 -#: sequencer.c:1666

3461 +#: sequencer.c:1677

3462 #, c-format

3463 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3464 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

3465

3447 -#: sequencer.c:1677

3466 +#: sequencer.c:1688

3467 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3468 msgstr ""

3469 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3470

3452 -#: sequencer.c:1818 sequencer.c:2109

3471 +#: sequencer.c:1829 sequencer.c:2125

3472 msgid "cannot read HEAD"

3473 msgstr "impossible de lire HEAD"

3474

3456 -#: sequencer.c:1858 builtin/difftool.c:640

3475 +#: sequencer.c:1869 builtin/difftool.c:639

3476 #, c-format

3477 msgid "could not copy '%s' to '%s'"

3478 msgstr "impossible de copier '%s' vers '%s'"

3479

3461 -#: sequencer.c:1874

3480 +#: sequencer.c:1888

3481 msgid "could not read index"

3482 msgstr "impossible de lire l'index"

3483

3465 -#: sequencer.c:1879

3484 +#: sequencer.c:1893

3485 #, c-format

3486 msgid ""

3487 "execution failed: %s\n"

@@ -3477,11 +3496,11 @@ msgstr ""

3496 "git rebase --continue\n"

3497 "\n"

3498

3480 -#: sequencer.c:1885

3499 +#: sequencer.c:1899

3500 msgid "and made changes to the index and/or the working tree\n"

3501 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3502

3484 -#: sequencer.c:1891

3503 +#: sequencer.c:1905

3504 #, c-format

3505 msgid ""

3506 "execution succeeded: %s\n"

@@ -3498,17 +3517,17 @@ msgstr ""

3517 " git rebase --continue\n"

3518 "\n"

3519

3501 -#: sequencer.c:1948

3520 +#: sequencer.c:1964

3521 #, c-format

3522 msgid "Applied autostash.\n"

3523 msgstr "Autoremisage appliqué.\n"

3524

3506 -#: sequencer.c:1960

3525 +#: sequencer.c:1976

3526 #, c-format

3527 msgid "cannot store %s"

3528 msgstr "impossible de stocker %s"

3529

3511 -#: sequencer.c:1963 git-rebase.sh:175

3530 +#: sequencer.c:1979 git-rebase.sh:175

3531 #, c-format

3532 msgid ""

3533 "Applying autostash resulted in conflicts.\n"

@@ -3519,57 +3538,57 @@ msgstr ""

3538 "Vos modifications sont à l'abri dans la remise.\n"

3539 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

3540

3522 -#: sequencer.c:2045

3541 +#: sequencer.c:2061

3542 #, c-format

3543 msgid "Stopped at %s... %.*s\n"

3544 msgstr "arrêt à %s... %.*s\n"

3545

3527 -#: sequencer.c:2087

3546 +#: sequencer.c:2103

3547 #, c-format

3548 msgid "unknown command %d"

3549 msgstr "commande inconnue %d"

3550

3532 -#: sequencer.c:2117

3551 +#: sequencer.c:2133

3552 msgid "could not read orig-head"

3553 msgstr "impossible de lire orig-head"

3554

3536 -#: sequencer.c:2122 sequencer.c:2678

3555 +#: sequencer.c:2138 sequencer.c:2739

3556 msgid "could not read 'onto'"

3557 msgstr "impossible de lire 'onto'"

3558

3540 -#: sequencer.c:2129

3559 +#: sequencer.c:2145

3560 #, c-format

3561 msgid "could not update %s"

3562 msgstr "impossible de mettre à jour %s"

3563

3545 -#: sequencer.c:2136

3564 +#: sequencer.c:2152

3565 #, c-format

3566 msgid "could not update HEAD to %s"

3567 msgstr "impossible de mettre à jour HEAD sur %s"

3568

3550 -#: sequencer.c:2220

3569 +#: sequencer.c:2236

3570 msgid "cannot rebase: You have unstaged changes."

3571 msgstr "impossible de rebaser : vous avez des modifications non indexées."

3572

3554 -#: sequencer.c:2225

3573 +#: sequencer.c:2241

3574 msgid "could not remove CHERRY_PICK_HEAD"

3575 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3576

3558 -#: sequencer.c:2234

3577 +#: sequencer.c:2250

3578 msgid "cannot amend non-existing commit"

3579 msgstr "impossible de corriger un commit non-existant"

3580

3562 -#: sequencer.c:2236

3581 +#: sequencer.c:2252

3582 #, c-format

3583 msgid "invalid file: '%s'"

3584 msgstr "fichier invalide : '%s'"

3585

3567 -#: sequencer.c:2238

3586 +#: sequencer.c:2254

3587 #, c-format

3588 msgid "invalid contents: '%s'"

3589 msgstr "contenu invalide : '%s'"

3590

3572 -#: sequencer.c:2241

3591 +#: sequencer.c:2257

3592 msgid ""

3593 "\n"

3594 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3579,50 +3598,45 @@ msgstr ""

3598 "Vous avez des modifications non validées dans votre copie de travail.\n"

3599 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

3600

3582 -#: sequencer.c:2251

3601 +#: sequencer.c:2267

3602 msgid "could not commit staged changes."

3603 msgstr "impossible de valider les modifications indexées."

3604

3586 -#: sequencer.c:2331

3605 +#: sequencer.c:2347

3606 #, c-format

3607 msgid "%s: can't cherry-pick a %s"

3608 msgstr "%s : impossible de picorer un %s"

3609

3591 -#: sequencer.c:2335

3610 +#: sequencer.c:2351

3611 #, c-format

3612 msgid "%s: bad revision"

3613 msgstr "%s : mauvaise révision"

3614

3596 -#: sequencer.c:2368

3615 +#: sequencer.c:2384

3616 msgid "can't revert as initial commit"

3617 msgstr "impossible d'annuler en tant que commit initial"

3618

3600 -#: sequencer.c:2471

3619 +#: sequencer.c:2489

3620 msgid "make_script: unhandled options"

3621 msgstr "make_script : options non gérées"

3622

3604 -#: sequencer.c:2474

3623 +#: sequencer.c:2492

3624 msgid "make_script: error preparing revisions"

3625 msgstr "make_script : erreur lors de la préparation des révisions"

3626

3608 -#: sequencer.c:2510

3627 +#: sequencer.c:2526 sequencer.c:2561

3628 #, c-format

3629 msgid "unusable todo list: '%s'"

3630 msgstr "liste à faire inutilisable : '%s'"

3631

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

3632 +#: sequencer.c:2609

3633 #, c-format

3634 msgid ""

3635 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3636 msgstr ""

3637 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

3638

3625 -#: sequencer.c:2641

3639 +#: sequencer.c:2689

3640 #, c-format

3641 msgid ""

3642 "Warning: some commits may have been dropped accidentally.\n"

@@ -3631,7 +3645,7 @@ msgstr ""

3645 "Attention : certains commits ont pu être accidentellement supprimés.\n"

3646 "Commits supprimés (du plus jeune au plus vieux) :\n"

3647

3634 -#: sequencer.c:2648

3648 +#: sequencer.c:2696

3649 #, c-format

3650 msgid ""

3651 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3649,7 +3663,7 @@ msgstr ""

3663 "Les comportements disponibles sont : ignore, warn, error.\n"

3664 "\n"

3665

3652 -#: sequencer.c:2660

3666 +#: sequencer.c:2708

3667 #, c-format

3668 msgid ""

3669 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3660,31 +3674,21 @@ msgstr ""

3674 "rebase --continue'.\n"

3675 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

3676

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

3677 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3678 +#: builtin/am.c:779

3679 #, c-format

3680 msgid "could not open '%s' for writing"

3681 msgstr "impossible d'ouvrir '%s' en écriture"

3682

3674 -#: sequencer.c:2756

3683 +#: sequencer.c:2769

3684 #, c-format

3676 -msgid "could not truncate '%s'"

3677 -msgstr "impossible de tronquer '%s'"

3685 +msgid "could not parse commit '%s'"

3686 +msgstr "impossible d'analyser le commit '%s'"

3687

3679 -#: sequencer.c:2848

3688 +#: sequencer.c:2891

3689 msgid "the script was already rearranged."

3690 msgstr "le script a déjà été réarrangé."

3691

3683 -#: sequencer.c:2953

3684 -#, c-format

3685 -msgid "could not finish '%s'"

3686 -msgstr "impossible de finir '%s'"

3687 -

3692 #: setup.c:171

3693 #, c-format

3694 msgid ""

@@ -3717,34 +3721,34 @@ msgstr ""

3721 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3722 "'git <commande> [<révision>...] -- [<chemin>...]'"

3723

3720 -#: setup.c:499

3724 +#: setup.c:501

3725 #, c-format

3726 msgid "Expected git repo version <= %d, found %d"

3727 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

3728

3725 -#: setup.c:507

3729 +#: setup.c:509

3730 msgid "unknown repository extensions found:"

3731 msgstr "extensions de dépôt inconnues trouvées :"

3732

3729 -#: setup.c:806

3733 +#: setup.c:811

3734 #, c-format

3735 msgid "Not a git repository (or any of the parent directories): %s"

3736 msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3737

3734 -#: setup.c:808 builtin/index-pack.c:1653

3738 +#: setup.c:813 builtin/index-pack.c:1653

3739 msgid "Cannot come back to cwd"

3740 msgstr "Impossible de revenir au répertoire de travail courant"

3741

3738 -#: setup.c:1046

3742 +#: setup.c:1052

3743 msgid "Unable to read current working directory"

3744 msgstr "Impossible d'accéder au répertoire de travail courant"

3745

3742 -#: setup.c:1058 setup.c:1064

3746 +#: setup.c:1064 setup.c:1070

3747 #, c-format

3748 msgid "Cannot change to '%s'"

3749 msgstr "Impossible de modifié en '%s'"

3750

3747 -#: setup.c:1077

3751 +#: setup.c:1083

3752 #, c-format

3753 msgid ""

3754 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3755,7 +3759,7 @@ msgstr ""

3759 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

3760 "n'est pas activé)."

3761

3758 -#: setup.c:1159

3762 +#: setup.c:1167

3763 #, c-format

3764 msgid ""

3765 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3765,43 +3769,43 @@ msgstr ""

3769 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

3770 "écriture."

3771

3768 -#: sha1_file.c:528

3772 +#: sha1_file.c:598

3773 #, c-format

3774 msgid "path '%s' does not exist"

3775 msgstr "le chemin '%s' n'existe pas"

3776

3773 -#: sha1_file.c:554

3777 +#: sha1_file.c:624

3778 #, c-format

3779 msgid "reference repository '%s' as a linked checkout is not supported yet."

3780 msgstr ""

3781 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

3782 "encore supporté."

3783

3780 -#: sha1_file.c:560

3784 +#: sha1_file.c:630

3785 #, c-format

3786 msgid "reference repository '%s' is not a local repository."

3787 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

3788

3785 -#: sha1_file.c:566

3789 +#: sha1_file.c:636

3790 #, c-format

3791 msgid "reference repository '%s' is shallow"

3792 msgstr "le dépôt de référence '%s' est superficiel"

3793

3790 -#: sha1_file.c:574

3794 +#: sha1_file.c:644

3795 #, c-format

3796 msgid "reference repository '%s' is grafted"

3797 msgstr "le dépôt de référence '%s' est greffé"

3798

3795 -#: sha1_name.c:420

3799 +#: sha1_name.c:422

3800 #, c-format

3801 msgid "short SHA1 %s is ambiguous"

3802 msgstr "le SHA1 court %s est ambigu"

3803

3800 -#: sha1_name.c:431

3804 +#: sha1_name.c:433

3805 msgid "The candidates are:"

3806 msgstr "Les candidats sont :"

3807

3804 -#: sha1_name.c:590

3808 +#: sha1_name.c:693

3809 msgid ""

3810 "Git normally never creates a ref that ends with 40 hex characters\n"

3811 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3826,72 +3830,72 @@ msgstr ""

3830 "message\n"

3831 "en lançant \"git config advice.objectNameWarning false\""

3832

3829 -#: submodule.c:93 submodule.c:127

3833 +#: submodule.c:96 submodule.c:130

3834 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3835 msgstr ""

3836 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

3837 "d'abord"

3838

3835 -#: submodule.c:97 submodule.c:131

3839 +#: submodule.c:100 submodule.c:134

3840 #, c-format

3841 msgid "Could not find section in .gitmodules where path=%s"

3842 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

3843

3840 -#: submodule.c:105

3844 +#: submodule.c:108

3845 #, c-format

3846 msgid "Could not update .gitmodules entry %s"

3847 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

3848

3849 # ici %s est un chemin

3846 -#: submodule.c:138

3850 +#: submodule.c:141

3851 #, c-format

3852 msgid "Could not remove .gitmodules entry for %s"

3853 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

3854

3851 -#: submodule.c:149

3855 +#: submodule.c:152

3856 msgid "staging updated .gitmodules failed"

3857 msgstr "échec de la mise en index du .gitmodules mis à jour"

3858

3855 -#: submodule.c:309

3859 +#: submodule.c:312

3860 #, c-format

3861 msgid "in unpopulated submodule '%s'"

3862 msgstr "dans le sous-module '%s' non populé"

3863

3860 -#: submodule.c:340

3864 +#: submodule.c:343

3865 #, c-format

3866 msgid "Pathspec '%s' is in submodule '%.*s'"

3867 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

3868

3865 -#: submodule.c:799

3869 +#: submodule.c:833

3870 #, c-format

3871 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3872 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

3873

3870 -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3874 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3875 msgid "Failed to resolve HEAD as a valid ref."

3876 msgstr "Échec de résolution de HEAD comme référence valide."

3877

3874 -#: submodule.c:1304

3878 +#: submodule.c:1370

3879 #, c-format

3880 msgid "'%s' not recognized as a git repository"

3881 msgstr "'%s' n'est pas reconnu comme dépôt git"

3882

3879 -#: submodule.c:1442

3883 +#: submodule.c:1508

3884 #, c-format

3885 msgid "could not start 'git status' in submodule '%s'"

3886 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

3887

3884 -#: submodule.c:1455

3888 +#: submodule.c:1521

3889 #, c-format

3890 msgid "could not run 'git status' in submodule '%s'"

3891 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

3892

3889 -#: submodule.c:1548

3893 +#: submodule.c:1614

3894 #, c-format

3895 msgid "submodule '%s' has dirty index"

3896 msgstr "le sous-module '%s' a un index sale"

3897

3894 -#: submodule.c:1809

3898 +#: submodule.c:1876

3899 #, c-format

3900 msgid ""

3901 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3899,18 +3903,18 @@ msgstr ""

3903 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

3904 "n'est pas supporté"

3905

3902 -#: submodule.c:1821 submodule.c:1877

3906 +#: submodule.c:1888 submodule.c:1944

3907 #, c-format

3908 msgid "could not lookup name for submodule '%s'"

3909 msgstr "impossible de trouve le nom pour le sous-module '%s'"

3910

3907 -#: submodule.c:1825 builtin/submodule--helper.c:671

3908 -#: builtin/submodule--helper.c:681

3911 +#: submodule.c:1892 builtin/submodule--helper.c:909

3912 +#: builtin/submodule--helper.c:919

3913 #, c-format

3914 msgid "could not create directory '%s'"

3915 msgstr "impossible de créer le répertoire '%s'"

3916

3913 -#: submodule.c:1828

3917 +#: submodule.c:1895

3918 #, c-format

3919 msgid ""

3920 "Migrating git directory of '%s%s' from\n"

@@ -3921,20 +3925,20 @@ msgstr ""

3925 "'%s' sur\n"

3926 "'%s'\n"

3927

3924 -#: submodule.c:1912

3928 +#: submodule.c:1979

3929 #, c-format

3930 msgid "could not recurse into submodule '%s'"

3931 msgstr "récursion impossible dans le sous-module '%s'"

3932

3929 -#: submodule.c:1956

3933 +#: submodule.c:2023

3934 msgid "could not start ls-files in .."

3935 msgstr "impossible de démarrer ls-files dans .."

3936

3933 -#: submodule.c:1976

3937 +#: submodule.c:2043

3938 msgid "BUG: returned path string doesn't match cwd?"

3939 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

3940

3937 -#: submodule.c:1995

3941 +#: submodule.c:2062

3942 #, c-format

3943 msgid "ls-tree returned unexpected return code %d"

3944 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

@@ -4002,17 +4006,17 @@ msgstr "impossible de créer un fichier temporaire"

4006 msgid "could not rename temporary file to %s"

4007 msgstr "impossible de renommer un fichier temporaire en %s"

4008

4005 -#: transport.c:62

4009 +#: transport.c:63

4010 #, c-format

4011 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4012 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

4013

4010 -#: transport.c:151

4014 +#: transport.c:152

4015 #, c-format

4016 msgid "transport: invalid depth option '%s'"

4017 msgstr "transport : option de profondeur invalide '%s'"

4018

4015 -#: transport.c:888

4019 +#: transport.c:904

4020 #, c-format

4021 msgid ""

4022 "The following submodule paths contain changes that can\n"

@@ -4021,7 +4025,7 @@ msgstr ""

4025 "Les chemins suivant de sous-module contiennent des modifications\n"

4026 "qui ne peuvent être trouvées sur aucun distant :\n"

4027

4024 -#: transport.c:892

4028 +#: transport.c:908

4029 #, c-format

4030 msgid ""

4031 "\n"

@@ -4048,11 +4052,11 @@ msgstr ""

4052 "pour les pousser vers un serveur distant.\n"

4053 "\n"

4054

4051 -#: transport.c:900

4055 +#: transport.c:916

4056 msgid "Aborting."

4057 msgstr "Abandon."

4058

4055 -#: transport-helper.c:1071

4059 +#: transport-helper.c:1074

4060 #, c-format

4061 msgid "Could not read ref %s"

4062 msgstr "impossible de lire la réf %s"

@@ -4073,7 +4077,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"

4077 msgid "too-short tree file"

4078 msgstr "fichier arbre trop court"

4079

4076 -#: unpack-trees.c:106

4080 +#: unpack-trees.c:107

4081 #, c-format

4082 msgid ""

4083 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4084,7 +4088,7 @@ msgstr ""

4088 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

4089 "branche."

4090

4087 -#: unpack-trees.c:108

4091 +#: unpack-trees.c:109

4092 #, c-format

4093 msgid ""

4094 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4094,7 +4098,7 @@ msgstr ""

4098 "l'extraction :\n"

4099 "%%s"

4100

4097 -#: unpack-trees.c:111

4101 +#: unpack-trees.c:112

4102 #, c-format

4103 msgid ""

4104 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4104,7 +4108,7 @@ msgstr ""

4108 "fusion :\n"

4109 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

4110

4107 -#: unpack-trees.c:113

4111 +#: unpack-trees.c:114

4112 #, c-format

4113 msgid ""

4114 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4114,7 +4118,7 @@ msgstr ""

4118 "fusion :\n"

4119 "%%s"

4120

4117 -#: unpack-trees.c:116

4121 +#: unpack-trees.c:117

4122 #, c-format

4123 msgid ""

4124 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4123,7 +4127,7 @@ msgstr ""

4127 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4128 "%%sVeuillez valider ou remiser vos modifications avant %s."

4129

4126 -#: unpack-trees.c:118

4130 +#: unpack-trees.c:119

4131 #, c-format

4132 msgid ""

4133 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4132,7 +4136,7 @@ msgstr ""

4136 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4137 "%%s"

4138

4135 -#: unpack-trees.c:123

4139 +#: unpack-trees.c:124

4140 #, c-format

4141 msgid ""

4142 "Updating the following directories would lose untracked files in them:\n"

@@ -4142,7 +4146,7 @@ msgstr ""

4146 "contenus :\n"

4147 "%s"

4148

4145 -#: unpack-trees.c:127

4149 +#: unpack-trees.c:128

4150 #, c-format

4151 msgid ""

4152 "The following untracked working tree files would be removed by checkout:\n"

@@ -4152,7 +4156,7 @@ msgstr ""

4156 "l'extraction :\n"

4157 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4158

4155 -#: unpack-trees.c:129

4159 +#: unpack-trees.c:130

4160 #, c-format

4161 msgid ""

4162 "The following untracked working tree files would be removed by checkout:\n"

@@ -4161,7 +4165,7 @@ msgstr ""

4165 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

4166 "%%s"

4167

4164 -#: unpack-trees.c:132

4168 +#: unpack-trees.c:133

4169 #, c-format

4170 msgid ""

4171 "The following untracked working tree files would be removed by merge:\n"

@@ -4171,7 +4175,7 @@ msgstr ""

4175 "la fusion :\n"

4176 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4177

4174 -#: unpack-trees.c:134

4178 +#: unpack-trees.c:135

4179 #, c-format

4180 msgid ""

4181 "The following untracked working tree files would be removed by merge:\n"

@@ -4180,7 +4184,7 @@ msgstr ""

4184 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

4185 "%%s"

4186

4183 -#: unpack-trees.c:137

4187 +#: unpack-trees.c:138

4188 #, c-format

4189 msgid ""

4190 "The following untracked working tree files would be removed by %s:\n"

@@ -4190,7 +4194,7 @@ msgstr ""

4194 "%s :\n"

4195 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4196

4193 -#: unpack-trees.c:139

4197 +#: unpack-trees.c:140

4198 #, c-format

4199 msgid ""

4200 "The following untracked working tree files would be removed by %s:\n"

@@ -4199,7 +4203,7 @@ msgstr ""

4203 "Les fichiers suivants non suivis seraient effacés par %s :\n"

4204 "%%s"

4205

4202 -#: unpack-trees.c:144

4206 +#: unpack-trees.c:145

4207 #, c-format

4208 msgid ""

4209 "The following untracked working tree files would be overwritten by "

@@ -4210,7 +4214,7 @@ msgstr ""

4214 "l'extraction :\n"

4215 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4216

4213 -#: unpack-trees.c:146

4217 +#: unpack-trees.c:147

4218 #, c-format

4219 msgid ""

4220 "The following untracked working tree files would be overwritten by "

@@ -4220,7 +4224,7 @@ msgstr ""

4224 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

4225 "%%s"

4226

4223 -#: unpack-trees.c:149

4227 +#: unpack-trees.c:150

4228 #, c-format

4229 msgid ""

4230 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4230,7 +4234,7 @@ msgstr ""

4234 "la fusion :\n"

4235 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4236

4233 -#: unpack-trees.c:151

4237 +#: unpack-trees.c:152

4238 #, c-format

4239 msgid ""

4240 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4239,7 +4243,7 @@ msgstr ""

4243 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

4244 "%%s"

4245

4242 -#: unpack-trees.c:154

4246 +#: unpack-trees.c:155

4247 #, c-format

4248 msgid ""

4249 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4249,7 +4253,7 @@ msgstr ""

4253 "%s :\n"

4254 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4255

4252 -#: unpack-trees.c:156

4256 +#: unpack-trees.c:157

4257 #, c-format

4258 msgid ""

4259 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4258,12 +4262,12 @@ msgstr ""

4262 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

4263 "%%s"

4264

4261 -#: unpack-trees.c:163

4265 +#: unpack-trees.c:164

4266 #, c-format

4267 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4268 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

4269

4266 -#: unpack-trees.c:166

4270 +#: unpack-trees.c:167

4271 #, c-format

4272 msgid ""

4273 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4273,7 +4277,7 @@ msgstr ""

4277 "pas à jour :\n"

4278 "%s"

4279

4276 -#: unpack-trees.c:168

4280 +#: unpack-trees.c:169

4281 #, c-format

4282 msgid ""

4283 "The following working tree files would be overwritten by sparse checkout "

@@ -4284,7 +4288,7 @@ msgstr ""

4288 "jour par l'extraction creuse :\n"

4289 "%s"

4290

4287 -#: unpack-trees.c:170

4291 +#: unpack-trees.c:171

4292 #, c-format

4293 msgid ""

4294 "The following working tree files would be removed by sparse checkout "

@@ -4295,7 +4299,7 @@ msgstr ""

4299 "à jour par extraction creuse :\n"

4300 "%s"

4301

4298 -#: unpack-trees.c:172

4302 +#: unpack-trees.c:173

4303 #, c-format

4304 msgid ""

4305 "Cannot update submodule:\n"

@@ -4304,12 +4308,12 @@ msgstr ""

4308 "Mise à jour impossible pour le sous-module :\n"

4309 "%s"

4310

4307 -#: unpack-trees.c:249

4311 +#: unpack-trees.c:250

4312 #, c-format

4313 msgid "Aborting\n"

4314 msgstr "Abandon\n"

4315

4312 -#: unpack-trees.c:331

4316 +#: unpack-trees.c:332

4317 msgid "Checking out files"

4318 msgstr "Extraction des fichiers"

4319

@@ -4352,8 +4356,8 @@ msgstr "échec de la lecture de '%s'"

4356 msgid "could not open '%s' for reading and writing"

4357 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4358

4355 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4356 -#: builtin/am.c:858 builtin/merge.c:1041

4359 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4360 +#: builtin/am.c:862 builtin/merge.c:1043

4361 #, c-format

4362 msgid "could not open '%s' for reading"

4363 msgstr "impossible d'ouvrir '%s' en lecture"

@@ -4367,16 +4371,6 @@ msgstr "impossible d'accéder à '%s'"

4371 msgid "unable to get current working directory"

4372 msgstr "impossible d'accéder au répertoire de travail courant"

4373

4370 -#: wrapper.c:656

4371 -#, c-format

4372 -msgid "could not write to %s"

4373 -msgstr "Impossible d'écrire dans %s"

4374 -

4375 -#: wrapper.c:658

4376 -#, c-format

4377 -msgid "could not close %s"

4378 -msgstr "impossible de fermer %s"

4379 -

4374 #: wt-status.c:150

4375 msgid "Unmerged paths:"

4376 msgstr "Chemins non fusionnés :"

@@ -4404,11 +4398,11 @@ msgstr ""

4398 msgid " (use \"git rm <file>...\" to mark resolution)"

4399 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

4400

4407 -#: wt-status.c:198 wt-status.c:979

4401 +#: wt-status.c:198 wt-status.c:984

4402 msgid "Changes to be committed:"

4403 msgstr "Modifications qui seront validées :"

4404

4411 -#: wt-status.c:216 wt-status.c:988

4405 +#: wt-status.c:216 wt-status.c:993

4406 msgid "Changes not staged for commit:"

4407 msgstr "Modifications qui ne seront pas validées :"

4408

@@ -4513,22 +4507,22 @@ msgstr "contenu modifié, "

4507 msgid "untracked content, "

4508 msgstr "contenu non suivi, "

4509

4516 -#: wt-status.c:819

4510 +#: wt-status.c:824

4511 #, c-format

4512 msgid "Your stash currently has %d entry"

4513 msgid_plural "Your stash currently has %d entries"

4514 msgstr[0] "Votre remisage contient actuellement %d entrée"

4515 msgstr[1] "Votre remisage contient actuellement %d entrées"

4516

4523 -#: wt-status.c:851

4517 +#: wt-status.c:856

4518 msgid "Submodules changed but not updated:"

4519 msgstr "Sous-modules modifiés mais non mis à jour :"

4520

4527 -#: wt-status.c:853

4521 +#: wt-status.c:858

4522 msgid "Submodule changes to be committed:"

4523 msgstr "Changements du sous-module à valider :"

4524

4531 -#: wt-status.c:935

4525 +#: wt-status.c:940

4526 msgid ""

4527 "Do not modify or remove the line above.\n"

4528 "Everything below it will be ignored."

@@ -4536,107 +4530,107 @@ msgstr ""

4530 "Ne touchez pas à la ligne ci-dessus.\n"

4531 "Tout ce qui suit sera éliminé."

4532

4539 -#: wt-status.c:1048

4533 +#: wt-status.c:1053

4534 msgid "You have unmerged paths."

4535 msgstr "Vous avez des chemins non fusionnés."

4536

4543 -#: wt-status.c:1051

4537 +#: wt-status.c:1056

4538 msgid " (fix conflicts and run \"git commit\")"

4539 msgstr " (réglez les conflits puis lancez \"git commit\")"

4540

4547 -#: wt-status.c:1053

4541 +#: wt-status.c:1058

4542 msgid " (use \"git merge --abort\" to abort the merge)"

4543 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

4544

4551 -#: wt-status.c:1058

4545 +#: wt-status.c:1063

4546 msgid "All conflicts fixed but you are still merging."

4547 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

4548

4555 -#: wt-status.c:1061

4549 +#: wt-status.c:1066

4550 msgid " (use \"git commit\" to conclude merge)"

4551 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

4552

4559 -#: wt-status.c:1071

4553 +#: wt-status.c:1076

4554 msgid "You are in the middle of an am session."

4555 msgstr "Vous êtes au milieu d'une session am."

4556

4563 -#: wt-status.c:1074

4557 +#: wt-status.c:1079

4558 msgid "The current patch is empty."

4559 msgstr "Le patch actuel est vide."

4560

4567 -#: wt-status.c:1078

4561 +#: wt-status.c:1083

4562 msgid " (fix conflicts and then run \"git am --continue\")"

4563 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

4564

4571 -#: wt-status.c:1080

4565 +#: wt-status.c:1085

4566 msgid " (use \"git am --skip\" to skip this patch)"

4567 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

4568

4575 -#: wt-status.c:1082

4569 +#: wt-status.c:1087

4570 msgid " (use \"git am --abort\" to restore the original branch)"

4571 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

4572

4579 -#: wt-status.c:1214

4573 +#: wt-status.c:1219

4574 msgid "git-rebase-todo is missing."

4575 msgstr "git-rebase-todo est manquant."

4576

4583 -#: wt-status.c:1216

4577 +#: wt-status.c:1221

4578 msgid "No commands done."

4579 msgstr "Aucune commande réalisée."

4580

4587 -#: wt-status.c:1219

4581 +#: wt-status.c:1224

4582 #, c-format

4583 msgid "Last command done (%d command done):"

4584 msgid_plural "Last commands done (%d commands done):"

4585 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

4586 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

4587

4594 -#: wt-status.c:1230

4588 +#: wt-status.c:1235

4589 #, c-format

4590 msgid " (see more in file %s)"

4591 msgstr " (voir plus dans le fichier %s)"

4592

4599 -#: wt-status.c:1235

4593 +#: wt-status.c:1240

4594 msgid "No commands remaining."

4595 msgstr "Aucune commande restante."

4596

4603 -#: wt-status.c:1238

4597 +#: wt-status.c:1243

4598 #, c-format

4599 msgid "Next command to do (%d remaining command):"

4600 msgid_plural "Next commands to do (%d remaining commands):"

4601 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

4602 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

4603

4610 -#: wt-status.c:1246

4604 +#: wt-status.c:1251

4605 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4606 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

4607

4614 -#: wt-status.c:1259

4608 +#: wt-status.c:1264

4609 #, c-format

4610 msgid "You are currently rebasing branch '%s' on '%s'."

4611 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

4612

4619 -#: wt-status.c:1264

4613 +#: wt-status.c:1269

4614 msgid "You are currently rebasing."

4615 msgstr "Vous êtes en train de rebaser."

4616

4623 -#: wt-status.c:1278

4617 +#: wt-status.c:1283

4618 msgid " (fix conflicts and then run \"git rebase --continue\")"

4619 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

4620

4627 -#: wt-status.c:1280

4621 +#: wt-status.c:1285

4622 msgid " (use \"git rebase --skip\" to skip this patch)"

4623 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

4624

4631 -#: wt-status.c:1282

4625 +#: wt-status.c:1287

4626 msgid " (use \"git rebase --abort\" to check out the original branch)"

4627 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

4628

4635 -#: wt-status.c:1288

4629 +#: wt-status.c:1293

4630 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4631 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

4632

4639 -#: wt-status.c:1292

4633 +#: wt-status.c:1297

4634 #, c-format

4635 msgid ""

4636 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4644,128 +4638,128 @@ msgstr ""

4638 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

4639 "de la branche '%s' sur '%s'."

4640

4647 -#: wt-status.c:1297

4641 +#: wt-status.c:1302

4642 msgid "You are currently splitting a commit during a rebase."

4643 msgstr ""

4644 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

4645

4652 -#: wt-status.c:1300

4646 +#: wt-status.c:1305

4647 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4648 msgstr ""

4649 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

4650

4657 -#: wt-status.c:1304

4651 +#: wt-status.c:1309

4652 #, c-format

4653 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4654 msgstr ""

4655 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

4656 "branche '%s' sur '%s'."

4657

4664 -#: wt-status.c:1309

4658 +#: wt-status.c:1314

4659 msgid "You are currently editing a commit during a rebase."

4660 msgstr ""

4661 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

4662

4669 -#: wt-status.c:1312

4663 +#: wt-status.c:1317

4664 msgid " (use \"git commit --amend\" to amend the current commit)"

4665 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

4666

4673 -#: wt-status.c:1314

4667 +#: wt-status.c:1319

4668 msgid ""

4669 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4670 msgstr ""

4671 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

4672 "modifications)"

4673

4680 -#: wt-status.c:1324

4674 +#: wt-status.c:1329

4675 #, c-format

4676 msgid "You are currently cherry-picking commit %s."

4677 msgstr "Vous êtes actuellement en train de picorer le commit %s."

4678

4685 -#: wt-status.c:1329

4679 +#: wt-status.c:1334

4680 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4681 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

4682

4689 -#: wt-status.c:1332

4683 +#: wt-status.c:1337

4684 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4685 msgstr ""

4686 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

4687

4694 -#: wt-status.c:1334

4688 +#: wt-status.c:1339

4689 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4690 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

4691

4698 -#: wt-status.c:1343

4692 +#: wt-status.c:1348

4693 #, c-format

4694 msgid "You are currently reverting commit %s."

4695 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

4696

4703 -#: wt-status.c:1348

4697 +#: wt-status.c:1353

4698 msgid " (fix conflicts and run \"git revert --continue\")"

4699 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

4700

4707 -#: wt-status.c:1351

4701 +#: wt-status.c:1356

4702 msgid " (all conflicts fixed: run \"git revert --continue\")"

4703 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

4704

4711 -#: wt-status.c:1353

4705 +#: wt-status.c:1358

4706 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4707 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

4708

4715 -#: wt-status.c:1364

4709 +#: wt-status.c:1369

4710 #, c-format

4711 msgid "You are currently bisecting, started from branch '%s'."

4712 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

4713

4720 -#: wt-status.c:1368

4714 +#: wt-status.c:1373

4715 msgid "You are currently bisecting."

4716 msgstr "Vous êtes en cours de bissection."

4717

4724 -#: wt-status.c:1371

4718 +#: wt-status.c:1376

4719 msgid " (use \"git bisect reset\" to get back to the original branch)"

4720 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

4721

4728 -#: wt-status.c:1568

4722 +#: wt-status.c:1573

4723 msgid "On branch "

4724 msgstr "Sur la branche "

4725

4732 -#: wt-status.c:1574

4726 +#: wt-status.c:1579

4727 msgid "interactive rebase in progress; onto "

4728 msgstr "rebasage interactif en cours ; sur "

4729

4736 -#: wt-status.c:1576

4730 +#: wt-status.c:1581

4731 msgid "rebase in progress; onto "

4732 msgstr "rebasage en cours ; sur "

4733

4740 -#: wt-status.c:1581

4734 +#: wt-status.c:1586

4735 msgid "HEAD detached at "

4736 msgstr "HEAD détachée sur "

4737

4744 -#: wt-status.c:1583

4738 +#: wt-status.c:1588

4739 msgid "HEAD detached from "

4740 msgstr "HEAD détachée depuis "

4741

4748 -#: wt-status.c:1586

4742 +#: wt-status.c:1591

4743 msgid "Not currently on any branch."

4744 msgstr "Actuellement sur aucun branche."

4745

4752 -#: wt-status.c:1606

4746 +#: wt-status.c:1611

4747 msgid "Initial commit"

4748 msgstr "Validation initiale"

4749

4756 -#: wt-status.c:1607

4750 +#: wt-status.c:1612

4751 msgid "No commits yet"

4752 msgstr "Aucun commit"

4753

4760 -#: wt-status.c:1621

4754 +#: wt-status.c:1626

4755 msgid "Untracked files"

4756 msgstr "Fichiers non suivis"

4757

4764 -#: wt-status.c:1623

4758 +#: wt-status.c:1628

4759 msgid "Ignored files"

4760 msgstr "Fichiers ignorés"

4761

4768 -#: wt-status.c:1627

4762 +#: wt-status.c:1632

4763 #, c-format

4764 msgid ""

4765 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4777,32 +4771,32 @@ msgstr ""

4771 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

4772 "status')."

4773

4780 -#: wt-status.c:1633

4774 +#: wt-status.c:1638

4775 #, c-format

4776 msgid "Untracked files not listed%s"

4777 msgstr "Fichiers non suivis non affichés%s"

4778

4785 -#: wt-status.c:1635

4779 +#: wt-status.c:1640

4780 msgid " (use -u option to show untracked files)"

4781 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

4782

4789 -#: wt-status.c:1641

4783 +#: wt-status.c:1646

4784 msgid "No changes"

4785 msgstr "Aucune modification"

4786

4793 -#: wt-status.c:1646

4787 +#: wt-status.c:1651

4788 #, c-format

4789 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4790 msgstr ""

4791 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

4792 "\"git commit -a\")\n"

4793

4800 -#: wt-status.c:1649

4794 +#: wt-status.c:1654

4795 #, c-format

4796 msgid "no changes added to commit\n"

4797 msgstr "aucune modification ajoutée à la validation\n"

4798

4805 -#: wt-status.c:1652

4799 +#: wt-status.c:1657

4800 #, c-format

4801 msgid ""

4802 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -4811,62 +4805,62 @@ msgstr ""

4805 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4806 "sont présents (utilisez \"git add\" pour les suivre)\n"

4807

4814 -#: wt-status.c:1655

4808 +#: wt-status.c:1660

4809 #, c-format

4810 msgid "nothing added to commit but untracked files present\n"

4811 msgstr ""

4812 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4813 "sont présents\n"

4814

4821 -#: wt-status.c:1658

4815 +#: wt-status.c:1663

4816 #, c-format

4817 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4818 msgstr ""

4819 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

4820 "suivre)\n"

4821

4828 -#: wt-status.c:1661 wt-status.c:1666

4822 +#: wt-status.c:1666 wt-status.c:1671

4823 #, c-format

4824 msgid "nothing to commit\n"

4825 msgstr "rien à valider\n"

4826

4833 -#: wt-status.c:1664

4827 +#: wt-status.c:1669

4828 #, c-format

4829 msgid "nothing to commit (use -u to show untracked files)\n"

4830 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

4831

4838 -#: wt-status.c:1668

4832 +#: wt-status.c:1673

4833 #, c-format

4834 msgid "nothing to commit, working tree clean\n"

4835 msgstr "rien à valider, la copie de travail est propre\n"

4836

4843 -#: wt-status.c:1780

4837 +#: wt-status.c:1785

4838 msgid "No commits yet on "

4839 msgstr "Encore aucun commit sur "

4840

4847 -#: wt-status.c:1784

4841 +#: wt-status.c:1789

4842 msgid "HEAD (no branch)"

4843 msgstr "HEAD (aucune branche)"

4844

4851 -#: wt-status.c:1813 wt-status.c:1821

4845 +#: wt-status.c:1818 wt-status.c:1826

4846 msgid "behind "

4847 msgstr "derrière "

4848

4855 -#: wt-status.c:1816 wt-status.c:1819

4849 +#: wt-status.c:1821 wt-status.c:1824

4850 msgid "ahead "

4851 msgstr "devant "

4852

4853 #. TRANSLATORS: the action is e.g. "pull with rebase"

4860 -#: wt-status.c:2311

4854 +#: wt-status.c:2318

4855 #, c-format

4856 msgid "cannot %s: You have unstaged changes."

4857 msgstr "Impossible de %s : vous avez des modifications non indexées."

4858

4865 -#: wt-status.c:2317

4859 +#: wt-status.c:2324

4860 msgid "additionally, your index contains uncommitted changes."

4861 msgstr "de plus, votre index contient des modifications non validées."

4862

4869 -#: wt-status.c:2319

4863 +#: wt-status.c:2326

4864 #, c-format

4865 msgid "cannot %s: Your index contains uncommitted changes."

4866 msgstr "%s impossible : votre index contient des modifications non validées."

@@ -4880,126 +4874,130 @@ msgstr "échec lors de l'unlink de '%s'"

4874 msgid "git add [<options>] [--] <pathspec>..."

4875 msgstr "git add [<options>] [--] <chemin>..."

4876

4883 -#: builtin/add.c:82

4877 +#: builtin/add.c:83

4878 #, c-format

4879 msgid "unexpected diff status %c"

4880 msgstr "état de diff inattendu %c"

4881

4888 -#: builtin/add.c:87 builtin/commit.c:291

4882 +#: builtin/add.c:88 builtin/commit.c:291

4883 msgid "updating files failed"

4884 msgstr "échec de la mise à jour des fichiers"

4885

4892 -#: builtin/add.c:97

4886 +#: builtin/add.c:98

4887 #, c-format

4888 msgid "remove '%s'\n"

4889 msgstr "suppression de '%s'\n"

4890

4897 -#: builtin/add.c:153

4891 +#: builtin/add.c:173

4892 msgid "Unstaged changes after refreshing the index:"

4893 msgstr "Modifications non indexées après rafraîchissement de l'index :"

4894

4901 -#: builtin/add.c:213 builtin/rev-parse.c:888

4895 +#: builtin/add.c:233 builtin/rev-parse.c:888

4896 msgid "Could not read the index"

4897 msgstr "Impossible de lire l'index"

4898

4905 -#: builtin/add.c:224

4899 +#: builtin/add.c:244

4900 #, c-format

4901 msgid "Could not open '%s' for writing."

4902 msgstr "Impossible d'ouvrir '%s' en écriture."

4903

4910 -#: builtin/add.c:228

4904 +#: builtin/add.c:248

4905 msgid "Could not write patch"

4906 msgstr "Impossible d'écrire le patch"

4907

4914 -#: builtin/add.c:231

4908 +#: builtin/add.c:251

4909 msgid "editing patch failed"

4910 msgstr "échec de l'édition du patch"

4911

4918 -#: builtin/add.c:234

4912 +#: builtin/add.c:254

4913 #, c-format

4914 msgid "Could not stat '%s'"

4915 msgstr "Stat de '%s' impossible"

4916

4923 -#: builtin/add.c:236

4917 +#: builtin/add.c:256

4918 msgid "Empty patch. Aborted."

4919 msgstr "Patch vide. Abandon."

4920

4927 -#: builtin/add.c:241

4921 +#: builtin/add.c:261

4922 #, c-format

4923 msgid "Could not apply '%s'"

4924 msgstr "Impossible d'appliquer '%s'"

4925

4932 -#: builtin/add.c:251

4926 +#: builtin/add.c:271

4927 msgid "The following paths are ignored by one of your .gitignore files:\n"

4928 msgstr ""

4929 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

4930

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

4931 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

4932 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

4933 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4934 msgid "dry run"

4935 msgstr "simuler l'action"

4936

4943 -#: builtin/add.c:274

4937 +#: builtin/add.c:294

4938 msgid "interactive picking"

4939 msgstr "sélection interactive"

4940

4947 -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4941 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

4942 msgid "select hunks interactively"

4943 msgstr "sélection interactive des sections"

4944

4951 -#: builtin/add.c:276

4945 +#: builtin/add.c:296

4946 msgid "edit current diff and apply"

4947 msgstr "édition du diff actuel et application"

4948

4955 -#: builtin/add.c:277

4949 +#: builtin/add.c:297

4950 msgid "allow adding otherwise ignored files"

4951 msgstr "permettre l'ajout de fichiers ignorés"

4952

4959 -#: builtin/add.c:278

4953 +#: builtin/add.c:298

4954 msgid "update tracked files"

4955 msgstr "mettre à jour les fichiers suivis"

4956

4963 -#: builtin/add.c:279

4957 +#: builtin/add.c:299

4958 +msgid "renormalize EOL of tracked files (implies -u)"

4959 +msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"

4960 +

4961 +#: builtin/add.c:300

4962 msgid "record only the fact that the path will be added later"

4963 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"

4964

4967 -#: builtin/add.c:280

4965 +#: builtin/add.c:301

4966 msgid "add changes from all tracked and untracked files"

4967 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"

4968

4971 -#: builtin/add.c:283

4969 +#: builtin/add.c:304

4970 msgid "ignore paths removed in the working tree (same as --no-all)"

4971 msgstr ""

4972 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"

4973

4976 -#: builtin/add.c:285

4974 +#: builtin/add.c:306

4975 msgid "don't add, only refresh the index"

4976 msgstr "ne pas ajouter, juste rafraîchir l'index"

4977

4980 -#: builtin/add.c:286

4978 +#: builtin/add.c:307

4979 msgid "just skip files which cannot be added because of errors"

4980 msgstr ""

4981 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "

4982 "d'erreurs"

4983

4986 -#: builtin/add.c:287

4984 +#: builtin/add.c:308

4985 msgid "check if - even missing - files are ignored in dry run"

4986 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

4987

4990 -#: builtin/add.c:288 builtin/update-index.c:954

4988 +#: builtin/add.c:309 builtin/update-index.c:964

4989 msgid "(+/-)x"

4990 msgstr "(+/-)x"

4991

4994 -#: builtin/add.c:288 builtin/update-index.c:955

4992 +#: builtin/add.c:309 builtin/update-index.c:965

4993 msgid "override the executable bit of the listed files"

4994 msgstr "outrepasser le bit exécutable pour les fichiers listés"

4995

4998 -#: builtin/add.c:290

4996 +#: builtin/add.c:311

4997 msgid "warn when adding an embedded repository"

4998 msgstr "avertir lors de l'ajout d'un dépôt embarqué"

4999

5002 -#: builtin/add.c:305

5000 +#: builtin/add.c:326

5001 #, c-format

5002 msgid ""

5003 "You've added another git repository inside your current repository.\n"

@@ -5030,48 +5028,48 @@ msgstr ""

5028 "\n"

5029 "Référez-vous à \"git help submodule\" pour plus d'information."

5030

5033 -#: builtin/add.c:333

5031 +#: builtin/add.c:354

5032 #, c-format

5033 msgid "adding embedded git repository: %s"

5034 msgstr "dépôt git embarqué ajouté : %s"

5035

5038 -#: builtin/add.c:351

5036 +#: builtin/add.c:372

5037 #, c-format

5038 msgid "Use -f if you really want to add them.\n"

5039 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"

5040

5043 -#: builtin/add.c:359

5041 +#: builtin/add.c:380

5042 msgid "adding files failed"

5043 msgstr "échec de l'ajout de fichiers"

5044

5047 -#: builtin/add.c:396

5045 +#: builtin/add.c:417

5046 msgid "-A and -u are mutually incompatible"

5047 msgstr "-A et -u sont mutuellement incompatibles"

5048

5051 -#: builtin/add.c:403

5049 +#: builtin/add.c:424

5050 msgid "Option --ignore-missing can only be used together with --dry-run"

5051 msgstr ""

5052 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

5053

5056 -#: builtin/add.c:407

5054 +#: builtin/add.c:428

5055 #, c-format

5056 msgid "--chmod param '%s' must be either -x or +x"

5057 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

5058

5061 -#: builtin/add.c:422

5059 +#: builtin/add.c:443

5060 #, c-format

5061 msgid "Nothing specified, nothing added.\n"

5062 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

5063

5066 -#: builtin/add.c:423

5064 +#: builtin/add.c:444

5065 #, c-format

5066 msgid "Maybe you wanted to say 'git add .'?\n"

5067 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

5068

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

5069 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

5070 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

5071 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

5072 +#: builtin/rm.c:271 builtin/submodule--helper.c:311

5073 msgid "index file corrupt"

5074 msgstr "fichier d'index corrompu"

5075

@@ -5098,87 +5096,87 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'"

5096 msgid "fseek failed"

5097 msgstr "échec de fseek"

5098

5101 -#: builtin/am.c:786

5099 +#: builtin/am.c:790

5100 #, c-format

5101 msgid "could not parse patch '%s'"

5102 msgstr "impossible d'analyser le patch '%s'"

5103

5106 -#: builtin/am.c:851

5104 +#: builtin/am.c:855

5105 msgid "Only one StGIT patch series can be applied at once"

5106 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

5107

5110 -#: builtin/am.c:899

5108 +#: builtin/am.c:903

5109 msgid "invalid timestamp"

5110 msgstr "horodatage invalide"

5111

5114 -#: builtin/am.c:904 builtin/am.c:916

5112 +#: builtin/am.c:908 builtin/am.c:920

5113 msgid "invalid Date line"

5114 msgstr "ligne de Date invalide"

5115

5118 -#: builtin/am.c:911

5116 +#: builtin/am.c:915

5117 msgid "invalid timezone offset"

5118 msgstr "décalage horaire invalide"

5119

5122 -#: builtin/am.c:1004

5120 +#: builtin/am.c:1008

5121 msgid "Patch format detection failed."

5122 msgstr "Échec de détection du format du patch."

5123

5126 -#: builtin/am.c:1009 builtin/clone.c:402

5124 +#: builtin/am.c:1013 builtin/clone.c:402

5125 #, c-format

5126 msgid "failed to create directory '%s'"

5127 msgstr "échec de la création du répertoire '%s'"

5128

5131 -#: builtin/am.c:1013

5129 +#: builtin/am.c:1017

5130 msgid "Failed to split patches."

5131 msgstr "Échec de découpage des patchs."

5132

5135 -#: builtin/am.c:1142 builtin/commit.c:376

5133 +#: builtin/am.c:1146 builtin/commit.c:376

5134 msgid "unable to write index file"

5135 msgstr "impossible d'écrire le fichier d'index"

5136

5139 -#: builtin/am.c:1193

5137 +#: builtin/am.c:1197

5138 #, c-format

5139 msgid "When you have resolved this problem, run \"%s --continue\"."

5140 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

5141

5144 -#: builtin/am.c:1194

5142 +#: builtin/am.c:1198

5143 #, c-format

5144 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5145 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

5146

5149 -#: builtin/am.c:1195

5147 +#: builtin/am.c:1199

5148 #, c-format

5149 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5150 msgstr ""

5151 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

5152 "abort\"."

5153

5156 -#: builtin/am.c:1302

5154 +#: builtin/am.c:1306

5155 msgid "Patch is empty."

5156 msgstr "Le patch actuel est vide."

5157

5160 -#: builtin/am.c:1368

5158 +#: builtin/am.c:1372

5159 #, c-format

5160 msgid "invalid ident line: %.*s"

5161 msgstr "ligne d'identification invalide : %.*s"

5162

5165 -#: builtin/am.c:1390

5163 +#: builtin/am.c:1394

5164 #, c-format

5165 msgid "unable to parse commit %s"

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

5167

5170 -#: builtin/am.c:1584

5168 +#: builtin/am.c:1587

5169 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

5170 msgstr ""

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

5172 "points."

5173

5176 -#: builtin/am.c:1586

5174 +#: builtin/am.c:1589

5175 msgid "Using index info to reconstruct a base tree..."

5176 msgstr ""

5177 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

5178

5181 -#: builtin/am.c:1605

5179 +#: builtin/am.c:1608

5180 msgid ""

5181 "Did you hand edit your patch?\n"

5182 "It does not apply to blobs recorded in its index."

@@ -5186,38 +5184,38 @@ msgstr ""

5184 "Avez-vous édité le patch à la main ?\n"

5185 "Il ne s'applique pas aux blobs enregistrés dans son index."

5186

5189 -#: builtin/am.c:1611

5187 +#: builtin/am.c:1614

5188 msgid "Falling back to patching base and 3-way merge..."

5189 msgstr "Retour à un patch de la base et fusion à 3 points..."

5190

5193 -#: builtin/am.c:1636

5191 +#: builtin/am.c:1639

5192 msgid "Failed to merge in the changes."

5193 msgstr "Échec d'intégration des modifications."

5194

5197 -#: builtin/am.c:1660 builtin/merge.c:641

5195 +#: builtin/am.c:1663 builtin/merge.c:642

5196 msgid "git write-tree failed to write a tree"

5197 msgstr "git write-tree a échoué à écrire un arbre"

5198

5201 -#: builtin/am.c:1667

5199 +#: builtin/am.c:1670

5200 msgid "applying to an empty history"

5201 msgstr "application à un historique vide"

5202

5205 -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5206 -#: builtin/merge.c:849

5203 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

5204 +#: builtin/merge.c:850

5205 msgid "failed to write commit object"

5206 msgstr "échec de l'écriture de l'objet commit"

5207

5210 -#: builtin/am.c:1713 builtin/am.c:1717

5208 +#: builtin/am.c:1716 builtin/am.c:1720

5209 #, c-format

5210 msgid "cannot resume: %s does not exist."

5211 msgstr "impossible de continuer : %s n'existe pas."

5212

5215 -#: builtin/am.c:1733

5213 +#: builtin/am.c:1736

5214 msgid "cannot be interactive without stdin connected to a terminal."

5215 msgstr ""

5216 "impossible d'être interactif sans entrée standard connectée à un terminal."

5217

5220 -#: builtin/am.c:1738

5218 +#: builtin/am.c:1741

5219 msgid "Commit Body is:"

5220 msgstr "Le corps de la validation est :"

5221

@@ -5225,35 +5223,35 @@ msgstr "Le corps de la validation est :"

5223 #. in your translation. The program will only accept English

5224 #. input at this point.

5225 #.

5228 -#: builtin/am.c:1748

5226 +#: builtin/am.c:1751

5227 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5228 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

5229

5232 -#: builtin/am.c:1798

5230 +#: builtin/am.c:1801

5231 #, c-format

5232 msgid "Dirty index: cannot apply patches (dirty: %s)"

5233 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

5234

5237 -#: builtin/am.c:1838 builtin/am.c:1910

5235 +#: builtin/am.c:1841 builtin/am.c:1913

5236 #, c-format

5237 msgid "Applying: %.*s"

5238 msgstr "Application de %.*s"

5239

5242 -#: builtin/am.c:1854

5240 +#: builtin/am.c:1857

5241 msgid "No changes -- Patch already applied."

5242 msgstr "Pas de changement -- Patch déjà appliqué."

5243

5246 -#: builtin/am.c:1862

5244 +#: builtin/am.c:1865

5245 #, c-format

5246 msgid "Patch failed at %s %.*s"

5247 msgstr "le patch a échoué à %s %.*s"

5248

5251 -#: builtin/am.c:1868

5249 +#: builtin/am.c:1871

5250 #, c-format

5251 msgid "The copy of the patch that failed is found in: %s"

5252 msgstr "La copie du patch qui a échoué se trouve dans : %s"

5253

5256 -#: builtin/am.c:1913

5254 +#: builtin/am.c:1916

5255 msgid ""

5256 "No changes - did you forget to use 'git add'?\n"

5257 "If there is nothing left to stage, chances are that something else\n"

@@ -5264,7 +5262,7 @@ msgstr ""

5262 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

5263 "patch."

5264

5267 -#: builtin/am.c:1920

5265 +#: builtin/am.c:1923

5266 msgid ""

5267 "You still have unmerged paths in your index.\n"

5268 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5277,17 +5275,17 @@ msgstr ""

5275 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "

5276 "accepter son état."

5277

5280 -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5278 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

5279 #: builtin/reset.c:340

5280 #, c-format

5281 msgid "Could not parse object '%s'."

5282 msgstr "Impossible d'analyser l'objet '%s'."

5283

5286 -#: builtin/am.c:2081

5284 +#: builtin/am.c:2082

5285 msgid "failed to clean index"

5286 msgstr "échec du nettoyage de l'index"

5287

5290 -#: builtin/am.c:2116

5288 +#: builtin/am.c:2117

5289 msgid ""

5290 "You seem to have moved HEAD since the last 'am' failure.\n"

5291 "Not rewinding to ORIG_HEAD"

@@ -5295,135 +5293,135 @@ msgstr ""

5293 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

5294 "Pas de retour à ORIG_HEAD"

5295

5298 -#: builtin/am.c:2179

5296 +#: builtin/am.c:2180

5297 #, c-format

5298 msgid "Invalid value for --patch-format: %s"

5299 msgstr "Valeur invalide pour --patch-format : %s"

5300

5303 -#: builtin/am.c:2212

5301 +#: builtin/am.c:2213

5302 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5303 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"

5304

5307 -#: builtin/am.c:2213

5305 +#: builtin/am.c:2214

5306 msgid "git am [<options>] (--continue | --skip | --abort)"

5307 msgstr "git am [<options>] (--continue | --quit | --abort)"

5308

5311 -#: builtin/am.c:2219

5309 +#: builtin/am.c:2220

5310 msgid "run interactively"

5311 msgstr "exécution interactive"

5312

5315 -#: builtin/am.c:2221

5313 +#: builtin/am.c:2222

5314 msgid "historical option -- no-op"

5315 msgstr "option historique -- no-op"

5316

5319 -#: builtin/am.c:2223

5317 +#: builtin/am.c:2224

5318 msgid "allow fall back on 3way merging if needed"

5319 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

5320

5323 -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5321 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5322 #: builtin/repack.c:180

5323 msgid "be quiet"

5324 msgstr "être silencieux"

5325

5328 -#: builtin/am.c:2226

5326 +#: builtin/am.c:2227

5327 msgid "add a Signed-off-by line to the commit message"

5328 msgstr "ajouter une ligne Signed-off-by au message de validation"

5329

5332 -#: builtin/am.c:2229

5330 +#: builtin/am.c:2230

5331 msgid "recode into utf8 (default)"

5332 msgstr "recoder en utf-8 (par défaut)"

5333

5336 -#: builtin/am.c:2231

5334 +#: builtin/am.c:2232

5335 msgid "pass -k flag to git-mailinfo"

5336 msgstr "passer l'option -k à git-mailinfo"

5337

5340 -#: builtin/am.c:2233

5338 +#: builtin/am.c:2234

5339 msgid "pass -b flag to git-mailinfo"

5340 msgstr "passer l'option -b à git-mailinfo"

5341

5344 -#: builtin/am.c:2235

5342 +#: builtin/am.c:2236

5343 msgid "pass -m flag to git-mailinfo"

5344 msgstr "passer l'option -m à git-mailinfo"

5345

5348 -#: builtin/am.c:2237

5346 +#: builtin/am.c:2238

5347 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5348 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

5349

5352 -#: builtin/am.c:2240

5350 +#: builtin/am.c:2241

5351 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5352 msgstr ""

5353 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

5354

5357 -#: builtin/am.c:2243

5355 +#: builtin/am.c:2244

5356 msgid "strip everything before a scissors line"

5357 msgstr "retirer tout le contenu avant la ligne des ciseaux"

5358

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

5359 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5360 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5361 +#: builtin/am.c:2273

5362 msgid "pass it through git-apply"

5363 msgstr "le passer jusqu'à git-apply"

5364

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

5365 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5366 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5367 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5368 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5369 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5370 msgid "n"

5371 msgstr "n"

5372

5375 -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5373 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

5374 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5375 msgid "format"

5376 msgstr "format"

5377

5380 -#: builtin/am.c:2269

5378 +#: builtin/am.c:2270

5379 msgid "format the patch(es) are in"

5380 msgstr "format de présentation des patchs"

5381

5384 -#: builtin/am.c:2275

5382 +#: builtin/am.c:2276

5383 msgid "override error message when patch failure occurs"

5384 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

5385

5388 -#: builtin/am.c:2277

5386 +#: builtin/am.c:2278

5387 msgid "continue applying patches after resolving a conflict"

5388 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

5389

5392 -#: builtin/am.c:2280

5390 +#: builtin/am.c:2281

5391 msgid "synonyms for --continue"

5392 msgstr "synonymes de --continue"

5393

5396 -#: builtin/am.c:2283

5394 +#: builtin/am.c:2284

5395 msgid "skip the current patch"

5396 msgstr "sauter le patch courant"

5397

5400 -#: builtin/am.c:2286

5398 +#: builtin/am.c:2287

5399 msgid "restore the original branch and abort the patching operation."

5400 msgstr ""

5401 "restaurer la branche originale et abandonner les applications de patch."

5402

5405 -#: builtin/am.c:2290

5403 +#: builtin/am.c:2291

5404 msgid "lie about committer date"

5405 msgstr "mentir sur la date de validation"

5406

5409 -#: builtin/am.c:2292

5407 +#: builtin/am.c:2293

5408 msgid "use current timestamp for author date"

5409 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

5410

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

5411 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

5412 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5413 msgid "key-id"

5414 msgstr "id-clé"

5415

5418 -#: builtin/am.c:2295

5416 +#: builtin/am.c:2296

5417 msgid "GPG-sign commits"

5418 msgstr "signer les commits avec GPG"

5419

5422 -#: builtin/am.c:2298

5420 +#: builtin/am.c:2299

5421 msgid "(internal use for git-rebase)"

5422 msgstr "(utilisation interne pour git-rebase)"

5423

5426 -#: builtin/am.c:2316

5424 +#: builtin/am.c:2317

5425 msgid ""

5426 "The -b/--binary option has been a no-op for long time, and\n"

5427 "it will be removed. Please do not use it anymore."

@@ -5431,17 +5429,17 @@ msgstr ""

5429 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

5430 "et elle sera supprimée. Veuillez ne plus l'utiliser."

5431

5434 -#: builtin/am.c:2323

5432 +#: builtin/am.c:2324

5433 msgid "failed to read the index"

5434 msgstr "échec à la lecture de l'index"

5435

5438 -#: builtin/am.c:2338

5436 +#: builtin/am.c:2339

5437 #, c-format

5438 msgid "previous rebase directory %s still exists but mbox given."

5439 msgstr ""

5440 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

5441

5444 -#: builtin/am.c:2362

5442 +#: builtin/am.c:2363

5443 #, c-format

5444 msgid ""

5445 "Stray %s directory found.\n"

@@ -5450,7 +5448,7 @@ msgstr ""

5448 "Répertoire abandonné %s trouvé.\n"

5449 "Utilisez \"git am --abort\" pour le supprimer."

5450

5453 -#: builtin/am.c:2368

5451 +#: builtin/am.c:2369

5452 msgid "Resolve operation not in progress, we are not resuming."

5453 msgstr ""

5454 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

@@ -5490,21 +5488,72 @@ msgstr "git archive : erreur de protocole"

5488 msgid "git archive: expected a flush"

5489 msgstr "git archive : vidage attendu"

5490

5493 -#: builtin/bisect--helper.c:7

5491 +#: builtin/bisect--helper.c:12

5492 msgid "git bisect--helper --next-all [--no-checkout]"

5493 msgstr "git bisect --helper --next-all [--no-checkout]"

5494

5497 -#: builtin/bisect--helper.c:17

5495 +#: builtin/bisect--helper.c:13

5496 +msgid "git bisect--helper --write-terms <bad_term> <good_term>"

5497 +msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>"

5498 +

5499 +#: builtin/bisect--helper.c:14

5500 +msgid "git bisect--helper --bisect-clean-state"

5501 +msgstr "git bisect--helper --bisect-clean-state"

5502 +

5503 +#: builtin/bisect--helper.c:46

5504 +#, c-format

5505 +msgid "'%s' is not a valid term"

5506 +msgstr "'%s' n'est pas un terme valide"

5507 +

5508 +#: builtin/bisect--helper.c:50

5509 +#, c-format

5510 +msgid "can't use the builtin command '%s' as a term"

5511 +msgstr "impossible d'utiliser la commande incluse '%s' comme terme"

5512 +

5513 +#: builtin/bisect--helper.c:60

5514 +#, c-format

5515 +msgid "can't change the meaning of the term '%s'"

5516 +msgstr "impossible de modifier la signification du terme '%s'"

5517 +

5518 +#: builtin/bisect--helper.c:71

5519 +msgid "please use two different terms"

5520 +msgstr "veuillez utiliser deux termes différents"

5521 +

5522 +#: builtin/bisect--helper.c:78

5523 +msgid "could not open the file BISECT_TERMS"

5524 +msgstr "impossible d'ouvrir le fichier BISECT_TERMS"

5525 +

5526 +#: builtin/bisect--helper.c:120

5527 msgid "perform 'git bisect next'"

5528 msgstr "effectuer 'git bisect next'"

5529

5501 -#: builtin/bisect--helper.c:19

5530 +#: builtin/bisect--helper.c:122

5531 +msgid "write the terms to .git/BISECT_TERMS"

5532 +msgstr "écrire les termes dans .git/BISECT_TERMS"

5533 +

5534 +#: builtin/bisect--helper.c:124

5535 +msgid "cleanup the bisection state"

5536 +msgstr "vérifier l'état de la bissection"

5537 +

5538 +#: builtin/bisect--helper.c:126

5539 +msgid "check for expected revs"

5540 +msgstr "vérifier si des révisions sont attendues"

5541 +

5542 +#: builtin/bisect--helper.c:128

5543 msgid "update BISECT_HEAD instead of checking out the current commit"

5544 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"

5545

5546 +#: builtin/bisect--helper.c:143

5547 +msgid "--write-terms requires two arguments"

5548 +msgstr "--write-terms exige deux arguments"

5549 +

5550 +#: builtin/bisect--helper.c:147

5551 +msgid "--bisect-clean-state requires no arguments"

5552 +msgstr "--bisect-clean-state ne supporte aucun argument"

5553 +

5554 #: builtin/blame.c:27

5555 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5507 -msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

5556 +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"

5557

5558 #: builtin/blame.c:32

5559 msgid "<rev-opts> are documented in git-rev-list(1)"

@@ -5768,55 +5817,55 @@ msgstr "La branche %s est en cours de rebasage sur %s"

5817 msgid "Branch %s is being bisected at %s"

5818 msgstr "La branche %s est en cours de bissection sur %s"

5819

5771 -#: builtin/branch.c:470

5820 +#: builtin/branch.c:471

5821 msgid "cannot copy the current branch while not on any."

5822 msgstr "impossible de copier la branche actuelle, il n'y en a pas."

5823

5775 -#: builtin/branch.c:472

5824 +#: builtin/branch.c:473

5825 msgid "cannot rename the current branch while not on any."

5826 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

5827

5779 -#: builtin/branch.c:483

5828 +#: builtin/branch.c:484

5829 #, c-format

5830 msgid "Invalid branch name: '%s'"

5831 msgstr "Nom de branche invalide : '%s'"

5832

5784 -#: builtin/branch.c:504

5833 +#: builtin/branch.c:511

5834 msgid "Branch rename failed"

5835 msgstr "Échec de renommage de la branche"

5836

5788 -#: builtin/branch.c:506

5837 +#: builtin/branch.c:513

5838 msgid "Branch copy failed"

5839 msgstr "Échec de copie de la branche"

5840

5792 -#: builtin/branch.c:510

5841 +#: builtin/branch.c:517

5842 #, c-format

5794 -msgid "Copied a misnamed branch '%s' away"

5795 -msgstr "Copie d'une branche mal nommée '%s'"

5843 +msgid "Created a copy of a misnamed branch '%s'"

5844 +msgstr "Création d'une copie d'une branche mal nommée '%s'"

5845

5797 -#: builtin/branch.c:513

5846 +#: builtin/branch.c:520

5847 #, c-format

5848 msgid "Renamed a misnamed branch '%s' away"

5849 msgstr "Renommage d'une branche mal nommée '%s'"

5850

5802 -#: builtin/branch.c:519

5851 +#: builtin/branch.c:526

5852 #, c-format

5853 msgid "Branch renamed to %s, but HEAD is not updated!"

5854 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

5855

5807 -#: builtin/branch.c:528

5856 +#: builtin/branch.c:535

5857 msgid "Branch is renamed, but update of config-file failed"

5858 msgstr ""

5859 "La branche est renommée, mais la mise à jour du fichier de configuration a "

5860 "échoué"

5861

5813 -#: builtin/branch.c:530

5862 +#: builtin/branch.c:537

5863 msgid "Branch is copied, but update of config-file failed"

5864 msgstr ""

5865 "La branche est copiée, mais la mise à jour du fichier de configuration a "

5866 "échoué"

5867

5819 -#: builtin/branch.c:546

5868 +#: builtin/branch.c:553

5869 #, c-format

5870 msgid ""

5871 "Please edit the description for the branch\n"

@@ -5827,184 +5876,184 @@ msgstr ""

5876 " %s\n"

5877 "Les lignes commençant par '%c' seront ignorées.\n"

5878

5830 -#: builtin/branch.c:579

5879 +#: builtin/branch.c:586

5880 msgid "Generic options"

5881 msgstr "Options génériques"

5882

5834 -#: builtin/branch.c:581

5883 +#: builtin/branch.c:588

5884 msgid "show hash and subject, give twice for upstream branch"

5885 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

5886

5838 -#: builtin/branch.c:582

5887 +#: builtin/branch.c:589

5888 msgid "suppress informational messages"

5889 msgstr "supprimer les messages d'information"

5890

5842 -#: builtin/branch.c:583

5891 +#: builtin/branch.c:590

5892 msgid "set up tracking mode (see git-pull(1))"

5893 msgstr "régler le mode de suivi (voir git-pull(1))"

5894

5846 -#: builtin/branch.c:585

5895 +#: builtin/branch.c:592

5896 msgid "do not use"

5897 msgstr "ne pas utiliser"

5898

5850 -#: builtin/branch.c:587

5899 +#: builtin/branch.c:594

5900 msgid "upstream"

5901 msgstr "amont"

5902

5854 -#: builtin/branch.c:587

5903 +#: builtin/branch.c:594

5904 msgid "change the upstream info"

5905 msgstr "modifier l'information amont"

5906

5858 -#: builtin/branch.c:588

5907 +#: builtin/branch.c:595

5908 msgid "Unset the upstream info"

5909 msgstr "Désactiver l'information amont"

5910

5862 -#: builtin/branch.c:589

5911 +#: builtin/branch.c:596

5912 msgid "use colored output"

5913 msgstr "utiliser la coloration dans la sortie"

5914

5866 -#: builtin/branch.c:590

5915 +#: builtin/branch.c:597

5916 msgid "act on remote-tracking branches"

5917 msgstr "agir sur les branches de suivi distantes"

5918

5870 -#: builtin/branch.c:592 builtin/branch.c:594

5919 +#: builtin/branch.c:599 builtin/branch.c:601

5920 msgid "print only branches that contain the commit"

5921 msgstr "afficher seulement les branches qui contiennent le commit"

5922

5874 -#: builtin/branch.c:593 builtin/branch.c:595

5923 +#: builtin/branch.c:600 builtin/branch.c:602

5924 msgid "print only branches that don't contain the commit"

5925 msgstr "afficher seulement les branches qui ne contiennent pas le commit"

5926

5878 -#: builtin/branch.c:598

5927 +#: builtin/branch.c:605

5928 msgid "Specific git-branch actions:"

5929 msgstr "Actions spécifiques à git-branch :"

5930

5882 -#: builtin/branch.c:599

5931 +#: builtin/branch.c:606

5932 msgid "list both remote-tracking and local branches"

5933 msgstr "afficher à la fois les branches de suivi et les branches locales"

5934

5886 -#: builtin/branch.c:601

5935 +#: builtin/branch.c:608

5936 msgid "delete fully merged branch"

5937 msgstr "supprimer une branche totalement fusionnée"

5938

5890 -#: builtin/branch.c:602

5939 +#: builtin/branch.c:609

5940 msgid "delete branch (even if not merged)"

5941 msgstr "supprimer une branche (même non fusionnée)"

5942

5894 -#: builtin/branch.c:603

5943 +#: builtin/branch.c:610

5944 msgid "move/rename a branch and its reflog"

5945 msgstr "déplacer/renommer une branche et son reflog"

5946

5898 -#: builtin/branch.c:604

5947 +#: builtin/branch.c:611

5948 msgid "move/rename a branch, even if target exists"

5949 msgstr "déplacer/renommer une branche, même si la cible existe"

5950

5902 -#: builtin/branch.c:605

5951 +#: builtin/branch.c:612

5952 msgid "copy a branch and its reflog"

5953 msgstr "copier une branche et son reflog"

5954

5906 -#: builtin/branch.c:606

5955 +#: builtin/branch.c:613

5956 msgid "copy a branch, even if target exists"

5957 msgstr "copier une branche, même si la cible existe"

5958

5910 -#: builtin/branch.c:607

5959 +#: builtin/branch.c:614

5960 msgid "list branch names"

5961 msgstr "afficher les noms des branches"

5962

5914 -#: builtin/branch.c:608

5963 +#: builtin/branch.c:615

5964 msgid "create the branch's reflog"

5965 msgstr "créer le reflog de la branche"

5966

5918 -#: builtin/branch.c:610

5967 +#: builtin/branch.c:617

5968 msgid "edit the description for the branch"

5969 msgstr "éditer la description de la branche"

5970

5922 -#: builtin/branch.c:611

5971 +#: builtin/branch.c:618

5972 msgid "force creation, move/rename, deletion"

5973 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

5974

5926 -#: builtin/branch.c:612

5975 +#: builtin/branch.c:619

5976 msgid "print only branches that are merged"

5977 msgstr "afficher seulement les branches qui sont fusionnées"

5978

5930 -#: builtin/branch.c:613

5979 +#: builtin/branch.c:620

5980 msgid "print only branches that are not merged"

5981 msgstr "afficher seulement les branches qui ne sont pas fusionnées"

5982

5934 -#: builtin/branch.c:614

5983 +#: builtin/branch.c:621

5984 msgid "list branches in columns"

5985 msgstr "afficher les branches en colonnes"

5986

5938 -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405

5987 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

5988 msgid "key"

5989 msgstr "clé"

5990

5942 -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406

5991 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

5992 msgid "field name to sort on"

5993 msgstr "nom du champ servant à trier"

5994

5946 -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408

5995 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

5996 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5997 #: builtin/tag.c:408

5998 msgid "object"

5999 msgstr "objet"

6000

5952 -#: builtin/branch.c:619

6001 +#: builtin/branch.c:626

6002 msgid "print only branches of the object"

6003 msgstr "afficher seulement les branches de l'objet"

6004

5956 -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415

6005 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

6006 msgid "sorting and filtering are case insensitive"

6007 msgstr "le tri et le filtrage sont non-sensibles à la casse"

6008

5960 -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413

6009 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

6010 #: builtin/verify-tag.c:39

6011 msgid "format to use for the output"

6012 msgstr "format à utiliser pour la sortie"

6013

5965 -#: builtin/branch.c:645 builtin/clone.c:729

6014 +#: builtin/branch.c:652 builtin/clone.c:730

6015 msgid "HEAD not found below refs/heads!"

6016 msgstr "HEAD non trouvée sous refs/heads !"

6017

5969 -#: builtin/branch.c:668

6018 +#: builtin/branch.c:675

6019 msgid "--column and --verbose are incompatible"

6020 msgstr "--column et --verbose sont incompatibles"

6021

5973 -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741

6022 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751

6023 msgid "branch name required"

6024 msgstr "le nom de branche est requis"

6025

5977 -#: builtin/branch.c:708

6026 +#: builtin/branch.c:718

6027 msgid "Cannot give description to detached HEAD"

6028 msgstr "Impossible de décrire une HEAD détachée"

6029

5981 -#: builtin/branch.c:713

6030 +#: builtin/branch.c:723

6031 msgid "cannot edit description of more than one branch"

6032 msgstr "impossible d'éditer la description de plus d'une branche"

6033

5985 -#: builtin/branch.c:720

6034 +#: builtin/branch.c:730

6035 #, c-format

6036 msgid "No commit on branch '%s' yet."

6037 msgstr "Aucun commit sur la branche '%s'."

6038

5990 -#: builtin/branch.c:723

6039 +#: builtin/branch.c:733

6040 #, c-format

6041 msgid "No branch named '%s'."

6042 msgstr "Aucune branche nommée '%s'."

6043

5995 -#: builtin/branch.c:738

6044 +#: builtin/branch.c:748

6045 msgid "too many branches for a copy operation"

6046 msgstr "trop de branches pour une opération de copie"

6047

5999 -#: builtin/branch.c:747

6048 +#: builtin/branch.c:757

6049 msgid "too many arguments for a rename operation"

6050 msgstr "trop d'arguments pour une opération de renommage"

6051

6003 -#: builtin/branch.c:752

6052 +#: builtin/branch.c:762

6053 msgid "too many arguments to set new upstream"

6054 msgstr "trop d'arguments pour spécifier une branche amont"

6055

6007 -#: builtin/branch.c:756

6056 +#: builtin/branch.c:766

6057 #, c-format

6058 msgid ""

6059 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -6012,41 +6061,37 @@ msgstr ""

6061 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

6062 "aucune branche."

6063

6015 -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800

6064 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807

6065 #, c-format

6066 msgid "no such branch '%s'"

6067 msgstr "pas de branche '%s'"

6068

6020 -#: builtin/branch.c:763

6069 +#: builtin/branch.c:773

6070 #, c-format

6071 msgid "branch '%s' does not exist"

6072 msgstr "la branche '%s' n'existe pas"

6073

6025 -#: builtin/branch.c:775

6074 +#: builtin/branch.c:785

6075 msgid "too many arguments to unset upstream"

6076 msgstr "trop d'arguments pour désactiver un amont"

6077

6029 -#: builtin/branch.c:779

6078 +#: builtin/branch.c:789

6079 msgid "could not unset upstream of HEAD when it does not point to any branch."

6080 msgstr ""

6081 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

6082 "aucune branche."

6083

6035 -#: builtin/branch.c:785

6084 +#: builtin/branch.c:795

6085 #, c-format

6086 msgid "Branch '%s' has no upstream information"

6087 msgstr "La branche '%s' n'a aucune information de branche amont"

6088

6040 -#: builtin/branch.c:797

6041 -msgid "it does not make sense to create 'HEAD' manually"

6042 -msgstr "créer manuellement 'HEAD' n'a pas de sens"

6043 -

6044 -#: builtin/branch.c:803

6089 +#: builtin/branch.c:810

6090 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

6091 msgstr ""

6092 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

6093

6049 -#: builtin/branch.c:806

6094 +#: builtin/branch.c:813

6095 msgid ""

6096 "the '--set-upstream' option is no longer supported. Please use '--track' or "

6097 "'--set-upstream-to' instead."

@@ -6111,7 +6156,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

6156 msgid "for blob objects, run filters on object's content"

6157 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"

6158

6114 -#: builtin/cat-file.c:569 git-submodule.sh:943

6159 +#: builtin/cat-file.c:569 git-submodule.sh:931

6160 msgid "blob"

6161 msgstr "blob"

6162

@@ -6171,7 +6216,7 @@ msgid "terminate input and output records by a NUL character"

6216 msgstr ""

6217 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

6218

6174 -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358

6219 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6220 msgid "suppress progress reporting"

6221 msgstr "supprimer l'état d'avancement"

6222

@@ -6228,164 +6273,164 @@ msgstr "aucun contact spécifié"

6273 msgid "git checkout-index [<options>] [--] [<file>...]"

6274 msgstr "git checkout-index [<options>] [--] [<fichier>...]"

6275

6231 -#: builtin/checkout-index.c:145

6276 +#: builtin/checkout-index.c:143

6277 msgid "stage should be between 1 and 3 or all"

6278 msgstr "stage doit valoir entre 1 et 3, ou all"

6279

6235 -#: builtin/checkout-index.c:161

6280 +#: builtin/checkout-index.c:159

6281 msgid "check out all files in the index"

6282 msgstr "extraire tous les fichiers présents dans l'index"

6283

6239 -#: builtin/checkout-index.c:162

6284 +#: builtin/checkout-index.c:160

6285 msgid "force overwrite of existing files"

6286 msgstr "forcer l'écrasement des fichiers existants"

6287

6243 -#: builtin/checkout-index.c:164

6288 +#: builtin/checkout-index.c:162

6289 msgid "no warning for existing files and files not in index"

6290 msgstr ""

6291 "pas d'avertissement pour les fichiers existants et les fichiers absents de "

6292 "l'index"

6293

6249 -#: builtin/checkout-index.c:166

6294 +#: builtin/checkout-index.c:164

6295 msgid "don't checkout new files"

6296 msgstr "ne pas extraire les nouveaux fichiers"

6297

6253 -#: builtin/checkout-index.c:168

6298 +#: builtin/checkout-index.c:166

6299 msgid "update stat information in the index file"

6300 msgstr "mettre à jour l'information de stat dans le fichier d'index"

6301

6257 -#: builtin/checkout-index.c:172

6302 +#: builtin/checkout-index.c:170

6303 msgid "read list of paths from the standard input"

6304 msgstr "lire la liste des chemins depuis l'entrée standard"

6305

6261 -#: builtin/checkout-index.c:174

6306 +#: builtin/checkout-index.c:172

6307 msgid "write the content to temporary files"

6308 msgstr "écrire le contenu dans des fichiers temporaires"

6309

6265 -#: builtin/checkout-index.c:175 builtin/column.c:31

6266 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631

6267 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999

6268 -#: builtin/worktree.c:498

6310 +#: builtin/checkout-index.c:173 builtin/column.c:31

6311 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6312 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6313 +#: builtin/worktree.c:552

l10n: fr.po v2.16.0 round 1