12142e1bcb · matheusbsbs/matheus-bagliano

@@ -73,8 +73,8 @@ msgid ""

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2017-05-05 09:35+0800\n"

77 -"PO-Revision-Date: 2017-05-05 12:02+0200\n"

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

77 +"PO-Revision-Date: 2017-07-23 04:35+0200\n"

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

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

80 "Language: fr\n"

@@ -83,37 +83,37 @@ msgstr ""

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

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

85

86 -#: advice.c:55

86 +#: advice.c:58

87 #, c-format

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

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

90

91 -#: advice.c:83

91 +#: advice.c:86

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

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

94

95 -#: advice.c:85

95 +#: advice.c:88

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

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

98

99 -#: advice.c:87

99 +#: advice.c:90

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

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

102

103 -#: advice.c:89

103 +#: advice.c:92

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

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

106

107 -#: advice.c:91

107 +#: advice.c:94

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

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

110

111 -#: advice.c:93

111 +#: advice.c:96

112 #, c-format

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

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

115

116 -#: advice.c:101

116 +#: advice.c:104

117 msgid ""

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

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

@@ -121,23 +121,23 @@ msgstr ""

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

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

123

124 -#: advice.c:109

124 +#: advice.c:112

125 msgid "Exiting because of an unresolved conflict."

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

127

128 -#: advice.c:114 builtin/merge.c:1185

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

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

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

131

132 -#: advice.c:116

132 +#: advice.c:119

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

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

135

136 -#: advice.c:117

136 +#: advice.c:120

137 msgid "Exiting because of unfinished merge."

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

139

140 -#: advice.c:123

140 +#: advice.c:126

141 #, c-format

142 msgid ""

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

@@ -169,89 +169,99 @@ msgstr ""

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

170 "\n"

171

172 -#: apply.c:57

172 +#: apply.c:58

173 #, c-format

174 msgid "unrecognized whitespace option '%s'"

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

176

177 -#: apply.c:73

177 +#: apply.c:74

178 #, c-format

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

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

181

182 -#: apply.c:125

182 +#: apply.c:126

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

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

185

186 -#: apply.c:127

186 +#: apply.c:128

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

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

189

190 -#: apply.c:130

190 +#: apply.c:131

191 msgid "--3way outside a repository"

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

193

194 -#: apply.c:141

194 +#: apply.c:142

195 msgid "--index outside a repository"

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

197

198 -#: apply.c:144

198 +#: apply.c:145

199 msgid "--cached outside a repository"

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

201

202 -#: apply.c:845

202 +#: apply.c:836

203 #, c-format

204 msgid "Cannot prepare timestamp regexp %s"

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

206

207 -#: apply.c:854

207 +#: apply.c:845

208 #, c-format

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

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

211

212 -#: apply.c:938

212 +#: apply.c:929

213 #, c-format

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

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

216

217 -#: apply.c:977

217 +#: apply.c:967

218 #, c-format

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

220 msgstr ""

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

222 "ligne %d"

223

224 -#: apply.c:983

224 +#: apply.c:973

225 #, c-format

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

227 msgstr ""

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

229 "à la ligne %d"

230

231 -#: apply.c:984

231 +#: apply.c:974

232 #, c-format

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

234 msgstr ""

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

236 "à la ligne %d"

237

238 -#: apply.c:990

238 +#: apply.c:979

239 #, c-format

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

241 msgstr ""

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

243

244 -#: apply.c:1488

244 +#: apply.c:1008

245 +#, c-format

246 +msgid "invalid mode on line %d: %s"

247 +msgstr "mode invalide dans la ligne %d : %s"

248 +

249 +#: apply.c:1326

250 +#, c-format

251 +msgid "inconsistent header lines %d and %d"

252 +msgstr "lignes d'entête inconsistantes %d et %d"

253 +

254 +#: apply.c:1498

255 #, c-format

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

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

258

249 -#: apply.c:1557

259 +#: apply.c:1567

260 #, c-format

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

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

263

254 -#: apply.c:1577

264 +#: apply.c:1587

265 #, c-format

266 msgid ""

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

@@ -266,83 +276,83 @@ msgstr[1] ""

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

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

278

269 -#: apply.c:1589

279 +#: apply.c:1600

280 #, c-format

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

282 msgstr ""

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

284

275 -#: apply.c:1759

285 +#: apply.c:1770

286 msgid "new file depends on old contents"

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

288

279 -#: apply.c:1761

289 +#: apply.c:1772

290 msgid "deleted file still has contents"

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

292

283 -#: apply.c:1795

293 +#: apply.c:1806

294 #, c-format

295 msgid "corrupt patch at line %d"

296 msgstr "patch corrompu à la ligne %d"

297

288 -#: apply.c:1832

298 +#: apply.c:1843

299 #, c-format

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

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

302

293 -#: apply.c:1834

303 +#: apply.c:1845

304 #, c-format

305 msgid "deleted file %s still has contents"

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

307

298 -#: apply.c:1837

308 +#: apply.c:1848

309 #, c-format

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

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

312

303 -#: apply.c:1984

313 +#: apply.c:1995

314 #, c-format

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

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

317

308 -#: apply.c:2021

318 +#: apply.c:2032

319 #, c-format

320 msgid "unrecognized binary patch at line %d"

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

322

313 -#: apply.c:2182

323 +#: apply.c:2193

324 #, c-format

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

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

327

318 -#: apply.c:2265

328 +#: apply.c:2276

329 #, c-format

330 msgid "unable to read symlink %s"

331 msgstr "lecture du lien symbolique %s impossible"

332

323 -#: apply.c:2269

333 +#: apply.c:2280

334 #, c-format

335 msgid "unable to open or read %s"

336 msgstr "ouverture ou lecture de %s impossible"

337

328 -#: apply.c:2922

338 +#: apply.c:2933

339 #, c-format

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

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

342

333 -#: apply.c:3041

343 +#: apply.c:3052

344 #, c-format

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

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

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

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

349

340 -#: apply.c:3053

350 +#: apply.c:3064

351 #, c-format

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

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

354

345 -#: apply.c:3059

355 +#: apply.c:3070

356 #, c-format

357 msgid ""

358 "while searching for:\n"

@@ -351,580 +361,580 @@ msgstr ""

361 "pendant la recherche de :\n"

362 "%.*s"

363

354 -#: apply.c:3081

364 +#: apply.c:3092

365 #, c-format

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

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

368

359 -#: apply.c:3089

369 +#: apply.c:3100

370 #, c-format

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

372 msgstr ""

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

374 "inverse"

375

366 -#: apply.c:3135

376 +#: apply.c:3146

377 #, c-format

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

379 msgstr ""

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

381

372 -#: apply.c:3145

382 +#: apply.c:3156

383 #, c-format

384 msgid ""

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

386 msgstr ""

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

388

379 -#: apply.c:3153

389 +#: apply.c:3164

390 #, c-format

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

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

393

384 -#: apply.c:3171

394 +#: apply.c:3182

395 #, c-format

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

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

398

389 -#: apply.c:3184

399 +#: apply.c:3195

400 #, c-format

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

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

403

394 -#: apply.c:3190

404 +#: apply.c:3201

405 #, c-format

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

407 msgstr ""

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

409 "trouvé)"

410

401 -#: apply.c:3211

411 +#: apply.c:3222

412 #, c-format

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

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

415

406 -#: apply.c:3333

416 +#: apply.c:3344

417 #, c-format

418 msgid "cannot checkout %s"

419 msgstr "extraction de %s impossible"

420

411 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

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

422 #, c-format

423 msgid "failed to read %s"

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

425

416 -#: apply.c:3389

426 +#: apply.c:3400

427 #, c-format

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

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

430

421 -#: apply.c:3418 apply.c:3658

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

432 #, c-format

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

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

435

426 -#: apply.c:3501 apply.c:3672

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

437 #, c-format

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

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

440

431 -#: apply.c:3510 apply.c:3680

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

442 #, c-format

443 msgid "%s: does not match index"

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

445

436 -#: apply.c:3545

446 +#: apply.c:3556

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

448 msgstr ""

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

450 "points."

451

442 -#: apply.c:3548

452 +#: apply.c:3559

453 #, c-format

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

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

456

447 -#: apply.c:3564 apply.c:3568

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

458 #, c-format

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

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

461

452 -#: apply.c:3580

462 +#: apply.c:3591

463 #, c-format

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

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

466

457 -#: apply.c:3594

467 +#: apply.c:3605

468 #, c-format

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

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

471

462 -#: apply.c:3599

472 +#: apply.c:3610

473 #, c-format

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

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

476

467 -#: apply.c:3625

477 +#: apply.c:3636

478 msgid "removal patch leaves file contents"

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

480

471 -#: apply.c:3697

481 +#: apply.c:3708

482 #, c-format

483 msgid "%s: wrong type"

484 msgstr "%s : type erroné"

485

476 -#: apply.c:3699

486 +#: apply.c:3710

487 #, c-format

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

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

490

481 -#: apply.c:3850 apply.c:3852

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

492 #, c-format

493 msgid "invalid path '%s'"

494 msgstr "chemin invalide '%s'"

495

486 -#: apply.c:3908

496 +#: apply.c:3918

497 #, c-format

498 msgid "%s: already exists in index"

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

500

491 -#: apply.c:3911

501 +#: apply.c:3921

502 #, c-format

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

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

505

496 -#: apply.c:3931

506 +#: apply.c:3941

507 #, c-format

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

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

510

501 -#: apply.c:3936

511 +#: apply.c:3946

512 #, c-format

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

514 msgstr ""

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

516

507 -#: apply.c:3956

517 +#: apply.c:3966

518 #, c-format

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

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

521

512 -#: apply.c:3960

522 +#: apply.c:3970

523 #, c-format

524 msgid "%s: patch does not apply"

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

526

517 -#: apply.c:3975

527 +#: apply.c:3985

528 #, c-format

529 msgid "Checking patch %s..."

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

531

522 -#: apply.c:4066

532 +#: apply.c:4076

533 #, c-format

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

535 msgstr ""

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

537

528 -#: apply.c:4073

538 +#: apply.c:4083

539 #, c-format

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

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

542

533 -#: apply.c:4076

543 +#: apply.c:4086

544 #, c-format

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

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

547

538 -#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

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

549 #, c-format

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

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

552

543 -#: apply.c:4085

553 +#: apply.c:4095

554 #, c-format

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

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

557

548 -#: apply.c:4095

558 +#: apply.c:4105

559 #, c-format

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

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

562

553 -#: apply.c:4233

563 +#: apply.c:4243

564 #, c-format

565 msgid "unable to remove %s from index"

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

567

558 -#: apply.c:4268

568 +#: apply.c:4278

569 #, c-format

570 msgid "corrupt patch for submodule %s"

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

572

563 -#: apply.c:4274

573 +#: apply.c:4284

574 #, c-format

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

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

577

568 -#: apply.c:4282

578 +#: apply.c:4292

579 #, c-format

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

581 msgstr ""

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

583 "impossible"

584

575 -#: apply.c:4288 apply.c:4432

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

586 #, c-format

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

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

589

580 -#: apply.c:4329

590 +#: apply.c:4339

591 #, c-format

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

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

594

585 -#: apply.c:4333

595 +#: apply.c:4343

596 #, c-format

597 msgid "closing file '%s'"

598 msgstr "fermeture du fichier '%s'"

599

590 -#: apply.c:4403

600 +#: apply.c:4413

601 #, c-format

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

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

604

595 -#: apply.c:4501

605 +#: apply.c:4511

606 #, c-format

607 msgid "Applied patch %s cleanly."

608 msgstr "Patch %s appliqué proprement."

609

600 -#: apply.c:4509

610 +#: apply.c:4519

611 msgid "internal error"

612 msgstr "erreur interne"

613

604 -#: apply.c:4512

614 +#: apply.c:4522

615 #, c-format

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

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

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

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

620

611 -#: apply.c:4523

621 +#: apply.c:4533

622 #, c-format

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

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

625

616 -#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

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

627 #, c-format

628 msgid "cannot open %s"

629 msgstr "impossible d'ouvrir %s"

630

621 -#: apply.c:4545

631 +#: apply.c:4555

632 #, c-format

633 msgid "Hunk #%d applied cleanly."

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

635

626 -#: apply.c:4549

636 +#: apply.c:4559

637 #, c-format

638 msgid "Rejected hunk #%d."

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

640

631 -#: apply.c:4659

641 +#: apply.c:4669

642 #, c-format

643 msgid "Skipped patch '%s'."

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

645

636 -#: apply.c:4667

646 +#: apply.c:4677

647 msgid "unrecognized input"

648 msgstr "entrée non reconnue"

649

640 -#: apply.c:4686

650 +#: apply.c:4696

651 msgid "unable to read index file"

652 msgstr "lecture du fichier d'index impossible"

653

644 -#: apply.c:4823

654 +#: apply.c:4833

655 #, c-format

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

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

658

649 -#: apply.c:4850

659 +#: apply.c:4860

660 #, c-format

661 msgid "squelched %d whitespace error"

662 msgid_plural "squelched %d whitespace errors"

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

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

665

656 -#: apply.c:4856 apply.c:4871

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

667 #, c-format

668 msgid "%d line adds whitespace errors."

669 msgid_plural "%d lines add whitespace errors."

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

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

672

663 -#: apply.c:4864

673 +#: apply.c:4874

674 #, c-format

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

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

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

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

679

670 -#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

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

681 msgid "Unable to write new index file"

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

683

674 -#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279

675 -#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

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

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

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

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

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

679 -#: git-add--interactive.perl:239

689 +#: git-add--interactive.perl:197

690 msgid "path"

691 msgstr "chemin"

692

683 -#: apply.c:4912

693 +#: apply.c:4922

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

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

696

687 -#: apply.c:4915

697 +#: apply.c:4925

698 msgid "apply changes matching the given path"

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

700

691 -#: apply.c:4917 builtin/am.c:2285

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

702 msgid "num"

703 msgstr "num"

704

695 -#: apply.c:4918

705 +#: apply.c:4928

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

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

708

699 -#: apply.c:4921

709 +#: apply.c:4931

710 msgid "ignore additions made by the patch"

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

712

703 -#: apply.c:4923

713 +#: apply.c:4933

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

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

716

707 -#: apply.c:4927

717 +#: apply.c:4937

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

719 msgstr ""

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

721

712 -#: apply.c:4929

722 +#: apply.c:4939

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

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

725

716 -#: apply.c:4931

726 +#: apply.c:4941

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

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

729

720 -#: apply.c:4933

730 +#: apply.c:4943

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

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

733

724 -#: apply.c:4935

734 +#: apply.c:4945

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

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

737

728 -#: apply.c:4937

738 +#: apply.c:4947

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

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

741

732 -#: apply.c:4939

742 +#: apply.c:4949

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

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

745

736 -#: apply.c:4941

746 +#: apply.c:4951

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

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

749

740 -#: apply.c:4943

750 +#: apply.c:4953

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

752 msgstr ""

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

754

745 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515

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

756 msgid "paths are separated with NUL character"

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

758

749 -#: apply.c:4948

759 +#: apply.c:4958

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

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

762

753 -#: apply.c:4949 builtin/am.c:2264

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

764 msgid "action"

765 msgstr "action"

766

757 -#: apply.c:4950

767 +#: apply.c:4960

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

769 msgstr ""

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

771 "d'espace"

772

763 -#: apply.c:4953 apply.c:4956

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

774 msgid "ignore changes in whitespace when finding context"

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

776

767 -#: apply.c:4959

777 +#: apply.c:4969

778 msgid "apply the patch in reverse"

779 msgstr "appliquer le patch en sens inverse"

780

771 -#: apply.c:4961

781 +#: apply.c:4971

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

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

784

775 -#: apply.c:4963

785 +#: apply.c:4973

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

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

788

779 -#: apply.c:4965

789 +#: apply.c:4975

790 msgid "allow overlapping hunks"

791 msgstr "accepter les recouvrements de sections"

792

783 -#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19

784 -#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

785 -#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

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

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

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

796 msgid "be verbose"

797 msgstr "mode verbeux"

798

789 -#: apply.c:4968

799 +#: apply.c:4978

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

801 msgstr ""

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

803 "fichier"

804

795 -#: apply.c:4971

805 +#: apply.c:4981

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

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

808

799 -#: apply.c:4973 builtin/am.c:2273

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

810 msgid "root"

811 msgstr "racine"

812

803 -#: apply.c:4974

813 +#: apply.c:4984

814 msgid "prepend <root> to all filenames"

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

816

807 -#: archive.c:12

817 +#: archive.c:13

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

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

820

811 -#: archive.c:13

821 +#: archive.c:14

822 msgid "git archive --list"

823 msgstr "git archive --list"

824

815 -#: archive.c:14

825 +#: archive.c:15

826 msgid ""

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

828 msgstr ""

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

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

831

822 -#: archive.c:15

832 +#: archive.c:16

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

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

835

826 -#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

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

837 #, c-format

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

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

840

831 -#: archive.c:417

841 +#: archive.c:418

842 msgid "fmt"

843 msgstr "fmt"

844

835 -#: archive.c:417

845 +#: archive.c:418

846 msgid "archive format"

847 msgstr "format d'archive"

848

839 -#: archive.c:418 builtin/log.c:1436

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

850 msgid "prefix"

851 msgstr "préfixe"

852

843 -#: archive.c:419

853 +#: archive.c:420

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

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

856

847 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60

848 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

849 -#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552

850 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

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

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

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

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

861 #: parse-options.h:153

862 msgid "file"

863 msgstr "fichier"

864

855 -#: archive.c:421 builtin/archive.c:89

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

866 msgid "write the archive to this file"

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

868

859 -#: archive.c:423

869 +#: archive.c:424

870 msgid "read .gitattributes in working directory"

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

872

863 -#: archive.c:424

873 +#: archive.c:425

874 msgid "report archived files on stderr"

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

876

867 -#: archive.c:425

877 +#: archive.c:426

878 msgid "store only"

879 msgstr "stockage seulement"

880

871 -#: archive.c:426

881 +#: archive.c:427

882 msgid "compress faster"

883 msgstr "compression rapide"

884

875 -#: archive.c:434

885 +#: archive.c:435

886 msgid "compress better"

887 msgstr "compression efficace"

888

879 -#: archive.c:437

889 +#: archive.c:438

890 msgid "list supported archive formats"

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

892

883 -#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

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

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

895 msgid "repo"

896 msgstr "dépôt"

897

888 -#: archive.c:440 builtin/archive.c:91

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

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

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

901

892 -#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

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

903 msgid "command"

904 msgstr "commande"

905

896 -#: archive.c:442 builtin/archive.c:93

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

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

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

909

900 -#: archive.c:449

910 +#: archive.c:450

911 msgid "Unexpected option --remote"

912 msgstr "Option --remote inattendue"

913

904 -#: archive.c:451

914 +#: archive.c:452

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

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

917

908 -#: archive.c:453

918 +#: archive.c:454

919 msgid "Unexpected option --output"

920 msgstr "Option --output inattendue"

921

912 -#: archive.c:475

922 +#: archive.c:476

923 #, c-format

924 msgid "Unknown archive format '%s'"

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

926

917 -#: archive.c:482

927 +#: archive.c:483

928 #, c-format

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

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

931

922 -#: attr.c:212

932 +#: attr.c:214

933 #, c-format

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

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

936

927 -#: attr.c:408

937 +#: attr.c:410

938 msgid ""

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

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

@@ -932,27 +942,22 @@ msgstr ""

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

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

944

935 -#: bisect.c:444

936 -#, c-format

937 -msgid "Could not open file '%s'"

938 -msgstr "impossible d'ouvrir le fichier '%s'"

939 -

940 -#: bisect.c:449

945 +#: bisect.c:447

946 #, c-format

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

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

949

945 -#: bisect.c:657

950 +#: bisect.c:655

951 #, c-format

952 msgid "We cannot bisect more!\n"

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

954

950 -#: bisect.c:710

955 +#: bisect.c:708

956 #, c-format

957 msgid "Not a valid commit name %s"

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

959

955 -#: bisect.c:734

960 +#: bisect.c:732

961 #, c-format

962 msgid ""

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

@@ -961,7 +966,7 @@ msgstr ""

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

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

968

964 -#: bisect.c:739

969 +#: bisect.c:737

970 #, c-format

971 msgid ""

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

@@ -970,7 +975,7 @@ msgstr ""

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

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

977

973 -#: bisect.c:744

978 +#: bisect.c:742

979 #, c-format

980 msgid ""

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

@@ -979,7 +984,7 @@ msgstr ""

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

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

986

982 -#: bisect.c:752

987 +#: bisect.c:750

988 #, c-format

989 msgid ""

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

@@ -990,7 +995,7 @@ msgstr ""

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

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

997

993 -#: bisect.c:765

998 +#: bisect.c:763

999 #, c-format

1000 msgid ""

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

@@ -1002,36 +1007,36 @@ msgstr ""

1007 "et %s.\n"

1008 "On continue tout de même."

1009

1005 -#: bisect.c:800

1010 +#: bisect.c:798

1011 #, c-format

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

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

1014

1010 -#: bisect.c:851

1015 +#: bisect.c:849

1016 #, c-format

1017 msgid "a %s revision is needed"

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

1019

1015 -#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255

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

1021 #, c-format

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

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

1024

1020 -#: bisect.c:919

1025 +#: bisect.c:917

1026 #, c-format

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

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

1029

1025 -#: bisect.c:949

1030 +#: bisect.c:947

1031 msgid "reading bisect refs failed"

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

1033

1029 -#: bisect.c:969

1034 +#: bisect.c:967

1035 #, c-format

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

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

1038

1034 -#: bisect.c:977

1039 +#: bisect.c:975

1040 #, c-format

1041 msgid ""

1042 "No testable commit found.\n"

@@ -1040,15 +1045,16 @@ msgstr ""

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

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

1047

1043 -#: bisect.c:996

1048 +#: bisect.c:994

1049 #, c-format

1050 msgid "(roughly %d step)"

1051 msgid_plural "(roughly %d steps)"

1052 msgstr[0] "(à peu près %d étape)"

1053 msgstr[1] "(à peu près %d étapes)"

1054

1050 -#. TRANSLATORS: the last %s will be replaced with

1051 -#. "(roughly %d steps)" translation

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

1056 +#. steps)" translation.

1057 +#.

1058 #: bisect.c:1000

1059 #, c-format

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

@@ -1056,6 +1062,44 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1064

1065 +#: blame.c:1757

1066 +msgid "--contents and --reverse do not blend well."

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

1068 +

1069 +#: blame.c:1768

1070 +msgid "cannot use --contents with final commit object name"

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

1072 +

1073 +#: blame.c:1788

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

1075 +msgstr ""

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

1077 +"dernier commit"

1078 +

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

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

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

1082 +#: builtin/shortlog.c:177

1083 +msgid "revision walk setup failed"

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

1085 +

1086 +#: blame.c:1815

1087 +msgid ""

1088 +"--reverse --first-parent together require range along first-parent chain"

1089 +msgstr ""

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

1091 +"premier parent"

1092 +

1093 +#: blame.c:1826

1094 +#, c-format

1095 +msgid "no such path %s in %s"

1096 +msgstr "pas de chemin %s dans %s"

1097 +

1098 +#: blame.c:1837

1099 +#, c-format

1100 +msgid "cannot read blob %s for path %s"

1101 +msgstr "impossible de lire le blob %s pour le chemin %s"

1102 +

1103 #: branch.c:53

1104 #, c-format

1105 msgid ""

@@ -1196,7 +1240,7 @@ msgstr "Point d'embranchement invalide : '%s'."

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

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

1242

1199 -#: branch.c:364

1243 +#: branch.c:366

1244 #, c-format

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

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

@@ -1206,92 +1250,85 @@ msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"

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

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

1252

1209 -#: bundle.c:61

1253 +#: bundle.c:62

1254 #, c-format

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

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

1257

1214 -#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777

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

1259 #, c-format

1260 msgid "could not open '%s'"

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

1262

1219 -#: bundle.c:139

1263 +#: bundle.c:140

1264 msgid "Repository lacks these prerequisite commits:"

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

1266

1223 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321

1224 -#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1225 -#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1226 -#: builtin/merge.c:359 builtin/shortlog.c:176

1227 -msgid "revision walk setup failed"

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

1229 -

1230 -#: bundle.c:185

1267 +#: bundle.c:186

1268 #, c-format

1269 msgid "The bundle contains this ref:"

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

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

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

1273

1237 -#: bundle.c:192

1274 +#: bundle.c:193

1275 msgid "The bundle records a complete history."

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

1277

1241 -#: bundle.c:194

1278 +#: bundle.c:195

1279 #, c-format

1280 msgid "The bundle requires this ref:"

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

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

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

1284

1248 -#: bundle.c:253

1285 +#: bundle.c:254

1286 msgid "Could not spawn pack-objects"

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

1288

1252 -#: bundle.c:264

1289 +#: bundle.c:265

1290 msgid "pack-objects died"

1291 msgstr "les objets groupés ont disparu"

1292

1256 -#: bundle.c:304

1293 +#: bundle.c:307

1294 msgid "rev-list died"

1295 msgstr "rev-list a disparu"

1296

1260 -#: bundle.c:353

1297 +#: bundle.c:356

1298 #, c-format

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

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

1301

1265 -#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

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

1303 #, c-format

1304 msgid "unrecognized argument: %s"

1305 msgstr "argument non reconnu : %s"

1306

1270 -#: bundle.c:451

1307 +#: bundle.c:454

1308 msgid "Refusing to create empty bundle."

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

1310

1274 -#: bundle.c:463

1311 +#: bundle.c:466

1312 #, c-format

1313 msgid "cannot create '%s'"

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

1315

1279 -#: bundle.c:491

1316 +#: bundle.c:494

1317 msgid "index-pack died"

1318 msgstr "l'index de groupe a disparu"

1319

1283 -#: color.c:300

1320 +#: color.c:301

1321 #, c-format

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

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

1324

1288 -#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455

1289 -#: builtin/am.c:1489 builtin/am.c:2126

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

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

1327 #, c-format

1328 msgid "could not parse %s"

1329 msgstr "impossible d'analyser %s"

1330

1294 -#: commit.c:42

1331 +#: commit.c:43

1332 #, c-format

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

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

@@ -1312,180 +1349,180 @@ msgstr ""

1349 msgid "memory exhausted"

1350 msgstr "plus de mémoire"

1351

1315 -#: config.c:191

1352 +#: config.c:186

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

1354 msgstr ""

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

1356 "fichiers"

1357

1321 -#: config.c:711

1358 +#: config.c:720

1359 #, c-format

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

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

1362

1326 -#: config.c:715

1363 +#: config.c:724

1364 #, c-format

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

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

1367

1331 -#: config.c:719

1368 +#: config.c:728

1369 #, c-format

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

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

1372

1336 -#: config.c:723

1373 +#: config.c:732

1374 #, c-format

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

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

1377

1341 -#: config.c:727

1378 +#: config.c:736

1379 #, c-format

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

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

1382

1346 -#: config.c:731

1383 +#: config.c:740

1384 #, c-format

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

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

1387

1351 -#: config.c:859

1388 +#: config.c:868

1389 msgid "out of range"

1390 msgstr "hors plage"

1391

1355 -#: config.c:859

1392 +#: config.c:868

1393 msgid "invalid unit"

1394 msgstr "unité invalide"

1395

1359 -#: config.c:865

1396 +#: config.c:874

1397 #, c-format

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

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

1400

1364 -#: config.c:870

1401 +#: config.c:879

1402 #, c-format

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

1404 msgstr ""

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

1406 "%s : %s"

1407

1371 -#: config.c:873

1408 +#: config.c:882

1409 #, c-format

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

1411 msgstr ""

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

1413 "%s : %s"

1414

1378 -#: config.c:876

1415 +#: config.c:885

1416 #, c-format

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

1418 msgstr ""

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

1420 "standard : %s"

1421

1385 -#: config.c:879

1422 +#: config.c:888

1423 #, c-format

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

1425 msgstr ""

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

1427 "sous-module %s : %s"

1428

1392 -#: config.c:882

1429 +#: config.c:891

1430 #, c-format

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

1432 msgstr ""

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

1434 "commande %s : %s"

1435

1399 -#: config.c:885

1436 +#: config.c:894

1437 #, c-format

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

1439 msgstr ""

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

1441

1405 -#: config.c:980

1442 +#: config.c:989

1443 #, c-format

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

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

1446

1410 -#: config.c:1075 config.c:1086

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

1448 #, c-format

1449 msgid "bad zlib compression level %d"

1450 msgstr "niveau de compression zlib incorrect %d"

1451

1415 -#: config.c:1203

1452 +#: config.c:1212

1453 #, c-format

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

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

1456

1420 -#: config.c:1359

1457 +#: config.c:1368

1458 #, c-format

1459 msgid "bad pack compression level %d"

1460 msgstr "niveau de compression du paquet %d"

1461

1425 -#: config.c:1557

1462 +#: config.c:1564

1463 msgid "unable to parse command-line config"

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

1465

1429 -#: config.c:1611

1466 +#: config.c:1894

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

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

1469

1433 -#: config.c:1970

1470 +#: config.c:2064

1471 #, c-format

1472 msgid "Invalid %s: '%s'"

1473 msgstr "%s invalide : '%s'"

1474

1438 -#: config.c:1991

1475 +#: config.c:2085

1476 #, c-format

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

1478 msgstr ""

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

1480 "défaut"

1481

1445 -#: config.c:2017

1482 +#: config.c:2111

1483 #, c-format

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

1485 msgstr ""

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

1487 "100"

1488

1452 -#: config.c:2028

1489 +#: config.c:2122

1490 #, c-format

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

1492 msgstr ""

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

1494

1458 -#: config.c:2030

1495 +#: config.c:2124

1496 #, c-format

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

1498 msgstr ""

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

1500

1464 -#: config.c:2089

1501 +#: config.c:2183

1502 #, c-format

1503 msgid "%s has multiple values"

1504 msgstr "%s a des valeurs multiples"

1505

1469 -#: config.c:2423 config.c:2648

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

1507 #, c-format

1508 msgid "fstat on %s failed"

1509 msgstr "échec de fstat sur %s"

1510

1474 -#: config.c:2541

1511 +#: config.c:2635

1512 #, c-format

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

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

1515

1479 -#: config.c:2543 builtin/remote.c:774

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

1517 #, c-format

1518 msgid "could not unset '%s'"

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

1520

1484 -#: connect.c:49

1521 +#: connect.c:50

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

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

1524

1488 -#: connect.c:51

1525 +#: connect.c:52

1526 msgid ""

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

1528 "\n"

@@ -1497,7 +1534,7 @@ msgstr ""

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

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

1536

1500 -#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

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

1538 msgid "Checking connectivity"

1539 msgstr "Vérification de la connectivité"

1540

@@ -1513,7 +1550,7 @@ msgstr "impossible d'écrire dans la rev-list"

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

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

1552

1516 -#: convert.c:201

1553 +#: convert.c:205

1554 #, c-format

1555 msgid ""

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

@@ -1523,12 +1560,12 @@ msgstr ""

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

1561 "travail."

1562

1526 -#: convert.c:205

1563 +#: convert.c:209

1564 #, c-format

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

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

1567

1531 -#: convert.c:211

1568 +#: convert.c:215

1569 #, c-format

1570 msgid ""

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

@@ -1538,78 +1575,78 @@ msgstr ""

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

1576 "travail."

1577

1541 -#: convert.c:215

1578 +#: convert.c:219

1579 #, c-format

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

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

1582

1546 -#: date.c:97

1583 +#: date.c:116

1584 msgid "in the future"

1585 msgstr "dans le futur"

1586

1550 -#: date.c:103

1587 +#: date.c:122

1588 #, c-format

1552 -msgid "%lu second ago"

1553 -msgid_plural "%lu seconds ago"

1554 -msgstr[0] "il y a %lu seconde"

1555 -msgstr[1] "il y a %lu secondes"

1589 +msgid "%<PRIuMAX> second ago"

1590 +msgid_plural "%<PRIuMAX> seconds ago"

1591 +msgstr[0] "il y a %<PRIuMAX> seconde"

1592 +msgstr[1] "il y a %<PRIuMAX> secondes"

1593

1557 -#: date.c:110

1594 +#: date.c:129

1595 #, c-format

1559 -msgid "%lu minute ago"

1560 -msgid_plural "%lu minutes ago"

1561 -msgstr[0] "il y a %lu minute"

1562 -msgstr[1] "il y a %lu minutes"

1596 +msgid "%<PRIuMAX> minute ago"

1597 +msgid_plural "%<PRIuMAX> minutes ago"

1598 +msgstr[0] "il y a %<PRIuMAX> minute"

1599 +msgstr[1] "il y a %<PRIuMAX> minutes"

1600

1564 -#: date.c:117

1601 +#: date.c:136

1602 #, c-format

1566 -msgid "%lu hour ago"

1567 -msgid_plural "%lu hours ago"

1568 -msgstr[0] "il y a %lu heure"

1569 -msgstr[1] "il y a %lu heures"

1603 +msgid "%<PRIuMAX> hour ago"

1604 +msgid_plural "%<PRIuMAX> hours ago"

1605 +msgstr[0] "il y a %<PRIuMAX> heure"

1606 +msgstr[1] "il y a %<PRIuMAX> heures"

1607

1571 -#: date.c:124

1608 +#: date.c:143

1609 #, c-format

1573 -msgid "%lu day ago"

1574 -msgid_plural "%lu days ago"

1575 -msgstr[0] "il y a %lu jour"

1576 -msgstr[1] "il y a %lu jours"

1610 +msgid "%<PRIuMAX> day ago"

1611 +msgid_plural "%<PRIuMAX> days ago"

1612 +msgstr[0] "il y a %<PRIuMAX> jour"

1613 +msgstr[1] "il y a %<PRIuMAX> jours"

1614

1578 -#: date.c:130

1615 +#: date.c:149

1616 #, c-format

1580 -msgid "%lu week ago"

1581 -msgid_plural "%lu weeks ago"

1582 -msgstr[0] "il y a %lu semaine"

1583 -msgstr[1] "il y a %lu semaines"

1617 +msgid "%<PRIuMAX> week ago"

1618 +msgid_plural "%<PRIuMAX> weeks ago"

1619 +msgstr[0] "il y a %<PRIuMAX> semaine"

1620 +msgstr[1] "il y a %<PRIuMAX> semaines"

1621

1585 -#: date.c:137

1622 +#: date.c:156

1623 #, c-format

1587 -msgid "%lu month ago"

1588 -msgid_plural "%lu months ago"

1589 -msgstr[0] "il y a %lu mois"

1590 -msgstr[1] "il y a %lu mois"

1624 +msgid "%<PRIuMAX> month ago"

1625 +msgid_plural "%<PRIuMAX> months ago"

1626 +msgstr[0] "il y a %<PRIuMAX> mois"

1627 +msgstr[1] "il y a %<PRIuMAX> mois"

1628

1592 -#: date.c:148

1629 +#: date.c:167

1630 #, c-format

1594 -msgid "%lu year"

1595 -msgid_plural "%lu years"

1596 -msgstr[0] "%lu an"

1597 -msgstr[1] "%lu ans"

1631 +msgid "%<PRIuMAX> year"

1632 +msgid_plural "%<PRIuMAX> years"

1633 +msgstr[0] "%<PRIuMAX> an"

1634 +msgstr[1] "%<PRIuMAX> ans"

1635

1636 #. TRANSLATORS: "%s" is "<n> years"

1600 -#: date.c:151

1637 +#: date.c:170

1638 #, c-format

1602 -msgid "%s, %lu month ago"

1603 -msgid_plural "%s, %lu months ago"

1604 -msgstr[0] "il y a %s et %lu mois"

1605 -msgstr[1] "il y a %s et %lu mois"

1639 +msgid "%s, %<PRIuMAX> month ago"

1640 +msgid_plural "%s, %<PRIuMAX> months ago"

1641 +msgstr[0] "il y a %s et %<PRIuMAX> mois"

1642 +msgstr[1] "il y a %s et %<PRIuMAX> mois"

1643

1607 -#: date.c:156 date.c:161

1644 +#: date.c:175 date.c:180

1645 #, c-format

1609 -msgid "%lu year ago"

1610 -msgid_plural "%lu years ago"

1611 -msgstr[0] "il y a %lu an"

1612 -msgstr[1] "il y a %lu ans"

1646 +msgid "%<PRIuMAX> year ago"

1647 +msgid_plural "%<PRIuMAX> years ago"

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

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

1650

1651 #: diffcore-order.c:24

1652 #, c-format

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

1657 msgid "Performing inexact rename detection"

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

1659

1623 -#: diff.c:62

1660 +#: diff.c:63

1661 #, c-format

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

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

1664

1628 -#: diff.c:124

1665 +#: diff.c:125

1666 #, c-format

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

1668 msgstr ""

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

1670

1634 -#: diff.c:129

1671 +#: diff.c:130

1672 #, c-format

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

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

1675

1639 -#: diff.c:281

1676 +#: diff.c:282

1677 #, c-format

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

1679 msgstr ""

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

1681

1645 -#: diff.c:344

1682 +#: diff.c:342

1683 #, c-format

1684 msgid ""

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

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

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

1689 "%s"

1690

1654 -#: diff.c:3102

1691 +#: diff.c:3101

1692 #, c-format

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

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

1695

1659 -#: diff.c:3428

1696 +#: diff.c:3427

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

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

1699

1663 -#: diff.c:3518

1700 +#: diff.c:3517

1701 msgid "--follow requires exactly one pathspec"

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

1703

1667 -#: diff.c:3681

1704 +#: diff.c:3680

1705 #, c-format

1706 msgid ""

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

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

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

1711 "%s"

1712

1676 -#: diff.c:3695

1713 +#: diff.c:3694

1714 #, c-format

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

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

1717

1681 -#: diff.c:4719

1718 +#: diff.c:4716

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

1720 msgstr ""

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

1722 "fichiers."

1723

1687 -#: diff.c:4722

1724 +#: diff.c:4719

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

1726 msgstr ""

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

1728 "grand nombre de fichiers."

1729

1693 -#: diff.c:4725

1730 +#: diff.c:4722

1731 #, c-format

1732 msgid ""

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

@@ -1698,258 +1735,258 @@ msgstr ""

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

1736 "commande."

1737

1701 -#: dir.c:1899

1738 +#: dir.c:1948

1739 msgid "failed to get kernel name and information"

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

1741

1705 -#: dir.c:2018

1742 +#: dir.c:2067

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

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

1745

1709 -#: dir.c:2776 dir.c:2781

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

1747 #, c-format

1748 msgid "could not create directories for %s"

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

1750

1714 -#: dir.c:2806

1751 +#: dir.c:2876

1752 #, c-format

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

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

1755

1719 -#: entry.c:280

1756 +#: entry.c:281

1757 #, c-format

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

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

1760

1724 -#: fetch-pack.c:249

1761 +#: fetch-pack.c:251

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

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

1764

1728 -#: fetch-pack.c:261

1765 +#: fetch-pack.c:263

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

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

1768

1732 -#: fetch-pack.c:280 builtin/archive.c:63

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

1770 #, c-format

1771 msgid "remote error: %s"

1772 msgstr "erreur distante : %s"

1773

1737 -#: fetch-pack.c:281

1774 +#: fetch-pack.c:283

1775 #, c-format

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

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

1778

1742 -#: fetch-pack.c:333

1779 +#: fetch-pack.c:335

1780 msgid "--stateless-rpc requires multi_ack_detailed"

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

1782

1746 -#: fetch-pack.c:419

1783 +#: fetch-pack.c:421

1784 #, c-format

1785 msgid "invalid shallow line: %s"

1786 msgstr "ligne de superficiel invalide : %s"

1787

1751 -#: fetch-pack.c:425

1788 +#: fetch-pack.c:427

1789 #, c-format

1790 msgid "invalid unshallow line: %s"

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

1792

1756 -#: fetch-pack.c:427

1793 +#: fetch-pack.c:429

1794 #, c-format

1795 msgid "object not found: %s"

1796 msgstr "objet non trouvé : %s"

1797

1761 -#: fetch-pack.c:430

1798 +#: fetch-pack.c:432

1799 #, c-format

1800 msgid "error in object: %s"

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

1802

1766 -#: fetch-pack.c:432

1803 +#: fetch-pack.c:434

1804 #, c-format

1805 msgid "no shallow found: %s"

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

1807

1771 -#: fetch-pack.c:435

1808 +#: fetch-pack.c:437

1809 #, c-format

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

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

1812

1776 -#: fetch-pack.c:474

1813 +#: fetch-pack.c:476

1814 #, c-format

1815 msgid "got %s %d %s"

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

1817

1781 -#: fetch-pack.c:488

1818 +#: fetch-pack.c:490

1819 #, c-format

1820 msgid "invalid commit %s"

1821 msgstr "commit invalide %s"

1822

1786 -#: fetch-pack.c:521

1823 +#: fetch-pack.c:523

1824 msgid "giving up"

1825 msgstr "abandon"

1826

1790 -#: fetch-pack.c:531 progress.c:235

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

1828 msgid "done"

1829 msgstr "fait"

1830

1794 -#: fetch-pack.c:543

1831 +#: fetch-pack.c:545

1832 #, c-format

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

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

1835

1799 -#: fetch-pack.c:589

1836 +#: fetch-pack.c:591

1837 #, c-format

1838 msgid "Marking %s as complete"

1839 msgstr "Marquage de %s comme terminé"

1840

1804 -#: fetch-pack.c:737

1841 +#: fetch-pack.c:775

1842 #, c-format

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

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

1845

1809 -#: fetch-pack.c:775

1846 +#: fetch-pack.c:813

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

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

1849

1813 -#: fetch-pack.c:783

1850 +#: fetch-pack.c:821

1851 msgid "protocol error: bad pack header"

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

1853

1817 -#: fetch-pack.c:839

1854 +#: fetch-pack.c:877

1855 #, c-format

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

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

1858

1822 -#: fetch-pack.c:855

1859 +#: fetch-pack.c:893

1860 #, c-format

1861 msgid "%s failed"

1862 msgstr "échec de %s"

1863

1827 -#: fetch-pack.c:857

1864 +#: fetch-pack.c:895

1865 msgid "error in sideband demultiplexer"

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

1867

1831 -#: fetch-pack.c:884

1868 +#: fetch-pack.c:922

1869 msgid "Server does not support shallow clients"

1870 msgstr "Le serveur ne supporte les clients superficiels"

1871

1835 -#: fetch-pack.c:888

1872 +#: fetch-pack.c:926

1873 msgid "Server supports multi_ack_detailed"

1874 msgstr "Le serveur supporte multi_ack_detailed"

1875

1839 -#: fetch-pack.c:891

1876 +#: fetch-pack.c:929

1877 msgid "Server supports no-done"

1878 msgstr "Le serveur support no-done"

1879

1843 -#: fetch-pack.c:897

1880 +#: fetch-pack.c:935

1881 msgid "Server supports multi_ack"

1882 msgstr "Le serveur supporte multi_ack"

1883

1847 -#: fetch-pack.c:901

1884 +#: fetch-pack.c:939

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

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

1887

1851 -#: fetch-pack.c:905

1888 +#: fetch-pack.c:943

1889 msgid "Server supports side-band"

1890 msgstr "Le serveru supporte side-band"

1891

1855 -#: fetch-pack.c:909

1892 +#: fetch-pack.c:947

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

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

1895

1859 -#: fetch-pack.c:913

1896 +#: fetch-pack.c:951

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

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

1899

1863 -#: fetch-pack.c:923

1900 +#: fetch-pack.c:961

1901 msgid "Server supports ofs-delta"

1902 msgstr "Le serveur support ofs-delta"

1903

1867 -#: fetch-pack.c:930

1904 +#: fetch-pack.c:968

1905 #, c-format

1906 msgid "Server version is %.*s"

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

1908

1872 -#: fetch-pack.c:936

1909 +#: fetch-pack.c:974

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

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

1912

1876 -#: fetch-pack.c:940

1913 +#: fetch-pack.c:978

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

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

1916

1880 -#: fetch-pack.c:942

1917 +#: fetch-pack.c:980

1918 msgid "Server does not support --deepen"

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

1920

1884 -#: fetch-pack.c:953

1921 +#: fetch-pack.c:991

1922 msgid "no common commits"

1923 msgstr "pas de commit commun"

1924

1888 -#: fetch-pack.c:965

1925 +#: fetch-pack.c:1003

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

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

1928

1892 -#: fetch-pack.c:1127

1929 +#: fetch-pack.c:1165

1930 msgid "no matching remote head"

1931 msgstr "pas de HEAD distante correspondante"

1932

1896 -#: fetch-pack.c:1149

1933 +#: fetch-pack.c:1187

1934 #, c-format

1935 msgid "no such remote ref %s"

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

1937

1901 -#: fetch-pack.c:1152

1938 +#: fetch-pack.c:1190

1939 #, c-format

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

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

1942

1906 -#: gpg-interface.c:185

1943 +#: gpg-interface.c:181

1944 msgid "gpg failed to sign the data"

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

1946

1910 -#: gpg-interface.c:215

1947 +#: gpg-interface.c:211

1948 msgid "could not create temporary file"

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

1950

1914 -#: gpg-interface.c:217

1951 +#: gpg-interface.c:213

1952 #, c-format

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

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

1955

1919 -#: graph.c:96

1956 +#: graph.c:97

1957 #, c-format

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

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

1960

1924 -#: grep.c:1796

1961 +#: grep.c:1981

1962 #, c-format

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

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

1965

1929 -#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

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

1967 #, c-format

1968 msgid "failed to stat '%s'"

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

1970

1934 -#: grep.c:1824

1971 +#: grep.c:2009

1972 #, c-format

1973 msgid "'%s': short read"

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

1975

1939 -#: help.c:218

1976 +#: help.c:179

1977 #, c-format

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

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

1980

1944 -#: help.c:225

1981 +#: help.c:186

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

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

1984

1948 -#: help.c:256

1985 +#: help.c:217

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

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

1988

1952 -#: help.c:321

1989 +#: help.c:281

1990 #, c-format

1991 msgid ""

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

@@ -1958,50 +1995,70 @@ msgstr ""

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

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

1997

1961 -#: help.c:376

1998 +#: help.c:336

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

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

2001

1965 -#: help.c:398

2002 +#: help.c:358

2003 #, c-format

1967 -msgid ""

1968 -"WARNING: You called a Git command named '%s', which does not exist.\n"

1969 -"Continuing under the assumption that you meant '%s'"

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

2005 msgstr ""

1971 -"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "

1972 -"pas.\n"

1973 -"Continuons en supposant que vous avez voulu dire '%s'"

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

2007

1975 -#: help.c:403

2008 +#: help.c:363

2009 #, c-format

1977 -msgid "in %0.1f seconds automatically..."

1978 -msgstr "dans %0.1f secondes automatiquement..."

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

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

2012

1980 -#: help.c:410

2013 +#: help.c:368

2014 +#, c-format

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

2016 +msgstr ""

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

2018 +

2019 +#: help.c:376

2020 #, c-format

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

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

2023

1985 -#: help.c:414 help.c:480

2024 +#: help.c:380

2025 msgid ""

2026 "\n"

1988 -"Did you mean this?"

2027 +"The most similar command is"

2028 msgid_plural ""

2029 "\n"

1991 -"Did you mean one of these?"

2030 +"The most similar commands are"

2031 msgstr[0] ""

2032 "\n"

1994 -"Vouliez-vous dire cela ?"

2033 +"La commande la plus ressemblante est"

2034 msgstr[1] ""

2035 "\n"

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

2036 +"Les commandes les plus ressemblantes sont"

2037

1999 -#: help.c:476

2038 +#: help.c:395

2039 +msgid "git version [<options>]"

2040 +msgstr "git version [<options>]"

2041 +

2042 +#: help.c:456

2043 #, c-format

2044 msgid "%s: %s - %s"

2045 msgstr "%s: %s - %s"

2046

2004 -#: ident.c:343

2047 +#: help.c:460

2048 +msgid ""

2049 +"\n"

2050 +"Did you mean this?"

2051 +msgid_plural ""

2052 +"\n"

2053 +"Did you mean one of these?"

2054 +msgstr[0] ""

2055 +"\n"

2056 +"Vouliez-vous dire cela ?"

2057 +msgstr[1] ""

2058 +"\n"

2059 +"Vouliez-vous dire un de ceux-là ?"

2060 +

2061 +#: ident.c:342

2062 msgid ""

2063 "\n"

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

@@ -2027,35 +2084,35 @@ msgstr ""

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

2085 "\n"

2086

2030 -#: ident.c:367

2087 +#: ident.c:366

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

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

2090

2034 -#: ident.c:372

2091 +#: ident.c:371

2092 #, c-format

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

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

2095

2039 -#: ident.c:382

2096 +#: ident.c:381

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

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

2099

2043 -#: ident.c:388

2100 +#: ident.c:387

2101 #, c-format

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

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

2104

2048 -#: ident.c:396

2105 +#: ident.c:395

2106 #, c-format

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

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

2109

2053 -#: ident.c:402

2110 +#: ident.c:401

2111 #, c-format

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

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

2114

2058 -#: ident.c:417 builtin/commit.c:611

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

2116 #, c-format

2117 msgid "invalid date format: %s"

2118 msgstr "format de date invalide : %s"

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

2145 msgid "failed to read the cache"

2146 msgstr "impossible de lire le cache"

2147

2091 -#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393

2092 -#: builtin/checkout.c:607 builtin/clone.c:749

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

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

2150 msgid "unable to write new index file"

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

2152

2096 -#: merge-recursive.c:209

2153 +#: merge-recursive.c:210

2154 msgid "(bad commit)\n"

2155 msgstr "(mauvais commit)\n"

2156

2100 -#: merge-recursive.c:231 merge-recursive.c:239

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

2158 #, c-format

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

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

2161

2105 -#: merge-recursive.c:303

2162 +#: merge-recursive.c:304

2163 msgid "error building trees"

2164 msgstr "erreur de construction des arbres"

2165

2109 -#: merge-recursive.c:727

2166 +#: merge-recursive.c:728

2167 #, c-format

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

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

2170

2114 -#: merge-recursive.c:738

2171 +#: merge-recursive.c:739

2172 #, c-format

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

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

2175

2119 -#: merge-recursive.c:752 merge-recursive.c:771

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

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

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

2179

2123 -#: merge-recursive.c:761

2180 +#: merge-recursive.c:762

2181 #, c-format

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

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

2184

2128 -#: merge-recursive.c:803 builtin/cat-file.c:34

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

2186 #, c-format

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

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

2189

2133 -#: merge-recursive.c:805

2190 +#: merge-recursive.c:806

2191 #, c-format

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

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

2194

2138 -#: merge-recursive.c:829

2195 +#: merge-recursive.c:830

2196 #, c-format

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

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

2199

2143 -#: merge-recursive.c:840

2200 +#: merge-recursive.c:841

2201 #, c-format

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

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

2204

2148 -#: merge-recursive.c:845

2205 +#: merge-recursive.c:846

2206 #, c-format

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

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

2209

2153 -#: merge-recursive.c:985

2210 +#: merge-recursive.c:986

2211 msgid "Failed to execute internal merge"

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

2213

2157 -#: merge-recursive.c:989

2214 +#: merge-recursive.c:990

2215 #, c-format

2216 msgid "Unable to add %s to database"

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

2218

2162 -#: merge-recursive.c:1092

2219 +#: merge-recursive.c:1093

2220 #, c-format

2221 msgid ""

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

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

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

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

2227

2171 -#: merge-recursive.c:1097

2228 +#: merge-recursive.c:1098

2229 #, c-format

2230 msgid ""

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

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

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

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

2236

2180 -#: merge-recursive.c:1104

2237 +#: merge-recursive.c:1105

2238 #, c-format

2239 msgid ""

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

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

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

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

2245

2189 -#: merge-recursive.c:1109

2246 +#: merge-recursive.c:1110

2247 #, c-format

2248 msgid ""

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

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

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

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

2254

2198 -#: merge-recursive.c:1143

2255 +#: merge-recursive.c:1144

2256 msgid "rename"

2257 msgstr "renommage"

2258

2202 -#: merge-recursive.c:1143

2259 +#: merge-recursive.c:1144

2260 msgid "renamed"

2261 msgstr "renommé"

2262

2206 -#: merge-recursive.c:1200

2263 +#: merge-recursive.c:1201

2264 #, c-format

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

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

2267

2211 -#: merge-recursive.c:1225

2268 +#: merge-recursive.c:1226

2269 #, c-format

2270 msgid ""

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

@@ -2217,137 +2274,137 @@ msgstr ""

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

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

2276

2220 -#: merge-recursive.c:1230

2277 +#: merge-recursive.c:1231

2278 msgid " (left unresolved)"

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

2280

2224 -#: merge-recursive.c:1292

2281 +#: merge-recursive.c:1293

2282 #, c-format

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

2284 msgstr ""

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

2286 ">'%s' dans %s"

2287

2231 -#: merge-recursive.c:1325

2288 +#: merge-recursive.c:1326

2289 #, c-format

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

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

2292

2236 -#: merge-recursive.c:1528

2293 +#: merge-recursive.c:1529

2294 #, c-format

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

2296 msgstr ""

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

2298

2242 -#: merge-recursive.c:1543

2299 +#: merge-recursive.c:1544

2300 #, c-format

2301 msgid "Adding merged %s"

2302 msgstr "Ajout de %s fusionné"

2303

2247 -#: merge-recursive.c:1550 merge-recursive.c:1780

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

2305 #, c-format

2306 msgid "Adding as %s instead"

2307 msgstr "Ajout plutôt comme %s"

2308

2252 -#: merge-recursive.c:1607

2309 +#: merge-recursive.c:1608

2310 #, c-format

2311 msgid "cannot read object %s"

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

2313

2257 -#: merge-recursive.c:1610

2314 +#: merge-recursive.c:1611

2315 #, c-format

2316 msgid "object %s is not a blob"

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

2318

2262 -#: merge-recursive.c:1679

2319 +#: merge-recursive.c:1680

2320 msgid "modify"

2321 msgstr "modification"

2322

2266 -#: merge-recursive.c:1679

2323 +#: merge-recursive.c:1680

2324 msgid "modified"

2325 msgstr "modifié"

2326

2270 -#: merge-recursive.c:1689

2327 +#: merge-recursive.c:1690

2328 msgid "content"

2329 msgstr "contenu"

2330

2274 -#: merge-recursive.c:1696

2331 +#: merge-recursive.c:1697

2332 msgid "add/add"

2333 msgstr "ajout/ajout"

2334

2278 -#: merge-recursive.c:1732

2335 +#: merge-recursive.c:1733

2336 #, c-format

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

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

2339

2283 -#: merge-recursive.c:1746

2340 +#: merge-recursive.c:1747

2341 #, c-format

2342 msgid "Auto-merging %s"

2343 msgstr "Fusion automatique de %s"

2344

2288 -#: merge-recursive.c:1750 git-submodule.sh:944

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

2346 msgid "submodule"

2347 msgstr "sous-module"

2348

2292 -#: merge-recursive.c:1751

2349 +#: merge-recursive.c:1752

2350 #, c-format

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

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

2353

2297 -#: merge-recursive.c:1845

2354 +#: merge-recursive.c:1846

2355 #, c-format

2356 msgid "Removing %s"

2357 msgstr "Suppression de %s"

2358

2302 -#: merge-recursive.c:1871

2359 +#: merge-recursive.c:1872

2360 msgid "file/directory"

2361 msgstr "fichier/répertoire"

2362

2306 -#: merge-recursive.c:1877

2363 +#: merge-recursive.c:1878

2364 msgid "directory/file"

2365 msgstr "répertoire/fichier"

2366

2310 -#: merge-recursive.c:1883

2367 +#: merge-recursive.c:1884

2368 #, c-format

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

2370 msgstr ""

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

2372

2316 -#: merge-recursive.c:1892

2373 +#: merge-recursive.c:1893

2374 #, c-format

2375 msgid "Adding %s"

2376 msgstr "Ajout de %s"

2377

2321 -#: merge-recursive.c:1929

2378 +#: merge-recursive.c:1930

2379 msgid "Already up-to-date!"

2380 msgstr "Déjà à jour !"

2381

2325 -#: merge-recursive.c:1938

2382 +#: merge-recursive.c:1939

2383 #, c-format

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

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

2386

2330 -#: merge-recursive.c:2021

2387 +#: merge-recursive.c:2022

2388 msgid "Merging:"

2389 msgstr "Fusion :"

2390

2334 -#: merge-recursive.c:2034

2391 +#: merge-recursive.c:2035

2392 #, c-format

2393 msgid "found %u common ancestor:"

2394 msgid_plural "found %u common ancestors:"

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

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

2397

2341 -#: merge-recursive.c:2073

2398 +#: merge-recursive.c:2074

2399 msgid "merge returned no commit"

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

2401

2345 -#: merge-recursive.c:2136

2402 +#: merge-recursive.c:2137

2403 #, c-format

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

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

2406

2350 -#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

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

2408 msgid "Unable to write index."

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

2410

@@ -2367,23 +2424,25 @@ msgstr ""

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

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

2426

2370 -#: notes-utils.c:41

2427 +#: notes-utils.c:42

2428 msgid "Cannot commit uninitialized/unreferenced notes tree"

2429 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"

2430

2374 -#: notes-utils.c:100

2431 +#: notes-utils.c:101

2432 #, c-format

2433 msgid "Bad notes.rewriteMode value: '%s'"

2434 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"

2435

2379 -#: notes-utils.c:110

2436 +#: notes-utils.c:111

2437 #, c-format

2438 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2439 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

2440

2384 -#. TRANSLATORS: The first %s is the name of the

2385 -#. environment variable, the second %s is its value

2386 -#: notes-utils.c:137

2441 +#. TRANSLATORS: The first %s is the name of

2442 +#. the environment variable, the second %s is

2443 +#. its value.

2444 +#.

2445 +#: notes-utils.c:141

2446 #, c-format

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

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

@@ -2393,28 +2452,29 @@ msgstr "Mauvaise valeur de %s : '%s'"

2452 msgid "unable to parse object: %s"

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

2454

2396 -#: parse-options.c:572

2455 +#: parse-options.c:573

2456 msgid "..."

2457 msgstr "..."

2458

2400 -#: parse-options.c:590

2459 +#: parse-options.c:591

2460 #, c-format

2461 msgid "usage: %s"

2462 msgstr "usage : %s"

2463

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

2406 -#. one in "usage: %s" translation

2407 -#: parse-options.c:594

2465 +#. one in "usage: %s" translation.

2466 +#.

2467 +#: parse-options.c:597

2468 #, c-format

2469 msgid " or: %s"

2470 msgstr " ou : %s"

2471

2412 -#: parse-options.c:597

2472 +#: parse-options.c:600

2473 #, c-format

2474 msgid " %s"

2475 msgstr " %s"

2476

2417 -#: parse-options.c:631

2477 +#: parse-options.c:634

2478 msgid "-NUM"

2479 msgstr "-NUM"

2480

@@ -2423,37 +2483,37 @@ msgstr "-NUM"

2483 msgid "malformed object name '%s'"

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

2485

2426 -#: path.c:810

2486 +#: path.c:890

2487 #, c-format

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

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

2490

2431 -#: pathspec.c:125

2491 +#: pathspec.c:129

2492 msgid "Escape character '\\' not allowed as last character in attr value"

2493 msgstr ""

2494 "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "

2495 "valeur d'attribut"

2496

2437 -#: pathspec.c:143

2497 +#: pathspec.c:147

2498 msgid "Only one 'attr:' specification is allowed."

2499 msgstr "Une seule spécification 'attr:' est autorisée."

2500

2441 -#: pathspec.c:146

2501 +#: pathspec.c:150

2502 msgid "attr spec must not be empty"

2503 msgstr "un spécificateur d'attribut ne peut pas être vide"

2504

2445 -#: pathspec.c:189

2505 +#: pathspec.c:193

2506 #, c-format

2507 msgid "invalid attribute name %s"

2508 msgstr "nom d'attribut invalide %s"

2509

2450 -#: pathspec.c:254

2510 +#: pathspec.c:258

2511 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2512 msgstr ""

2513 "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "

2514 "incompatibles"

2515

2456 -#: pathspec.c:261

2516 +#: pathspec.c:265

2517 msgid ""

2518 "global 'literal' pathspec setting is incompatible with all other global "

2519 "pathspec settings"

@@ -2461,53 +2521,48 @@ msgstr ""

2521 "le réglage global de spécificateur de chemin 'literal' est incompatible avec "

2522 "tous les autres réglages globaux de spécificateur de chemin"

2523

2464 -#: pathspec.c:301

2524 +#: pathspec.c:305

2525 msgid "invalid parameter for pathspec magic 'prefix'"

2526 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"

2527

2468 -#: pathspec.c:322

2528 +#: pathspec.c:326

2529 #, c-format

2530 msgid "Invalid pathspec magic '%.*s' in '%s'"

2531 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"

2532

2473 -#: pathspec.c:327

2533 +#: pathspec.c:331

2534 #, c-format

2535 msgid "Missing ')' at the end of pathspec magic in '%s'"

2536 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"

2537

2478 -#: pathspec.c:365

2538 +#: pathspec.c:369

2539 #, c-format

2540 msgid "Unimplemented pathspec magic '%c' in '%s'"

2541 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

2542

2483 -#: pathspec.c:421 pathspec.c:443

2484 -#, c-format

2485 -msgid "Pathspec '%s' is in submodule '%.*s'"

2486 -msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

2487 -

2488 -#: pathspec.c:483

2543 +#: pathspec.c:428

2544 #, c-format

2545 msgid "%s: 'literal' and 'glob' are incompatible"

2546 msgstr "%s : 'literal' et 'glob' sont incompatibles"

2547

2493 -#: pathspec.c:496

2548 +#: pathspec.c:441

2549 #, c-format

2550 msgid "%s: '%s' is outside repository"

2551 msgstr "%s : '%s' est hors du dépôt"

2552

2498 -#: pathspec.c:584

2553 +#: pathspec.c:515

2554 #, c-format

2555 msgid "'%s' (mnemonic: '%c')"

2556 msgstr "'%s' (mnémonique : '%c')"

2557

2503 -#: pathspec.c:594

2558 +#: pathspec.c:525

2559 #, c-format

2560 msgid "%s: pathspec magic not supported by this command: %s"

2561 msgstr ""

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

2563 "commande : %s"

2564

2510 -#: pathspec.c:644

2565 +#: pathspec.c:575

2566 msgid ""

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

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

@@ -2516,16 +2571,16 @@ msgstr ""

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

2572 "correspondre à tous le chemins"

2573

2519 -#: pathspec.c:668

2574 +#: pathspec.c:599

2575 #, c-format

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

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

2578

2524 -#: pretty.c:982

2579 +#: pretty.c:963

2580 msgid "unable to parse --pretty format"

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

2582

2528 -#: read-cache.c:1442

2583 +#: read-cache.c:1443

2584 #, c-format

2585 msgid ""

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

@@ -2534,7 +2589,7 @@ msgstr ""

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

2590 "Utilisation de la version %i"

2591

2537 -#: read-cache.c:1452

2592 +#: read-cache.c:1453

2593 #, c-format

2594 msgid ""

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

@@ -2543,47 +2598,52 @@ msgstr ""

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

2599 "Utilisation de la version %i"

2600

2546 -#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048

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

2602 +#, c-format

2603 +msgid "could not close '%s'"

2604 +msgstr "impossible de fermer '%s'"

2605 +

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

2607 #, c-format

2608 msgid "could not stat '%s'"

2609 msgstr "stat impossible de '%s'"

2610

2551 -#: read-cache.c:2388

2611 +#: read-cache.c:2396

2612 #, c-format

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

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

2615

2556 -#: read-cache.c:2400

2616 +#: read-cache.c:2408

2617 #, c-format

2618 msgid "unable to unlink: %s"

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

2620

2561 -#: refs.c:620 builtin/merge.c:844

2621 +#: refs.c:622

2622 #, c-format

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

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

2625

2566 -#: refs.c:1667

2626 +#: refs.c:1769

2627 msgid "ref updates forbidden inside quarantine environment"

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

2629

2570 -#: refs/files-backend.c:1631

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

2631 #, c-format

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

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

2634

2575 -#: refs/files-backend.c:1634

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

2636 #, c-format

2637 msgid "could not delete references: %s"

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

2639

2580 -#: refs/files-backend.c:1643

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

2641 #, c-format

2642 msgid "could not remove reference %s"

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

2644

2645 # à priori on parle d'une branche ici

2586 -#: ref-filter.c:35 wt-status.c:1780

2646 +#: ref-filter.c:35 wt-status.c:1811

2647 msgid "gone"

2648 msgstr "disparue"

2649

@@ -2602,304 +2662,306 @@ msgstr "en retard de %d"

2662 msgid "ahead %d, behind %d"

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

2664

2605 -#: ref-filter.c:104

2665 +#: ref-filter.c:105

2666 #, c-format

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

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

2669

2610 -#: ref-filter.c:106

2670 +#: ref-filter.c:107

2671 #, c-format

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

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

2674

2615 -#: ref-filter.c:120

2675 +#: ref-filter.c:121

2676 #, c-format

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

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

2679

2620 -#: ref-filter.c:124

2680 +#: ref-filter.c:125

2681 #, c-format

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

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

2684

2625 -#: ref-filter.c:126

2685 +#: ref-filter.c:127

2686 #, c-format

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

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

2689

2630 -#: ref-filter.c:166

2690 +#: ref-filter.c:167

2691 #, c-format

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

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

2694

2635 -#: ref-filter.c:173

2695 +#: ref-filter.c:174

2696 #, c-format

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

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

2699

2640 -#: ref-filter.c:180

2700 +#: ref-filter.c:181

2701 #, c-format

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

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

2704

2645 -#: ref-filter.c:199

2705 +#: ref-filter.c:200

2706 #, c-format

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

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

2709

2650 -#: ref-filter.c:201

2710 +#: ref-filter.c:202

2711 #, c-format

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

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

2714

2655 -#: ref-filter.c:214

2715 +#: ref-filter.c:215

2716 #, c-format

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

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

2719

2660 -#: ref-filter.c:218

2720 +#: ref-filter.c:219

2721 #, c-format

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

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

2724

2665 -#: ref-filter.c:245

2725 +#: ref-filter.c:246

2726 #, c-format

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

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

2729

2670 -#: ref-filter.c:257

2730 +#: ref-filter.c:258

2731 #, c-format

2732 msgid "unrecognized position:%s"

2733 msgstr "position non reconnue : %s"

2734

2675 -#: ref-filter.c:261

2735 +#: ref-filter.c:262

2736 #, c-format

2737 msgid "unrecognized width:%s"

2738 msgstr "largeur non reconnue : %s"

2739

2680 -#: ref-filter.c:267

2740 +#: ref-filter.c:268

2741 #, c-format

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

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

2744

2685 -#: ref-filter.c:271

2745 +#: ref-filter.c:272

2746 #, c-format

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

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

2749

2690 -#: ref-filter.c:286

2750 +#: ref-filter.c:287

2751 #, c-format

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

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

2754

2695 -#: ref-filter.c:371

2755 +#: ref-filter.c:378

2756 #, c-format

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

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

2759

2700 -#: ref-filter.c:397

2760 +#: ref-filter.c:404

2761 #, c-format

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

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

2764

2705 -#: ref-filter.c:501

2765 +#: ref-filter.c:508

2766 #, c-format

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

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

2769

2710 -#: ref-filter.c:561

2770 +#: ref-filter.c:568

2771 #, c-format

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

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

2774

2715 -#: ref-filter.c:563

2775 +#: ref-filter.c:570

2776 #, c-format

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

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

2779

2720 -#: ref-filter.c:565

2780 +#: ref-filter.c:572

2781 #, c-format

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

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

2784

2725 -#: ref-filter.c:591

2785 +#: ref-filter.c:598

2786 #, c-format

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

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

2789

2730 -#: ref-filter.c:593

2790 +#: ref-filter.c:600

2791 #, c-format

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

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

2794

2735 -#: ref-filter.c:595

2795 +#: ref-filter.c:602

2796 #, c-format

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

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

2799

2740 -#: ref-filter.c:608

2800 +#: ref-filter.c:615

2801 #, c-format

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

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

2804

2745 -#: ref-filter.c:663

2805 +#: ref-filter.c:670

2806 #, c-format

2807 msgid "malformed format string %s"

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

2809

2750 -#: ref-filter.c:1247

2810 +#: ref-filter.c:1254

2811 #, c-format

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

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

2814

2755 -#: ref-filter.c:1250

2815 +#: ref-filter.c:1257

2816 #, c-format

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

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

2819

2760 -#. TRANSLATORS: make sure this matches

2761 -#. "HEAD detached at " in wt-status.c

2762 -#: ref-filter.c:1256

2820 +#. TRANSLATORS: make sure this matches "HEAD

2821 +#. detached at " in wt-status.c

2822 +#.

2823 +#: ref-filter.c:1265

2824 #, c-format

2825 msgid "(HEAD detached at %s)"

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

2827

2767 -#. TRANSLATORS: make sure this matches

2768 -#. "HEAD detached from " in wt-status.c

2769 -#: ref-filter.c:1261

2828 +#. TRANSLATORS: make sure this matches "HEAD

2829 +#. detached from " in wt-status.c

2830 +#.

2831 +#: ref-filter.c:1272

2832 #, c-format

2833 msgid "(HEAD detached from %s)"

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

2835

2774 -#: ref-filter.c:1265

2836 +#: ref-filter.c:1276

2837 msgid "(no branch)"

2838 msgstr "(aucune branche)"

2839

2778 -#: ref-filter.c:1420 ref-filter.c:1451

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

2841 #, c-format

2842 msgid "missing object %s for %s"

2843 msgstr "objet manquant %s pour %s"

2844

2783 -#: ref-filter.c:1423 ref-filter.c:1454

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

2846 #, c-format

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

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

2849

2788 -#: ref-filter.c:1692

2850 +#: ref-filter.c:1760

2851 #, c-format

2852 msgid "malformed object at '%s'"

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

2854

2793 -#: ref-filter.c:1759

2855 +#: ref-filter.c:1827

2856 #, c-format

2857 msgid "ignoring ref with broken name %s"

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

2859

2798 -#: ref-filter.c:1764

2860 +#: ref-filter.c:1832

2861 #, c-format

2862 msgid "ignoring broken ref %s"

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

2864

2803 -#: ref-filter.c:2028

2865 +#: ref-filter.c:2095

2866 #, c-format

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

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

2869

2808 -#: ref-filter.c:2109

2870 +#: ref-filter.c:2176

2871 #, c-format

2872 msgid "malformed object name %s"

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

2874

2813 -#: remote.c:754

2875 +#: remote.c:747

2876 #, c-format

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

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

2879

2818 -#: remote.c:758

2880 +#: remote.c:751

2881 #, c-format

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

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

2884

2823 -#: remote.c:762

2885 +#: remote.c:755

2886 #, c-format

2887 msgid "%s tracks both %s and %s"

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

2889

2828 -#: remote.c:770

2890 +#: remote.c:763

2891 msgid "Internal error"

2892 msgstr "Erreur interne"

2893

2832 -#: remote.c:1685 remote.c:1787

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

2895 msgid "HEAD does not point to a branch"

2896 msgstr "HEAD ne pointe pas sur une branche"

2897

2836 -#: remote.c:1694

2898 +#: remote.c:1689

2899 #, c-format

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

2901 msgstr "pas de branche '%s'"

2902

2841 -#: remote.c:1697

2903 +#: remote.c:1692

2904 #, c-format

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

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

2907

2846 -#: remote.c:1703

2908 +#: remote.c:1698

2909 #, c-format

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

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

2912

2851 -#: remote.c:1718

2913 +#: remote.c:1713

2914 #, c-format

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

2916 msgstr ""

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

2918 "branche locale de suivi"

2919

2858 -#: remote.c:1730

2920 +#: remote.c:1725

2921 #, c-format

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

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

2924

2863 -#: remote.c:1741

2925 +#: remote.c:1736

2926 #, c-format

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

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

2929

2868 -#: remote.c:1754

2930 +#: remote.c:1749

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

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

2933

2872 -#: remote.c:1776

2934 +#: remote.c:1771

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

2936 msgstr ""

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

2938

2877 -#: remote.c:2081

2939 +#: remote.c:2076

2940 #, c-format

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

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

2943

2882 -#: remote.c:2085

2944 +#: remote.c:2080

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

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

2947

2886 -#: remote.c:2088

2948 +#: remote.c:2083

2949 #, c-format

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

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

2952

2891 -#: remote.c:2092

2953 +#: remote.c:2087

2954 #, c-format

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

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

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

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

2959

2898 -#: remote.c:2098

2960 +#: remote.c:2093

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

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

2963

2902 -#: remote.c:2101

2964 +#: remote.c:2096

2965 #, c-format

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

2967 msgid_plural ""

@@ -2911,11 +2973,11 @@ msgstr[1] ""

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

2974 "en avance rapide.\n"

2975

2914 -#: remote.c:2109

2976 +#: remote.c:2104

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

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

2979

2918 -#: remote.c:2112

2980 +#: remote.c:2107

2981 #, c-format

2982 msgid ""

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

@@ -2930,52 +2992,47 @@ msgstr[1] ""

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

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

2994

2933 -#: remote.c:2122

2995 +#: remote.c:2117

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

2997 msgstr ""

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

2999

2938 -#: revision.c:2158

3000 +#: revision.c:2187

3001 msgid "your current branch appears to be broken"

3002 msgstr "votre branche actuelle semble cassée"

3003

2942 -#: revision.c:2161

3004 +#: revision.c:2190

3005 #, c-format

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

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

3008

2947 -#: revision.c:2355

3009 +#: revision.c:2384

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

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

3012

2951 -#: run-command.c:125

3013 +#: run-command.c:644

3014 msgid "open /dev/null failed"

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

3016

2955 -#: run-command.c:127

2956 -#, c-format

2957 -msgid "dup2(%d,%d) failed"

2958 -msgstr "échec de dup2(%d,%d)"

2959 -

2960 -#: send-pack.c:150

3017 +#: send-pack.c:151

3018 #, c-format

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

3020 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

3021

2965 -#: send-pack.c:152

3022 +#: send-pack.c:153

3023 #, c-format

3024 msgid "remote unpack failed: %s"

3025 msgstr "le dépaquetage a échoué : %s"

3026

2970 -#: send-pack.c:315

3027 +#: send-pack.c:316

3028 msgid "failed to sign the push certificate"

3029 msgstr "impossible de signer le certificat de poussée"

3030

2974 -#: send-pack.c:428

3031 +#: send-pack.c:429

3032 msgid "the receiving end does not support --signed push"

3033 msgstr "Le receveur ne gère pas les poussées avec --signed"

3034

2978 -#: send-pack.c:430

3035 +#: send-pack.c:431

3036 msgid ""

3037 "not sending a push certificate since the receiving end does not support --"

3038 "signed push"

@@ -2983,32 +3040,32 @@ msgstr ""

3040 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

3041 "poussées avec --signed"

3042

2986 -#: send-pack.c:442

3043 +#: send-pack.c:443

3044 msgid "the receiving end does not support --atomic push"

3045 msgstr "Le receveur ne gère pas les poussées avec --atomic"

3046

2990 -#: send-pack.c:447

3047 +#: send-pack.c:448

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

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

3050

2994 -#: sequencer.c:215

3051 +#: sequencer.c:216

3052 msgid "revert"

3053 msgstr "revert"

3054

2998 -#: sequencer.c:217

3055 +#: sequencer.c:218

3056 msgid "cherry-pick"

3057 msgstr "cherry-pick"

3058

3002 -#: sequencer.c:219

3059 +#: sequencer.c:220

3060 msgid "rebase -i"

3061 msgstr "rebase -i"

3062

3006 -#: sequencer.c:221

3063 +#: sequencer.c:222

3064 #, c-format

3065 msgid "Unknown action: %d"

3066 msgstr "Action inconnue : %d"

3067

3011 -#: sequencer.c:278

3068 +#: sequencer.c:279

3069 msgid ""

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

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

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

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

3074 "avec 'git add <chemins>' ou 'git rm <chemins>'"

3075

3019 -#: sequencer.c:281

3076 +#: sequencer.c:282

3077 msgid ""

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

3079 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3026,63 +3083,63 @@ msgstr ""

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

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

3085

3029 -#: sequencer.c:294 sequencer.c:1682

3086 +#: sequencer.c:295 sequencer.c:1685

3087 #, c-format

3088 msgid "could not lock '%s'"

3089 msgstr "impossible de verrouiller '%s'"

3090

3034 -#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701

3091 +#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

3092 #, c-format

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

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

3095

3039 -#: sequencer.c:301

3096 +#: sequencer.c:302

3097 #, c-format

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

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

3100

3044 -#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689

3101 +#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

3102 #, c-format

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

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

3105

3049 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257

3050 -#: builtin/commit.c:749 builtin/merge.c:1018

3106 +#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

3107 +#: builtin/commit.c:750 builtin/merge.c:1017

3108 #, c-format

3109 msgid "could not read '%s'"

3110 msgstr "impossible de lire '%s'"

3111

3055 -#: sequencer.c:355

3112 +#: sequencer.c:356

3113 #, c-format

3114 msgid "your local changes would be overwritten by %s."

3115 msgstr "vos modifications locales seraient écrasées par %s."

3116

3060 -#: sequencer.c:359

3117 +#: sequencer.c:360

3118 msgid "commit your changes or stash them to proceed."

3119 msgstr "validez vos modifications ou les remiser pour continuer."

3120

3064 -#: sequencer.c:388

3121 +#: sequencer.c:389

3122 #, c-format

3123 msgid "%s: fast-forward"

3124 msgstr "%s : avance rapide"

3125

3126 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3070 -#. * "rebase -i".

3127 +#. "rebase -i".

3128 #.

3072 -#: sequencer.c:470

3129 +#: sequencer.c:472

3130 #, c-format

3131 msgid "%s: Unable to write new index file"

3132 msgstr "%s: Impossible d'écrire le nouveau fichier index"

3133

3077 -#: sequencer.c:489

3134 +#: sequencer.c:491

3135 msgid "could not resolve HEAD commit\n"

3136 msgstr "impossible de résoudre le commit HEAD\n"

3137

3081 -#: sequencer.c:509

3138 +#: sequencer.c:511

3139 msgid "unable to update cache tree\n"

3140 msgstr "impossible de mettre à jour l'arbre de cache\n"

3141

3085 -#: sequencer.c:592

3142 +#: sequencer.c:595

3143 #, c-format

3144 msgid ""

3145 "you have staged changes in your working tree\n"

@@ -3111,17 +3168,17 @@ msgstr ""

3168 "\n"

3169 " git rebase --continue\n"

3170

3114 -#: sequencer.c:694

3171 +#: sequencer.c:697

3172 #, c-format

3173 msgid "could not parse commit %s\n"

3174 msgstr "impossible d'analyser le commit %s\n"

3175

3119 -#: sequencer.c:699

3176 +#: sequencer.c:702

3177 #, c-format

3178 msgid "could not parse parent commit %s\n"

3179 msgstr "impossible d'analyser le commit parent %s\n"

3180

3124 -#: sequencer.c:821

3181 +#: sequencer.c:824

3182 #, c-format

3183 msgid ""

3184 "unexpected 1st line of squash message:\n"

@@ -3132,7 +3189,7 @@ msgstr ""

3189 "\n"

3190 "\t%.*s"

3191

3135 -#: sequencer.c:827

3192 +#: sequencer.c:830

3193 #, c-format

3194 msgid ""

3195 "invalid 1st line of squash message:\n"

@@ -3143,232 +3200,232 @@ msgstr ""

3200 "\n"

3201 "\t%.*s"

3202

3146 -#: sequencer.c:833 sequencer.c:858

3203 +#: sequencer.c:836 sequencer.c:861

3204 #, c-format

3205 msgid "This is a combination of %d commits."

3206 msgstr "Ceci est la combinaison de %d commits."

3207

3151 -#: sequencer.c:842

3208 +#: sequencer.c:845

3209 msgid "need a HEAD to fixup"

3210 msgstr "une HEAD est nécessaire à la correction"

3211

3155 -#: sequencer.c:844

3212 +#: sequencer.c:847

3213 msgid "could not read HEAD"

3214 msgstr "Impossible de lire HEAD"

3215

3159 -#: sequencer.c:846

3216 +#: sequencer.c:849

3217 msgid "could not read HEAD's commit message"

3218 msgstr "impossible de lire le message de validation de HEAD"

3219

3163 -#: sequencer.c:852

3220 +#: sequencer.c:855

3221 #, c-format

3222 msgid "cannot write '%s'"

3223 msgstr "impossible d'écrire '%s'"

3224

3168 -#: sequencer.c:861 git-rebase--interactive.sh:445

3225 +#: sequencer.c:864 git-rebase--interactive.sh:445

3226 msgid "This is the 1st commit message:"

3227 msgstr "Ceci est le premier message de validation :"

3228

3172 -#: sequencer.c:869

3229 +#: sequencer.c:872

3230 #, c-format

3231 msgid "could not read commit message of %s"

3232 msgstr "impossible de lire le message de validation de %s"

3233

3177 -#: sequencer.c:876

3234 +#: sequencer.c:879

3235 #, c-format

3236 msgid "This is the commit message #%d:"

3237 msgstr "Ceci est le message de validation numéro %d :"

3238

3182 -#: sequencer.c:881

3239 +#: sequencer.c:884

3240 #, c-format

3241 msgid "The commit message #%d will be skipped:"

3242 msgstr "Le message de validation %d sera ignoré :"

3243

3187 -#: sequencer.c:886

3244 +#: sequencer.c:889

3245 #, c-format

3246 msgid "unknown command: %d"

3247 msgstr "commande inconnue : %d"

3248

3192 -#: sequencer.c:952

3249 +#: sequencer.c:955

3250 msgid "your index file is unmerged."

3251 msgstr "votre fichier d'index n'est pas fusionné."

3252

3196 -#: sequencer.c:970

3253 +#: sequencer.c:973

3254 #, c-format

3255 msgid "commit %s is a merge but no -m option was given."

3256 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

3257

3201 -#: sequencer.c:978

3258 +#: sequencer.c:981

3259 #, c-format

3260 msgid "commit %s does not have parent %d"

3261 msgstr "le commit %s n'a pas de parent %d"

3262

3206 -#: sequencer.c:982

3263 +#: sequencer.c:985

3264 #, c-format

3265 msgid "mainline was specified but commit %s is not a merge."

3266 msgstr ""

3267 "une branche principale a été spécifiée mais le commit %s n'est pas une "

3268 "fusion."

3269

3213 -#: sequencer.c:988

3270 +#: sequencer.c:991

3271 #, c-format

3272 msgid "cannot get commit message for %s"

3273 msgstr "impossible d'obtenir un message de validation pour %s"

3274

3275 #. TRANSLATORS: The first %s will be a "todo" command like

3276 #. "revert" or "pick", the second %s a SHA1.

3220 -#: sequencer.c:1009

3277 +#: sequencer.c:1012

3278 #, c-format

3279 msgid "%s: cannot parse parent commit %s"

3280 msgstr "%s : impossible d'analyser le commit parent %s"

3281

3225 -#: sequencer.c:1071 sequencer.c:1827

3282 +#: sequencer.c:1075 sequencer.c:1830

3283 #, c-format

3284 msgid "could not rename '%s' to '%s'"

3285 msgstr "impossible de renommer '%s' en '%s'"

3286

3230 -#: sequencer.c:1122

3287 +#: sequencer.c:1126

3288 #, c-format

3289 msgid "could not revert %s... %s"

3290 msgstr "impossible d'annuler %s... %s"

3291

3235 -#: sequencer.c:1123

3292 +#: sequencer.c:1127

3293 #, c-format

3294 msgid "could not apply %s... %s"

3295 msgstr "impossible d'appliquer %s... %s"

3296

3240 -#: sequencer.c:1165

3297 +#: sequencer.c:1169

3298 msgid "empty commit set passed"

3299 msgstr "l'ensemble de commits spécifié est vide"

3300

3244 -#: sequencer.c:1175

3301 +#: sequencer.c:1179

3302 #, c-format

3303 msgid "git %s: failed to read the index"

3304 msgstr "git %s : échec à la lecture de l'index"

3305

3249 -#: sequencer.c:1182

3306 +#: sequencer.c:1186

3307 #, c-format

3308 msgid "git %s: failed to refresh the index"

3309 msgstr "git %s : échec du rafraîchissement de l'index"

3310

3254 -#: sequencer.c:1303

3311 +#: sequencer.c:1306

3312 #, c-format

3313 msgid "invalid line %d: %.*s"

3314 msgstr "ligne %d invalide : %.*s"

3315

3259 -#: sequencer.c:1311

3316 +#: sequencer.c:1314

3317 #, c-format

3318 msgid "cannot '%s' without a previous commit"

3319 msgstr "'%s' impossible avec le commit précédent"

3320

3264 -#: sequencer.c:1344

3321 +#: sequencer.c:1347

3322 #, c-format

3323 msgid "could not read '%s'."

3324 msgstr "impossible de lire '%s'."

3325

3269 -#: sequencer.c:1356

3326 +#: sequencer.c:1359

3327 msgid "please fix this using 'git rebase --edit-todo'."

3328 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3329

3273 -#: sequencer.c:1358

3330 +#: sequencer.c:1361

3331 #, c-format

3332 msgid "unusable instruction sheet: '%s'"

3333 msgstr "feuille d'instruction inutilisable : '%s'"

3334

3278 -#: sequencer.c:1363

3335 +#: sequencer.c:1366

3336 msgid "no commits parsed."

3337 msgstr "aucun commit analysé."

3338

3282 -#: sequencer.c:1374

3339 +#: sequencer.c:1377

3340 msgid "cannot cherry-pick during a revert."

3341 msgstr "impossible de picorer pendant l'annulation d'un commit."

3342

3286 -#: sequencer.c:1376

3343 +#: sequencer.c:1379

3344 msgid "cannot revert during a cherry-pick."

3345 msgstr "impossible d'annuler un commit pendant un picorage."

3346

3290 -#: sequencer.c:1439

3347 +#: sequencer.c:1442

3348 #, c-format

3349 msgid "invalid key: %s"

3350 msgstr "clé invalide : %s"

3351

3295 -#: sequencer.c:1442

3352 +#: sequencer.c:1445

3353 #, c-format

3354 msgid "invalid value for %s: %s"

3355 msgstr "valeur invalide pour %s : %s"

3356

3300 -#: sequencer.c:1499

3357 +#: sequencer.c:1502

3358 #, c-format

3359 msgid "malformed options sheet: '%s'"

3360 msgstr "feuille d'options malformée : %s"

3361

3305 -#: sequencer.c:1537

3362 +#: sequencer.c:1540

3363 msgid "a cherry-pick or revert is already in progress"

3364 msgstr "un picorage ou un retour est déjà en cours"

3365

3309 -#: sequencer.c:1538

3366 +#: sequencer.c:1541

3367 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3368 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

3369

3313 -#: sequencer.c:1541

3370 +#: sequencer.c:1544

3371 #, c-format

3372 msgid "could not create sequencer directory '%s'"

3373 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3374

3318 -#: sequencer.c:1555

3375 +#: sequencer.c:1558

3376 msgid "could not lock HEAD"

3377 msgstr "impossible de verrouiller HEAD"

3378

3322 -#: sequencer.c:1611 sequencer.c:2181

3379 +#: sequencer.c:1614 sequencer.c:2188

3380 msgid "no cherry-pick or revert in progress"

3381 msgstr "aucun picorage ou retour en cours"

3382

3326 -#: sequencer.c:1613

3383 +#: sequencer.c:1616

3384 msgid "cannot resolve HEAD"

3385 msgstr "impossible de résoudre HEAD"

3386

3330 -#: sequencer.c:1615 sequencer.c:1649

3387 +#: sequencer.c:1618 sequencer.c:1652

3388 msgid "cannot abort from a branch yet to be born"

3389 msgstr "impossible d'abandonner depuis une branche non encore créée"

3390

3334 -#: sequencer.c:1635 builtin/grep.c:910

3391 +#: sequencer.c:1638 builtin/grep.c:929

3392 #, c-format

3393 msgid "cannot open '%s'"

3394 msgstr "impossible d'ouvrir '%s'"

3395

3339 -#: sequencer.c:1637

3396 +#: sequencer.c:1640

3397 #, c-format

3398 msgid "cannot read '%s': %s"

3399 msgstr "impossible de lire '%s' : %s"

3400

3344 -#: sequencer.c:1638

3401 +#: sequencer.c:1641

3402 msgid "unexpected end of file"

3403 msgstr "fin de fichier inattendue"

3404

3348 -#: sequencer.c:1644

3405 +#: sequencer.c:1647

3406 #, c-format

3407 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3408 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

3409

3353 -#: sequencer.c:1655

3410 +#: sequencer.c:1658

3411 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3412 msgstr ""

3413 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3414

3358 -#: sequencer.c:1792 sequencer.c:2080

3415 +#: sequencer.c:1795 sequencer.c:2086

3416 msgid "cannot read HEAD"

3417 msgstr "impossible de lire HEAD"

3418

3362 -#: sequencer.c:1832 builtin/difftool.c:616

3419 +#: sequencer.c:1835 builtin/difftool.c:633

3420 #, c-format

3421 msgid "could not copy '%s' to '%s'"

3422 msgstr "impossible de copier '%s' vers '%s'"

3423

3367 -#: sequencer.c:1848

3424 +#: sequencer.c:1851

3425 msgid "could not read index"

3426 msgstr "impossible de lire l'index"

3427

3371 -#: sequencer.c:1853

3428 +#: sequencer.c:1856

3429 #, c-format

3430 msgid ""

3431 "execution failed: %s\n"

@@ -3383,11 +3440,11 @@ msgstr ""

3440 "git rebase --continue\n"

3441 "\n"

3442

3386 -#: sequencer.c:1859

3443 +#: sequencer.c:1862

3444 msgid "and made changes to the index and/or the working tree\n"

3445 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3446

3390 -#: sequencer.c:1865

3447 +#: sequencer.c:1868

3448 #, c-format

3449 msgid ""

3450 "execution succeeded: %s\n"

@@ -3404,17 +3461,17 @@ msgstr ""

3461 " git rebase --continue\n"

3462 "\n"

3463

3407 -#: sequencer.c:1920 git-rebase.sh:169

3464 +#: sequencer.c:1925

3465 #, c-format

3409 -msgid "Applied autostash."

3410 -msgstr "Autoremisage appliqué."

3466 +msgid "Applied autostash.\n"

3467 +msgstr "Autoremisage appliqué.\n"

3468

3412 -#: sequencer.c:1932

3469 +#: sequencer.c:1937

3470 #, c-format

3471 msgid "cannot store %s"

3472 msgstr "impossible de stocker %s"

3473

3417 -#: sequencer.c:1934 git-rebase.sh:173

3474 +#: sequencer.c:1940 git-rebase.sh:173

3475 #, c-format

3476 msgid ""

3477 "Applying autostash resulted in conflicts.\n"

@@ -3425,57 +3482,57 @@ msgstr ""

3482 "Vos modifications sont à l'abri dans la remise.\n"

3483 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

3484

3428 -#: sequencer.c:2016

3485 +#: sequencer.c:2022

3486 #, c-format

3487 msgid "Stopped at %s... %.*s\n"

3488 msgstr "arrêt à %s... %.*s\n"

3489

3433 -#: sequencer.c:2058

3490 +#: sequencer.c:2064

3491 #, c-format

3492 msgid "unknown command %d"

3493 msgstr "commande inconnue %d"

3494

3438 -#: sequencer.c:2088

3495 +#: sequencer.c:2094

3496 msgid "could not read orig-head"

3497 msgstr "impossible de lire orig-head"

3498

3442 -#: sequencer.c:2092

3499 +#: sequencer.c:2099

3500 msgid "could not read 'onto'"

3501 msgstr "impossible de lire 'onto'"

3502

3446 -#: sequencer.c:2099

3503 +#: sequencer.c:2106

3504 #, c-format

3505 msgid "could not update %s"

3506 msgstr "impossible de mettre à jour %s"

3507

3451 -#: sequencer.c:2106

3508 +#: sequencer.c:2113

3509 #, c-format

3510 msgid "could not update HEAD to %s"

3511 msgstr "impossible de mettre à jour HEAD sur %s"

3512

3456 -#: sequencer.c:2190

3513 +#: sequencer.c:2197

3514 msgid "cannot rebase: You have unstaged changes."

3515 msgstr "impossible de rebaser : vous avez des modifications non indexées."

3516

3460 -#: sequencer.c:2195

3517 +#: sequencer.c:2202

3518 msgid "could not remove CHERRY_PICK_HEAD"

3519 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3520

3464 -#: sequencer.c:2204

3521 +#: sequencer.c:2211

3522 msgid "cannot amend non-existing commit"

3523 msgstr "impossible de corriger un commit non-existant"

3524

3468 -#: sequencer.c:2206

3525 +#: sequencer.c:2213

3526 #, c-format

3527 msgid "invalid file: '%s'"

3528 msgstr "fichier invalide : '%s'"

3529

3473 -#: sequencer.c:2208

3530 +#: sequencer.c:2215

3531 #, c-format

3532 msgid "invalid contents: '%s'"

3533 msgstr "contenu invalide : '%s'"

3534

3478 -#: sequencer.c:2211

3535 +#: sequencer.c:2218

3536 msgid ""

3537 "\n"

3538 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3485,25 +3542,25 @@ msgstr ""

3542 "Vous avez des modifications non validées dans votre copie de travail.\n"

3543 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

3544

3488 -#: sequencer.c:2221

3545 +#: sequencer.c:2228

3546 msgid "could not commit staged changes."

3547 msgstr "impossible de valider les modifications indexées."

3548

3492 -#: sequencer.c:2301

3549 +#: sequencer.c:2308

3550 #, c-format

3551 msgid "%s: can't cherry-pick a %s"

3552 msgstr "%s : impossible de picorer un %s"

3553

3497 -#: sequencer.c:2305

3554 +#: sequencer.c:2312

3555 #, c-format

3556 msgid "%s: bad revision"

3557 msgstr "%s : mauvaise révision"

3558

3502 -#: sequencer.c:2338

3559 +#: sequencer.c:2345

3560 msgid "can't revert as initial commit"

3561 msgstr "impossible d'annuler en tant que commit initial"

3562

3506 -#: setup.c:165

3563 +#: setup.c:171

3564 #, c-format

3565 msgid ""

3566 "%s: no such path in the working tree.\n"

@@ -3513,7 +3570,7 @@ msgstr ""

3570 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "

3571 "n'existent pas localement."

3572

3516 -#: setup.c:178

3573 +#: setup.c:184

3574 #, c-format

3575 msgid ""

3576 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3524,7 +3581,7 @@ msgstr ""

3581 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3582 "'git <commande> [<révision>...] -- [<chemin>...]'"

3583

3527 -#: setup.c:228

3584 +#: setup.c:252

3585 #, c-format

3586 msgid ""

3587 "ambiguous argument '%s': both revision and filename\n"

@@ -3535,34 +3592,34 @@ msgstr ""

3592 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3593 "'git <commande> [<révision>...] -- [<chemin>...]'"

3594

3538 -#: setup.c:475

3595 +#: setup.c:504

3596 #, c-format

3597 msgid "Expected git repo version <= %d, found %d"

3598 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

3599

3543 -#: setup.c:483

3600 +#: setup.c:512

3601 msgid "unknown repository extensions found:"

3602 msgstr "extensions de dépôt inconnues trouvées :"

3603

3547 -#: setup.c:776

3604 +#: setup.c:810

3605 #, c-format

3606 msgid "Not a git repository (or any of the parent directories): %s"

3607 msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3608

3552 -#: setup.c:778 builtin/index-pack.c:1646

3609 +#: setup.c:812 builtin/index-pack.c:1652

3610 msgid "Cannot come back to cwd"

3611 msgstr "Impossible de revenir au répertoire de travail courant"

3612

3556 -#: setup.c:1010

3613 +#: setup.c:1050

3614 msgid "Unable to read current working directory"

3615 msgstr "Impossible d'accéder au répertoire de travail courant"

3616

3560 -#: setup.c:1022 setup.c:1028

3617 +#: setup.c:1062 setup.c:1068

3618 #, c-format

3619 msgid "Cannot change to '%s'"

3620 msgstr "Impossible de modifié en '%s'"

3621

3565 -#: setup.c:1041

3622 +#: setup.c:1081

3623 #, c-format

3624 msgid ""

3625 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3573,7 +3630,7 @@ msgstr ""

3630 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

3631 "n'est pas activé)."

3632

3576 -#: setup.c:1106

3633 +#: setup.c:1173

3634 #, c-format

3635 msgid ""

3636 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3583,29 +3640,29 @@ msgstr ""

3640 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

3641 "écriture."

3642

3586 -#: sha1_file.c:559

3643 +#: sha1_file.c:560

3644 #, c-format

3645 msgid "path '%s' does not exist"

3646 msgstr "le chemin '%s' n'existe pas"

3647

3591 -#: sha1_file.c:585

3648 +#: sha1_file.c:586

3649 #, c-format

3650 msgid "reference repository '%s' as a linked checkout is not supported yet."

3651 msgstr ""

3652 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

3653 "encore supporté."

3654

3598 -#: sha1_file.c:591

3655 +#: sha1_file.c:592

3656 #, c-format

3657 msgid "reference repository '%s' is not a local repository."

3658 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

3659

3603 -#: sha1_file.c:597

3660 +#: sha1_file.c:598

3661 #, c-format

3662 msgid "reference repository '%s' is shallow"

3663 msgstr "le dépôt de référence '%s' est superficiel"

3664

3608 -#: sha1_file.c:605

3665 +#: sha1_file.c:606

3666 #, c-format

3667 msgid "reference repository '%s' is grafted"

3668 msgstr "le dépôt de référence '%s' est greffé"

@@ -3614,27 +3671,27 @@ msgstr "le dépôt de référence '%s' est greffé"

3671 msgid "offset before end of packfile (broken .idx?)"

3672 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

3673

3617 -#: sha1_file.c:2721

3674 +#: sha1_file.c:2729

3675 #, c-format

3676 msgid "offset before start of pack index for %s (corrupt index?)"

3677 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

3678

3622 -#: sha1_file.c:2725

3679 +#: sha1_file.c:2733

3680 #, c-format

3681 msgid "offset beyond end of pack index for %s (truncated index?)"

3682 msgstr ""

3683 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

3684

3628 -#: sha1_name.c:409

3685 +#: sha1_name.c:419

3686 #, c-format

3687 msgid "short SHA1 %s is ambiguous"

3688 msgstr "le SHA1 court %s est ambigu"

3689

3633 -#: sha1_name.c:420

3690 +#: sha1_name.c:430

3691 msgid "The candidates are:"

3692 msgstr "Les candidats sont :"

3693

3637 -#: sha1_name.c:580

3694 +#: sha1_name.c:589

3695 msgid ""

3696 "Git normally never creates a ref that ends with 40 hex characters\n"

3697 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3659,57 +3716,67 @@ msgstr ""

3716 "message\n"

3717 "en lançant \"git config advice.objectNameWarning false\""

3718

3662 -#: submodule.c:67 submodule.c:101

3719 +#: submodule.c:70 submodule.c:104

3720 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3721 msgstr ""

3722 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

3723 "d'abord"

3724

3668 -#: submodule.c:71 submodule.c:105

3725 +#: submodule.c:74 submodule.c:108

3726 #, c-format

3727 msgid "Could not find section in .gitmodules where path=%s"

3728 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

3729

3673 -#: submodule.c:79

3730 +#: submodule.c:82

3731 #, c-format

3732 msgid "Could not update .gitmodules entry %s"

3733 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

3734

3735 # ici %s est un chemin

3679 -#: submodule.c:112

3736 +#: submodule.c:115

3737 #, c-format

3738 msgid "Could not remove .gitmodules entry for %s"

3739 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

3740

3684 -#: submodule.c:123

3741 +#: submodule.c:126

3742 msgid "staging updated .gitmodules failed"

3743 msgstr "échec de la mise en index du .gitmodules mis à jour"

3744

3688 -#: submodule.c:161

3745 +#: submodule.c:165

3746 msgid "negative values not allowed for submodule.fetchJobs"

3747 msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

3748

3692 -#: submodule.c:1194

3749 +#: submodule.c:376

3750 +#, c-format

3751 +msgid "in unpopulated submodule '%s'"

3752 +msgstr "dans le sous-module '%s' non populé"

3753 +

3754 +#: submodule.c:407

3755 +#, c-format

3756 +msgid "Pathspec '%s' is in submodule '%.*s'"

3757 +msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

3758 +

3759 +#: submodule.c:1337

3760 #, c-format

3761 msgid "'%s' not recognized as a git repository"

3762 msgstr "'%s' n'est pas reconnu comme dépôt git"

3763

3697 -#: submodule.c:1332

3764 +#: submodule.c:1475

3765 #, c-format

3766 msgid "could not start 'git status' in submodule '%s'"

3767 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

3768

3702 -#: submodule.c:1345

3769 +#: submodule.c:1488

3770 #, c-format

3771 msgid "could not run 'git status' in submodule '%s'"

3772 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

3773

3707 -#: submodule.c:1421

3774 +#: submodule.c:1581

3775 #, c-format

3776 msgid "submodule '%s' has dirty index"

3777 msgstr "le sous-module '%s' a un index sale"

3778

3712 -#: submodule.c:1678

3779 +#: submodule.c:1845

3780 #, c-format

3781 msgid ""

3782 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3717,18 +3784,18 @@ msgstr ""

3784 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

3785 "n'est pas supporté"

3786

3720 -#: submodule.c:1690 submodule.c:1746

3787 +#: submodule.c:1857 submodule.c:1913

3788 #, c-format

3789 msgid "could not lookup name for submodule '%s'"

3790 msgstr "impossible de trouve le nom pour le sous-module '%s'"

3791

3725 -#: submodule.c:1694 builtin/submodule--helper.c:678

3792 +#: submodule.c:1861 builtin/submodule--helper.c:678

3793 #: builtin/submodule--helper.c:688

3794 #, c-format

3795 msgid "could not create directory '%s'"

3796 msgstr "impossible de créer le répertoire '%s'"

3797

3731 -#: submodule.c:1697

3798 +#: submodule.c:1864

3799 #, c-format

3800 msgid ""

3801 "Migrating git directory of '%s%s' from\n"

@@ -3739,94 +3806,94 @@ msgstr ""

3806 "'%s' sur\n"

3807 "'%s'\n"

3808

3742 -#: submodule.c:1781

3809 +#: submodule.c:1948

3810 #, c-format

3811 msgid "could not recurse into submodule '%s'"

3812 msgstr "récursion impossible dans le sous-module '%s'"

3813

3747 -#: submodule.c:1825

3814 +#: submodule.c:1992

3815 msgid "could not start ls-files in .."

3816 msgstr "impossible de démarrer ls-files dans .."

3817

3751 -#: submodule.c:1845

3818 +#: submodule.c:2012

3819 msgid "BUG: returned path string doesn't match cwd?"

3820 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

3821

3755 -#: submodule.c:1864

3822 +#: submodule.c:2031

3823 #, c-format

3824 msgid "ls-tree returned unexpected return code %d"

3825 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

3826

3760 -#: submodule-config.c:380

3827 +#: submodule-config.c:420

3828 #, c-format

3829 msgid "invalid value for %s"

3830 msgstr "Valeur invalide pour %s"

3831

3765 -#: trailer.c:240

3832 +#: trailer.c:241

3833 #, c-format

3834 msgid "running trailer command '%s' failed"

3835 msgstr "échec de la commande trailer '%s'"

3836

3770 -#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3771 -#: trailer.c:543

3837 +#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3838 +#: trailer.c:544

3839 #, c-format

3840 msgid "unknown value '%s' for key '%s'"

3841 msgstr "valeur inconnue '%s' pour la clé '%s'"

3842

3776 -#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3843 +#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3844 #, c-format

3845 msgid "more than one %s"

3846 msgstr "plus d'un %s"

3847

3781 -#: trailer.c:702

3848 +#: trailer.c:703

3849 #, c-format

3850 msgid "empty trailer token in trailer '%.*s'"

3851 msgstr "symbole vide dans la ligne de fin '%.*s'"

3852

3786 -#: trailer.c:722

3853 +#: trailer.c:723

3854 #, c-format

3855 msgid "could not read input file '%s'"

3856 msgstr "impossible de lire le fichier d'entrée '%s'"

3857

3791 -#: trailer.c:725

3858 +#: trailer.c:726

3859 msgid "could not read from stdin"

3860 msgstr "Impossible de lire depuis l'entrée standard"

3861

3795 -#: trailer.c:949 builtin/am.c:44

3862 +#: trailer.c:950 builtin/am.c:45

3863 #, c-format

3864 msgid "could not stat %s"

3865 msgstr "stat impossible de %s"

3866

3800 -#: trailer.c:951

3867 +#: trailer.c:952

3868 #, c-format

3869 msgid "file %s is not a regular file"

3870 msgstr "%s n'est pas un fichier régulier"

3871

3805 -#: trailer.c:953

3872 +#: trailer.c:954

3873 #, c-format

3874 msgid "file %s is not writable by user"

3875 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"

3876

3810 -#: trailer.c:965

3877 +#: trailer.c:966

3878 msgid "could not open temporary file"

3879 msgstr "impossible de créer un fichier temporaire"

3880

3814 -#: trailer.c:1001

3881 +#: trailer.c:1002

3882 #, c-format

3883 msgid "could not rename temporary file to %s"

3884 msgstr "impossible de renommer un fichier temporaire en %s"

3885

3819 -#: transport.c:62

3886 +#: transport.c:63

3887 #, c-format

3888 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3889 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

3890

3824 -#: transport.c:151

3891 +#: transport.c:152

3892 #, c-format

3893 msgid "transport: invalid depth option '%s'"

3894 msgstr "transport : option de profondeur invalide '%s'"

3895

3829 -#: transport.c:889

3896 +#: transport.c:890

3897 #, c-format

3898 msgid ""

3899 "The following submodule paths contain changes that can\n"

@@ -3835,7 +3902,7 @@ msgstr ""

3902 "Les chemins suivant de sous-module contiennent des modifications\n"

3903 "qui ne peuvent être trouvées sur aucun distant :\n"

3904

3838 -#: transport.c:893

3905 +#: transport.c:894

3906 #, c-format

3907 msgid ""

3908 "\n"

@@ -3862,11 +3929,11 @@ msgstr ""

3929 "pour les pousser vers un serveur distant.\n"

3930 "\n"

3931

3865 -#: transport.c:901

3932 +#: transport.c:902

3933 msgid "Aborting."

3934 msgstr "Abandon."

3935

3869 -#: transport-helper.c:1080

3936 +#: transport-helper.c:1071

3937 #, c-format

3938 msgid "Could not read ref %s"

3939 msgstr "impossible de lire la réf %s"

@@ -3887,7 +3954,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"

3954 msgid "too-short tree file"

3955 msgstr "fichier arbre trop court"

3956

3890 -#: unpack-trees.c:104

3957 +#: unpack-trees.c:105

3958 #, c-format

3959 msgid ""

3960 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3898,7 +3965,7 @@ msgstr ""

3965 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

3966 "branche."

3967

3901 -#: unpack-trees.c:106

3968 +#: unpack-trees.c:107

3969 #, c-format

3970 msgid ""

3971 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3908,7 +3975,7 @@ msgstr ""

3975 "l'extraction :\n"

3976 "%%s"

3977

3911 -#: unpack-trees.c:109

3978 +#: unpack-trees.c:110

3979 #, c-format

3980 msgid ""

3981 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3918,7 +3985,7 @@ msgstr ""

3985 "fusion :\n"

3986 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

3987

3921 -#: unpack-trees.c:111

3988 +#: unpack-trees.c:112

3989 #, c-format

3990 msgid ""

3991 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3928,7 +3995,7 @@ msgstr ""

3995 "fusion :\n"

3996 "%%s"

3997

3931 -#: unpack-trees.c:114

3998 +#: unpack-trees.c:115

3999 #, c-format

4000 msgid ""

4001 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3937,7 +4004,7 @@ msgstr ""

4004 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4005 "%%sVeuillez valider ou remiser vos modifications avant %s."

4006

3940 -#: unpack-trees.c:116

4007 +#: unpack-trees.c:117

4008 #, c-format

4009 msgid ""

4010 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3946,7 +4013,7 @@ msgstr ""

4013 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4014 "%%s"

4015

3949 -#: unpack-trees.c:121

4016 +#: unpack-trees.c:122

4017 #, c-format

4018 msgid ""

4019 "Updating the following directories would lose untracked files in them:\n"

@@ -3956,7 +4023,7 @@ msgstr ""

4023 "contenus :\n"

4024 "%s"

4025

3959 -#: unpack-trees.c:125

4026 +#: unpack-trees.c:126

4027 #, c-format

4028 msgid ""

4029 "The following untracked working tree files would be removed by checkout:\n"

@@ -3966,7 +4033,7 @@ msgstr ""

4033 "l'extraction :\n"

4034 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4035

3969 -#: unpack-trees.c:127

4036 +#: unpack-trees.c:128

4037 #, c-format

4038 msgid ""

4039 "The following untracked working tree files would be removed by checkout:\n"

@@ -3975,7 +4042,7 @@ msgstr ""

4042 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

4043 "%%s"

4044

3978 -#: unpack-trees.c:130

4045 +#: unpack-trees.c:131

4046 #, c-format

4047 msgid ""

4048 "The following untracked working tree files would be removed by merge:\n"

@@ -3985,7 +4052,7 @@ msgstr ""

4052 "la fusion :\n"

4053 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4054

3988 -#: unpack-trees.c:132

4055 +#: unpack-trees.c:133

4056 #, c-format

4057 msgid ""

4058 "The following untracked working tree files would be removed by merge:\n"

@@ -3994,7 +4061,7 @@ msgstr ""

4061 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

4062 "%%s"

4063

3997 -#: unpack-trees.c:135

4064 +#: unpack-trees.c:136

4065 #, c-format

4066 msgid ""

4067 "The following untracked working tree files would be removed by %s:\n"

@@ -4004,7 +4071,7 @@ msgstr ""

4071 "%s :\n"

4072 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4073

4007 -#: unpack-trees.c:137

4074 +#: unpack-trees.c:138

4075 #, c-format

4076 msgid ""

4077 "The following untracked working tree files would be removed by %s:\n"

@@ -4013,7 +4080,7 @@ msgstr ""

4080 "Les fichiers suivants non suivis seraient effacés par %s :\n"

4081 "%%s"

4082

4016 -#: unpack-trees.c:142

4083 +#: unpack-trees.c:143

4084 #, c-format

4085 msgid ""

4086 "The following untracked working tree files would be overwritten by "

@@ -4024,7 +4091,7 @@ msgstr ""

4091 "l'extraction :\n"

4092 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4093

4027 -#: unpack-trees.c:144

4094 +#: unpack-trees.c:145

4095 #, c-format

4096 msgid ""

4097 "The following untracked working tree files would be overwritten by "

@@ -4034,7 +4101,7 @@ msgstr ""

4101 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

4102 "%%s"

4103

4037 -#: unpack-trees.c:147

4104 +#: unpack-trees.c:148

4105 #, c-format

4106 msgid ""

4107 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4044,7 +4111,7 @@ msgstr ""

4111 "la fusion :\n"

4112 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4113

4047 -#: unpack-trees.c:149

4114 +#: unpack-trees.c:150

4115 #, c-format

4116 msgid ""

4117 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4053,7 +4120,7 @@ msgstr ""

4120 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

4121 "%%s"

4122

4056 -#: unpack-trees.c:152

4123 +#: unpack-trees.c:153

4124 #, c-format

4125 msgid ""

4126 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4063,7 +4130,7 @@ msgstr ""

4130 "%s :\n"

4131 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4132

4066 -#: unpack-trees.c:154

4133 +#: unpack-trees.c:155

4134 #, c-format

4135 msgid ""

4136 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4072,12 +4139,12 @@ msgstr ""

4139 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

4140 "%%s"

4141

4075 -#: unpack-trees.c:161

4142 +#: unpack-trees.c:162

4143 #, c-format

4144 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4145 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

4146

4080 -#: unpack-trees.c:164

4147 +#: unpack-trees.c:165

4148 #, c-format

4149 msgid ""

4150 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -4087,7 +4154,7 @@ msgstr ""

4154 "pas à jour :\n"

4155 "%s"

4156

4090 -#: unpack-trees.c:166

4157 +#: unpack-trees.c:167

4158 #, c-format

4159 msgid ""

4160 "The following working tree files would be overwritten by sparse checkout "

@@ -4098,7 +4165,7 @@ msgstr ""

4165 "jour par l'extraction creuse :\n"

4166 "%s"

4167

4101 -#: unpack-trees.c:168

4168 +#: unpack-trees.c:169

4169 #, c-format

4170 msgid ""

4171 "The following working tree files would be removed by sparse checkout "

@@ -4109,7 +4176,7 @@ msgstr ""

4176 "à jour par extraction creuse :\n"

4177 "%s"

4178

4112 -#: unpack-trees.c:170

4179 +#: unpack-trees.c:171

4180 #, c-format

4181 msgid ""

4182 "Cannot update submodule:\n"

@@ -4118,19 +4185,19 @@ msgstr ""

4185 "Mise à jour impossible pour le sous-module :\n"

4186 "%s"

4187

4121 -#: unpack-trees.c:247

4188 +#: unpack-trees.c:248

4189 #, c-format

4190 msgid "Aborting\n"

4191 msgstr "Abandon\n"

4192

4126 -#: unpack-trees.c:272

4193 +#: unpack-trees.c:277

4194 #, c-format

4195 msgid "submodule update strategy not supported for submodule '%s'"

4196 msgstr ""

4197 "stratégie de mise à jour de sous-module non supportée pour le sous-module "

4198 "'%s'"

4199

4133 -#: unpack-trees.c:340

4200 +#: unpack-trees.c:346

4201 msgid "Checking out files"

4202 msgstr "Extraction des fichiers"

4203

@@ -4163,192 +4230,198 @@ msgstr "numéro de port invalide"

4230 msgid "invalid '..' path segment"

4231 msgstr "segment de chemin '..' invalide"

4232

4166 -#: worktree.c:285

4233 +#: worktree.c:245

4234 #, c-format

4235 msgid "failed to read '%s'"

4236 msgstr "échec de la lecture de '%s'"

4237

4171 -#: wrapper.c:222 wrapper.c:392

4238 +#: wrapper.c:223 wrapper.c:393

4239 #, c-format

4240 msgid "could not open '%s' for reading and writing"

4241 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4242

4176 -#: wrapper.c:224 wrapper.c:394 builtin/am.c:766

4243 +#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

4244 #, c-format

4245 msgid "could not open '%s' for writing"

4246 msgstr "impossible d'ouvrir '%s' en écriture"

4247

4181 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757

4182 -#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015

4183 -#: builtin/pull.c:341

4248 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

4249 +#: builtin/am.c:849 builtin/merge.c:1014

4250 #, c-format

4251 msgid "could not open '%s' for reading"

4252 msgstr "impossible d'ouvrir '%s' en lecture"

4253

4188 -#: wrapper.c:581 wrapper.c:602

4254 +#: wrapper.c:424 wrapper.c:624

4255 #, c-format

4256 msgid "unable to access '%s'"

4257 msgstr "impossible d'accéder à '%s'"

4258

4193 -#: wrapper.c:610

4259 +#: wrapper.c:632

4260 msgid "unable to get current working directory"

4261 msgstr "impossible d'accéder au répertoire de travail courant"

4262

4197 -#: wrapper.c:634

4263 +#: wrapper.c:656

4264 #, c-format

4265 msgid "could not write to %s"

4266 msgstr "Impossible d'écrire dans %s"

4267

4202 -#: wrapper.c:636

4268 +#: wrapper.c:658

4269 #, c-format

4270 msgid "could not close %s"

4271 msgstr "impossible de fermer %s"

4272

4207 -#: wt-status.c:151

4273 +#: wt-status.c:152

4274 msgid "Unmerged paths:"

4275 msgstr "Chemins non fusionnés :"

4276

4211 -#: wt-status.c:178 wt-status.c:205

4277 +#: wt-status.c:179 wt-status.c:206

4278 #, c-format

4279 msgid " (use \"git reset %s <file>...\" to unstage)"

4280 msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"

4281

4216 -#: wt-status.c:180 wt-status.c:207

4282 +#: wt-status.c:181 wt-status.c:208

4283 msgid " (use \"git rm --cached <file>...\" to unstage)"

4284 msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"

4285

4220 -#: wt-status.c:184

4286 +#: wt-status.c:185

4287 msgid " (use \"git add <file>...\" to mark resolution)"

4288 msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"

4289

4224 -#: wt-status.c:186 wt-status.c:190

4290 +#: wt-status.c:187 wt-status.c:191

4291 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4292 msgstr ""

4293 " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "

4294 "résolu)"

4295

4230 -#: wt-status.c:188

4296 +#: wt-status.c:189

4297 msgid " (use \"git rm <file>...\" to mark resolution)"

4298 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

4299

4234 -#: wt-status.c:199 wt-status.c:958

4300 +#: wt-status.c:200 wt-status.c:981

4301 msgid "Changes to be committed:"

4302 msgstr "Modifications qui seront validées :"

4303

4238 -#: wt-status.c:217 wt-status.c:967

4304 +#: wt-status.c:218 wt-status.c:990

4305 msgid "Changes not staged for commit:"

4306 msgstr "Modifications qui ne seront pas validées :"

4307

4242 -#: wt-status.c:221

4308 +#: wt-status.c:222

4309 msgid " (use \"git add <file>...\" to update what will be committed)"

4310 msgstr ""

4311 " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"

4312

4247 -#: wt-status.c:223

4313 +#: wt-status.c:224

4314 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4315 msgstr ""

4316 " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "

4317 "validé)"

4318

4253 -#: wt-status.c:224

4319 +#: wt-status.c:225

4320 msgid ""

4321 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4322 msgstr ""

4323 " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "

4324 "dans la copie de travail)"

4325

4260 -#: wt-status.c:226

4326 +#: wt-status.c:227

4327 msgid " (commit or discard the untracked or modified content in submodules)"

4328 msgstr ""

4329 " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"

4330

4265 -#: wt-status.c:238

4331 +#: wt-status.c:239

4332 #, c-format

4333 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4334 msgstr ""

4335 " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"

4336

4271 -#: wt-status.c:253

4337 +#: wt-status.c:254

4338 msgid "both deleted:"

4339 msgstr "supprimé des deux côtés :"

4340

4275 -#: wt-status.c:255

4341 +#: wt-status.c:256

4342 msgid "added by us:"

4343 msgstr "ajouté par nous :"

4344

4279 -#: wt-status.c:257

4345 +#: wt-status.c:258

4346 msgid "deleted by them:"

4347 msgstr "supprimé par eux :"

4348

4283 -#: wt-status.c:259

4349 +#: wt-status.c:260

4350 msgid "added by them:"

4351 msgstr "ajouté par eux :"

4352

4287 -#: wt-status.c:261

4353 +#: wt-status.c:262

4354 msgid "deleted by us:"

4355 msgstr "supprimé par nous :"

4356

4291 -#: wt-status.c:263

4357 +#: wt-status.c:264

4358 msgid "both added:"

4359 msgstr "ajouté de deux côtés :"

4360

4295 -#: wt-status.c:265

4361 +#: wt-status.c:266

4362 msgid "both modified:"

4363 msgstr "modifié des deux côtés :"

4364

4299 -#: wt-status.c:275

4365 +#: wt-status.c:276

4366 msgid "new file:"

4367 msgstr "nouveau fichier :"

4368

4303 -#: wt-status.c:277

4369 +#: wt-status.c:278

4370 msgid "copied:"

4371 msgstr "copié :"

4372

4307 -#: wt-status.c:279

4373 +#: wt-status.c:280

4374 msgid "deleted:"

4375 msgstr "supprimé :"

4376

4311 -#: wt-status.c:281

4377 +#: wt-status.c:282

4378 msgid "modified:"

4379 msgstr "modifié :"

4380

4315 -#: wt-status.c:283

4381 +#: wt-status.c:284

4382 msgid "renamed:"

4383 msgstr "renommé :"

4384

4319 -#: wt-status.c:285

4385 +#: wt-status.c:286

4386 msgid "typechange:"

4387 msgstr "modif. type :"

4388

4323 -#: wt-status.c:287

4389 +#: wt-status.c:288

4390 msgid "unknown:"

4391 msgstr "inconnu :"

4392

4327 -#: wt-status.c:289

4393 +#: wt-status.c:290

4394 msgid "unmerged:"

4395 msgstr "non fusionné :"

4396

4331 -#: wt-status.c:371

4397 +#: wt-status.c:372

4398 msgid "new commits, "

4399 msgstr "nouveaux commits, "

4400

4335 -#: wt-status.c:373

4401 +#: wt-status.c:374

4402 msgid "modified content, "

4403 msgstr "contenu modifié, "

4404

4339 -#: wt-status.c:375

4405 +#: wt-status.c:376

4406 msgid "untracked content, "

4407 msgstr "contenu non suivi, "

4408

4343 -#: wt-status.c:831

4409 +#: wt-status.c:821

4410 +#, c-format

4411 +msgid "Your stash currently has %d entry"

4412 +msgid_plural "Your stash currently has %d entries"

4413 +msgstr[0] "Votre remisage contient actuellement %d entrée"

4414 +msgstr[1] "Votre remisage contient actuellement %d entrées"

4415 +

4416 +#: wt-status.c:853

4417 msgid "Submodules changed but not updated:"

4418 msgstr "Sous-modules modifiés mais non mis à jour :"

4419

4347 -#: wt-status.c:833

4420 +#: wt-status.c:855

4421 msgid "Submodule changes to be committed:"

4422 msgstr "Changements du sous-module à valider :"

4423

4351 -#: wt-status.c:914

4424 +#: wt-status.c:937

4425 msgid ""

4426 "Do not touch the line above.\n"

4427 "Everything below will be removed."

@@ -4356,107 +4429,107 @@ msgstr ""

4429 "Ne touchez pas à la ligne ci-dessus\n"

4430 "Tout ce qui suit sera éliminé."

4431

4359 -#: wt-status.c:1026

4432 +#: wt-status.c:1049

4433 msgid "You have unmerged paths."

4434 msgstr "Vous avez des chemins non fusionnés."

4435

4363 -#: wt-status.c:1029

4436 +#: wt-status.c:1052

4437 msgid " (fix conflicts and run \"git commit\")"

4438 msgstr " (réglez les conflits puis lancez \"git commit\")"

4439

4367 -#: wt-status.c:1031

4440 +#: wt-status.c:1054

4441 msgid " (use \"git merge --abort\" to abort the merge)"

4442 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

4443

4371 -#: wt-status.c:1036

4444 +#: wt-status.c:1059

4445 msgid "All conflicts fixed but you are still merging."

4446 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

4447

4375 -#: wt-status.c:1039

4448 +#: wt-status.c:1062

4449 msgid " (use \"git commit\" to conclude merge)"

4450 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

4451

4379 -#: wt-status.c:1049

4452 +#: wt-status.c:1072

4453 msgid "You are in the middle of an am session."

4454 msgstr "Vous êtes au milieu d'une session am."

4455

4383 -#: wt-status.c:1052

4456 +#: wt-status.c:1075

4457 msgid "The current patch is empty."

4458 msgstr "Le patch actuel est vide."

4459

4387 -#: wt-status.c:1056

4460 +#: wt-status.c:1079

4461 msgid " (fix conflicts and then run \"git am --continue\")"

4462 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

4463

4391 -#: wt-status.c:1058

4464 +#: wt-status.c:1081

4465 msgid " (use \"git am --skip\" to skip this patch)"

4466 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

4467

4395 -#: wt-status.c:1060

4468 +#: wt-status.c:1083

4469 msgid " (use \"git am --abort\" to restore the original branch)"

4470 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

4471

4399 -#: wt-status.c:1189

4472 +#: wt-status.c:1214

4473 msgid "git-rebase-todo is missing."

4474 msgstr "git-rebase-todo est manquant."

4475

4403 -#: wt-status.c:1191

4476 +#: wt-status.c:1216

4477 msgid "No commands done."

4478 msgstr "Aucune commande réalisée."

4479

4407 -#: wt-status.c:1194

4480 +#: wt-status.c:1219

4481 #, c-format

4482 msgid "Last command done (%d command done):"

4483 msgid_plural "Last commands done (%d commands done):"

4484 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

4485 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

4486

4414 -#: wt-status.c:1205

4487 +#: wt-status.c:1230

4488 #, c-format

4489 msgid " (see more in file %s)"

4490 msgstr " (voir plus dans le fichier %s)"

4491

4419 -#: wt-status.c:1210

4492 +#: wt-status.c:1235

4493 msgid "No commands remaining."

4494 msgstr "Aucune commande restante."

4495

4423 -#: wt-status.c:1213

4496 +#: wt-status.c:1238

4497 #, c-format

4498 msgid "Next command to do (%d remaining command):"

4499 msgid_plural "Next commands to do (%d remaining commands):"

4500 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

4501 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

4502

4430 -#: wt-status.c:1221

4503 +#: wt-status.c:1246

4504 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4505 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

4506

4434 -#: wt-status.c:1234

4507 +#: wt-status.c:1259

4508 #, c-format

4509 msgid "You are currently rebasing branch '%s' on '%s'."

4510 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

4511

4439 -#: wt-status.c:1239

4512 +#: wt-status.c:1264

4513 msgid "You are currently rebasing."

4514 msgstr "Vous êtes en train de rebaser."

4515

4443 -#: wt-status.c:1253

4516 +#: wt-status.c:1278

4517 msgid " (fix conflicts and then run \"git rebase --continue\")"

4518 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

4519

4447 -#: wt-status.c:1255

4520 +#: wt-status.c:1280

4521 msgid " (use \"git rebase --skip\" to skip this patch)"

4522 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

4523

4451 -#: wt-status.c:1257

4524 +#: wt-status.c:1282

4525 msgid " (use \"git rebase --abort\" to check out the original branch)"

4526 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

4527

4455 -#: wt-status.c:1263

4528 +#: wt-status.c:1288

4529 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4530 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

4531

4459 -#: wt-status.c:1267

4532 +#: wt-status.c:1292

4533 #, c-format

4534 msgid ""

4535 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4464,124 +4537,128 @@ msgstr ""

4537 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

4538 "de la branche '%s' sur '%s'."

4539

4467 -#: wt-status.c:1272

4540 +#: wt-status.c:1297

4541 msgid "You are currently splitting a commit during a rebase."

4542 msgstr ""

4543 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

4544

4472 -#: wt-status.c:1275

4545 +#: wt-status.c:1300

4546 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4547 msgstr ""

4548 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

4549

4477 -#: wt-status.c:1279

4550 +#: wt-status.c:1304

4551 #, c-format

4552 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4553 msgstr ""

4554 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

4555 "branche '%s' sur '%s'."

4556

4484 -#: wt-status.c:1284

4557 +#: wt-status.c:1309

4558 msgid "You are currently editing a commit during a rebase."

4559 msgstr ""

4560 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

4561

4489 -#: wt-status.c:1287

4562 +#: wt-status.c:1312

4563 msgid " (use \"git commit --amend\" to amend the current commit)"

4564 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

4565

4493 -#: wt-status.c:1289

4566 +#: wt-status.c:1314

4567 msgid ""

4568 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4569 msgstr ""

4570 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

4571 "modifications)"

4572

4500 -#: wt-status.c:1299

4573 +#: wt-status.c:1324

4574 #, c-format

4575 msgid "You are currently cherry-picking commit %s."

4576 msgstr "Vous êtes actuellement en train de picorer le commit %s."

4577

4505 -#: wt-status.c:1304

4578 +#: wt-status.c:1329

4579 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4580 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

4581

4509 -#: wt-status.c:1307

4582 +#: wt-status.c:1332

4583 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4584 msgstr ""

4585 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

4586

4514 -#: wt-status.c:1309

4587 +#: wt-status.c:1334

4588 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4589 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

4590

4518 -#: wt-status.c:1318

4591 +#: wt-status.c:1343

4592 #, c-format

4593 msgid "You are currently reverting commit %s."

4594 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

4595

4523 -#: wt-status.c:1323

4596 +#: wt-status.c:1348

4597 msgid " (fix conflicts and run \"git revert --continue\")"

4598 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

4599

4527 -#: wt-status.c:1326

4600 +#: wt-status.c:1351

4601 msgid " (all conflicts fixed: run \"git revert --continue\")"

4602 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

4603

4531 -#: wt-status.c:1328

4604 +#: wt-status.c:1353

4605 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4606 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

4607

4535 -#: wt-status.c:1339

4608 +#: wt-status.c:1364

4609 #, c-format

4610 msgid "You are currently bisecting, started from branch '%s'."

4611 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

4612

4540 -#: wt-status.c:1343

4613 +#: wt-status.c:1368

4614 msgid "You are currently bisecting."

4615 msgstr "Vous êtes en cours de bissection."

4616

4544 -#: wt-status.c:1346

4617 +#: wt-status.c:1371

4618 msgid " (use \"git bisect reset\" to get back to the original branch)"

4619 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

4620

4548 -#: wt-status.c:1543

4621 +#: wt-status.c:1568

4622 msgid "On branch "

4623 msgstr "Sur la branche "

4624

4552 -#: wt-status.c:1549

4625 +#: wt-status.c:1574

4626 msgid "interactive rebase in progress; onto "

4627 msgstr "rebasage interactif en cours ; sur "

4628

4556 -#: wt-status.c:1551

4629 +#: wt-status.c:1576

4630 msgid "rebase in progress; onto "

4631 msgstr "rebasage en cours ; sur "

4632

4560 -#: wt-status.c:1556

4633 +#: wt-status.c:1581

4634 msgid "HEAD detached at "

4635 msgstr "HEAD détachée sur "

4636

4564 -#: wt-status.c:1558

4637 +#: wt-status.c:1583

4638 msgid "HEAD detached from "

4639 msgstr "HEAD détachée depuis "

4640

4568 -#: wt-status.c:1561

4641 +#: wt-status.c:1586

4642 msgid "Not currently on any branch."

4643 msgstr "Actuellement sur aucun branche."

4644

4572 -#: wt-status.c:1579

4645 +#: wt-status.c:1606

4646 msgid "Initial commit"

4647 msgstr "Validation initiale"

4648

4576 -#: wt-status.c:1593

4649 +#: wt-status.c:1607

4650 +msgid "No commits yet"

4651 +msgstr "Aucun commit"

4652 +

4653 +#: wt-status.c:1621

4654 msgid "Untracked files"

4655 msgstr "Fichiers non suivis"

4656

4580 -#: wt-status.c:1595

4657 +#: wt-status.c:1623

4658 msgid "Ignored files"

4659 msgstr "Fichiers ignorés"

4660

4584 -#: wt-status.c:1599

4661 +#: wt-status.c:1627

4662 #, c-format

4663 msgid ""

4664 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4593,32 +4670,32 @@ msgstr ""

4670 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

4671 "status')."

4672

4596 -#: wt-status.c:1605

4673 +#: wt-status.c:1633

4674 #, c-format

4675 msgid "Untracked files not listed%s"

4676 msgstr "Fichiers non suivis non affichés%s"

4677

4601 -#: wt-status.c:1607

4678 +#: wt-status.c:1635

4679 msgid " (use -u option to show untracked files)"

4680 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

4681

4605 -#: wt-status.c:1613

4682 +#: wt-status.c:1641

4683 msgid "No changes"

4684 msgstr "Aucune modification"

4685

4609 -#: wt-status.c:1618

4686 +#: wt-status.c:1646

4687 #, c-format

4688 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4689 msgstr ""

4690 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

4691 "\"git commit -a\")\n"

4692

4616 -#: wt-status.c:1621

4693 +#: wt-status.c:1649

4694 #, c-format

4695 msgid "no changes added to commit\n"

4696 msgstr "aucune modification ajoutée à la validation\n"

l10n: fr.po v2.14.0 rnd 2