ec688f776c · matheusbsbs/matheus-bagliano

@@ -75,8 +75,8 @@ msgid ""

75 msgstr ""

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

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

78 -"POT-Creation-Date: 2019-02-15 10:09+0800\n"

79 -"PO-Revision-Date: 2019-06-05 11:20+0200\n"

78 +"POT-Creation-Date: 2019-08-10 20:12+0800\n"

79 +"PO-Revision-Date: 2019-08-10 18:17+0200\n"

80 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"

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

82 "Language: fr\n"

@@ -84,38 +84,39 @@ msgstr ""

84 "Content-Type: text/plain; charset=UTF-8\n"

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

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

87 +"X-Generator: Poedit 2.2.3\n"

88

88 -#: advice.c:103

89 +#: advice.c:109

90 #, c-format

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

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

93

93 -#: advice.c:156

94 +#: advice.c:162

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

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

97

97 -#: advice.c:158

98 +#: advice.c:164

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

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

101

101 -#: advice.c:160

102 +#: advice.c:166

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

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

105

105 -#: advice.c:162

106 +#: advice.c:168

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

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

109

109 -#: advice.c:164

110 +#: advice.c:170

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

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

113

113 -#: advice.c:166

114 +#: advice.c:172

115 #, c-format

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

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

118

118 -#: advice.c:174

119 +#: advice.c:180

120 msgid ""

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

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

@@ -123,52 +124,65 @@ msgstr ""

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

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

126

126 -#: advice.c:182

127 +#: advice.c:188

128 msgid "Exiting because of an unresolved conflict."

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

130

130 -#: advice.c:187 builtin/merge.c:1320

131 +#: advice.c:193 builtin/merge.c:1327

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

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

134

134 -#: advice.c:189

135 +#: advice.c:195

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

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

138

138 -#: advice.c:190

139 +#: advice.c:196

140 msgid "Exiting because of unfinished merge."

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

142

142 -#: advice.c:196

143 +#: advice.c:202

144 #, c-format

145 msgid ""

145 -"Note: checking out '%s'.\n"

146 +"Note: switching to '%s'.\n"

147 "\n"

148 "You are in 'detached HEAD' state. You can look around, make experimental\n"

149 "changes and commit them, and you can discard any commits you make in this\n"

149 -"state without impacting any branches by performing another checkout.\n"

150 +"state without impacting any branches by switching back to a branch.\n"

151 "\n"

152 "If you want to create a new branch to retain commits you create, you may\n"

152 -"do so (now or later) by using -b with the checkout command again. Example:\n"

153 +"do so (now or later) by using -c with the switch command. Example:\n"

154 "\n"

154 -" git checkout -b <new-branch-name>\n"

155 +" git switch -c <new-branch-name>\n"

156 +"\n"

157 +"Or undo this operation with:\n"

158 +"\n"

159 +" git switch -\n"

160 +"\n"

161 +"Turn off this advice by setting config variable advice.detachedHead to "

162 +"false\n"

163 "\n"

164 msgstr ""

157 -"Note : extraction de '%s'.\n"

165 +"Note : basculement sur '%s'.\n"

166 "\n"

167 "Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "

168 "modifications\n"

161 -"expérimentales et les valider. Il vous suffit de faire une autre extraction "

169 +"expérimentales et les valider. Il vous suffit de faire un autre basculement "

170 "pour\n"

171 "abandonner les commits que vous faites dans cet état sans impacter les "

172 "autres branches\n"

173 "\n"

174 "Si vous voulez créer une nouvelle branche pour conserver les commits que "

175 "vous créez,\n"

168 -"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme "

169 -"ceci :\n"

176 +"il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n"

177 +"\n"

178 +" git switch -c <nom-de-la-nouvelle-branche>\n"

179 "\n"

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

180 +"Ou annuler cette opération avec :\n"

181 +"\n"

182 +" git switch -\n"

183 +"\n"

184 +"Désactivez ce conseil en renseignant la variable de configuration advice."

185 +"detachedHead à false\n"

186 "\n"

187

188 #: alias.c:50

@@ -179,99 +193,99 @@ msgstr "cmdline se termine par \\"

193 msgid "unclosed quote"

194 msgstr "citation non fermée"

195

182 -#: apply.c:63

196 +#: apply.c:69

197 #, c-format

198 msgid "unrecognized whitespace option '%s'"

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

200

187 -#: apply.c:79

201 +#: apply.c:85

202 #, c-format

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

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

205

192 -#: apply.c:129

206 +#: apply.c:135

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

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

209

196 -#: apply.c:131

210 +#: apply.c:137

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

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

213

200 -#: apply.c:134

214 +#: apply.c:140

215 msgid "--3way outside a repository"

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

217

204 -#: apply.c:145

218 +#: apply.c:151

219 msgid "--index outside a repository"

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

221

208 -#: apply.c:148

222 +#: apply.c:154

223 msgid "--cached outside a repository"

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

225

212 -#: apply.c:829

226 +#: apply.c:801

227 #, c-format

228 msgid "Cannot prepare timestamp regexp %s"

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

230

217 -#: apply.c:838

231 +#: apply.c:810

232 #, c-format

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

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

235

222 -#: apply.c:912

236 +#: apply.c:884

237 #, c-format

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

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

240

227 -#: apply.c:950

241 +#: apply.c:922

242 #, c-format

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

244 msgstr ""

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

246 "ligne %d"

247

234 -#: apply.c:956

248 +#: apply.c:928

249 #, c-format

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

251 msgstr ""

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

253 "à la ligne %d"

254

241 -#: apply.c:957

255 +#: apply.c:929

256 #, c-format

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

258 msgstr ""

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

260 "à la ligne %d"

261

248 -#: apply.c:962

262 +#: apply.c:934

263 #, c-format

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

265 msgstr ""

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

267

254 -#: apply.c:991

268 +#: apply.c:963

269 #, c-format

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

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

272

259 -#: apply.c:1310

273 +#: apply.c:1282

274 #, c-format

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

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

277

264 -#: apply.c:1482

278 +#: apply.c:1460

279 #, c-format

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

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

282

269 -#: apply.c:1551

283 +#: apply.c:1529

284 #, c-format

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

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

287

274 -#: apply.c:1571

288 +#: apply.c:1551

289 #, c-format

290 msgid ""

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

@@ -286,83 +300,83 @@ msgstr[1] ""

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

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

302

289 -#: apply.c:1584

303 +#: apply.c:1564

304 #, c-format

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

306 msgstr ""

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

308

295 -#: apply.c:1772

309 +#: apply.c:1752

310 msgid "new file depends on old contents"

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

312

299 -#: apply.c:1774

313 +#: apply.c:1754

314 msgid "deleted file still has contents"

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

316

303 -#: apply.c:1808

317 +#: apply.c:1788

318 #, c-format

319 msgid "corrupt patch at line %d"

320 msgstr "patch corrompu à la ligne %d"

321

308 -#: apply.c:1845

322 +#: apply.c:1825

323 #, c-format

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

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

326

313 -#: apply.c:1847

327 +#: apply.c:1827

328 #, c-format

329 msgid "deleted file %s still has contents"

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

331

318 -#: apply.c:1850

332 +#: apply.c:1830

333 #, c-format

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

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

336

323 -#: apply.c:1997

337 +#: apply.c:1977

338 #, c-format

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

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

341

328 -#: apply.c:2034

342 +#: apply.c:2014

343 #, c-format

344 msgid "unrecognized binary patch at line %d"

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

346

333 -#: apply.c:2196

347 +#: apply.c:2176

348 #, c-format

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

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

351

338 -#: apply.c:2282

352 +#: apply.c:2262

353 #, c-format

354 msgid "unable to read symlink %s"

355 msgstr "lecture du lien symbolique %s impossible"

356

343 -#: apply.c:2286

357 +#: apply.c:2266

358 #, c-format

359 msgid "unable to open or read %s"

360 msgstr "ouverture ou lecture de %s impossible"

361

348 -#: apply.c:2945

362 +#: apply.c:2925

363 #, c-format

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

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

366

353 -#: apply.c:3066

367 +#: apply.c:3046

368 #, c-format

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

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

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

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

373

360 -#: apply.c:3078

374 +#: apply.c:3058

375 #, c-format

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

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

378

365 -#: apply.c:3084

379 +#: apply.c:3064

380 #, c-format

381 msgid ""

382 "while searching for:\n"

@@ -371,463 +385,463 @@ msgstr ""

385 "pendant la recherche de :\n"

386 "%.*s"

387

374 -#: apply.c:3106

388 +#: apply.c:3086

389 #, c-format

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

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

392

379 -#: apply.c:3114

393 +#: apply.c:3094

394 #, c-format

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

396 msgstr ""

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

398 "inverse"

399

386 -#: apply.c:3161

400 +#: apply.c:3141

401 #, c-format

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

403 msgstr ""

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

405

392 -#: apply.c:3171

406 +#: apply.c:3151

407 #, c-format

408 msgid ""

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

410 msgstr ""

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

412

399 -#: apply.c:3179

413 +#: apply.c:3159

414 #, c-format

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

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

417

404 -#: apply.c:3197

418 +#: apply.c:3177

419 #, c-format

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

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

422

409 -#: apply.c:3210

423 +#: apply.c:3190

424 #, c-format

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

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

427

414 -#: apply.c:3216

428 +#: apply.c:3196

429 #, c-format

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

431 msgstr ""

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

433 "trouvé)"

434

421 -#: apply.c:3237

435 +#: apply.c:3217

436 #, c-format

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

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

439

426 -#: apply.c:3360

440 +#: apply.c:3340

441 #, c-format

442 msgid "cannot checkout %s"

443 msgstr "extraction de %s impossible"

444

431 -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279

445 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

446 #, c-format

447 msgid "failed to read %s"

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

449

436 -#: apply.c:3420

450 +#: apply.c:3400

451 #, c-format

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

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

454

441 -#: apply.c:3449 apply.c:3692

455 +#: apply.c:3429 apply.c:3672

456 #, c-format

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

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

459

446 -#: apply.c:3535 apply.c:3707

460 +#: apply.c:3515 apply.c:3687

461 #, c-format

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

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

464

451 -#: apply.c:3544 apply.c:3715

465 +#: apply.c:3524 apply.c:3695

466 #, c-format

467 msgid "%s: does not match index"

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

469

456 -#: apply.c:3579

470 +#: apply.c:3559

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

472 msgstr ""

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

474 "points."

475

462 -#: apply.c:3582

476 +#: apply.c:3562

477 #, c-format

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

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

480

467 -#: apply.c:3598 apply.c:3602

481 +#: apply.c:3578 apply.c:3582

482 #, c-format

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

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

485

472 -#: apply.c:3614

486 +#: apply.c:3594

487 #, c-format

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

489 msgstr "Échec du retour à une fusion à 3 points…\n"

490

477 -#: apply.c:3628

491 +#: apply.c:3608

492 #, c-format

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

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

495

482 -#: apply.c:3633

496 +#: apply.c:3613

497 #, c-format

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

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

500

487 -#: apply.c:3659

501 +#: apply.c:3639

502 msgid "removal patch leaves file contents"

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

504

491 -#: apply.c:3732

505 +#: apply.c:3712

506 #, c-format

507 msgid "%s: wrong type"

508 msgstr "%s : type erroné"

509

496 -#: apply.c:3734

510 +#: apply.c:3714

511 #, c-format

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

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

514

501 -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856

515 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

516 #: read-cache.c:1309

517 #, c-format

518 msgid "invalid path '%s'"

519 msgstr "chemin invalide '%s'"

520

507 -#: apply.c:3943

521 +#: apply.c:3923

522 #, c-format

523 msgid "%s: already exists in index"

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

525

512 -#: apply.c:3946

526 +#: apply.c:3926

527 #, c-format

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

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

530

517 -#: apply.c:3966

531 +#: apply.c:3946

532 #, c-format

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

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

535

522 -#: apply.c:3971

536 +#: apply.c:3951

537 #, c-format

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

539 msgstr ""

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

541

528 -#: apply.c:3991

542 +#: apply.c:3971

543 #, c-format

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

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

546

533 -#: apply.c:3995

547 +#: apply.c:3975

548 #, c-format

549 msgid "%s: patch does not apply"

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

551

538 -#: apply.c:4010

552 +#: apply.c:3990

553 #, c-format

554 msgid "Checking patch %s..."

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

556

543 -#: apply.c:4102

557 +#: apply.c:4082

558 #, c-format

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

560 msgstr ""

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

562

549 -#: apply.c:4109

563 +#: apply.c:4089

564 #, c-format

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

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

567

554 -#: apply.c:4112

568 +#: apply.c:4092

569 #, c-format

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

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

572

559 -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143

573 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

574 #, c-format

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

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

577

564 -#: apply.c:4121

578 +#: apply.c:4101

579 #, c-format

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

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

582

569 -#: apply.c:4131

583 +#: apply.c:4111

584 #, c-format

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

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

587

574 -#: apply.c:4269

588 +#: apply.c:4249

589 #, c-format

590 msgid "unable to remove %s from index"

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

592

579 -#: apply.c:4303

593 +#: apply.c:4283

594 #, c-format

595 msgid "corrupt patch for submodule %s"

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

597

584 -#: apply.c:4309

598 +#: apply.c:4289

599 #, c-format

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

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

602

589 -#: apply.c:4317

603 +#: apply.c:4297

604 #, c-format

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

606 msgstr ""

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

608 "impossible"

609

596 -#: apply.c:4323 apply.c:4468

610 +#: apply.c:4303 apply.c:4448

611 #, c-format

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

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

614

601 -#: apply.c:4366

615 +#: apply.c:4346

616 #, c-format

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

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

619

606 -#: apply.c:4370

620 +#: apply.c:4350

621 #, c-format

622 msgid "closing file '%s'"

623 msgstr "fermeture du fichier '%s'"

624

611 -#: apply.c:4440

625 +#: apply.c:4420

626 #, c-format

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

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

629

616 -#: apply.c:4538

630 +#: apply.c:4518

631 #, c-format

632 msgid "Applied patch %s cleanly."

633 msgstr "Patch %s appliqué proprement."

634

621 -#: apply.c:4546

635 +#: apply.c:4526

636 msgid "internal error"

637 msgstr "erreur interne"

638

625 -#: apply.c:4549

639 +#: apply.c:4529

640 #, c-format

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

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

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

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

645

632 -#: apply.c:4560

646 +#: apply.c:4540

647 #, c-format

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

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

650

637 -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118

651 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

652 #, c-format

653 msgid "cannot open %s"

654 msgstr "impossible d'ouvrir %s"

655

642 -#: apply.c:4582

656 +#: apply.c:4562

657 #, c-format

658 msgid "Hunk #%d applied cleanly."

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

660

647 -#: apply.c:4586

661 +#: apply.c:4566

662 #, c-format

663 msgid "Rejected hunk #%d."

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

665

652 -#: apply.c:4696

666 +#: apply.c:4676

667 #, c-format

668 msgid "Skipped patch '%s'."

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

670

657 -#: apply.c:4704

671 +#: apply.c:4684

672 msgid "unrecognized input"

673 msgstr "entrée non reconnue"

674

661 -#: apply.c:4724

675 +#: apply.c:4704

676 msgid "unable to read index file"

677 msgstr "lecture du fichier d'index impossible"

678

665 -#: apply.c:4879

679 +#: apply.c:4859

680 #, c-format

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

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

683

670 -#: apply.c:4906

684 +#: apply.c:4886

685 #, c-format

686 msgid "squelched %d whitespace error"

687 msgid_plural "squelched %d whitespace errors"

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

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

690

677 -#: apply.c:4912 apply.c:4927

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

692 #, c-format

693 msgid "%d line adds whitespace errors."

694 msgid_plural "%d lines add whitespace errors."

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

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

697

684 -#: apply.c:4920

698 +#: apply.c:4900

699 #, c-format

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

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

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

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

704

691 -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

705 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

706 msgid "Unable to write new index file"

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

708

695 -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213

696 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271

697 -#: builtin/pull.c:207 builtin/submodule--helper.c:407

698 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

699 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852

700 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197

709 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

710 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

711 +#: builtin/pull.c:208 builtin/submodule--helper.c:407

712 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

713 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

714 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

715 msgid "path"

716 msgstr "chemin"

717

704 -#: apply.c:4964

718 +#: apply.c:4944

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

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

721

708 -#: apply.c:4967

722 +#: apply.c:4947

723 msgid "apply changes matching the given path"

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

725

712 -#: apply.c:4969 builtin/am.c:2219

726 +#: apply.c:4949 builtin/am.c:2217

727 msgid "num"

728 msgstr "num"

729

716 -#: apply.c:4970

730 +#: apply.c:4950

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

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

733

720 -#: apply.c:4973

734 +#: apply.c:4953

735 msgid "ignore additions made by the patch"

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

737

724 -#: apply.c:4975

738 +#: apply.c:4955

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

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

741

728 -#: apply.c:4979

742 +#: apply.c:4959

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

744 msgstr ""

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

746

733 -#: apply.c:4981

747 +#: apply.c:4961

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

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

750

737 -#: apply.c:4983

751 +#: apply.c:4963

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

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

754

741 -#: apply.c:4985

755 +#: apply.c:4965

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

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

758

745 -#: apply.c:4987

759 +#: apply.c:4967

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

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

762

749 -#: apply.c:4989

763 +#: apply.c:4969

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

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

766

753 -#: apply.c:4991

767 +#: apply.c:4971

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

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

770

757 -#: apply.c:4994

771 +#: apply.c:4974

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

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

774

761 -#: apply.c:4996

775 +#: apply.c:4976

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

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

778

765 -#: apply.c:4998

779 +#: apply.c:4978

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

781 msgstr ""

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

783

770 -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524

784 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

785 msgid "paths are separated with NUL character"

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

787

774 -#: apply.c:5003

788 +#: apply.c:4983

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

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

791

778 -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97

779 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

780 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415

792 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

793 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

794 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

795 msgid "action"

796 msgstr "action"

797

784 -#: apply.c:5005

798 +#: apply.c:4985

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

800 msgstr ""

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

802 "d'espace"

803

790 -#: apply.c:5008 apply.c:5011

804 +#: apply.c:4988 apply.c:4991

805 msgid "ignore changes in whitespace when finding context"

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

807

794 -#: apply.c:5014

808 +#: apply.c:4994

809 msgid "apply the patch in reverse"

810 msgstr "appliquer le patch en sens inverse"

811

798 -#: apply.c:5016

812 +#: apply.c:4996

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

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

815

802 -#: apply.c:5018

816 +#: apply.c:4998

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

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

819

806 -#: apply.c:5020

820 +#: apply.c:5000

821 msgid "allow overlapping hunks"

822 msgstr "accepter les recouvrements de sections"

823

810 -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22

811 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786

812 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128

824 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

825 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

826 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

827 msgid "be verbose"

828 msgstr "mode verbeux"

829

816 -#: apply.c:5023

830 +#: apply.c:5003

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

832 msgstr ""

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

834 "fichier"

835

822 -#: apply.c:5026

836 +#: apply.c:5006

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

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

839

826 -#: apply.c:5028 builtin/am.c:2207

840 +#: apply.c:5008 builtin/am.c:2205

841 msgid "root"

842 msgstr "racine"

843

830 -#: apply.c:5029

844 +#: apply.c:5009

845 msgid "prepend <root> to all filenames"

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

847

@@ -870,98 +884,98 @@ msgstr "nom d'objet invalide : %s"

884 msgid "not a tree object: %s"

885 msgstr "objet arbre invalide : %s"

886

873 -#: archive.c:424

887 +#: archive.c:426

888 msgid "current working directory is untracked"

889 msgstr "l'arbre de travail actuel est non-suivi"

890

877 -#: archive.c:455

891 +#: archive.c:457

892 msgid "fmt"

893 msgstr "fmt"

894

881 -#: archive.c:455

895 +#: archive.c:457

896 msgid "archive format"

897 msgstr "format d'archive"

898

885 -#: archive.c:456 builtin/log.c:1557

899 +#: archive.c:458 builtin/log.c:1580

900 msgid "prefix"

901 msgstr "préfixe"

902

889 -#: archive.c:457

903 +#: archive.c:459

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

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

906

893 -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822

894 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091

895 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105

907 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

908 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

909 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

910 #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

911 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

912 msgid "file"

913 msgstr "fichier"

914

901 -#: archive.c:459 builtin/archive.c:90

915 +#: archive.c:461 builtin/archive.c:90

916 msgid "write the archive to this file"

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

918

905 -#: archive.c:461

919 +#: archive.c:463

920 msgid "read .gitattributes in working directory"

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

922

909 -#: archive.c:462

923 +#: archive.c:464

924 msgid "report archived files on stderr"

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

926

913 -#: archive.c:463

927 +#: archive.c:465

928 msgid "store only"

929 msgstr "stockage seulement"

930

917 -#: archive.c:464

931 +#: archive.c:466

932 msgid "compress faster"

933 msgstr "compression rapide"

934

921 -#: archive.c:472

935 +#: archive.c:474

936 msgid "compress better"

937 msgstr "compression efficace"

938

925 -#: archive.c:475

939 +#: archive.c:477

940 msgid "list supported archive formats"

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

942

929 -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113

930 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858

943 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

944 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

945 msgid "repo"

946 msgstr "dépôt"

947

934 -#: archive.c:478 builtin/archive.c:92

948 +#: archive.c:480 builtin/archive.c:92

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

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

951

938 -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707

952 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

953 #: builtin/notes.c:498

954 msgid "command"

955 msgstr "commande"

956

943 -#: archive.c:480 builtin/archive.c:94

957 +#: archive.c:482 builtin/archive.c:94

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

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

960

947 -#: archive.c:487

961 +#: archive.c:489

962 msgid "Unexpected option --remote"

963 msgstr "Option --remote inattendue"

964

951 -#: archive.c:489

965 +#: archive.c:491

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

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

968

955 -#: archive.c:491

969 +#: archive.c:493

970 msgid "Unexpected option --output"

971 msgstr "Option --output inattendue"

972

959 -#: archive.c:513

973 +#: archive.c:515

974 #, c-format

975 msgid "Unknown archive format '%s'"

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

977

964 -#: archive.c:520

978 +#: archive.c:522

979 #, c-format

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

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

@@ -1005,7 +1019,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s"

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

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

1021

1008 -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229

1022 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1023 #, c-format

1024 msgid "deflate error (%d)"

1025 msgstr "erreur de compression (%d)"

@@ -1108,12 +1122,12 @@ msgstr "Bissection : une base de fusion doit être testée\n"

1122 msgid "a %s revision is needed"

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

1124

1111 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248

1125 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1126 #, c-format

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

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

1129

1116 -#: bisect.c:928 builtin/merge.c:146

1130 +#: bisect.c:928 builtin/merge.c:148

1131 #, c-format

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

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

@@ -1153,41 +1167,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1169

1156 -#: blame.c:1794

1170 +#: blame.c:2697

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

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

1173

1160 -#: blame.c:1808

1174 +#: blame.c:2711

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

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

1177

1164 -#: blame.c:1829

1178 +#: blame.c:2732

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

1180 msgstr ""

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

1182 "dernier commit"

1183

1170 -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030

1171 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940

1172 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415

1173 -#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155

1184 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1185 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1186 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1187 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1188 #: builtin/shortlog.c:192

1189 msgid "revision walk setup failed"

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

1191

1178 -#: blame.c:1856

1192 +#: blame.c:2759

1193 msgid ""

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

1195 msgstr ""

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

1197 "premier parent"

1198

1185 -#: blame.c:1867

1199 +#: blame.c:2770

1200 #, c-format

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

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

1203

1190 -#: blame.c:1878

1204 +#: blame.c:2781

1205 #, c-format

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

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

@@ -1330,12 +1344,12 @@ msgstr "Nom d'objet ambigu : '%s'."

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

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

1346

1333 -#: branch.c:359

1347 +#: branch.c:364

1348 #, c-format

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

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

1351

1338 -#: branch.c:382

1352 +#: branch.c:387

1353 #, c-format

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

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

@@ -1350,8 +1364,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

1366

1353 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916

1354 -#: builtin/commit.c:788

1367 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1368 +#: builtin/commit.c:791

1369 #, c-format

1370 msgid "could not open '%s'"

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

@@ -1360,60 +1374,64 @@ msgstr "impossible d'ouvrir '%s'"

1374 msgid "Repository lacks these prerequisite commits:"

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

1376

1363 -#: bundle.c:194

1377 +#: bundle.c:146

1378 +msgid "need a repository to verify a bundle"

1379 +msgstr "la vérification d'un colis requiert un dépôt"

1380 +

1381 +#: bundle.c:197

1382 #, c-format

1383 msgid "The bundle contains this ref:"

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

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

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

1387

1370 -#: bundle.c:201

1388 +#: bundle.c:204

1389 msgid "The bundle records a complete history."

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

1391

1374 -#: bundle.c:203

1392 +#: bundle.c:206

1393 #, c-format

1394 msgid "The bundle requires this ref:"

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

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

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

1398

1381 -#: bundle.c:269

1399 +#: bundle.c:272

1400 msgid "unable to dup bundle descriptor"

1401 msgstr "impossible de dupliquer le descripteur de liasse"

1402

1385 -#: bundle.c:276

1403 +#: bundle.c:279

1404 msgid "Could not spawn pack-objects"

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

1406

1389 -#: bundle.c:287

1407 +#: bundle.c:290

1408 msgid "pack-objects died"

1409 msgstr "les objets groupés ont disparu"

1410

1393 -#: bundle.c:329

1411 +#: bundle.c:332

1412 msgid "rev-list died"

1413 msgstr "rev-list a disparu"

1414

1397 -#: bundle.c:378

1415 +#: bundle.c:381

1416 #, c-format

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

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

1419

1402 -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306

1420 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1421 #, c-format

1422 msgid "unrecognized argument: %s"

1423 msgstr "argument non reconnu : %s"

1424

1407 -#: bundle.c:465

1425 +#: bundle.c:468

1426 msgid "Refusing to create empty bundle."

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

1428

1411 -#: bundle.c:475

1429 +#: bundle.c:478

1430 #, c-format

1431 msgid "cannot create '%s'"

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

1433

1416 -#: bundle.c:500

1434 +#: bundle.c:503

1435 msgid "index-pack died"

1436 msgstr "l'index de groupe a disparu"

1437

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

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

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

1442

1425 -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399

1426 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455

1443 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1444 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1445 #, c-format

1446 msgid "could not parse %s"

1447 msgstr "impossible d'analyser %s"

@@ -1433,7 +1451,7 @@ msgstr "impossible d'analyser %s"

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

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

1453

1436 -#: commit.c:193

1454 +#: commit.c:192

1455 msgid ""

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

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

@@ -1453,27 +1471,27 @@ msgstr ""

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

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

1473

1456 -#: commit.c:1128

1474 +#: commit.c:1127

1475 #, c-format

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

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

1478

1461 -#: commit.c:1131

1479 +#: commit.c:1130

1480 #, c-format

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

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

1483

1466 -#: commit.c:1134

1484 +#: commit.c:1133

1485 #, c-format

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

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

1488

1471 -#: commit.c:1137

1489 +#: commit.c:1136

1490 #, c-format

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

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

1493

1476 -#: commit.c:1391

1494 +#: commit.c:1390

1495 msgid ""

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

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

@@ -1485,187 +1503,245 @@ msgstr ""

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

1504 "projet.\n"

1505

1488 -#: commit-graph.c:105

1506 +#: commit-graph.c:127

1507 msgid "commit-graph file is too small"

1508 msgstr "le graphe de commit est trop petit"

1509

1492 -#: commit-graph.c:170

1510 +#: commit-graph.c:192

1511 #, c-format

1512 msgid "commit-graph signature %X does not match signature %X"

1513 msgstr ""

1514 "la signature du graphe de commit %X ne correspond pas à la signature %X"

1515

1498 -#: commit-graph.c:177

1516 +#: commit-graph.c:199

1517 #, c-format

1518 msgid "commit-graph version %X does not match version %X"

1519 msgstr "la version %X du graphe de commit ne correspond pas à la version %X"

1520

1503 -#: commit-graph.c:184

1521 +#: commit-graph.c:206

1522 #, c-format

1523 msgid "commit-graph hash version %X does not match version %X"

1524 msgstr ""

1525 "l'empreinte de la version %X du graphe de commit ne correspond pas à la "

1526 "version %X"

1527

1510 -#: commit-graph.c:207

1528 +#: commit-graph.c:229

1529 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

1530 msgstr ""

1531 "entrée de table de consultation de morceaux de graphe de commite manquante ; "

1532 "le fichier est peut être incomplet"

1533

1516 -#: commit-graph.c:218

1534 +#: commit-graph.c:240

1535 #, c-format

1536 msgid "commit-graph improper chunk offset %08x%08x"

1537 msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"

1538

1521 -#: commit-graph.c:255

1539 +#: commit-graph.c:283

1540 #, c-format

1541 msgid "commit-graph chunk id %08x appears multiple times"

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

1543

1526 -#: commit-graph.c:390

1544 +#: commit-graph.c:347

1545 +msgid "commit-graph has no base graphs chunk"

1546 +msgstr "le graphe de commit n'a pas de section de graphes de base"

1547 +

1548 +#: commit-graph.c:357

1549 +msgid "commit-graph chain does not match"

1550 +msgstr "la chaîne de graphe de commit ne correspond pas"

1551 +

1552 +#: commit-graph.c:404

1553 +#, c-format

1554 +msgid "invalid commit-graph chain: line '%s' not a hash"

1555 +msgstr ""

1556 +"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"

1557 +

1558 +#: commit-graph.c:430

1559 +msgid "unable to find all commit-graph files"

1560 +msgstr "impossible de trouver tous les fichiers du graphe de commit"

1561 +

1562 +#: commit-graph.c:554 commit-graph.c:614

1563 +msgid "invalid commit position. commit-graph is likely corrupt"

1564 +msgstr ""

1565 +"position de commit invalide. Le graphe de commit est vraisemblablement "

1566 +"corrompu"

1567 +

1568 +#: commit-graph.c:575

1569 #, c-format

1570 msgid "could not find commit %s"

1571 msgstr "impossible de trouver le commit %s"

1572

1531 -#: commit-graph.c:732 builtin/pack-objects.c:2649

1573 +#: commit-graph.c:1002 builtin/pack-objects.c:2657

1574 #, c-format

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

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

1577

1536 -#: commit-graph.c:765

1578 +#: commit-graph.c:1034

1579 msgid "Loading known commits in commit graph"

1580 msgstr "Lecture des commits connus dans un graphe de commit"

1581

1540 -#: commit-graph.c:781

1582 +#: commit-graph.c:1051

1583 msgid "Expanding reachable commits in commit graph"

1584 msgstr "Expansion des commits joignables dans un graphe de commit"

1585

1544 -#: commit-graph.c:793

1586 +#: commit-graph.c:1070

1587 msgid "Clearing commit marks in commit graph"

1588 msgstr "Suppression les marques de commit dans le graphe de commits"

1589

1548 -#: commit-graph.c:813

1590 +#: commit-graph.c:1089

1591 msgid "Computing commit graph generation numbers"

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

1593

1552 -#: commit-graph.c:930

1594 +#: commit-graph.c:1163

1595 #, c-format

1596 msgid "Finding commits for commit graph in %d pack"

1597 msgid_plural "Finding commits for commit graph in %d packs"

1598 msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"

1599 msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"

1600

1559 -#: commit-graph.c:943

1601 +#: commit-graph.c:1176

1602 #, c-format

1603 msgid "error adding pack %s"

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

1605

1564 -#: commit-graph.c:945

1606 +#: commit-graph.c:1180

1607 #, c-format

1608 msgid "error opening index for %s"

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

1610

1569 -#: commit-graph.c:959

1611 +#: commit-graph.c:1204

1612 #, c-format

1613 msgid "Finding commits for commit graph from %d ref"

1614 msgid_plural "Finding commits for commit graph from %d refs"

1615 msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"

1616 msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"

1617

1576 -#: commit-graph.c:991

1618 +#: commit-graph.c:1238

1619 msgid "Finding commits for commit graph among packed objects"

1620 msgstr ""

1621 "Recherche de commits pour un graphe de commits parmi les objets empaquetés"

1622

1581 -#: commit-graph.c:1004

1623 +#: commit-graph.c:1253

1624 msgid "Counting distinct commits in commit graph"

1625 msgstr "Comptage des commits distincts dans un graphe de commit"

1626

1585 -#: commit-graph.c:1017

1586 -#, c-format

1587 -msgid "the commit graph format cannot write %d commits"

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

1589 -

1590 -#: commit-graph.c:1026

1627 +#: commit-graph.c:1284

1628 msgid "Finding extra edges in commit graph"

1629 msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"

1630

1594 -#: commit-graph.c:1050

1595 -msgid "too many commits to write graph"

1596 -msgstr "trop de commits pour écrire un graphe"

1631 +#: commit-graph.c:1332

1632 +msgid "failed to write correct number of base graph ids"

1633 +msgstr "échec à l'écriture le nombre correct d'id de base de fusion"

1634

1598 -#: commit-graph.c:1057 midx.c:819

1635 +#: commit-graph.c:1365 midx.c:811

1636 #, c-format

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

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

1639

1603 -#: commit-graph.c:1097

1640 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1641 +#, c-format

1642 +msgid "unable to create '%s'"

1643 +msgstr "impossible de créer '%s'"

1644 +

1645 +#: commit-graph.c:1437

1646 #, c-format

1647 msgid "Writing out commit graph in %d pass"

1648 msgid_plural "Writing out commit graph in %d passes"

1649 msgstr[0] "Écriture le graphe de commits en %d passe"

1650 msgstr[1] "Écriture le graphe de commits en %d passes"

1651

1610 -#: commit-graph.c:1162

1652 +#: commit-graph.c:1478

1653 +msgid "unable to open commit-graph chain file"

1654 +msgstr "impossible d'ouvrir le fichier de graphe de commit"

1655 +

1656 +#: commit-graph.c:1490

1657 +msgid "failed to rename base commit-graph file"

1658 +msgstr "échec du renommage du fichier de graphe de commits"

1659 +

1660 +#: commit-graph.c:1510

1661 +msgid "failed to rename temporary commit-graph file"

1662 +msgstr "impossible de renommer le fichier temporaire de graphe de commits"

1663 +

1664 +#: commit-graph.c:1621

1665 +msgid "Scanning merged commits"

1666 +msgstr "Analyse des commits de fusion"

1667 +

1668 +#: commit-graph.c:1632

1669 +#, c-format

1670 +msgid "unexpected duplicate commit id %s"

1671 +msgstr "id de commit %s dupliqué inattendu"

1672 +

1673 +#: commit-graph.c:1657

1674 +msgid "Merging commit-graph"

1675 +msgstr "fusion du graphe de commits"

1676 +

1677 +#: commit-graph.c:1844

1678 +#, c-format

1679 +msgid "the commit graph format cannot write %d commits"

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

1681 +

1682 +#: commit-graph.c:1855

1683 +msgid "too many commits to write graph"

1684 +msgstr "trop de commits pour écrire un graphe"

1685 +

1686 +#: commit-graph.c:1945

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

1688 msgstr ""

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

1690 "vraisemblablement corrompu"

1691

1616 -#: commit-graph.c:1172

1692 +#: commit-graph.c:1955

1693 #, c-format

1694 msgid "commit-graph has incorrect OID order: %s then %s"

1695 msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"

1696

1621 -#: commit-graph.c:1182 commit-graph.c:1197

1697 +#: commit-graph.c:1965 commit-graph.c:1980

1698 #, c-format

1699 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

1700 msgstr ""

1701 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "

1702 "%u != %u"

1703

1628 -#: commit-graph.c:1189

1704 +#: commit-graph.c:1972

1705 #, c-format

1706 msgid "failed to parse commit %s from commit-graph"

1707 msgstr "échec de l'analyse le commit %s depuis le graphe de commits"

1708

1633 -#: commit-graph.c:1206

1709 +#: commit-graph.c:1989

1710 msgid "Verifying commits in commit graph"

1711 msgstr "Verification des commits dans le graphe de commits"

1712

1637 -#: commit-graph.c:1219

1713 +#: commit-graph.c:2002

1714 #, c-format

1715 msgid "failed to parse commit %s from object database for commit-graph"

1716 msgstr ""

1717 "échec de l'analyse du commit %s depuis la base de données d'objets pour le "

1718 "graphe de commit"

1719

1644 -#: commit-graph.c:1226

1720 +#: commit-graph.c:2009

1721 #, c-format

1722 msgid "root tree OID for commit %s in commit-graph is %s != %s"

1723 msgstr ""

1724 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "

1725 "%s"

1726

1651 -#: commit-graph.c:1236

1727 +#: commit-graph.c:2019

1728 #, c-format

1729 msgid "commit-graph parent list for commit %s is too long"

1730 msgstr ""

1731 "la liste des parents du graphe de commit pour le commit %s est trop longue"

1732

1657 -#: commit-graph.c:1242

1733 +#: commit-graph.c:2028

1734 #, c-format

1735 msgid "commit-graph parent for %s is %s != %s"

1736 msgstr "le parent du graphe de commit pour %s est %s != %s"

1737

1662 -#: commit-graph.c:1255

1738 +#: commit-graph.c:2041

1739 #, c-format

1740 msgid "commit-graph parent list for commit %s terminates early"

1741 msgstr ""

1742 "la liste de parents du graphe de commit pour le commit %s se termine trop tôt"

1743

1668 -#: commit-graph.c:1260

1744 +#: commit-graph.c:2046

1745 #, c-format

1746 msgid ""

1747 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

@@ -1673,7 +1749,7 @@ msgstr ""

1749 "le graphe de commit a un numéro de génération nul pour le commit %s, mais "

1750 "non-nul ailleurs"

1751

1676 -#: commit-graph.c:1264

1752 +#: commit-graph.c:2050

1753 #, c-format

1754 msgid ""

1755 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

@@ -1681,12 +1757,12 @@ msgstr ""

1757 "le graphe de commit a un numéro de génération non-nul pour le commit %s, "

1758 "mais nul ailleurs"

1759

1684 -#: commit-graph.c:1279

1760 +#: commit-graph.c:2065

1761 #, c-format

1762 msgid "commit-graph generation for commit %s is %u != %u"

1763 msgstr "la génération du graphe de commit pour le commit %s est %u != %u"

1764

1689 -#: commit-graph.c:1285

1765 +#: commit-graph.c:2071

1766 #, c-format

1767 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

1768 msgstr ""

@@ -1697,7 +1773,7 @@ msgstr ""

1773 msgid "memory exhausted"

1774 msgstr "plus de mémoire"

1775

1700 -#: config.c:123

1776 +#: config.c:124

1777 #, c-format

1778 msgid ""

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

@@ -1712,313 +1788,313 @@ msgstr ""

1788 "\t%s\n"

1789 "possibilité d'inclusions multiples."

1790

1715 -#: config.c:139

1791 +#: config.c:140

1792 #, c-format

1793 msgid "could not expand include path '%s'"

1794 msgstr "expansion impossible du chemin d'inclusion '%s'"

1795

1720 -#: config.c:150

1796 +#: config.c:151

1797 msgid "relative config includes must come from files"

1798 msgstr "les inclusions de configuration relatives doivent venir de fichiers"

1799

1724 -#: config.c:190

1800 +#: config.c:197

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

1802 msgstr ""

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

1804 "fichiers"

1805

1730 -#: config.c:348

1806 +#: config.c:376

1807 #, c-format

1808 msgid "key does not contain a section: %s"

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

1810

1735 -#: config.c:354

1811 +#: config.c:382

1812 #, c-format

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

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

1815

1740 -#: config.c:378 sequencer.c:2459

1816 +#: config.c:406 sequencer.c:2463

1817 #, c-format

1818 msgid "invalid key: %s"

1819 msgstr "clé invalide : %s"

1820

1745 -#: config.c:384

1821 +#: config.c:412

1822 #, c-format

1823 msgid "invalid key (newline): %s"

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

1825

1750 -#: config.c:420 config.c:432

1826 +#: config.c:448 config.c:460

1827 #, c-format

1828 msgid "bogus config parameter: %s"

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

1830

1755 -#: config.c:467

1831 +#: config.c:495

1832 #, c-format

1833 msgid "bogus format in %s"

1834 msgstr "formatage mal formé dans %s"

1835

1760 -#: config.c:793

1836 +#: config.c:821

1837 #, c-format

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

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

1840

1765 -#: config.c:797

1841 +#: config.c:825

1842 #, c-format

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

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

1845

1770 -#: config.c:801

1846 +#: config.c:829

1847 #, c-format

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

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

1850

1775 -#: config.c:805

1851 +#: config.c:833

1852 #, c-format

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

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

1855

1780 -#: config.c:809

1856 +#: config.c:837

1857 #, c-format

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

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

1860

1785 -#: config.c:813

1861 +#: config.c:841

1862 #, c-format

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

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

1865

1790 -#: config.c:952

1866 +#: config.c:978

1867 msgid "out of range"

1868 msgstr "hors plage"

1869

1794 -#: config.c:952

1870 +#: config.c:978

1871 msgid "invalid unit"

1872 msgstr "unité invalide"

1873

1798 -#: config.c:958

1874 +#: config.c:979

1875 #, c-format

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

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

1878

1803 -#: config.c:963

1879 +#: config.c:998

1880 #, c-format

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

1882 msgstr ""

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

1884 "%s : %s"

1885

1810 -#: config.c:966

1886 +#: config.c:1001

1887 #, c-format

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

1889 msgstr ""

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

1891 "%s : %s"

1892

1817 -#: config.c:969

1893 +#: config.c:1004

1894 #, c-format

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

1896 msgstr ""

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

1898 "standard : %s"

1899

1824 -#: config.c:972

1900 +#: config.c:1007

1901 #, c-format

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

1903 msgstr ""

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

1905 "sous-module %s : %s"

1906

1831 -#: config.c:975

1907 +#: config.c:1010

1908 #, c-format

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

1910 msgstr ""

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

1912 "commande %s : %s"

1913

1838 -#: config.c:978

1914 +#: config.c:1013

1915 #, c-format

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

1917 msgstr ""

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

1919

1844 -#: config.c:1073

1920 +#: config.c:1108

1921 #, c-format

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

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

1924

1849 -#: config.c:1082

1925 +#: config.c:1117

1926 #, c-format

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

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

1929

1854 -#: config.c:1173

1930 +#: config.c:1208

1931 #, c-format

1932 msgid "abbrev length out of range: %d"

1933 msgstr "longueur d'abbrev hors plage : %d"

1934

1859 -#: config.c:1187 config.c:1198

1935 +#: config.c:1222 config.c:1233

1936 #, c-format

1937 msgid "bad zlib compression level %d"

1938 msgstr "niveau de compression zlib incorrect %d"

1939

1864 -#: config.c:1290

1940 +#: config.c:1325

1941 msgid "core.commentChar should only be one character"

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

1943

1868 -#: config.c:1323

1944 +#: config.c:1358

1945 #, c-format

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

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

1948

1873 -#: config.c:1395

1949 +#: config.c:1430

1950 #, c-format

1951 msgid "malformed value for %s"

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

1953

1878 -#: config.c:1421

1954 +#: config.c:1456

1955 #, c-format

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

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

1958

1883 -#: config.c:1422

1959 +#: config.c:1457

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

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

1962

1887 -#: config.c:1483 builtin/pack-objects.c:3397

1963 +#: config.c:1518 builtin/pack-objects.c:3410

1964 #, c-format

1965 msgid "bad pack compression level %d"

1966 msgstr "niveau de compression du paquet %d"

1967

1892 -#: config.c:1604

1968 +#: config.c:1639

1969 #, c-format

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

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

1972

1897 -#: config.c:1607

1973 +#: config.c:1642

1974 #, c-format

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

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

1977

1902 -#: config.c:1624

1978 +#: config.c:1659

1979 #, c-format

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

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

1982

1907 -#: config.c:1654

1983 +#: config.c:1689

1984 #, c-format

1985 msgid "failed to parse %s"

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

1987

1912 -#: config.c:1710

1988 +#: config.c:1745

1989 msgid "unable to parse command-line config"

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

1991

1916 -#: config.c:2059

1992 +#: config.c:2094

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

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

1995

1920 -#: config.c:2229

1996 +#: config.c:2264

1997 #, c-format

1998 msgid "Invalid %s: '%s'"

1999 msgstr "%s invalide : '%s'"

2000

1925 -#: config.c:2272

2001 +#: config.c:2307

2002 #, c-format

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

2004 msgstr ""

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

2006 "défaut"

2007

1932 -#: config.c:2298

2008 +#: config.c:2333

2009 #, c-format

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

2011 msgstr ""

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

2013 "100"

2014

1939 -#: config.c:2344

2015 +#: config.c:2379

2016 #, c-format

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

2018 msgstr ""

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

2020

1945 -#: config.c:2346

2021 +#: config.c:2381

2022 #, c-format

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

2024 msgstr ""

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

2026

1951 -#: config.c:2427

2027 +#: config.c:2462

2028 #, c-format

2029 msgid "invalid section name '%s'"

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

2031

1956 -#: config.c:2459

2032 +#: config.c:2494

2033 #, c-format

2034 msgid "%s has multiple values"

2035 msgstr "%s a des valeurs multiples"

2036

1961 -#: config.c:2488

2037 +#: config.c:2523

2038 #, c-format

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

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

2041

1966 -#: config.c:2740 config.c:3064

2042 +#: config.c:2775 config.c:3099

2043 #, c-format

2044 msgid "could not lock config file %s"

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

2046

1971 -#: config.c:2751

2047 +#: config.c:2786

2048 #, c-format

2049 msgid "opening %s"

2050 msgstr "ouverture de %s"

2051

1976 -#: config.c:2786 builtin/config.c:328

2052 +#: config.c:2821 builtin/config.c:328

2053 #, c-format

2054 msgid "invalid pattern: %s"

2055 msgstr "motif invalide : %s"

2056

1981 -#: config.c:2811

2057 +#: config.c:2846

2058 #, c-format

2059 msgid "invalid config file %s"

2060 msgstr "fichier de configuration invalide %s"

2061

1986 -#: config.c:2824 config.c:3077

2062 +#: config.c:2859 config.c:3112

2063 #, c-format

2064 msgid "fstat on %s failed"

2065 msgstr "échec de fstat sur %s"

2066

1991 -#: config.c:2835

2067 +#: config.c:2870

2068 #, c-format

2069 msgid "unable to mmap '%s'"

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

2071

1996 -#: config.c:2844 config.c:3082

2072 +#: config.c:2879 config.c:3117

2073 #, c-format

2074 msgid "chmod on %s failed"

2075 msgstr "échec de chmod sur %s"

2076

2001 -#: config.c:2929 config.c:3179

2077 +#: config.c:2964 config.c:3214

2078 #, c-format

2079 msgid "could not write config file %s"

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

2081

2006 -#: config.c:2963

2082 +#: config.c:2998

2083 #, c-format

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

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

2086

2011 -#: config.c:2965 builtin/remote.c:782

2087 +#: config.c:3000 builtin/remote.c:782

2088 #, c-format

2089 msgid "could not unset '%s'"

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

2091

2016 -#: config.c:3055

2092 +#: config.c:3090

2093 #, c-format

2094 msgid "invalid section name: %s"

2095 msgstr "nom de section invalide : %s"

2096

2021 -#: config.c:3222

2097 +#: config.c:3257

2098 #, c-format

2099 msgid "missing value for '%s'"

2100 msgstr "valeur manquante pour '%s'"

@@ -2184,19 +2260,19 @@ msgstr "chemin étrange '%s' bloqué"

2260 msgid "unable to fork"

2261 msgstr "fork impossible"

2262

2187 -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43

2263 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2264 msgid "Checking connectivity"

2265 msgstr "Vérification de la connectivité"

2266

2191 -#: connected.c:97

2267 +#: connected.c:98

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

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

2270

2195 -#: connected.c:117

2271 +#: connected.c:118

2272 msgid "failed write to rev-list"

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

2274

2199 -#: connected.c:124

2275 +#: connected.c:125

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

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

2278

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

2495 "l'expression rationnelle depuis la configuration a trop de groupes de "

2496 "capture (max=%d)"

2497

2422 -#: delta-islands.c:466

2498 +#: delta-islands.c:467

2499 #, c-format

2500 msgid "Marked %d islands, done.\n"

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

@@ -2497,35 +2573,35 @@ msgstr ""

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

2574 "%s"

2575

2500 -#: diff.c:4210

2576 +#: diff.c:4215

2577 #, c-format

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

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

2580

2505 -#: diff.c:4555

2581 +#: diff.c:4560

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

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

2584

2509 -#: diff.c:4558

2585 +#: diff.c:4563

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

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

2588

2513 -#: diff.c:4636

2589 +#: diff.c:4641

2590 msgid "--follow requires exactly one pathspec"

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

2592

2517 -#: diff.c:4684

2593 +#: diff.c:4689

2594 #, c-format

2595 msgid "invalid --stat value: %s"

2596 msgstr "valeur invalide de --stat : %s"

2597

2522 -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217

2598 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2599 #: parse-options.c:199 parse-options.c:203

2600 #, c-format

2601 msgid "%s expects a numerical value"

2602 msgstr "%s attend une valeur numérique"

2603

2528 -#: diff.c:4721

2604 +#: diff.c:4726

2605 #, c-format

2606 msgid ""

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

@@ -2534,42 +2610,42 @@ msgstr ""

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

2611 "%s"

2612

2537 -#: diff.c:4806

2613 +#: diff.c:4811

2614 #, c-format

2615 msgid "unknown change class '%c' in --diff-filter=%s"

2616 msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"

2617

2542 -#: diff.c:4830

2618 +#: diff.c:4835

2619 #, c-format

2620 msgid "unknown value after ws-error-highlight=%.*s"

2621 msgstr "valeur inconnue après ws-error-highlight=%.*s"

2622

2547 -#: diff.c:4844

2623 +#: diff.c:4849

2624 #, c-format

2625 msgid "unable to resolve '%s'"

2626 msgstr "impossible de résoudre '%s'"

2627

2552 -#: diff.c:4894 diff.c:4900

2628 +#: diff.c:4899 diff.c:4905

2629 #, c-format

2630 msgid "%s expects <n>/<m> form"

2631 msgstr "forme <n>/<m> attendue par %s"

2632

2557 -#: diff.c:4912

2633 +#: diff.c:4917

2634 #, c-format

2635 msgid "%s expects a character, got '%s'"

2636 msgstr "caractère attendu par %s, '%s' trouvé"

2637

2562 -#: diff.c:4933

2638 +#: diff.c:4938

2639 #, c-format

2640 msgid "bad --color-moved argument: %s"

2641 msgstr "mauvais argument --color-moved : %s"

2642

2567 -#: diff.c:4952

2643 +#: diff.c:4957

2644 #, c-format

2645 msgid "invalid mode '%s' in --color-moved-ws"

2646 msgstr "mode invalide '%s' dans --color-moved-ws"

2647

2572 -#: diff.c:4992

2648 +#: diff.c:4997

2649 msgid ""

2650 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

2651 "\"histogram\""

@@ -2577,155 +2653,155 @@ msgstr ""

2653 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "

2654 "\"histogram\""

2655

2580 -#: diff.c:5028 diff.c:5048

2656 +#: diff.c:5033 diff.c:5053

2657 #, c-format

2658 msgid "invalid argument to %s"

2659 msgstr "argument invalide pour %s"

2660

2585 -#: diff.c:5186

2661 +#: diff.c:5191

2662 #, c-format

2663 msgid "failed to parse --submodule option parameter: '%s'"

2664 msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"

2665

2590 -#: diff.c:5242

2666 +#: diff.c:5247

2667 #, c-format

2668 msgid "bad --word-diff argument: %s"

2669 msgstr "mauvais argument pour --word-diff : %s"

2670

2595 -#: diff.c:5265

2671 +#: diff.c:5270

2672 msgid "Diff output format options"

2673 msgstr "Options de format de sortie de diff"

2674

2599 -#: diff.c:5267 diff.c:5273

2675 +#: diff.c:5272 diff.c:5278

2676 msgid "generate patch"

2677 msgstr "générer la rustine"

2678

2603 -#: diff.c:5270 builtin/log.c:167

2679 +#: diff.c:5275 builtin/log.c:172

2680 msgid "suppress diff output"

2681 msgstr "supprimer la sortie des différences"

2682

2607 -#: diff.c:5275 diff.c:5389 diff.c:5396

2683 +#: diff.c:5280 diff.c:5394 diff.c:5401

2684 msgid "<n>"

2685 msgstr "<n>"

2686

2611 -#: diff.c:5276 diff.c:5279

2687 +#: diff.c:5281 diff.c:5284

2688 msgid "generate diffs with <n> lines context"

2689 msgstr "générer les diffs avec <n> lignes de contexte"

2690

2615 -#: diff.c:5281

2691 +#: diff.c:5286

2692 msgid "generate the diff in raw format"

2693 msgstr "générer le diff en format brut"

2694

2619 -#: diff.c:5284

2695 +#: diff.c:5289

2696 msgid "synonym for '-p --raw'"

2697 msgstr "synonyme de '-p --raw'"

2698

2623 -#: diff.c:5288

2699 +#: diff.c:5293

2700 msgid "synonym for '-p --stat'"

2701 msgstr "synonyme de '-p --stat'"

2702

2627 -#: diff.c:5292

2703 +#: diff.c:5297

2704 msgid "machine friendly --stat"

2705 msgstr "--stat pour traitement automatique"

2706

2631 -#: diff.c:5295

2707 +#: diff.c:5300

2708 msgid "output only the last line of --stat"

2709 msgstr "afficher seulement la dernière ligne de --stat"

2710

2635 -#: diff.c:5297 diff.c:5305

2711 +#: diff.c:5302 diff.c:5310

2712 msgid "<param1,param2>..."

2713 msgstr "<param1,param2>..."

2714

2639 -#: diff.c:5298

2715 +#: diff.c:5303

2716 msgid ""

2717 "output the distribution of relative amount of changes for each sub-directory"

2718 msgstr ""

2719 "afficher la distribution des quantités de modifications relatives pour "

2720 "chaque sous-répertoire"

2721

2646 -#: diff.c:5302

2722 +#: diff.c:5307

2723 msgid "synonym for --dirstat=cumulative"

2724 msgstr "synonyme pour --dirstat=cumulative"

2725

2650 -#: diff.c:5306

2726 +#: diff.c:5311

2727 msgid "synonym for --dirstat=files,param1,param2..."

2728 msgstr "synonyme pour --dirstat=files,param1,param2..."

2729

2654 -#: diff.c:5310

2730 +#: diff.c:5315

2731 msgid "warn if changes introduce conflict markers or whitespace errors"

2732 msgstr ""

2733 "avertir si les modifications introduisent des marqueurs de conflit ou des "

2734 "erreurs d'espace"

2735

2660 -#: diff.c:5313

2736 +#: diff.c:5318

2737 msgid "condensed summary such as creations, renames and mode changes"

2738 msgstr ""

2739 "résumé succinct tel que les créations, les renommages et les modifications "

2740 "de mode"

2741

2666 -#: diff.c:5316

2742 +#: diff.c:5321

2743 msgid "show only names of changed files"

2744 msgstr "n'afficher que les noms de fichiers modifiés"

2745

2670 -#: diff.c:5319

2746 +#: diff.c:5324

2747 msgid "show only names and status of changed files"

2748 msgstr "n'afficher que les noms et les status des fichiers modifiés"

2749

2674 -#: diff.c:5321

2750 +#: diff.c:5326

2751 msgid "<width>[,<name-width>[,<count>]]"

2752 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"

2753

2678 -#: diff.c:5322

2754 +#: diff.c:5327

2755 msgid "generate diffstat"

2756 msgstr "générer un diffstat"

2757

2682 -#: diff.c:5324 diff.c:5327 diff.c:5330

2758 +#: diff.c:5329 diff.c:5332 diff.c:5335

2759 msgid "<width>"

2760 msgstr "<largeur>"

2761

2686 -#: diff.c:5325

2762 +#: diff.c:5330

2763 msgid "generate diffstat with a given width"

2764 msgstr "générer un diffstat avec la largeur indiquée"

2765

2690 -#: diff.c:5328

2766 +#: diff.c:5333

2767 msgid "generate diffstat with a given name width"

2768 msgstr "génerer un diffstat avec la largeur de nom indiquée"

2769

2694 -#: diff.c:5331

2770 +#: diff.c:5336

2771 msgid "generate diffstat with a given graph width"

2772 msgstr "génerer un diffstat avec la largeur de graphe indiquée"

2773

2698 -#: diff.c:5333

2774 +#: diff.c:5338

2775 msgid "<count>"

2776 msgstr "<compte>"

2777

2702 -#: diff.c:5334

2778 +#: diff.c:5339

2779 msgid "generate diffstat with limited lines"

2780 msgstr "générer un diffstat avec des lignes limitées"

2781

2706 -#: diff.c:5337

2782 +#: diff.c:5342

2783 msgid "generate compact summary in diffstat"

2784 msgstr "générer une résumé compact dans le diffstat"

2785

2710 -#: diff.c:5340

2786 +#: diff.c:5345

2787 msgid "output a binary diff that can be applied"

2788 msgstr "produire un diff binaire qui peut être appliqué"

2789

2714 -#: diff.c:5343

2790 +#: diff.c:5348

2791 msgid "show full pre- and post-image object names on the \"index\" lines"

2792 msgstr ""

2793 "afficher les noms complets des objets pre- et post-image sur les lignes "

2794 "\"index\""

2795

2720 -#: diff.c:5345

2796 +#: diff.c:5350

2797 msgid "show colored diff"

2798 msgstr "afficher un diff coloré"

2799

2724 -#: diff.c:5346

2800 +#: diff.c:5351

2801 msgid "<kind>"

2802 msgstr "<sorte>"

2803

2728 -#: diff.c:5347

2804 +#: diff.c:5352

2805 msgid ""

2806 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

2807 "diff"

@@ -2733,7 +2809,7 @@ msgstr ""

2809 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "

2810 "'nouveau' dans le diff"

2811

2736 -#: diff.c:5350

2812 +#: diff.c:5355

2813 msgid ""

2814 "do not munge pathnames and use NULs as output field terminators in --raw or "

2815 "--numstat"

@@ -2741,93 +2817,93 @@ msgstr ""

2817 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "

2818 "champs dans --raw ou --numstat"

2819

2744 -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465

2820 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2821 msgid "<prefix>"

2822 msgstr "<préfixe>"

2823

2748 -#: diff.c:5354

2824 +#: diff.c:5359

2825 msgid "show the given source prefix instead of \"a/\""

2826 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""

2827

2752 -#: diff.c:5357

2828 +#: diff.c:5362

2829 msgid "show the given destination prefix instead of \"b/\""

2830 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""

2831

2756 -#: diff.c:5360

2832 +#: diff.c:5365

2833 msgid "prepend an additional prefix to every line of output"

2834 msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"

2835

2760 -#: diff.c:5363

2836 +#: diff.c:5368

2837 msgid "do not show any source or destination prefix"

2838 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"

2839

2764 -#: diff.c:5366

2840 +#: diff.c:5371

2841 msgid "show context between diff hunks up to the specified number of lines"

2842 msgstr ""

2843 "afficher le contexte entre les sections à concurrence du nombre de ligne "

2844 "indiqué"

2845

2770 -#: diff.c:5370 diff.c:5375 diff.c:5380

2846 +#: diff.c:5375 diff.c:5380 diff.c:5385

2847 msgid "<char>"

2848 msgstr "<caractère>"

2849

2774 -#: diff.c:5371

2850 +#: diff.c:5376

2851 msgid "specify the character to indicate a new line instead of '+'"

2852 msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"

2853

2778 -#: diff.c:5376

2854 +#: diff.c:5381

2855 msgid "specify the character to indicate an old line instead of '-'"

2856 msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"

2857

2782 -#: diff.c:5381

2858 +#: diff.c:5386

2859 msgid "specify the character to indicate a context instead of ' '"

2860 msgstr ""

2861 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"

2862

2787 -#: diff.c:5384

2863 +#: diff.c:5389

2864 msgid "Diff rename options"

2865 msgstr "Options de renommage de diff"

2866

2791 -#: diff.c:5385

2867 +#: diff.c:5390

2868 msgid "<n>[/<m>]"

2869 msgstr "<n>[/<m>]"

2870

2795 -#: diff.c:5386

2871 +#: diff.c:5391

2872 msgid "break complete rewrite changes into pairs of delete and create"

2873 msgstr ""

2874 "casser les modifications d'une réécrire complète en paires de suppression et "

2875 "création"

2876

2801 -#: diff.c:5390

2877 +#: diff.c:5395

2878 msgid "detect renames"

2879 msgstr "détecter les renommages"

2880

2805 -#: diff.c:5394

2881 +#: diff.c:5399

2882 msgid "omit the preimage for deletes"

2883 msgstr "supprimer la pré-image pour les suppressions"

2884

2809 -#: diff.c:5397

2885 +#: diff.c:5402

2886 msgid "detect copies"

2887 msgstr "détecter les copies"

2888

2813 -#: diff.c:5401

2889 +#: diff.c:5406

2890 msgid "use unmodified files as source to find copies"

2891 msgstr ""

2892 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"

2893

2818 -#: diff.c:5403

2894 +#: diff.c:5408

2895 msgid "disable rename detection"

2896 msgstr "désactiver la détection de renommage"

2897

2822 -#: diff.c:5406

2898 +#: diff.c:5411

2899 msgid "use empty blobs as rename source"

2900 msgstr "utiliser des blobs vides comme source de renommage"

2901

2826 -#: diff.c:5408

2902 +#: diff.c:5413

2903 msgid "continue listing the history of a file beyond renames"

2904 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"

2905

2830 -#: diff.c:5411

2906 +#: diff.c:5416

2907 msgid ""

2908 "prevent rename/copy detection if the number of rename/copy targets exceeds "

2909 "given limit"

@@ -2835,161 +2911,161 @@ msgstr ""

2911 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"

2912 "copie excède la limite indiquée"

2913

2838 -#: diff.c:5413

2914 +#: diff.c:5418

2915 msgid "Diff algorithm options"

2916 msgstr "Options de l'algorithme de diff"

2917

2842 -#: diff.c:5415

2918 +#: diff.c:5420

2919 msgid "produce the smallest possible diff"

2920 msgstr "produire le diff le plus petit possible"

2921

2846 -#: diff.c:5418

2922 +#: diff.c:5423

2923 msgid "ignore whitespace when comparing lines"

2924 msgstr "ignorer les espaces lors de la comparaison de ligne"

2925

2850 -#: diff.c:5421

2926 +#: diff.c:5426

2927 msgid "ignore changes in amount of whitespace"

2928 msgstr "ignorer des modifications du nombre d'espaces"

2929

2854 -#: diff.c:5424

2930 +#: diff.c:5429

2931 msgid "ignore changes in whitespace at EOL"

2932 msgstr "ignorer des modifications d'espace en fin de ligne"

2933

2858 -#: diff.c:5427

2934 +#: diff.c:5432

2935 msgid "ignore carrier-return at the end of line"

2936 msgstr "ignore le retour chariot en fin de ligne"

2937

2862 -#: diff.c:5430

2938 +#: diff.c:5435

2939 msgid "ignore changes whose lines are all blank"

2940 msgstr "ignorer les modifications dont les lignes sont vides"

2941

2866 -#: diff.c:5433

2942 +#: diff.c:5438

2943 msgid "heuristic to shift diff hunk boundaries for easy reading"

2944 msgstr ""

2945 "heuristique qui déplace les limites de sections de diff pour faciliter la "

2946 "lecture"

2947

2872 -#: diff.c:5436

2948 +#: diff.c:5441

2949 msgid "generate diff using the \"patience diff\" algorithm"

2950 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""

2951

2876 -#: diff.c:5440

2952 +#: diff.c:5445

2953 msgid "generate diff using the \"histogram diff\" algorithm"

2954 msgstr ""

2955 "générer un diff en utilisant l'algorithme de différence \"histogramme\""

2956

2881 -#: diff.c:5442

2957 +#: diff.c:5447

2958 msgid "<algorithm>"

2959 msgstr "<algorithme>"

2960

2885 -#: diff.c:5443

2961 +#: diff.c:5448

2962 msgid "choose a diff algorithm"

2963 msgstr "choisir un algorithme de différence"

2964

2889 -#: diff.c:5445

2965 +#: diff.c:5450

2966 msgid "<text>"

2967 msgstr "<texte>"

2968

2893 -#: diff.c:5446

2969 +#: diff.c:5451

2970 msgid "generate diff using the \"anchored diff\" algorithm"

2971 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""

2972

2897 -#: diff.c:5448 diff.c:5457 diff.c:5460

2973 +#: diff.c:5453 diff.c:5462 diff.c:5465

2974 msgid "<mode>"

2975 msgstr "<mode>"

2976

2901 -#: diff.c:5449

2977 +#: diff.c:5454

2978 msgid "show word diff, using <mode> to delimit changed words"

2979 msgstr ""

2980 "afficher des différences par mot, en utilisant <mode> pour délimiter les "

2981 "mots modifiés"

2982

2907 -#: diff.c:5451 diff.c:5454 diff.c:5499

2983 +#: diff.c:5456 diff.c:5459 diff.c:5504

2984 msgid "<regex>"

2985 msgstr "<regex>"

2986

2911 -#: diff.c:5452

2987 +#: diff.c:5457

2988 msgid "use <regex> to decide what a word is"

2989 msgstr "utiliser <regex> pour décider ce qu'est un mot"

2990

2915 -#: diff.c:5455

2991 +#: diff.c:5460

2992 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

2993 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

2994

2919 -#: diff.c:5458

2995 +#: diff.c:5463

2996 msgid "moved lines of code are colored differently"

2997 msgstr "les lignes déplacées sont colorées différemment"

2998

2923 -#: diff.c:5461

2999 +#: diff.c:5466

3000 msgid "how white spaces are ignored in --color-moved"

3001 msgstr "comment les espaces sont ignorés dans --color-moved"

3002

2927 -#: diff.c:5464

3003 +#: diff.c:5469

3004 msgid "Other diff options"

3005 msgstr "Autres options diff"

3006

2931 -#: diff.c:5466

3007 +#: diff.c:5471

3008 msgid "when run from subdir, exclude changes outside and show relative paths"

3009 msgstr ""

3010 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3011 "afficher les chemins relatifs"

3012

2937 -#: diff.c:5470

3013 +#: diff.c:5475

3014 msgid "treat all files as text"

3015 msgstr "traiter les fichiers comme texte"

3016

2941 -#: diff.c:5472

3017 +#: diff.c:5477

3018 msgid "swap two inputs, reverse the diff"

3019 msgstr "échanger les entrées, inverser le diff"

3020

2945 -#: diff.c:5474

3021 +#: diff.c:5479

3022 msgid "exit with 1 if there were differences, 0 otherwise"

3023 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3024

2949 -#: diff.c:5476

3025 +#: diff.c:5481

3026 msgid "disable all output of the program"

3027 msgstr "désactiver tous les affichages du programme"

3028

2953 -#: diff.c:5478

3029 +#: diff.c:5483

3030 msgid "allow an external diff helper to be executed"

3031 msgstr "autoriser l'exécution d'un assistant externe de diff"

3032

2957 -#: diff.c:5480

3033 +#: diff.c:5485

3034 msgid "run external text conversion filters when comparing binary files"

3035 msgstr ""

3036 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3037 "fichiers binaires"

3038

2963 -#: diff.c:5482

3039 +#: diff.c:5487

3040 msgid "<when>"

3041 msgstr "<quand>"

3042

2967 -#: diff.c:5483

3043 +#: diff.c:5488

3044 msgid "ignore changes to submodules in the diff generation"

3045 msgstr ""

3046 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3047

2972 -#: diff.c:5486

3048 +#: diff.c:5491

3049 msgid "<format>"

3050 msgstr "<format>"

3051

2976 -#: diff.c:5487

3052 +#: diff.c:5492

3053 msgid "specify how differences in submodules are shown"

3054 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3055

2980 -#: diff.c:5491

3056 +#: diff.c:5496

3057 msgid "hide 'git add -N' entries from the index"

3058 msgstr "masquer les entrées 'git add -N' de l'index"

3059

2984 -#: diff.c:5494

3060 +#: diff.c:5499

3061 msgid "treat 'git add -N' entries as real in the index"

3062 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

3063

2988 -#: diff.c:5496

3064 +#: diff.c:5501

3065 msgid "<string>"

3066 msgstr "<chaîne>"

3067

2992 -#: diff.c:5497

3068 +#: diff.c:5502

3069 msgid ""

3070 "look for differences that change the number of occurrences of the specified "

3071 "string"

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

3073 "rechercher les différences qui modifient le nombre d'occurrences de la "

3074 "chaîne spécifiée"

3075

3000 -#: diff.c:5500

3076 +#: diff.c:5505

3077 msgid ""

3078 "look for differences that change the number of occurrences of the specified "

3079 "regex"

@@ -3005,26 +3081,26 @@ msgstr ""

3081 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

3082 "spécifiée"

3083

3008 -#: diff.c:5503

3084 +#: diff.c:5508

3085 msgid "show all changes in the changeset with -S or -G"

3086 msgstr ""

3087 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

3088 "ou -G"

3089

3014 -#: diff.c:5506

3090 +#: diff.c:5511

3091 msgid "treat <string> in -S as extended POSIX regular expression"

3092 msgstr ""

3093 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

3094

3019 -#: diff.c:5509

3095 +#: diff.c:5514

3096 msgid "control the order in which files appear in the output"

3097 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

3098

3023 -#: diff.c:5510

3099 +#: diff.c:5515

3100 msgid "<object-id>"

3101 msgstr "<id-objet>"

3102

3027 -#: diff.c:5511

3103 +#: diff.c:5516

3104 msgid ""

3105 "look for differences that change the number of occurrences of the specified "

3106 "object"

@@ -3032,35 +3108,35 @@ msgstr ""

3108 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

3109 "indiqué"

3110

3035 -#: diff.c:5513

3111 +#: diff.c:5518

3112 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3113 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3114

3039 -#: diff.c:5514

3115 +#: diff.c:5519

3116 msgid "select files by diff type"

3117 msgstr "sélectionner les fichiers par types de diff"

3118

3043 -#: diff.c:5516

3119 +#: diff.c:5521

3120 msgid "<file>"

3121 msgstr "<fichier>"

3122

3047 -#: diff.c:5517

3123 +#: diff.c:5522

3124 msgid "Output to a specific file"

3125 msgstr "Sortie vers un fichier spécifié"

3126

3051 -#: diff.c:6150

3127 +#: diff.c:6177

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

3129 msgstr ""

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

3131 "fichiers."

3132

3057 -#: diff.c:6153

3133 +#: diff.c:6180

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

3135 msgstr ""

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

3137 "grand nombre de fichiers."

3138

3063 -#: diff.c:6156

3139 +#: diff.c:6183

3140 #, c-format

3141 msgid ""

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

@@ -3168,32 +3244,32 @@ msgstr "impossible d'écrire sur un distant"

3244 msgid "--stateless-rpc requires multi_ack_detailed"

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

3246

3171 -#: fetch-pack.c:360 fetch-pack.c:1271

3247 +#: fetch-pack.c:360 fetch-pack.c:1284

3248 #, c-format

3249 msgid "invalid shallow line: %s"

3250 msgstr "ligne de superficiel invalide : %s"

3251

3176 -#: fetch-pack.c:366 fetch-pack.c:1277

3252 +#: fetch-pack.c:366 fetch-pack.c:1290

3253 #, c-format

3254 msgid "invalid unshallow line: %s"

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

3256

3181 -#: fetch-pack.c:368 fetch-pack.c:1279

3257 +#: fetch-pack.c:368 fetch-pack.c:1292

3258 #, c-format

3259 msgid "object not found: %s"

3260 msgstr "objet non trouvé : %s"

3261

3186 -#: fetch-pack.c:371 fetch-pack.c:1282

3262 +#: fetch-pack.c:371 fetch-pack.c:1295

3263 #, c-format

3264 msgid "error in object: %s"

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

3266

3191 -#: fetch-pack.c:373 fetch-pack.c:1284

3267 +#: fetch-pack.c:373 fetch-pack.c:1297

3268 #, c-format

3269 msgid "no shallow found: %s"

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

3271

3196 -#: fetch-pack.c:376 fetch-pack.c:1288

3272 +#: fetch-pack.c:376 fetch-pack.c:1301

3273 #, c-format

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

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

@@ -3212,7 +3288,7 @@ msgstr "commit invalide %s"

3288 msgid "giving up"

3289 msgstr "abandon"

3290

3215 -#: fetch-pack.c:477 progress.c:284

3291 +#: fetch-pack.c:477 progress.c:277

3292 msgid "done"

3293 msgstr "fait"

3294

@@ -3253,154 +3329,130 @@ msgstr "échec de %s"

3329 msgid "error in sideband demultiplexer"

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

3331

3256 -#: fetch-pack.c:906

3257 -msgid "Server does not support shallow clients"

3258 -msgstr "Le serveur ne supporte les clients superficiels"

3259 -

3260 -#: fetch-pack.c:910

3261 -msgid "Server supports multi_ack_detailed"

3262 -msgstr "Le serveur supporte multi_ack_detailed"

3263 -

3264 -#: fetch-pack.c:913

3265 -msgid "Server supports no-done"

3266 -msgstr "Le serveur support no-done"

3267 -

3268 -#: fetch-pack.c:919

3269 -msgid "Server supports multi_ack"

3270 -msgstr "Le serveur supporte multi_ack"

3271 -

3272 -#: fetch-pack.c:923

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

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

3275 -

3276 -#: fetch-pack.c:927

3277 -msgid "Server supports side-band"

3278 -msgstr "Le serveru supporte side-band"

3279 -

3280 -#: fetch-pack.c:931

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

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

3283 -

3284 -#: fetch-pack.c:935

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

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

3287 -

3288 -#: fetch-pack.c:945

3289 -msgid "Server supports ofs-delta"

3290 -msgstr "Le serveur supporte ofs-delta"

3291 -

3292 -#: fetch-pack.c:951 fetch-pack.c:1144

3293 -msgid "Server supports filter"

3294 -msgstr "Le serveur supporte filter"

3295 -

3296 -#: fetch-pack.c:959

3332 +#: fetch-pack.c:908

3333 #, c-format

3334 msgid "Server version is %.*s"

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

3336

3301 -#: fetch-pack.c:965

3337 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3338 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3339 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3340 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3341 +#, c-format

3342 +msgid "Server supports %s"

3343 +msgstr "Le serveur supporte %s"

3344 +

3345 +#: fetch-pack.c:915

3346 +msgid "Server does not support shallow clients"

3347 +msgstr "Le serveur ne supporte les clients superficiels"

3348 +

3349 +#: fetch-pack.c:975

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

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

3352

3305 -#: fetch-pack.c:969

3353 +#: fetch-pack.c:980

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

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

3356

3309 -#: fetch-pack.c:971

3357 +#: fetch-pack.c:984

3358 msgid "Server does not support --deepen"

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

3360

3313 -#: fetch-pack.c:988

3361 +#: fetch-pack.c:1001

3362 msgid "no common commits"

3363 msgstr "pas de commit commun"

3364

3317 -#: fetch-pack.c:1000 fetch-pack.c:1449

3365 +#: fetch-pack.c:1013 fetch-pack.c:1462

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

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

3368

3321 -#: fetch-pack.c:1138

3369 +#: fetch-pack.c:1151

3370 msgid "Server does not support shallow requests"

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

3372

3325 -#: fetch-pack.c:1171

3373 +#: fetch-pack.c:1157

3374 +msgid "Server supports filter"

3375 +msgstr "Le serveur supporte filter"

3376 +

3377 +#: fetch-pack.c:1184

3378 msgid "unable to write request to remote"

3379 msgstr "impossible d'écrire la requête sur le distant"

3380

3329 -#: fetch-pack.c:1189

3381 +#: fetch-pack.c:1202

3382 #, c-format

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

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

3385

3334 -#: fetch-pack.c:1195

3386 +#: fetch-pack.c:1208

3387 #, c-format

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

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

3390

3339 -#: fetch-pack.c:1234

3391 +#: fetch-pack.c:1247

3392 #, c-format

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

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

3395

3344 -#: fetch-pack.c:1239

3396 +#: fetch-pack.c:1252

3397 #, c-format

3398 msgid "error processing acks: %d"

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

3400

3349 -#: fetch-pack.c:1249

3401 +#: fetch-pack.c:1262

3402 msgid "expected packfile to be sent after 'ready'"

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

3404

3353 -#: fetch-pack.c:1251

3405 +#: fetch-pack.c:1264

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

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

3408

3357 -#: fetch-pack.c:1293

3409 +#: fetch-pack.c:1306

3410 #, c-format

3411 msgid "error processing shallow info: %d"

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

3413

3362 -#: fetch-pack.c:1340

3414 +#: fetch-pack.c:1353

3415 #, c-format

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

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

3418

3367 -#: fetch-pack.c:1345

3419 +#: fetch-pack.c:1358

3420 #, c-format

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

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

3423

3372 -#: fetch-pack.c:1350

3424 +#: fetch-pack.c:1363

3425 #, c-format

3426 msgid "error processing wanted refs: %d"

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

3428

3377 -#: fetch-pack.c:1676

3429 +#: fetch-pack.c:1689

3430 msgid "no matching remote head"

3431 msgstr "pas de HEAD distante correspondante"

3432

3381 -#: fetch-pack.c:1699 builtin/clone.c:673

3433 +#: fetch-pack.c:1712 builtin/clone.c:686

3434 msgid "remote did not send all necessary objects"

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

3436

3385 -#: fetch-pack.c:1726

3437 +#: fetch-pack.c:1739

3438 #, c-format

3439 msgid "no such remote ref %s"

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

3441

3390 -#: fetch-pack.c:1729

3442 +#: fetch-pack.c:1742

3443 #, c-format

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

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

3446

3395 -#: gpg-interface.c:318

3447 +#: gpg-interface.c:321

3448 msgid "gpg failed to sign the data"

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

3450

3399 -#: gpg-interface.c:344

3451 +#: gpg-interface.c:347

3452 msgid "could not create temporary file"

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

3454

3403 -#: gpg-interface.c:347

3455 +#: gpg-interface.c:350

3456 #, c-format

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

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

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

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

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

3464

3413 -#: grep.c:2113

3465 +#: grep.c:2117

3466 #, c-format

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

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

3469

3418 -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

3470 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3471 #: builtin/rm.c:135

3472 #, c-format

3473 msgid "failed to stat '%s'"

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

3475

3424 -#: grep.c:2141

3476 +#: grep.c:2145

3477 #, c-format

3478 msgid "'%s': short read"

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

@@ -3492,7 +3544,7 @@ msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

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

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

3546

3495 -#: help.c:363 git.c:97

3547 +#: help.c:363 git.c:98

3548 #, c-format

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

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

@@ -3641,7 +3693,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

3695

3644 -#: ident.c:436 builtin/commit.c:608

3696 +#: ident.c:436 builtin/commit.c:611

3697 #, c-format

3698 msgid "invalid date format: %s"

3699 msgstr "format de date invalide : %s"

@@ -3675,6 +3727,11 @@ msgstr "attendu : 'tree:<profondeur>'"

3727 msgid "sparse:path filters support has been dropped"

3728 msgstr "sparse : le support des filtres de chemin a été abandonné"

3729

3730 +#: list-objects-filter-options.c:94

3731 +#, c-format

3732 +msgid "invalid filter-spec '%s'"

3733 +msgstr "spécificateur de filtre invalide '%s'"

3734 +

3735 #: list-objects-filter-options.c:158

3736 msgid "cannot change partial clone promisor remote"

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

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

3764 msgid "failed to read the cache"

3765 msgstr "impossible de lire le cache"

3766

3710 -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921

3711 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773

3767 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3768 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3769 #: builtin/stash.c:264

3770 msgid "unable to write new index file"

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

@@ -3731,93 +3788,93 @@ msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3788 msgid "error building trees"

3789 msgstr "erreur de construction des arbres"

3790

3734 -#: merge-recursive.c:861

3791 +#: merge-recursive.c:863

3792 #, c-format

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

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

3795

3739 -#: merge-recursive.c:872

3796 +#: merge-recursive.c:874

3797 #, c-format

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

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

3800

3744 -#: merge-recursive.c:886 merge-recursive.c:905

3801 +#: merge-recursive.c:888 merge-recursive.c:907

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

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

3804

3748 -#: merge-recursive.c:895

3805 +#: merge-recursive.c:897

3806 #, c-format

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

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

3809

3753 -#: merge-recursive.c:936 builtin/cat-file.c:40

3810 +#: merge-recursive.c:938 builtin/cat-file.c:40

3811 #, c-format

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

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

3814

3758 -#: merge-recursive.c:939

3815 +#: merge-recursive.c:941

3816 #, c-format

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

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

3819

3763 -#: merge-recursive.c:963

3820 +#: merge-recursive.c:965

3821 #, c-format

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

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

3824

3768 -#: merge-recursive.c:974

3825 +#: merge-recursive.c:976

3826 #, c-format

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

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

3829

3773 -#: merge-recursive.c:979

3830 +#: merge-recursive.c:981

3831 #, c-format

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

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

3834

3778 -#: merge-recursive.c:1175

3835 +#: merge-recursive.c:1177

3836 #, c-format

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

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

3839

3783 -#: merge-recursive.c:1182

3840 +#: merge-recursive.c:1184

3841 #, c-format

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

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

3844

3788 -#: merge-recursive.c:1189

3845 +#: merge-recursive.c:1191

3846 #, c-format

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

3848 msgstr ""

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

3850 "base de fusion)"

3851

3795 -#: merge-recursive.c:1197 merge-recursive.c:1209

3852 +#: merge-recursive.c:1199 merge-recursive.c:1211

3853 #, c-format

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

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

3856

3800 -#: merge-recursive.c:1200 merge-recursive.c:1212

3857 +#: merge-recursive.c:1202 merge-recursive.c:1214

3858 #, c-format

3859 msgid "Fast-forwarding submodule %s"

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

3861

3805 -#: merge-recursive.c:1235

3862 +#: merge-recursive.c:1237

3863 #, c-format

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

3865 msgstr ""

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

3867

3811 -#: merge-recursive.c:1239

3868 +#: merge-recursive.c:1241

3869 #, c-format

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

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

3872

3816 -#: merge-recursive.c:1240

3873 +#: merge-recursive.c:1242

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

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

3876

3820 -#: merge-recursive.c:1243

3877 +#: merge-recursive.c:1245

3878 #, c-format

3879 msgid ""

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

@@ -3834,33 +3891,33 @@ msgstr ""

3891 "\n"

3892 "qui acceptera cette suggestion.\n"

3893

3837 -#: merge-recursive.c:1252

3894 +#: merge-recursive.c:1254

3895 #, c-format

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

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

3898

3842 -#: merge-recursive.c:1325

3899 +#: merge-recursive.c:1327

3900 msgid "Failed to execute internal merge"

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

3902

3846 -#: merge-recursive.c:1330

3903 +#: merge-recursive.c:1332

3904 #, c-format

3905 msgid "Unable to add %s to database"

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

3907

3851 -#: merge-recursive.c:1362

3908 +#: merge-recursive.c:1364

3909 #, c-format

3910 msgid "Auto-merging %s"

3911 msgstr "Fusion automatique de %s"

3912

3856 -#: merge-recursive.c:1385

3913 +#: merge-recursive.c:1387

3914 #, c-format

3915 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3916 msgstr ""

3917 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

3918 "place."

3919

3863 -#: merge-recursive.c:1457

3920 +#: merge-recursive.c:1459

3921 #, c-format

3922 msgid ""

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

@@ -3869,7 +3926,7 @@ msgstr ""

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

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

3928

3872 -#: merge-recursive.c:1462

3929 +#: merge-recursive.c:1464

3930 #, c-format

3931 msgid ""

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

@@ -3878,7 +3935,7 @@ msgstr ""

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

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

3937

3881 -#: merge-recursive.c:1469

3938 +#: merge-recursive.c:1471

3939 #, c-format

3940 msgid ""

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

@@ -3887,7 +3944,7 @@ msgstr ""

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

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

3946

3890 -#: merge-recursive.c:1474

3947 +#: merge-recursive.c:1476

3948 #, c-format

3949 msgid ""

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

@@ -3896,41 +3953,41 @@ msgstr ""

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

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

3955

3899 -#: merge-recursive.c:1509

3956 +#: merge-recursive.c:1511

3957 msgid "rename"

3958 msgstr "renommage"

3959

3903 -#: merge-recursive.c:1509

3960 +#: merge-recursive.c:1511

3961 msgid "renamed"

3962 msgstr "renommé"

3963

3907 -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085

3964 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3965 #, c-format

3966 msgid "Refusing to lose dirty file at %s"

3967 msgstr "Refus de perdre le fichier modifié %s"

3968

3912 -#: merge-recursive.c:1599

3969 +#: merge-recursive.c:1601

3970 #, c-format

3971 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3972 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3973

3917 -#: merge-recursive.c:1657

3974 +#: merge-recursive.c:1659

3975 #, c-format

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

3977 msgstr ""

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

3979

3923 -#: merge-recursive.c:1687

3980 +#: merge-recursive.c:1690

3981 #, c-format

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

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

3984

3928 -#: merge-recursive.c:1692

3985 +#: merge-recursive.c:1695

3986 #, c-format

3987 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3988 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

3989

3933 -#: merge-recursive.c:1711

3990 +#: merge-recursive.c:1714

3991 #, c-format

3992 msgid ""

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

@@ -3939,18 +3996,18 @@ msgstr ""

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

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

3998

3942 -#: merge-recursive.c:1716

3999 +#: merge-recursive.c:1719

4000 msgid " (left unresolved)"

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

4002

3946 -#: merge-recursive.c:1825

4003 +#: merge-recursive.c:1828

4004 #, c-format

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

4006 msgstr ""

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

4008 ">'%s' dans %s"

4009

3953 -#: merge-recursive.c:2030

4010 +#: merge-recursive.c:2035

4011 #, c-format

4012 msgid ""

4013 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3961,7 +4018,7 @@ msgstr ""

4018 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

4019 "sans aucune destination récupérant la majorité des fichiers."

4020

3964 -#: merge-recursive.c:2062

4021 +#: merge-recursive.c:2067

4022 #, c-format

4023 msgid ""

4024 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3970,7 +4027,7 @@ msgstr ""

4027 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

4028 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

4029

3973 -#: merge-recursive.c:2072

4030 +#: merge-recursive.c:2077

4031 #, c-format

4032 msgid ""

4033 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3979,7 +4036,7 @@ msgstr ""

4036 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

4037 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

4038

3982 -#: merge-recursive.c:2164

4039 +#: merge-recursive.c:2169

4040 #, c-format

4041 msgid ""

4042 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3988,7 +4045,7 @@ msgstr ""

4045 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

4046 "Renommage de répertoire %s->%s dans %s"

4047

3991 -#: merge-recursive.c:2408

4048 +#: merge-recursive.c:2413

4049 #, c-format

4050 msgid ""

4051 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3997,52 +4054,52 @@ msgstr ""

4054 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

4055 "renommé."

4056

4000 -#: merge-recursive.c:2929

4057 +#: merge-recursive.c:2938

4058 #, c-format

4059 msgid "cannot read object %s"

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

4061

4005 -#: merge-recursive.c:2932

4062 +#: merge-recursive.c:2941

4063 #, c-format

4064 msgid "object %s is not a blob"

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

4066

4010 -#: merge-recursive.c:2996

4067 +#: merge-recursive.c:3005

4068 msgid "modify"

4069 msgstr "modification"

4070

4014 -#: merge-recursive.c:2996

4071 +#: merge-recursive.c:3005

4072 msgid "modified"

4073 msgstr "modifié"

4074

4018 -#: merge-recursive.c:3008

4075 +#: merge-recursive.c:3017

4076 msgid "content"

4077 msgstr "contenu"

4078

4022 -#: merge-recursive.c:3012

4079 +#: merge-recursive.c:3021

4080 msgid "add/add"

4081 msgstr "ajout/ajout"

4082

4026 -#: merge-recursive.c:3035

4083 +#: merge-recursive.c:3044

4084 #, c-format

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

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

4087

4031 -#: merge-recursive.c:3057 git-submodule.sh:937

4088 +#: merge-recursive.c:3066 git-submodule.sh:937

4089 msgid "submodule"

4090 msgstr "sous-module"

4091

4035 -#: merge-recursive.c:3058

4092 +#: merge-recursive.c:3067

4093 #, c-format

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

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

4096

4040 -#: merge-recursive.c:3088

4097 +#: merge-recursive.c:3097

4098 #, c-format

4099 msgid "Adding as %s instead"

4100 msgstr "Ajout plutôt comme %s"

4101

4045 -#: merge-recursive.c:3170

4102 +#: merge-recursive.c:3179

4103 #, c-format

4104 msgid ""

4105 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4051,7 +4108,7 @@ msgstr ""

4108 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

4109 "en %s ; déplacé dans %s."

4110

4054 -#: merge-recursive.c:3173

4111 +#: merge-recursive.c:3182

4112 #, c-format

4113 msgid ""

4114 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4061,7 +4118,7 @@ msgstr ""

4118 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

4119 "vers %s."

4120

4064 -#: merge-recursive.c:3177

4121 +#: merge-recursive.c:3186

4122 #, c-format

4123 msgid ""

4124 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4070,7 +4127,7 @@ msgstr ""

4127 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

4128 "renommé en %s ; déplacé dans %s."

4129

4073 -#: merge-recursive.c:3180

4130 +#: merge-recursive.c:3189

4131 #, c-format

4132 msgid ""

4133 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4080,36 +4137,36 @@ msgstr ""

4137 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

4138 "être déplacé vers %s."

4139

4083 -#: merge-recursive.c:3294

4140 +#: merge-recursive.c:3303

4141 #, c-format

4142 msgid "Removing %s"

4143 msgstr "Suppression de %s"

4144

4088 -#: merge-recursive.c:3317

4145 +#: merge-recursive.c:3326

4146 msgid "file/directory"

4147 msgstr "fichier/répertoire"

4148

4092 -#: merge-recursive.c:3322

4149 +#: merge-recursive.c:3331

4150 msgid "directory/file"

4151 msgstr "répertoire/fichier"

4152

4096 -#: merge-recursive.c:3329

4153 +#: merge-recursive.c:3338

4154 #, c-format

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

4156 msgstr ""

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

4158

4102 -#: merge-recursive.c:3338

4159 +#: merge-recursive.c:3347

4160 #, c-format

4161 msgid "Adding %s"

4162 msgstr "Ajout de %s"

4163

4107 -#: merge-recursive.c:3347

4164 +#: merge-recursive.c:3356

4165 #, c-format

4166 msgid "CONFLICT (add/add): Merge conflict in %s"

4167 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

4168

4112 -#: merge-recursive.c:3385

4169 +#: merge-recursive.c:3394

4170 #, c-format

4171 msgid ""

4172 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4119,132 +4176,137 @@ msgstr ""

4176 "fusion :\n"

4177 " %s"

4178

4122 -#: merge-recursive.c:3396

4179 +#: merge-recursive.c:3405

4180 msgid "Already up to date!"

4181 msgstr "Déjà à jour !"

4182

4126 -#: merge-recursive.c:3405

4183 +#: merge-recursive.c:3414

4184 #, c-format

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

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

4187

4131 -#: merge-recursive.c:3504

4188 +#: merge-recursive.c:3513

4189 msgid "Merging:"

4190 msgstr "Fusion :"

4191

4135 -#: merge-recursive.c:3517

4192 +#: merge-recursive.c:3526

4193 #, c-format

4194 msgid "found %u common ancestor:"

4195 msgid_plural "found %u common ancestors:"

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

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

4198

4142 -#: merge-recursive.c:3556

4199 +#: merge-recursive.c:3565

4200 msgid "merge returned no commit"

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

4202

4146 -#: merge-recursive.c:3622

4203 +#: merge-recursive.c:3631

4204 #, c-format

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

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

4207

4151 -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873

4208 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4209 msgid "Unable to write index."

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

4211

4155 -#: midx.c:66

4212 +#: midx.c:69

4213 #, c-format

4214 msgid "multi-pack-index file %s is too small"

4215 msgstr "le fichier d'index multi-paquet %s est trop petit"

4216

4160 -#: midx.c:82

4217 +#: midx.c:85

4218 #, c-format

4219 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4220 msgstr ""

4221 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "

4222 "0x%08x"

4223

4167 -#: midx.c:87

4224 +#: midx.c:90

4225 #, c-format

4226 msgid "multi-pack-index version %d not recognized"

4227 msgstr "la version d'index multi-paquet %d n'est pas reconnue"

4228

4172 -#: midx.c:92

4229 +#: midx.c:95

4230 #, c-format

4231 msgid "hash version %u does not match"

4232 msgstr "la version %u du condensé ne correspond pas"

4233

4177 -#: midx.c:106

4234 +#: midx.c:109

4235 msgid "invalid chunk offset (too large)"

4236 msgstr "décalage de section invalide (trop grand)"

4237

4181 -#: midx.c:130

4238 +#: midx.c:133

4239 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4240 msgstr ""

4241 "identifiant de terminaison de tronçon d'index multi-paquet terminant "

4242 "apparaît plus tôt qu'attendu"

4243

4187 -#: midx.c:143

4244 +#: midx.c:146

4245 msgid "multi-pack-index missing required pack-name chunk"

4246 msgstr "index multi-paquet manque de tronçon de nom de paquet"

4247

4191 -#: midx.c:145

4248 +#: midx.c:148

4249 msgid "multi-pack-index missing required OID fanout chunk"

4250 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"

4251

4195 -#: midx.c:147

4252 +#: midx.c:150

4253 msgid "multi-pack-index missing required OID lookup chunk"

4254 msgstr "index multi-paquet manque de tronçon de recherche OID"

4255

4199 -#: midx.c:149

4256 +#: midx.c:152

4257 msgid "multi-pack-index missing required object offsets chunk"

4258 msgstr "index multi-paquet manque de tronçon de décalage d'objet"

4259

4203 -#: midx.c:163

4260 +#: midx.c:166

4261 #, c-format

4262 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4263 msgstr ""

4264 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

4265

4209 -#: midx.c:208

4266 +#: midx.c:211

4267 #, c-format

4268 msgid "bad pack-int-id: %u (%u total packs)"

4269 msgstr "mauvais pack-int-id : %u (%u paquets au total)"

4270

4214 -#: midx.c:258

4271 +#: midx.c:261

4272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4273 msgstr ""

4274 "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"

4275

4219 -#: midx.c:286

4276 +#: midx.c:289

4277 msgid "error preparing packfile from multi-pack-index"

4278 msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

4279

4223 -#: midx.c:457

4280 +#: midx.c:470

4281 #, c-format

4282 msgid "failed to add packfile '%s'"

4283 msgstr "échec de l'ajout du fichier paquet '%s'"

4284

4228 -#: midx.c:463

4285 +#: midx.c:476

4286 #, c-format

4287 msgid "failed to open pack-index '%s'"

4288 msgstr "échec à l'ouverture du fichier paquet '%s'"

4289

4233 -#: midx.c:557

4290 +#: midx.c:536

4291 #, c-format

4292 msgid "failed to locate object %d in packfile"

4293 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

4294

4238 -#: midx.c:993

4295 +#: midx.c:865

4296 +#, c-format

4297 +msgid "did not see pack-file %s to drop"

4298 +msgstr "fichier paquet à éliminer %s non trouvé"

4299 +

4300 +#: midx.c:1036

4301 #, c-format

4302 msgid "failed to clear multi-pack-index at %s"

4303 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

4304

4243 -#: midx.c:1048

4305 +#: midx.c:1091

4306 msgid "Looking for referenced packfiles"

4307 msgstr "Recherche de fichiers paquets référencés"

4308

4247 -#: midx.c:1063

4309 +#: midx.c:1106

4310 #, c-format

4311 msgid ""

4312 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

@@ -4252,49 +4314,57 @@ msgstr ""

4314 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

4315 "étalement[%d]"

4316

4255 -#: midx.c:1067

4317 +#: midx.c:1110

4318 msgid "Verifying OID order in MIDX"

4319 msgstr "Vérification de l'ordre des OID dans MIDX"

4320

4259 -#: midx.c:1076

4321 +#: midx.c:1119

4322 #, c-format

4323 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4324 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

4325

4264 -#: midx.c:1095

4326 +#: midx.c:1138

4327 msgid "Sorting objects by packfile"

4328 msgstr "Classement des objets par fichier paquet"

4329

4268 -#: midx.c:1101

4330 +#: midx.c:1144

4331 msgid "Verifying object offsets"

4332 msgstr "Vérification des décalages des objets"

4333

4272 -#: midx.c:1117

4334 +#: midx.c:1160

4335 #, c-format

4336 msgid "failed to load pack entry for oid[%d] = %s"

4337 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

4338

4277 -#: midx.c:1123

4339 +#: midx.c:1166

4340 #, c-format

4341 msgid "failed to load pack-index for packfile %s"

4342 msgstr "impossible de lire le fichier paquet %s"

4343

4282 -#: midx.c:1132

4344 +#: midx.c:1175

4345 #, c-format

4346 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4347 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

4348

4287 -#: name-hash.c:531

4349 +#: midx.c:1350

4350 +msgid "could not start pack-objects"

4351 +msgstr "Impossible de démarrer le groupement d'objets"

4352 +

4353 +#: midx.c:1369

4354 +msgid "could not finish pack-objects"

4355 +msgstr "Impossible de finir le groupement d'objets"

4356 +

4357 +#: name-hash.c:532

4358 #, c-format

4359 msgid "unable to create lazy_dir thread: %s"

4360 msgstr "impossible de créer le fil lazy_dir : %s"

4361

4292 -#: name-hash.c:553

4362 +#: name-hash.c:554

4363 #, c-format

4364 msgid "unable to create lazy_name thread: %s"

4365 msgstr "impossible de créer le fil lazy_name : %s"

4366

4297 -#: name-hash.c:559

4367 +#: name-hash.c:560

4368 #, c-format

4369 msgid "unable to join lazy_name thread: %s"

4370 msgstr "impossible de joindre le fil lazy_name : %s"

@@ -4363,16 +4433,16 @@ msgstr "impossible d'analyser l'objet : %s"

4433 msgid "hash mismatch %s"

4434 msgstr "incohérence de hachage %s"

4435

4366 -#: packfile.c:617

4436 +#: packfile.c:648

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

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

4439

4370 -#: packfile.c:1868

4440 +#: packfile.c:1899

4441 #, c-format

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

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

4444

4375 -#: packfile.c:1872

4445 +#: packfile.c:1903

4446 #, c-format

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

4448 msgstr ""

@@ -4634,24 +4704,29 @@ msgstr "impossible de créer le lstat en fil : %s"

4704 msgid "unable to parse --pretty format"

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

4706

4637 -#: range-diff.c:56

4707 +#: range-diff.c:70

4708 msgid "could not start `log`"

4709 msgstr "impossible de démarrer `log`"

4710

4641 -#: range-diff.c:59

4711 +#: range-diff.c:72

4712 msgid "could not read `log` output"

4713 msgstr "impossible de lire la sortie de `log`"

4714

4645 -#: range-diff.c:74 sequencer.c:4897

4715 +#: range-diff.c:91 sequencer.c:5021

4716 #, c-format

4717 msgid "could not parse commit '%s'"

4718 msgstr "impossible d'analyser le commit '%s'"

4719

4650 -#: range-diff.c:224

4720 +#: range-diff.c:117

4721 +#, c-format

4722 +msgid "could not parse git header '%.*s'"

4723 +msgstr "impossible d'analyser l'entête git '%.*s'"

4724 +

4725 +#: range-diff.c:274

4726 msgid "failed to generate diff"

4727 msgstr "échec de la génération de diff"

4728

4654 -#: range-diff.c:455 range-diff.c:457

4729 +#: range-diff.c:506 range-diff.c:508

4730 #, c-format

4731 msgid "could not parse log for '%s'"

4732 msgstr "impossible d'analyser le journal pour '%s'"

@@ -4768,11 +4843,10 @@ msgid "unordered stage entries for '%s'"

4843 msgstr "entrées de préparation non ordonnées pour '%s'"

4844

4845 #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4771 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358

4772 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955

4773 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498

4774 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4775 -#: builtin/submodule--helper.c:330

4846 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4847 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4848 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4849 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4850 msgid "index file corrupt"

4851 msgstr "fichier d'index corrompu"

4852

@@ -4826,12 +4900,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'"

4900 msgid "broken index, expect %s in %s, got %s"

4901 msgstr "index cassé, %s attendu dans %s, %s obtenu"

4902

4829 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117

4903 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4904 #, c-format

4905 msgid "could not close '%s'"

4906 msgstr "impossible de fermer '%s'"

4907

4834 -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807

4908 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4909 #, c-format

4910 msgid "could not stat '%s'"

4911 msgstr "stat impossible de '%s'"

@@ -4912,7 +4986,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

4986 msgstr[0] "Rebasage de %s sur %s (%d commande)"

4987 msgstr[1] "Rebasage de %s sur %s (%d commandes)"

4988

4915 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173

4989 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

4990 msgid ""

4991 "\n"

4992 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -4921,7 +4995,7 @@ msgstr ""

4995 "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "

4996 "commit.\n"

4997

4924 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177

4998 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

4999 msgid ""

5000 "\n"

5001 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -4929,7 +5003,7 @@ msgstr ""

5003 "\n"

5004 "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"

5005

4932 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816

5006 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

5007 msgid ""

5008 "\n"

5009 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -4944,7 +5018,7 @@ msgstr ""

5018 " git rebase --continue\n"

5019 "\n"

5020

4947 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893

5021 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

5022 msgid ""

5023 "\n"

5024 "However, if you remove everything, the rebase will be aborted.\n"

@@ -4954,12 +5028,12 @@ msgstr ""

5028 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"

5029 "\n"

5030

4957 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900

5031 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

5032 msgid "Note that empty commits are commented out"

5033 msgstr "Veuillez noter que les commits vides sont en commentaire"

5034

4961 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339

4962 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235

5035 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

5036 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

5037 #, c-format

5038 msgid "could not write '%s'"

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

@@ -4996,97 +5070,98 @@ msgstr ""

5070 "Les comportements disponibles sont : ignore, warn, error.\n"

5071 "\n"

5072

4999 -#: refs.c:192

5073 +#: refs.c:262

5074 #, c-format

5075 msgid "%s does not point to a valid object!"

5076 msgstr "%s ne pointe pas sur un objet valide!"

5077

5004 -#: refs.c:597

5078 +#: refs.c:667

5079 #, c-format

5080 msgid "ignoring dangling symref %s"

5081 msgstr "symref pendant %s ignoré"

5082

5009 -#: refs.c:599 ref-filter.c:1982

5083 +#: refs.c:669 ref-filter.c:2092

5084 #, c-format

5085 msgid "ignoring broken ref %s"

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

5087

5014 -#: refs.c:734

5088 +#: refs.c:804

5089 #, c-format

5090 msgid "could not open '%s' for writing: %s"

5091 msgstr "impossible d'ouvrir '%s' en écriture : %s"

5092

5019 -#: refs.c:744 refs.c:795

5093 +#: refs.c:814 refs.c:865

5094 #, c-format

5095 msgid "could not read ref '%s'"

5096 msgstr "impossible de lire la réf '%s'"

5097

5024 -#: refs.c:750

5098 +#: refs.c:820

5099 #, c-format

5100 msgid "ref '%s' already exists"

5101 msgstr "la référence '%s' existe déjà"

5102

5029 -#: refs.c:755

5103 +#: refs.c:825

5104 #, c-format

5105 msgid "unexpected object ID when writing '%s'"

5106 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5107

5034 -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805

5035 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656

5108 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

5109 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

5110 #, c-format

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

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

5113

5040 -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993

5114 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

5115 +#: builtin/rebase.c:1003

5116 #, c-format

5117 msgid "could not open '%s' for writing"

5118 msgstr "impossible d'ouvrir '%s' en écriture"

5119

5045 -#: refs.c:797

5120 +#: refs.c:867

5121 #, c-format

5122 msgid "unexpected object ID when deleting '%s'"

5123 msgstr "id d'objet inattendu pendant la suppression de '%s'"

5124

5050 -#: refs.c:928

5125 +#: refs.c:998

5126 #, c-format

5127 msgid "log for ref %s has gap after %s"

5128 msgstr "le journal pour la réf %s contient un trou après %s"

5129

5055 -#: refs.c:934

5130 +#: refs.c:1004

5131 #, c-format

5132 msgid "log for ref %s unexpectedly ended on %s"

5133 msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

5134

5060 -#: refs.c:993

5135 +#: refs.c:1063

5136 #, c-format

5137 msgid "log for %s is empty"

5138 msgstr "le journal pour la réf %s est vide"

5139

5065 -#: refs.c:1085

5140 +#: refs.c:1155

5141 #, c-format

5142 msgid "refusing to update ref with bad name '%s'"

5143 msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

5144

5070 -#: refs.c:1161

5145 +#: refs.c:1231

5146 #, c-format

5147 msgid "update_ref failed for ref '%s': %s"

5148 msgstr "échec de update_ref pour la réf '%s' : %s"

5149

5075 -#: refs.c:1942

5150 +#: refs.c:2012

5151 #, c-format

5152 msgid "multiple updates for ref '%s' not allowed"

5153 msgstr "mises à jour multiples pour la réf '%s' non permises"

5154

5080 -#: refs.c:1974

5155 +#: refs.c:2044

5156 msgid "ref updates forbidden inside quarantine environment"

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

5158

5084 -#: refs.c:2070 refs.c:2100

5159 +#: refs.c:2140 refs.c:2170

5160 #, c-format

5161 msgid "'%s' exists; cannot create '%s'"

5162 msgstr "'%s' existe ; impossible de créer '%s'"

5163

5089 -#: refs.c:2076 refs.c:2111

5164 +#: refs.c:2146 refs.c:2181

5165 #, c-format

5166 msgid "cannot process '%s' and '%s' at the same time"

5167 msgstr "impossible de traiter '%s' et '%s' en même temps"

@@ -5113,268 +5188,252 @@ msgid "invalid refspec '%s'"

5188 msgstr "spécificateur de réference invalide : '%s'"

5189

5190 # à priori on parle d'une branche ici

5116 -#: ref-filter.c:39 wt-status.c:1909

5191 +#: ref-filter.c:42 wt-status.c:1934

5192 msgid "gone"

5193 msgstr "disparue"

5194

5120 -#: ref-filter.c:40

5195 +#: ref-filter.c:43

5196 #, c-format

5197 msgid "ahead %d"

5198 msgstr "en avance de %d"

5199

5125 -#: ref-filter.c:41

5200 +#: ref-filter.c:44

5201 #, c-format

5202 msgid "behind %d"

5203 msgstr "en retard de %d"

5204

5130 -#: ref-filter.c:42

5205 +#: ref-filter.c:45

5206 #, c-format

5207 msgid "ahead %d, behind %d"

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

5209

5135 -#: ref-filter.c:138

5210 +#: ref-filter.c:162

5211 #, c-format

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

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

5214

5140 -#: ref-filter.c:140

5215 +#: ref-filter.c:164

5216 #, c-format

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

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

5219

5145 -#: ref-filter.c:162

5220 +#: ref-filter.c:186

5221 #, c-format

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

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

5224

5150 -#: ref-filter.c:166

5225 +#: ref-filter.c:190

5226 #, c-format

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

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

5229

5155 -#: ref-filter.c:168

5230 +#: ref-filter.c:192

5231 #, c-format

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

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

5234

5160 -#: ref-filter.c:223

5235 +#: ref-filter.c:247

5236 #, c-format

5237 msgid "%%(objecttype) does not take arguments"

5238 msgstr "%%(objecttype) n'accepte pas d'argument"

5239

5165 -#: ref-filter.c:245

5240 +#: ref-filter.c:269

5241 #, c-format

5242 msgid "unrecognized %%(objectsize) argument: %s"

5243 msgstr "argument %%(objectsize) non reconnu : %s"

5244

5170 -#: ref-filter.c:253

5245 +#: ref-filter.c:277

5246 #, c-format

5247 msgid "%%(deltabase) does not take arguments"

5248 msgstr "%%(deltabase) n'accepte pas d'argument"

5249

5175 -#: ref-filter.c:265

5250 +#: ref-filter.c:289

5251 #, c-format

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

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

5254

5180 -#: ref-filter.c:274

5255 +#: ref-filter.c:298

5256 #, c-format

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

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

5259

5185 -#: ref-filter.c:296

5260 +#: ref-filter.c:320

5261 #, c-format

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

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

5264

5190 -#: ref-filter.c:325

5265 +#: ref-filter.c:349

5266 #, c-format

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

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

5269

5195 -#: ref-filter.c:327

5270 +#: ref-filter.c:351

5271 #, c-format

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

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

5274

5200 -#: ref-filter.c:342

5275 +#: ref-filter.c:366

5276 #, c-format

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

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

5279

5205 -#: ref-filter.c:346

5280 +#: ref-filter.c:370

5281 #, c-format

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

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

5284

5210 -#: ref-filter.c:376

5285 +#: ref-filter.c:400

5286 #, c-format

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

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

5289

5215 -#: ref-filter.c:388

5290 +#: ref-filter.c:412

5291 #, c-format

5292 msgid "unrecognized position:%s"

5293 msgstr "position non reconnue : %s"

5294

5220 -#: ref-filter.c:395

5295 +#: ref-filter.c:419

5296 #, c-format

5297 msgid "unrecognized width:%s"

5298 msgstr "largeur non reconnue : %s"

5299

5225 -#: ref-filter.c:404

5300 +#: ref-filter.c:428

5301 #, c-format

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

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

5304

5230 -#: ref-filter.c:412

5305 +#: ref-filter.c:436

5306 #, c-format

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

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

5309

5235 -#: ref-filter.c:430

5310 +#: ref-filter.c:454

5311 #, c-format

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

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

5314

5240 -#: ref-filter.c:531

5315 +#: ref-filter.c:556

5316 #, c-format

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

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

5319

5245 -#: ref-filter.c:558

5320 +#: ref-filter.c:583

5321 #, c-format

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

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

5324

5250 -#: ref-filter.c:562

5325 +#: ref-filter.c:587

5326 #, c-format

5327 msgid ""

5328 "not a git repository, but the field '%.*s' requires access to object data"

5329 msgstr ""

5330 "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"

5331

5257 -#: ref-filter.c:686

5332 +#: ref-filter.c:711

5333 #, c-format

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

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

5336

5262 -#: ref-filter.c:749

5337 +#: ref-filter.c:774

5338 #, c-format

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

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

5341

5267 -#: ref-filter.c:751

5342 +#: ref-filter.c:776

5343 #, c-format

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

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

5346

5272 -#: ref-filter.c:753

5347 +#: ref-filter.c:778

5348 #, c-format

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

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

5351

5277 -#: ref-filter.c:781

5352 +#: ref-filter.c:806

5353 #, c-format

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

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

5356

5282 -#: ref-filter.c:783

5357 +#: ref-filter.c:808

5358 #, c-format

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

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

5361

5287 -#: ref-filter.c:785

5362 +#: ref-filter.c:810

5363 #, c-format

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

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

5366

5292 -#: ref-filter.c:800

5367 +#: ref-filter.c:825

5368 #, c-format

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

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

5371

5297 -#: ref-filter.c:857

5372 +#: ref-filter.c:882

5373 #, c-format

5374 msgid "malformed format string %s"

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

5376

5302 -#: ref-filter.c:1453

5303 -#, c-format

5304 -msgid "(no branch, rebasing %s)"

5305 -msgstr "(aucune branche, rebasage de %s)"

5306 -

5307 -#: ref-filter.c:1456

5308 -#, c-format

5309 -msgid "(no branch, rebasing detached HEAD %s)"

5310 -msgstr "(aucune branche, rebasage de la HEAD détachée %s)"

5311 -

5312 -#: ref-filter.c:1459

5377 +#: ref-filter.c:1485

5378 #, c-format

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

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

5379 +msgid "no branch, rebasing %s"

5380 +msgstr "aucune branche, rebasage de %s"

5381

5317 -#. TRANSLATORS: make sure this matches "HEAD

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

5319 -#.

5320 -#: ref-filter.c:1467

5382 +#: ref-filter.c:1488

5383 #, c-format

5322 -msgid "(HEAD detached at %s)"

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

5384 +msgid "no branch, rebasing detached HEAD %s"

5385 +msgstr "aucune branche, rebasage de la HEAD détachée %s"

5386

5325 -#. TRANSLATORS: make sure this matches "HEAD

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

5327 -#.

5328 -#: ref-filter.c:1474

5387 +#: ref-filter.c:1491

5388 #, c-format

5330 -msgid "(HEAD detached from %s)"

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

5389 +msgid "no branch, bisect started on %s"

5390 +msgstr "aucune branche, bisect a démarré sur %s"

5391

5333 -#: ref-filter.c:1478

5334 -msgid "(no branch)"

5335 -msgstr "(aucune branche)"

5392 +#: ref-filter.c:1501

5393 +msgid "no branch"

5394 +msgstr "aucune branche"

5395

5337 -#: ref-filter.c:1512 ref-filter.c:1669

5396 +#: ref-filter.c:1537 ref-filter.c:1743

5397 #, c-format

5398 msgid "missing object %s for %s"

5399 msgstr "objet manquant %s pour %s"

5400

5342 -#: ref-filter.c:1522

5401 +#: ref-filter.c:1547

5402 #, c-format

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

5404 msgstr "échec de parse_object_buffer sur %s pour %s"

5405

5347 -#: ref-filter.c:1888

5406 +#: ref-filter.c:1998

5407 #, c-format

5408 msgid "malformed object at '%s'"

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

5410

5352 -#: ref-filter.c:1977

5411 +#: ref-filter.c:2087

5412 #, c-format

5413 msgid "ignoring ref with broken name %s"

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

5415

5357 -#: ref-filter.c:2263

5416 +#: ref-filter.c:2382

5417 #, c-format

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

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

5420

5362 -#: ref-filter.c:2363

5421 +#: ref-filter.c:2482

5422 #, c-format

5423 msgid "option `%s' is incompatible with --merged"

5424 msgstr "l'option « %s » est incompatible avec --merged"

5425

5367 -#: ref-filter.c:2366

5426 +#: ref-filter.c:2485

5427 #, c-format

5428 msgid "option `%s' is incompatible with --no-merged"

5429 msgstr "l'option « %s » est incompatible avec --no-merged"

5430

5372 -#: ref-filter.c:2376

5431 +#: ref-filter.c:2495

5432 #, c-format

5433 msgid "malformed object name %s"

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

5435

5377 -#: ref-filter.c:2381

5436 +#: ref-filter.c:2500

5437 #, c-format

5438 msgid "option `%s' must point to a commit"

5439 msgstr "l'option '%s' doit pointer sur un commit"

@@ -5728,8 +5787,8 @@ msgstr "impossible de délier '%s' qui est errant"

5787 msgid "Recorded preimage for '%s'"

5788 msgstr "Pré-image enregistrée pour '%s'"

5789

5731 -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750

5732 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427

5790 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5791 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5792 #, c-format

5793 msgid "could not create directory '%s'"

5794 msgstr "impossible de créer le répertoire '%s'"

@@ -5763,20 +5822,20 @@ msgstr "Résolution pour '%s' oubliée\n"

5822 msgid "unable to open rr-cache directory"

5823 msgstr "impossible d'ouvrir le répertoire rr-cache"

5824

5766 -#: revision.c:2476

5825 +#: revision.c:2507

5826 msgid "your current branch appears to be broken"

5827 msgstr "votre branche actuelle semble cassée"

5828

5770 -#: revision.c:2479

5829 +#: revision.c:2510

5830 #, c-format

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

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

5833

5775 -#: revision.c:2679

5834 +#: revision.c:2710

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

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

5837

5779 -#: revision.c:2683

5838 +#: revision.c:2714

5839 msgid "-L does not yet support diff formats besides -p and -s"

5840 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

5841

@@ -5849,24 +5908,29 @@ msgstr "mode de nettoyage invalide de message de validation '%s'"

5908 msgid "could not delete '%s'"

5909 msgstr "Impossible de supprimer '%s'"

5910

5852 -#: sequencer.c:318

5911 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5912 +#, c-format

5913 +msgid "could not remove '%s'"

5914 +msgstr "impossible de supprimer '%s'"

5915 +

5916 +#: sequencer.c:321

5917 msgid "revert"

5918 msgstr "revert"

5919

5856 -#: sequencer.c:320

5920 +#: sequencer.c:323

5921 msgid "cherry-pick"

5922 msgstr "cherry-pick"

5923

5860 -#: sequencer.c:322

5924 +#: sequencer.c:325

5925 msgid "rebase -i"

5926 msgstr "rebase -i"

5927

5864 -#: sequencer.c:324

5928 +#: sequencer.c:327

5929 #, c-format

5930 msgid "unknown action: %d"

5931 msgstr "action inconnue : %d"

5932

5869 -#: sequencer.c:382

5933 +#: sequencer.c:385

5934 msgid ""

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

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

@@ -5874,7 +5938,7 @@ msgstr ""

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

5939 "avec 'git add <chemins>' ou 'git rm <chemins>'"

5940

5877 -#: sequencer.c:385

5941 +#: sequencer.c:388

5942 msgid ""

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

5944 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5884,44 +5948,44 @@ msgstr ""

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

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

5950

5887 -#: sequencer.c:398 sequencer.c:2801

5951 +#: sequencer.c:401 sequencer.c:2909

5952 #, c-format

5953 msgid "could not lock '%s'"

5954 msgstr "impossible de verrouiller '%s'"

5955

5892 -#: sequencer.c:405

5956 +#: sequencer.c:408

5957 #, c-format

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

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

5960

5897 -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821

5898 -#: sequencer.c:3084

5961 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5962 +#: sequencer.c:3192

5963 #, c-format

5964 msgid "failed to finalize '%s'"

5965 msgstr "échec lors de la finalisation de '%s'"

5966

5903 -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704

5904 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760

5905 -#: builtin/merge.c:1115 builtin/rebase.c:567

5967 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5968 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5969 +#: builtin/merge.c:1112 builtin/rebase.c:567

5970 #, c-format

5971 msgid "could not read '%s'"

5972 msgstr "impossible de lire '%s'"

5973

5910 -#: sequencer.c:459

5974 +#: sequencer.c:462

5975 #, c-format

5976 msgid "your local changes would be overwritten by %s."

5977 msgstr "vos modifications locales seraient écrasées par %s."

5978

5915 -#: sequencer.c:463

5979 +#: sequencer.c:466

5980 msgid "commit your changes or stash them to proceed."

5981 msgstr "validez vos modifications ou les remiser pour continuer."

5982

5919 -#: sequencer.c:495

5983 +#: sequencer.c:498

5984 #, c-format

5985 msgid "%s: fast-forward"

5986 msgstr "%s : avance rapide"

5987

5924 -#: sequencer.c:534 builtin/tag.c:555

5988 +#: sequencer.c:537 builtin/tag.c:565

5989 #, c-format

5990 msgid "Invalid cleanup mode %s"

5991 msgstr "Mode de nettoyage invalide %s"

@@ -5929,70 +5993,70 @@ msgstr "Mode de nettoyage invalide %s"

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

5994 #. "rebase -i".

5995 #.

5932 -#: sequencer.c:629

5996 +#: sequencer.c:632

5997 #, c-format

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

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

6000

5937 -#: sequencer.c:646

6001 +#: sequencer.c:649

6002 msgid "unable to update cache tree"

6003 msgstr "impossible de mettre à jour l'arbre de cache"

6004

5941 -#: sequencer.c:660

6005 +#: sequencer.c:663

6006 msgid "could not resolve HEAD commit"

6007 msgstr "impossible de résoudre le commit HEAD"

6008

5945 -#: sequencer.c:740

6009 +#: sequencer.c:743

6010 #, c-format

6011 msgid "no key present in '%.*s'"

6012 msgstr "aucune clé présente dans '%.*s'"

6013

5950 -#: sequencer.c:751

6014 +#: sequencer.c:754

6015 #, c-format

6016 msgid "unable to dequote value of '%s'"

6017 msgstr "Impossible de décoter la valeur de '%s'"

6018

5955 -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5956 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035

6019 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

6020 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

6021 #, c-format

6022 msgid "could not open '%s' for reading"

6023 msgstr "impossible d'ouvrir '%s' en lecture"

6024

5961 -#: sequencer.c:798

6025 +#: sequencer.c:801

6026 msgid "'GIT_AUTHOR_NAME' already given"

6027 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

6028

5965 -#: sequencer.c:803

6029 +#: sequencer.c:806

6030 msgid "'GIT_AUTHOR_EMAIL' already given"

6031 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

6032

5969 -#: sequencer.c:808

6033 +#: sequencer.c:811

6034 msgid "'GIT_AUTHOR_DATE' already given"

6035 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

6036

5973 -#: sequencer.c:812

6037 +#: sequencer.c:815

6038 #, c-format

6039 msgid "unknown variable '%s'"

6040 msgstr "variable inconnue '%s'"

6041

5978 -#: sequencer.c:817

6042 +#: sequencer.c:820

6043 msgid "missing 'GIT_AUTHOR_NAME'"

6044 msgstr "'GIT_AUTHOR_NAME' manquant"

6045

5982 -#: sequencer.c:819

6046 +#: sequencer.c:822

6047 msgid "missing 'GIT_AUTHOR_EMAIL'"

6048 msgstr "'GIT_AUTHOR_EMAIL' manquant"

6049

5986 -#: sequencer.c:821

6050 +#: sequencer.c:824

6051 msgid "missing 'GIT_AUTHOR_DATE'"

6052 msgstr "'GIT_AUTHOR_DATE' manquant"

6053

5990 -#: sequencer.c:881

6054 +#: sequencer.c:884

6055 #, c-format

6056 msgid "invalid date format '%s' in '%s'"

6057 msgstr "format de date invalide '%s' dans '%s'"

6058

5995 -#: sequencer.c:898

6059 +#: sequencer.c:901

6060 #, c-format

6061 msgid ""

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

@@ -6021,15 +6085,15 @@ msgstr ""

6085 "\n"

6086 " git rebase --continue\n"

6087

6024 -#: sequencer.c:992

6088 +#: sequencer.c:995

6089 msgid "writing root commit"

6090 msgstr "écriture du commit racine"

6091

6028 -#: sequencer.c:1213

6092 +#: sequencer.c:1216

6093 msgid "'prepare-commit-msg' hook failed"

6094 msgstr "échec du crochet 'prepare-commit-msg'"

6095

6032 -#: sequencer.c:1220

6096 +#: sequencer.c:1223

6097 msgid ""

6098 "Your name and email address were configured automatically based\n"

6099 "on your username and hostname. Please check that they are accurate.\n"

@@ -6058,7 +6122,7 @@ msgstr ""

6122 "\n"

6123 " git commit --amend --reset-author\n"

6124

6061 -#: sequencer.c:1233

6125 +#: sequencer.c:1236

6126 msgid ""

6127 "Your name and email address were configured automatically based\n"

6128 "on your username and hostname. Please check that they are accurate.\n"

@@ -6084,306 +6148,349 @@ msgstr ""

6148 "\n"

6149 " git commit --amend --reset-author\n"

6150

6087 -#: sequencer.c:1275

6151 +#: sequencer.c:1278

6152 msgid "couldn't look up newly created commit"

6153 msgstr "impossible de retrouver le commit nouvellement créé"

6154

6091 -#: sequencer.c:1277

6155 +#: sequencer.c:1280

6156 msgid "could not parse newly created commit"

6157 msgstr "impossible d'analyser le commit nouvellement créé"

6158

6095 -#: sequencer.c:1323

6159 +#: sequencer.c:1326

6160 msgid "unable to resolve HEAD after creating commit"

6161 msgstr "impossible de résoudre HEAD après création du commit"

6162

6099 -#: sequencer.c:1325

6163 +#: sequencer.c:1328

6164 msgid "detached HEAD"

6165 msgstr "HEAD détachée"

6166

6103 -#: sequencer.c:1329

6167 +#: sequencer.c:1332

6168 msgid " (root-commit)"

6169 msgstr " (commit racine)"

6170

6107 -#: sequencer.c:1350

6171 +#: sequencer.c:1353

6172 msgid "could not parse HEAD"

6173 msgstr "impossible de lire HEAD"

6174

6111 -#: sequencer.c:1352

6175 +#: sequencer.c:1355

6176 #, c-format

6177 msgid "HEAD %s is not a commit!"

6178 msgstr "HEAD %s n'est pas un commit !"

6179

6116 -#: sequencer.c:1356 builtin/commit.c:1551

6180 +#: sequencer.c:1359 builtin/commit.c:1571

6181 msgid "could not parse HEAD commit"

6182 msgstr "impossible d'analyser le commit HEAD"

6183

6120 -#: sequencer.c:1408 sequencer.c:2001

6184 +#: sequencer.c:1411 sequencer.c:2004

6185 msgid "unable to parse commit author"

6186 msgstr "impossible d'analyser l'auteur du commit"

6187

6124 -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688

6188 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6189 msgid "git write-tree failed to write a tree"

6190 msgstr "git write-tree a échoué à écrire un arbre"

6191

6128 -#: sequencer.c:1435 sequencer.c:1496

6192 +#: sequencer.c:1438 sequencer.c:1499

6193 #, c-format

6194 msgid "unable to read commit message from '%s'"

6195 msgstr "impossible de lire le message de validation de '%s'"

6196

6133 -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882

6134 -#: builtin/merge.c:906

6197 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6198 +#: builtin/merge.c:903

6199 msgid "failed to write commit object"

6200 msgstr "échec de l'écriture de l'objet commit"

6201

6138 -#: sequencer.c:1523

6202 +#: sequencer.c:1526

6203 #, c-format

6204 msgid "could not parse commit %s"

6205 msgstr "impossible d'analyser le commit %s"

6206

6143 -#: sequencer.c:1528

6207 +#: sequencer.c:1531

6208 #, c-format

6209 msgid "could not parse parent commit %s"

6210 msgstr "impossible d'analyser le commit parent %s"

6211

6148 -#: sequencer.c:1602 sequencer.c:1712

6212 +#: sequencer.c:1605 sequencer.c:1715

6213 #, c-format

6214 msgid "unknown command: %d"

6215 msgstr "commande inconnue : %d"

6216

6153 -#: sequencer.c:1659 sequencer.c:1684

6217 +#: sequencer.c:1662 sequencer.c:1687

6218 #, c-format

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

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

6221

6158 -#: sequencer.c:1669

6222 +#: sequencer.c:1672

6223 msgid "need a HEAD to fixup"

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

6225

6162 -#: sequencer.c:1671 sequencer.c:3111

6226 +#: sequencer.c:1674 sequencer.c:3219

6227 msgid "could not read HEAD"

6228 msgstr "Impossible de lire HEAD"

6229

6166 -#: sequencer.c:1673

6230 +#: sequencer.c:1676

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

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

6233

6170 -#: sequencer.c:1679

6234 +#: sequencer.c:1682

6235 #, c-format

6236 msgid "cannot write '%s'"

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

6238

6175 -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441

6239 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

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

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

6242

6179 -#: sequencer.c:1694

6243 +#: sequencer.c:1697

6244 #, c-format

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

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

6247

6184 -#: sequencer.c:1701

6248 +#: sequencer.c:1704

6249 #, c-format

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

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

6252

6189 -#: sequencer.c:1707

6253 +#: sequencer.c:1710

6254 #, c-format

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

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

6257

6194 -#: sequencer.c:1795

6258 +#: sequencer.c:1798

6259 msgid "your index file is unmerged."

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

6261

6198 -#: sequencer.c:1802

6262 +#: sequencer.c:1805

6263 msgid "cannot fixup root commit"

6264 msgstr "impossible de réparer le commit racine"

6265

6202 -#: sequencer.c:1821

6266 +#: sequencer.c:1824

6267 #, c-format

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

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

6270

6207 -#: sequencer.c:1829 sequencer.c:1837

6271 +#: sequencer.c:1832 sequencer.c:1840

6272 #, c-format

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

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

6275

6212 -#: sequencer.c:1843

6276 +#: sequencer.c:1846

6277 #, c-format

6278 msgid "cannot get commit message for %s"

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

6280

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

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

6219 -#: sequencer.c:1862

6283 +#: sequencer.c:1865

6284 #, c-format

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

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

6287

6224 -#: sequencer.c:1927

6288 +#: sequencer.c:1930

6289 #, c-format

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

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

6292

6229 -#: sequencer.c:1982

6293 +#: sequencer.c:1985

6294 #, c-format

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

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

6297

6234 -#: sequencer.c:1983

6298 +#: sequencer.c:1986

6299 #, c-format

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

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

6302

6239 -#: sequencer.c:2042

6303 +#: sequencer.c:2045

6304 #, c-format

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

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

6307

6244 -#: sequencer.c:2049

6308 +#: sequencer.c:2052

6309 #, c-format

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

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

6312

6249 -#: sequencer.c:2118

6313 +#: sequencer.c:2128

6314 #, c-format

6315 msgid "%s does not accept arguments: '%s'"

6316 msgstr "%s n'accepte pas d'argument : '%s'"

6317

6254 -#: sequencer.c:2127

6318 +#: sequencer.c:2137

6319 #, c-format

6320 msgid "missing arguments for %s"

6321 msgstr "argument manquant pour %s"

6322

6259 -#: sequencer.c:2164

6323 +#: sequencer.c:2174

6324 #, c-format

6325 msgid "could not parse '%.*s'"

6326 msgstr "impossible d'analyser '%.*s'"

6327

6264 -#: sequencer.c:2226

6328 +#: sequencer.c:2228

6329 #, c-format

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

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

6332

6269 -#: sequencer.c:2237

6333 +#: sequencer.c:2239

6334 #, c-format

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

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

6337

6274 -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178

6338 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6339 #: builtin/rebase.c:204 builtin/rebase.c:229

6340 #, c-format

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

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

6343

6280 -#: sequencer.c:2360

6344 +#: sequencer.c:2323

6345 +msgid "cancelling a cherry picking in progress"

6346 +msgstr "annulation d'un picorage en cours"

6347 +

6348 +#: sequencer.c:2330

6349 +msgid "cancelling a revert in progress"

6350 +msgstr "annulation d'un retour en cours"

6351 +

6352 +#: sequencer.c:2364

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

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

6355

6284 -#: sequencer.c:2362

6356 +#: sequencer.c:2366

6357 #, c-format

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

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

6360

6289 -#: sequencer.c:2367

6361 +#: sequencer.c:2371

6362 msgid "no commits parsed."

6363 msgstr "aucun commit analysé."

6364

6293 -#: sequencer.c:2378

6365 +#: sequencer.c:2382

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

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

6368

6297 -#: sequencer.c:2380

6369 +#: sequencer.c:2384

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

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

6372

6301 -#: sequencer.c:2462

6373 +#: sequencer.c:2466

6374 #, c-format

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

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

6377

6306 -#: sequencer.c:2549

6378 +#: sequencer.c:2553

6379 msgid "unusable squash-onto"

6380 msgstr "\"écrase-sur\" inutilisable"

6381

6310 -#: sequencer.c:2565

6382 +#: sequencer.c:2569

6383 #, c-format

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

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

6386

6315 -#: sequencer.c:2648 sequencer.c:4227

6387 +#: sequencer.c:2652 sequencer.c:4351

6388 msgid "empty commit set passed"

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

6390

6319 -#: sequencer.c:2656

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

6321 -msgstr "un picorage ou un retour est déjà en cours"

6391 +#: sequencer.c:2668

6392 +msgid "revert is already in progress"

6393 +msgstr "un retour est déjà en cours"

6394 +

6395 +#: sequencer.c:2670

6396 +#, c-format

6397 +msgid "try \"git revert (--continue | %s--abort | --quit)\""

6398 +msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""

6399 +

6400 +#: sequencer.c:2673

6401 +msgid "cherry-pick is already in progress"

6402 +msgstr "un picorage est déjà en cours"

6403

6323 -#: sequencer.c:2657

6324 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

6325 -msgstr "essayez \"git cherry-pick (--continue | --quit | --abort)\""

6404 +#: sequencer.c:2675

6405 +#, c-format

6406 +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6407 +msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""

6408

6327 -#: sequencer.c:2660

6409 +#: sequencer.c:2689

6410 #, c-format

6411 msgid "could not create sequencer directory '%s'"

6412 msgstr "impossible de créer le répertoire de séquenceur '%s'"

6413

6332 -#: sequencer.c:2674

6414 +#: sequencer.c:2704

6415 msgid "could not lock HEAD"

6416 msgstr "impossible de verrouiller HEAD"

6417

6336 -#: sequencer.c:2729 sequencer.c:3979

6418 +#: sequencer.c:2764 sequencer.c:4103

6419 msgid "no cherry-pick or revert in progress"

6420 msgstr "aucun picorage ou retour en cours"

6421

6340 -#: sequencer.c:2731

6422 +#: sequencer.c:2766 sequencer.c:2777

6423 msgid "cannot resolve HEAD"

6424 msgstr "impossible de résoudre HEAD"

6425

6344 -#: sequencer.c:2733 sequencer.c:2768

6426 +#: sequencer.c:2768 sequencer.c:2812

6427 msgid "cannot abort from a branch yet to be born"

6428 msgstr "impossible d'abandonner depuis une branche non encore créée"

6429

6348 -#: sequencer.c:2754 builtin/grep.c:732

6430 +#: sequencer.c:2798 builtin/grep.c:734

6431 #, c-format

6432 msgid "cannot open '%s'"

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

6434

6353 -#: sequencer.c:2756

6435 +#: sequencer.c:2800

6436 #, c-format

6437 msgid "cannot read '%s': %s"

6438 msgstr "impossible de lire '%s' : %s"

6439

6358 -#: sequencer.c:2757

6440 +#: sequencer.c:2801

6441 msgid "unexpected end of file"

6442 msgstr "fin de fichier inattendue"

6443

6362 -#: sequencer.c:2763

6444 +#: sequencer.c:2807

6445 #, c-format

6446 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6447 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

6448

6367 -#: sequencer.c:2774

6449 +#: sequencer.c:2818

6450 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6451 msgstr ""

6452 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

6453

6372 -#: sequencer.c:2903 sequencer.c:3894

6454 +#: sequencer.c:2859

6455 +msgid "no revert in progress"

6456 +msgstr "Pas de retour en cours ?"

6457 +

6458 +#: sequencer.c:2867

6459 +msgid "no cherry-pick in progress"

6460 +msgstr "aucun picorage en cours"

6461 +

6462 +#: sequencer.c:2877

6463 +msgid "failed to skip the commit"

6464 +msgstr "échec du saut de commit"

6465 +

6466 +#: sequencer.c:2884

6467 +msgid "there is nothing to skip"

6468 +msgstr "il n'y a rien à sauter"

6469 +

6470 +#: sequencer.c:2887

6471 +#, c-format

6472 +msgid ""

6473 +"have you committed already?\n"

6474 +"try \"git %s --continue\""

6475 +msgstr ""

6476 +"Avez-vous déjà validé ?\n"

6477 +"essayez \"git %s -continue\""

6478 +

6479 +#: sequencer.c:3011 sequencer.c:4015

6480 #, c-format

6481 msgid "could not update %s"

6482 msgstr "impossible de mettre à jour %s"

6483

6377 -#: sequencer.c:2941 sequencer.c:3874

6484 +#: sequencer.c:3049 sequencer.c:3995

6485 msgid "cannot read HEAD"

6486 msgstr "impossible de lire HEAD"

6487

6381 -#: sequencer.c:2958

6488 +#: sequencer.c:3066

6489 #, c-format

6490 msgid "unable to copy '%s' to '%s'"

6491 msgstr "impossible de copier '%s' vers '%s'"

6492

6386 -#: sequencer.c:2966

6493 +#: sequencer.c:3074

6494 #, c-format

6495 msgid ""

6496 "You can amend the commit now, with\n"

@@ -6402,27 +6509,27 @@ msgstr ""

6509 "\n"

6510 " git rebase --continue\n"

6511

6405 -#: sequencer.c:2976

6512 +#: sequencer.c:3084

6513 #, c-format

6514 msgid "Could not apply %s... %.*s"

6515 msgstr "impossible d'appliquer %s... %.*s"

6516

6410 -#: sequencer.c:2983

6517 +#: sequencer.c:3091

6518 #, c-format

6519 msgid "Could not merge %.*s"

6520 msgstr "Impossible de fusionner %.*s"

6521

6415 -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633

6522 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633

6523 #, c-format

6524 msgid "could not copy '%s' to '%s'"

6525 msgstr "impossible de copier '%s' vers '%s'"

6526

6420 -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580

6421 -#: builtin/rebase.c:1940 builtin/rebase.c:1995

6527 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582

6528 +#: builtin/rebase.c:1953 builtin/rebase.c:2008

6529 msgid "could not read index"

6530 msgstr "impossible de lire l'index"

6531

6425 -#: sequencer.c:3028

6532 +#: sequencer.c:3136

6533 #, c-format

6534 msgid ""

6535 "execution failed: %s\n"

@@ -6437,11 +6544,11 @@ msgstr ""

6544 "git rebase --continue\n"

6545 "\n"

6546

6440 -#: sequencer.c:3034

6547 +#: sequencer.c:3142

6548 msgid "and made changes to the index and/or the working tree\n"

6549 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

6550

6444 -#: sequencer.c:3040

6551 +#: sequencer.c:3148

6552 #, c-format

6553 msgid ""

6554 "execution succeeded: %s\n"

@@ -6458,77 +6565,77 @@ msgstr ""

6565 " git rebase --continue\n"

6566 "\n"

6567

6461 -#: sequencer.c:3101

6568 +#: sequencer.c:3209

6569 #, c-format

6570 msgid "illegal label name: '%.*s'"

6571 msgstr "nom de label illégal '%.*s'"

6572

6466 -#: sequencer.c:3155

6573 +#: sequencer.c:3263

6574 msgid "writing fake root commit"

6575 msgstr "écriture d'un commit racine bidon"

6576

6470 -#: sequencer.c:3160

6577 +#: sequencer.c:3268

6578 msgid "writing squash-onto"

6579 msgstr "écriture de 'écraser-sur'"

6580

6474 -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850

6581 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860

6582 #, c-format

6583 msgid "failed to find tree of %s"

6584 msgstr "impossible de trouver l'arbre de %s"

6585

6479 -#: sequencer.c:3216 builtin/rebase.c:863

6586 +#: sequencer.c:3324 builtin/rebase.c:873

6587 msgid "could not write index"

6588 msgstr "impossible d'écrire l'index"

6589

6483 -#: sequencer.c:3243

6590 +#: sequencer.c:3351

6591 #, c-format

6592 msgid "could not resolve '%s'"

6593 msgstr "impossible de résoudre '%s'"

l10n: fr v2.23.0 round 2