4c5081614c · 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-10-28 13:19+0800\n"

79 -"PO-Revision-Date: 2019-10-28 20:35+0100\n"

78 +"POT-Creation-Date: 2019-12-30 08:48+0800\n"

79 +"PO-Revision-Date: 2019-12-31 17:37+0100\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"

@@ -86,37 +86,464 @@ msgstr ""

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

87 "X-Generator: Poedit 2.2.3\n"

88

89 -#: advice.c:109

89 +#: add-interactive.c:347

90 +#, c-format

91 +msgid "Huh (%s)?"

92 +msgstr "Hein (%s) ?"

93 +

94 +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216

95 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643

96 +#: builtin/rebase.c:2019 builtin/rebase.c:2063

97 +msgid "could not read index"

98 +msgstr "impossible de lire l'index"

99 +

100 +#: add-interactive.c:555 git-add--interactive.perl:269

101 +#: git-add--interactive.perl:294

102 +msgid "binary"

103 +msgstr "binaire"

104 +

105 +#: add-interactive.c:613 git-add--interactive.perl:278

106 +#: git-add--interactive.perl:332

107 +msgid "nothing"

108 +msgstr "rien"

109 +

110 +#: add-interactive.c:614 git-add--interactive.perl:314

111 +#: git-add--interactive.perl:329

112 +msgid "unchanged"

113 +msgstr "inchangé"

114 +

115 +#: add-interactive.c:651 git-add--interactive.perl:643

116 +msgid "Update"

117 +msgstr "Mise à jour"

118 +

119 +#: add-interactive.c:668 add-interactive.c:856

120 +#, c-format

121 +msgid "could not stage '%s'"

122 +msgstr "impossible d'indexer '%s'"

123 +

124 +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409

125 +#: builtin/rebase.c:895

126 +msgid "could not write index"

127 +msgstr "impossible d'écrire l'index"

128 +

129 +#: add-interactive.c:677 git-add--interactive.perl:628

130 +#, c-format, perl-format

131 +msgid "updated %d path\n"

132 +msgid_plural "updated %d paths\n"

133 +msgstr[0] "%d chemin mis à jour\n"

134 +msgstr[1] "%d chemins mis à jour\n"

135 +

136 +#: add-interactive.c:695 git-add--interactive.perl:678

137 +#, c-format, perl-format

138 +msgid "note: %s is untracked now.\n"

139 +msgstr "note : %s n'est plus suivi à présent.\n"

140 +

141 +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281

142 +#: builtin/reset.c:144

143 +#, c-format

144 +msgid "make_cache_entry failed for path '%s'"

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

146 +

147 +#: add-interactive.c:730 git-add--interactive.perl:655

148 +msgid "Revert"

149 +msgstr "Inverser"

150 +

151 +#: add-interactive.c:746

152 +msgid "Could not parse HEAD^{tree}"

153 +msgstr "impossible d'analyser HEAD^{tree}"

154 +

155 +#: add-interactive.c:784 git-add--interactive.perl:631

156 +#, c-format, perl-format

157 +msgid "reverted %d path\n"

158 +msgid_plural "reverted %d paths\n"

159 +msgstr[0] "%d chemin inversé\n"

160 +msgstr[1] "%d chemins inversés\n"

161 +

162 +#: add-interactive.c:835 git-add--interactive.perl:695

163 +#, c-format

164 +msgid "No untracked files.\n"

165 +msgstr "Aucun Fichier non suivi.\n"

166 +

167 +#: add-interactive.c:839 git-add--interactive.perl:689

168 +msgid "Add untracked"

169 +msgstr "Ajouter un fichier non-suivi"

170 +

171 +#: add-interactive.c:866 git-add--interactive.perl:625

172 +#, c-format, perl-format

173 +msgid "added %d path\n"

174 +msgid_plural "added %d paths\n"

175 +msgstr[0] "%d chemin ajouté\n"

176 +msgstr[1] "%d chemins ajoutés\n"

177 +

178 +#: add-interactive.c:896

179 +#, c-format

180 +msgid "ignoring unmerged: %s"

181 +msgstr "fichier non-fusionné ignoré : %s"

182 +

183 +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366

184 +#, c-format

185 +msgid "Only binary files changed.\n"

186 +msgstr "Seuls des fichiers binaires ont changé.\n"

187 +

188 +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368

189 +#, c-format

190 +msgid "No changes.\n"

191 +msgstr "Aucune modification.\n"

192 +

193 +#: add-interactive.c:914 git-add--interactive.perl:1376

194 +msgid "Patch update"

195 +msgstr "Mise à jour par patch"

196 +

197 +#: add-interactive.c:953 git-add--interactive.perl:1754

198 +msgid "Review diff"

199 +msgstr "Réviser la différence"

200 +

201 +#: add-interactive.c:981

202 +msgid "show paths with changes"

203 +msgstr "afficher les chemins comprenant des modifications"

204 +

205 +#: add-interactive.c:983

206 +msgid "add working tree state to the staged set of changes"

207 +msgstr "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"

208 +

209 +#: add-interactive.c:985

210 +msgid "revert staged set of changes back to the HEAD version"

211 +msgstr "retourner l'ensemble de modifications indexées à la version HEAD"

212 +

213 +#: add-interactive.c:987

214 +msgid "pick hunks and update selectively"

215 +msgstr "sélection et mise à jour individuelle des sections"

216 +

217 +#: add-interactive.c:989

218 +msgid "view diff between HEAD and index"

219 +msgstr "visualiser les diffs entre HEAD et l'index"

220 +

221 +#: add-interactive.c:991

222 +msgid "add contents of untracked files to the staged set of changes"

223 +msgstr "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications indexées"

224 +

225 +#: add-interactive.c:999 add-interactive.c:1048

226 +msgid "Prompt help:"

227 +msgstr "Aide :"

228 +

229 +#: add-interactive.c:1001

230 +msgid "select a single item"

231 +msgstr "sélectionner un seul élément"

232 +

233 +#: add-interactive.c:1003

234 +msgid "select a range of items"

235 +msgstr "sélectionner une plage d'éléments"

236 +

237 +#: add-interactive.c:1005

238 +msgid "select multiple ranges"

239 +msgstr "sélectionner plusieurs plages"

240 +

241 +#: add-interactive.c:1007 add-interactive.c:1052

242 +msgid "select item based on unique prefix"

243 +msgstr "sélectionner un élément basé sur une préfixe unique"

244 +

245 +#: add-interactive.c:1009

246 +msgid "unselect specified items"

247 +msgstr "désélectionner les éléments spécifiés"

248 +

249 +#: add-interactive.c:1011

250 +msgid "choose all items"

251 +msgstr "choisir tous les éléments"

252 +

253 +#: add-interactive.c:1013

254 +msgid "(empty) finish selecting"

255 +msgstr "(vide) arrêter de sélectionner"

256 +

257 +#: add-interactive.c:1050

258 +msgid "select a numbered item"

259 +msgstr "sélectionner un élément par son numéro"

260 +

261 +#: add-interactive.c:1054

262 +msgid "(empty) select nothing"

263 +msgstr "(vide) ne rien sélectionner"

264 +

265 +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851

266 +msgid "*** Commands ***"

267 +msgstr "*** Commandes ***"

268 +

269 +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848

270 +msgid "What now"

271 +msgstr "Et maintenant ?"

272 +

273 +#: add-interactive.c:1115 git-add--interactive.perl:213

274 +msgid "staged"

275 +msgstr "indexé"

276 +

277 +#: add-interactive.c:1115 git-add--interactive.perl:213

278 +msgid "unstaged"

279 +msgstr "non-indexé"

280 +

281 +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197

282 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

283 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409

284 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

285 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

286 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213

287 +msgid "path"

288 +msgstr "chemin"

289 +

290 +#: add-interactive.c:1122

291 +msgid "could not refresh index"

292 +msgstr "impossible de rafraîchir l'index"

293 +

294 +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765

295 +#, c-format

296 +msgid "Bye.\n"

297 +msgstr "Au revoir.\n"

298 +

299 +#: add-patch.c:15

300 +#, c-format

301 +msgid "Stage mode change [y,n,a,q,d%s,?]? "

302 +msgstr "Indexer le changement de mode [y,n,a,q,d%s,?] ? "

303 +

304 +#: add-patch.c:16

305 +#, c-format

306 +msgid "Stage deletion [y,n,a,q,d%s,?]? "

307 +msgstr "Indexer la suppression [y,n,a,q,d%s,?] ? "

308 +

309 +#: add-patch.c:17

310 +#, c-format

311 +msgid "Stage this hunk [y,n,a,q,d%s,?]? "

312 +msgstr "Indexer cette section [y,n,a,q,d%s,?] ? "

313 +

314 +#: add-patch.c:111

315 +#, c-format

316 +msgid "could not parse hunk header '%.*s'"

317 +msgstr "impossible d'analyser l'entête de section '%.*s'"

318 +

319 +#: add-patch.c:130 add-patch.c:134

320 +#, c-format

321 +msgid "could not parse colored hunk header '%.*s'"

322 +msgstr "impossible d'analyser l'entête coloré de section '%.*s'"

323 +

324 +#: add-patch.c:176

325 +msgid "could not parse diff"

326 +msgstr "impossible d'analyser la diff"

327 +

328 +#: add-patch.c:194

329 +msgid "could not parse colored diff"

330 +msgstr "impossible d'analyser la diff colorée"

331 +

332 +#: add-patch.c:508

333 +#, c-format

334 +msgid ""

335 +"expected context line #%d in\n"

336 +"%.*s"

337 +msgstr ""

338 +"ligne de contexte attendue #%d dans\n"

339 +"%.*s"

340 +

341 +#: add-patch.c:523

342 +#, c-format

343 +msgid ""

344 +"hunks do not overlap:\n"

345 +"%.*s\n"

346 +"\tdoes not end with:\n"

347 +"%.*s"

348 +msgstr ""

349 +"les sections ne se recouvrent pas :\n"

350 +"%.*s\n"

351 +"\tne se termine pas par :\n"

352 +"%.*s"

353 +

354 +#: add-patch.c:799 git-add--interactive.perl:1112

355 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

356 +msgstr ""

357 +"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"

358 +

359 +#: add-patch.c:803

360 +#, c-format

361 +msgid ""

362 +"---\n"

363 +"To remove '%c' lines, make them ' ' lines (context).\n"

364 +"To remove '%c' lines, delete them.\n"

365 +"Lines starting with %c will be removed.\n"

366 +msgstr ""

367 +"---\n"

368 +"Pour éliminer les lignes '%c', rendez-les ' ' (contexte).\n"

369 +"Pour éliminer les lignes '%c', effacez-les.\n"

370 +"Les lignes commençant par %c seront éliminées.\n"

371 +

372 +#: add-patch.c:810

373 +msgid ""

374 +"If the patch applies cleanly, the edited hunk will immediately be\n"

375 +"marked for staging.\n"

376 +msgstr ""

377 +"Si le patch s'applique proprement, la section éditée sera\n"

378 +"immédiatement marquée comme indexée.\n"

379 +

380 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

381 +#: add-patch.c:818 git-add--interactive.perl:1126

382 +msgid ""

383 +"If it does not apply cleanly, you will be given an opportunity to\n"

384 +"edit again. If all lines of the hunk are removed, then the edit is\n"

385 +"aborted and the hunk is left unchanged.\n"

386 +msgstr ""

387 +"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n"

388 +"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"

389 +"alors l'édition sera abandonnée et la section conservée.\n"

390 +

391 +#: add-patch.c:851

392 +msgid "could not parse hunk header"

393 +msgstr "impossible d'analyser l'entête de section"

394 +

395 +#: add-patch.c:895 add-patch.c:1294

396 +msgid "'git apply --cached' failed"

397 +msgstr "'git apply --cached' a échoué"

398 +

399 +#. TRANSLATORS: do not translate [y/n]

400 +#. The program will only accept that input at this point.

401 +#. Consider translating (saying "no" discards!) as

402 +#. (saying "n" for "no" discards!) if the translation

403 +#. of the word "no" does not start with n.

404 +#.

405 +#. TRANSLATORS: do not translate [y/n]

406 +#. The program will only accept that input

407 +#. at this point.

408 +#. Consider translating (saying "no" discards!) as

409 +#. (saying "n" for "no" discards!) if the translation

410 +#. of the word "no" does not start with n.

411 +#: add-patch.c:952 git-add--interactive.perl:1239

412 +msgid ""

413 +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

414 +msgstr ""

415 +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "

416 +"l'élimine !) [y|n] ? "

417 +

418 +#: add-patch.c:1009

419 +msgid ""

420 +"y - stage this hunk\n"

421 +"n - do not stage this hunk\n"

422 +"q - quit; do not stage this hunk or any of the remaining ones\n"

423 +"a - stage this and all the remaining hunks\n"

424 +"d - do not stage this hunk nor any of the remaining hunks\n"

425 +msgstr ""

426 +"y - indexer cette section\n"

427 +"n - ne pas indexer cette section\n"

428 +"q - quitter ; ne pas indexer cette section ni les autres restantes\n"

429 +"a - indexer cette section et toutes les suivantes\n"

430 +"d - ne pas indexer cette section ni les suivantes\n"

431 +

432 +#: add-patch.c:1016

433 +msgid ""

434 +"j - leave this hunk undecided, see next undecided hunk\n"

435 +"J - leave this hunk undecided, see next hunk\n"

436 +"k - leave this hunk undecided, see previous undecided hunk\n"

437 +"K - leave this hunk undecided, see previous hunk\n"

438 +"g - select a hunk to go to\n"

439 +"/ - search for a hunk matching the given regex\n"

440 +"s - split the current hunk into smaller hunks\n"

441 +"e - manually edit the current hunk\n"

442 +"? - print help\n"

443 +msgstr ""

444 +"j - laisser cette section non décidée et aller à la suivante non-décidée\n"

445 +"J - laisser cette section non décidée et aller à la suivante\n"

446 +"k - laisser cette section non décidée et aller à la précédente non-décidée\n"

447 +"K - laisser cette section non décidée et aller à la précédente\n"

448 +"g - sélectionner une section et s'y rendre\n"

449 +"/ - rechercher une section correspondant à une regex donnée\n"

450 +"s - découper la section en sections plus petites\n"

451 +"e - éditer manuellement la section actuelle\n"

452 +"? - afficher l'aide\n"

453 +

454 +#: add-patch.c:1137 add-patch.c:1147

455 +msgid "No previous hunk"

456 +msgstr "Pas de section précédente"

457 +

458 +#: add-patch.c:1142 add-patch.c:1152

459 +msgid "No next hunk"

460 +msgstr "Pas de section suivante"

461 +

462 +#: add-patch.c:1158

463 +msgid "No other hunks to goto"

464 +msgstr "Aucune autre section à atteindre"

465 +

466 +#: add-patch.c:1169 git-add--interactive.perl:1577

467 +msgid "go to which hunk (<ret> to see more)? "

468 +msgstr "aller à quelle section (<ret> pour voir plus) ? "

469 +

470 +#: add-patch.c:1170 git-add--interactive.perl:1579

471 +msgid "go to which hunk? "

472 +msgstr "aller à quelle section ? "

473 +

474 +#: add-patch.c:1181

475 +#, c-format

476 +msgid "Invalid number: '%s'"

477 +msgstr "Numéro invalide : '%s'"

478 +

479 +#: add-patch.c:1186

480 +#, c-format

481 +msgid "Sorry, only %d hunk available."

482 +msgid_plural "Sorry, only %d hunks available."

483 +msgstr[0] "Désolé, %d seule section disponible."

484 +msgstr[1] "Désolé, Seulement %d sections disponibles."

485 +

486 +#: add-patch.c:1195

487 +msgid "No other hunks to search"

488 +msgstr "aucune autre section à rechercher"

489 +

490 +#: add-patch.c:1201 git-add--interactive.perl:1623

491 +msgid "search for regex? "

492 +msgstr "rechercher la regex ? "

493 +

494 +#: add-patch.c:1216

495 +#, c-format

496 +msgid "Malformed search regexp %s: %s"

497 +msgstr "Regex de recherche malformée %s : %s"

498 +

499 +#: add-patch.c:1233

500 +msgid "No hunk matches the given pattern"

501 +msgstr "Aucune section ne correspond au motif donné"

502 +

503 +#: add-patch.c:1240

504 +msgid "Sorry, cannot split this hunk"

505 +msgstr "Désolé, impossible de découper cette section"

506 +

507 +#: add-patch.c:1244

508 +#, c-format

509 +msgid "Split into %d hunks."

510 +msgstr "Découpée en %d sections."

511 +

512 +#: add-patch.c:1248

513 +msgid "Sorry, cannot edit this hunk"

514 +msgstr "Désolé, impossible d'éditer cette section"

515 +

516 +#: advice.c:111

517 #, c-format

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

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

520

94 -#: advice.c:162

521 +#: advice.c:164

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

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

524

98 -#: advice.c:164

525 +#: advice.c:166

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

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

528

102 -#: advice.c:166

529 +#: advice.c:168

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

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

532

106 -#: advice.c:168

533 +#: advice.c:170

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

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

536

110 -#: advice.c:170

537 +#: advice.c:172

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

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

540

114 -#: advice.c:172

541 +#: advice.c:174

542 #, c-format

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

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

545

119 -#: advice.c:180

546 +#: advice.c:182

547 msgid ""

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

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

@@ -124,23 +551,23 @@ msgstr ""

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

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

553

127 -#: advice.c:188

554 +#: advice.c:190

555 msgid "Exiting because of an unresolved conflict."

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

557

131 -#: advice.c:193 builtin/merge.c:1332

558 +#: advice.c:195 builtin/merge.c:1332

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

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

561

135 -#: advice.c:195

562 +#: advice.c:197

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

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

565

139 -#: advice.c:196

566 +#: advice.c:198

567 msgid "Exiting because of unfinished merge."

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

569

143 -#: advice.c:202

570 +#: advice.c:204

571 #, c-format

572 msgid ""

573 "Note: switching to '%s'.\n"

@@ -359,24 +786,24 @@ msgstr "lecture du lien symbolique %s impossible"

786 msgid "unable to open or read %s"

787 msgstr "ouverture ou lecture de %s impossible"

788

362 -#: apply.c:2926

789 +#: apply.c:2936

790 #, c-format

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

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

793

367 -#: apply.c:3047

794 +#: apply.c:3057

795 #, c-format

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

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

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

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

800

374 -#: apply.c:3059

801 +#: apply.c:3069

802 #, c-format

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

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

805

379 -#: apply.c:3065

806 +#: apply.c:3075

807 #, c-format

808 msgid ""

809 "while searching for:\n"

@@ -385,463 +812,449 @@ msgstr ""

812 "pendant la recherche de :\n"

813 "%.*s"

814

388 -#: apply.c:3087

815 +#: apply.c:3097

816 #, c-format

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

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

819

393 -#: apply.c:3095

820 +#: apply.c:3105

821 #, c-format

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

823 msgstr ""

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

825 "inverse"

826

400 -#: apply.c:3142

827 +#: apply.c:3152

828 #, c-format

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

830 msgstr ""

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

832

406 -#: apply.c:3152

833 +#: apply.c:3162

834 #, c-format

835 msgid ""

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

837 msgstr ""

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

839

413 -#: apply.c:3160

840 +#: apply.c:3170

841 #, c-format

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

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

844

418 -#: apply.c:3178

845 +#: apply.c:3188

846 #, c-format

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

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

849

423 -#: apply.c:3191

850 +#: apply.c:3201

851 #, c-format

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

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

854

428 -#: apply.c:3197

855 +#: apply.c:3207

856 #, c-format

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

858 msgstr ""

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

860 "trouvé)"

861

435 -#: apply.c:3218

862 +#: apply.c:3228

863 #, c-format

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

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

866

440 -#: apply.c:3341

867 +#: apply.c:3351

868 #, c-format

869 msgid "cannot checkout %s"

870 msgstr "extraction de %s impossible"

871

445 -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

872 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280

873 #, c-format

874 msgid "failed to read %s"

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

876

450 -#: apply.c:3401

877 +#: apply.c:3411

878 #, c-format

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

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

881

455 -#: apply.c:3430 apply.c:3673

882 +#: apply.c:3440 apply.c:3683

883 #, c-format

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

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

886

460 -#: apply.c:3516 apply.c:3688

887 +#: apply.c:3526 apply.c:3698

888 #, c-format

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

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

891

465 -#: apply.c:3525 apply.c:3696

892 +#: apply.c:3535 apply.c:3706

893 #, c-format

894 msgid "%s: does not match index"

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

896

470 -#: apply.c:3560

897 +#: apply.c:3570

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

899 msgstr ""

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

901 "points."

902

476 -#: apply.c:3563

903 +#: apply.c:3573

904 #, c-format

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

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

907

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

908 +#: apply.c:3589 apply.c:3593

909 #, c-format

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

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

912

486 -#: apply.c:3595

913 +#: apply.c:3605

914 #, c-format

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

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

917

491 -#: apply.c:3609

918 +#: apply.c:3619

919 #, c-format

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

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

922

496 -#: apply.c:3614

923 +#: apply.c:3624

924 #, c-format

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

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

927

501 -#: apply.c:3640

928 +#: apply.c:3650

929 msgid "removal patch leaves file contents"

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

931

505 -#: apply.c:3713

932 +#: apply.c:3723

933 #, c-format

934 msgid "%s: wrong type"

935 msgstr "%s : type erroné"

936

510 -#: apply.c:3715

937 +#: apply.c:3725

938 #, c-format

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

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

941

515 -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

516 -#: read-cache.c:1309

942 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856

943 +#: read-cache.c:1320

944 #, c-format

945 msgid "invalid path '%s'"

946 msgstr "chemin invalide '%s'"

947

521 -#: apply.c:3924

948 +#: apply.c:3934

949 #, c-format

950 msgid "%s: already exists in index"

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

952

526 -#: apply.c:3927

953 +#: apply.c:3937

954 #, c-format

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

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

957

531 -#: apply.c:3947

958 +#: apply.c:3957

959 #, c-format

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

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

962

536 -#: apply.c:3952

963 +#: apply.c:3962

964 #, c-format

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

966 msgstr ""

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

968

542 -#: apply.c:3972

969 +#: apply.c:3982

970 #, c-format

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

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

973

547 -#: apply.c:3976

974 +#: apply.c:3986

975 #, c-format

976 msgid "%s: patch does not apply"

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

978

552 -#: apply.c:3991

979 +#: apply.c:4001

980 #, c-format

981 msgid "Checking patch %s..."

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

983

557 -#: apply.c:4083

984 +#: apply.c:4093

985 #, c-format

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

987 msgstr ""

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

989

563 -#: apply.c:4090

990 +#: apply.c:4100

991 #, c-format

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

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

994

568 -#: apply.c:4093

995 +#: apply.c:4103

996 #, c-format

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

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

999

573 -#: apply.c:4098 builtin/checkout.c:279 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 -

578 -#: apply.c:4102

1000 +#: apply.c:4112

1001 #, c-format

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

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

1004

583 -#: apply.c:4112

1005 +#: apply.c:4122

1006 #, c-format

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

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

1009

588 -#: apply.c:4250

1010 +#: apply.c:4260

1011 #, c-format

1012 msgid "unable to remove %s from index"

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

1014

593 -#: apply.c:4284

1015 +#: apply.c:4294

1016 #, c-format

1017 msgid "corrupt patch for submodule %s"

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

1019

598 -#: apply.c:4290

1020 +#: apply.c:4300

1021 #, c-format

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

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

1024

603 -#: apply.c:4298

1025 +#: apply.c:4308

1026 #, c-format

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

1028 msgstr ""

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

1030 "impossible"

1031

610 -#: apply.c:4304 apply.c:4449

1032 +#: apply.c:4314 apply.c:4459

1033 #, c-format

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

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

1036

615 -#: apply.c:4347

1037 +#: apply.c:4357

1038 #, c-format

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

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

1041

620 -#: apply.c:4351

1042 +#: apply.c:4361

1043 #, c-format

1044 msgid "closing file '%s'"

1045 msgstr "fermeture du fichier '%s'"

1046

625 -#: apply.c:4421

1047 +#: apply.c:4431

1048 #, c-format

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

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

1051

630 -#: apply.c:4519

1052 +#: apply.c:4529

1053 #, c-format

1054 msgid "Applied patch %s cleanly."

1055 msgstr "Patch %s appliqué proprement."

1056

635 -#: apply.c:4527

1057 +#: apply.c:4537

1058 msgid "internal error"

1059 msgstr "erreur interne"

1060

639 -#: apply.c:4530

1061 +#: apply.c:4540

1062 #, c-format

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

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

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

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

1067

646 -#: apply.c:4541

1068 +#: apply.c:4551

1069 #, c-format

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

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

1072

651 -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

1073 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192

1074 #, c-format

1075 msgid "cannot open %s"

1076 msgstr "impossible d'ouvrir %s"

1077

656 -#: apply.c:4563

1078 +#: apply.c:4573

1079 #, c-format

1080 msgid "Hunk #%d applied cleanly."

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

1082

661 -#: apply.c:4567

1083 +#: apply.c:4577

1084 #, c-format

1085 msgid "Rejected hunk #%d."

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

1087

666 -#: apply.c:4686

1088 +#: apply.c:4696

1089 #, c-format

1090 msgid "Skipped patch '%s'."

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

1092

671 -#: apply.c:4694

1093 +#: apply.c:4704

1094 msgid "unrecognized input"

1095 msgstr "entrée non reconnue"

1096

675 -#: apply.c:4714

1097 +#: apply.c:4724

1098 msgid "unable to read index file"

1099 msgstr "lecture du fichier d'index impossible"

1100

679 -#: apply.c:4871

1101 +#: apply.c:4881

1102 #, c-format

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

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

1105

684 -#: apply.c:4898

1106 +#: apply.c:4908

1107 #, c-format

1108 msgid "squelched %d whitespace error"

1109 msgid_plural "squelched %d whitespace errors"

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

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

1112

691 -#: apply.c:4904 apply.c:4919

1113 +#: apply.c:4914 apply.c:4929

1114 #, c-format

1115 msgid "%d line adds whitespace errors."

1116 msgid_plural "%d lines add whitespace errors."

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

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

1119

698 -#: apply.c:4912

1120 +#: apply.c:4922

1121 #, c-format

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

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

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

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

1126

705 -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

1127 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390

1128 msgid "Unable to write new index file"

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

1130

709 -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

710 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

711 -#: builtin/pull.c:209 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 -

718 -#: apply.c:4956

1131 +#: apply.c:4966

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

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

1134

722 -#: apply.c:4959

1135 +#: apply.c:4969

1136 msgid "apply changes matching the given path"

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

1138

726 -#: apply.c:4961 builtin/am.c:2206

1139 +#: apply.c:4971 builtin/am.c:2206

1140 msgid "num"

1141 msgstr "num"

1142

730 -#: apply.c:4962

1143 +#: apply.c:4972

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

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

1146

734 -#: apply.c:4965

1147 +#: apply.c:4975

1148 msgid "ignore additions made by the patch"

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

1150

738 -#: apply.c:4967

1151 +#: apply.c:4977

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

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

1154

742 -#: apply.c:4971

1155 +#: apply.c:4981

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

1157 msgstr ""

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

1159

747 -#: apply.c:4973

1160 +#: apply.c:4983

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

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

1163

751 -#: apply.c:4975

1164 +#: apply.c:4985

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

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

1167

755 -#: apply.c:4977

1168 +#: apply.c:4987

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

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

1171

759 -#: apply.c:4979

1172 +#: apply.c:4989

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

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

1175

763 -#: apply.c:4981

1176 +#: apply.c:4991

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

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

1179

767 -#: apply.c:4983

1180 +#: apply.c:4993

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

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

1183

771 -#: apply.c:4986

1184 +#: apply.c:4996

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

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

1187

775 -#: apply.c:4988

1188 +#: apply.c:4998

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

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

1191

779 -#: apply.c:4990

1192 +#: apply.c:5000

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

1194 msgstr ""

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

1196

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

1197 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524

1198 msgid "paths are separated with NUL character"

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

1200

788 -#: apply.c:4995

1201 +#: apply.c:5005

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

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

1204

792 -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

1205 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98

1206 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

794 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

1207 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474

1208 msgid "action"

1209 msgstr "action"

1210

798 -#: apply.c:4997

1211 +#: apply.c:5007

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

1213 msgstr ""

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

1215 "d'espace"

1216

804 -#: apply.c:5000 apply.c:5003

1217 +#: apply.c:5010 apply.c:5013

1218 msgid "ignore changes in whitespace when finding context"

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

1220

808 -#: apply.c:5006

1221 +#: apply.c:5016

1222 msgid "apply the patch in reverse"

1223 msgstr "appliquer le patch en sens inverse"

1224

812 -#: apply.c:5008

1225 +#: apply.c:5018

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

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

1228

816 -#: apply.c:5010

1229 +#: apply.c:5020

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

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

1232

820 -#: apply.c:5012

1233 +#: apply.c:5022

1234 msgid "allow overlapping hunks"

1235 msgstr "accepter les recouvrements de sections"

1236

824 -#: apply.c:5013 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:2085 builtin/mv.c:123 builtin/read-tree.c:128

1237 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22

1238 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774

1239 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1240 msgid "be verbose"

1241 msgstr "mode verbeux"

1242

830 -#: apply.c:5015

1243 +#: apply.c:5025

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

1245 msgstr ""

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

1247 "fichier"

1248

836 -#: apply.c:5018

1249 +#: apply.c:5028

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

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

1252

840 -#: apply.c:5020 builtin/am.c:2194

1253 +#: apply.c:5030 builtin/am.c:2194

1254 msgid "root"

1255 msgstr "racine"

1256

844 -#: apply.c:5021

1257 +#: apply.c:5031

1258 msgid "prepend <root> to all filenames"

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

1260

@@ -864,7 +1277,7 @@ msgstr ""

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

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

1279

867 -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

1280 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299

1281 #, c-format

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

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

@@ -896,7 +1309,7 @@ msgstr "fmt"

1309 msgid "archive format"

1310 msgstr "format d'archive"

1311

899 -#: archive.c:458 builtin/log.c:1581

1312 +#: archive.c:458 builtin/log.c:1653

1313 msgid "prefix"

1314 msgstr "préfixe"

1315

@@ -904,12 +1317,12 @@ msgstr "préfixe"

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

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

1319

907 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

1320 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1321 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

1322 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

1323 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

1324 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

912 -#: parse-options.h:186

1325 +#: parse-options.h:190

1326 msgid "file"

1327 msgstr "fichier"

1328

@@ -941,8 +1354,8 @@ msgstr "compression efficace"

1354 msgid "list supported archive formats"

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

1356

944 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

945 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

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

1358 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

1359 msgid "repo"

1360 msgstr "dépôt"

1361

@@ -981,17 +1394,17 @@ msgstr "Format d'archive inconnu '%s'"

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

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

1396

984 -#: archive-tar.c:125 archive-zip.c:345

1397 +#: archive-tar.c:125 archive-zip.c:350

1398 #, c-format

1399 msgid "cannot stream blob %s"

1400 msgstr "impossible de transmettre le blob %s en flux"

1401

989 -#: archive-tar.c:266 archive-zip.c:363

1402 +#: archive-tar.c:266 archive-zip.c:368

1403 #, c-format

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

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

1406

994 -#: archive-tar.c:293 archive-zip.c:353

1407 +#: archive-tar.c:293 archive-zip.c:358

1408 #, c-format

1409 msgid "cannot read %s"

1410 msgstr "impossible de lire %s"

@@ -1010,37 +1423,37 @@ msgstr "impossible de rediriger un descripteur"

1423 msgid "'%s' filter reported error"

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

1425

1013 -#: archive-zip.c:314

1426 +#: archive-zip.c:319

1427 #, c-format

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

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

1430

1018 -#: archive-zip.c:318

1431 +#: archive-zip.c:323

1432 #, c-format

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

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

1435

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

1436 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1437 #, c-format

1438 msgid "deflate error (%d)"

1439 msgstr "erreur de compression (%d)"

1440

1028 -#: archive-zip.c:609

1441 +#: archive-zip.c:614

1442 #, c-format

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

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

1445

1033 -#: attr.c:213

1446 +#: attr.c:212

1447 #, c-format

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

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

1450

1038 -#: attr.c:370

1451 +#: attr.c:369

1452 #, c-format

1453 msgid "%s not allowed: %s:%d"

1454 msgstr "%s non permis : %s : %d"

1455

1043 -#: attr.c:410

1456 +#: attr.c:409

1457 msgid ""

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

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

@@ -1182,9 +1595,9 @@ msgstr ""

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

1596 "dernier commit"

1597

1185 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1186 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1187 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1598 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093

1599 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1600 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

1601 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1602 #: builtin/shortlog.c:192

1603 msgid "revision walk setup failed"

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

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

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

1780

1368 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1369 -#: builtin/commit.c:791

1781 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108

1782 +#: builtin/commit.c:811

1783 #, c-format

1784 msgid "could not open '%s'"

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

@@ -1397,42 +1810,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1812

1400 -#: bundle.c:272

1813 +#: bundle.c:273

1814 msgid "unable to dup bundle descriptor"

1815 msgstr "impossible de dupliquer le descripteur de liasse"

1816

1404 -#: bundle.c:279

1817 +#: bundle.c:280

1818 msgid "Could not spawn pack-objects"

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

1820

1408 -#: bundle.c:290

1821 +#: bundle.c:291

1822 msgid "pack-objects died"

1823 msgstr "les objets groupés ont disparu"

1824

1412 -#: bundle.c:332

1825 +#: bundle.c:333

1826 msgid "rev-list died"

1827 msgstr "rev-list a disparu"

1828

1416 -#: bundle.c:381

1829 +#: bundle.c:382

1830 #, c-format

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

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

1833

1421 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1834 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

1835 #, c-format

1836 msgid "unrecognized argument: %s"

1837 msgstr "argument non reconnu : %s"

1838

1426 -#: bundle.c:468

1839 +#: bundle.c:469

1840 msgid "Refusing to create empty bundle."

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

1842

1430 -#: bundle.c:478

1843 +#: bundle.c:479

1844 #, c-format

1845 msgid "cannot create '%s'"

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

1847

1435 -#: bundle.c:503

1848 +#: bundle.c:504

1849 msgid "index-pack died"

1850 msgstr "l'index de groupe a disparu"

1851

@@ -1441,18 +1854,18 @@ msgstr "l'index de groupe a disparu"

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

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

1856

1444 -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1857 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1858 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1859 #, c-format

1860 msgid "could not parse %s"

1861 msgstr "impossible d'analyser %s"

1862

1450 -#: commit.c:52

1863 +#: commit.c:53

1864 #, c-format

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

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

1867

1455 -#: commit.c:192

1868 +#: commit.c:193

1869 msgid ""

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

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

@@ -1472,27 +1885,27 @@ msgstr ""

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

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

1887

1475 -#: commit.c:1128

1888 +#: commit.c:1152

1889 #, c-format

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

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

1892

1480 -#: commit.c:1131

1893 +#: commit.c:1155

1894 #, c-format

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

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

1897

1485 -#: commit.c:1134

1898 +#: commit.c:1158

1899 #, c-format

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

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

1902

1490 -#: commit.c:1137

1903 +#: commit.c:1161

1904 #, c-format

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

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

1907

1495 -#: commit.c:1391

1908 +#: commit.c:1415

1909 msgid ""

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

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

@@ -1504,83 +1917,78 @@ msgstr ""

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

1918 "projet.\n"

1919

1507 -#: commit-graph.c:127

1920 +#: commit-graph.c:130

1921 msgid "commit-graph file is too small"

1922 msgstr "le graphe de commit est trop petit"

1923

1511 -#: commit-graph.c:192

1924 +#: commit-graph.c:195

1925 #, c-format

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

1927 msgstr ""

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

1929

1517 -#: commit-graph.c:199

1930 +#: commit-graph.c:202

1931 #, c-format

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

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

1934

1522 -#: commit-graph.c:206

1935 +#: commit-graph.c:209

1936 #, c-format

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

1938 msgstr ""

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

1940 "version %X"

1941

1529 -#: commit-graph.c:229

1942 +#: commit-graph.c:232

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

1944 msgstr ""

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

1946 "le fichier est peut être incomplet"

1947

1535 -#: commit-graph.c:240

1948 +#: commit-graph.c:243

1949 #, c-format

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

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

1952

1540 -#: commit-graph.c:283

1953 +#: commit-graph.c:286

1954 #, c-format

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

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

1957

1545 -#: commit-graph.c:347

1958 +#: commit-graph.c:350

1959 msgid "commit-graph has no base graphs chunk"

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

1961

1549 -#: commit-graph.c:357

1962 +#: commit-graph.c:360

1963 msgid "commit-graph chain does not match"

1964 msgstr "la chaîne de graphe de commit ne correspond pas"

1965

1553 -#: commit-graph.c:404

1966 +#: commit-graph.c:407

1967 #, c-format

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

1969 msgstr ""

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

1971

1559 -#: commit-graph.c:430

1972 +#: commit-graph.c:433

1973 msgid "unable to find all commit-graph files"

1974 msgstr "impossible de trouver tous les fichiers du graphe de commit"

1975

1563 -#: commit-graph.c:561 commit-graph.c:621

1976 +#: commit-graph.c:564 commit-graph.c:624

1977 msgid "invalid commit position. commit-graph is likely corrupt"

1978 msgstr ""

1979 "position de commit invalide. Le graphe de commit est vraisemblablement "

1980 "corrompu"

1981

1569 -#: commit-graph.c:582

1982 +#: commit-graph.c:585

1983 #, c-format

1984 msgid "could not find commit %s"

1985 msgstr "impossible de trouver le commit %s"

1986

1574 -#: commit-graph.c:855 builtin/am.c:1287

1987 +#: commit-graph.c:858 builtin/am.c:1287

1988 #, c-format

1989 msgid "unable to parse commit %s"

1990 msgstr "impossible d'analyser le commit %s"

1991

1579 -#: commit-graph.c:859

1580 -#, c-format

1581 -msgid "unable to get tree for %s"

1582 -msgstr "impossible de récupérer l'arbre de %s"

1583 -

1992 #: commit-graph.c:1017 builtin/pack-objects.c:2641

1993 #, c-format

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

@@ -1648,12 +2056,12 @@ msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"

2056 msgid "failed to write correct number of base graph ids"

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

2058

1651 -#: commit-graph.c:1379 midx.c:810

2059 +#: commit-graph.c:1379 midx.c:814

2060 #, c-format

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

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

2063

1656 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

2064 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248

2065 #, c-format

2066 msgid "unable to create '%s'"

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

@@ -1829,7 +2237,7 @@ msgstr "la clé ne contient pas de section: %s"

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

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

2239

1832 -#: config.c:406 sequencer.c:2401

2240 +#: config.c:406 sequencer.c:2530

2241 #, c-format

2242 msgid "invalid key: %s"

2243 msgstr "clé invalide : %s"

@@ -1962,148 +2370,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère"

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

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

2372

1965 -#: config.c:1425

2373 +#: config.c:1430

2374 #, c-format

2375 msgid "malformed value for %s"

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

2377

1970 -#: config.c:1451

2378 +#: config.c:1456

2379 #, c-format

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

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

2382

1975 -#: config.c:1452

2383 +#: config.c:1457

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

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

2386

1979 -#: config.c:1513 builtin/pack-objects.c:3394

2387 +#: config.c:1518 builtin/pack-objects.c:3394

2388 #, c-format

2389 msgid "bad pack compression level %d"

2390 msgstr "niveau de compression du paquet %d"

2391

1984 -#: config.c:1634

2392 +#: config.c:1639

2393 #, c-format

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

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

2396

1989 -#: config.c:1637

2397 +#: config.c:1642

2398 #, c-format

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

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

2401

1994 -#: config.c:1654

2402 +#: config.c:1659

2403 #, c-format

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

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

2406

1999 -#: config.c:1684

2407 +#: config.c:1689

2408 #, c-format

2409 msgid "failed to parse %s"

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

2411

2004 -#: config.c:1740

2412 +#: config.c:1745

2413 msgid "unable to parse command-line config"

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

2415

2008 -#: config.c:2091

2416 +#: config.c:2096

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

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

2419

2012 -#: config.c:2261

2420 +#: config.c:2266

2421 #, c-format

2422 msgid "Invalid %s: '%s'"

2423 msgstr "%s invalide : '%s'"

2424

2017 -#: config.c:2306

2425 +#: config.c:2311

2426 #, c-format

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

2428 msgstr ""

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

2430 "100"

2431

2024 -#: config.c:2352

2432 +#: config.c:2357

2433 #, c-format

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

2435 msgstr ""

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

2437

2030 -#: config.c:2354

2438 +#: config.c:2359

2439 #, c-format

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

2441 msgstr ""

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

2443

2036 -#: config.c:2435

2444 +#: config.c:2440

2445 #, c-format

2446 msgid "invalid section name '%s'"

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

2448

2041 -#: config.c:2467

2449 +#: config.c:2472

2450 #, c-format

2451 msgid "%s has multiple values"

2452 msgstr "%s a des valeurs multiples"

2453

2046 -#: config.c:2496

2454 +#: config.c:2501

2455 #, c-format

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

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

2458

2051 -#: config.c:2748 config.c:3072

2459 +#: config.c:2753 config.c:3077

2460 #, c-format

2461 msgid "could not lock config file %s"

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

2463

2056 -#: config.c:2759

2464 +#: config.c:2764

2465 #, c-format

2466 msgid "opening %s"

2467 msgstr "ouverture de %s"

2468

2061 -#: config.c:2794 builtin/config.c:328

2469 +#: config.c:2799 builtin/config.c:328

2470 #, c-format

2471 msgid "invalid pattern: %s"

2472 msgstr "motif invalide : %s"

2473

2066 -#: config.c:2819

2474 +#: config.c:2824

2475 #, c-format

2476 msgid "invalid config file %s"

2477 msgstr "fichier de configuration invalide %s"

2478

2071 -#: config.c:2832 config.c:3085

2479 +#: config.c:2837 config.c:3090

2480 #, c-format

2481 msgid "fstat on %s failed"

2482 msgstr "échec de fstat sur %s"

2483

2076 -#: config.c:2843

2484 +#: config.c:2848

2485 #, c-format

2486 msgid "unable to mmap '%s'"

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

2488

2081 -#: config.c:2852 config.c:3090

2489 +#: config.c:2857 config.c:3095

2490 #, c-format

2491 msgid "chmod on %s failed"

2492 msgstr "échec de chmod sur %s"

2493

2086 -#: config.c:2937 config.c:3187

2494 +#: config.c:2942 config.c:3192

2495 #, c-format

2496 msgid "could not write config file %s"

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

2498

2091 -#: config.c:2971

2499 +#: config.c:2976

2500 #, c-format

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

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

2503

2096 -#: config.c:2973 builtin/remote.c:782

2504 +#: config.c:2978 builtin/remote.c:781

2505 #, c-format

2506 msgid "could not unset '%s'"

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

2508

2101 -#: config.c:3063

2509 +#: config.c:3068

2510 #, c-format

2511 msgid "invalid section name: %s"

2512 msgstr "nom de section invalide : %s"

2513

2106 -#: config.c:3230

2514 +#: config.c:3235

2515 #, c-format

2516 msgid "missing value for '%s'"

2517 msgstr "valeur manquante pour '%s'"

@@ -2269,19 +2677,19 @@ msgstr "chemin étrange '%s' bloqué"

2677 msgid "unable to fork"

2678 msgstr "fork impossible"

2679

2272 -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2680 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43

2681 msgid "Checking connectivity"

2682 msgstr "Vérification de la connectivité"

2683

2276 -#: connected.c:100

2684 +#: connected.c:101

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

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

2687

2280 -#: connected.c:120

2688 +#: connected.c:121

2689 msgid "failed write to rev-list"

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

2691

2284 -#: connected.c:127

2692 +#: connected.c:128

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

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

2695

@@ -2318,26 +2726,24 @@ msgstr ""

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

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

2728

2321 -#: convert.c:280

2729 +#: convert.c:284

2730 #, c-format

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

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

2733

2326 -#: convert.c:287

2734 +#: convert.c:291

2735 #, c-format

2736 msgid ""

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

2330 -"tree-encoding."

2331 -msgstr ""

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

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

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

2738 +"working-tree-encoding."

2739 +msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%.*s comme encodage d'arbre de travail."

2740

2335 -#: convert.c:305

2741 +#: convert.c:304

2742 #, c-format

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

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

2745

2340 -#: convert.c:307

2746 +#: convert.c:306

2747 #, c-format

2748 msgid ""

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

@@ -2347,52 +2753,52 @@ msgstr ""

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

2754 "de travail."

2755

2350 -#: convert.c:425 convert.c:496

2756 +#: convert.c:419 convert.c:490

2757 #, c-format

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

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

2760

2355 -#: convert.c:468

2761 +#: convert.c:462

2762 #, c-format

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

2764 msgstr ""

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

2766 "contenu"

2767

2362 -#: convert.c:674

2768 +#: convert.c:668

2769 #, c-format

2770 msgid "cannot fork to run external filter '%s'"

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

2772

2367 -#: convert.c:694

2773 +#: convert.c:688

2774 #, c-format

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

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

2777

2372 -#: convert.c:701

2778 +#: convert.c:695

2779 #, c-format

2780 msgid "external filter '%s' failed %d"

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

2782

2377 -#: convert.c:736 convert.c:739

2783 +#: convert.c:730 convert.c:733

2784 #, c-format

2785 msgid "read from external filter '%s' failed"

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

2787

2382 -#: convert.c:742 convert.c:797

2788 +#: convert.c:736 convert.c:791

2789 #, c-format

2790 msgid "external filter '%s' failed"

2791 msgstr "le filtre externe '%s' a échoué"

2792

2387 -#: convert.c:845

2793 +#: convert.c:839

2794 msgid "unexpected filter type"

2795 msgstr "type de filtre inattendu"

2796

2391 -#: convert.c:856

2797 +#: convert.c:850

2798 msgid "path name too long for external filter"

2799 msgstr "nom de chemin trop long pour un filtre externe"

2800

2395 -#: convert.c:930

2801 +#: convert.c:924

2802 #, c-format

2803 msgid ""

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

@@ -2401,16 +2807,16 @@ msgstr ""

2807 "le filtre externe '%s' n'est plus disponible bien que tous les chemins "

2808 "n'aient pas été filtrés"

2809

2404 -#: convert.c:1229

2810 +#: convert.c:1223

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

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

2813

2408 -#: convert.c:1417 convert.c:1451

2814 +#: convert.c:1411 convert.c:1445

2815 #, c-format

2816 msgid "%s: clean filter '%s' failed"

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

2818

2413 -#: convert.c:1495

2819 +#: convert.c:1489

2820 #, c-format

2821 msgid "%s: smudge filter %s failed"

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

@@ -2582,35 +2988,35 @@ msgstr ""

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

2989 "%s"

2990

2585 -#: diff.c:4218

2991 +#: diff.c:4202

2992 #, c-format

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

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

2995

2590 -#: diff.c:4563

2996 +#: diff.c:4547

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

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

2999

2594 -#: diff.c:4566

3000 +#: diff.c:4550

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

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

3003

2598 -#: diff.c:4644

3004 +#: diff.c:4628

3005 msgid "--follow requires exactly one pathspec"

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

3007

2602 -#: diff.c:4692

3008 +#: diff.c:4676

3009 #, c-format

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

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

3012

2607 -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

3013 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

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

3015 #, c-format

3016 msgid "%s expects a numerical value"

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

3018

2613 -#: diff.c:4729

3019 +#: diff.c:4713

3020 #, c-format

3021 msgid ""

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

@@ -2619,42 +3025,42 @@ msgstr ""

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

3026 "%s"

3027

2622 -#: diff.c:4814

3028 +#: diff.c:4798

3029 #, c-format

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

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

3032

2627 -#: diff.c:4838

3033 +#: diff.c:4822

3034 #, c-format

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

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

3037

2632 -#: diff.c:4852

3038 +#: diff.c:4836

3039 #, c-format

3040 msgid "unable to resolve '%s'"

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

3042

2637 -#: diff.c:4902 diff.c:4908

3043 +#: diff.c:4886 diff.c:4892

3044 #, c-format

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

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

3047

2642 -#: diff.c:4920

3048 +#: diff.c:4904

3049 #, c-format

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

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

3052

2647 -#: diff.c:4941

3053 +#: diff.c:4925

3054 #, c-format

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

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

3057

2652 -#: diff.c:4960

3058 +#: diff.c:4944

3059 #, c-format

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

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

3062

2657 -#: diff.c:5000

3063 +#: diff.c:4984

3064 msgid ""

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

3066 "\"histogram\""

@@ -2662,155 +3068,155 @@ msgstr ""

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

3069 "\"histogram\""

3070

2665 -#: diff.c:5036 diff.c:5056

3071 +#: diff.c:5020 diff.c:5040

3072 #, c-format

3073 msgid "invalid argument to %s"

3074 msgstr "argument invalide pour %s"

3075

2670 -#: diff.c:5194

3076 +#: diff.c:5178

3077 #, c-format

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

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

3080

2675 -#: diff.c:5250

3081 +#: diff.c:5234

3082 #, c-format

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

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

3085

2680 -#: diff.c:5273

3086 +#: diff.c:5257

3087 msgid "Diff output format options"

3088 msgstr "Options de format de sortie de diff"

3089

2684 -#: diff.c:5275 diff.c:5281

3090 +#: diff.c:5259 diff.c:5265

3091 msgid "generate patch"

3092 msgstr "générer la rustine"

3093

2688 -#: diff.c:5278 builtin/log.c:172

3094 +#: diff.c:5262 builtin/log.c:173

3095 msgid "suppress diff output"

3096 msgstr "supprimer la sortie des différences"

3097

2692 -#: diff.c:5283 diff.c:5397 diff.c:5404

3098 +#: diff.c:5267 diff.c:5381 diff.c:5388

3099 msgid "<n>"

3100 msgstr "<n>"

3101

2696 -#: diff.c:5284 diff.c:5287

3102 +#: diff.c:5268 diff.c:5271

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

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

3105

2700 -#: diff.c:5289

3106 +#: diff.c:5273

3107 msgid "generate the diff in raw format"

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

3109

2704 -#: diff.c:5292

3110 +#: diff.c:5276

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

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

3113

2708 -#: diff.c:5296

3114 +#: diff.c:5280

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

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

3117

2712 -#: diff.c:5300

3118 +#: diff.c:5284

3119 msgid "machine friendly --stat"

3120 msgstr "--stat pour traitement automatique"

3121

2716 -#: diff.c:5303

3122 +#: diff.c:5287

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

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

3125

2720 -#: diff.c:5305 diff.c:5313

3126 +#: diff.c:5289 diff.c:5297

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

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

3129

2724 -#: diff.c:5306

3130 +#: diff.c:5290

3131 msgid ""

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

3133 msgstr ""

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

3135 "chaque sous-répertoire"

3136

2731 -#: diff.c:5310

3137 +#: diff.c:5294

3138 msgid "synonym for --dirstat=cumulative"

3139 msgstr "synonyme pour --dirstat=cumulative"

3140

2735 -#: diff.c:5314

3141 +#: diff.c:5298

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

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

3144

2739 -#: diff.c:5318

3145 +#: diff.c:5302

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

3147 msgstr ""

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

3149 "erreurs d'espace"

3150

2745 -#: diff.c:5321

3151 +#: diff.c:5305

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

3153 msgstr ""

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

3155 "de mode"

3156

2751 -#: diff.c:5324

3157 +#: diff.c:5308

3158 msgid "show only names of changed files"

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

3160

2755 -#: diff.c:5327

3161 +#: diff.c:5311

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

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

3164

2759 -#: diff.c:5329

3165 +#: diff.c:5313

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

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

3168

2763 -#: diff.c:5330

3169 +#: diff.c:5314

3170 msgid "generate diffstat"

3171 msgstr "générer un diffstat"

3172

2767 -#: diff.c:5332 diff.c:5335 diff.c:5338

3173 +#: diff.c:5316 diff.c:5319 diff.c:5322

3174 msgid "<width>"

3175 msgstr "<largeur>"

3176

2771 -#: diff.c:5333

3177 +#: diff.c:5317

3178 msgid "generate diffstat with a given width"

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

3180

2775 -#: diff.c:5336

3181 +#: diff.c:5320

3182 msgid "generate diffstat with a given name width"

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

3184

2779 -#: diff.c:5339

3185 +#: diff.c:5323

3186 msgid "generate diffstat with a given graph width"

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

3188

2783 -#: diff.c:5341

3189 +#: diff.c:5325

3190 msgid "<count>"

3191 msgstr "<compte>"

3192

2787 -#: diff.c:5342

3193 +#: diff.c:5326

3194 msgid "generate diffstat with limited lines"

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

3196

2791 -#: diff.c:5345

3197 +#: diff.c:5329

3198 msgid "generate compact summary in diffstat"

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

3200

2795 -#: diff.c:5348

3201 +#: diff.c:5332

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

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

3204

2799 -#: diff.c:5351

3205 +#: diff.c:5335

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

3207 msgstr ""

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

3209 "\"index\""

3210

2805 -#: diff.c:5353

3211 +#: diff.c:5337

3212 msgid "show colored diff"

3213 msgstr "afficher un diff coloré"

3214

2809 -#: diff.c:5354

3215 +#: diff.c:5338

3216 msgid "<kind>"

3217 msgstr "<sorte>"

3218

2813 -#: diff.c:5355

3219 +#: diff.c:5339

3220 msgid ""

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

3222 "diff"

@@ -2818,7 +3224,7 @@ msgstr ""

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

3225 "'nouveau' dans le diff"

3226

2821 -#: diff.c:5358

3227 +#: diff.c:5342

3228 msgid ""

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

3230 "--numstat"

@@ -2826,93 +3232,93 @@ msgstr ""

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

3233 "champs dans --raw ou --numstat"

3234

2829 -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

3235 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3236 msgid "<prefix>"

3237 msgstr "<préfixe>"

3238

2833 -#: diff.c:5362

3239 +#: diff.c:5346

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

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

3242

2837 -#: diff.c:5365

3243 +#: diff.c:5349

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

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

3246

2841 -#: diff.c:5368

3247 +#: diff.c:5352

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

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

3250

2845 -#: diff.c:5371

3251 +#: diff.c:5355

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

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

3254

2849 -#: diff.c:5374

3255 +#: diff.c:5358

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

3257 msgstr ""

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

3259 "indiqué"

3260

2855 -#: diff.c:5378 diff.c:5383 diff.c:5388

3261 +#: diff.c:5362 diff.c:5367 diff.c:5372

3262 msgid "<char>"

3263 msgstr "<caractère>"

3264

2859 -#: diff.c:5379

3265 +#: diff.c:5363

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

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

3268

2863 -#: diff.c:5384

3269 +#: diff.c:5368

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

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

3272

2867 -#: diff.c:5389

3273 +#: diff.c:5373

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

3275 msgstr ""

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

3277

2872 -#: diff.c:5392

3278 +#: diff.c:5376

3279 msgid "Diff rename options"

3280 msgstr "Options de renommage de diff"

3281

2876 -#: diff.c:5393

3282 +#: diff.c:5377

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

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

3285

2880 -#: diff.c:5394

3286 +#: diff.c:5378

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

3288 msgstr ""

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

3290 "création"

3291

2886 -#: diff.c:5398

3292 +#: diff.c:5382

3293 msgid "detect renames"

3294 msgstr "détecter les renommages"

3295

2890 -#: diff.c:5402

3296 +#: diff.c:5386

3297 msgid "omit the preimage for deletes"

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

3299

2894 -#: diff.c:5405

3300 +#: diff.c:5389

3301 msgid "detect copies"

3302 msgstr "détecter les copies"

3303

2898 -#: diff.c:5409

3304 +#: diff.c:5393

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

3306 msgstr ""

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

3308

2903 -#: diff.c:5411

3309 +#: diff.c:5395

3310 msgid "disable rename detection"

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

3312

2907 -#: diff.c:5414

3313 +#: diff.c:5398

3314 msgid "use empty blobs as rename source"

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

3316

2911 -#: diff.c:5416

3317 +#: diff.c:5400

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

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

3320

2915 -#: diff.c:5419

3321 +#: diff.c:5403

3322 msgid ""

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

3324 "given limit"

@@ -2920,161 +3326,161 @@ msgstr ""

3326 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"

3327 "copie excède la limite indiquée"

3328

2923 -#: diff.c:5421

3329 +#: diff.c:5405

3330 msgid "Diff algorithm options"

3331 msgstr "Options de l'algorithme de diff"

3332

2927 -#: diff.c:5423

3333 +#: diff.c:5407

3334 msgid "produce the smallest possible diff"

3335 msgstr "produire le diff le plus petit possible"

3336

2931 -#: diff.c:5426

3337 +#: diff.c:5410

3338 msgid "ignore whitespace when comparing lines"

3339 msgstr "ignorer les espaces lors de la comparaison de ligne"

3340

2935 -#: diff.c:5429

3341 +#: diff.c:5413

3342 msgid "ignore changes in amount of whitespace"

3343 msgstr "ignorer des modifications du nombre d'espaces"

3344

2939 -#: diff.c:5432

3345 +#: diff.c:5416

3346 msgid "ignore changes in whitespace at EOL"

3347 msgstr "ignorer des modifications d'espace en fin de ligne"

3348

2943 -#: diff.c:5435

3349 +#: diff.c:5419

3350 msgid "ignore carrier-return at the end of line"

3351 msgstr "ignore le retour chariot en fin de ligne"

3352

2947 -#: diff.c:5438

3353 +#: diff.c:5422

3354 msgid "ignore changes whose lines are all blank"

3355 msgstr "ignorer les modifications dont les lignes sont vides"

3356

2951 -#: diff.c:5441

3357 +#: diff.c:5425

3358 msgid "heuristic to shift diff hunk boundaries for easy reading"

3359 msgstr ""

3360 "heuristique qui déplace les limites de sections de diff pour faciliter la "

3361 "lecture"

3362

2957 -#: diff.c:5444

3363 +#: diff.c:5428

3364 msgid "generate diff using the \"patience diff\" algorithm"

3365 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""

3366

2961 -#: diff.c:5448

3367 +#: diff.c:5432

3368 msgid "generate diff using the \"histogram diff\" algorithm"

3369 msgstr ""

3370 "générer un diff en utilisant l'algorithme de différence \"histogramme\""

3371

2966 -#: diff.c:5450

3372 +#: diff.c:5434

3373 msgid "<algorithm>"

3374 msgstr "<algorithme>"

3375

2970 -#: diff.c:5451

3376 +#: diff.c:5435

3377 msgid "choose a diff algorithm"

3378 msgstr "choisir un algorithme de différence"

3379

2974 -#: diff.c:5453

3380 +#: diff.c:5437

3381 msgid "<text>"

3382 msgstr "<texte>"

3383

2978 -#: diff.c:5454

3384 +#: diff.c:5438

3385 msgid "generate diff using the \"anchored diff\" algorithm"

3386 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""

3387

2982 -#: diff.c:5456 diff.c:5465 diff.c:5468

3388 +#: diff.c:5440 diff.c:5449 diff.c:5452

3389 msgid "<mode>"

3390 msgstr "<mode>"

3391

2986 -#: diff.c:5457

3392 +#: diff.c:5441

3393 msgid "show word diff, using <mode> to delimit changed words"

3394 msgstr ""

3395 "afficher des différences par mot, en utilisant <mode> pour délimiter les "

3396 "mots modifiés"

3397

2992 -#: diff.c:5459 diff.c:5462 diff.c:5507

3398 +#: diff.c:5443 diff.c:5446 diff.c:5491

3399 msgid "<regex>"

3400 msgstr "<regex>"

3401

2996 -#: diff.c:5460

3402 +#: diff.c:5444

3403 msgid "use <regex> to decide what a word is"

3404 msgstr "utiliser <regex> pour décider ce qu'est un mot"

3405

3000 -#: diff.c:5463

3406 +#: diff.c:5447

3407 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3408 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

3409

3004 -#: diff.c:5466

3410 +#: diff.c:5450

3411 msgid "moved lines of code are colored differently"

3412 msgstr "les lignes déplacées sont colorées différemment"

3413

3008 -#: diff.c:5469

3414 +#: diff.c:5453

3415 msgid "how white spaces are ignored in --color-moved"

3416 msgstr "comment les espaces sont ignorés dans --color-moved"

3417

3012 -#: diff.c:5472

3418 +#: diff.c:5456

3419 msgid "Other diff options"

3420 msgstr "Autres options diff"

3421

3016 -#: diff.c:5474

3422 +#: diff.c:5458

3423 msgid "when run from subdir, exclude changes outside and show relative paths"

3424 msgstr ""

3425 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3426 "afficher les chemins relatifs"

3427

3022 -#: diff.c:5478

3428 +#: diff.c:5462

3429 msgid "treat all files as text"

3430 msgstr "traiter les fichiers comme texte"

3431

3026 -#: diff.c:5480

3432 +#: diff.c:5464

3433 msgid "swap two inputs, reverse the diff"

3434 msgstr "échanger les entrées, inverser le diff"

3435

3030 -#: diff.c:5482

3436 +#: diff.c:5466

3437 msgid "exit with 1 if there were differences, 0 otherwise"

3438 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3439

3034 -#: diff.c:5484

3440 +#: diff.c:5468

3441 msgid "disable all output of the program"

3442 msgstr "désactiver tous les affichages du programme"

3443

3038 -#: diff.c:5486

3444 +#: diff.c:5470

3445 msgid "allow an external diff helper to be executed"

3446 msgstr "autoriser l'exécution d'un assistant externe de diff"

3447

3042 -#: diff.c:5488

3448 +#: diff.c:5472

3449 msgid "run external text conversion filters when comparing binary files"

3450 msgstr ""

3451 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3452 "fichiers binaires"

3453

3048 -#: diff.c:5490

3454 +#: diff.c:5474

3455 msgid "<when>"

3456 msgstr "<quand>"

3457

3052 -#: diff.c:5491

3458 +#: diff.c:5475

3459 msgid "ignore changes to submodules in the diff generation"

3460 msgstr ""

3461 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3462

3057 -#: diff.c:5494

3463 +#: diff.c:5478

3464 msgid "<format>"

3465 msgstr "<format>"

3466

3061 -#: diff.c:5495

3467 +#: diff.c:5479

3468 msgid "specify how differences in submodules are shown"

3469 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3470

3065 -#: diff.c:5499

3471 +#: diff.c:5483

3472 msgid "hide 'git add -N' entries from the index"

3473 msgstr "masquer les entrées 'git add -N' de l'index"

3474

3069 -#: diff.c:5502

3475 +#: diff.c:5486

3476 msgid "treat 'git add -N' entries as real in the index"

3477 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

3478

3073 -#: diff.c:5504

3479 +#: diff.c:5488

3480 msgid "<string>"

3481 msgstr "<chaîne>"

3482

3077 -#: diff.c:5505

3483 +#: diff.c:5489

3484 msgid ""

3485 "look for differences that change the number of occurrences of the specified "

3486 "string"

@@ -3082,7 +3488,7 @@ msgstr ""

3488 "rechercher les différences qui modifient le nombre d'occurrences de la "

3489 "chaîne spécifiée"

3490

3085 -#: diff.c:5508

3491 +#: diff.c:5492

3492 msgid ""

3493 "look for differences that change the number of occurrences of the specified "

3494 "regex"

@@ -3090,26 +3496,26 @@ msgstr ""

3496 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

3497 "spécifiée"

3498

3093 -#: diff.c:5511

3499 +#: diff.c:5495

3500 msgid "show all changes in the changeset with -S or -G"

3501 msgstr ""

3502 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

3503 "ou -G"

3504

3099 -#: diff.c:5514

3505 +#: diff.c:5498

3506 msgid "treat <string> in -S as extended POSIX regular expression"

3507 msgstr ""

3508 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

3509

3104 -#: diff.c:5517

3510 +#: diff.c:5501

3511 msgid "control the order in which files appear in the output"

3512 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

3513

3108 -#: diff.c:5518

3514 +#: diff.c:5502

3515 msgid "<object-id>"

3516 msgstr "<id-objet>"

3517

3112 -#: diff.c:5519

3518 +#: diff.c:5503

3519 msgid ""

3520 "look for differences that change the number of occurrences of the specified "

3521 "object"

@@ -3117,35 +3523,35 @@ msgstr ""

3523 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

3524 "indiqué"

3525

3120 -#: diff.c:5521

3526 +#: diff.c:5505

3527 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3528 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3529

3124 -#: diff.c:5522

3530 +#: diff.c:5506

3531 msgid "select files by diff type"

3532 msgstr "sélectionner les fichiers par types de diff"

3533

3128 -#: diff.c:5524

3534 +#: diff.c:5508

3535 msgid "<file>"

3536 msgstr "<fichier>"

3537

3132 -#: diff.c:5525

3538 +#: diff.c:5509

3539 msgid "Output to a specific file"

3540 msgstr "Sortie vers un fichier spécifié"

3541

3136 -#: diff.c:6180

3542 +#: diff.c:6164

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

3544 msgstr ""

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

3546 "fichiers."

3547

3142 -#: diff.c:6183

3548 +#: diff.c:6167

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

3550 msgstr ""

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

3552 "grand nombre de fichiers."

3553

3148 -#: diff.c:6186

3554 +#: diff.c:6170

3555 #, c-format

3556 msgid ""

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

@@ -3153,41 +3559,60 @@ msgstr ""

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

3560 "commande."

3561

3156 -#: dir.c:549

3562 +#: dir.c:554

3563 #, c-format

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

3565 msgstr ""

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

3567

3162 -#: dir.c:938

3568 +#: dir.c:664

3569 +#, c-format

3570 +msgid "unrecognized pattern: '%s'"

3571 +msgstr "motif non reconnu : '%s'"

3572 +

3573 +#: dir.c:682 dir.c:696

3574 +#, c-format

3575 +msgid "unrecognized negative pattern: '%s'"

3576 +msgstr "motif négatif non reconnu : '%s'"

3577 +

3578 +#: dir.c:714

3579 +#, c-format

3580 +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3581 +msgstr "votre fichier d'extraction partielle pourrait présenter des problèmes : le motif '%s' est répété"

3582 +

3583 +#: dir.c:724

3584 +msgid "disabling cone pattern matching"

3585 +msgstr "désactivation de la correspondance de motif de cone"

3586 +

3587 +#: dir.c:1101

3588 #, c-format

3589 msgid "cannot use %s as an exclude file"

3590 msgstr "impossible d'utiliser %s comme fichier d'exclusion"

3591

3167 -#: dir.c:1877

3592 +#: dir.c:2078

3593 #, c-format

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

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

3596

3172 -#: dir.c:2128

3597 +#: dir.c:2415

3598 msgid "failed to get kernel name and information"

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

3600

3176 -#: dir.c:2252

3601 +#: dir.c:2539

3602 msgid "untracked cache is disabled on this system or location"

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

3604

3180 -#: dir.c:3056

3605 +#: dir.c:3343

3606 #, c-format

3607 msgid "index file corrupt in repo %s"

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

3609

3185 -#: dir.c:3101 dir.c:3106

3610 +#: dir.c:3388 dir.c:3393

3611 #, c-format

3612 msgid "could not create directories for %s"

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

3614

3190 -#: dir.c:3135

3615 +#: dir.c:3422

3616 #, c-format

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

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

@@ -3208,12 +3633,12 @@ msgstr "Filtrage du contenu"

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

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

3635

3211 -#: environment.c:148

3636 +#: environment.c:149

3637 #, c-format

3638 msgid "bad git namespace path \"%s\""

3639 msgstr "Espaces de nom de Git \"%s\""

3640

3216 -#: environment.c:330

3641 +#: environment.c:331

3642 #, c-format

3643 msgid "could not set GIT_DIR to '%s'"

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

@@ -3249,32 +3674,32 @@ msgstr "impossible d'écrire sur un distant"

3674 msgid "--stateless-rpc requires multi_ack_detailed"

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

3676

3252 -#: fetch-pack.c:356 fetch-pack.c:1280

3677 +#: fetch-pack.c:356 fetch-pack.c:1340

3678 #, c-format

3679 msgid "invalid shallow line: %s"

3680 msgstr "ligne de superficiel invalide : %s"

3681

3257 -#: fetch-pack.c:362 fetch-pack.c:1286

3682 +#: fetch-pack.c:362 fetch-pack.c:1346

3683 #, c-format

3684 msgid "invalid unshallow line: %s"

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

3686

3262 -#: fetch-pack.c:364 fetch-pack.c:1288

3687 +#: fetch-pack.c:364 fetch-pack.c:1348

3688 #, c-format

3689 msgid "object not found: %s"

3690 msgstr "objet non trouvé : %s"

3691

3267 -#: fetch-pack.c:367 fetch-pack.c:1291

3692 +#: fetch-pack.c:367 fetch-pack.c:1351

3693 #, c-format

3694 msgid "error in object: %s"

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

3696

3272 -#: fetch-pack.c:369 fetch-pack.c:1293

3697 +#: fetch-pack.c:369 fetch-pack.c:1353

3698 #, c-format

3699 msgid "no shallow found: %s"

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

3701

3277 -#: fetch-pack.c:372 fetch-pack.c:1297

3702 +#: fetch-pack.c:372 fetch-pack.c:1357

3703 #, c-format

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

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

@@ -3293,7 +3718,7 @@ msgstr "commit invalide %s"

3718 msgid "giving up"

3719 msgstr "abandon"

3720

3296 -#: fetch-pack.c:475 progress.c:312

3721 +#: fetch-pack.c:475 progress.c:323

3722 msgid "done"

3723 msgstr "fait"

3724

@@ -3307,162 +3732,162 @@ msgstr "%s trouvé (%d) %s"

3732 msgid "Marking %s as complete"

3733 msgstr "Marquage de %s comme terminé"

3734

3310 -#: fetch-pack.c:742

3735 +#: fetch-pack.c:754

3736 #, c-format

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

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

3739

3315 -#: fetch-pack.c:781

3740 +#: fetch-pack.c:818

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

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

3743

3319 -#: fetch-pack.c:789

3744 +#: fetch-pack.c:826

3745 msgid "protocol error: bad pack header"

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

3747

3323 -#: fetch-pack.c:857

3748 +#: fetch-pack.c:900

3749 #, c-format

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

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

3752

3328 -#: fetch-pack.c:873

3753 +#: fetch-pack.c:916

3754 #, c-format

3755 msgid "%s failed"

3756 msgstr "échec de %s"

3757

3333 -#: fetch-pack.c:875

3758 +#: fetch-pack.c:918

3759 msgid "error in sideband demultiplexer"

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

3761

3337 -#: fetch-pack.c:907

3762 +#: fetch-pack.c:965

3763 #, c-format

3764 msgid "Server version is %.*s"

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

3766

3342 -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3343 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3344 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3345 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3767 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3768 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3769 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3770 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3771 #, c-format

3772 msgid "Server supports %s"

3773 msgstr "Le serveur supporte %s"

3774

3350 -#: fetch-pack.c:914

3775 +#: fetch-pack.c:972

3776 msgid "Server does not support shallow clients"

3777 msgstr "Le serveur ne supporte les clients superficiels"

3778

3354 -#: fetch-pack.c:974

3779 +#: fetch-pack.c:1032

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

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

3782

3358 -#: fetch-pack.c:979

3783 +#: fetch-pack.c:1037

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

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

3786

3362 -#: fetch-pack.c:983

3787 +#: fetch-pack.c:1041

3788 msgid "Server does not support --deepen"

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

3790

3366 -#: fetch-pack.c:1000

3791 +#: fetch-pack.c:1058

3792 msgid "no common commits"

3793 msgstr "pas de commit commun"

3794

3370 -#: fetch-pack.c:1012 fetch-pack.c:1468

3795 +#: fetch-pack.c:1070 fetch-pack.c:1536

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

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

3798

3374 -#: fetch-pack.c:1150

3799 +#: fetch-pack.c:1209

3800 msgid "Server does not support shallow requests"

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

3802

3378 -#: fetch-pack.c:1157

3803 +#: fetch-pack.c:1216

3804 msgid "Server supports filter"

3805 msgstr "Le serveur supporte filter"

3806

3382 -#: fetch-pack.c:1180

3807 +#: fetch-pack.c:1239

3808 msgid "unable to write request to remote"

3809 msgstr "impossible d'écrire la requête sur le distant"

3810

3386 -#: fetch-pack.c:1198

3811 +#: fetch-pack.c:1257

3812 #, c-format

3813 msgid "error reading section header '%s'"

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

3815

3391 -#: fetch-pack.c:1204

3816 +#: fetch-pack.c:1263

3817 #, c-format

3818 msgid "expected '%s', received '%s'"

3819 msgstr "'%s' attendu, '%s' reçu"

3820

3396 -#: fetch-pack.c:1243

3821 +#: fetch-pack.c:1303

3822 #, c-format

3823 msgid "unexpected acknowledgment line: '%s'"

3824 msgstr "ligne d'acquittement inattendue : '%s'"

3825

3401 -#: fetch-pack.c:1248

3826 +#: fetch-pack.c:1308

3827 #, c-format

3828 msgid "error processing acks: %d"

3829 msgstr "erreur lors du traitement des acquittements : %d"

3830

3406 -#: fetch-pack.c:1258

3831 +#: fetch-pack.c:1318

3832 msgid "expected packfile to be sent after 'ready'"

3833 msgstr "fichier paquet attendu à envoyer après 'ready'"

3834

3410 -#: fetch-pack.c:1260

3835 +#: fetch-pack.c:1320

3836 msgid "expected no other sections to be sent after no 'ready'"

3837 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

3838

3414 -#: fetch-pack.c:1302

3839 +#: fetch-pack.c:1362

3840 #, c-format

3841 msgid "error processing shallow info: %d"

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

3843

3419 -#: fetch-pack.c:1349

3844 +#: fetch-pack.c:1409

3845 #, c-format

3846 msgid "expected wanted-ref, got '%s'"

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

3848

3424 -#: fetch-pack.c:1354

3849 +#: fetch-pack.c:1414

3850 #, c-format

3851 msgid "unexpected wanted-ref: '%s'"

3852 msgstr "wanted-ref inattendu : '%s'"

3853

3429 -#: fetch-pack.c:1359

3854 +#: fetch-pack.c:1419

3855 #, c-format

3856 msgid "error processing wanted refs: %d"

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

3858

3434 -#: fetch-pack.c:1693

3859 +#: fetch-pack.c:1762

3860 msgid "no matching remote head"

3861 msgstr "pas de HEAD distante correspondante"

3862

3438 -#: fetch-pack.c:1716 builtin/clone.c:685

3863 +#: fetch-pack.c:1785 builtin/clone.c:688

3864 msgid "remote did not send all necessary objects"

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

3866

3442 -#: fetch-pack.c:1743

3867 +#: fetch-pack.c:1812

3868 #, c-format

3869 msgid "no such remote ref %s"

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

3871

3447 -#: fetch-pack.c:1746

3872 +#: fetch-pack.c:1815

3873 #, c-format

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

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

3876

3452 -#: gpg-interface.c:321

3453 -msgid "gpg failed to sign the data"

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

3455 -

3456 -#: gpg-interface.c:347

3877 +#: gpg-interface.c:223

3878 msgid "could not create temporary file"

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

3880

3460 -#: gpg-interface.c:350

3881 +#: gpg-interface.c:226

3882 #, c-format

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

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

3885

3465 -#: graph.c:97

3886 +#: gpg-interface.c:390

3887 +msgid "gpg failed to sign the data"

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

3889 +

3890 +#: graph.c:98

3891 #, c-format

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

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

@@ -3480,7 +3905,7 @@ msgstr ""

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

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

3907

3483 -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3908 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

3909 #: builtin/rm.c:135

3910 #, c-format

3911 msgid "failed to stat '%s'"

@@ -3537,7 +3962,7 @@ msgid "Low-level Commands / Interrogators"

3962 msgstr "Commandes bas niveau / Interrogateurs"

3963

3964 #: help.c:37

3540 -msgid "Low-level Commands / Synching Repositories"

3965 +msgid "Low-level Commands / Syncing Repositories"

3966 msgstr "Commandes bas niveau / Synchronisation de dépôts"

3967

3968 #: help.c:38

@@ -3706,7 +4131,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

4133

3709 -#: ident.c:436 builtin/commit.c:611

4134 +#: ident.c:436 builtin/commit.c:631

4135 #, c-format

4136 msgid "invalid date format: %s"

4137 msgstr "format de date invalide : %s"

@@ -3794,7 +4219,7 @@ msgid "failed to read the cache"

4219 msgstr "impossible de lire le cache"

4220

4221 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3797 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

4222 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4223 #: builtin/stash.c:264

4224 msgid "unable to write new index file"

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

@@ -3986,7 +4411,7 @@ msgstr "renommage"

4411 msgid "renamed"

4412 msgstr "renommé"

4413

3989 -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

4414 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4415 #, c-format

4416 msgid "Refusing to lose dirty file at %s"

4417 msgstr "Refus de perdre le fichier modifié %s"

@@ -4032,7 +4457,7 @@ msgstr ""

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

4458 ">'%s' dans %s"

4459

4035 -#: merge-recursive.c:2056

4460 +#: merge-recursive.c:2114

4461 #, c-format

4462 msgid ""

4463 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4043,7 +4468,7 @@ msgstr ""

4468 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

4469 "sans aucune destination récupérant la majorité des fichiers."

4470

4046 -#: merge-recursive.c:2088

4471 +#: merge-recursive.c:2146

4472 #, c-format

4473 msgid ""

4474 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4052,7 +4477,7 @@ msgstr ""

4477 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

4478 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

4479

4055 -#: merge-recursive.c:2098

4480 +#: merge-recursive.c:2156

4481 #, c-format

4482 msgid ""

4483 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4061,7 +4486,7 @@ msgstr ""

4486 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

4487 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

4488

4064 -#: merge-recursive.c:2190

4489 +#: merge-recursive.c:2248

4490 #, c-format

4491 msgid ""

4492 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4070,7 +4495,7 @@ msgstr ""

4495 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

4496 "Renommage de répertoire %s->%s dans %s"

4497

4073 -#: merge-recursive.c:2435

4498 +#: merge-recursive.c:2493

4499 #, c-format

4500 msgid ""

4501 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -4079,52 +4504,52 @@ msgstr ""

4504 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

4505 "renommé."

4506

4082 -#: merge-recursive.c:2961

4507 +#: merge-recursive.c:3019

4508 #, c-format

4509 msgid "cannot read object %s"

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

4511

4087 -#: merge-recursive.c:2964

4512 +#: merge-recursive.c:3022

4513 #, c-format

4514 msgid "object %s is not a blob"

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

4516

4092 -#: merge-recursive.c:3028

4517 +#: merge-recursive.c:3086

4518 msgid "modify"

4519 msgstr "modification"

4520

4096 -#: merge-recursive.c:3028

4521 +#: merge-recursive.c:3086

4522 msgid "modified"

4523 msgstr "modifié"

4524

4100 -#: merge-recursive.c:3040

4525 +#: merge-recursive.c:3098

4526 msgid "content"

4527 msgstr "contenu"

4528

4104 -#: merge-recursive.c:3044

4529 +#: merge-recursive.c:3102

4530 msgid "add/add"

4531 msgstr "ajout/ajout"

4532

4108 -#: merge-recursive.c:3067

4533 +#: merge-recursive.c:3125

4534 #, c-format

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

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

4537

4113 -#: merge-recursive.c:3089 git-submodule.sh:937

4538 +#: merge-recursive.c:3147 git-submodule.sh:993

4539 msgid "submodule"

4540 msgstr "sous-module"

4541

4117 -#: merge-recursive.c:3090

4542 +#: merge-recursive.c:3148

4543 #, c-format

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

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

4546

4122 -#: merge-recursive.c:3120

4547 +#: merge-recursive.c:3178

4548 #, c-format

4549 msgid "Adding as %s instead"

4550 msgstr "Ajout plutôt comme %s"

4551

4127 -#: merge-recursive.c:3203

4552 +#: merge-recursive.c:3261

4553 #, c-format

4554 msgid ""

4555 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4133,7 +4558,7 @@ msgstr ""

4558 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

4559 "en %s ; déplacé dans %s."

4560

4136 -#: merge-recursive.c:3206

4561 +#: merge-recursive.c:3264

4562 #, c-format

4563 msgid ""

4564 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4143,7 +4568,7 @@ msgstr ""

4568 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

4569 "vers %s."

4570

4146 -#: merge-recursive.c:3210

4571 +#: merge-recursive.c:3268

4572 #, c-format

4573 msgid ""

4574 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4152,7 +4577,7 @@ msgstr ""

4577 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

4578 "renommé en %s ; déplacé dans %s."

4579

4155 -#: merge-recursive.c:3213

4580 +#: merge-recursive.c:3271

4581 #, c-format

4582 msgid ""

4583 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4162,60 +4587,60 @@ msgstr ""

4587 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

4588 "être déplacé vers %s."

4589

4165 -#: merge-recursive.c:3327

4590 +#: merge-recursive.c:3385

4591 #, c-format

4592 msgid "Removing %s"

4593 msgstr "Suppression de %s"

4594

4170 -#: merge-recursive.c:3350

4595 +#: merge-recursive.c:3408

4596 msgid "file/directory"

4597 msgstr "fichier/répertoire"

4598

4174 -#: merge-recursive.c:3355

4599 +#: merge-recursive.c:3413

4600 msgid "directory/file"

4601 msgstr "répertoire/fichier"

4602

4178 -#: merge-recursive.c:3362

4603 +#: merge-recursive.c:3420

4604 #, c-format

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

4606 msgstr ""

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

4608

4184 -#: merge-recursive.c:3371

4609 +#: merge-recursive.c:3429

4610 #, c-format

4611 msgid "Adding %s"

4612 msgstr "Ajout de %s"

4613

4189 -#: merge-recursive.c:3380

4614 +#: merge-recursive.c:3438

4615 #, c-format

4616 msgid "CONFLICT (add/add): Merge conflict in %s"

4617 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

4618

4194 -#: merge-recursive.c:3424

4619 +#: merge-recursive.c:3482

4620 msgid "Already up to date!"

4621 msgstr "Déjà à jour !"

4622

4198 -#: merge-recursive.c:3433

4623 +#: merge-recursive.c:3491

4624 #, c-format

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

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

4627

4203 -#: merge-recursive.c:3537

4628 +#: merge-recursive.c:3595

4629 msgid "Merging:"

4630 msgstr "Fusion :"

4631

4207 -#: merge-recursive.c:3550

4632 +#: merge-recursive.c:3608

4633 #, c-format

4634 msgid "found %u common ancestor:"

4635 msgid_plural "found %u common ancestors:"

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

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

4638

4214 -#: merge-recursive.c:3600

4639 +#: merge-recursive.c:3658

4640 msgid "merge returned no commit"

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

4642

4218 -#: merge-recursive.c:3659

4643 +#: merge-recursive.c:3717

4644 #, c-format

4645 msgid ""

4646 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4225,12 +4650,12 @@ msgstr ""

4650 "fusion :\n"

4651 " %s"

4652

4228 -#: merge-recursive.c:3756

4653 +#: merge-recursive.c:3814

4654 #, c-format

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

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

4657

4233 -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4658 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4659 msgid "Unable to write index."

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

4661

@@ -4302,36 +4727,44 @@ msgstr ""

4727 msgid "error preparing packfile from multi-pack-index"

4728 msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

4729

4305 -#: midx.c:469

4730 +#: midx.c:472

4731 #, c-format

4732 msgid "failed to add packfile '%s'"

4733 msgstr "échec de l'ajout du fichier paquet '%s'"

4734

4310 -#: midx.c:475

4735 +#: midx.c:478

4736 #, c-format

4737 msgid "failed to open pack-index '%s'"

4738 msgstr "échec à l'ouverture du fichier paquet '%s'"

4739

4315 -#: midx.c:535

4740 +#: midx.c:538

4741 #, c-format

4742 msgid "failed to locate object %d in packfile"

4743 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

4744

4320 -#: midx.c:864

4745 +#: midx.c:842

4746 +msgid "Adding packfiles to multi-pack-index"

4747 +msgstr "Ajout de fichiers paquet à un index multi-paquet"

4748 +

4749 +#: midx.c:875

4750 #, c-format

4751 msgid "did not see pack-file %s to drop"

4752 msgstr "fichier paquet à éliminer %s non trouvé"

4753

4325 -#: midx.c:1035

4754 +#: midx.c:973

4755 +msgid "Writing chunks to multi-pack-index"

4756 +msgstr "Écriture des sections dans l'index multi-paquet"

4757 +

4758 +#: midx.c:1052

4759 #, c-format

4760 msgid "failed to clear multi-pack-index at %s"

4761 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

4762

4330 -#: midx.c:1090

4763 +#: midx.c:1108

4764 msgid "Looking for referenced packfiles"

4765 msgstr "Recherche de fichiers paquets référencés"

4766

4334 -#: midx.c:1105

4767 +#: midx.c:1123

4768 #, c-format

4769 msgid ""

4770 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

@@ -4339,43 +4772,51 @@ msgstr ""

4772 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

4773 "étalement[%d]"

4774

4342 -#: midx.c:1109

4343 -msgid "Verifying OID order in MIDX"

4344 -msgstr "Vérification de l'ordre des OID dans MIDX"

4775 +#: midx.c:1128

4776 +msgid "Verifying OID order in multi-pack-index"

4777 +msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"

4778

4346 -#: midx.c:1118

4779 +#: midx.c:1137

4780 #, c-format

4781 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4782 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

4783

4351 -#: midx.c:1137

4784 +#: midx.c:1157

4785 msgid "Sorting objects by packfile"

4786 msgstr "Classement des objets par fichier paquet"

4787

4355 -#: midx.c:1143

4788 +#: midx.c:1164

4789 msgid "Verifying object offsets"

4790 msgstr "Vérification des décalages des objets"

4791

4359 -#: midx.c:1159

4792 +#: midx.c:1180

4793 #, c-format

4794 msgid "failed to load pack entry for oid[%d] = %s"

4795 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

4796

4364 -#: midx.c:1165

4797 +#: midx.c:1186

4798 #, c-format

4799 msgid "failed to load pack-index for packfile %s"

4800 msgstr "impossible de lire le fichier paquet %s"

4801

4369 -#: midx.c:1174

4802 +#: midx.c:1195

4803 #, c-format

4804 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4805 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

4806

4374 -#: midx.c:1349

4807 +#: midx.c:1220

4808 +msgid "Counting referenced objects"

4809 +msgstr "Comptage des objets référencés"

4810 +

4811 +#: midx.c:1230

4812 +msgid "Finding and deleting unreferenced packfiles"

4813 +msgstr "Recherche et effacement des fichiers paquets non-référencés"

4814 +

4815 +#: midx.c:1388

4816 msgid "could not start pack-objects"

4817 msgstr "Impossible de démarrer le groupement d'objets"

4818

4378 -#: midx.c:1368

4819 +#: midx.c:1407

4820 msgid "could not finish pack-objects"

4821 msgstr "Impossible de finir le groupement d'objets"

4822

@@ -4462,12 +4903,12 @@ msgstr "incohérence de hachage %s"

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

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

4905

4465 -#: packfile.c:1887

4906 +#: packfile.c:1888

4907 #, c-format

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

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

4910

4470 -#: packfile.c:1891

4911 +#: packfile.c:1892

4912 #, c-format

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

4914 msgstr ""

@@ -4579,37 +5020,37 @@ msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""

5020 msgid "malformed object name '%s'"

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

5022

4582 -#: path.c:897

5023 +#: path.c:915

5024 #, c-format

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

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

5027

4587 -#: pathspec.c:128

5028 +#: pathspec.c:130

5029 msgid "Escape character '\\' not allowed as last character in attr value"

5030 msgstr ""

5031 "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "

5032 "valeur d'attribut"

5033

4593 -#: pathspec.c:146

5034 +#: pathspec.c:148

5035 msgid "Only one 'attr:' specification is allowed."

5036 msgstr "Une seule spécification 'attr:' est autorisée."

5037

4597 -#: pathspec.c:149

5038 +#: pathspec.c:151

5039 msgid "attr spec must not be empty"

5040 msgstr "un spécificateur d'attribut ne peut pas être vide"

5041

4601 -#: pathspec.c:192

5042 +#: pathspec.c:194

5043 #, c-format

5044 msgid "invalid attribute name %s"

5045 msgstr "nom d'attribut invalide %s"

5046

4606 -#: pathspec.c:257

5047 +#: pathspec.c:259

5048 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5049 msgstr ""

5050 "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "

5051 "incompatibles"

5052

4612 -#: pathspec.c:264

5053 +#: pathspec.c:266

5054 msgid ""

5055 "global 'literal' pathspec setting is incompatible with all other global "

5056 "pathspec settings"

@@ -4617,52 +5058,57 @@ msgstr ""

5058 "le réglage global de spécificateur de chemin 'literal' est incompatible avec "

5059 "tous les autres réglages globaux de spécificateur de chemin"

5060

4620 -#: pathspec.c:304

5061 +#: pathspec.c:306

5062 msgid "invalid parameter for pathspec magic 'prefix'"

5063 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"

5064

4624 -#: pathspec.c:325

5065 +#: pathspec.c:327

5066 #, c-format

5067 msgid "Invalid pathspec magic '%.*s' in '%s'"

5068 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"

5069

4629 -#: pathspec.c:330

5070 +#: pathspec.c:332

5071 #, c-format

5072 msgid "Missing ')' at the end of pathspec magic in '%s'"

5073 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"

5074

4634 -#: pathspec.c:368

5075 +#: pathspec.c:370

5076 #, c-format

5077 msgid "Unimplemented pathspec magic '%c' in '%s'"

5078 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

5079

4639 -#: pathspec.c:427

5080 +#: pathspec.c:429

5081 #, c-format

5082 msgid "%s: 'literal' and 'glob' are incompatible"

5083 msgstr "%s : 'literal' et 'glob' sont incompatibles"

5084

4644 -#: pathspec.c:440

5085 +#: pathspec.c:442

5086 #, c-format

5087 msgid "%s: '%s' is outside repository"

5088 msgstr "%s : '%s' est hors du dépôt"

5089

4649 -#: pathspec.c:514

5090 +#: pathspec.c:516

5091 #, c-format

5092 msgid "'%s' (mnemonic: '%c')"

5093 msgstr "'%s' (mnémonique : '%c')"

5094

4654 -#: pathspec.c:524

5095 +#: pathspec.c:526

5096 #, c-format

5097 msgid "%s: pathspec magic not supported by this command: %s"

5098 msgstr ""

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

5100 "commande : %s"

5101

4661 -#: pathspec.c:591

5102 +#: pathspec.c:593

5103 #, c-format

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

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

5106

5107 +#: pathspec.c:638

5108 +#, c-format

5109 +msgid "line is badly quoted: %s"

5110 +msgstr "la ligne est mal citée : %s"

5111 +

5112 #: pkt-line.c:92

5113 msgid "unable to write flush packet"

5114 msgstr "impossible d'écrire le paquet de vidage"

@@ -4725,42 +5171,42 @@ msgstr "Rafraîchissement de l'index"

5171 msgid "unable to create threaded lstat: %s"

5172 msgstr "impossible de créer le lstat en fil : %s"

5173

4728 -#: pretty.c:966

5174 +#: pretty.c:981

5175 msgid "unable to parse --pretty format"

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

5177

4732 -#: promisor-remote.c:25

5178 +#: promisor-remote.c:23

5179 msgid "Remote with no URL"

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

5181

4736 -#: promisor-remote.c:61

5182 +#: promisor-remote.c:58

5183 #, c-format

5184 msgid "promisor remote name cannot begin with '/': %s"

5185 msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"

5186

4741 -#: range-diff.c:71

5187 +#: range-diff.c:75

5188 msgid "could not start `log`"

5189 msgstr "impossible de démarrer `log`"

5190

4745 -#: range-diff.c:73

5191 +#: range-diff.c:77

5192 msgid "could not read `log` output"

5193 msgstr "impossible de lire la sortie de `log`"

5194

4749 -#: range-diff.c:92 sequencer.c:4985

5195 +#: range-diff.c:96 sequencer.c:5163

5196 #, c-format

5197 msgid "could not parse commit '%s'"

5198 msgstr "impossible d'analyser le commit '%s'"

5199

4754 -#: range-diff.c:118

5200 +#: range-diff.c:122

5201 #, c-format

5202 msgid "could not parse git header '%.*s'"

5203 msgstr "impossible d'analyser l'entête git '%.*s'"

5204

4759 -#: range-diff.c:275

5205 +#: range-diff.c:285

5206 msgid "failed to generate diff"

5207 msgstr "échec de la génération de diff"

5208

4763 -#: range-diff.c:507 range-diff.c:509

5209 +#: range-diff.c:518 range-diff.c:520

5210 #, c-format

5211 msgid "could not parse log for '%s'"

5212 msgstr "impossible d'analyser le journal pour '%s'"

@@ -4801,16 +5247,16 @@ msgstr "impossible d'ajouter '%s' à l'index"

5247 msgid "unable to stat '%s'"

5248 msgstr "fstat de '%s' impossible"

5249

4804 -#: read-cache.c:1314

5250 +#: read-cache.c:1325

5251 #, c-format

5252 msgid "'%s' appears as both a file and as a directory"

5253 msgstr "'%s' existe à la fois comme un fichier et un répertoire"

5254

4809 -#: read-cache.c:1520

5255 +#: read-cache.c:1531

5256 msgid "Refresh index"

5257 msgstr "Rafraîchir l'index"

5258

4813 -#: read-cache.c:1635

5259 +#: read-cache.c:1646

5260 #, c-format

5261 msgid ""

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

@@ -4819,7 +5265,7 @@ msgstr ""

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

5266 "Utilisation de la version %i"

5267

4822 -#: read-cache.c:1645

5268 +#: read-cache.c:1656

5269 #, c-format

5270 msgid ""

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

@@ -4828,138 +5274,138 @@ msgstr ""

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

5275 "Utilisation de la version %i"

5276

4831 -#: read-cache.c:1701

5277 +#: read-cache.c:1712

5278 #, c-format

5279 msgid "bad signature 0x%08x"

5280 msgstr "signature incorrecte 0x%08x"

5281

4836 -#: read-cache.c:1704

5282 +#: read-cache.c:1715

5283 #, c-format

5284 msgid "bad index version %d"

5285 msgstr "mauvaise version d'index %d"

5286

4841 -#: read-cache.c:1713

5287 +#: read-cache.c:1724

5288 msgid "bad index file sha1 signature"

5289 msgstr "mauvaise signature sha1 d'index"

5290

4845 -#: read-cache.c:1743

5291 +#: read-cache.c:1754

5292 #, c-format

5293 msgid "index uses %.4s extension, which we do not understand"

5294 msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"

5295

4850 -#: read-cache.c:1745

5296 +#: read-cache.c:1756

5297 #, c-format

5298 msgid "ignoring %.4s extension"

5299 msgstr "extension %.4s ignorée"

5300

4855 -#: read-cache.c:1782

5301 +#: read-cache.c:1793

5302 #, c-format

5303 msgid "unknown index entry format 0x%08x"

5304 msgstr "format d'entrée d'index inconnu 0x%08x"

5305

4860 -#: read-cache.c:1798

5306 +#: read-cache.c:1809

5307 #, c-format

5308 msgid "malformed name field in the index, near path '%s'"

5309 msgstr "champ de nom malformé dans l'index, près du chemin '%s'"

5310

4865 -#: read-cache.c:1855

5311 +#: read-cache.c:1866

5312 msgid "unordered stage entries in index"

5313 msgstr "entrées de préparation non ordonnées dans l'index"

5314

4869 -#: read-cache.c:1858

5315 +#: read-cache.c:1869

5316 #, c-format

5317 msgid "multiple stage entries for merged file '%s'"

5318 msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"

5319

4874 -#: read-cache.c:1861

5320 +#: read-cache.c:1872

5321 #, c-format

5322 msgid "unordered stage entries for '%s'"

5323 msgstr "entrées de préparation non ordonnées pour '%s'"

5324

4879 -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4880 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4881 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

5325 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5326 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5327 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5328 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4883 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

5329 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5330 msgid "index file corrupt"

5331 msgstr "fichier d'index corrompu"

5332

4887 -#: read-cache.c:2108

5333 +#: read-cache.c:2119

5334 #, c-format

5335 msgid "unable to create load_cache_entries thread: %s"

5336 msgstr "impossible de créer le fil load_cache_entries : %s"

5337

4892 -#: read-cache.c:2121

5338 +#: read-cache.c:2132

5339 #, c-format

5340 msgid "unable to join load_cache_entries thread: %s"

5341 msgstr "impossible de joindre le fil load_cach_entries : %s"

5342

4897 -#: read-cache.c:2154

5343 +#: read-cache.c:2165

5344 #, c-format

5345 msgid "%s: index file open failed"

5346 msgstr "%s : l'ouverture du fichier d'index a échoué"

5347

4902 -#: read-cache.c:2158

5348 +#: read-cache.c:2169

5349 #, c-format

5350 msgid "%s: cannot stat the open index"

5351 msgstr "%s : impossible de faire un stat sur l'index ouvert"

5352

4907 -#: read-cache.c:2162

5353 +#: read-cache.c:2173

5354 #, c-format

5355 msgid "%s: index file smaller than expected"

5356 msgstr "%s : fichier d'index plus petit qu'attendu"

5357

4912 -#: read-cache.c:2166

5358 +#: read-cache.c:2177

5359 #, c-format

5360 msgid "%s: unable to map index file"

5361 msgstr "%s : impossible de mapper le fichier d'index"

5362

4917 -#: read-cache.c:2208

5363 +#: read-cache.c:2219

5364 #, c-format

5365 msgid "unable to create load_index_extensions thread: %s"

5366 msgstr "impossible de créer le fil load_index_extensions : %s"

5367

4922 -#: read-cache.c:2235

5368 +#: read-cache.c:2246

5369 #, c-format

5370 msgid "unable to join load_index_extensions thread: %s"

5371 msgstr "impossible de joindre le fil load_index_extensions : %s"

5372

4927 -#: read-cache.c:2267

5373 +#: read-cache.c:2278

5374 #, c-format

5375 msgid "could not freshen shared index '%s'"

5376 msgstr "impossible de rafraîchir l'index partagé '%s'"

5377

4932 -#: read-cache.c:2314

5378 +#: read-cache.c:2325

5379 #, c-format

5380 msgid "broken index, expect %s in %s, got %s"

5381 msgstr "index cassé, %s attendu dans %s, %s obtenu"

5382

4937 -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

5383 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5384 #, c-format

5385 msgid "could not close '%s'"

5386 msgstr "impossible de fermer '%s'"

5387

4942 -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

5388 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5389 #, c-format

5390 msgid "could not stat '%s'"

5391 msgstr "stat impossible de '%s'"

5392

4947 -#: read-cache.c:3126

5393 +#: read-cache.c:3137

5394 #, c-format

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

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

5397

4952 -#: read-cache.c:3138

5398 +#: read-cache.c:3149

5399 #, c-format

5400 msgid "unable to unlink: %s"

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

5402

4957 -#: read-cache.c:3163

5403 +#: read-cache.c:3174

5404 #, c-format

5405 msgid "cannot fix permission bits on '%s'"

5406 msgstr "impossible de régler les bits de droit de '%s'"

5407

4962 -#: read-cache.c:3312

5408 +#: read-cache.c:3323

5409 #, c-format

5410 msgid "%s: cannot drop to stage #0"

5411 msgstr "%s : impossible de revenir à l'étape 0"

@@ -5066,8 +5512,8 @@ msgstr ""

5512 msgid "Note that empty commits are commented out"

5513 msgstr "Veuillez noter que les commits vides sont en commentaire"

5514

5069 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

5070 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

5515 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5516 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5517 #, c-format

5518 msgid "could not write '%s'"

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

@@ -5139,14 +5585,15 @@ msgstr "la référence '%s' existe déjà"

5585 msgid "unexpected object ID when writing '%s'"

5586 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5587

5142 -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

5143 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

5588 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5589 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5590 +#: wrapper.c:620

5591 #, c-format

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

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

5594

5148 -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5149 -#: builtin/rebase.c:1004

5595 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5596 +#: builtin/rebase.c:1031

5597 #, c-format

5598 msgid "could not open '%s' for writing"

5599 msgstr "impossible d'ouvrir '%s' en écriture"

@@ -5821,8 +6268,8 @@ msgstr "impossible de délier '%s' qui est errant"

6268 msgid "Recorded preimage for '%s'"

6269 msgstr "Pré-image enregistrée pour '%s'"

6270

5824 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5825 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

6271 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6272 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6273 #, c-format

6274 msgid "could not create directory '%s'"

6275 msgstr "impossible de créer le répertoire '%s'"

@@ -5856,33 +6303,33 @@ msgstr "Résolution pour '%s' oubliée\n"

6303 msgid "unable to open rr-cache directory"

6304 msgstr "impossible d'ouvrir le répertoire rr-cache"

6305

5859 -#: revision.c:2509

6306 +#: revision.c:2497

6307 msgid "your current branch appears to be broken"

6308 msgstr "votre branche actuelle semble cassée"

6309

5863 -#: revision.c:2512

6310 +#: revision.c:2500

6311 #, c-format

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

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

6314

5868 -#: revision.c:2720

6315 +#: revision.c:2708

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

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

6318

5872 -#: revision.c:2724

6319 +#: revision.c:2712

6320 msgid "-L does not yet support diff formats besides -p and -s"

6321 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

6322

5876 -#: run-command.c:763

6323 +#: run-command.c:762

6324 msgid "open /dev/null failed"

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

6326

5880 -#: run-command.c:1269

6327 +#: run-command.c:1268

6328 #, c-format

6329 msgid "cannot create async thread: %s"

6330 msgstr "impossible de créer un fil asynchrone : %s"

6331

5885 -#: run-command.c:1333

6332 +#: run-command.c:1332

6333 #, c-format

6334 msgid ""

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

@@ -5892,31 +6339,31 @@ msgstr ""

6339 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

6340 "false`."

6341

5895 -#: send-pack.c:142

6342 +#: send-pack.c:144

6343 msgid "unexpected flush packet while reading remote unpack status"

6344 msgstr ""

6345 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

6346 "distant"

6347

5901 -#: send-pack.c:144

6348 +#: send-pack.c:146

6349 #, c-format

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

6351 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

6352

5906 -#: send-pack.c:146

6353 +#: send-pack.c:148

6354 #, c-format

6355 msgid "remote unpack failed: %s"

6356 msgstr "le dépaquetage a échoué : %s"

6357

5911 -#: send-pack.c:307

6358 +#: send-pack.c:309

6359 msgid "failed to sign the push certificate"

6360 msgstr "impossible de signer le certificat de poussée"

6361

5915 -#: send-pack.c:421

6362 +#: send-pack.c:423

6363 msgid "the receiving end does not support --signed push"

6364 msgstr "Le receveur ne gère pas les poussées avec --signed"

6365

5919 -#: send-pack.c:423

6366 +#: send-pack.c:425

6367 msgid ""

6368 "not sending a push certificate since the receiving end does not support --"

6369 "signed push"

@@ -5924,47 +6371,47 @@ msgstr ""

6371 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

6372 "poussées avec --signed"

6373

5927 -#: send-pack.c:435

6374 +#: send-pack.c:437

6375 msgid "the receiving end does not support --atomic push"

6376 msgstr "Le receveur ne gère pas les poussées avec --atomic"

6377

5931 -#: send-pack.c:440

6378 +#: send-pack.c:442

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

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

6381

5935 -#: sequencer.c:187

6382 +#: sequencer.c:189

6383 #, c-format

6384 msgid "invalid commit message cleanup mode '%s'"

6385 msgstr "mode de nettoyage invalide de message de validation '%s'"

6386

5940 -#: sequencer.c:292

6387 +#: sequencer.c:294

6388 #, c-format

6389 msgid "could not delete '%s'"

6390 msgstr "Impossible de supprimer '%s'"

6391

5945 -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

6392 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6393 #, c-format

6394 msgid "could not remove '%s'"

6395 msgstr "impossible de supprimer '%s'"

6396

5950 -#: sequencer.c:321

6397 +#: sequencer.c:323

6398 msgid "revert"

6399 msgstr "revert"

6400

5954 -#: sequencer.c:323

6401 +#: sequencer.c:325

6402 msgid "cherry-pick"

6403 msgstr "cherry-pick"

6404

5958 -#: sequencer.c:325

6405 +#: sequencer.c:327

6406 msgid "rebase -i"

6407 msgstr "rebase -i"

6408

5962 -#: sequencer.c:327

6409 +#: sequencer.c:329

6410 #, c-format

6411 msgid "unknown action: %d"

6412 msgstr "action inconnue : %d"

6413

5967 -#: sequencer.c:385

6414 +#: sequencer.c:387

6415 msgid ""

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

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

@@ -5972,7 +6419,7 @@ msgstr ""

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

6420 "avec 'git add <chemins>' ou 'git rm <chemins>'"

6421

5975 -#: sequencer.c:388

6422 +#: sequencer.c:390

6423 msgid ""

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

6425 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5982,44 +6429,44 @@ msgstr ""

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

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

6431

5985 -#: sequencer.c:401 sequencer.c:2847

6432 +#: sequencer.c:403 sequencer.c:2993

6433 #, c-format

6434 msgid "could not lock '%s'"

6435 msgstr "impossible de verrouiller '%s'"

6436

5990 -#: sequencer.c:408

6437 +#: sequencer.c:410

6438 #, c-format

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

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

6441

5995 -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5996 -#: sequencer.c:3130

6442 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6443 +#: sequencer.c:3277

6444 #, c-format

6445 msgid "failed to finalize '%s'"

6446 msgstr "échec lors de la finalisation de '%s'"

6447

6001 -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

6002 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

6003 -#: builtin/rebase.c:568

6448 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6449 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6450 +#: builtin/rebase.c:589

6451 #, c-format

6452 msgid "could not read '%s'"

6453 msgstr "impossible de lire '%s'"

6454

6008 -#: sequencer.c:462

6455 +#: sequencer.c:464

6456 #, c-format

6457 msgid "your local changes would be overwritten by %s."

6458 msgstr "vos modifications locales seraient écrasées par %s."

6459

6013 -#: sequencer.c:466

6460 +#: sequencer.c:468

6461 msgid "commit your changes or stash them to proceed."

6462 msgstr "validez vos modifications ou les remiser pour continuer."

6463

6017 -#: sequencer.c:498

6464 +#: sequencer.c:500

6465 #, c-format

6466 msgid "%s: fast-forward"

6467 msgstr "%s : avance rapide"

6468

6022 -#: sequencer.c:537 builtin/tag.c:565

6469 +#: sequencer.c:539 builtin/tag.c:565

6470 #, c-format

6471 msgid "Invalid cleanup mode %s"

6472 msgstr "Mode de nettoyage invalide %s"

@@ -6027,65 +6474,69 @@ msgstr "Mode de nettoyage invalide %s"

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

6475 #. "rebase -i".

6476 #.

6030 -#: sequencer.c:631

6477 +#: sequencer.c:633

6478 #, c-format

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

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

6481

6035 -#: sequencer.c:648

6482 +#: sequencer.c:650

6483 msgid "unable to update cache tree"

6484 msgstr "impossible de mettre à jour l'arbre de cache"

6485

6039 -#: sequencer.c:662

6486 +#: sequencer.c:664

6487 msgid "could not resolve HEAD commit"

6488 msgstr "impossible de résoudre le commit HEAD"

6489

6043 -#: sequencer.c:742

6490 +#: sequencer.c:744

6491 #, c-format

6492 msgid "no key present in '%.*s'"

6493 msgstr "aucune clé présente dans '%.*s'"

6494

6048 -#: sequencer.c:753

6495 +#: sequencer.c:755

6496 #, c-format

6497 msgid "unable to dequote value of '%s'"

6498 msgstr "Impossible de décoter la valeur de '%s'"

6499

6053 -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6054 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

6500 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6501 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6502 #, c-format

6503 msgid "could not open '%s' for reading"

6504 msgstr "impossible d'ouvrir '%s' en lecture"

6505

6059 -#: sequencer.c:800

6506 +#: sequencer.c:802

6507 msgid "'GIT_AUTHOR_NAME' already given"

6508 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

6509

6063 -#: sequencer.c:805

6510 +#: sequencer.c:807

6511 msgid "'GIT_AUTHOR_EMAIL' already given"

6512 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

6513

6067 -#: sequencer.c:810

6514 +#: sequencer.c:812

6515 msgid "'GIT_AUTHOR_DATE' already given"

6516 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

6517

6071 -#: sequencer.c:814

6518 +#: sequencer.c:816

6519 #, c-format

6520 msgid "unknown variable '%s'"

6521 msgstr "variable inconnue '%s'"

6522

6076 -#: sequencer.c:819

6523 +#: sequencer.c:821

6524 msgid "missing 'GIT_AUTHOR_NAME'"

6525 msgstr "'GIT_AUTHOR_NAME' manquant"

6526

6080 -#: sequencer.c:821

6527 +#: sequencer.c:823

6528 msgid "missing 'GIT_AUTHOR_EMAIL'"

6529 msgstr "'GIT_AUTHOR_EMAIL' manquant"

6530

6084 -#: sequencer.c:823

6531 +#: sequencer.c:825

6532 msgid "missing 'GIT_AUTHOR_DATE'"

6533 msgstr "'GIT_AUTHOR_DATE' manquant"

6534

6088 -#: sequencer.c:872

6535 +#: sequencer.c:902 sequencer.c:1427

6536 +msgid "malformed ident line"

6537 +msgstr "ligne d'identification malformée"

6538 +

6539 +#: sequencer.c:925

6540 #, c-format

6541 msgid ""

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

@@ -6114,11 +6565,11 @@ msgstr ""

6565 "\n"

6566 " git rebase --continue\n"

6567

6117 -#: sequencer.c:1146

6568 +#: sequencer.c:1218

6569 msgid "'prepare-commit-msg' hook failed"

6570 msgstr "échec du crochet 'prepare-commit-msg'"

6571

6121 -#: sequencer.c:1153

6572 +#: sequencer.c:1224

6573 msgid ""

6574 "Your name and email address were configured automatically based\n"

6575 "on your username and hostname. Please check that they are accurate.\n"

@@ -6147,7 +6598,7 @@ msgstr ""

6598 "\n"

6599 " git commit --amend --reset-author\n"

6600

6150 -#: sequencer.c:1166

6601 +#: sequencer.c:1237

6602 msgid ""

6603 "Your name and email address were configured automatically based\n"

6604 "on your username and hostname. Please check that they are accurate.\n"

@@ -6173,326 +6624,330 @@ msgstr ""

6624 "\n"

6625 " git commit --amend --reset-author\n"

6626

6176 -#: sequencer.c:1208

6627 +#: sequencer.c:1279

6628 msgid "couldn't look up newly created commit"

6629 msgstr "impossible de retrouver le commit nouvellement créé"

6630

6180 -#: sequencer.c:1210

6631 +#: sequencer.c:1281

6632 msgid "could not parse newly created commit"

6633 msgstr "impossible d'analyser le commit nouvellement créé"

6634

6184 -#: sequencer.c:1256

6635 +#: sequencer.c:1327

6636 msgid "unable to resolve HEAD after creating commit"

6637 msgstr "impossible de résoudre HEAD après création du commit"

6638

6188 -#: sequencer.c:1258

6639 +#: sequencer.c:1329

6640 msgid "detached HEAD"

6641 msgstr "HEAD détachée"

6642

6192 -#: sequencer.c:1262

6643 +#: sequencer.c:1333

6644 msgid " (root-commit)"

6645 msgstr " (commit racine)"

6646

6196 -#: sequencer.c:1283

6647 +#: sequencer.c:1354

6648 msgid "could not parse HEAD"

6649 msgstr "impossible de lire HEAD"

6650

6200 -#: sequencer.c:1285

6651 +#: sequencer.c:1356

6652 #, c-format

6653 msgid "HEAD %s is not a commit!"

6654 msgstr "HEAD %s n'est pas un commit !"

6655

6205 -#: sequencer.c:1289 builtin/commit.c:1571

6656 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6657 msgid "could not parse HEAD commit"

6658 msgstr "impossible d'analyser le commit HEAD"

6659

6209 -#: sequencer.c:1341 sequencer.c:1933

6660 +#: sequencer.c:1411 sequencer.c:2055

6661 msgid "unable to parse commit author"

6662 msgstr "impossible d'analyser l'auteur du commit"

6663

6213 -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6664 +#: sequencer.c:1431

6665 +msgid "corrupted author without date information"

6666 +msgstr "ligne author corrompue sans information de date"

6667 +

6668 +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6669 msgid "git write-tree failed to write a tree"

6670 msgstr "git write-tree a échoué à écrire un arbre"

6671

6217 -#: sequencer.c:1369 sequencer.c:1429

6672 +#: sequencer.c:1480 sequencer.c:1550

6673 #, c-format

6674 msgid "unable to read commit message from '%s'"

6675 msgstr "impossible de lire le message de validation de '%s'"

6676

6222 -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6677 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6678 #: builtin/merge.c:908

6679 msgid "failed to write commit object"

6680 msgstr "échec de l'écriture de l'objet commit"

6681

6227 -#: sequencer.c:1456

6682 +#: sequencer.c:1577

6683 #, c-format

6684 msgid "could not parse commit %s"

6685 msgstr "impossible d'analyser le commit %s"

6686

6232 -#: sequencer.c:1461

6687 +#: sequencer.c:1582

6688 #, c-format

6689 msgid "could not parse parent commit %s"

6690 msgstr "impossible d'analyser le commit parent %s"

6691

6237 -#: sequencer.c:1535 sequencer.c:1645

6692 +#: sequencer.c:1656 sequencer.c:1767

6693 #, c-format

6694 msgid "unknown command: %d"

6695 msgstr "commande inconnue : %d"

6696

6242 -#: sequencer.c:1592 sequencer.c:1617

6697 +#: sequencer.c:1714 sequencer.c:1739

6698 #, c-format

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

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

6701

6247 -#: sequencer.c:1602

6702 +#: sequencer.c:1724

6703 msgid "need a HEAD to fixup"

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

6705

6251 -#: sequencer.c:1604 sequencer.c:3157

6706 +#: sequencer.c:1726 sequencer.c:3304

6707 msgid "could not read HEAD"

6708 msgstr "Impossible de lire HEAD"

6709

6255 -#: sequencer.c:1606

6710 +#: sequencer.c:1728

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

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

6713

6259 -#: sequencer.c:1612

6714 +#: sequencer.c:1734

6715 #, c-format

6716 msgid "cannot write '%s'"

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

6718

6264 -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6719 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

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

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

6722

6268 -#: sequencer.c:1627

6723 +#: sequencer.c:1749

6724 #, c-format

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

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

6727

6273 -#: sequencer.c:1634

6728 +#: sequencer.c:1756

6729 #, c-format

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

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

6732

6278 -#: sequencer.c:1640

6733 +#: sequencer.c:1762

6734 #, c-format

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

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

6737

6283 -#: sequencer.c:1728

6738 +#: sequencer.c:1850

6739 msgid "your index file is unmerged."

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

6741

6287 -#: sequencer.c:1735

6742 +#: sequencer.c:1857

6743 msgid "cannot fixup root commit"

6744 msgstr "impossible de réparer le commit racine"

6745

6291 -#: sequencer.c:1754

6746 +#: sequencer.c:1876

6747 #, c-format

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

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

6750

6296 -#: sequencer.c:1762 sequencer.c:1770

6751 +#: sequencer.c:1884 sequencer.c:1892

6752 #, c-format

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

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

6755

6301 -#: sequencer.c:1776

6756 +#: sequencer.c:1898

6757 #, c-format

6758 msgid "cannot get commit message for %s"

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

6760

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

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

6308 -#: sequencer.c:1795

6763 +#: sequencer.c:1917

6764 #, c-format

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

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

6767

6313 -#: sequencer.c:1860

6768 +#: sequencer.c:1982

6769 #, c-format

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

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

6772

6318 -#: sequencer.c:1915

6773 +#: sequencer.c:2037

6774 #, c-format

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

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

6777

6323 -#: sequencer.c:1916

6778 +#: sequencer.c:2038

6779 #, c-format

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

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

6782

6328 -#: sequencer.c:1983

6783 +#: sequencer.c:2105

6784 #, c-format

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

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

6787

6333 -#: sequencer.c:1990

6788 +#: sequencer.c:2112

6789 #, c-format

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

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

6792

6338 -#: sequencer.c:2066

6793 +#: sequencer.c:2189

6794 #, c-format

6795 msgid "%s does not accept arguments: '%s'"

6796 msgstr "%s n'accepte pas d'argument : '%s'"

6797

6343 -#: sequencer.c:2075

6798 +#: sequencer.c:2198

6799 #, c-format

6800 msgid "missing arguments for %s"

6801 msgstr "argument manquant pour %s"

6802

6348 -#: sequencer.c:2112

6803 +#: sequencer.c:2235

6804 #, c-format

6805 msgid "could not parse '%.*s'"

6806 msgstr "impossible d'analyser '%.*s'"

6807

6353 -#: sequencer.c:2166

6808 +#: sequencer.c:2289

6809 #, c-format

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

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

6812

6358 -#: sequencer.c:2177

6813 +#: sequencer.c:2300

6814 #, c-format

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

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

6817

6363 -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6364 -#: builtin/rebase.c:204 builtin/rebase.c:229

6818 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6819 +#: builtin/rebase.c:223 builtin/rebase.c:248

6820 #, c-format

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

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

6823

6369 -#: sequencer.c:2261

6824 +#: sequencer.c:2384

6825 msgid "cancelling a cherry picking in progress"

6826 msgstr "annulation d'un picorage en cours"

6827

6373 -#: sequencer.c:2268

6828 +#: sequencer.c:2391

6829 msgid "cancelling a revert in progress"

6830 msgstr "annulation d'un retour en cours"

6831

6377 -#: sequencer.c:2302

6832 +#: sequencer.c:2435

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

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

6835

6381 -#: sequencer.c:2304

6836 +#: sequencer.c:2437

6837 #, c-format

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

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

6840

6386 -#: sequencer.c:2309

6841 +#: sequencer.c:2442

6842 msgid "no commits parsed."

6843 msgstr "aucun commit analysé."

6844

6390 -#: sequencer.c:2320

6845 +#: sequencer.c:2453

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

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

6848

6394 -#: sequencer.c:2322

6849 +#: sequencer.c:2455

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

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

6852

6398 -#: sequencer.c:2404

6853 +#: sequencer.c:2533

6854 #, c-format

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

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

6857

6403 -#: sequencer.c:2491

6858 +#: sequencer.c:2630

6859 msgid "unusable squash-onto"

6860 msgstr "\"écrase-sur\" inutilisable"

6861

6407 -#: sequencer.c:2507

6862 +#: sequencer.c:2646

6863 #, c-format

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

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

6866

6412 -#: sequencer.c:2590 sequencer.c:4308

6867 +#: sequencer.c:2736 sequencer.c:4463

6868 msgid "empty commit set passed"

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

6870

6416 -#: sequencer.c:2606

6871 +#: sequencer.c:2752

6872 msgid "revert is already in progress"

6873 msgstr "un retour est déjà en cours"

6874

6420 -#: sequencer.c:2608

6875 +#: sequencer.c:2754

6876 #, c-format

6877 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6878 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""

6879

6425 -#: sequencer.c:2611

6880 +#: sequencer.c:2757

6881 msgid "cherry-pick is already in progress"

6882 msgstr "un picorage est déjà en cours"

6883

6429 -#: sequencer.c:2613

6884 +#: sequencer.c:2759

6885 #, c-format

6886 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6887 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""

6888

6434 -#: sequencer.c:2627

6889 +#: sequencer.c:2773

6890 #, c-format

6891 msgid "could not create sequencer directory '%s'"

6892 msgstr "impossible de créer le répertoire de séquenceur '%s'"

6893

6439 -#: sequencer.c:2642

6894 +#: sequencer.c:2788

6895 msgid "could not lock HEAD"

6896 msgstr "impossible de verrouiller HEAD"

6897

6443 -#: sequencer.c:2702 sequencer.c:4057

6898 +#: sequencer.c:2848 sequencer.c:4209

6899 msgid "no cherry-pick or revert in progress"

6900 msgstr "aucun picorage ou retour en cours"

6901

6447 -#: sequencer.c:2704 sequencer.c:2715

6902 +#: sequencer.c:2850 sequencer.c:2861

6903 msgid "cannot resolve HEAD"

6904 msgstr "impossible de résoudre HEAD"

6905

6451 -#: sequencer.c:2706 sequencer.c:2750

6906 +#: sequencer.c:2852 sequencer.c:2896

6907 msgid "cannot abort from a branch yet to be born"

6908 msgstr "impossible d'abandonner depuis une branche non encore créée"

6909

6455 -#: sequencer.c:2736 builtin/grep.c:736

6910 +#: sequencer.c:2882 builtin/grep.c:736

6911 #, c-format

6912 msgid "cannot open '%s'"

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

6914

6460 -#: sequencer.c:2738

6915 +#: sequencer.c:2884

6916 #, c-format

6917 msgid "cannot read '%s': %s"

6918 msgstr "impossible de lire '%s' : %s"

6919

6465 -#: sequencer.c:2739

6920 +#: sequencer.c:2885

6921 msgid "unexpected end of file"

6922 msgstr "fin de fichier inattendue"

6923

6469 -#: sequencer.c:2745

6924 +#: sequencer.c:2891

6925 #, c-format

6926 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

6927 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

6928

6474 -#: sequencer.c:2756

6929 +#: sequencer.c:2902

6930 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6931 msgstr ""

6932 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

6933

6479 -#: sequencer.c:2797

6934 +#: sequencer.c:2943

6935 msgid "no revert in progress"

6936 msgstr "Pas de retour en cours ?"

6937

6483 -#: sequencer.c:2805

6938 +#: sequencer.c:2951

6939 msgid "no cherry-pick in progress"

6940 msgstr "aucun picorage en cours"

6941

6487 -#: sequencer.c:2815

6942 +#: sequencer.c:2961

6943 msgid "failed to skip the commit"

6944 msgstr "échec du saut de commit"

6945

6491 -#: sequencer.c:2822

6946 +#: sequencer.c:2968

6947 msgid "there is nothing to skip"

6948 msgstr "il n'y a rien à sauter"

6949

6495 -#: sequencer.c:2825

6950 +#: sequencer.c:2971

6951 #, c-format

6952 msgid ""

6953 "have you committed already?\n"

@@ -6501,21 +6956,21 @@ msgstr ""

6956 "Avez-vous déjà validé ?\n"

6957 "essayez \"git %s -continue\""

6958

6504 -#: sequencer.c:2949 sequencer.c:3969

6959 +#: sequencer.c:3095 sequencer.c:4121

6960 #, c-format

6961 msgid "could not update %s"

6962 msgstr "impossible de mettre à jour %s"

6963

6509 -#: sequencer.c:2987 sequencer.c:3949

6964 +#: sequencer.c:3134 sequencer.c:4101

6965 msgid "cannot read HEAD"

6966 msgstr "impossible de lire HEAD"

6967

6513 -#: sequencer.c:3004

6968 +#: sequencer.c:3151

6969 #, c-format

6970 msgid "unable to copy '%s' to '%s'"

6971 msgstr "impossible de copier '%s' vers '%s'"

6972

6518 -#: sequencer.c:3012

6973 +#: sequencer.c:3159

6974 #, c-format

6975 msgid ""

6976 "You can amend the commit now, with\n"

@@ -6534,27 +6989,22 @@ msgstr ""

6989 "\n"

6990 " git rebase --continue\n"

6991

6537 -#: sequencer.c:3022

6992 +#: sequencer.c:3169

6993 #, c-format

6994 msgid "Could not apply %s... %.*s"

6995 msgstr "impossible d'appliquer %s... %.*s"

6996

6542 -#: sequencer.c:3029

6997 +#: sequencer.c:3176

6998 #, c-format

6999 msgid "Could not merge %.*s"

7000 msgstr "Impossible de fusionner %.*s"

7001

6547 -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641

7002 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

7003 #, c-format

7004 msgid "could not copy '%s' to '%s'"

7005 msgstr "impossible de copier '%s' vers '%s'"

7006

6552 -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613

6553 -#: builtin/rebase.c:1987 builtin/rebase.c:2031

6554 -msgid "could not read index"

6555 -msgstr "impossible de lire l'index"

6556 -

6557 -#: sequencer.c:3074

7007 +#: sequencer.c:3221

7008 #, c-format

7009 msgid ""

7010 "execution failed: %s\n"

@@ -6569,11 +7019,11 @@ msgstr ""

7019 "git rebase --continue\n"

7020 "\n"

7021

6572 -#: sequencer.c:3080

7022 +#: sequencer.c:3227

7023 msgid "and made changes to the index and/or the working tree\n"

7024 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

7025

6576 -#: sequencer.c:3086

7026 +#: sequencer.c:3233

7027 #, c-format

7028 msgid ""

7029 "execution succeeded: %s\n"

@@ -6590,77 +7040,73 @@ msgstr ""

7040 " git rebase --continue\n"

7041 "\n"

7042

6593 -#: sequencer.c:3147

7043 +#: sequencer.c:3294

7044 #, c-format

7045 msgid "illegal label name: '%.*s'"

7046 msgstr "nom de label illégal '%.*s'"

7047

6598 -#: sequencer.c:3201

7048 +#: sequencer.c:3348

7049 msgid "writing fake root commit"

7050 msgstr "écriture d'un commit racine bidon"

7051

6602 -#: sequencer.c:3206

7052 +#: sequencer.c:3353

7053 msgid "writing squash-onto"

7054 msgstr "écriture de 'écraser-sur'"

7055

6606 -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861

7056 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

7057 #, c-format

7058 msgid "failed to find tree of %s"

7059 msgstr "impossible de trouver l'arbre de %s"

7060

6611 -#: sequencer.c:3262 builtin/rebase.c:874

6612 -msgid "could not write index"

6613 -msgstr "impossible d'écrire l'index"

6614 -

6615 -#: sequencer.c:3289

7061 +#: sequencer.c:3436

7062 #, c-format

7063 msgid "could not resolve '%s'"

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

7065

6620 -#: sequencer.c:3320

7066 +#: sequencer.c:3467

7067 msgid "cannot merge without a current revision"

7068 msgstr "impossible de fusionner avec une révision courante"

7069

6624 -#: sequencer.c:3342

7070 +#: sequencer.c:3489

7071 #, c-format

7072 msgid "unable to parse '%.*s'"

7073 msgstr "impossible d'analyser '%.*s'"

7074

6629 -#: sequencer.c:3351

7075 +#: sequencer.c:3498

7076 #, c-format

7077 msgid "nothing to merge: '%.*s'"

7078 msgstr "rien à fusionner : '%.*s'"

7079

6634 -#: sequencer.c:3363

7080 +#: sequencer.c:3510

7081 msgid "octopus merge cannot be executed on top of a [new root]"

7082 msgstr ""

7083 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

7084

6639 -#: sequencer.c:3378

7085 +#: sequencer.c:3526

7086 #, c-format

7087 msgid "could not get commit message of '%s'"

7088 msgstr "impossible de lire le message de validation de '%s'"

7089

6644 -#: sequencer.c:3538

7090 +#: sequencer.c:3688

7091 #, c-format

7092 msgid "could not even attempt to merge '%.*s'"

7093 msgstr "impossible de seulement essayer de fusionner '%.*s'"

7094

6649 -#: sequencer.c:3554

7095 +#: sequencer.c:3704

7096 msgid "merge: Unable to write new index file"

7097 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

7098

6653 -#: sequencer.c:3623 builtin/rebase.c:712

7099 +#: sequencer.c:3773 builtin/rebase.c:733

7100 #, c-format

7101 msgid "Applied autostash.\n"

7102 msgstr "Autoremisage appliqué.\n"

7103

6658 -#: sequencer.c:3635

7104 +#: sequencer.c:3785

7105 #, c-format

7106 msgid "cannot store %s"

7107 msgstr "impossible de stocker %s"

7108

6663 -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113

7109 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

7110 #, c-format

7111 msgid ""

7112 "Applying autostash resulted in conflicts.\n"

@@ -6671,31 +7117,31 @@ msgstr ""

7117 "Vos modifications sont à l'abri dans la remise.\n"

7118 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

7119

6674 -#: sequencer.c:3699

7120 +#: sequencer.c:3849

7121 #, c-format

7122 msgid "could not checkout %s"

7123 msgstr "extraction de %s impossible"

7124

6679 -#: sequencer.c:3713

7125 +#: sequencer.c:3863

7126 #, c-format

7127 msgid "%s: not a valid OID"

7128 msgstr "%s n'est pas un OID valide"

7129

6684 -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779

7130 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

7131 msgid "could not detach HEAD"

7132 msgstr "Impossible de détacher HEAD"

7133

6688 -#: sequencer.c:3733

7134 +#: sequencer.c:3883

7135 #, c-format

7136 msgid "Stopped at HEAD\n"

7137 msgstr "arrêt à HEAD\n"

7138

6693 -#: sequencer.c:3735

7139 +#: sequencer.c:3885

7140 #, c-format

7141 msgid "Stopped at %s\n"

7142 msgstr "Arrêté à %s\n"

7143

6698 -#: sequencer.c:3743

7144 +#: sequencer.c:3893

7145 #, c-format

7146 msgid ""

7147 "Could not execute the todo command\n"

@@ -6716,48 +7162,48 @@ msgstr ""

7162 " git rebase --edit-todo\n"

7163 " git rebase --continue\n"

7164

6719 -#: sequencer.c:3827

7165 +#: sequencer.c:3979

7166 #, c-format

7167 msgid "Stopped at %s... %.*s\n"

7168 msgstr "arrêt à %s... %.*s\n"

7169

6724 -#: sequencer.c:3898

7170 +#: sequencer.c:4050

7171 #, c-format

7172 msgid "unknown command %d"

7173 msgstr "commande inconnue %d"

7174

6729 -#: sequencer.c:3957

7175 +#: sequencer.c:4109

7176 msgid "could not read orig-head"

7177 msgstr "impossible de lire orig-head"

7178

6733 -#: sequencer.c:3962

7179 +#: sequencer.c:4114

7180 msgid "could not read 'onto'"

7181 msgstr "impossible de lire 'onto'"

7182

6737 -#: sequencer.c:3976

7183 +#: sequencer.c:4128

7184 #, c-format

7185 msgid "could not update HEAD to %s"

7186 msgstr "impossible de mettre à jour HEAD sur %s"

7187

6742 -#: sequencer.c:4069

7188 +#: sequencer.c:4221

7189 msgid "cannot rebase: You have unstaged changes."

7190 msgstr "impossible de rebaser : vous avez des modifications non indexées."

7191

6746 -#: sequencer.c:4078

7192 +#: sequencer.c:4230

7193 msgid "cannot amend non-existing commit"

7194 msgstr "impossible de corriger un commit non-existant"

7195

6750 -#: sequencer.c:4080

7196 +#: sequencer.c:4232

7197 #, c-format

7198 msgid "invalid file: '%s'"

7199 msgstr "fichier invalide : '%s'"

7200

6755 -#: sequencer.c:4082

7201 +#: sequencer.c:4234

7202 #, c-format

7203 msgid "invalid contents: '%s'"

7204 msgstr "contenu invalide : '%s'"

7205

6760 -#: sequencer.c:4085

7206 +#: sequencer.c:4237

7207 msgid ""

7208 "\n"

7209 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -6767,42 +7213,42 @@ msgstr ""

7213 "Vous avez des modifications non validées dans votre copie de travail.\n"

7214 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

7215

6770 -#: sequencer.c:4121 sequencer.c:4159

7216 +#: sequencer.c:4273 sequencer.c:4312

7217 #, c-format

7218 msgid "could not write file: '%s'"

7219 msgstr "impossible d'écrire le fichier : '%s'"

7220

6775 -#: sequencer.c:4174

7221 +#: sequencer.c:4327

7222 msgid "could not remove CHERRY_PICK_HEAD"

7223 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

7224

6779 -#: sequencer.c:4181

7225 +#: sequencer.c:4334

7226 msgid "could not commit staged changes."

7227 msgstr "impossible de valider les modifications indexées."

7228

6783 -#: sequencer.c:4285

7229 +#: sequencer.c:4440

7230 #, c-format

7231 msgid "%s: can't cherry-pick a %s"

7232 msgstr "%s : impossible de picorer un %s"

7233

6788 -#: sequencer.c:4289

7234 +#: sequencer.c:4444

7235 #, c-format

7236 msgid "%s: bad revision"

7237 msgstr "%s : mauvaise révision"

7238

6793 -#: sequencer.c:4324

7239 +#: sequencer.c:4479

7240 msgid "can't revert as initial commit"

7241 msgstr "impossible d'annuler en tant que commit initial"

7242

6797 -#: sequencer.c:4774

7243 +#: sequencer.c:4952

7244 msgid "make_script: unhandled options"

7245 msgstr "make_script : options non gérées"

7246

6801 -#: sequencer.c:4777

7247 +#: sequencer.c:4955

7248 msgid "make_script: error preparing revisions"

7249 msgstr "make_script : erreur lors de la préparation des révisions"

7250

6805 -#: sequencer.c:4935

7251 +#: sequencer.c:5113

7252 msgid ""

7253 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7254 "continue'.\n"

@@ -6812,15 +7258,15 @@ msgstr ""

7258 "rebase --continue'.\n"

7259 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

7260

6815 -#: sequencer.c:5047 sequencer.c:5064

7261 +#: sequencer.c:5226 sequencer.c:5243

7262 msgid "nothing to do"

7263 msgstr "rien à faire"

7264

6819 -#: sequencer.c:5078

7265 +#: sequencer.c:5257

7266 msgid "could not skip unnecessary pick commands"

7267 msgstr "impossible d'éviter les commandes de picorage non nécessaires"

7268

6823 -#: sequencer.c:5166

7269 +#: sequencer.c:5351

7270 msgid "the script was already rearranged."

7271 msgstr "le script a déjà été réarrangé."

7272

@@ -7331,6 +7777,11 @@ msgid_plural "%u bytes/s"

7777 msgstr[0] "%u octet/s"

7778 msgstr[1] "%u octets/s"

7779

7780 +#: strbuf.c:1149

7781 +#, c-format

7782 +msgid "could not edit '%s'"

7783 +msgstr "impossible d'éditer '%s'"

7784 +

7785 #: submodule.c:114 submodule.c:143

7786 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

7787 msgstr ""

@@ -7367,7 +7818,7 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

7818 msgid "submodule entry '%s' (%s) is a %s, not a commit"

7819 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

7820

7370 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989

7821 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

7822 msgid "Failed to resolve HEAD as a valid ref."

7823 msgstr "Échec de résolution de HEAD comme référence valide."

7824

@@ -7406,7 +7857,12 @@ msgstr "le sous-module '%s' a un index sale"

7857 msgid "Submodule '%s' could not be updated."

7858 msgstr "le sous-module '%s' n'a pas pu être mis à jour."

7859

7409 -#: submodule.c:2007

7860 +#: submodule.c:2027

7861 +#, c-format

7862 +msgid "submodule git dir '%s' is inside git dir '%.*s'"

7863 +msgstr "le répertoire git du sous-module '%s' est à l'intérieur du répertoire git '%.*s'"

7864 +

7865 +#: submodule.c:2048

7866 #, c-format

7867 msgid ""

7868 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -7414,12 +7870,17 @@ msgstr ""

7870 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

7871 "n'est pas supporté"

7872

7417 -#: submodule.c:2019 submodule.c:2074

7873 +#: submodule.c:2060 submodule.c:2119

7874 #, c-format

7875 msgid "could not lookup name for submodule '%s'"

7876 msgstr "impossible de trouve le nom pour le sous-module '%s'"

7877

7422 -#: submodule.c:2026

7878 +#: submodule.c:2064

7879 +#, c-format

7880 +msgid "refusing to move '%s' into an existing git dir"

7881 +msgstr "refus de déplacer '%s' dans une répertoire git existant"

7882 +

7883 +#: submodule.c:2071

7884 #, c-format

7885 msgid ""

7886 "Migrating git directory of '%s%s' from\n"

@@ -7430,16 +7891,16 @@ msgstr ""

7891 "'%s' sur\n"

7892 "'%s'\n"

7893

7433 -#: submodule.c:2109

7894 +#: submodule.c:2154

7895 #, c-format

7896 msgid "could not recurse into submodule '%s'"

7897 msgstr "récursion impossible dans le sous-module '%s'"

7898

7438 -#: submodule.c:2153

7899 +#: submodule.c:2198

7900 msgid "could not start ls-files in .."

7901 msgstr "impossible de démarrer ls-files dans .."

7902

7442 -#: submodule.c:2192

7903 +#: submodule.c:2237

7904 #, c-format

7905 msgid "ls-tree returned unexpected return code %d"

7906 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

@@ -7460,12 +7921,12 @@ msgstr ""

7921 "'%s' ignoré et qui peut être interprété comme une option de ligne de "

7922 "commande : %s"

7923

7463 -#: submodule-config.c:490

7924 +#: submodule-config.c:498

7925 #, c-format

7926 msgid "invalid value for %s"

7927 msgstr "Valeur invalide pour %s"

7928

7468 -#: submodule-config.c:761

7929 +#: submodule-config.c:769

7930 #, c-format

7931 msgid "Could not update .gitmodules entry %s"

7932 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

@@ -7613,7 +8074,7 @@ msgstr "Abandon."

8074 msgid "failed to push all needed submodules"

8075 msgstr "échec de la poussée de tous les sous-modules nécessaires"

8076

7616 -#: transport.c:1345 transport-helper.c:655

8077 +#: transport.c:1345 transport-helper.c:656

8078 msgid "operation not supported by protocol"

8079 msgstr "option non supportée par le protocole"

8080

@@ -7626,7 +8087,7 @@ msgstr "échec de l'écriture totale sur l'assistant distant"

8087 msgid "unable to find remote helper for '%s'"

8088 msgstr "Impossible de trouver un assistant distant pour '%s'"

8089

7629 -#: transport-helper.c:160 transport-helper.c:569

8090 +#: transport-helper.c:160 transport-helper.c:570

8091 msgid "can't dup helper output fd"

8092 msgstr ""

8093 "impossible de dupliquer le descripteur de flux de sortie de l'assistant"

@@ -7654,94 +8115,94 @@ msgstr "%s a dit de manière inattendue : '%s'"

8115 msgid "%s also locked %s"

8116 msgstr "%s a aussi verrouillé %s"

8117

7657 -#: transport-helper.c:491

8118 +#: transport-helper.c:492

8119 msgid "couldn't run fast-import"

8120 msgstr "impossible de lancer fast-import"

8121

7661 -#: transport-helper.c:514

8122 +#: transport-helper.c:515

8123 msgid "error while running fast-import"

8124 msgstr "erreur au lancement de fast-import"

8125

7665 -#: transport-helper.c:543 transport-helper.c:1132

8126 +#: transport-helper.c:544 transport-helper.c:1133

8127 #, c-format

8128 msgid "could not read ref %s"

8129 msgstr "impossible de lire la réf %s"

8130

7670 -#: transport-helper.c:588

8131 +#: transport-helper.c:589

8132 #, c-format

8133 msgid "unknown response to connect: %s"

8134 msgstr "réponse inconnue à connect : %s"

8135

7675 -#: transport-helper.c:610

8136 +#: transport-helper.c:611

8137 msgid "setting remote service path not supported by protocol"

8138 msgstr ""

8139 "la spécification du chemin de service distant n'est pas supportée par le "

8140 "protocole"

8141

7681 -#: transport-helper.c:612

8142 +#: transport-helper.c:613

8143 msgid "invalid remote service path"

8144 msgstr "chemin de service distant invalide"

8145

7685 -#: transport-helper.c:658

8146 +#: transport-helper.c:659

8147 #, c-format

8148 msgid "can't connect to subservice %s"

8149 msgstr "impossible de se connecter au sous-service %s"

8150

7690 -#: transport-helper.c:734

8151 +#: transport-helper.c:735

8152 #, c-format

8153 msgid "expected ok/error, helper said '%s'"

8154 msgstr "ok/error attendu, l'assistant a dit '%s'"

8155

7695 -#: transport-helper.c:787

8156 +#: transport-helper.c:788

8157 #, c-format

8158 msgid "helper reported unexpected status of %s"

8159 msgstr "l'assistant a renvoyé un statut de retour inattendu %s"

8160

7700 -#: transport-helper.c:848

8161 +#: transport-helper.c:849

8162 #, c-format

8163 msgid "helper %s does not support dry-run"

8164 msgstr "l'assistant %s ne gère pas dry-run"

8165

7705 -#: transport-helper.c:851

8166 +#: transport-helper.c:852

8167 #, c-format

8168 msgid "helper %s does not support --signed"

8169 msgstr "l'assistant %s ne gère pas --signed"

8170

7710 -#: transport-helper.c:854

8171 +#: transport-helper.c:855

8172 #, c-format

8173 msgid "helper %s does not support --signed=if-asked"

8174 msgstr "l'assistant %s ne gère pas --signed=if-asked"

8175

7715 -#: transport-helper.c:859

8176 +#: transport-helper.c:860

8177 #, c-format

8178 msgid "helper %s does not support --atomic"

8179 msgstr "l'assistant %s ne gère pas --atomic"

8180

7720 -#: transport-helper.c:865

8181 +#: transport-helper.c:866

8182 #, c-format

8183 msgid "helper %s does not support 'push-option'"

8184 msgstr "l'assistant %s ne gère pas 'push-option'"

8185

7725 -#: transport-helper.c:963

8186 +#: transport-helper.c:964

8187 msgid "remote-helper doesn't support push; refspec needed"

8188 msgstr ""

8189 "l'assistant %s ne gère pas push ; un spécificateur de référence est "

8190 "nécessaire"

8191

7731 -#: transport-helper.c:968

8192 +#: transport-helper.c:969

8193 #, c-format

8194 msgid "helper %s does not support 'force'"

8195 msgstr "l'assistant %s ne gère pas 'force'"

8196

7736 -#: transport-helper.c:1015

8197 +#: transport-helper.c:1016

8198 msgid "couldn't run fast-export"

8199 msgstr "impossible de lancer fast-export"

8200

7740 -#: transport-helper.c:1020

8201 +#: transport-helper.c:1021

8202 msgid "error while running fast-export"

8203 msgstr "erreur au lancement de fast-export"

8204

7744 -#: transport-helper.c:1045

8205 +#: transport-helper.c:1046

8206 #, c-format

8207 msgid ""

8208 "No refs in common and none specified; doing nothing.\n"

@@ -7750,47 +8211,47 @@ msgstr ""

8211 "Aucune référence en commun et aucune spécfiée ; rien à faire.\n"

8212 "Vous devriez peut-être spécifier une branche telle que 'master'.\n"

8213

7753 -#: transport-helper.c:1118

8214 +#: transport-helper.c:1119

8215 #, c-format

8216 msgid "malformed response in ref list: %s"

8217 msgstr "réponse malformée dans le liste de réfs : %s"

8218

7758 -#: transport-helper.c:1270

8219 +#: transport-helper.c:1271

8220 #, c-format

8221 msgid "read(%s) failed"

8222 msgstr "échec de read(%s)"

8223

7763 -#: transport-helper.c:1297

8224 +#: transport-helper.c:1298

8225 #, c-format

8226 msgid "write(%s) failed"

8227 msgstr "échec de write(%s)"

8228

7768 -#: transport-helper.c:1346

8229 +#: transport-helper.c:1347

8230 #, c-format

8231 msgid "%s thread failed"

8232 msgstr "échec du fil d'exécution %s"

8233

7773 -#: transport-helper.c:1350

8234 +#: transport-helper.c:1351

8235 #, c-format

8236 msgid "%s thread failed to join: %s"

8237 msgstr "échec de jonction du fil d'exécution %s : %s"

8238

7778 -#: transport-helper.c:1369 transport-helper.c:1373

8239 +#: transport-helper.c:1370 transport-helper.c:1374

8240 #, c-format

8241 msgid "can't start thread for copying data: %s"

8242 msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"

8243

7783 -#: transport-helper.c:1410

8244 +#: transport-helper.c:1411

8245 #, c-format

8246 msgid "%s process failed to wait"

8247 msgstr "échec du processus %s pour l'attente"

8248

7788 -#: transport-helper.c:1414

8249 +#: transport-helper.c:1415

8250 #, c-format

8251 msgid "%s process failed"

8252 msgstr "échec du processus %s"

8253

7793 -#: transport-helper.c:1432 transport-helper.c:1441

8254 +#: transport-helper.c:1433 transport-helper.c:1442

8255 msgid "can't start thread for copying data"

8256 msgstr "impossible de démarrer le fil d'exécution pour copier les données"

8257

@@ -7806,7 +8267,12 @@ msgstr "mode invalide dans l'entrée d'arbre"

8267 msgid "empty filename in tree entry"

8268 msgstr "nom de fichier vide dans une entrée de l'arbre"

8269

7809 -#: tree-walk.c:118

8270 +#: tree-walk.c:48

8271 +#, c-format

8272 +msgid "filename in tree entry contains backslash: '%s'"

8273 +msgstr "le nom du fichier dans l'entrée de l'arbre contient une barre oblique inversée : '%s'"

8274 +

8275 +#: tree-walk.c:124

8276 msgid "too-short tree file"

8277 msgstr "fichier arbre trop court"

8278

@@ -8060,6 +8526,10 @@ msgstr ""

8526 "sensibles à la casse dans une système de fichier insensible) et un\n"

8527 "seul du groupe en collision est dans l'arbre de travail :\n"

8528

8529 +#: unpack-trees.c:1441

8530 +msgid "Updating index flags"

8531 +msgstr "Mise à jour des drapeaux de l'index"

8532 +

8533 #: urlmatch.c:163

8534 msgid "invalid URL scheme name or missing '://' suffix"

8535 msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"

@@ -8668,136 +9138,136 @@ msgstr "de plus, votre index contient des modifications non validées."

9138 msgid "cannot %s: Your index contains uncommitted changes."

9139 msgstr "%s impossible : votre index contient des modifications non validées."

9140

8671 -#: compat/precompose_utf8.c:58 builtin/clone.c:452

9141 +#: compat/precompose_utf8.c:58 builtin/clone.c:455

9142 #, c-format

9143 msgid "failed to unlink '%s'"

9144 msgstr "échec pour délier '%s'"

9145

8676 -#: builtin/add.c:25

9146 +#: builtin/add.c:26

9147 msgid "git add [<options>] [--] <pathspec>..."

9148 msgstr "git add [<options>] [--] <chemin>..."

9149

8680 -#: builtin/add.c:84

9150 +#: builtin/add.c:87

9151 #, c-format

9152 msgid "unexpected diff status %c"

9153 msgstr "état de diff inattendu %c"

9154

8685 -#: builtin/add.c:89 builtin/commit.c:288

9155 +#: builtin/add.c:92 builtin/commit.c:288

9156 msgid "updating files failed"

9157 msgstr "échec de la mise à jour des fichiers"

9158

8689 -#: builtin/add.c:99

9159 +#: builtin/add.c:102

9160 #, c-format

9161 msgid "remove '%s'\n"

9162 msgstr "suppression de '%s'\n"

9163

8694 -#: builtin/add.c:174

9164 +#: builtin/add.c:177

9165 msgid "Unstaged changes after refreshing the index:"

9166 msgstr "Modifications non indexées après rafraîchissement de l'index :"

9167

l10n: fr.po v2.25.0 rnd 1