0859ed62b4 · matheusbsbs/matheus-bagliano

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

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2018-06-16 22:06+0800\n"

78 -"PO-Revision-Date: 2018-06-16 20:42+0200\n"

77 +"POT-Creation-Date: 2018-08-21 08:28+0800\n"

78 +"PO-Revision-Date: 2018-08-23 22:48+0200\n"

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

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

81 "Language: fr\n"

@@ -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:92

87 +#: advice.c:97

88 #, c-format

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

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

91

92 -#: advice.c:137

92 +#: advice.c:150

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:139

96 +#: advice.c:152

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:141

100 +#: advice.c:154

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:143

104 +#: advice.c:156

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:145

108 +#: advice.c:158

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:147

112 +#: advice.c:160

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:155

117 +#: advice.c:168

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:163

125 +#: advice.c:176

126 msgid "Exiting because of an unresolved conflict."

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

128

129 -#: advice.c:168 builtin/merge.c:1250

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

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:170

133 +#: advice.c:183

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

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

136

137 -#: advice.c:171

137 +#: advice.c:184

138 msgid "Exiting because of unfinished merge."

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

140

141 -#: advice.c:177

141 +#: advice.c:190

142 #, c-format

143 msgid ""

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

@@ -170,99 +170,99 @@ msgstr ""

170 " git checkout -b <nom-de-la-nouvelle-branche>\n"

171 "\n"

172

173 -#: apply.c:58

173 +#: apply.c:59

174 #, c-format

175 msgid "unrecognized whitespace option '%s'"

176 msgstr "option d'espace non reconnue '%s'"

177

178 -#: apply.c:74

178 +#: apply.c:75

179 #, c-format

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

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

182

183 -#: apply.c:122

183 +#: apply.c:125

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

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

186

187 -#: apply.c:124

187 +#: apply.c:127

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

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

190

191 -#: apply.c:127

191 +#: apply.c:130

192 msgid "--3way outside a repository"

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

194

195 -#: apply.c:138

195 +#: apply.c:141

196 msgid "--index outside a repository"

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

198

199 -#: apply.c:141

199 +#: apply.c:144

200 msgid "--cached outside a repository"

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

202

203 -#: apply.c:821

203 +#: apply.c:826

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:830

208 +#: apply.c:835

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:904

213 +#: apply.c:909

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:942

218 +#: apply.c:947

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:948

225 +#: apply.c:953

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:949

232 +#: apply.c:954

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:954

239 +#: apply.c:959

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:983

245 +#: apply.c:988

246 #, c-format

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

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

249

250 -#: apply.c:1301

250 +#: apply.c:1306

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:1473

255 +#: apply.c:1478

256 #, c-format

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

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

259

260 -#: apply.c:1542

260 +#: apply.c:1547

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:1562

265 +#: apply.c:1567

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:1575

280 +#: apply.c:1580

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:1763

286 +#: apply.c:1768

287 msgid "new file depends on old contents"

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

289

290 -#: apply.c:1765

290 +#: apply.c:1770

291 msgid "deleted file still has contents"

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

293

294 -#: apply.c:1799

294 +#: apply.c:1804

295 #, c-format

296 msgid "corrupt patch at line %d"

297 msgstr "patch corrompu à la ligne %d"

298

299 -#: apply.c:1836

299 +#: apply.c:1841

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:1838

304 +#: apply.c:1843

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:1841

309 +#: apply.c:1846

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:1988

314 +#: apply.c:1993

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:2025

319 +#: apply.c:2030

320 #, c-format

321 msgid "unrecognized binary patch at line %d"

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

323

324 -#: apply.c:2185

324 +#: apply.c:2190

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:2271

329 +#: apply.c:2276

330 #, c-format

331 msgid "unable to read symlink %s"

332 msgstr "lecture du lien symbolique %s impossible"

333

334 -#: apply.c:2275

334 +#: apply.c:2280

335 #, c-format

336 msgid "unable to open or read %s"

337 msgstr "ouverture ou lecture de %s impossible"

338

339 -#: apply.c:2934

339 +#: apply.c:2939

340 #, c-format

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

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

343

344 -#: apply.c:3055

344 +#: apply.c:3060

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:3067

351 +#: apply.c:3072

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:3073

356 +#: apply.c:3078

357 #, c-format

358 msgid ""

359 "while searching for:\n"

@@ -362,576 +362,630 @@ msgstr ""

362 "pendant la recherche de :\n"

363 "%.*s"

364

365 -#: apply.c:3095

365 +#: apply.c:3100

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:3103

370 +#: apply.c:3108

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:3149

377 +#: apply.c:3154

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:3159

383 +#: apply.c:3164

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:3167

390 +#: apply.c:3172

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:3185

395 +#: apply.c:3190

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:3198

400 +#: apply.c:3203

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:3204

405 +#: apply.c:3209

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:3225

412 +#: apply.c:3230

413 #, c-format

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

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

416

417 -#: apply.c:3347

417 +#: apply.c:3352

418 #, c-format

419 msgid "cannot checkout %s"

420 msgstr "extraction de %s impossible"

421

422 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

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

423 #, c-format

424 msgid "failed to read %s"

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

426

427 -#: apply.c:3404

427 +#: apply.c:3412

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:3433 apply.c:3673

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

433 #, c-format

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

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

436

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

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

438 #, c-format

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

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

441

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

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

443 #, c-format

444 msgid "%s: does not match index"

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

446

447 -#: apply.c:3560

447 +#: apply.c:3568

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:3563

453 +#: apply.c:3571

454 #, c-format

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

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

457

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

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

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:3595

463 +#: apply.c:3603

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:3609

468 +#: apply.c:3617

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:3614

473 +#: apply.c:3622

474 #, c-format

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

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

477

478 -#: apply.c:3640

478 +#: apply.c:3648

479 msgid "removal patch leaves file contents"

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

481

482 -#: apply.c:3712

482 +#: apply.c:3721

483 #, c-format

484 msgid "%s: wrong type"

485 msgstr "%s : type erroné"

486

487 -#: apply.c:3714

487 +#: apply.c:3723

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:3864 apply.c:3866

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

493 #, c-format

494 msgid "invalid path '%s'"

495 msgstr "chemin invalide '%s'"

496

497 -#: apply.c:3922

497 +#: apply.c:3932

498 #, c-format

499 msgid "%s: already exists in index"

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

501

502 -#: apply.c:3925

502 +#: apply.c:3935

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:3945

507 +#: apply.c:3955

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:3950

512 +#: apply.c:3960

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:3970

518 +#: apply.c:3980

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:3974

523 +#: apply.c:3984

524 #, c-format

525 msgid "%s: patch does not apply"

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

527

528 -#: apply.c:3989

528 +#: apply.c:3999

529 #, c-format

530 msgid "Checking patch %s..."

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

532

533 -#: apply.c:4080

533 +#: apply.c:4091

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:4087

539 +#: apply.c:4098

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:4090

544 +#: apply.c:4101

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:4095 builtin/checkout.c:235 builtin/reset.c:140

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

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:4099

554 +#: apply.c:4110

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:4109

559 +#: apply.c:4120

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:4247

564 +#: apply.c:4258

565 #, c-format

566 msgid "unable to remove %s from index"

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

568

569 -#: apply.c:4282

569 +#: apply.c:4292

570 #, c-format

571 msgid "corrupt patch for submodule %s"

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

573

574 -#: apply.c:4288

574 +#: apply.c:4298

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:4296

579 +#: apply.c:4306

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:4302 apply.c:4446

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

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:4343

591 +#: apply.c:4355

592 #, c-format

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

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

595

596 -#: apply.c:4347

596 +#: apply.c:4359

597 #, c-format

598 msgid "closing file '%s'"

599 msgstr "fermeture du fichier '%s'"

600

601 -#: apply.c:4417

601 +#: apply.c:4429

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:4515

606 +#: apply.c:4527

607 #, c-format

608 msgid "Applied patch %s cleanly."

609 msgstr "Patch %s appliqué proprement."

610

611 -#: apply.c:4523

611 +#: apply.c:4535

612 msgid "internal error"

613 msgstr "erreur interne"

614

615 -#: apply.c:4526

615 +#: apply.c:4538

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:4537

622 +#: apply.c:4549

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:4545 builtin/fetch.c:786 builtin/fetch.c:1036

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

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

631

632 -#: apply.c:4559

632 +#: apply.c:4571

633 #, c-format

634 msgid "Hunk #%d applied cleanly."

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

636

637 -#: apply.c:4563

637 +#: apply.c:4575

638 #, c-format

639 msgid "Rejected hunk #%d."

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

641

642 -#: apply.c:4673

642 +#: apply.c:4685

643 #, c-format

644 msgid "Skipped patch '%s'."

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

646

647 -#: apply.c:4681

647 +#: apply.c:4693

648 msgid "unrecognized input"

649 msgstr "entrée non reconnue"

650

651 -#: apply.c:4700

651 +#: apply.c:4712

652 msgid "unable to read index file"

653 msgstr "lecture du fichier d'index impossible"

654

655 -#: apply.c:4837

655 +#: apply.c:4849

656 #, c-format

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

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

659

660 -#: apply.c:4864

660 +#: apply.c:4876

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:4870 apply.c:4885

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

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:4878

674 +#: apply.c:4890

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:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

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

682 msgid "Unable to write new index file"

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

684

685 -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

686 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

687 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

688 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

689 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

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

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

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

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

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

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

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

691 msgid "path"

692 msgstr "chemin"

693

694 -#: apply.c:4922

694 +#: apply.c:4934

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:4925

698 +#: apply.c:4937

699 msgid "apply changes matching the given path"

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

701

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

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

703 msgid "num"

704 msgstr "num"

705

706 -#: apply.c:4928

706 +#: apply.c:4940

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:4931

710 +#: apply.c:4943

711 msgid "ignore additions made by the patch"

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

713

714 -#: apply.c:4933

714 +#: apply.c:4945

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:4937

718 +#: apply.c:4949

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:4939

723 +#: apply.c:4951

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:4941

727 +#: apply.c:4953

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:4943

731 +#: apply.c:4955

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:4945

735 +#: apply.c:4957

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

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

738 +

739 +#: apply.c:4959

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

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

742

739 -#: apply.c:4947

743 +#: apply.c:4961

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

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

746

743 -#: apply.c:4950

747 +#: apply.c:4964

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

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

750

747 -#: apply.c:4952

751 +#: apply.c:4966

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

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

754

751 -#: apply.c:4954

755 +#: apply.c:4968

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

757 msgstr ""

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

759

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

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

761 msgid "paths are separated with NUL character"

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

763

760 -#: apply.c:4959

764 +#: apply.c:4973

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

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

767

764 -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

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

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

766 -#: builtin/pack-objects.c:3177

770 +#: builtin/pack-objects.c:3205

771 msgid "action"

772 msgstr "action"

773

770 -#: apply.c:4961

774 +#: apply.c:4975

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

776 msgstr ""

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

778 "d'espace"

779

776 -#: apply.c:4964 apply.c:4967

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

781 msgid "ignore changes in whitespace when finding context"

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

783

780 -#: apply.c:4970

784 +#: apply.c:4984

785 msgid "apply the patch in reverse"

786 msgstr "appliquer le patch en sens inverse"

787

784 -#: apply.c:4972

788 +#: apply.c:4986

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

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

791

788 -#: apply.c:4974

792 +#: apply.c:4988

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

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

795

792 -#: apply.c:4976

796 +#: apply.c:4990

797 msgid "allow overlapping hunks"

798 msgstr "accepter les recouvrements de sections"

799

796 -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

797 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

798 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

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

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

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

803 msgid "be verbose"

804 msgstr "mode verbeux"

805

802 -#: apply.c:4979

806 +#: apply.c:4993

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

808 msgstr ""

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

810 "fichier"

811

808 -#: apply.c:4982

812 +#: apply.c:4996

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

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

815

812 -#: apply.c:4984 builtin/am.c:2251

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

817 msgid "root"

818 msgstr "racine"

819

816 -#: apply.c:4985

820 +#: apply.c:4999

821 msgid "prepend <root> to all filenames"

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

823

820 -#: archive.c:13

824 +#: archive.c:14

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

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

827

824 -#: archive.c:14

828 +#: archive.c:15

829 msgid "git archive --list"

830 msgstr "git archive --list"

831

828 -#: archive.c:15

832 +#: archive.c:16

833 msgid ""

834 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

835 msgstr ""

836 "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "

837 "apparenté> [<chemin>...]"

838

835 -#: archive.c:16

839 +#: archive.c:17

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

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

842

839 -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

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

844 #, c-format

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

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

847

844 -#: archive.c:434

848 +#: archive.c:446

849 msgid "fmt"

850 msgstr "fmt"

851

848 -#: archive.c:434

852 +#: archive.c:446

853 msgid "archive format"

854 msgstr "format d'archive"

855

852 -#: archive.c:435 builtin/log.c:1462

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

857 msgid "prefix"

858 msgstr "préfixe"

859

856 -#: archive.c:436

860 +#: archive.c:448

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

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

863

860 -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

861 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

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

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

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

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

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

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

868 #: parse-options.h:165

869 msgid "file"

870 msgstr "fichier"

871

868 -#: archive.c:438 builtin/archive.c:89

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

873 msgid "write the archive to this file"

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

875

872 -#: archive.c:440

876 +#: archive.c:452

877 msgid "read .gitattributes in working directory"

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

879

876 -#: archive.c:441

880 +#: archive.c:453

881 msgid "report archived files on stderr"

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

883

880 -#: archive.c:442

884 +#: archive.c:454

885 msgid "store only"

886 msgstr "stockage seulement"

887

884 -#: archive.c:443

888 +#: archive.c:455

889 msgid "compress faster"

890 msgstr "compression rapide"

891

888 -#: archive.c:451

892 +#: archive.c:463

893 msgid "compress better"

894 msgstr "compression efficace"

895

892 -#: archive.c:454

896 +#: archive.c:466

897 msgid "list supported archive formats"

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

899

896 -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

897 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

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

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

902 msgid "repo"

903 msgstr "dépôt"

904

901 -#: archive.c:457 builtin/archive.c:91

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

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

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

908

905 -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

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

910 +#: builtin/notes.c:491

911 msgid "command"

912 msgstr "commande"

913

909 -#: archive.c:459 builtin/archive.c:93

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

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

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

917

913 -#: archive.c:466

918 +#: archive.c:478

919 msgid "Unexpected option --remote"

920 msgstr "Option --remote inattendue"

921

917 -#: archive.c:468

922 +#: archive.c:480

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

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

925

921 -#: archive.c:470

926 +#: archive.c:482

927 msgid "Unexpected option --output"

928 msgstr "Option --output inattendue"

929

925 -#: archive.c:492

930 +#: archive.c:504

931 #, c-format

932 msgid "Unknown archive format '%s'"

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

934

930 -#: archive.c:499

935 +#: archive.c:511

936 #, c-format

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

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

939

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

941 +#, c-format

942 +msgid "cannot stream blob %s"

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

944 +

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

946 +#, c-format

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

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

949 +

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

951 +#, c-format

952 +msgid "cannot read %s"

953 +msgstr "impossible de lire %s"

954 +

955 +#: archive-tar.c:458

956 +#, c-format

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

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

959 +

960 +#: archive-tar.c:461

961 +msgid "unable to redirect descriptor"

962 +msgstr "impossible de rediriger un descripteur"

963 +

964 +#: archive-tar.c:468

965 +#, c-format

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

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

968 +

969 +#: archive-zip.c:313

970 +#, c-format

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

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

973 +

974 +#: archive-zip.c:317

975 +#, c-format

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

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

978 +

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

980 +#, c-format

981 +msgid "deflate error (%d)"

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

983 +

984 +#: archive-zip.c:605

985 +#, c-format

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

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

988 +

989 #: attr.c:218

990 #, c-format

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

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

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

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

1001

948 -#: bisect.c:461

1002 +#: bisect.c:467

1003 #, c-format

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

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

1006

953 -#: bisect.c:669

1007 +#: bisect.c:675

1008 #, c-format

1009 msgid "We cannot bisect more!\n"

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

1011

958 -#: bisect.c:723

1012 +#: bisect.c:729

1013 #, c-format

1014 msgid "Not a valid commit name %s"

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

1016

963 -#: bisect.c:747

1017 +#: bisect.c:753

1018 #, c-format

1019 msgid ""

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

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

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

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

1025

972 -#: bisect.c:752

1026 +#: bisect.c:758

1027 #, c-format

1028 msgid ""

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

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

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

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

1034

981 -#: bisect.c:757

1035 +#: bisect.c:763

1036 #, c-format

1037 msgid ""

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

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

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

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

1043

990 -#: bisect.c:765

1044 +#: bisect.c:771

1045 #, c-format

1046 msgid ""

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

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

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

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

1054

1001 -#: bisect.c:778

1055 +#: bisect.c:784

1056 #, c-format

1057 msgid ""

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

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

1064 "et %s.\n"

1065 "On continue tout de même."

1066

1013 -#: bisect.c:811

1067 +#: bisect.c:817

1068 #, c-format

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

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

1071

1018 -#: bisect.c:851

1072 +#: bisect.c:857

1073 #, c-format

1074 msgid "a %s revision is needed"

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

1076

1023 -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

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

1078 #, c-format

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

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

1081

1028 -#: bisect.c:921

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

1083 #, c-format

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

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

1086

1033 -#: bisect.c:951

1087 +#: bisect.c:957

1088 msgid "reading bisect refs failed"

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

1090

1037 -#: bisect.c:970

1091 +#: bisect.c:976

1092 #, c-format

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

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

1095

1042 -#: bisect.c:978

1096 +#: bisect.c:984

1097 #, c-format

1098 msgid ""

1099 "No testable commit found.\n"

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

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

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

1104

1051 -#: bisect.c:997

1105 +#: bisect.c:1003

1106 #, c-format

1107 msgid "(roughly %d step)"

1108 msgid_plural "(roughly %d steps)"

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

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

1113 #. steps)" translation.

1114 #.

1061 -#: bisect.c:1003

1115 +#: bisect.c:1009

1116 #, c-format

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

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

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

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

1121

1068 -#: blame.c:1756

1122 +#: blame.c:1786

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

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

1125

1072 -#: blame.c:1767

1126 +#: blame.c:1800

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

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

1129

1076 -#: blame.c:1787

1130 +#: blame.c:1821

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

1132 msgstr ""

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

1134 "dernier commit"

1135

1082 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1083 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1084 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

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

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

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

1139 +#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047

1140 #: builtin/shortlog.c:192

1141 msgid "revision walk setup failed"

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

1143

1089 -#: blame.c:1814

1144 +#: blame.c:1848

1145 msgid ""

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

1147 msgstr ""

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

1149 "premier parent"

1150

1096 -#: blame.c:1825

1151 +#: blame.c:1859

1152 #, c-format

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

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

1155

1101 -#: blame.c:1836

1156 +#: blame.c:1870

1157 #, c-format

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

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

@@ -1251,75 +1306,75 @@ msgstr "'%s' est déjà extrait dans '%s'"

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

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

1308

1254 -#: bundle.c:34

1309 +#: bundle.c:36

1310 #, c-format

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

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

1313

1259 -#: bundle.c:62

1314 +#: bundle.c:64

1315 #, c-format

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

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

1318

1264 -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

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

1320 #, c-format

1321 msgid "could not open '%s'"

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

1323

1269 -#: bundle.c:139

1324 +#: bundle.c:141

1325 msgid "Repository lacks these prerequisite commits:"

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

1327

1273 -#: bundle.c:190

1328 +#: bundle.c:192

1329 #, c-format

1330 msgid "The bundle contains this ref:"

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

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

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

1334

1280 -#: bundle.c:197

1335 +#: bundle.c:199

1336 msgid "The bundle records a complete history."

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

1338

1284 -#: bundle.c:199

1339 +#: bundle.c:201

1340 #, c-format

1341 msgid "The bundle requires this ref:"

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

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

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

1345

1291 -#: bundle.c:258

1346 +#: bundle.c:260

1347 msgid "Could not spawn pack-objects"

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

1349

1295 -#: bundle.c:269

1350 +#: bundle.c:271

1351 msgid "pack-objects died"

1352 msgstr "les objets groupés ont disparu"

1353

1299 -#: bundle.c:311

1354 +#: bundle.c:313

1355 msgid "rev-list died"

1356 msgstr "rev-list a disparu"

1357

1303 -#: bundle.c:360

1358 +#: bundle.c:362

1359 #, c-format

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

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

1362

1308 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

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

1364 #, c-format

1365 msgid "unrecognized argument: %s"

1366 msgstr "argument non reconnu : %s"

1367

1313 -#: bundle.c:458

1368 +#: bundle.c:461

1369 msgid "Refusing to create empty bundle."

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

1371

1317 -#: bundle.c:470

1372 +#: bundle.c:473

1373 #, c-format

1374 msgid "cannot create '%s'"

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

1376

1322 -#: bundle.c:498

1377 +#: bundle.c:501

1378 msgid "index-pack died"

1379 msgstr "l'index de groupe a disparu"

1380

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

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

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

1385

1331 -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1332 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

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

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

1388 #: builtin/replace.c:448

1389 #, c-format

1390 msgid "could not parse %s"

1391 msgstr "impossible d'analyser %s"

1392

1338 -#: commit.c:45

1393 +#: commit.c:50

1394 #, c-format

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

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

1397

1343 -#: commit.c:182

1398 +#: commit.c:191

1399 msgid ""

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

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

@@ -1360,7 +1415,7 @@ msgstr ""

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

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

1417

1363 -#: commit.c:1540

1418 +#: commit.c:1629

1419 msgid ""

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

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

@@ -1372,201 +1427,405 @@ msgstr ""

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

1428 "projet.\n"

1429

1375 -#: commit-graph.c:669

1430 +#: commit-graph.c:83

1431 +#, c-format

1432 +msgid "graph file %s is too small"

1433 +msgstr "le fichier de graphe %s est trop petit"

1434 +

1435 +#: commit-graph.c:90

1436 +#, c-format

1437 +msgid "graph signature %X does not match signature %X"

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

1439 +

1440 +#: commit-graph.c:97

1441 +#, c-format

1442 +msgid "graph version %X does not match version %X"

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

1444 +

1445 +#: commit-graph.c:104

1446 +#, c-format

1447 +msgid "hash version %X does not match version %X"

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

1449 +

1450 +#: commit-graph.c:128

1451 +#, c-format

1452 +msgid "improper chunk offset %08x%08x"

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

1454 +

1455 +#: commit-graph.c:164

1456 +#, c-format

1457 +msgid "chunk id %08x appears multiple times"

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

1459 +

1460 +#: commit-graph.c:261

1461 +#, c-format

1462 +msgid "could not find commit %s"

1463 +msgstr "impossible de trouver le commit %s"

1464 +

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

1466 +#, c-format

1467 +msgid "unable to get type of object %s"

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

1469 +

1470 +#: commit-graph.c:730

1471 +#, c-format

1472 +msgid "error adding pack %s"

1473 +msgstr "erreur à l'ajout du packet %s"

1474 +

1475 +#: commit-graph.c:732

1476 +#, c-format

1477 +msgid "error opening index for %s"

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

1479 +

1480 +#: commit-graph.c:773

1481 #, c-format

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

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

1484

1380 -#: commit-graph.c:696

1485 +#: commit-graph.c:800

1486 msgid "too many commits to write graph"

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

1488

1384 -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1489 +#: commit-graph.c:806

1490 #, c-format

1386 -msgid "cannot mkdir %s"

1387 -msgstr "impossible de créer le répertoire (mkdir) %s"

1491 +msgid "unable to create leading directories of %s"

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

1493 +

1494 +#: commit-graph.c:904

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

1496 +msgstr "le graphe de commit a une somme de contrôle incorrecte et est vraisemblablement corrompu"

1497

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

1499 msgid "memory exhausted"

1500 msgstr "plus de mémoire"

1501

1393 -#: config.c:187

1394 -msgid "relative config include conditionals must come from files"

1502 +#: config.c:123

1503 +#, c-format

1504 +msgid ""

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

1506 +"\t%s\n"

1507 +"from\n"

1508 +"\t%s\n"

1509 +"Do you have circular includes?"

1510 msgstr ""

1396 -"les conditions d'inclusion de configuration relative doivent venir de "

1397 -"fichiers"

1511 +"profondeur d'inclusion maximum (%d) dépassée à l'inclusion de\n"

1512 +"\t%s\n"

1513 +"depuis\n"

1514 +"\t%s\n"

1515 +"possibilité d'inclusions multiples."

1516 +

1517 +#: config.c:139

1518 +#, c-format

1519 +msgid "could not expand include path '%s'"

1520 +msgstr "expansion impossible du chemin d'inclusion '%s'"

1521 +

1522 +#: config.c:150

1523 +msgid "relative config includes must come from files"

1524 +msgstr "les inclusions de configuration relatives doivent venir de fichiers"

1525 +

1526 +#: config.c:190

1527 +msgid "relative config include conditionals must come from files"

1528 +msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers"

1529 +

1530 +#: config.c:348

1531 +#, c-format

1532 +msgid "key does not contain a section: %s"

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

1534 +

1535 +#: config.c:354

1536 +#, c-format

1537 +msgid "key does not contain variable name: %s"

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

1539 +

1540 +#: config.c:378 sequencer.c:2206

1541 +#, c-format

1542 +msgid "invalid key: %s"

1543 +msgstr "clé invalide : %s"

1544 +

1545 +#: config.c:384

1546 +#, c-format

1547 +msgid "invalid key (newline): %s"

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

1549

1399 -#: config.c:788

1550 +#: config.c:420 config.c:432

1551 +#, c-format

1552 +msgid "bogus config parameter: %s"

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

1554 +

1555 +#: config.c:467

1556 +#, c-format

1557 +msgid "bogus format in %s"

1558 +msgstr "formatage mal formé dans %s"

1559 +

1560 +#: config.c:793

1561 #, c-format

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

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

1564

1404 -#: config.c:792

1565 +#: config.c:797

1566 #, c-format

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

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

1569

1409 -#: config.c:796

1570 +#: config.c:801

1571 #, c-format

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

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

1574

1414 -#: config.c:800

1575 +#: config.c:805

1576 #, c-format

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

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

1579

1419 -#: config.c:804

1580 +#: config.c:809

1581 #, c-format

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

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

1584

1424 -#: config.c:808

1585 +#: config.c:813

1586 #, c-format

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

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

1589

1429 -#: config.c:936

1590 +#: config.c:952

1591 msgid "out of range"

1592 msgstr "hors plage"

1593

1433 -#: config.c:936

1594 +#: config.c:952

1595 msgid "invalid unit"

1596 msgstr "unité invalide"

1597

1437 -#: config.c:942

1598 +#: config.c:958

1599 #, c-format

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

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

1602

1442 -#: config.c:947

1603 +#: config.c:963

1604 #, c-format

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

1606 msgstr ""

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

1608 "%s : %s"

1609

1449 -#: config.c:950

1610 +#: config.c:966

1611 #, c-format

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

1613 msgstr ""

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

1615 "%s : %s"

1616

1456 -#: config.c:953

1617 +#: config.c:969

1618 #, c-format

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

1620 msgstr ""

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

1622 "standard : %s"

1623

1463 -#: config.c:956

1624 +#: config.c:972

1625 #, c-format

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

1627 msgstr ""

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

1629 "sous-module %s : %s"

1630

1470 -#: config.c:959

1631 +#: config.c:975

1632 #, c-format

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

1634 msgstr ""

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

1636 "commande %s : %s"

1637

1477 -#: config.c:962

1638 +#: config.c:978

1639 #, c-format

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

1641 msgstr ""

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

1643

1483 -#: config.c:1057

1644 +#: config.c:1073

1645 #, c-format

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

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

1648

1488 -#: config.c:1066

1649 +#: config.c:1082

1650 #, c-format

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

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

1653

1493 -#: config.c:1171 config.c:1182

1654 +#: config.c:1173

1655 +#, c-format

1656 +msgid "abbrev length out of range: %d"

1657 +msgstr "longueur d'abbrev hors plage : %d"

1658 +

1659 +#: config.c:1187 config.c:1198

1660 #, c-format

1661 msgid "bad zlib compression level %d"

1662 msgstr "niveau de compression zlib incorrect %d"

1663

1498 -#: config.c:1307

1664 +#: config.c:1290

1665 +msgid "core.commentChar should only be one character"

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

1667 +

1668 +#: config.c:1323

1669 #, c-format

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

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

1672

1503 -#: config.c:1473

1673 +#: config.c:1403

1674 +#, c-format

1675 +msgid "malformed value for %s"

1676 +msgstr "valeur mal formée pour %s"

1677 +

1678 +#: config.c:1429

1679 +#, c-format

1680 +msgid "malformed value for %s: %s"

1681 +msgstr "valeur mal formée pour %s : %s"

1682 +

1683 +#: config.c:1430

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

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

1686 +

1687 +#: config.c:1489 builtin/pack-objects.c:3282

1688 #, c-format

1689 msgid "bad pack compression level %d"

1690 msgstr "niveau de compression du paquet %d"

1691

1508 -#: config.c:1681

1692 +#: config.c:1610

1693 +#, c-format

1694 +msgid "unable to load config blob object '%s'"

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

1696 +

1697 +#: config.c:1613

1698 +#, c-format

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

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

1701 +

1702 +#: config.c:1630

1703 +#, c-format

1704 +msgid "unable to resolve config blob '%s'"

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

1706 +

1707 +#: config.c:1660

1708 +#, c-format

1709 +msgid "failed to parse %s"

1710 +msgstr "échec de l'analyse de %s"

1711 +

1712 +#: config.c:1700

1713 msgid "unable to parse command-line config"

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

1715

1512 -#: config.c:2013

1716 +#: config.c:2032

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

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

1719

1516 -#: config.c:2200

1720 +#: config.c:2202

1721 #, c-format

1722 msgid "Invalid %s: '%s'"

1723 msgstr "%s invalide : '%s'"

1724

1521 -#: config.c:2243

1725 +#: config.c:2245

1726 #, c-format

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

1728 msgstr ""

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

1730 "défaut"

1731

1528 -#: config.c:2269

1732 +#: config.c:2271

1733 #, c-format

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

1735 msgstr ""

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

1737 "100"

1738

1535 -#: config.c:2294

1739 +#: config.c:2296

1740 #, c-format

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

1742 msgstr ""

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

1744

1541 -#: config.c:2296

1745 +#: config.c:2298

1746 #, c-format

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

1748 msgstr ""

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

1750

1547 -#: config.c:2402

1751 +#: config.c:2379

1752 +#, c-format

1753 +msgid "invalid section name '%s'"

1754 +msgstr "nom de section invalide '%s'"

1755 +

1756 +#: config.c:2411

1757 #, c-format

1758 msgid "%s has multiple values"

1759 msgstr "%s a des valeurs multiples"

1760

1552 -#: config.c:2766 config.c:3019

1761 +#: config.c:2440

1762 +#, c-format

1763 +msgid "failed to write new configuration file %s"

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

1765 +

1766 +#: config.c:2691 config.c:3015

1767 +#, c-format

1768 +msgid "could not lock config file %s"

1769 +msgstr "impossible de verrouiller le fichier de configuration %s"

1770 +

1771 +#: config.c:2702

1772 +#, c-format

1773 +msgid "opening %s"

1774 +msgstr "ouverture de %s"

1775 +

1776 +#: config.c:2737 builtin/config.c:324

1777 +#, c-format

1778 +msgid "invalid pattern: %s"

1779 +msgstr "motif invalide : %s"

1780 +

1781 +#: config.c:2762

1782 +#, c-format

1783 +msgid "invalid config file %s"

1784 +msgstr "fichier de configuration invalide %s"

1785 +

1786 +#: config.c:2775 config.c:3028

1787 #, c-format

1788 msgid "fstat on %s failed"

1789 msgstr "échec de fstat sur %s"

1790

1557 -#: config.c:2905

1791 +#: config.c:2786

1792 +#, c-format

1793 +msgid "unable to mmap '%s'"

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

1795 +

1796 +#: config.c:2795 config.c:3033

1797 +#, c-format

1798 +msgid "chmod on %s failed"

1799 +msgstr "échec de chmod sur %s"

1800 +

1801 +#: config.c:2880 config.c:3130

1802 +#, c-format

1803 +msgid "could not write config file %s"

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

1805 +

1806 +#: config.c:2914

1807 #, c-format

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

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

1810

1562 -#: config.c:2907 builtin/remote.c:779

1811 +#: config.c:2916 builtin/remote.c:781

1812 #, c-format

1813 msgid "could not unset '%s'"

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

1815

1816 +#: config.c:3006

1817 +#, c-format

1818 +msgid "invalid section name: %s"

1819 +msgstr "nom de section invalide : %s"

1820 +

1821 +#: config.c:3173

1822 +#, c-format

1823 +msgid "missing value for '%s'"

1824 +msgstr "valeur manquante pour '%s'"

1825 +

1826 #: connect.c:61

1568 -msgid "The remote end hung up upon initial contact"

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

1827 +msgid "the remote end hung up upon initial contact"

1828 +msgstr "l'hôte distant a fermé la connexion lors du contact initial"

1829

1830 #: connect.c:63

1831 msgid ""

@@ -1580,58 +1839,209 @@ msgstr ""

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

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

1841

1583 -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1842 +#: connect.c:81

1843 +#, c-format

1844 +msgid "server doesn't support '%s'"

1845 +msgstr "Le serveur ne supporte pas '%s'"

1846 +

1847 +#: connect.c:103

1848 +#, c-format

1849 +msgid "server doesn't support feature '%s'"

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

1851 +

1852 +#: connect.c:114

1853 +msgid "expected flush after capabilities"

1854 +msgstr "vidage attendu après les capacités"

1855 +

1856 +#: connect.c:233

1857 +#, c-format

1858 +msgid "ignoring capabilities after first line '%s'"

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

1860 +

1861 +#: connect.c:252

1862 +msgid "protocol error: unexpected capabilities^{}"

1863 +msgstr "erreur de protocole : capabilities^{} inattendu"

1864 +

1865 +#: connect.c:273

1866 +#, c-format

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

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

1869 +

1870 +#: connect.c:275

1871 +msgid "repository on the other end cannot be shallow"

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

1873 +

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

1875 +#, c-format

1876 +msgid "remote error: %s"

1877 +msgstr "erreur distante : %s"

1878 +

1879 +#: connect.c:316

1880 +msgid "invalid packet"

1881 +msgstr "paquet invalide"

1882 +

1883 +#: connect.c:336

1884 +#, c-format

1885 +msgid "protocol error: unexpected '%s'"

1886 +msgstr "erreur de protocole : '%s' attendu"

1887 +

1888 +#: connect.c:444

1889 +#, c-format

1890 +msgid "invalid ls-refs response: %s"

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

1892 +

1893 +#: connect.c:448

1894 +msgid "expected flush after ref listing"

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

1896 +

1897 +#: connect.c:547

1898 +#, c-format

1899 +msgid "protocol '%s' is not supported"

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

1901 +

1902 +#: connect.c:598

1903 +msgid "unable to set SO_KEEPALIVE on socket"

1904 +msgstr "impossible de positionner SO_KEEPALIVE sur la socket"

1905 +

1906 +#: connect.c:638 connect.c:701

1907 +#, c-format

1908 +msgid "Looking up %s ... "

1909 +msgstr "Recherche de %s… "

1910 +

1911 +#: connect.c:642

1912 +#, c-format

1913 +msgid "unable to look up %s (port %s) (%s)"

1914 +msgstr "impossible de rechercher %s (port %s) (%s)"

1915 +

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

1917 +#: connect.c:646 connect.c:717

1918 +#, c-format

1919 +msgid ""

1920 +"done.\n"

1921 +"Connecting to %s (port %s) ... "

1922 +msgstr ""

1923 +"fait.\n"

1924 +"Connexion à %s (port %s)… "

1925 +

1926 +#: connect.c:668 connect.c:745

1927 +#, c-format

1928 +msgid ""

1929 +"unable to connect to %s:\n"

1930 +"%s"

1931 +msgstr ""

1932 +"impossible de se connecter à %s :\n"

1933 +"%s"

1934 +

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

1936 +#: connect.c:674 connect.c:751

1937 +msgid "done."

1938 +msgstr "fait."

1939 +

1940 +#: connect.c:705

1941 +#, c-format

1942 +msgid "unable to look up %s (%s)"

1943 +msgstr "impossible de rechercher %s (%s)"

1944 +

1945 +#: connect.c:711

1946 +#, c-format

1947 +msgid "unknown port %s"

1948 +msgstr "port inconnu %s"

1949 +

1950 +#: connect.c:848 connect.c:1174

1951 +#, c-format

1952 +msgid "strange hostname '%s' blocked"

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

1954 +

1955 +#: connect.c:850

1956 +#, c-format

1957 +msgid "strange port '%s' blocked"

1958 +msgstr "port étrange '%s' bloqué"

1959 +

1960 +#: connect.c:860

1961 +#, c-format

1962 +msgid "cannot start proxy %s"

1963 +msgstr "impossible de démarrer un proxy %s"

1964 +

1965 +#: connect.c:927

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

1967 +msgstr "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe d'URL valide"

1968 +

1969 +#: connect.c:1122

1970 +msgid "ssh variant 'simple' does not support -4"

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

1972 +

1973 +#: connect.c:1134

1974 +msgid "ssh variant 'simple' does not support -6"

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

1976 +

1977 +#: connect.c:1151

1978 +msgid "ssh variant 'simple' does not support setting port"

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

1980 +

1981 +#: connect.c:1262

1982 +#, c-format

1983 +msgid "strange pathname '%s' blocked"

1984 +msgstr "chemin étrange '%s' bloqué"

1985 +

1986 +#: connect.c:1307

1987 +msgid "unable to fork"

1988 +msgstr "fork impossible"

1989 +

1990 +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1991 msgid "Checking connectivity"

1992 msgstr "Vérification de la connectivité"

1993

1587 -#: connected.c:78

1994 +#: connected.c:80

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

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

1997

1591 -#: connected.c:98

1998 +#: connected.c:100

1999 msgid "failed write to rev-list"

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

2001

1595 -#: connected.c:105

2002 +#: connected.c:107

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

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

2005

1599 -#: convert.c:206

2006 +#: convert.c:194

2007 #, c-format

1601 -msgid "CRLF would be replaced by LF in %s."

1602 -msgstr "Les CRLF seraient remplacés par des LF dans %s."

2008 +msgid "illegal crlf_action %d"

2009 +msgstr "crlf_action illégal %d"

2010

1604 -#: convert.c:208

2011 +#: convert.c:207

2012 +#, c-format

2013 +msgid "CRLF would be replaced by LF in %s"

2014 +msgstr "Les CRLF seraient remplacés par des LF dans %s"

2015 +

2016 +#: convert.c:209

2017 #, c-format

2018 msgid ""

2019 "CRLF will be replaced by LF in %s.\n"

1608 -"The file will have its original line endings in your working directory."

2020 +"The file will have its original line endings in your working directory"

2021 msgstr ""

2022 "Les CRLF seront remplacés par des LF dans %s.\n"

1611 -"Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1612 -"travail."

2023 +"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"

2024

1614 -#: convert.c:216

2025 +#: convert.c:217

2026 #, c-format

2027 msgid "LF would be replaced by CRLF in %s"

2028 msgstr "Les LF seraient remplacés par des CRLF dans %s"

2029

1619 -#: convert.c:218

2030 +#: convert.c:219

2031 #, c-format

2032 msgid ""

2033 "LF will be replaced by CRLF in %s.\n"

1623 -"The file will have its original line endings in your working directory."

2034 +"The file will have its original line endings in your working directory"

2035 msgstr ""

2036 "Les LF seront remplacés par des CRLF dans %s.\n"

1626 -"Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1627 -"travail."

2037 +"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"

2038

1629 -#: convert.c:279

2039 +#: convert.c:280

2040 #, c-format

2041 msgid "BOM is prohibited in '%s' if encoded as %s"

2042 msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"

2043

1634 -#: convert.c:286

2044 +#: convert.c:287

2045 #, c-format

2046 msgid ""

2047 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

@@ -1640,12 +2050,12 @@ msgstr ""

2050 "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "

2051 "utiliser UTF-%s comme encodage d'arbre de travail."

2052

1643 -#: convert.c:304

2053 +#: convert.c:305

2054 #, c-format

2055 msgid "BOM is required in '%s' if encoded as %s"

2056 msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"

2057

1648 -#: convert.c:306

2058 +#: convert.c:307

2059 #, c-format

2060 msgid ""

2061 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -1655,22 +2065,72 @@ msgstr ""

2065 "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "

2066 "de travail."

2067

1658 -#: convert.c:424

2068 +#: convert.c:425 convert.c:496

2069 #, c-format

2070 msgid "failed to encode '%s' from %s to %s"

2071 msgstr "échec de l'encodage de '%s' de %s vers %s"

2072

1663 -#: convert.c:467

2073 +#: convert.c:468

2074 #, c-format

2075 msgid "encoding '%s' from %s to %s and back is not the same"

2076 msgstr ""

2077 "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "

2078 "contenu"

2079

1670 -#: convert.c:1225

2080 +#: convert.c:674

2081 +#, c-format

2082 +msgid "cannot fork to run external filter '%s'"

2083 +msgstr "impossible de forker pour lancer le filtre externe '%s'"

2084 +

2085 +#: convert.c:694

2086 +#, c-format

2087 +msgid "cannot feed the input to external filter '%s'"

2088 +msgstr "impossible de fournir l'entrée au filtre externe '%s'"

2089 +

2090 +#: convert.c:701

2091 +#, c-format

2092 +msgid "external filter '%s' failed %d"

2093 +msgstr "le filtre externe '%s' a échoué %d"

2094 +

2095 +#: convert.c:736 convert.c:739

2096 +#, c-format

2097 +msgid "read from external filter '%s' failed"

2098 +msgstr "la lecture depuis le filtre externe '%s' a échoué"

2099 +

2100 +#: convert.c:742 convert.c:796

2101 +#, c-format

2102 +msgid "external filter '%s' failed"

2103 +msgstr "le filtre externe '%s' a échoué"

2104 +

2105 +#: convert.c:844

2106 +msgid "unexpected filter type"

2107 +msgstr "type de filtre inattendu"

2108 +

2109 +#: convert.c:855

2110 +msgid "path name too long for external filter"

2111 +msgstr "nom de chemin trop long pour un filtre externe"

2112 +

2113 +#: convert.c:929

2114 +#, c-format

2115 +msgid ""

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

2117 +"been filtered"

2118 +msgstr "le filtre externe '%s' n'est plus disponible bien que tous les chemins n'aient pas été filtrés"

2119 +

2120 +#: convert.c:1228

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

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

2123

2124 +#: convert.c:1402 convert.c:1436

2125 +#, c-format

2126 +msgid "%s: clean filter '%s' failed"

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

2128 +

2129 +#: convert.c:1480

2130 +#, c-format

2131 +msgid "%s: smudge filter %s failed"

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

2133 +

2134 #: date.c:116

2135 msgid "in the future"

2136 msgstr "dans le futur"

@@ -1744,41 +2204,50 @@ msgstr[1] "il y a %<PRIuMAX> ans"

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

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

2206

1747 -#: diffcore-rename.c:535

2207 +#: diffcore-rename.c:536

2208 msgid "Performing inexact rename detection"

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

2210

1751 -#: diff.c:74

2211 +#: diff.c:108

2212 #, c-format

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

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

2215

1756 -#: diff.c:152

2216 +#: diff.c:158

2217 #, c-format

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

2219 msgstr ""

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

2221

1762 -#: diff.c:157

2222 +#: diff.c:163

2223 #, c-format

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

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

2226

1767 -#: diff.c:281

2227 +#: diff.c:291

2228 msgid ""

1769 -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1770 -"'plain'"

1771 -msgstr ""

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

1773 -"'zebra', 'dimmed_zebra', 'plain'"

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

2230 +"'dimmed-zebra', 'plain'"

2231 +msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"

2232

1775 -#: diff.c:341

2233 +#: diff.c:316

2234 +#, c-format

2235 +msgid "ignoring unknown color-moved-ws mode '%s'"

2236 +msgstr "mode color-moved-ws inconnu '%s' ignoré"

2237 +

2238 +#: diff.c:323

2239 +msgid ""

2240 +"color-moved-ws: allow-indentation-change cannot be combined with other white "

2241 +"space modes"

2242 +msgstr "color-moved-ws : allow-indentation-change ne peut pas être combiné avec d'autres modes d'espace"

2243 +

2244 +#: diff.c:394

2245 #, c-format

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

2247 msgstr ""

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

2249

1781 -#: diff.c:401

2250 +#: diff.c:454

2251 #, c-format

2252 msgid ""

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

@@ -1787,24 +2256,24 @@ msgstr ""

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

2257 "%s"

2258

1790 -#: diff.c:3823

2259 +#: diff.c:4096

2260 #, c-format

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

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

2263

1795 -#: diff.c:4153

2264 +#: diff.c:4427

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

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

2267

1799 -#: diff.c:4156

2268 +#: diff.c:4430

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

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

2271

1803 -#: diff.c:4244

2272 +#: diff.c:4508

2273 msgid "--follow requires exactly one pathspec"

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

2275

1807 -#: diff.c:4410

2276 +#: diff.c:4674

2277 #, c-format

2278 msgid ""

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

@@ -1813,24 +2282,24 @@ msgstr ""

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

2283 "%s"

2284

1816 -#: diff.c:4424

2285 +#: diff.c:4688

2286 #, c-format

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

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

2289

1821 -#: diff.c:5500

2290 +#: diff.c:5766

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

2292 msgstr ""

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

2294 "fichiers."

2295

1827 -#: diff.c:5503

2296 +#: diff.c:5769

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

2298 msgstr ""

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

2300 "grand nombre de fichiers."

2301

1833 -#: diff.c:5506

2302 +#: diff.c:5772

2303 #, c-format

2304 msgid ""

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

@@ -1838,25 +2307,40 @@ msgstr ""

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

2308 "commande."

2309

1841 -#: dir.c:1867

2310 +#: dir.c:569

2311 +#, c-format

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

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

2314 +

2315 +#: dir.c:958

2316 +#, c-format

2317 +msgid "cannot use %s as an exclude file"

2318 +msgstr "impossible d'utiliser %s comme fichier d'exclusion"

2319 +

2320 +#: dir.c:1873

2321 #, c-format

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

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

2324

1846 -#: dir.c:2109

2325 +#: dir.c:2115

2326 msgid "failed to get kernel name and information"

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

2328

1850 -#: dir.c:2233

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

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

2329 +#: dir.c:2239

2330 +msgid "untracked cache is disabled on this system or location"

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

2332 +

2333 +#: dir.c:3037

2334 +#, c-format

2335 +msgid "index file corrupt in repo %s"

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

2337

1854 -#: dir.c:3075 dir.c:3080

2338 +#: dir.c:3082 dir.c:3087

2339 #, c-format

2340 msgid "could not create directories for %s"

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

2342

1859 -#: dir.c:3109

2343 +#: dir.c:3116

2344 #, c-format

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

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

@@ -1868,218 +2352,272 @@ msgstr ""

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

2353 "texte…%c"

2354

1871 -#: entry.c:177

2355 +#: entry.c:178

2356 msgid "Filtering content"

2357 msgstr "Filtrage du contenu"

2358

1875 -#: entry.c:435

2359 +#: entry.c:437

2360 #, c-format

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

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

2363

2364 +#: environment.c:150

2365 +#, c-format

2366 +msgid "bad git namespace path \"%s\""

2367 +msgstr "Espaces de nom de Git \"%s\""

2368 +

2369 +#: environment.c:332

2370 +#, c-format

2371 +msgid "could not set GIT_DIR to '%s'"

2372 +msgstr "impossible de régler GIT_DIR à '%s'"

2373 +

2374 +#: exec-cmd.c:361

2375 +#, c-format

2376 +msgid "too many args to run %s"

2377 +msgstr "trop d'arguments pour lancer %s"

2378 +

2379 #: fetch-object.c:17

2380 msgid "Remote with no URL"

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

2382

1884 -#: fetch-pack.c:254

2383 +#: fetch-pack.c:152

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

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

2386

1888 -#: fetch-pack.c:266

2387 +#: fetch-pack.c:164

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

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

2390

1892 -#: fetch-pack.c:285 builtin/archive.c:63

1893 -#, c-format

1894 -msgid "remote error: %s"

1895 -msgstr "erreur distante : %s"

1896 -

1897 -#: fetch-pack.c:286

2391 +#: fetch-pack.c:184

2392 #, c-format

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

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

2395

1902 -#: fetch-pack.c:338

2396 +#: fetch-pack.c:254

2397 msgid "--stateless-rpc requires multi_ack_detailed"

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

2399

1906 -#: fetch-pack.c:429 fetch-pack.c:1310

2400 +#: fetch-pack.c:342 fetch-pack.c:1257

2401 #, c-format

2402 msgid "invalid shallow line: %s"

2403 msgstr "ligne de superficiel invalide : %s"

2404

1911 -#: fetch-pack.c:435 fetch-pack.c:1316

2405 +#: fetch-pack.c:348 fetch-pack.c:1263

2406 #, c-format

2407 msgid "invalid unshallow line: %s"

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

2409

1916 -#: fetch-pack.c:437 fetch-pack.c:1318

2410 +#: fetch-pack.c:350 fetch-pack.c:1265

2411 #, c-format

2412 msgid "object not found: %s"

2413 msgstr "objet non trouvé : %s"

2414

1921 -#: fetch-pack.c:440 fetch-pack.c:1321

2415 +#: fetch-pack.c:353 fetch-pack.c:1268

2416 #, c-format

2417 msgid "error in object: %s"

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

2419

1926 -#: fetch-pack.c:442 fetch-pack.c:1323

2420 +#: fetch-pack.c:355 fetch-pack.c:1270

2421 #, c-format

2422 msgid "no shallow found: %s"

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

2424

1931 -#: fetch-pack.c:445 fetch-pack.c:1326

2425 +#: fetch-pack.c:358 fetch-pack.c:1273

2426 #, c-format

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

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

2429

1936 -#: fetch-pack.c:486

2430 +#: fetch-pack.c:399

2431 #, c-format

2432 msgid "got %s %d %s"

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

2434

1941 -#: fetch-pack.c:500

2435 +#: fetch-pack.c:416

2436 #, c-format

2437 msgid "invalid commit %s"

2438 msgstr "commit invalide %s"

2439

1946 -#: fetch-pack.c:533

2440 +#: fetch-pack.c:447

2441 msgid "giving up"

2442 msgstr "abandon"

2443

1950 -#: fetch-pack.c:543 progress.c:229

2444 +#: fetch-pack.c:459 progress.c:229

2445 msgid "done"

2446 msgstr "fait"

2447

1954 -#: fetch-pack.c:555

2448 +#: fetch-pack.c:471

2449 #, c-format

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

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

2452

1959 -#: fetch-pack.c:601

2453 +#: fetch-pack.c:517

2454 #, c-format

2455 msgid "Marking %s as complete"

2456 msgstr "Marquage de %s comme terminé"

2457

1964 -#: fetch-pack.c:828

2458 +#: fetch-pack.c:764

2459 #, c-format

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

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

2462

1969 -#: fetch-pack.c:869

2463 +#: fetch-pack.c:803

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

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

2466

1973 -#: fetch-pack.c:877

2467 +#: fetch-pack.c:811

2468 msgid "protocol error: bad pack header"

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

2470

1977 -#: fetch-pack.c:944

2471 +#: fetch-pack.c:879

2472 #, c-format

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

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

2475

1982 -#: fetch-pack.c:960

2476 +#: fetch-pack.c:895

2477 #, c-format

2478 msgid "%s failed"

2479 msgstr "échec de %s"

2480

1987 -#: fetch-pack.c:962

2481 +#: fetch-pack.c:897

2482 msgid "error in sideband demultiplexer"

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

2484

1991 -#: fetch-pack.c:989

2485 +#: fetch-pack.c:926

2486 msgid "Server does not support shallow clients"

2487 msgstr "Le serveur ne supporte les clients superficiels"

2488

1995 -#: fetch-pack.c:993

2489 +#: fetch-pack.c:930

2490 msgid "Server supports multi_ack_detailed"

2491 msgstr "Le serveur supporte multi_ack_detailed"

2492

1999 -#: fetch-pack.c:996

2493 +#: fetch-pack.c:933

2494 msgid "Server supports no-done"

2495 msgstr "Le serveur support no-done"

2496

2003 -#: fetch-pack.c:1002

2497 +#: fetch-pack.c:939

2498 msgid "Server supports multi_ack"

2499 msgstr "Le serveur supporte multi_ack"

2500

2007 -#: fetch-pack.c:1006

2501 +#: fetch-pack.c:943

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

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

2504

2011 -#: fetch-pack.c:1010

2505 +#: fetch-pack.c:947

2506 msgid "Server supports side-band"

2507 msgstr "Le serveru supporte side-band"

2508

2015 -#: fetch-pack.c:1014

2509 +#: fetch-pack.c:951

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

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

2512

2019 -#: fetch-pack.c:1018

2513 +#: fetch-pack.c:955

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

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

2516

2023 -#: fetch-pack.c:1028

2517 +#: fetch-pack.c:965

2518 msgid "Server supports ofs-delta"

2519 msgstr "Le serveur supporte ofs-delta"

2520

2027 -#: fetch-pack.c:1034 fetch-pack.c:1204

2521 +#: fetch-pack.c:971 fetch-pack.c:1150

2522 msgid "Server supports filter"

2523 msgstr "Le serveur supporte filter"

2524

2031 -#: fetch-pack.c:1042

2525 +#: fetch-pack.c:979

2526 #, c-format

2527 msgid "Server version is %.*s"

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

2529

2036 -#: fetch-pack.c:1048

2530 +#: fetch-pack.c:985

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

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

2533

2040 -#: fetch-pack.c:1052

2534 +#: fetch-pack.c:989

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

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

2537

2044 -#: fetch-pack.c:1054

2538 +#: fetch-pack.c:991

2539 msgid "Server does not support --deepen"

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

2541

2048 -#: fetch-pack.c:1065

2542 +#: fetch-pack.c:1004

2543 msgid "no common commits"

2544 msgstr "pas de commit commun"

2545

2052 -#: fetch-pack.c:1077 fetch-pack.c:1414

2546 +#: fetch-pack.c:1016 fetch-pack.c:1393

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

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

2549

2056 -#: fetch-pack.c:1199

2550 +#: fetch-pack.c:1145

2551 msgid "Server does not support shallow requests"

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

2553

2060 -#: fetch-pack.c:1584

2554 +#: fetch-pack.c:1191

2555 +#, c-format

2556 +msgid "error reading section header '%s'"

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

2558 +

2559 +#: fetch-pack.c:1197

2560 +#, c-format

2561 +msgid "expected '%s', received '%s'"

2562 +msgstr "'%s' attendu, '%s' reçu"

2563 +

2564 +#: fetch-pack.c:1236

2565 +#, c-format

2566 +msgid "unexpected acknowledgment line: '%s'"

2567 +msgstr "ligne d'acquittement inattendue : '%s'"

2568 +

2569 +#: fetch-pack.c:1241

2570 +#, c-format

2571 +msgid "error processing acks: %d"

2572 +msgstr "erreur lors du traitement des acquittements : %d"

2573 +

2574 +#: fetch-pack.c:1278

2575 +#, c-format

2576 +msgid "error processing shallow info: %d"

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

2578 +

2579 +#: fetch-pack.c:1294

2580 +#, c-format

2581 +msgid "expected wanted-ref, got '%s'"

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

2583 +

2584 +#: fetch-pack.c:1304

2585 +#, c-format

2586 +msgid "unexpected wanted-ref: '%s'"

2587 +msgstr "wanted-ref inattendu : '%s'"

2588 +

2589 +#: fetch-pack.c:1308

2590 +#, c-format

2591 +msgid "error processing wanted refs: %d"

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

2593 +

2594 +#: fetch-pack.c:1603

2595 msgid "no matching remote head"

2596 msgstr "pas de HEAD distante correspondante"

2597

2064 -#: fetch-pack.c:1610

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

2599 +msgid "remote did not send all necessary objects"

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

2601 +

2602 +#: fetch-pack.c:1647

2603 #, c-format

2604 msgid "no such remote ref %s"

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

2606

2069 -#: fetch-pack.c:1613

2607 +#: fetch-pack.c:1650

2608 #, c-format

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

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

2611

2074 -#: gpg-interface.c:185

2612 +#: gpg-interface.c:253

2613 msgid "gpg failed to sign the data"

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

2615

2078 -#: gpg-interface.c:210

2616 +#: gpg-interface.c:279

2617 msgid "could not create temporary file"

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

2619

2082 -#: gpg-interface.c:213

2620 +#: gpg-interface.c:282

2621 #, c-format

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

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

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

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

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

2629

2092 -#: grep.c:2020

2630 +#: grep.c:2115

2631 #, c-format

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

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

2634

2097 -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2635 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2636 #: builtin/rm.c:134

2637 #, c-format

2638 msgid "failed to stat '%s'"

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

2640

2103 -#: grep.c:2048

2641 +#: grep.c:2143

2642 #, c-format

2643 msgid "'%s': short read"

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

@@ -2180,7 +2718,7 @@ msgstr "type de liste de commandes non supporté '%s'"

2718 msgid "The common Git guides are:"

2719 msgstr "Les guides Git populaires sont :"

2720

2183 -#: help.c:467

2721 +#: help.c:552

2722 #, c-format

2723 msgid ""

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

@@ -2189,33 +2727,33 @@ msgstr ""

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

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

2729

2192 -#: help.c:526

2730 +#: help.c:611

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

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

2733

2196 -#: help.c:548

2734 +#: help.c:633

2735 #, c-format

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

2737 msgstr ""

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

2739

2202 -#: help.c:553

2740 +#: help.c:638

2741 #, c-format

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

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

2744

2207 -#: help.c:558

2745 +#: help.c:643

2746 #, c-format

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

2748 msgstr ""

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

2750

2213 -#: help.c:566

2751 +#: help.c:651

2752 #, c-format

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

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

2755

2218 -#: help.c:570

2756 +#: help.c:655

2757 msgid ""

2758 "\n"

2759 "The most similar command is"

@@ -2229,16 +2767,16 @@ msgstr[1] ""

2767 "\n"

2768 "Les commandes les plus ressemblantes sont"

2769

2232 -#: help.c:585

2770 +#: help.c:670

2771 msgid "git version [<options>]"

2772 msgstr "git version [<options>]"

2773

2236 -#: help.c:652

2774 +#: help.c:738

2775 #, c-format

2776 msgid "%s: %s - %s"

2777 msgstr "%s: %s - %s"

2778

2241 -#: help.c:656

2779 +#: help.c:742

2780 msgid ""

2781 "\n"

2782 "Did you mean this?"

@@ -2306,7 +2844,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

2846

2309 -#: ident.c:416 builtin/commit.c:587

2847 +#: ident.c:416 builtin/commit.c:600

2848 #, c-format

2849 msgid "invalid date format: %s"

2850 msgstr "format de date invalide : %s"

@@ -2343,120 +2881,120 @@ msgstr ""

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

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

2883

2346 -#: merge.c:71

2884 +#: merge.c:40

2885 msgid "failed to read the cache"

2886 msgstr "impossible de lire le cache"

2887

2350 -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2351 -#: builtin/checkout.c:606 builtin/clone.c:761

2888 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2889 +#: builtin/checkout.c:608 builtin/clone.c:763

2890 msgid "unable to write new index file"

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

2892

2355 -#: merge-recursive.c:298

2893 +#: merge-recursive.c:303

2894 msgid "(bad commit)\n"

2895 msgstr "(mauvais commit)\n"

2896

2359 -#: merge-recursive.c:320

2897 +#: merge-recursive.c:325

2898 #, c-format

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

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

2901

2364 -#: merge-recursive.c:328

2902 +#: merge-recursive.c:333

2903 #, c-format

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

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

2906

2369 -#: merge-recursive.c:410

2907 +#: merge-recursive.c:415

2908 msgid "error building trees"

2909 msgstr "erreur de construction des arbres"

2910

2373 -#: merge-recursive.c:881

2911 +#: merge-recursive.c:886

2912 #, c-format

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

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

2915

2378 -#: merge-recursive.c:892

2916 +#: merge-recursive.c:897

2917 #, c-format

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

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

2920

2383 -#: merge-recursive.c:906 merge-recursive.c:925

2921 +#: merge-recursive.c:911 merge-recursive.c:930

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

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

2924

2387 -#: merge-recursive.c:915

2925 +#: merge-recursive.c:920

2926 #, c-format

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

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

2929

2392 -#: merge-recursive.c:957 builtin/cat-file.c:37

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

2931 #, c-format

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

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

2934

2397 -#: merge-recursive.c:959

2935 +#: merge-recursive.c:964

2936 #, c-format

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

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

2939

2402 -#: merge-recursive.c:983

2940 +#: merge-recursive.c:988

2941 #, c-format

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

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

2944

2407 -#: merge-recursive.c:994

2945 +#: merge-recursive.c:999

2946 #, c-format

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

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

2949

2412 -#: merge-recursive.c:999

2950 +#: merge-recursive.c:1004

2951 #, c-format

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

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

2954

2417 -#: merge-recursive.c:1186

2955 +#: merge-recursive.c:1191

2956 #, c-format

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

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

2959

2422 -#: merge-recursive.c:1193

2960 +#: merge-recursive.c:1198

2961 #, c-format

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

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

2964

2427 -#: merge-recursive.c:1200

2965 +#: merge-recursive.c:1205

2966 #, c-format

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

2968 msgstr ""

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

2970 "base de fusion)"

2971

2434 -#: merge-recursive.c:1208 merge-recursive.c:1220

2972 +#: merge-recursive.c:1213 merge-recursive.c:1225

2973 #, c-format

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

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

2976

2439 -#: merge-recursive.c:1211 merge-recursive.c:1223

2977 +#: merge-recursive.c:1216 merge-recursive.c:1228

2978 #, c-format

2979 msgid "Fast-forwarding submodule %s"

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

2981

2444 -#: merge-recursive.c:1245

2982 +#: merge-recursive.c:1250

2983 #, c-format

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

2985 msgstr ""

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

2987

2450 -#: merge-recursive.c:1249

2988 +#: merge-recursive.c:1254

2989 #, c-format

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

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

2992

2455 -#: merge-recursive.c:1250

2993 +#: merge-recursive.c:1255

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

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

2996

2459 -#: merge-recursive.c:1253

2997 +#: merge-recursive.c:1258

2998 #, c-format

2999 msgid ""

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

@@ -2473,33 +3011,33 @@ msgstr ""

3011 "\n"

3012 "qui acceptera cette suggestion.\n"

3013

2476 -#: merge-recursive.c:1262

3014 +#: merge-recursive.c:1267

3015 #, c-format

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

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

3018

2481 -#: merge-recursive.c:1321

3019 +#: merge-recursive.c:1326

3020 msgid "Failed to execute internal merge"

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

3022

2485 -#: merge-recursive.c:1326

3023 +#: merge-recursive.c:1331

3024 #, c-format

3025 msgid "Unable to add %s to database"

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

3027

2490 -#: merge-recursive.c:1358

3028 +#: merge-recursive.c:1363

3029 #, c-format

3030 msgid "Auto-merging %s"

3031 msgstr "Fusion automatique de %s"

3032

2495 -#: merge-recursive.c:1423

3033 +#: merge-recursive.c:1434

3034 #, c-format

3035 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3036 msgstr ""

3037 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

3038 "place."

3039

2502 -#: merge-recursive.c:1475

3040 +#: merge-recursive.c:1501

3041 #, c-format

3042 msgid ""

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

@@ -2508,7 +3046,7 @@ msgstr ""

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

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

3048

2511 -#: merge-recursive.c:1480

3049 +#: merge-recursive.c:1506

3050 #, c-format

3051 msgid ""

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

@@ -2517,7 +3055,7 @@ msgstr ""

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

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

3057

2520 -#: merge-recursive.c:1487

3058 +#: merge-recursive.c:1513

3059 #, c-format

3060 msgid ""

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

@@ -2526,7 +3064,7 @@ msgstr ""

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

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

3066

2529 -#: merge-recursive.c:1492

3067 +#: merge-recursive.c:1518

3068 #, c-format

3069 msgid ""

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

@@ -2535,31 +3073,31 @@ msgstr ""

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

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

3075

2538 -#: merge-recursive.c:1526

3076 +#: merge-recursive.c:1552

3077 msgid "rename"

3078 msgstr "renommage"

3079

2542 -#: merge-recursive.c:1526

3080 +#: merge-recursive.c:1552

3081 msgid "renamed"

3082 msgstr "renommé"

3083

2546 -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2547 -#: merge-recursive.c:3086

3084 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3085 +#: merge-recursive.c:3129

3086 #, c-format

3087 msgid "Refusing to lose dirty file at %s"

3088 msgstr "Refus de perdre le fichier modifié %s"

3089

2552 -#: merge-recursive.c:1594

3090 +#: merge-recursive.c:1620

3091 #, c-format

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

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

3094

2557 -#: merge-recursive.c:1599

3095 +#: merge-recursive.c:1625

3096 #, c-format

3097 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3098 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

3099

2562 -#: merge-recursive.c:1625

3100 +#: merge-recursive.c:1651

3101 #, c-format

3102 msgid ""

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

@@ -2568,28 +3106,28 @@ msgstr ""

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

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

3108

2571 -#: merge-recursive.c:1630

3109 +#: merge-recursive.c:1656

3110 msgid " (left unresolved)"

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

3112

2575 -#: merge-recursive.c:1694

3113 +#: merge-recursive.c:1720

3114 #, c-format

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

3116 msgstr ""

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

3118 ">'%s' dans %s"

3119

2582 -#: merge-recursive.c:1733

3120 +#: merge-recursive.c:1759

3121 #, c-format

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

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

3124

2587 -#: merge-recursive.c:1745

3125 +#: merge-recursive.c:1771

3126 #, c-format

3127 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3128 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3129

2592 -#: merge-recursive.c:1951

3130 +#: merge-recursive.c:1977

3131 #, c-format

3132 msgid ""

3133 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -2600,7 +3138,7 @@ msgstr ""

3138 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

3139 "sans aucune destination récupérant la majorité des fichiers."

3140

2603 -#: merge-recursive.c:1983

3141 +#: merge-recursive.c:2009

3142 #, c-format

3143 msgid ""

3144 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -2609,7 +3147,7 @@ msgstr ""

3147 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

3148 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

3149

2612 -#: merge-recursive.c:1993

3150 +#: merge-recursive.c:2019

3151 #, c-format

3152 msgid ""

3153 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -2618,7 +3156,7 @@ msgstr ""

3156 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

3157 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

3158

2621 -#: merge-recursive.c:2085

3159 +#: merge-recursive.c:2111

3160 #, c-format

3161 msgid ""

3162 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -2627,7 +3165,7 @@ msgstr ""

3165 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

3166 "Renommage de répertoire %s->%s dans %s"

3167

2630 -#: merge-recursive.c:2330

3168 +#: merge-recursive.c:2356

3169 #, c-format

3170 msgid ""

3171 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -2636,125 +3174,129 @@ msgstr ""

3174 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

3175 "renommé."

3176

2639 -#: merge-recursive.c:2736

3177 +#: merge-recursive.c:2762

3178 #, c-format

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

3180 msgstr ""

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

3182

2645 -#: merge-recursive.c:2751

3183 +#: merge-recursive.c:2777

3184 #, c-format

3185 msgid "Adding merged %s"

3186 msgstr "Ajout de %s fusionné"

3187

2650 -#: merge-recursive.c:2758 merge-recursive.c:3089

3188 +#: merge-recursive.c:2784 merge-recursive.c:3132

3189 #, c-format

3190 msgid "Adding as %s instead"

3191 msgstr "Ajout plutôt comme %s"

3192

2655 -#: merge-recursive.c:2914

3193 +#: merge-recursive.c:2941

3194 #, c-format

3195 msgid "cannot read object %s"

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

3197

2660 -#: merge-recursive.c:2917

3198 +#: merge-recursive.c:2944

3199 #, c-format

3200 msgid "object %s is not a blob"

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

3202

2665 -#: merge-recursive.c:2986

3203 +#: merge-recursive.c:3013

3204 msgid "modify"

3205 msgstr "modification"

3206

2669 -#: merge-recursive.c:2986

3207 +#: merge-recursive.c:3013

3208 msgid "modified"

3209 msgstr "modifié"

3210

2673 -#: merge-recursive.c:2997

3211 +#: merge-recursive.c:3024

3212 msgid "content"

3213 msgstr "contenu"

3214

2677 -#: merge-recursive.c:3004

3215 +#: merge-recursive.c:3031

3216 msgid "add/add"

3217 msgstr "ajout/ajout"

3218

2681 -#: merge-recursive.c:3046

3219 +#: merge-recursive.c:3076

3220 #, c-format

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

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

3223

2686 -#: merge-recursive.c:3055 git-submodule.sh:895

3224 +#: merge-recursive.c:3098 git-submodule.sh:865

3225 msgid "submodule"

3226 msgstr "sous-module"

3227

2690 -#: merge-recursive.c:3056

3228 +#: merge-recursive.c:3099

3229 #, c-format

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

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

3232

2695 -#: merge-recursive.c:3178

3233 +#: merge-recursive.c:3221

3234 #, c-format

3235 msgid "Removing %s"

3236 msgstr "Suppression de %s"

3237

2700 -#: merge-recursive.c:3204

3238 +#: merge-recursive.c:3247

3239 msgid "file/directory"

3240 msgstr "fichier/répertoire"

3241

2704 -#: merge-recursive.c:3210

3242 +#: merge-recursive.c:3253

3243 msgid "directory/file"

3244 msgstr "répertoire/fichier"

3245

2708 -#: merge-recursive.c:3217

3246 +#: merge-recursive.c:3260

3247 #, c-format

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

3249 msgstr ""

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

3251

2714 -#: merge-recursive.c:3226

3252 +#: merge-recursive.c:3269

3253 #, c-format

3254 msgid "Adding %s"

3255 msgstr "Ajout de %s"

3256

2719 -#: merge-recursive.c:3267

3257 +#: merge-recursive.c:3303

3258 #, c-format

2721 -msgid "Dirty index: cannot merge (dirty: %s)"

2722 -msgstr "Index sale : fusion impossible (sales : %s)"

3259 +msgid ""

3260 +"Your local changes to the following files would be overwritten by merge:\n"

3261 +" %s"

3262 +msgstr ""

3263 +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"

3264 +" %s"

3265

2724 -#: merge-recursive.c:3271

3266 +#: merge-recursive.c:3314

3267 msgid "Already up to date!"

3268 msgstr "Déjà à jour !"

3269

2728 -#: merge-recursive.c:3280

3270 +#: merge-recursive.c:3323

3271 #, c-format

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

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

3274

2733 -#: merge-recursive.c:3379

3275 +#: merge-recursive.c:3422

3276 msgid "Merging:"

3277 msgstr "Fusion :"

3278

2737 -#: merge-recursive.c:3392

3279 +#: merge-recursive.c:3435

3280 #, c-format

3281 msgid "found %u common ancestor:"

3282 msgid_plural "found %u common ancestors:"

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

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

3285

2744 -#: merge-recursive.c:3431

3286 +#: merge-recursive.c:3474

3287 msgid "merge returned no commit"

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

3289

2748 -#: merge-recursive.c:3495

3290 +#: merge-recursive.c:3540

3291 #, c-format

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

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

3294

2753 -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

3295 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3296 msgid "Unable to write index."

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

3298

2757 -#: notes-merge.c:272

3299 +#: notes-merge.c:274

3300 #, c-format

3301 msgid ""

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

@@ -2765,21 +3307,21 @@ msgstr ""

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

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

3309

2768 -#: notes-merge.c:279

3310 +#: notes-merge.c:281

3311 #, c-format

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

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

3314

2773 -#: notes-utils.c:43

3315 +#: notes-utils.c:45

3316 msgid "Cannot commit uninitialized/unreferenced notes tree"

3317 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"

3318

2777 -#: notes-utils.c:102

3319 +#: notes-utils.c:104

3320 #, c-format

3321 msgid "Bad notes.rewriteMode value: '%s'"

3322 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"

3323

2782 -#: notes-utils.c:112

3324 +#: notes-utils.c:114

3325 #, c-format

3326 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3327 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

@@ -2788,36 +3330,56 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

3330 #. the environment variable, the second %s is

3331 #. its value.

3332 #.

2791 -#: notes-utils.c:142

3333 +#: notes-utils.c:144

3334 #, c-format

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

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

3337

2796 -#: object.c:242

3338 +#: object.c:54

3339 +#, c-format

3340 +msgid "invalid object type \"%s\""

3341 +msgstr "type d'objet invalide \"%s\""

3342 +

3343 +#: object.c:173

3344 +#, c-format

3345 +msgid "object %s is a %s, not a %s"

3346 +msgstr "l'objet %s est de type %s, pas de type %s"

3347 +

3348 +#: object.c:233

3349 +#, c-format

3350 +msgid "object %s has unknown type id %d"

3351 +msgstr "l'objet %s a un id de type inconnu %d"

3352 +

3353 +#: object.c:246

3354 #, c-format

3355 msgid "unable to parse object: %s"

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

3357

3358 +#: object.c:266 object.c:277

3359 +#, c-format

3360 +msgid "sha1 mismatch %s"

3361 +msgstr "incohérence de sha1 %s"

3362 +

3363 #: packfile.c:563

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

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

3366

2805 -#: packfile.c:1742

3367 +#: packfile.c:1745

3368 #, c-format

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

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

3371

2810 -#: packfile.c:1746

3372 +#: packfile.c:1749

3373 #, c-format

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

3375 msgstr ""

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

3377

2816 -#: parse-options.c:621

3378 +#: parse-options.c:672

3379 msgid "..."

3380 msgstr "..."

3381

2820 -#: parse-options.c:640

3382 +#: parse-options.c:691

3383 #, c-format

3384 msgid "usage: %s"

3385 msgstr "usage : %s"

@@ -2825,17 +3387,17 @@ msgstr "usage : %s"

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

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

3389 #.

2828 -#: parse-options.c:646

3390 +#: parse-options.c:697

3391 #, c-format

3392 msgid " or: %s"

3393 msgstr " ou : %s"

3394

2833 -#: parse-options.c:649

3395 +#: parse-options.c:700

3396 #, c-format

3397 msgid " %s"

3398 msgstr " %s"

3399

2838 -#: parse-options.c:688

3400 +#: parse-options.c:739

3401 msgid "-NUM"

3402 msgstr "-NUM"

3403

@@ -2933,11 +3495,71 @@ msgstr ""

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

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

3497

3498 +#: pkt-line.c:104

3499 +msgid "flush packet write failed"

3500 +msgstr "échec de l'écriture du vidage de paquet"

3501 +

3502 +#: pkt-line.c:142 pkt-line.c:228

3503 +msgid "protocol error: impossibly long line"

3504 +msgstr "erreur de protocole : ligne impossiblement trop longue"

3505 +

3506 +#: pkt-line.c:158 pkt-line.c:160

3507 +msgid "packet write with format failed"

3508 +msgstr "échec de l'écriture d'un paquet avec format"

3509 +

3510 +#: pkt-line.c:192

3511 +msgid "packet write failed - data exceeds max packet size"

3512 +msgstr "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale d'un paquet"

3513 +

3514 +#: pkt-line.c:199 pkt-line.c:206

3515 +msgid "packet write failed"

3516 +msgstr "échec de l'écriture d'un paquet"

3517 +

3518 +#: pkt-line.c:291

3519 +msgid "read error"

3520 +msgstr "erreur de lecture"

3521 +

3522 +#: pkt-line.c:299

3523 +msgid "the remote end hung up unexpectedly"

3524 +msgstr "L'hôte distant a fermé la connexion de manière inattendue"

3525 +

3526 +#: pkt-line.c:327

3527 +#, c-format

3528 +msgid "protocol error: bad line length character: %.4s"

3529 +msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"

3530 +

3531 +#: pkt-line.c:337 pkt-line.c:342

3532 +#, c-format

3533 +msgid "protocol error: bad line length %d"

3534 +msgstr "erreur de protocole : mauvaise longueur de ligne %d"

3535 +

3536 #: pretty.c:962

3537 msgid "unable to parse --pretty format"

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

3539

2940 -#: read-cache.c:1500

3540 +#: range-diff.c:48

3541 +msgid "could not start `log`"

3542 +msgstr "impossible de démarrer `log`"

3543 +

3544 +#: range-diff.c:51

3545 +msgid "could not read `log` output"

3546 +msgstr "impossible de lire la sortie de `log`"

3547 +

3548 +#: range-diff.c:66 sequencer.c:4540

3549 +#, c-format

3550 +msgid "could not parse commit '%s'"

3551 +msgstr "impossible d'analyser le commit '%s'"

3552 +

3553 +#: range-diff.c:196

3554 +msgid "failed to generate diff"

3555 +msgstr "échec de la génération de diff"

3556 +

3557 +#: range-diff.c:421 range-diff.c:423

3558 +#, c-format

3559 +msgid "could not parse log for '%s'"

3560 +msgstr "impossible d'analyser le journal pour '%s'"

3561 +

3562 +#: read-cache.c:1579

3563 #, c-format

3564 msgid ""

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

@@ -2946,7 +3568,7 @@ msgstr ""

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

3569 "Utilisation de la version %i"

3570

2949 -#: read-cache.c:1510

3571 +#: read-cache.c:1589

3572 #, c-format

3573 msgid ""

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

@@ -2955,228 +3577,330 @@ msgstr ""

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

3578 "Utilisation de la version %i"

3579

2958 -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

3580 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3581 #, c-format

3582 msgid "could not close '%s'"

3583 msgstr "impossible de fermer '%s'"

3584

2963 -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

3585 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3586 #, c-format

3587 msgid "could not stat '%s'"

3588 msgstr "stat impossible de '%s'"

3589

2968 -#: read-cache.c:2490

3590 +#: read-cache.c:2666

3591 #, c-format

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

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

3594

2973 -#: read-cache.c:2502

3595 +#: read-cache.c:2678

3596 #, c-format

3597 msgid "unable to unlink: %s"

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

3599

2978 -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2979 -#: builtin/am.c:779

3600 +#: refs.c:192

3601 +#, c-format

3602 +msgid "%s does not point to a valid object!"

3603 +msgstr "%s ne pointe pas sur un objet valide!"

3604 +

3605 +#: refs.c:579

3606 +#, c-format

3607 +msgid "ignoring dangling symref %s"

3608 +msgstr "symref pendant %s ignoré"

3609 +

3610 +#: refs.c:581 ref-filter.c:2067

3611 +#, c-format

3612 +msgid "ignoring broken ref %s"

3613 +msgstr "réf cassé %s ignoré"

3614 +

3615 +#: refs.c:685

3616 +#, c-format

3617 +msgid "could not open '%s' for writing: %s"

3618 +msgstr "impossible d'ouvrir '%s' en écriture : %s"

3619 +

3620 +#: refs.c:695 refs.c:746

3621 +#, c-format

3622 +msgid "could not read ref '%s'"

3623 +msgstr "impossible de lire la réf '%s'"

3624 +

3625 +#: refs.c:701

3626 +#, c-format

3627 +msgid "ref '%s' already exists"

3628 +msgstr "la référence '%s' existe déjà"

3629 +

3630 +#: refs.c:706

3631 +#, c-format

3632 +msgid "unexpected object ID when writing '%s'"

3633 +msgstr "id d'objet inattendu pendant l'écriture de '%s'"

3634 +

3635 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3636 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3637 +#: wrapper.c:656

3638 +#, c-format

3639 +msgid "could not write to '%s'"

3640 +msgstr "impossible d'écrire dans '%s'"

3641 +

3642 +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3643 +#: builtin/am.c:780

3644 #, c-format

3645 msgid "could not open '%s' for writing"

3646 msgstr "impossible d'ouvrir '%s' en écriture"

3647

2984 -#: refs.c:1880

3648 +#: refs.c:748

3649 +#, c-format

3650 +msgid "unexpected object ID when deleting '%s'"

3651 +msgstr "id d'objet inattendu pendant la suppression de '%s'"

3652 +

3653 +#: refs.c:879

3654 +#, c-format

3655 +msgid "log for ref %s has gap after %s"

3656 +msgstr "le journal pour la réf %s contient un trou après %s"

3657 +

3658 +#: refs.c:885

3659 +#, c-format

3660 +msgid "log for ref %s unexpectedly ended on %s"

3661 +msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

3662 +

3663 +#: refs.c:943

3664 +#, c-format

3665 +msgid "log for %s is empty"

3666 +msgstr "le journal pour la réf %s est vide"

3667 +

3668 +#: refs.c:1035

3669 +#, c-format

3670 +msgid "refusing to update ref with bad name '%s'"

3671 +msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

3672 +

3673 +#: refs.c:1111

3674 +#, c-format

3675 +msgid "update_ref failed for ref '%s': %s"

3676 +msgstr "échec de update_ref pour la réf '%s' : %s"

3677 +

3678 +#: refs.c:1853

3679 +#, c-format

3680 +msgid "multiple updates for ref '%s' not allowed"

3681 +msgstr "mises à jour multiples pour la réf '%s' non permises"

3682 +

3683 +#: refs.c:1885

3684 msgid "ref updates forbidden inside quarantine environment"

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

3686

3687 +#: refs.c:1981 refs.c:2011

3688 +#, c-format

3689 +msgid "'%s' exists; cannot create '%s'"

3690 +msgstr "'%s' existe ; impossible de créer '%s'"

3691 +

3692 +#: refs.c:1987 refs.c:2022

3693 +#, c-format

3694 +msgid "cannot process '%s' and '%s' at the same time"

3695 +msgstr "impossible de traiter '%s' et '%s' en même temps"

3696 +

3697 #: refs/files-backend.c:1191

3698 #, c-format

3699 msgid "could not remove reference %s"

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

3701

2993 -#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2994 -#: refs/packed-backend.c:1541

3702 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3703 +#: refs/packed-backend.c:1542

3704 #, c-format

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

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

3707

2999 -#: refs/files-backend.c:1208 refs/packed-backend.c:1544

3708 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3709 #, c-format

3710 msgid "could not delete references: %s"

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

3712

3713 +#: refspec.c:137

3714 +#, c-format

3715 +msgid "invalid refspec '%s'"

3716 +msgstr "spécificateur de réference invalide : '%s'"

3717 +

3718 # à priori on parle d'une branche ici

3005 -#: ref-filter.c:35 wt-status.c:1850

3719 +#: ref-filter.c:38 wt-status.c:1850

3720 msgid "gone"

3721 msgstr "disparue"

3722

3009 -#: ref-filter.c:36

3723 +#: ref-filter.c:39

3724 #, c-format

3725 msgid "ahead %d"

3726 msgstr "en avance de %d"

3727

3014 -#: ref-filter.c:37

3728 +#: ref-filter.c:40

3729 #, c-format

3730 msgid "behind %d"

3731 msgstr "en retard de %d"

3732

3019 -#: ref-filter.c:38

3733 +#: ref-filter.c:41

3734 #, c-format

3735 msgid "ahead %d, behind %d"

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

3737

3024 -#: ref-filter.c:121

3738 +#: ref-filter.c:137

3739 #, c-format

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

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

3742

3029 -#: ref-filter.c:123

3743 +#: ref-filter.c:139

3744 #, c-format

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

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

3747

3034 -#: ref-filter.c:145

3748 +#: ref-filter.c:161

3749 #, c-format

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

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

3752

3039 -#: ref-filter.c:149

3753 +#: ref-filter.c:165

3754 #, c-format

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

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

3757

3044 -#: ref-filter.c:151

3758 +#: ref-filter.c:167

3759 #, c-format

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

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

3762

3049 -#: ref-filter.c:206

3763 +#: ref-filter.c:222

3764 +#, c-format

3765 +msgid "%%(objecttype) does not take arguments"

3766 +msgstr "%%(objecttype) n'accepte pas d'argument"

3767 +

3768 +#: ref-filter.c:234

3769 +#, c-format

3770 +msgid "%%(objectsize) does not take arguments"

3771 +msgstr "%%(objectsize) n'accepte pas d'argument"

3772 +

3773 +#: ref-filter.c:246

3774 #, c-format

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

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

3777

3054 -#: ref-filter.c:215

3778 +#: ref-filter.c:255

3779 #, c-format

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

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

3782

3059 -#: ref-filter.c:235

3783 +#: ref-filter.c:275

3784 #, c-format

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

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

3787

3064 -#: ref-filter.c:264

3788 +#: ref-filter.c:304

3789 #, c-format

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

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

3792

3069 -#: ref-filter.c:266

3793 +#: ref-filter.c:306

3794 #, c-format

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

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

3797

3074 -#: ref-filter.c:281

3798 +#: ref-filter.c:321

3799 #, c-format

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

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

3802

3079 -#: ref-filter.c:285

3803 +#: ref-filter.c:325

3804 #, c-format

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

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

3807

3084 -#: ref-filter.c:315

3808 +#: ref-filter.c:355

3809 #, c-format

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

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

3812

3089 -#: ref-filter.c:327

3813 +#: ref-filter.c:367

3814 #, c-format

3815 msgid "unrecognized position:%s"

3816 msgstr "position non reconnue : %s"

3817

3094 -#: ref-filter.c:334

3818 +#: ref-filter.c:374

3819 #, c-format

3820 msgid "unrecognized width:%s"

3821 msgstr "largeur non reconnue : %s"

3822

3099 -#: ref-filter.c:343

3823 +#: ref-filter.c:383

3824 #, c-format

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

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

3827

3104 -#: ref-filter.c:351

3828 +#: ref-filter.c:391

3829 #, c-format

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

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

3832

3109 -#: ref-filter.c:369

3833 +#: ref-filter.c:409

3834 #, c-format

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

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

3837

3114 -#: ref-filter.c:464

3838 +#: ref-filter.c:505

3839 #, c-format

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

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

3842

3119 -#: ref-filter.c:491

3843 +#: ref-filter.c:532

3844 #, c-format

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

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

3847

3124 -#: ref-filter.c:608

3848 +#: ref-filter.c:656

3849 #, c-format

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

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

3852

3129 -#: ref-filter.c:671

3853 +#: ref-filter.c:719

3854 #, c-format

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

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

3857

3134 -#: ref-filter.c:673

3858 +#: ref-filter.c:721

3859 #, c-format

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

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

3862

3139 -#: ref-filter.c:675

3863 +#: ref-filter.c:723

3864 #, c-format

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

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

3867

3144 -#: ref-filter.c:703

3868 +#: ref-filter.c:751

3869 #, c-format

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

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

3872

3149 -#: ref-filter.c:705

3873 +#: ref-filter.c:753

3874 #, c-format

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

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

3877

3154 -#: ref-filter.c:707

3878 +#: ref-filter.c:755

3879 #, c-format

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

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

3882

3159 -#: ref-filter.c:722

3883 +#: ref-filter.c:770

3884 #, c-format

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

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

3887

3164 -#: ref-filter.c:779

3888 +#: ref-filter.c:827

3889 #, c-format

3890 msgid "malformed format string %s"

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

3892

3169 -#: ref-filter.c:1387

3893 +#: ref-filter.c:1416

3894 #, c-format

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

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

3897

3174 -#: ref-filter.c:1390

3898 +#: ref-filter.c:1419

3899 #, c-format

3900 msgid "(no branch, rebasing detached HEAD %s)"

3901 msgstr "(aucune branche, rebasage de la HEAD détachée %s)"

3902

3179 -#: ref-filter.c:1393

3903 +#: ref-filter.c:1422

3904 #, c-format

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

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

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

3908 #. TRANSLATORS: make sure this matches "HEAD

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

3910 #.

3187 -#: ref-filter.c:1401

3911 +#: ref-filter.c:1430

3912 #, c-format

3913 msgid "(HEAD detached at %s)"

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

@@ -3192,150 +3916,145 @@ msgstr "(HEAD détachée sur %s)"

3916 #. TRANSLATORS: make sure this matches "HEAD

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

3918 #.

3195 -#: ref-filter.c:1408

3919 +#: ref-filter.c:1437

3920 #, c-format

3921 msgid "(HEAD detached from %s)"

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

3923

3200 -#: ref-filter.c:1412

3924 +#: ref-filter.c:1441

3925 msgid "(no branch)"

3926 msgstr "(aucune branche)"

3927

3204 -#: ref-filter.c:1442

3928 +#: ref-filter.c:1475 ref-filter.c:1623

3929 #, c-format

3930 msgid "missing object %s for %s"

3931 msgstr "objet manquant %s pour %s"

3932

3209 -#: ref-filter.c:1445

3933 +#: ref-filter.c:1483

3934 #, c-format

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

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

3937

3214 -#: ref-filter.c:1902

3938 +#: ref-filter.c:1980

3939 #, c-format

3940 msgid "malformed object at '%s'"

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

3942

3219 -#: ref-filter.c:1984

3943 +#: ref-filter.c:2062

3944 #, c-format

3945 msgid "ignoring ref with broken name %s"

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

3947

3224 -#: ref-filter.c:1989

3225 -#, c-format

3226 -msgid "ignoring broken ref %s"

3227 -msgstr "réf cassé %s ignoré"

3228 -

3229 -#: ref-filter.c:2261

3948 +#: ref-filter.c:2340

3949 #, c-format

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

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

3952

3234 -#: ref-filter.c:2365

3953 +#: ref-filter.c:2444

3954 #, c-format

3955 msgid "malformed object name %s"

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

3957

3239 -#: remote.c:605

3958 +#: remote.c:606

3959 #, c-format

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

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

3962

3244 -#: remote.c:609

3963 +#: remote.c:610

3964 #, c-format

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

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

3967

3249 -#: remote.c:613

3968 +#: remote.c:614

3969 #, c-format

3970 msgid "%s tracks both %s and %s"

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

3972

3254 -#: remote.c:621

3973 +#: remote.c:622

3974 msgid "Internal error"

3975 msgstr "Erreur interne"

3976

3258 -#: remote.c:1534 remote.c:1635

3977 +#: remote.c:1536 remote.c:1637

3978 msgid "HEAD does not point to a branch"

3979 msgstr "HEAD ne pointe pas sur une branche"

3980

3262 -#: remote.c:1543

3981 +#: remote.c:1545

3982 #, c-format

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

3984 msgstr "pas de branche '%s'"

3985

3267 -#: remote.c:1546

3986 +#: remote.c:1548

3987 #, c-format

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

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

3990

3272 -#: remote.c:1552

3991 +#: remote.c:1554

3992 #, c-format

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

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

3995

3277 -#: remote.c:1567

3996 +#: remote.c:1569

3997 #, c-format

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

3999 msgstr ""

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

4001 "branche locale de suivi"

4002

3284 -#: remote.c:1579

4003 +#: remote.c:1581

4004 #, c-format

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

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

4007

3289 -#: remote.c:1589

4008 +#: remote.c:1591

4009 #, c-format

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

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

4012

3294 -#: remote.c:1602

4013 +#: remote.c:1604

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

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

4016

3298 -#: remote.c:1624

4017 +#: remote.c:1626

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

4019 msgstr ""

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

4021

3303 -#: remote.c:1939

4022 +#: remote.c:1951

4023 #, c-format

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

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

4026

3308 -#: remote.c:1943

4027 +#: remote.c:1955

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

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

4030

3312 -#: remote.c:1946

4031 +#: remote.c:1958

4032 #, c-format

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

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

4035

3317 -#: remote.c:1950

4036 +#: remote.c:1962

4037 #, c-format

4038 msgid "Your branch and '%s' refer to different commits.\n"

4039 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

4040

3322 -#: remote.c:1953

4041 +#: remote.c:1965

4042 #, c-format

4043 msgid " (use \"%s\" for details)\n"

4044 msgstr " (utilisez \"%s\" pour plus de détails)\n"

4045

3327 -#: remote.c:1957

4046 +#: remote.c:1969

4047 #, c-format

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

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

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

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

4052

3334 -#: remote.c:1963

4053 +#: remote.c:1975

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

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

4056

3338 -#: remote.c:1966

4057 +#: remote.c:1978

4058 #, c-format

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

4060 msgid_plural ""

@@ -3347,11 +4066,11 @@ msgstr[1] ""

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

4067 "en avance rapide.\n"

4068

3350 -#: remote.c:1974

4069 +#: remote.c:1986

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

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

4072

3354 -#: remote.c:1977

4073 +#: remote.c:1989

4074 #, c-format

4075 msgid ""

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

@@ -3366,21 +4085,36 @@ msgstr[1] ""

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

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

4087

3369 -#: remote.c:1987

4088 +#: remote.c:1999

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

4090 msgstr ""

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

4092

3374 -#: revision.c:2289

4093 +#: replace-object.c:20

4094 +#, c-format

4095 +msgid "bad replace ref name: %s"

4096 +msgstr "mauvaise références de remplacement : %s"

4097 +

4098 +#: replace-object.c:29

4099 +#, c-format

4100 +msgid "duplicate replace ref: %s"

4101 +msgstr "référence de remplacement dupliquée : %s"

4102 +

4103 +#: replace-object.c:72

4104 +#, c-format

4105 +msgid "replace depth too high for object %s"

4106 +msgstr "profondeur de remplacement trop grande pour l'objet %s"

4107 +

4108 +#: revision.c:2305

4109 msgid "your current branch appears to be broken"

4110 msgstr "votre branche actuelle semble cassée"

4111

3378 -#: revision.c:2292

4112 +#: revision.c:2308

4113 #, c-format

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

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

4116

3383 -#: revision.c:2489

4117 +#: revision.c:2505

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

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

4120

@@ -3398,31 +4132,31 @@ msgstr ""

4132 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

4133 "false`."

4134

3401 -#: send-pack.c:141

4135 +#: send-pack.c:142

4136 msgid "unexpected flush packet while reading remote unpack status"

4137 msgstr ""

4138 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

4139 "distant"

4140

3407 -#: send-pack.c:143

4141 +#: send-pack.c:144

4142 #, c-format

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

4144 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

4145

3412 -#: send-pack.c:145

4146 +#: send-pack.c:146

4147 #, c-format

4148 msgid "remote unpack failed: %s"

4149 msgstr "le dépaquetage a échoué : %s"

4150

3417 -#: send-pack.c:308

4151 +#: send-pack.c:309

4152 msgid "failed to sign the push certificate"

4153 msgstr "impossible de signer le certificat de poussée"

4154

3421 -#: send-pack.c:421

4155 +#: send-pack.c:422

4156 msgid "the receiving end does not support --signed push"

4157 msgstr "Le receveur ne gère pas les poussées avec --signed"

4158

3425 -#: send-pack.c:423

4159 +#: send-pack.c:424

4160 msgid ""

4161 "not sending a push certificate since the receiving end does not support --"

4162 "signed push"

@@ -3430,42 +4164,42 @@ msgstr ""

4164 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

4165 "poussées avec --signed"

4166

3433 -#: send-pack.c:435

4167 +#: send-pack.c:436

4168 msgid "the receiving end does not support --atomic push"

4169 msgstr "Le receveur ne gère pas les poussées avec --atomic"

4170

3437 -#: send-pack.c:440

4171 +#: send-pack.c:441

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

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

4174

3441 -#: sequencer.c:175

4175 +#: sequencer.c:177

4176 #, c-format

4177 msgid "invalid commit message cleanup mode '%s'"

4178 msgstr "mode de nettoyage invalide de message de validation '%s'"

4179

3446 -#: sequencer.c:275

4180 +#: sequencer.c:278

4181 #, c-format

4182 msgid "could not delete '%s'"

4183 msgstr "Impossible de supprimer '%s'"

4184

3451 -#: sequencer.c:301

4185 +#: sequencer.c:304

4186 msgid "revert"

4187 msgstr "revert"

4188

3455 -#: sequencer.c:303

4189 +#: sequencer.c:306

4190 msgid "cherry-pick"

4191 msgstr "cherry-pick"

4192

3459 -#: sequencer.c:305

4193 +#: sequencer.c:308

4194 msgid "rebase -i"

4195 msgstr "rebase -i"

4196

3463 -#: sequencer.c:307

4197 +#: sequencer.c:310

4198 #, c-format

3465 -msgid "Unknown action: %d"

3466 -msgstr "Action inconnue : %d"

4199 +msgid "unknown action: %d"

4200 +msgstr "action inconnue : %d"

4201

3468 -#: sequencer.c:364

4202 +#: sequencer.c:367

4203 msgid ""

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

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

@@ -3473,7 +4207,7 @@ msgstr ""

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

4208 "avec 'git add <chemins>' ou 'git rm <chemins>'"

4209

3476 -#: sequencer.c:367

4210 +#: sequencer.c:370

4211 msgid ""

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

4213 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3483,45 +4217,39 @@ msgstr ""

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

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

4219

3486 -#: sequencer.c:380 sequencer.c:2468

4220 +#: sequencer.c:383 sequencer.c:2488

4221 #, c-format

4222 msgid "could not lock '%s'"

4223 msgstr "impossible de verrouiller '%s'"

4224

3491 -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3492 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3493 -#, c-format

3494 -msgid "could not write to '%s'"

3495 -msgstr "impossible d'écrire dans '%s'"

3496 -

3497 -#: sequencer.c:387

4225 +#: sequencer.c:390

4226 #, c-format

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

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

4229

3502 -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3503 -#: sequencer.c:2702

4230 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4231 +#: sequencer.c:2741

4232 #, c-format

4233 msgid "failed to finalize '%s'"

4234 msgstr "échec lors de la finalisation de '%s'"

4235

3508 -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3509 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3510 -#: builtin/merge.c:1046

4236 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4237 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4238 +#: builtin/merge.c:1081

4239 #, c-format

4240 msgid "could not read '%s'"

4241 msgstr "impossible de lire '%s'"

4242

3515 -#: sequencer.c:441

4243 +#: sequencer.c:444

4244 #, c-format

4245 msgid "your local changes would be overwritten by %s."

4246 msgstr "vos modifications locales seraient écrasées par %s."

4247

3520 -#: sequencer.c:445

4248 +#: sequencer.c:448

4249 msgid "commit your changes or stash them to proceed."

4250 msgstr "validez vos modifications ou les remiser pour continuer."

4251

3524 -#: sequencer.c:474

4252 +#: sequencer.c:477

4253 #, c-format

4254 msgid "%s: fast-forward"

4255 msgstr "%s : avance rapide"

@@ -3529,20 +4257,40 @@ msgstr "%s : avance rapide"

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

4258 #. "rebase -i".

4259 #.

3532 -#: sequencer.c:563

4260 +#: sequencer.c:566

4261 #, c-format

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

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

4264

3537 -#: sequencer.c:579

4265 +#: sequencer.c:582

4266 msgid "unable to update cache tree"

4267 msgstr "impossible de mettre à jour l'arbre de cache"

4268

3541 -#: sequencer.c:592

4269 +#: sequencer.c:595

4270 msgid "could not resolve HEAD commit"

4271 msgstr "impossible de résoudre le commit HEAD"

4272

3545 -#: sequencer.c:749

4273 +#: sequencer.c:723

4274 +#, c-format

4275 +msgid "could not parse '%s' (looking for '%s'"

4276 +msgstr "impossible d'analyser '%s' (à la recherche de '%s')"

4277 +

4278 +#: sequencer.c:731

4279 +#, c-format

4280 +msgid "bad quoting on %s value in '%s'"

4281 +msgstr "Mauvaise citation sur la valeur %s dans '%s'"

4282 +

4283 +#: sequencer.c:740

4284 +#, c-format

4285 +msgid "could not parse '%s' (looking for '%s')"

4286 +msgstr "impossible d'analyser '%s' (à la recherche de '%s')"

4287 +

4288 +#: sequencer.c:747

4289 +#, c-format

4290 +msgid "invalid date format '%s' in '%s'"

4291 +msgstr "format de date invalide '%s' dans '%s'"

4292 +

4293 +#: sequencer.c:761

4294 #, c-format

4295 msgid ""

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

@@ -3571,15 +4319,15 @@ msgstr ""

4319 "\n"

4320 " git rebase --continue\n"

4321

3574 -#: sequencer.c:818

4322 +#: sequencer.c:830

4323 msgid "writing root commit"

4324 msgstr "écriture du commit racine"

4325

3578 -#: sequencer.c:1043

4326 +#: sequencer.c:1055

4327 msgid "'prepare-commit-msg' hook failed"

4328 msgstr "échec du crochet 'prepare-commit-msg'"

4329

3582 -#: sequencer.c:1050

4330 +#: sequencer.c:1062

4331 msgid ""

4332 "Your name and email address were configured automatically based\n"

4333 "on your username and hostname. Please check that they are accurate.\n"

@@ -3607,7 +4355,7 @@ msgstr ""

4355 "\n"

4356 " git commit --amend --reset-author\n"

4357

3610 -#: sequencer.c:1063

4358 +#: sequencer.c:1075

4359 msgid ""

4360 "Your name and email address were configured automatically based\n"

4361 "on your username and hostname. Please check that they are accurate.\n"

@@ -3633,316 +4381,345 @@ msgstr ""

4381 "\n"

4382 " git commit --amend --reset-author\n"

4383

3636 -#: sequencer.c:1103

4384 +#: sequencer.c:1115

4385 msgid "couldn't look up newly created commit"

4386 msgstr "impossible de retrouver le commit nouvellement créé"

4387

3640 -#: sequencer.c:1105

4388 +#: sequencer.c:1117

4389 msgid "could not parse newly created commit"

4390 msgstr "impossible d'analyser le commit nouvellement créé"

4391

3644 -#: sequencer.c:1151

4392 +#: sequencer.c:1163

4393 msgid "unable to resolve HEAD after creating commit"

4394 msgstr "impossible de résoudre HEAD après création du commit"

4395

3648 -#: sequencer.c:1153

4396 +#: sequencer.c:1165

4397 msgid "detached HEAD"

4398 msgstr "HEAD détachée"

4399

3652 -#: sequencer.c:1157

4400 +#: sequencer.c:1169

4401 msgid " (root-commit)"

4402 msgstr " (commit racine)"

4403

3656 -#: sequencer.c:1178

4404 +#: sequencer.c:1190

4405 msgid "could not parse HEAD"

4406 msgstr "impossible de lire HEAD"

4407

3660 -#: sequencer.c:1180

4408 +#: sequencer.c:1192

4409 #, c-format

4410 msgid "HEAD %s is not a commit!"

4411 msgstr "HEAD %s n'est pas un commit !"

4412

3665 -#: sequencer.c:1184 builtin/commit.c:1528

4413 +#: sequencer.c:1196 builtin/commit.c:1528

4414 msgid "could not parse HEAD commit"

4415 msgstr "impossible d'analyser le commit HEAD"

4416

3669 -#: sequencer.c:1235 sequencer.c:1832

4417 +#: sequencer.c:1247 sequencer.c:1845

4418 msgid "unable to parse commit author"

4419 msgstr "impossible d'analyser l'auteur du commit"

4420

3673 -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

4421 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4422 msgid "git write-tree failed to write a tree"

4423 msgstr "git write-tree a échoué à écrire un arbre"

4424

3677 -#: sequencer.c:1262 sequencer.c:1317

4425 +#: sequencer.c:1274 sequencer.c:1329

4426 #, c-format

4427 msgid "unable to read commit message from '%s'"

4428 msgstr "impossible de lire le message de validation de '%s'"

4429

3682 -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3683 -#: builtin/merge.c:850

4430 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4431 +#: builtin/merge.c:880

4432 msgid "failed to write commit object"

4433 msgstr "échec de l'écriture de l'objet commit"

4434

3687 -#: sequencer.c:1344

4435 +#: sequencer.c:1356

4436 #, c-format

4437 msgid "could not parse commit %s"

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

4439

3692 -#: sequencer.c:1349

4440 +#: sequencer.c:1361

4441 #, c-format

4442 msgid "could not parse parent commit %s"

4443 msgstr "impossible d'analyser le commit parent %s"

4444

3697 -#: sequencer.c:1500 sequencer.c:1525

4445 +#: sequencer.c:1457 sequencer.c:1565

4446 +#, c-format

4447 +msgid "unknown command: %d"

4448 +msgstr "commande inconnue : %d"

4449 +

4450 +#: sequencer.c:1512 sequencer.c:1537

4451 #, c-format

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

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

4454

3702 -#: sequencer.c:1510 sequencer.c:4355

4455 +#: sequencer.c:1522 sequencer.c:4520

4456 msgid "need a HEAD to fixup"

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

4458

3706 -#: sequencer.c:1512 sequencer.c:2729

4459 +#: sequencer.c:1524 sequencer.c:2768

4460 msgid "could not read HEAD"

4461 msgstr "Impossible de lire HEAD"

4462

3710 -#: sequencer.c:1514

4463 +#: sequencer.c:1526

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

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

4466

3714 -#: sequencer.c:1520

4467 +#: sequencer.c:1532

4468 #, c-format

4469 msgid "cannot write '%s'"

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

4471

3719 -#: sequencer.c:1527 git-rebase--interactive.sh:457

4472 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

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

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

4475

3723 -#: sequencer.c:1535

4476 +#: sequencer.c:1547

4477 #, c-format

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

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

4480

3728 -#: sequencer.c:1542

4481 +#: sequencer.c:1554

4482 #, c-format

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

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

4485

3733 -#: sequencer.c:1548

4486 +#: sequencer.c:1560

4487 #, c-format

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

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

4490

3738 -#: sequencer.c:1553

3739 -#, c-format

3740 -msgid "unknown command: %d"

3741 -msgstr "commande inconnue : %d"

3742 -

3743 -#: sequencer.c:1631

4491 +#: sequencer.c:1643

4492 msgid "your index file is unmerged."

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

4494

3747 -#: sequencer.c:1638

4495 +#: sequencer.c:1650

4496 msgid "cannot fixup root commit"

4497 msgstr "impossible de réparer le commit racine"

4498

3751 -#: sequencer.c:1657

4499 +#: sequencer.c:1669

4500 #, c-format

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

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

4503

3756 -#: sequencer.c:1665

4504 +#: sequencer.c:1677

4505 #, c-format

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

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

4508

3761 -#: sequencer.c:1669

4509 +#: sequencer.c:1681

4510 #, c-format

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

4512 msgstr ""

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

4514 "fusion."

4515

3768 -#: sequencer.c:1675

4516 +#: sequencer.c:1687

4517 #, c-format

4518 msgid "cannot get commit message for %s"

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

4520

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

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

3775 -#: sequencer.c:1694

4523 +#: sequencer.c:1706

4524 #, c-format

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

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

4527

3780 -#: sequencer.c:1759

4528 +#: sequencer.c:1771

4529 #, c-format

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

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

4532

3785 -#: sequencer.c:1813

4533 +#: sequencer.c:1826

4534 #, c-format

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

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

4537

3790 -#: sequencer.c:1814

4538 +#: sequencer.c:1827

4539 #, c-format

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

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

4542

3795 -#: sequencer.c:1864

3796 -msgid "empty commit set passed"

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

3798 -

3799 -#: sequencer.c:1874

4543 +#: sequencer.c:1885

4544 #, c-format

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

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

4547

3804 -#: sequencer.c:1881

4548 +#: sequencer.c:1892

4549 #, c-format

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

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

4552

3809 -#: sequencer.c:1961

4553 +#: sequencer.c:1972

4554 #, c-format

4555 msgid "%s does not accept arguments: '%s'"

4556 msgstr "%s n'accepte pas d'argument : '%s'"

4557

3814 -#: sequencer.c:1970

4558 +#: sequencer.c:1981

4559 #, c-format

4560 msgid "missing arguments for %s"

4561 msgstr "argument manquant pour %s"

4562

3819 -#: sequencer.c:2029

4563 +#: sequencer.c:2040

4564 #, c-format

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

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

4567

3824 -#: sequencer.c:2037

4568 +#: sequencer.c:2048

4569 #, c-format

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

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

4572

3829 -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

4573 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4574 #, c-format

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

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

4577

3834 -#: sequencer.c:2108

4578 +#: sequencer.c:2119

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

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

4581

3838 -#: sequencer.c:2110

4582 +#: sequencer.c:2121

4583 #, c-format

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

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

4586

3843 -#: sequencer.c:2115

4587 +#: sequencer.c:2126

4588 msgid "no commits parsed."

4589 msgstr "aucun commit analysé."

4590

3847 -#: sequencer.c:2126

4591 +#: sequencer.c:2137

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

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

4594

3851 -#: sequencer.c:2128

4595 +#: sequencer.c:2139

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

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

4598

3855 -#: sequencer.c:2195

3856 -#, c-format

3857 -msgid "invalid key: %s"

3858 -msgstr "clé invalide : %s"

3859 -

3860 -#: sequencer.c:2198

4599 +#: sequencer.c:2209

4600 #, c-format

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

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

4603

3865 -#: sequencer.c:2269

4604 +#: sequencer.c:2285

4605 msgid "unusable squash-onto"

4606 msgstr "\"écrase-sur\" inutilisable"

4607

3869 -#: sequencer.c:2285

4608 +#: sequencer.c:2301

4609 #, c-format

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

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

4612

3874 -#: sequencer.c:2323

4613 +#: sequencer.c:2335 sequencer.c:3775

4614 +msgid "empty commit set passed"

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

4616 +

4617 +#: sequencer.c:2343

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

4619 msgstr "un picorage ou un retour est déjà en cours"

4620

3878 -#: sequencer.c:2324

4621 +#: sequencer.c:2344

4622 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

4623 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

4624

3882 -#: sequencer.c:2327

4625 +#: sequencer.c:2347

4626 #, c-format

4627 msgid "could not create sequencer directory '%s'"

4628 msgstr "impossible de créer le répertoire de séquenceur '%s'"

4629

3887 -#: sequencer.c:2341

4630 +#: sequencer.c:2361

4631 msgid "could not lock HEAD"

4632 msgstr "impossible de verrouiller HEAD"

4633

3891 -#: sequencer.c:2396 sequencer.c:3403

4634 +#: sequencer.c:2416 sequencer.c:3543

4635 msgid "no cherry-pick or revert in progress"

4636 msgstr "aucun picorage ou retour en cours"

4637

3895 -#: sequencer.c:2398

4638 +#: sequencer.c:2418

4639 msgid "cannot resolve HEAD"

4640 msgstr "impossible de résoudre HEAD"

4641

3899 -#: sequencer.c:2400 sequencer.c:2435

4642 +#: sequencer.c:2420 sequencer.c:2455

4643 msgid "cannot abort from a branch yet to be born"

4644 msgstr "impossible d'abandonner depuis une branche non encore créée"

4645

3903 -#: sequencer.c:2421 builtin/grep.c:720

4646 +#: sequencer.c:2441 builtin/grep.c:721

4647 #, c-format

4648 msgid "cannot open '%s'"

4649 msgstr "impossible d'ouvrir '%s'"

4650

3908 -#: sequencer.c:2423

4651 +#: sequencer.c:2443

4652 #, c-format

4653 msgid "cannot read '%s': %s"

4654 msgstr "impossible de lire '%s' : %s"

4655

3913 -#: sequencer.c:2424

4656 +#: sequencer.c:2444

4657 msgid "unexpected end of file"

4658 msgstr "fin de fichier inattendue"

4659

3917 -#: sequencer.c:2430

4660 +#: sequencer.c:2450

4661 #, c-format

4662 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

4663 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

4664

3922 -#: sequencer.c:2441

4665 +#: sequencer.c:2461

4666 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

4667 msgstr ""

3925 -"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

4668 +"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

4669 +

4670 +#: sequencer.c:2565 sequencer.c:3461

4671 +#, c-format

4672 +msgid "could not update %s"

4673 +msgstr "impossible de mettre à jour %s"

4674 +

4675 +#: sequencer.c:2603 sequencer.c:3441

4676 +msgid "cannot read HEAD"

4677 +msgstr "impossible de lire HEAD"

4678 +

4679 +#: sequencer.c:2618

4680 +#, c-format

4681 +msgid "unable to copy '%s' to '%s'"

4682 +msgstr "impossible de copier '%s' vers '%s'"

4683 +

4684 +#: sequencer.c:2626

4685 +#, c-format

4686 +msgid ""

4687 +"You can amend the commit now, with\n"

4688 +"\n"

4689 +" git commit --amend %s\n"

4690 +"\n"

4691 +"Once you are satisfied with your changes, run\n"

4692 +"\n"

4693 +" git rebase --continue\n"

4694 +msgstr ""

4695 +"Vous pouvez corriger le commit maintenant, avec\n"

4696 +"\n"

4697 +" git commit --amend %s\n"

4698 +"\n"

4699 +"après avoir réalisé vos modifications, lancez\n"

4700 +"\n"

4701 +" git rebase --continue\n"

4702

3927 -#: sequencer.c:2545 sequencer.c:3321

4703 +#: sequencer.c:2636

4704 #, c-format

3929 -msgid "could not update %s"

3930 -msgstr "impossible de mettre à jour %s"

4705 +msgid "Could not apply %s... %.*s"

4706 +msgstr "impossible d'appliquer %s... %.*s"

4707

3932 -#: sequencer.c:2583 sequencer.c:3301

3933 -msgid "cannot read HEAD"

3934 -msgstr "impossible de lire HEAD"

4708 +#: sequencer.c:2643

4709 +#, c-format

4710 +msgid "Could not merge %.*s"

4711 +msgstr "Impossible de fusionner %.*s"

4712

3936 -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

4713 +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

4714 #, c-format

4715 msgid "could not copy '%s' to '%s'"

4716 msgstr "impossible de copier '%s' vers '%s'"

4717

3941 -#: sequencer.c:2641

4718 +#: sequencer.c:2680 sequencer.c:3095

4719 msgid "could not read index"

4720 msgstr "impossible de lire l'index"

4721

3945 -#: sequencer.c:2646

4722 +#: sequencer.c:2685

4723 #, c-format

4724 msgid ""

4725 "execution failed: %s\n"

@@ -3957,11 +4734,11 @@ msgstr ""

4734 "git rebase --continue\n"

4735 "\n"

4736

3960 -#: sequencer.c:2652

4737 +#: sequencer.c:2691

4738 msgid "and made changes to the index and/or the working tree\n"

4739 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

4740

3964 -#: sequencer.c:2658

4741 +#: sequencer.c:2697

4742 #, c-format

4743 msgid ""

4744 "execution succeeded: %s\n"

@@ -3978,62 +4755,81 @@ msgstr ""

4755 " git rebase --continue\n"

4756 "\n"

4757

3981 -#: sequencer.c:2771

4758 +#: sequencer.c:2758

4759 +#, c-format

4760 +msgid "illegal label name: '%.*s'"

4761 +msgstr "nom de label illégal '%.*s'"

4762 +

4763 +#: sequencer.c:2810

4764 msgid "writing fake root commit"

4765 msgstr "écriture d'un commit racine bidon"

4766

3985 -#: sequencer.c:2776

4767 +#: sequencer.c:2815

4768 msgid "writing squash-onto"

4769 msgstr "écriture de 'écraser-sur'"

4770

3989 -#: sequencer.c:2811

4771 +#: sequencer.c:2850

4772 #, c-format

4773 msgid "failed to find tree of %s"

4774 msgstr "impossible de trouver l'arbre de %s"

4775

3994 -#: sequencer.c:2829

4776 +#: sequencer.c:2868

4777 msgid "could not write index"

4778 msgstr "impossible d'écrire l'index"

4779

3998 -#: sequencer.c:2861

4780 +#: sequencer.c:2895

4781 +#, c-format

4782 +msgid "could not resolve '%s'"

4783 +msgstr "impossible de résoudre '%s'"

4784 +

4785 +#: sequencer.c:2921

4786 msgid "cannot merge without a current revision"

4787 msgstr "impossible de fusionner avec une révision courante"

4788

4002 -#: sequencer.c:2884

4789 +#: sequencer.c:2943

4790 #, c-format

4004 -msgid "could not resolve '%s'"

4005 -msgstr "impossible de résoudre '%s'"

4791 +msgid "unable to parse '%.*s'"

4792 +msgstr "impossible d'analyser '%.*s'"

4793 +

4794 +#: sequencer.c:2952

4795 +#, c-format

4796 +msgid "nothing to merge: '%.*s'"

4797 +msgstr "rien à fusionner : '%.*s'"

4798

4007 -#: sequencer.c:2906

4799 +#: sequencer.c:2964

4800 +msgid "octopus merge cannot be executed on top of a [new root]"

4801 +msgstr "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

4802 +

4803 +#: sequencer.c:2979

4804 #, c-format

4805 msgid "could not get commit message of '%s'"

4806 msgstr "impossible de lire le message de validation de '%s'"

4807

4012 -#: sequencer.c:2916 sequencer.c:2941

4808 +#: sequencer.c:2989 sequencer.c:3015

4809 #, c-format

4810 msgid "could not write '%s'"

4811 msgstr "impossible d'écrire '%s'"

4812

4017 -#: sequencer.c:3005

4813 +#: sequencer.c:3127

4814 #, c-format

4815 msgid "could not even attempt to merge '%.*s'"

4816 msgstr "impossible de seulement essayer de fusionner '%.*s'"

4817

4022 -#: sequencer.c:3021

4818 +#: sequencer.c:3143

4819 msgid "merge: Unable to write new index file"

4820 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

4821

4026 -#: sequencer.c:3088

4822 +#: sequencer.c:3211

4823 #, c-format

4824 msgid "Applied autostash.\n"

4825 msgstr "Autoremisage appliqué.\n"

4826

4031 -#: sequencer.c:3100

4827 +#: sequencer.c:3223

4828 #, c-format

4829 msgid "cannot store %s"

4830 msgstr "impossible de stocker %s"

4831

4036 -#: sequencer.c:3103 git-rebase.sh:188

4832 +#: sequencer.c:3226 git-rebase.sh:188

4833 #, c-format

4834 msgid ""

4835 "Applying autostash resulted in conflicts.\n"

@@ -4044,7 +4840,7 @@ msgstr ""

4840 "Vos modifications sont à l'abri dans la remise.\n"

4841 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

4842

4047 -#: sequencer.c:3134

4843 +#: sequencer.c:3257

4844 #, c-format

4845 msgid ""

4846 "Could not execute the todo command\n"

@@ -4065,48 +4861,48 @@ msgstr ""

4861 " git rebase --edit-todo\n"

4862 " git rebase --continue\n"

4863

4068 -#: sequencer.c:3202

4864 +#: sequencer.c:3325

4865 #, c-format

4866 msgid "Stopped at %s... %.*s\n"

4867 msgstr "arrêt à %s... %.*s\n"

4868

4073 -#: sequencer.c:3264

4869 +#: sequencer.c:3404

4870 #, c-format

4871 msgid "unknown command %d"

4872 msgstr "commande inconnue %d"

4873

4078 -#: sequencer.c:3309

4874 +#: sequencer.c:3449

4875 msgid "could not read orig-head"

4876 msgstr "impossible de lire orig-head"

4877

4082 -#: sequencer.c:3314 sequencer.c:4352

4878 +#: sequencer.c:3454 sequencer.c:4517

4879 msgid "could not read 'onto'"

4880 msgstr "impossible de lire 'onto'"

4881

4086 -#: sequencer.c:3328

4882 +#: sequencer.c:3468

4883 #, c-format

4884 msgid "could not update HEAD to %s"

4885 msgstr "impossible de mettre à jour HEAD sur %s"

4886

4091 -#: sequencer.c:3414

4887 +#: sequencer.c:3554

4888 msgid "cannot rebase: You have unstaged changes."

4889 msgstr "impossible de rebaser : vous avez des modifications non indexées."

4890

4095 -#: sequencer.c:3423

4891 +#: sequencer.c:3563

4892 msgid "cannot amend non-existing commit"

4893 msgstr "impossible de corriger un commit non-existant"

4894

4099 -#: sequencer.c:3425

4895 +#: sequencer.c:3565

4896 #, c-format

4897 msgid "invalid file: '%s'"

4898 msgstr "fichier invalide : '%s'"

4899

4104 -#: sequencer.c:3427

4900 +#: sequencer.c:3567

4901 #, c-format

4902 msgid "invalid contents: '%s'"

4903 msgstr "contenu invalide : '%s'"

4904

4109 -#: sequencer.c:3430

4905 +#: sequencer.c:3570

4906 msgid ""

4907 "\n"

4908 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4116,54 +4912,54 @@ msgstr ""

4912 "Vous avez des modifications non validées dans votre copie de travail.\n"

4913 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

4914

4119 -#: sequencer.c:3455 sequencer.c:3493

4915 +#: sequencer.c:3595 sequencer.c:3633

4916 #, c-format

4917 msgid "could not write file: '%s'"

4918 msgstr "impossible d'écrire le fichier : '%s'"

4919

4124 -#: sequencer.c:3508

4920 +#: sequencer.c:3648

4921 msgid "could not remove CHERRY_PICK_HEAD"

4922 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

4923

4128 -#: sequencer.c:3515

4924 +#: sequencer.c:3655

4925 msgid "could not commit staged changes."

4926 msgstr "impossible de valider les modifications indexées."

4927

4132 -#: sequencer.c:3612

4928 +#: sequencer.c:3752

4929 #, c-format

4930 msgid "%s: can't cherry-pick a %s"

4931 msgstr "%s : impossible de picorer un %s"

4932

4137 -#: sequencer.c:3616

4933 +#: sequencer.c:3756

4934 #, c-format

4935 msgid "%s: bad revision"

4936 msgstr "%s : mauvaise révision"

4937

4142 -#: sequencer.c:3649

4938 +#: sequencer.c:3791

4939 msgid "can't revert as initial commit"

4940 msgstr "impossible d'annuler en tant que commit initial"

4941

4146 -#: sequencer.c:4098

4942 +#: sequencer.c:4238

4943 msgid "make_script: unhandled options"

4944 msgstr "make_script : options non gérées"

4945

4150 -#: sequencer.c:4101

4946 +#: sequencer.c:4241

4947 msgid "make_script: error preparing revisions"

4948 msgstr "make_script : erreur lors de la préparation des révisions"

4949

4154 -#: sequencer.c:4142 sequencer.c:4177

4950 +#: sequencer.c:4281 sequencer.c:4337

4951 #, c-format

4952 msgid "unusable todo list: '%s'"

4953 msgstr "liste à faire inutilisable : '%s'"

4954

4159 -#: sequencer.c:4236

4955 +#: sequencer.c:4396

4956 #, c-format

4957 msgid ""

4958 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4959 msgstr ""

4960 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

4961

4166 -#: sequencer.c:4302

4962 +#: sequencer.c:4466

4963 #, c-format

4964 msgid ""

4965 "Warning: some commits may have been dropped accidentally.\n"

@@ -4172,7 +4968,7 @@ msgstr ""

4968 "Attention : certains commits ont pu être accidentellement supprimés.\n"

4969 "Commits supprimés (du plus jeune au plus vieux) :\n"

4970

4175 -#: sequencer.c:4309

4971 +#: sequencer.c:4473

4972 #, c-format

4973 msgid ""

4974 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4190,7 +4986,7 @@ msgstr ""

4986 "Les comportements disponibles sont : ignore, warn, error.\n"

4987 "\n"

4988

4193 -#: sequencer.c:4321

4989 +#: sequencer.c:4486

4990 #, c-format

4991 msgid ""

4992 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4201,12 +4997,7 @@ msgstr ""

4997 "rebase --continue'.\n"

4998 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

4999

4204 -#: sequencer.c:4375

4205 -#, c-format

4206 -msgid "could not parse commit '%s'"

4207 -msgstr "impossible d'analyser le commit '%s'"

4208 -

4209 -#: sequencer.c:4490

5000 +#: sequencer.c:4660

5001 msgid "the script was already rearranged."

5002 msgstr "le script a déjà été réarrangé."

5003

@@ -4374,6 +5165,38 @@ msgstr "échec de la bifurcation"

5165 msgid "setsid failed"

5166 msgstr "échec du setsid"

5167

5168 +#: sha1-file.c:381

5169 +#, c-format

5170 +msgid "object directory %s does not exist; check .git/objects/info/alternates"

5171 +msgstr "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"

5172 +

5173 +#: sha1-file.c:432

5174 +#, c-format

5175 +msgid "unable to normalize alternate object path: %s"

5176 +msgstr "impossible de normaliser le chemin d'objet alternatif : %s"

5177 +

5178 +#: sha1-file.c:503

5179 +#, c-format

5180 +msgid "%s: ignoring alternate object stores, nesting too deep"

5181 +msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"

5182 +

5183 +#: sha1-file.c:510

5184 +#, c-format

5185 +msgid "unable to normalize object directory: %s"

5186 +msgstr "impossible de normaliser le répertoire d'objet : %s"

5187 +

5188 +#: sha1-file.c:565

5189 +msgid "unable to fdopen alternates lockfile"

5190 +msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"

5191 +

5192 +#: sha1-file.c:583

5193 +msgid "unable to read alternates file"

5194 +msgstr "lecture du fichier d'alternatives impossible"

5195 +

5196 +#: sha1-file.c:590

5197 +msgid "unable to move new alternates file into place"

5198 +msgstr "impossible de déplacer le nouveau fichier d'alternative"

5199 +

5200 #: sha1-file.c:625

5201 #, c-format

5202 msgid "path '%s' does not exist"

@@ -4401,16 +5224,208 @@ msgstr "le dépôt de référence '%s' est superficiel"

5224 msgid "reference repository '%s' is grafted"

5225 msgstr "le dépôt de référence '%s' est greffé"

5226

l10n: fr.po v2.19.0 rnd 1