b3225a4183 · matheusbsbs/matheus-bagliano

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

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2018-12-02 10:55+0800\n"

78 -"PO-Revision-Date: 2018-12-02 10:24+0100\n"

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

78 +"PO-Revision-Date: 2019-02-15 22:18+0100\n"

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

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

81 "Language: fr\n"

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

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

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

86

87 -#: advice.c:99

87 +#: advice.c:101

88 #, c-format

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

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

91

92 -#: advice.c:152

92 +#: advice.c:154

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

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

95

96 -#: advice.c:154

96 +#: advice.c:156

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

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

99

100 -#: advice.c:156

100 +#: advice.c:158

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

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

103

104 -#: advice.c:158

104 +#: advice.c:160

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

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

107

108 -#: advice.c:160

108 +#: advice.c:162

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

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

111

112 -#: advice.c:162

112 +#: advice.c:164

113 #, c-format

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

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

116

117 -#: advice.c:170

117 +#: advice.c:172

118 msgid ""

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

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

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

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

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

124

125 -#: advice.c:178

125 +#: advice.c:180

126 msgid "Exiting because of an unresolved conflict."

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

128

129 -#: advice.c:183 builtin/merge.c:1289

129 +#: advice.c:185 builtin/merge.c:1290

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

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

132

133 -#: advice.c:185

133 +#: advice.c:187

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

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

136

137 -#: advice.c:186

137 +#: advice.c:188

138 msgid "Exiting because of unfinished merge."

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

140

141 -#: advice.c:192

141 +#: advice.c:194

142 #, c-format

143 msgid ""

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

@@ -170,6 +170,14 @@ msgstr ""

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

171 "\n"

172

173 +#: alias.c:50

174 +msgid "cmdline ends with \\"

175 +msgstr "cmdline se termine par \\"

176 +

177 +#: alias.c:51

178 +msgid "unclosed quote"

179 +msgstr "citation non fermée"

180 +

181 #: apply.c:59

182 #, c-format

183 msgid "unrecognized whitespace option '%s'"

@@ -200,69 +208,69 @@ msgstr "--index hors d'un dépôt"

208 msgid "--cached outside a repository"

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

210

203 -#: apply.c:826

211 +#: apply.c:825

212 #, c-format

213 msgid "Cannot prepare timestamp regexp %s"

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

215

208 -#: apply.c:835

216 +#: apply.c:834

217 #, c-format

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

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

220

213 -#: apply.c:909

221 +#: apply.c:908

222 #, c-format

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

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

225

218 -#: apply.c:947

226 +#: apply.c:946

227 #, c-format

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

229 msgstr ""

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

231 "ligne %d"

232

225 -#: apply.c:953

233 +#: apply.c:952

234 #, c-format

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

236 msgstr ""

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

238 "à la ligne %d"

239

232 -#: apply.c:954

240 +#: apply.c:953

241 #, c-format

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

243 msgstr ""

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

245 "à la ligne %d"

246

239 -#: apply.c:959

247 +#: apply.c:958

248 #, c-format

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

250 msgstr ""

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

252

245 -#: apply.c:988

253 +#: apply.c:987

254 #, c-format

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

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

257

250 -#: apply.c:1307

258 +#: apply.c:1306

259 #, c-format

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

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

262

255 -#: apply.c:1479

263 +#: apply.c:1478

264 #, c-format

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

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

267

260 -#: apply.c:1548

268 +#: apply.c:1547

269 #, c-format

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

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

272

265 -#: apply.c:1568

273 +#: apply.c:1567

274 #, c-format

275 msgid ""

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

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

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

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

287

280 -#: apply.c:1581

288 +#: apply.c:1580

289 #, c-format

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

291 msgstr ""

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

293

286 -#: apply.c:1769

294 +#: apply.c:1768

295 msgid "new file depends on old contents"

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

297

290 -#: apply.c:1771

298 +#: apply.c:1770

299 msgid "deleted file still has contents"

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

301

294 -#: apply.c:1805

302 +#: apply.c:1804

303 #, c-format

304 msgid "corrupt patch at line %d"

305 msgstr "patch corrompu à la ligne %d"

306

299 -#: apply.c:1842

307 +#: apply.c:1841

308 #, c-format

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

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

311

304 -#: apply.c:1844

312 +#: apply.c:1843

313 #, c-format

314 msgid "deleted file %s still has contents"

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

316

309 -#: apply.c:1847

317 +#: apply.c:1846

318 #, c-format

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

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

321

314 -#: apply.c:1994

322 +#: apply.c:1993

323 #, c-format

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

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

326

319 -#: apply.c:2031

327 +#: apply.c:2030

328 #, c-format

329 msgid "unrecognized binary patch at line %d"

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

331

324 -#: apply.c:2193

332 +#: apply.c:2192

333 #, c-format

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

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

336

329 -#: apply.c:2279

337 +#: apply.c:2278

338 #, c-format

339 msgid "unable to read symlink %s"

340 msgstr "lecture du lien symbolique %s impossible"

341

334 -#: apply.c:2283

342 +#: apply.c:2282

343 #, c-format

344 msgid "unable to open or read %s"

345 msgstr "ouverture ou lecture de %s impossible"

346

339 -#: apply.c:2942

347 +#: apply.c:2941

348 #, c-format

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

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

351

344 -#: apply.c:3063

352 +#: apply.c:3062

353 #, c-format

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

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

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

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

358

351 -#: apply.c:3075

359 +#: apply.c:3074

360 #, c-format

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

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

363

356 -#: apply.c:3081

364 +#: apply.c:3080

365 #, c-format

366 msgid ""

367 "while searching for:\n"

@@ -362,54 +370,54 @@ msgstr ""

370 "pendant la recherche de :\n"

371 "%.*s"

372

365 -#: apply.c:3103

373 +#: apply.c:3102

374 #, c-format

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

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

377

370 -#: apply.c:3111

378 +#: apply.c:3110

379 #, c-format

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

381 msgstr ""

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

383 "inverse"

384

377 -#: apply.c:3158

385 +#: apply.c:3157

386 #, c-format

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

388 msgstr ""

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

390

383 -#: apply.c:3168

391 +#: apply.c:3167

392 #, c-format

393 msgid ""

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

395 msgstr ""

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

397

390 -#: apply.c:3176

398 +#: apply.c:3175

399 #, c-format

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

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

402

395 -#: apply.c:3194

403 +#: apply.c:3193

404 #, c-format

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

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

407

400 -#: apply.c:3207

408 +#: apply.c:3206

409 #, c-format

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

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

412

405 -#: apply.c:3213

413 +#: apply.c:3212

414 #, c-format

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

416 msgstr ""

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

418 "trouvé)"

419

412 -#: apply.c:3234

420 +#: apply.c:3233

421 #, c-format

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

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

@@ -489,7 +497,8 @@ msgstr "%s : type erroné"

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

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

499

492 -#: apply.c:3881 apply.c:3883

500 +#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

501 +#: read-cache.c:1299

502 #, c-format

503 msgid "invalid path '%s'"

504 msgstr "chemin invalide '%s'"

@@ -546,7 +555,7 @@ msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"

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

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

557

549 -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

558 +#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

559 #, c-format

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

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

@@ -624,7 +633,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..."

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

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

635

627 -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

636 +#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

637 #, c-format

638 msgid "cannot open %s"

639 msgstr "impossible d'ouvrir %s"

@@ -648,177 +657,177 @@ msgstr "Chemin '%s' non traité."

657 msgid "unrecognized input"

658 msgstr "entrée non reconnue"

659

651 -#: apply.c:4719

660 +#: apply.c:4720

661 msgid "unable to read index file"

662 msgstr "lecture du fichier d'index impossible"

663

655 -#: apply.c:4874

664 +#: apply.c:4875

665 #, c-format

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

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

668

660 -#: apply.c:4901

669 +#: apply.c:4902

670 #, c-format

671 msgid "squelched %d whitespace error"

672 msgid_plural "squelched %d whitespace errors"

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

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

675

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

676 +#: apply.c:4908 apply.c:4923

677 #, c-format

678 msgid "%d line adds whitespace errors."

679 msgid_plural "%d lines add whitespace errors."

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

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

682

674 -#: apply.c:4915

683 +#: apply.c:4916

684 #, c-format

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

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

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

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

689

681 -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

690 +#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

691 msgid "Unable to write new index file"

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

693

685 -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

686 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

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

688 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

689 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

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

694 +#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

695 +#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

696 +#: builtin/pull.c:200 builtin/submodule--helper.c:407

697 +#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

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

699 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

700 msgid "path"

701 msgstr "chemin"

702

694 -#: apply.c:4959

703 +#: apply.c:4960

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

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

706

698 -#: apply.c:4962

707 +#: apply.c:4963

708 msgid "apply changes matching the given path"

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

710

702 -#: apply.c:4964 builtin/am.c:2218

711 +#: apply.c:4965 builtin/am.c:2212

712 msgid "num"

713 msgstr "num"

714

706 -#: apply.c:4965

715 +#: apply.c:4966

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

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

718

710 -#: apply.c:4968

719 +#: apply.c:4969

720 msgid "ignore additions made by the patch"

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

722

714 -#: apply.c:4970

723 +#: apply.c:4971

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

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

726

718 -#: apply.c:4974

727 +#: apply.c:4975

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

729 msgstr ""

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

731

723 -#: apply.c:4976

732 +#: apply.c:4977

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

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

735

727 -#: apply.c:4978

736 +#: apply.c:4979

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

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

739

731 -#: apply.c:4980

740 +#: apply.c:4981

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

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

743

735 -#: apply.c:4982

744 +#: apply.c:4983

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

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

747

739 -#: apply.c:4984

748 +#: apply.c:4985

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

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

751

743 -#: apply.c:4986

752 +#: apply.c:4987

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

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

755

747 -#: apply.c:4989

756 +#: apply.c:4990

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

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

759

751 -#: apply.c:4991

760 +#: apply.c:4992

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

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

763

755 -#: apply.c:4993

764 +#: apply.c:4994

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

766 msgstr ""

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

768

760 -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

769 +#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

770 msgid "paths are separated with NUL character"

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

772

764 -#: apply.c:4998

773 +#: apply.c:4999

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

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

776

768 -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

777 +#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

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

770 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857

779 +#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

780 msgid "action"

781 msgstr "action"

782

774 -#: apply.c:5000

783 +#: apply.c:5001

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

785 msgstr ""

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

787 "d'espace"

788

780 -#: apply.c:5003 apply.c:5006

789 +#: apply.c:5004 apply.c:5007

790 msgid "ignore changes in whitespace when finding context"

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

792

784 -#: apply.c:5009

793 +#: apply.c:5010

794 msgid "apply the patch in reverse"

795 msgstr "appliquer le patch en sens inverse"

796

788 -#: apply.c:5011

797 +#: apply.c:5012

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

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

800

792 -#: apply.c:5013

801 +#: apply.c:5014

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

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

804

796 -#: apply.c:5015

805 +#: apply.c:5016

806 msgid "allow overlapping hunks"

807 msgstr "accepter les recouvrements de sections"

808

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

801 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

802 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

803 -#: builtin/rebase--interactive.c:157

809 +#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22

810 +#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

811 +#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128

812 +#: builtin/rebase--interactive.c:159

813 msgid "be verbose"

814 msgstr "mode verbeux"

815

807 -#: apply.c:5018

816 +#: apply.c:5019

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

818 msgstr ""

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

820 "fichier"

821

813 -#: apply.c:5021

822 +#: apply.c:5022

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

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

825

817 -#: apply.c:5023 builtin/am.c:2206

826 +#: apply.c:5024 builtin/am.c:2200

827 msgid "root"

828 msgstr "racine"

829

821 -#: apply.c:5024

830 +#: apply.c:5025

831 msgid "prepend <root> to all filenames"

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

833

@@ -841,99 +850,118 @@ msgstr ""

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

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

852

844 -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

853 +#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

854 #, c-format

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

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

857

849 -#: archive.c:453

858 +#: archive.c:396

859 +#, c-format

860 +msgid "no such ref: %.*s"

861 +msgstr "référence inexistante : %.*s"

862 +

863 +#: archive.c:401

864 +#, c-format

865 +msgid "not a valid object name: %s"

866 +msgstr "nom d'objet invalide : %s"

867 +

868 +#: archive.c:414

869 +#, c-format

870 +msgid "not a tree object: %s"

871 +msgstr "objet arbre invalide : %s"

872 +

873 +#: archive.c:424

874 +msgid "current working directory is untracked"

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

876 +

877 +#: archive.c:455

878 msgid "fmt"

879 msgstr "fmt"

880

853 -#: archive.c:453

881 +#: archive.c:455

882 msgid "archive format"

883 msgstr "format d'archive"

884

857 -#: archive.c:454 builtin/log.c:1536

885 +#: archive.c:456 builtin/log.c:1549

886 msgid "prefix"

887 msgstr "préfixe"

888

861 -#: archive.c:455

889 +#: archive.c:457

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

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

892

865 -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

866 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

867 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

868 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

893 +#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

894 +#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

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

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

897 #: parse-options.h:162

898 msgid "file"

899 msgstr "fichier"

900

873 -#: archive.c:457 builtin/archive.c:89

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

902 msgid "write the archive to this file"

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

904

877 -#: archive.c:459

905 +#: archive.c:461

906 msgid "read .gitattributes in working directory"

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

908

881 -#: archive.c:460

909 +#: archive.c:462

910 msgid "report archived files on stderr"

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

912

885 -#: archive.c:461

913 +#: archive.c:463

914 msgid "store only"

915 msgstr "stockage seulement"

916

889 -#: archive.c:462

917 +#: archive.c:464

918 msgid "compress faster"

919 msgstr "compression rapide"

920

893 -#: archive.c:470

921 +#: archive.c:472

922 msgid "compress better"

923 msgstr "compression efficace"

924

897 -#: archive.c:473

925 +#: archive.c:475

926 msgid "list supported archive formats"

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

928

901 -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

902 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

929 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

930 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

931 msgid "repo"

932 msgstr "dépôt"

933

906 -#: archive.c:476 builtin/archive.c:91

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

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

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

937

910 -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

911 -#: builtin/notes.c:496

938 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

939 +#: builtin/notes.c:498

940 msgid "command"

941 msgstr "commande"

942

915 -#: archive.c:478 builtin/archive.c:93

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

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

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

946

919 -#: archive.c:485

947 +#: archive.c:487

948 msgid "Unexpected option --remote"

949 msgstr "Option --remote inattendue"

950

923 -#: archive.c:487

951 +#: archive.c:489

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

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

954

927 -#: archive.c:489

955 +#: archive.c:491

956 msgid "Unexpected option --output"

957 msgstr "Option --output inattendue"

958

931 -#: archive.c:511

959 +#: archive.c:513

960 #, c-format

961 msgid "Unknown archive format '%s'"

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

963

936 -#: archive.c:518

964 +#: archive.c:520

965 #, c-format

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

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

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

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

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

1007

980 -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

1008 +#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

1009 #, c-format

1010 msgid "deflate error (%d)"

1011 msgstr "erreur de compression (%d)"

@@ -987,12 +1015,17 @@ msgstr "erreur de compression (%d)"

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

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

1017

990 -#: attr.c:212

1018 +#: attr.c:211

1019 #, c-format

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

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

1022

995 -#: attr.c:409

1023 +#: attr.c:368

1024 +#, c-format

1025 +msgid "%s not allowed: %s:%d"

1026 +msgstr "%s non permis : %s : %d"

1027 +

1028 +#: attr.c:408

1029 msgid ""

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

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

@@ -1005,17 +1038,17 @@ msgstr ""

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

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

1040

1008 -#: bisect.c:676

1041 +#: bisect.c:678

1042 #, c-format

1043 msgid "We cannot bisect more!\n"

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

1045

1013 -#: bisect.c:730

1046 +#: bisect.c:733

1047 #, c-format

1048 msgid "Not a valid commit name %s"

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

1050

1018 -#: bisect.c:754

1051 +#: bisect.c:758

1052 #, c-format

1053 msgid ""

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

@@ -1024,7 +1057,7 @@ msgstr ""

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

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

1059

1027 -#: bisect.c:759

1060 +#: bisect.c:763

1061 #, c-format

1062 msgid ""

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

@@ -1033,7 +1066,7 @@ msgstr ""

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

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

1068

1036 -#: bisect.c:764

1069 +#: bisect.c:768

1070 #, c-format

1071 msgid ""

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

@@ -1042,7 +1075,7 @@ msgstr ""

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

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

1077

1045 -#: bisect.c:772

1078 +#: bisect.c:776

1079 #, c-format

1080 msgid ""

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

@@ -1053,7 +1086,7 @@ msgstr ""

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

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

1088

1056 -#: bisect.c:785

1089 +#: bisect.c:789

1090 #, c-format

1091 msgid ""

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

@@ -1065,36 +1098,36 @@ msgstr ""

1098 "et %s.\n"

1099 "On continue tout de même."

1100

1068 -#: bisect.c:818

1101 +#: bisect.c:822

1102 #, c-format

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

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

1105

1073 -#: bisect.c:858

1106 +#: bisect.c:865

1107 #, c-format

1108 msgid "a %s revision is needed"

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

1110

1078 -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1111 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

1112 #, c-format

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

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

1115

1083 -#: bisect.c:928 builtin/merge.c:138

1116 +#: bisect.c:937 builtin/merge.c:139

1117 #, c-format

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

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

1120

1088 -#: bisect.c:958

1121 +#: bisect.c:967

1122 msgid "reading bisect refs failed"

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

1124

1092 -#: bisect.c:977

1125 +#: bisect.c:986

1126 #, c-format

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

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

1129

1097 -#: bisect.c:985

1130 +#: bisect.c:994

1131 #, c-format

1132 msgid ""

1133 "No testable commit found.\n"

@@ -1103,7 +1136,7 @@ msgstr ""

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

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

1138

1106 -#: bisect.c:1004

1139 +#: bisect.c:1013

1140 #, c-format

1141 msgid "(roughly %d step)"

1142 msgid_plural "(roughly %d steps)"

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

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

1147 #. steps)" translation.

1148 #.

1116 -#: bisect.c:1010

1149 +#: bisect.c:1019

1150 #, c-format

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

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

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

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

1155

1123 -#: blame.c:1787

1156 +#: blame.c:1792

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

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

1159

1127 -#: blame.c:1801

1160 +#: blame.c:1806

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

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

1163

1131 -#: blame.c:1822

1164 +#: blame.c:1827

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

1166 msgstr ""

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

1168 "dernier commit"

1169

1137 -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1138 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1139 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1170 +#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1171 +#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1172 +#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1173 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1174 #: builtin/shortlog.c:192

1175 msgid "revision walk setup failed"

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

1177

1145 -#: blame.c:1849

1178 +#: blame.c:1854

1179 msgid ""

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

1181 msgstr ""

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

1183 "premier parent"

1184

1152 -#: blame.c:1860

1185 +#: blame.c:1865

1186 #, c-format

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

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

1189

1157 -#: blame.c:1871

1190 +#: blame.c:1876

1191 #, c-format

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

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

@@ -1282,27 +1315,27 @@ msgstr ""

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

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

1317

1285 -#: branch.c:279

1318 +#: branch.c:280

1319 #, c-format

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

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

1322

1290 -#: branch.c:299

1323 +#: branch.c:300

1324 #, c-format

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

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

1327

1295 -#: branch.c:304

1328 +#: branch.c:305

1329 #, c-format

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

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

1332

1300 -#: branch.c:358

1333 +#: branch.c:359

1334 #, c-format

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

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

1337

1305 -#: branch.c:381

1338 +#: branch.c:382

1339 #, c-format

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

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

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

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

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

1352

1320 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1321 -#: builtin/commit.c:774

1353 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1354 +#: builtin/commit.c:776

1355 #, c-format

1356 msgid "could not open '%s'"

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

1358

1326 -#: bundle.c:141

1359 +#: bundle.c:143

1360 msgid "Repository lacks these prerequisite commits:"

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

1362

1330 -#: bundle.c:192

1363 +#: bundle.c:194

1364 #, c-format

1365 msgid "The bundle contains this ref:"

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

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

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

1369

1337 -#: bundle.c:199

1370 +#: bundle.c:201

1371 msgid "The bundle records a complete history."

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

1373

1341 -#: bundle.c:201

1374 +#: bundle.c:203

1375 #, c-format

1376 msgid "The bundle requires this ref:"

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

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

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

1380

1348 -#: bundle.c:267

1381 +#: bundle.c:269

1382 msgid "unable to dup bundle descriptor"

1383 msgstr "impossible de dupliquer le descripteur de liasse"

1384

1352 -#: bundle.c:274

1385 +#: bundle.c:276

1386 msgid "Could not spawn pack-objects"

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

1388

1356 -#: bundle.c:285

1389 +#: bundle.c:287

1390 msgid "pack-objects died"

1391 msgstr "les objets groupés ont disparu"

1392

1360 -#: bundle.c:327

1393 +#: bundle.c:329

1394 msgid "rev-list died"

1395 msgstr "rev-list a disparu"

1396

1364 -#: bundle.c:376

1397 +#: bundle.c:378

1398 #, c-format

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

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

1401

1369 -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1402 +#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1403 #, c-format

1404 msgid "unrecognized argument: %s"

1405 msgstr "argument non reconnu : %s"

1406

1374 -#: bundle.c:464

1407 +#: bundle.c:465

1408 msgid "Refusing to create empty bundle."

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

1410

1378 -#: bundle.c:474

1411 +#: bundle.c:475

1412 #, c-format

1413 msgid "cannot create '%s'"

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

1415

1383 -#: bundle.c:498

1416 +#: bundle.c:500

1417 msgid "index-pack died"

1418 msgstr "l'index de groupe a disparu"

1419

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

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

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

1424

1392 -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1393 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1425 +#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1426 +#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1427 #: builtin/replace.c:448

1428 #, c-format

1429 msgid "could not parse %s"

@@ -1421,27 +1454,27 @@ msgstr ""

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

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

1456

1424 -#: commit.c:1115

1457 +#: commit.c:1122

1458 #, c-format

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

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

1461

1429 -#: commit.c:1118

1462 +#: commit.c:1125

1463 #, c-format

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

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

1466

1434 -#: commit.c:1121

1467 +#: commit.c:1128

1468 #, c-format

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

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

1471

1439 -#: commit.c:1124

1472 +#: commit.c:1131

1473 #, c-format

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

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

1476

1444 -#: commit.c:1378

1477 +#: commit.c:1385

1478 msgid ""

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

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

@@ -1453,93 +1486,137 @@ msgstr ""

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

1487 "projet.\n"

1488

1456 -#: commit-graph.c:108

1489 +#: commit-graph.c:101

1490 #, c-format

1491 msgid "graph file %s is too small"

1492 msgstr "le fichier de graphe %s est trop petit"

1493

1461 -#: commit-graph.c:115

1494 +#: commit-graph.c:136

1495 #, c-format

1496 msgid "graph signature %X does not match signature %X"

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

1498

1466 -#: commit-graph.c:122

1499 +#: commit-graph.c:143

1500 #, c-format

1501 msgid "graph version %X does not match version %X"

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

1503

1471 -#: commit-graph.c:129

1504 +#: commit-graph.c:150

1505 #, c-format

1506 msgid "hash version %X does not match version %X"

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

1508

1476 -#: commit-graph.c:153

1509 +#: commit-graph.c:173

1510 +msgid "chunk lookup table entry missing; graph file may be incomplete"

1511 +msgstr ""

1512 +"entrée de table de consultation de morceaux manquante ; le fichier de graphe "

1513 +"est peut être incomplet"

1514 +

1515 +#: commit-graph.c:184

1516 #, c-format

1517 msgid "improper chunk offset %08x%08x"

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

1519

1481 -#: commit-graph.c:189

1520 +#: commit-graph.c:221

1521 #, c-format

1522 msgid "chunk id %08x appears multiple times"

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

1524

1486 -#: commit-graph.c:308

1525 +#: commit-graph.c:334

1526 #, c-format

1527 msgid "could not find commit %s"

1528 msgstr "impossible de trouver le commit %s"

1529

1491 -#: commit-graph.c:617 builtin/pack-objects.c:2652

1530 +#: commit-graph.c:671 builtin/pack-objects.c:2646

1531 #, c-format

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

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

1534

1496 -#: commit-graph.c:651

1497 -msgid "Annotating commits in commit graph"

1498 -msgstr "Annotation des commits dans un graphe de commit"

1535 +#: commit-graph.c:704

1536 +msgid "Loading known commits in commit graph"

1537 +msgstr "Lecture des commits connus dans un graphe de commit"

1538 +

1539 +#: commit-graph.c:720

1540 +msgid "Expanding reachable commits in commit graph"

1541 +msgstr "Expansion des commits joignables dans un graphe de commit"

1542

1500 -#: commit-graph.c:691

1543 +#: commit-graph.c:732

1544 +msgid "Clearing commit marks in commit graph"

1545 +msgstr "Suppression les marques de commit dans le graphe de commits"

1546 +

1547 +#: commit-graph.c:752

1548 msgid "Computing commit graph generation numbers"

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

1550

1504 -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1505 -msgid "Finding commits for commit graph"

1506 -msgstr "Recherche de commits pour un graphe de commits"

1551 +#: commit-graph.c:869

1552 +#, c-format

1553 +msgid "Finding commits for commit graph in %d pack"

1554 +msgid_plural "Finding commits for commit graph in %d packs"

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

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

1557

1508 -#: commit-graph.c:812

1558 +#: commit-graph.c:882

1559 #, c-format

1560 msgid "error adding pack %s"

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

1562

1513 -#: commit-graph.c:814

1563 +#: commit-graph.c:884

1564 #, c-format

1565 msgid "error opening index for %s"

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

1567

1518 -#: commit-graph.c:868

1568 +#: commit-graph.c:898

1569 +#, c-format

1570 +msgid "Finding commits for commit graph from %d ref"

1571 +msgid_plural "Finding commits for commit graph from %d refs"

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

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

1574 +

1575 +#: commit-graph.c:930

1576 +msgid "Finding commits for commit graph among packed objects"

1577 +msgstr ""

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

1579 +

1580 +#: commit-graph.c:943

1581 +msgid "Counting distinct commits in commit graph"

1582 +msgstr "Comptage des commits distincts dans un graphe de commit"

1583 +

1584 +#: commit-graph.c:956

1585 #, c-format

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

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

1588

1523 -#: commit-graph.c:895

1589 +#: commit-graph.c:965

1590 +msgid "Finding extra edges in commit graph"

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

1592 +

1593 +#: commit-graph.c:989

1594 msgid "too many commits to write graph"

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

1596

1527 -#: commit-graph.c:902 midx.c:769

1597 +#: commit-graph.c:996 midx.c:769

1598 #, c-format

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

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

1601

1532 -#: commit-graph.c:1002

1602 +#: commit-graph.c:1036

1603 +#, c-format

1604 +msgid "Writing out commit graph in %d pass"

1605 +msgid_plural "Writing out commit graph in %d passes"

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

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

1608 +

1609 +#: commit-graph.c:1109

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

1611 msgstr ""

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

1613 "vraisemblablement corrompu"

1614

1538 -#: commit-graph.c:1046

1615 +#: commit-graph.c:1153

1616 msgid "Verifying commits in commit graph"

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

1618

1542 -#: compat/obstack.c:405 compat/obstack.c:407

1619 +#: compat/obstack.c:406 compat/obstack.c:408

1620 msgid "memory exhausted"

1621 msgstr "plus de mémoire"

1622

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

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

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

1662

1586 -#: config.c:378 sequencer.c:2296

1663 +#: config.c:378 sequencer.c:2330

1664 #, c-format

1665 msgid "invalid key: %s"

1666 msgstr "clé invalide : %s"

@@ -1730,7 +1807,7 @@ msgstr "valeur mal formée pour %s : %s"

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

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

1809

1733 -#: config.c:1481 builtin/pack-objects.c:3391

1810 +#: config.c:1481 builtin/pack-objects.c:3394

1811 #, c-format

1812 msgid "bad pack compression level %d"

1813 msgstr "niveau de compression du paquet %d"

@@ -1809,62 +1886,62 @@ msgstr "%s a des valeurs multiples"

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

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

1888

1812 -#: config.c:2717 config.c:3041

1889 +#: config.c:2716 config.c:3040

1890 #, c-format

1891 msgid "could not lock config file %s"

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

1893

1817 -#: config.c:2728

1894 +#: config.c:2727

1895 #, c-format

1896 msgid "opening %s"

1897 msgstr "ouverture de %s"

1898

1822 -#: config.c:2763 builtin/config.c:327

1899 +#: config.c:2762 builtin/config.c:328

1900 #, c-format

1901 msgid "invalid pattern: %s"

1902 msgstr "motif invalide : %s"

1903

1827 -#: config.c:2788

1904 +#: config.c:2787

1905 #, c-format

1906 msgid "invalid config file %s"

1907 msgstr "fichier de configuration invalide %s"

1908

1832 -#: config.c:2801 config.c:3054

1909 +#: config.c:2800 config.c:3053

1910 #, c-format

1911 msgid "fstat on %s failed"

1912 msgstr "échec de fstat sur %s"

1913

1837 -#: config.c:2812

1914 +#: config.c:2811

1915 #, c-format

1916 msgid "unable to mmap '%s'"

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

1918

1842 -#: config.c:2821 config.c:3059

1919 +#: config.c:2820 config.c:3058

1920 #, c-format

1921 msgid "chmod on %s failed"

1922 msgstr "échec de chmod sur %s"

1923

1847 -#: config.c:2906 config.c:3156

1924 +#: config.c:2905 config.c:3155

1925 #, c-format

1926 msgid "could not write config file %s"

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

1928

1852 -#: config.c:2940

1929 +#: config.c:2939

1930 #, c-format

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

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

1933

1857 -#: config.c:2942 builtin/remote.c:782

1934 +#: config.c:2941 builtin/remote.c:782

1935 #, c-format

1936 msgid "could not unset '%s'"

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

1938

1862 -#: config.c:3032

1939 +#: config.c:3031

1940 #, c-format

1941 msgid "invalid section name: %s"

1942 msgstr "nom de section invalide : %s"

1943

1867 -#: config.c:3199

1944 +#: config.c:3198

1945 #, c-format

1946 msgid "missing value for '%s'"

1947 msgstr "valeur manquante pour '%s'"

@@ -1917,50 +1994,45 @@ msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"

1994 msgid "repository on the other end cannot be shallow"

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

1996

1920 -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1921 -#, c-format

1922 -msgid "remote error: %s"

1923 -msgstr "erreur distante : %s"

1924 -

1925 -#: connect.c:316

1997 +#: connect.c:313

1998 msgid "invalid packet"

1999 msgstr "paquet invalide"

2000

1929 -#: connect.c:336

2001 +#: connect.c:333

2002 #, c-format

2003 msgid "protocol error: unexpected '%s'"

2004 msgstr "erreur de protocole : '%s' attendu"

2005

1934 -#: connect.c:444

2006 +#: connect.c:441

2007 #, c-format

2008 msgid "invalid ls-refs response: %s"

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

2010

1939 -#: connect.c:448

2011 +#: connect.c:445

2012 msgid "expected flush after ref listing"

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

2014

1943 -#: connect.c:547

2015 +#: connect.c:544

2016 #, c-format

2017 msgid "protocol '%s' is not supported"

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

2019

1948 -#: connect.c:598

2020 +#: connect.c:595

2021 msgid "unable to set SO_KEEPALIVE on socket"

2022 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"

2023

1952 -#: connect.c:638 connect.c:701

2024 +#: connect.c:635 connect.c:698

2025 #, c-format

2026 msgid "Looking up %s ... "

2027 msgstr "Recherche de %s… "

2028

1957 -#: connect.c:642

2029 +#: connect.c:639

2030 #, c-format

2031 msgid "unable to look up %s (port %s) (%s)"

2032 msgstr "impossible de rechercher %s (port %s) (%s)"

2033

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

1963 -#: connect.c:646 connect.c:717

2035 +#: connect.c:643 connect.c:714

2036 #, c-format

2037 msgid ""

2038 "done.\n"

@@ -1969,7 +2041,7 @@ msgstr ""

2041 "fait.\n"

2042 "Connexion à %s (port %s)… "

2043

1972 -#: connect.c:668 connect.c:745

2044 +#: connect.c:665 connect.c:742

2045 #, c-format

2046 msgid ""

2047 "unable to connect to %s:\n"

@@ -1979,63 +2051,63 @@ msgstr ""

2051 "%s"

2052

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

1982 -#: connect.c:674 connect.c:751

2054 +#: connect.c:671 connect.c:748

2055 msgid "done."

2056 msgstr "fait."

2057

1986 -#: connect.c:705

2058 +#: connect.c:702

2059 #, c-format

2060 msgid "unable to look up %s (%s)"

2061 msgstr "impossible de rechercher %s (%s)"

2062

1991 -#: connect.c:711

2063 +#: connect.c:708

2064 #, c-format

2065 msgid "unknown port %s"

2066 msgstr "port inconnu %s"

2067

1996 -#: connect.c:848 connect.c:1174

2068 +#: connect.c:845 connect.c:1171

2069 #, c-format

2070 msgid "strange hostname '%s' blocked"

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

2072

2001 -#: connect.c:850

2073 +#: connect.c:847

2074 #, c-format

2075 msgid "strange port '%s' blocked"

2076 msgstr "port étrange '%s' bloqué"

2077

2006 -#: connect.c:860

2078 +#: connect.c:857

2079 #, c-format

2080 msgid "cannot start proxy %s"

2081 msgstr "impossible de démarrer un proxy %s"

2082

2011 -#: connect.c:927

2083 +#: connect.c:924

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

2085 msgstr ""

2086 "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "

2087 "d'URL valide"

2088

2017 -#: connect.c:1122

2089 +#: connect.c:1119

2090 msgid "ssh variant 'simple' does not support -4"

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

2092

2021 -#: connect.c:1134

2093 +#: connect.c:1131

2094 msgid "ssh variant 'simple' does not support -6"

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

2096

2025 -#: connect.c:1151

2097 +#: connect.c:1148

2098 msgid "ssh variant 'simple' does not support setting port"

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

2100

2029 -#: connect.c:1262

2101 +#: connect.c:1259

2102 #, c-format

2103 msgid "strange pathname '%s' blocked"

2104 msgstr "chemin étrange '%s' bloqué"

2105

2034 -#: connect.c:1307

2106 +#: connect.c:1304

2107 msgid "unable to fork"

2108 msgstr "fork impossible"

2109

2038 -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2110 +#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

2111 msgid "Checking connectivity"

2112 msgstr "Vérification de la connectivité"

2113

@@ -2051,17 +2123,17 @@ msgstr "impossible d'écrire dans la rev-list"

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

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

2125

2054 -#: convert.c:194

2126 +#: convert.c:193

2127 #, c-format

2128 msgid "illegal crlf_action %d"

2129 msgstr "crlf_action illégal %d"

2130

2059 -#: convert.c:207

2131 +#: convert.c:206

2132 #, c-format

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

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

2135

2064 -#: convert.c:209

2136 +#: convert.c:208

2137 #, c-format

2138 msgid ""

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

@@ -2070,12 +2142,12 @@ msgstr ""

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

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

2144

2073 -#: convert.c:217

2145 +#: convert.c:216

2146 #, c-format

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

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

2149

2078 -#: convert.c:219

2150 +#: convert.c:218

2151 #, c-format

2152 msgid ""

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

@@ -2084,12 +2156,12 @@ msgstr ""

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

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

2158

2087 -#: convert.c:280

2159 +#: convert.c:279

2160 #, c-format

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

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

2163

2092 -#: convert.c:287

2164 +#: convert.c:286

2165 #, c-format

2166 msgid ""

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

@@ -2098,12 +2170,12 @@ msgstr ""

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

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

2172

2101 -#: convert.c:305

2173 +#: convert.c:304

2174 #, c-format

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

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

2177

2106 -#: convert.c:307

2178 +#: convert.c:306

2179 #, c-format

2180 msgid ""

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

@@ -2113,39 +2185,39 @@ msgstr ""

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

2186 "de travail."

2187

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

2188 +#: convert.c:424 convert.c:495

2189 #, c-format

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

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

2192

2121 -#: convert.c:468

2193 +#: convert.c:467

2194 #, c-format

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

2196 msgstr ""

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

2198 "contenu"

2199

2128 -#: convert.c:674

2200 +#: convert.c:673

2201 #, c-format

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

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

2204

2133 -#: convert.c:694

2205 +#: convert.c:693

2206 #, c-format

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

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

2209

2138 -#: convert.c:701

2210 +#: convert.c:700

2211 #, c-format

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

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

2214

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

2215 +#: convert.c:735 convert.c:738

2216 #, c-format

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

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

2219

2148 -#: convert.c:742 convert.c:796

2220 +#: convert.c:741 convert.c:796

2221 #, c-format

2222 msgid "external filter '%s' failed"

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

@@ -2181,53 +2253,53 @@ msgstr "%s : le filtre clean '%s' a échoué"

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

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

2255

2184 -#: date.c:116

2256 +#: date.c:137

2257 msgid "in the future"

2258 msgstr "dans le futur"

2259

2188 -#: date.c:122

2260 +#: date.c:143

2261 #, c-format

2262 msgid "%<PRIuMAX> second ago"

2263 msgid_plural "%<PRIuMAX> seconds ago"

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

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

2266

2195 -#: date.c:129

2267 +#: date.c:150

2268 #, c-format

2269 msgid "%<PRIuMAX> minute ago"

2270 msgid_plural "%<PRIuMAX> minutes ago"

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

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

2273

2202 -#: date.c:136

2274 +#: date.c:157

2275 #, c-format

2276 msgid "%<PRIuMAX> hour ago"

2277 msgid_plural "%<PRIuMAX> hours ago"

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

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

2280

2209 -#: date.c:143

2281 +#: date.c:164

2282 #, c-format

2283 msgid "%<PRIuMAX> day ago"

2284 msgid_plural "%<PRIuMAX> days ago"

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

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

2287

2216 -#: date.c:149

2288 +#: date.c:170

2289 #, c-format

2290 msgid "%<PRIuMAX> week ago"

2291 msgid_plural "%<PRIuMAX> weeks ago"

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

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

2294

2223 -#: date.c:156

2295 +#: date.c:177

2296 #, c-format

2297 msgid "%<PRIuMAX> month ago"

2298 msgid_plural "%<PRIuMAX> months ago"

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

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

2301

2230 -#: date.c:167

2302 +#: date.c:188

2303 #, c-format

2304 msgid "%<PRIuMAX> year"

2305 msgid_plural "%<PRIuMAX> years"

@@ -2235,42 +2307,42 @@ msgstr[0] "%<PRIuMAX> an"

2307 msgstr[1] "%<PRIuMAX> ans"

2308

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

2238 -#: date.c:170

2310 +#: date.c:191

2311 #, c-format

2312 msgid "%s, %<PRIuMAX> month ago"

2313 msgid_plural "%s, %<PRIuMAX> months ago"

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

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

2316

2245 -#: date.c:175 date.c:180

2317 +#: date.c:196 date.c:201

2318 #, c-format

2319 msgid "%<PRIuMAX> year ago"

2320 msgid_plural "%<PRIuMAX> years ago"

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

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

2323

2252 -#: delta-islands.c:268

2324 +#: delta-islands.c:272

2325 msgid "Propagating island marks"

2326 msgstr "Propagation des marques d'îlots"

2327

2256 -#: delta-islands.c:286

2328 +#: delta-islands.c:290

2329 #, c-format

2330 msgid "bad tree object %s"

2331 msgstr "objet arbre invalide %s"

2332

2261 -#: delta-islands.c:330

2333 +#: delta-islands.c:334

2334 #, c-format

2335 msgid "failed to load island regex for '%s': %s"

2336 msgstr "impossible de charger la regex île pour '%s' : %s"

2337

2266 -#: delta-islands.c:386

2338 +#: delta-islands.c:390

2339 #, c-format

2340 msgid "island regex from config has too many capture groups (max=%d)"

2341 msgstr ""

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

2343 "capture (max=%d)"

2344

2273 -#: delta-islands.c:462

2345 +#: delta-islands.c:466

2346 #, c-format

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

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

@@ -2308,26 +2380,31 @@ msgstr ""

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

2381 "'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"

2382

2311 -#: diff.c:316

2383 +#: diff.c:319

2384 #, c-format

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

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

2385 +msgid ""

2386 +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

2387 +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2388 +msgstr ""

2389 +"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-"

2390 +"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"

2391 +"change'"

2392

2316 -#: diff.c:323

2393 +#: diff.c:327

2394 msgid ""

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

2319 -"space modes"

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

2396 +"whitespace modes"

2397 msgstr ""

2398 "color-moved-ws : allow-indentation-change ne peut pas être combiné avec "

2399 "d'autres modes d'espace"

2400

2324 -#: diff.c:394

2401 +#: diff.c:400

2402 #, c-format

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

2404 msgstr ""

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

2406

2330 -#: diff.c:454

2407 +#: diff.c:460

2408 #, c-format

2409 msgid ""

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

@@ -2336,24 +2413,24 @@ msgstr ""

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

2414 "%s"

2415

2339 -#: diff.c:4140

2416 +#: diff.c:4211

2417 #, c-format

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

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

2420

2344 -#: diff.c:4482

2421 +#: diff.c:4553

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

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

2424

2348 -#: diff.c:4485

2425 +#: diff.c:4556

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

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

2428

2352 -#: diff.c:4563

2429 +#: diff.c:4634

2430 msgid "--follow requires exactly one pathspec"

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

2432

2356 -#: diff.c:4729

2433 +#: diff.c:4800

2434 #, c-format

2435 msgid ""

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

@@ -2362,24 +2439,24 @@ msgstr ""

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

2440 "%s"

2441

2365 -#: diff.c:4743

2442 +#: diff.c:4814

2443 #, c-format

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

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

2446

2370 -#: diff.c:5823

2447 +#: diff.c:5900

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

2449 msgstr ""

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

2451 "fichiers."

2452

2376 -#: diff.c:5826

2453 +#: diff.c:5903

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

2455 msgstr ""

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

2457 "grand nombre de fichiers."

2458

2382 -#: diff.c:5829

2459 +#: diff.c:5906

2460 #, c-format

2461 msgid ""

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

@@ -2387,41 +2464,41 @@ msgstr ""

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

2465 "commande."

2466

2390 -#: dir.c:576

2467 +#: dir.c:538

2468 #, c-format

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

2470 msgstr ""

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

2472

2396 -#: dir.c:965

2473 +#: dir.c:927

2474 #, c-format

2475 msgid "cannot use %s as an exclude file"

2476 msgstr "impossible d'utiliser %s comme fichier d'exclusion"

2477

2401 -#: dir.c:1880

2478 +#: dir.c:1842

2479 #, c-format

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

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

2482

2406 -#: dir.c:2122

2483 +#: dir.c:2084

2484 msgid "failed to get kernel name and information"

2408 -msgstr "échec de l'obtention d'information de kernel"

2485 +msgstr "echec de l'obtention d'information de kernel"

2486

2410 -#: dir.c:2246

2487 +#: dir.c:2208

2488 msgid "untracked cache is disabled on this system or location"

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

2490

2414 -#: dir.c:3047

2491 +#: dir.c:3009

2492 #, c-format

2493 msgid "index file corrupt in repo %s"

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

2495

2419 -#: dir.c:3092 dir.c:3097

2496 +#: dir.c:3054 dir.c:3059

2497 #, c-format

2498 msgid "could not create directories for %s"

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

2500

2424 -#: dir.c:3126

2501 +#: dir.c:3088

2502 #, c-format

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

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

@@ -2463,237 +2540,242 @@ msgstr "Dépôt distant sans URL"

2540

2541 #: fetch-pack.c:151

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

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

2543 +msgstr "git fetch-pack : liste superficielle attendue"

2544

2468 -#: fetch-pack.c:163

2545 +#: fetch-pack.c:154

2546 +msgid "git fetch-pack: expected a flush packet after shallow list"

2547 +msgstr ""

2548 +"git fetch-pack : paquet de vidage attendu après une liste superficielle"

2549 +

2550 +#: fetch-pack.c:165

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

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

2553

2472 -#: fetch-pack.c:183

2554 +#: fetch-pack.c:185

2555 #, c-format

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

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

2558

2477 -#: fetch-pack.c:253

2559 +#: fetch-pack.c:256

2560 msgid "--stateless-rpc requires multi_ack_detailed"

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

2562

2481 -#: fetch-pack.c:347 fetch-pack.c:1277

2563 +#: fetch-pack.c:358 fetch-pack.c:1264

2564 #, c-format

2565 msgid "invalid shallow line: %s"

2566 msgstr "ligne de superficiel invalide : %s"

2567

2486 -#: fetch-pack.c:353 fetch-pack.c:1283

2568 +#: fetch-pack.c:364 fetch-pack.c:1271

2569 #, c-format

2570 msgid "invalid unshallow line: %s"

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

2572

2491 -#: fetch-pack.c:355 fetch-pack.c:1285

2573 +#: fetch-pack.c:366 fetch-pack.c:1273

2574 #, c-format

2575 msgid "object not found: %s"

2576 msgstr "objet non trouvé : %s"

2577

2496 -#: fetch-pack.c:358 fetch-pack.c:1288

2578 +#: fetch-pack.c:369 fetch-pack.c:1276

2579 #, c-format

2580 msgid "error in object: %s"

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

2582

2501 -#: fetch-pack.c:360 fetch-pack.c:1290

2583 +#: fetch-pack.c:371 fetch-pack.c:1278

2584 #, c-format

2585 msgid "no shallow found: %s"

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

2587

2506 -#: fetch-pack.c:363 fetch-pack.c:1293

2588 +#: fetch-pack.c:374 fetch-pack.c:1282

2589 #, c-format

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

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

2592

2511 -#: fetch-pack.c:404

2593 +#: fetch-pack.c:415

2594 #, c-format

2595 msgid "got %s %d %s"

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

2597

2516 -#: fetch-pack.c:421

2598 +#: fetch-pack.c:432

2599 #, c-format

2600 msgid "invalid commit %s"

2601 msgstr "commit invalide %s"

2602

2521 -#: fetch-pack.c:452

2603 +#: fetch-pack.c:463

2604 msgid "giving up"

2605 msgstr "abandon"

2606

2525 -#: fetch-pack.c:464 progress.c:229

2607 +#: fetch-pack.c:475 progress.c:229

2608 msgid "done"

2609 msgstr "fait"

2610

2529 -#: fetch-pack.c:476

2611 +#: fetch-pack.c:487

2612 #, c-format

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

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

2615

2534 -#: fetch-pack.c:522

2616 +#: fetch-pack.c:533

2617 #, c-format

2618 msgid "Marking %s as complete"

2619 msgstr "Marquage de %s comme terminé"

2620

2539 -#: fetch-pack.c:764

2621 +#: fetch-pack.c:740

2622 #, c-format

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

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

2625

2544 -#: fetch-pack.c:803

2626 +#: fetch-pack.c:779

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

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

2629

2548 -#: fetch-pack.c:811

2630 +#: fetch-pack.c:787

2631 msgid "protocol error: bad pack header"

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

2633

2552 -#: fetch-pack.c:879

2634 +#: fetch-pack.c:855

2635 #, c-format

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

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

2638

2557 -#: fetch-pack.c:895

2639 +#: fetch-pack.c:871

2640 #, c-format

2641 msgid "%s failed"

2642 msgstr "échec de %s"

2643

2562 -#: fetch-pack.c:897

2644 +#: fetch-pack.c:873

2645 msgid "error in sideband demultiplexer"

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

2647

2566 -#: fetch-pack.c:926

2648 +#: fetch-pack.c:902

2649 msgid "Server does not support shallow clients"

2650 msgstr "Le serveur ne supporte les clients superficiels"

2651

2570 -#: fetch-pack.c:930

2652 +#: fetch-pack.c:906

2653 msgid "Server supports multi_ack_detailed"

2654 msgstr "Le serveur supporte multi_ack_detailed"

2655

2574 -#: fetch-pack.c:933

2656 +#: fetch-pack.c:909

2657 msgid "Server supports no-done"

2658 msgstr "Le serveur support no-done"

2659

2578 -#: fetch-pack.c:939

2660 +#: fetch-pack.c:915

2661 msgid "Server supports multi_ack"

2662 msgstr "Le serveur supporte multi_ack"

2663

2582 -#: fetch-pack.c:943

2664 +#: fetch-pack.c:919

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

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

2667

2586 -#: fetch-pack.c:947

2668 +#: fetch-pack.c:923

2669 msgid "Server supports side-band"

2670 msgstr "Le serveru supporte side-band"

2671

2590 -#: fetch-pack.c:951

2672 +#: fetch-pack.c:927

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

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

2675

2594 -#: fetch-pack.c:955

2676 +#: fetch-pack.c:931

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

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

2679

2598 -#: fetch-pack.c:965

2680 +#: fetch-pack.c:941

2681 msgid "Server supports ofs-delta"

2682 msgstr "Le serveur supporte ofs-delta"

2683

2602 -#: fetch-pack.c:971 fetch-pack.c:1158

2684 +#: fetch-pack.c:947 fetch-pack.c:1140

2685 msgid "Server supports filter"

2686 msgstr "Le serveur supporte filter"

2687

2606 -#: fetch-pack.c:979

2688 +#: fetch-pack.c:955

2689 #, c-format

2690 msgid "Server version is %.*s"

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

2692

2611 -#: fetch-pack.c:985

2693 +#: fetch-pack.c:961

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

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

2696

2615 -#: fetch-pack.c:989

2697 +#: fetch-pack.c:965

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

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

2700

2619 -#: fetch-pack.c:991

2701 +#: fetch-pack.c:967

2702 msgid "Server does not support --deepen"

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

2704

2623 -#: fetch-pack.c:1008

2705 +#: fetch-pack.c:984

2706 msgid "no common commits"

2707 msgstr "pas de commit commun"

2708

2627 -#: fetch-pack.c:1020 fetch-pack.c:1418

2709 +#: fetch-pack.c:996 fetch-pack.c:1419

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

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

2712

2631 -#: fetch-pack.c:1153

2713 +#: fetch-pack.c:1134

2714 msgid "Server does not support shallow requests"

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

2716

2635 -#: fetch-pack.c:1199

2717 +#: fetch-pack.c:1184

2718 #, c-format

2719 msgid "error reading section header '%s'"

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

2721

2640 -#: fetch-pack.c:1205

2722 +#: fetch-pack.c:1190

2723 #, c-format

2724 msgid "expected '%s', received '%s'"

2725 msgstr "'%s' attendu, '%s' reçu"

2726

2645 -#: fetch-pack.c:1244

2727 +#: fetch-pack.c:1229

2728 #, c-format

2729 msgid "unexpected acknowledgment line: '%s'"

2730 msgstr "ligne d'acquittement inattendue : '%s'"

2731

2650 -#: fetch-pack.c:1249

2732 +#: fetch-pack.c:1234

2733 #, c-format

2734 msgid "error processing acks: %d"

2735 msgstr "erreur lors du traitement des acquittements : %d"

2736

2655 -#: fetch-pack.c:1259

2737 +#: fetch-pack.c:1244

2738 msgid "expected packfile to be sent after 'ready'"

2739 msgstr "fichier paquet attendu à envoyer après 'ready'"

2740

2659 -#: fetch-pack.c:1261

2741 +#: fetch-pack.c:1246

2742 msgid "expected no other sections to be sent after no 'ready'"

2743 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"

2744

2663 -#: fetch-pack.c:1298

2745 +#: fetch-pack.c:1287

2746 #, c-format

2747 msgid "error processing shallow info: %d"

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

2749

2668 -#: fetch-pack.c:1314

2750 +#: fetch-pack.c:1308

2751 #, c-format

2752 msgid "expected wanted-ref, got '%s'"

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

2754

2673 -#: fetch-pack.c:1324

2755 +#: fetch-pack.c:1318

2756 #, c-format

2757 msgid "unexpected wanted-ref: '%s'"

2758 msgstr "wanted-ref inattendu : '%s'"

2759

2678 -#: fetch-pack.c:1328

2760 +#: fetch-pack.c:1322

2761 #, c-format

2762 msgid "error processing wanted refs: %d"

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

2764

2683 -#: fetch-pack.c:1642

2765 +#: fetch-pack.c:1646

2766 msgid "no matching remote head"

2767 msgstr "pas de HEAD distante correspondante"

2768

2687 -#: fetch-pack.c:1660 builtin/clone.c:664

2769 +#: fetch-pack.c:1664 builtin/clone.c:671

2770 msgid "remote did not send all necessary objects"

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

2772

2691 -#: fetch-pack.c:1686

2773 +#: fetch-pack.c:1690

2774 #, c-format

2775 msgid "no such remote ref %s"

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

2777

2696 -#: fetch-pack.c:1689

2778 +#: fetch-pack.c:1693

2779 #, c-format

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

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

@@ -2721,8 +2803,8 @@ msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"

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

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

2805

2724 -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2725 -#: builtin/rm.c:134

2806 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

2807 +#: builtin/rm.c:135

2808 #, c-format

2809 msgid "failed to stat '%s'"

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

@@ -2785,43 +2867,43 @@ msgstr "Commandes bas niveau / Synchronisation de dépôts"

2867 msgid "Low-level Commands / Internal Helpers"

2868 msgstr "Commandes bas niveau / Assistants internes"

2869

2788 -#: help.c:296

2870 +#: help.c:298

2871 #, c-format

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

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

2874

2793 -#: help.c:303

2875 +#: help.c:305

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

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

2878

2797 -#: help.c:312

2879 +#: help.c:314

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

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

2882

2801 -#: help.c:361 git.c:90

2883 +#: help.c:363 git.c:90

2884 #, c-format

2885 msgid "unsupported command listing type '%s'"

2886 msgstr "type de liste de commandes non supporté '%s'"

2887

2806 -#: help.c:408

2888 +#: help.c:410

2889 msgid "The common Git guides are:"

2890 msgstr "Les guides Git populaires sont :"

2891

2810 -#: help.c:517

2892 +#: help.c:519

2893 msgid "See 'git help <command>' to read about a specific subcommand"

2894 msgstr ""

2895 "Référez-vous à 'git help <commande>' pour des informations sur une sous-"

2896 "commande spécifique"

2897

2816 -#: help.c:522

2898 +#: help.c:524

2899 msgid "External commands"

2900 msgstr "Commandes externes"

2901

2820 -#: help.c:530

2902 +#: help.c:539

2903 msgid "Command aliases"

2904 msgstr "Alias de commande"

2905

2824 -#: help.c:594

2906 +#: help.c:603

2907 #, c-format

2908 msgid ""

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

@@ -2830,33 +2912,33 @@ msgstr ""

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

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

2914

2833 -#: help.c:653

2915 +#: help.c:662

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

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

2918

2837 -#: help.c:675

2919 +#: help.c:684

2920 #, c-format

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

2922 msgstr ""

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

2924

2843 -#: help.c:680

2925 +#: help.c:689

2926 #, c-format

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

2928 msgstr "Continuons en supposant que vous avez voulu dire '%s'."

2929

2848 -#: help.c:685

2930 +#: help.c:694

2931 #, c-format

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

2933 msgstr ""

2934 "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."

2935

2854 -#: help.c:693

2936 +#: help.c:702

2937 #, c-format

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

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

2940

2859 -#: help.c:697

2941 +#: help.c:706

2942 msgid ""

2943 "\n"

2944 "The most similar command is"

@@ -2870,16 +2952,16 @@ msgstr[1] ""

2952 "\n"

2953 "Les commandes les plus ressemblantes sont"

2954

2873 -#: help.c:712

2955 +#: help.c:721

2956 msgid "git version [<options>]"

2957 msgstr "git version [<options>]"

2958

2877 -#: help.c:780

2959 +#: help.c:789

2960 #, c-format

2961 msgid "%s: %s - %s"

2962 msgstr "%s: %s - %s"

2963

2882 -#: help.c:784

2964 +#: help.c:793

2965 msgid ""

2966 "\n"

2967 "Did you mean this?"

@@ -2947,20 +3029,20 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

3031

2950 -#: ident.c:419 builtin/commit.c:606

3032 +#: ident.c:419 builtin/commit.c:608

3033 #, c-format

3034 msgid "invalid date format: %s"

3035 msgstr "format de date invalide : %s"

3036

2955 -#: list-objects-filter-options.c:35

3037 +#: list-objects-filter-options.c:36

3038 msgid "multiple filter-specs cannot be combined"

3039 msgstr "impossible de combiner des spécificateurs multiples de filtre"

3040

3041 #: list-objects-filter-options.c:58

2960 -msgid "only 'tree:0' is supported"

2961 -msgstr "seul 'tree:0' est supporté"

3042 +msgid "expected 'tree:<depth>'"

3043 +msgstr "attendu : 'tree:<profondeur>'"

3044

2963 -#: list-objects-filter-options.c:137

3045 +#: list-objects-filter-options.c:152

3046 msgid "cannot change partial clone promisor remote"

3047 msgstr "impossible de modifier le prometteur distant de clone partiel"

3048

@@ -2992,96 +3074,96 @@ msgstr "Impossible de créer '%s.lock' : %s"

3074 msgid "failed to read the cache"

3075 msgstr "impossible de lire le cache"

3076

2995 -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2996 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

3077 +#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

3078 +#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

3079 msgid "unable to write new index file"

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

3081

3000 -#: merge-recursive.c:323

3082 +#: merge-recursive.c:332

3083 msgid "(bad commit)\n"

3084 msgstr "(mauvais commit)\n"

3085

3004 -#: merge-recursive.c:345

3086 +#: merge-recursive.c:355

3087 #, c-format

3088 msgid "add_cacheinfo failed for path '%s'; merge aborting."

3089 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3090

3009 -#: merge-recursive.c:353

3091 +#: merge-recursive.c:364

3092 #, c-format

3093 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

3094 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

3095

3014 -#: merge-recursive.c:435

3096 +#: merge-recursive.c:447

3097 msgid "error building trees"

3098 msgstr "erreur de construction des arbres"

3099

3018 -#: merge-recursive.c:906

3100 +#: merge-recursive.c:902

3101 #, c-format

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

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

3104

3023 -#: merge-recursive.c:917

3105 +#: merge-recursive.c:913

3106 #, c-format

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

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

3109

3028 -#: merge-recursive.c:931 merge-recursive.c:950

3110 +#: merge-recursive.c:927 merge-recursive.c:946

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

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

3113

3032 -#: merge-recursive.c:940

3114 +#: merge-recursive.c:936

3115 #, c-format

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

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

3118

3037 -#: merge-recursive.c:982 builtin/cat-file.c:39

3119 +#: merge-recursive.c:978 builtin/cat-file.c:40

3120 #, c-format

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

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

3123

3042 -#: merge-recursive.c:984

3124 +#: merge-recursive.c:980

3125 #, c-format

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

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

3128

3047 -#: merge-recursive.c:1008

3129 +#: merge-recursive.c:1004

3130 #, c-format

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

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

3133

3052 -#: merge-recursive.c:1019

3134 +#: merge-recursive.c:1015

3135 #, c-format

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

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

3138

3057 -#: merge-recursive.c:1024

3139 +#: merge-recursive.c:1020

3140 #, c-format

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

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

3143

3062 -#: merge-recursive.c:1212

3144 +#: merge-recursive.c:1211

3145 #, c-format

3146 msgid "Failed to merge submodule %s (not checked out)"

3147 msgstr "Échec de la fusion du sous-module %s (non extrait)"

3148

3067 -#: merge-recursive.c:1219

3149 +#: merge-recursive.c:1218

3150 #, c-format

3151 msgid "Failed to merge submodule %s (commits not present)"

3152 msgstr "Échec de fusion du sous-module %s (commits non présents)"

3153

3072 -#: merge-recursive.c:1226

3154 +#: merge-recursive.c:1225

3155 #, c-format

3156 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3157 msgstr ""

3158 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

3159 "base de fusion)"

3160

3079 -#: merge-recursive.c:1234 merge-recursive.c:1246

3161 +#: merge-recursive.c:1233 merge-recursive.c:1245

3162 #, c-format

3163 msgid "Fast-forwarding submodule %s to the following commit:"

3164 msgstr "Avance rapide du sous-module %s au commit suivant :"

3165

3084 -#: merge-recursive.c:1237 merge-recursive.c:1249

3166 +#: merge-recursive.c:1236 merge-recursive.c:1248

3167 #, c-format

3168 msgid "Fast-forwarding submodule %s"

3169 msgstr "Avance rapide du sous-module %s"

@@ -3123,28 +3205,28 @@ msgstr ""

3205 msgid "Failed to merge submodule %s (multiple merges found)"

3206 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

3207

3126 -#: merge-recursive.c:1358

3208 +#: merge-recursive.c:1361

3209 msgid "Failed to execute internal merge"

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

3211

3130 -#: merge-recursive.c:1363

3212 +#: merge-recursive.c:1366

3213 #, c-format

3214 msgid "Unable to add %s to database"

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

3216

3135 -#: merge-recursive.c:1395

3217 +#: merge-recursive.c:1398

3218 #, c-format

3219 msgid "Auto-merging %s"

3220 msgstr "Fusion automatique de %s"

3221

3140 -#: merge-recursive.c:1416

3222 +#: merge-recursive.c:1419

3223 #, c-format

3224 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3225 msgstr ""

3226 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

3227 "place."

3228

3147 -#: merge-recursive.c:1483

3229 +#: merge-recursive.c:1486

3230 #, c-format

3231 msgid ""

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

@@ -3153,7 +3235,7 @@ msgstr ""

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

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

3237

3156 -#: merge-recursive.c:1488

3238 +#: merge-recursive.c:1491

3239 #, c-format

3240 msgid ""

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

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

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

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

3246

3165 -#: merge-recursive.c:1495

3247 +#: merge-recursive.c:1498

3248 #, c-format

3249 msgid ""

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

@@ -3171,7 +3253,7 @@ msgstr ""

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

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

3255

3174 -#: merge-recursive.c:1500

3256 +#: merge-recursive.c:1503

3257 #, c-format

3258 msgid ""

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

@@ -3180,31 +3262,41 @@ msgstr ""

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

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

3264

3183 -#: merge-recursive.c:1534

3265 +#: merge-recursive.c:1537

3266 msgid "rename"

3267 msgstr "renommage"

3268

3187 -#: merge-recursive.c:1534

3269 +#: merge-recursive.c:1537

3270 msgid "renamed"

3271 msgstr "renommé"

3272

3191 -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3192 -#: merge-recursive.c:3124

3273 +#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3274 #, c-format

3275 msgid "Refusing to lose dirty file at %s"

3276 msgstr "Refus de perdre le fichier modifié %s"

3277

3197 -#: merge-recursive.c:1602

3278 +#: merge-recursive.c:1643

3279 +#, c-format

3280 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

3281 +msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3282 +

3283 +#: merge-recursive.c:1706

3284 +#, c-format

3285 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

3286 +msgstr ""

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

3288 +

3289 +#: merge-recursive.c:1734

3290 #, c-format

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

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

3293

3202 -#: merge-recursive.c:1607

3294 +#: merge-recursive.c:1739

3295 #, c-format

3296 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3297 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

3298

3207 -#: merge-recursive.c:1633

3299 +#: merge-recursive.c:1759

3300 #, c-format

3301 msgid ""

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

@@ -3213,28 +3305,18 @@ msgstr ""

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

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

3307

3216 -#: merge-recursive.c:1638

3308 +#: merge-recursive.c:1764

3309 msgid " (left unresolved)"

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

3311

3220 -#: merge-recursive.c:1699

3312 +#: merge-recursive.c:1868

3313 #, c-format

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

3315 msgstr ""

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

3317 ">'%s' dans %s"

3318

3227 -#: merge-recursive.c:1734

3228 -#, c-format

3229 -msgid "Renaming %s to %s and %s to %s instead"

3230 -msgstr "Renommage de %s en %s et de %s en %s à la place"

3231 -

3232 -#: merge-recursive.c:1746

3233 -#, c-format

3234 -msgid "Refusing to lose untracked file at %s, even though it's in the way."

3235 -msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

3236 -

3237 -#: merge-recursive.c:1952

3319 +#: merge-recursive.c:2064

3320 #, c-format

3321 msgid ""

3322 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3245,7 +3327,7 @@ msgstr ""

3327 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

3328 "sans aucune destination récupérant la majorité des fichiers."

3329

3248 -#: merge-recursive.c:1984

3330 +#: merge-recursive.c:2096

3331 #, c-format

3332 msgid ""

3333 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3254,7 +3336,7 @@ msgstr ""

3336 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

3337 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

3338

3257 -#: merge-recursive.c:1994

3339 +#: merge-recursive.c:2106

3340 #, c-format

3341 msgid ""

3342 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3263,7 +3345,7 @@ msgstr ""

3345 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

3346 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

3347

3266 -#: merge-recursive.c:2086

3348 +#: merge-recursive.c:2198

3349 #, c-format

3350 msgid ""

3351 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3272,7 +3354,7 @@ msgstr ""

3354 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

3355 "Renommage de répertoire %s->%s dans %s"

3356

3275 -#: merge-recursive.c:2331

3357 +#: merge-recursive.c:2443

3358 #, c-format

3359 msgid ""

3360 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3281,87 +3363,81 @@ msgstr ""

3363 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

3364 "renommé."

3365

3284 -#: merge-recursive.c:2737

3285 -#, c-format

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

3287 -msgstr ""

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

3289 -

3290 -#: merge-recursive.c:2763

3291 -#, c-format

3292 -msgid "Adding merged %s"

3293 -msgstr "Ajout de %s fusionné"

3294 -

3295 -#: merge-recursive.c:2770 merge-recursive.c:3127

3296 -#, c-format

3297 -msgid "Adding as %s instead"

3298 -msgstr "Ajout plutôt comme %s"

3299 -

3300 -#: merge-recursive.c:2934

3366 +#: merge-recursive.c:3022

3367 #, c-format

3368 msgid "cannot read object %s"

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

3370

3305 -#: merge-recursive.c:2937

3371 +#: merge-recursive.c:3025

3372 #, c-format

3373 msgid "object %s is not a blob"

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

3375

3310 -#: merge-recursive.c:3006

3376 +#: merge-recursive.c:3094

3377 msgid "modify"

3378 msgstr "modification"

3379

3314 -#: merge-recursive.c:3006

3380 +#: merge-recursive.c:3094

3381 msgid "modified"

3382 msgstr "modifié"

3383

3318 -#: merge-recursive.c:3017

3384 +#: merge-recursive.c:3105

3385 msgid "content"

3386 msgstr "contenu"

3387

3322 -#: merge-recursive.c:3024

3388 +#: merge-recursive.c:3112

3389 msgid "add/add"

3390 msgstr "ajout/ajout"

3391

3326 -#: merge-recursive.c:3071

3392 +#: merge-recursive.c:3160

3393 #, c-format

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

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

3396

3331 -#: merge-recursive.c:3093 git-submodule.sh:858

3397 +#: merge-recursive.c:3182 git-submodule.sh:861

3398 msgid "submodule"

3399 msgstr "sous-module"

3400

3335 -#: merge-recursive.c:3094

3401 +#: merge-recursive.c:3183

3402 #, c-format

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

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

3405

3406 #: merge-recursive.c:3216

3407 #, c-format

3408 +msgid "Adding as %s instead"

3409 +msgstr "Ajout plutôt comme %s"

3410 +

3411 +#: merge-recursive.c:3319

3412 +#, c-format

3413 msgid "Removing %s"

3414 msgstr "Suppression de %s"

3415

3345 -#: merge-recursive.c:3242

3416 +#: merge-recursive.c:3345

3417 msgid "file/directory"

3418 msgstr "fichier/répertoire"

3419

3349 -#: merge-recursive.c:3248

3420 +#: merge-recursive.c:3351

3421 msgid "directory/file"

3422 msgstr "répertoire/fichier"

3423

3353 -#: merge-recursive.c:3255

3424 +#: merge-recursive.c:3358

3425 #, c-format

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

3427 msgstr ""

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

3429

3359 -#: merge-recursive.c:3264

3430 +#: merge-recursive.c:3367

3431 #, c-format

3432 msgid "Adding %s"

3433 msgstr "Ajout de %s"

3434

3364 -#: merge-recursive.c:3300

3435 +#: merge-recursive.c:3376

3436 +#, c-format

3437 +msgid "CONFLICT (add/add): Merge conflict in %s"

3438 +msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

3439 +

3440 +#: merge-recursive.c:3417

3441 #, c-format

3442 msgid ""

3443 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3371,36 +3447,36 @@ msgstr ""

3447 "fusion :\n"

3448 " %s"

3449

3374 -#: merge-recursive.c:3311

3450 +#: merge-recursive.c:3428

3451 msgid "Already up to date!"

3452 msgstr "Déjà à jour !"

3453

3378 -#: merge-recursive.c:3320

3454 +#: merge-recursive.c:3437

3455 #, c-format

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

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

3458

3383 -#: merge-recursive.c:3419

3459 +#: merge-recursive.c:3536

3460 msgid "Merging:"

3461 msgstr "Fusion :"

3462

3387 -#: merge-recursive.c:3432

3463 +#: merge-recursive.c:3549

3464 #, c-format

3465 msgid "found %u common ancestor:"

3466 msgid_plural "found %u common ancestors:"

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

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

3469

3394 -#: merge-recursive.c:3471

3470 +#: merge-recursive.c:3588

3471 msgid "merge returned no commit"

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

3473

3398 -#: merge-recursive.c:3537

3474 +#: merge-recursive.c:3654

3475 #, c-format

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

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

3478

3403 -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3479 +#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

3480 msgid "Unable to write index."

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

3482

@@ -3524,22 +3600,22 @@ msgstr "impossible de lire le fichier paquet %s"

3600 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3601 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

3602

3527 -#: name-hash.c:532

3603 +#: name-hash.c:531

3604 #, c-format

3605 msgid "unable to create lazy_dir thread: %s"

3606 msgstr "impossible de créer le fil lazy_dir : %s"

3607

3532 -#: name-hash.c:554

3608 +#: name-hash.c:553

3609 #, c-format

3610 msgid "unable to create lazy_name thread: %s"

3611 msgstr "impossible de créer le fil lazy_name : %s"

3612

3537 -#: name-hash.c:560

3613 +#: name-hash.c:559

3614 #, c-format

3615 msgid "unable to join lazy_name thread: %s"

3616 msgstr "impossible de joindre le fil lazy_name : %s"

3617

3542 -#: notes-merge.c:275

3618 +#: notes-merge.c:277

3619 #, c-format

3620 msgid ""

3621 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3550,21 +3626,21 @@ msgstr ""

3626 "Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "

3627 "pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."

3628

3553 -#: notes-merge.c:282

3629 +#: notes-merge.c:284

3630 #, c-format

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

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

3633

3558 -#: notes-utils.c:45

3634 +#: notes-utils.c:46

3635 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

3637

3562 -#: notes-utils.c:104

3638 +#: notes-utils.c:105

3639 #, c-format

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

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

3642

3567 -#: notes-utils.c:114

3643 +#: notes-utils.c:115

3644 #, c-format

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

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

@@ -3573,7 +3649,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

3649 #. the environment variable, the second %s is

3650 #. its value.

3651 #.

3576 -#: notes-utils.c:144

3652 +#: notes-utils.c:145

3653 #, c-format

3654 msgid "Bad %s value: '%s'"

3655 msgstr "Mauvaise valeur de %s : '%s'"

@@ -3583,46 +3659,106 @@ msgstr "Mauvaise valeur de %s : '%s'"

3659 msgid "invalid object type \"%s\""

3660 msgstr "type d'objet invalide \"%s\""

3661

3586 -#: object.c:173

3662 +#: object.c:174

3663 #, c-format

3664 msgid "object %s is a %s, not a %s"

3665 msgstr "l'objet %s est de type %s, pas de type %s"

3666

3591 -#: object.c:233

3667 +#: object.c:234

3668 #, c-format

3669 msgid "object %s has unknown type id %d"

3670 msgstr "l'objet %s a un id de type inconnu %d"

3671

3596 -#: object.c:246

3672 +#: object.c:247

3673 #, c-format

3674 msgid "unable to parse object: %s"

3675 msgstr "impossible d'analyser l'objet : %s"

3676

3601 -#: object.c:266 object.c:277

3677 +#: object.c:267 object.c:278

3678 #, c-format

3603 -msgid "sha1 mismatch %s"

3604 -msgstr "incohérence de sha1 %s"

3679 +msgid "hash mismatch %s"

3680 +msgstr "incohérence de hachage %s"

3681

3682 #: packfile.c:607

3683 msgid "offset before end of packfile (broken .idx?)"

3684 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

3685

3610 -#: packfile.c:1864

3686 +#: packfile.c:1870

3687 #, c-format

3688 msgid "offset before start of pack index for %s (corrupt index?)"

3689 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

3690

3615 -#: packfile.c:1868

3691 +#: packfile.c:1874

3692 #, c-format

3693 msgid "offset beyond end of pack index for %s (truncated index?)"

3694 msgstr ""

3695 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

3696

3621 -#: parse-options.c:672

3697 +#: parse-options.c:35

3698 +#, c-format

3699 +msgid "%s requires a value"

3700 +msgstr "%s a besoin d'une valeur"

3701 +

3702 +#: parse-options.c:69

3703 +#, c-format

3704 +msgid "%s is incompatible with %s"

3705 +msgstr "%s est incompatible avec %s"

3706 +

3707 +#: parse-options.c:74

3708 +#, c-format

3709 +msgid "%s : incompatible with something else"

3710 +msgstr "%s est incompatible avec toute autre option"

3711 +

3712 +#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3713 +#, c-format

3714 +msgid "%s takes no value"

3715 +msgstr "%s n'accepte aucune valeur"

3716 +

3717 +#: parse-options.c:90

3718 +#, c-format

3719 +msgid "%s isn't available"

3720 +msgstr "%s n'est pas disponible"

3721 +

3722 +#: parse-options.c:178

3723 +#, c-format

3724 +msgid "%s expects a numerical value"

3725 +msgstr "%s attend une valeur numérique"

3726 +

3727 +#: parse-options.c:194

3728 +#, c-format

3729 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3730 +msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"

3731 +

3732 +#: parse-options.c:322

3733 +#, c-format

3734 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

3735 +msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"

3736 +

3737 +#: parse-options.c:356 parse-options.c:364

3738 +#, c-format

3739 +msgid "did you mean `--%s` (with two dashes ?)"

3740 +msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"

3741 +

3742 +#: parse-options.c:649

3743 +#, c-format

3744 +msgid "unknown option `%s'"

3745 +msgstr "option inconnue « %s »"

3746 +

3747 +#: parse-options.c:651

3748 +#, c-format

3749 +msgid "unknown switch `%c'"

3750 +msgstr "bascule inconnue « %c »"

3751 +

3752 +#: parse-options.c:653

3753 +#, c-format

3754 +msgid "unknown non-ascii option in string: `%s'"

3755 +msgstr "option non-ascii inconnue dans la chaîne : '%s'"

3756 +

3757 +#: parse-options.c:675

3758 msgid "..."

3759 msgstr "..."

3760

3625 -#: parse-options.c:691

3761 +#: parse-options.c:694

3762 #, c-format

3763 msgid "usage: %s"

3764 msgstr "usage : %s"

@@ -3630,26 +3766,36 @@ msgstr "usage : %s"

3766 #. TRANSLATORS: the colon here should align with the

3767 #. one in "usage: %s" translation.

3768 #.

3633 -#: parse-options.c:697

3769 +#: parse-options.c:700

3770 #, c-format

3771 msgid " or: %s"

3772 msgstr " ou : %s"

3773

3638 -#: parse-options.c:700

3774 +#: parse-options.c:703

3775 #, c-format

3776 msgid " %s"

3777 msgstr " %s"

3778

3643 -#: parse-options.c:739

3779 +#: parse-options.c:742

3780 msgid "-NUM"

3781 msgstr "-NUM"

3782

3647 -#: parse-options-cb.c:37

3783 +#: parse-options-cb.c:21

3784 +#, c-format

3785 +msgid "option `%s' expects a numerical value"

3786 +msgstr "l'option '%s' attend une valeur numérique"

3787 +

3788 +#: parse-options-cb.c:38

3789 #, c-format

3790 msgid "malformed expiration date '%s'"

3791 msgstr "date d'expiration malformée : '%s'"

3792

3652 -#: parse-options-cb.c:109

3793 +#: parse-options-cb.c:51

3794 +#, c-format

3795 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

3796 +msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""

3797 +

3798 +#: parse-options-cb.c:110

3799 #, c-format

3800 msgid "malformed object name '%s'"

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

@@ -3659,32 +3805,32 @@ msgstr "nom d'objet malformé '%s'"

3805 msgid "Could not make %s writable by group"

3806 msgstr "Impossible de rendre %s inscriptible pour le groupe"

3807

3662 -#: pathspec.c:129

3808 +#: pathspec.c:128

3809 msgid "Escape character '\\' not allowed as last character in attr value"

3810 msgstr ""

3811 "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "

3812 "valeur d'attribut"

3813

3668 -#: pathspec.c:147

3814 +#: pathspec.c:146

3815 msgid "Only one 'attr:' specification is allowed."

3816 msgstr "Une seule spécification 'attr:' est autorisée."

3817

3672 -#: pathspec.c:150

3818 +#: pathspec.c:149

3819 msgid "attr spec must not be empty"

3820 msgstr "un spécificateur d'attribut ne peut pas être vide"

3821

3676 -#: pathspec.c:193

3822 +#: pathspec.c:192

3823 #, c-format

3824 msgid "invalid attribute name %s"

3825 msgstr "nom d'attribut invalide %s"

3826

3681 -#: pathspec.c:258

3827 +#: pathspec.c:257

3828 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

3829 msgstr ""

3830 "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "

3831 "incompatibles"

3832

3687 -#: pathspec.c:265

3833 +#: pathspec.c:264

3834 msgid ""

3835 "global 'literal' pathspec setting is incompatible with all other global "

3836 "pathspec settings"

@@ -3692,48 +3838,48 @@ msgstr ""

3838 "le réglage global de spécificateur de chemin 'literal' est incompatible avec "

3839 "tous les autres réglages globaux de spécificateur de chemin"

3840

3695 -#: pathspec.c:305

3841 +#: pathspec.c:304

3842 msgid "invalid parameter for pathspec magic 'prefix'"

3843 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"

3844

3699 -#: pathspec.c:326

3845 +#: pathspec.c:325

3846 #, c-format

3847 msgid "Invalid pathspec magic '%.*s' in '%s'"

3848 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"

3849

3704 -#: pathspec.c:331

3850 +#: pathspec.c:330

3851 #, c-format

3852 msgid "Missing ')' at the end of pathspec magic in '%s'"

3853 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"

3854

3709 -#: pathspec.c:369

3855 +#: pathspec.c:368

3856 #, c-format

3857 msgid "Unimplemented pathspec magic '%c' in '%s'"

3858 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

3859

3714 -#: pathspec.c:428

3860 +#: pathspec.c:427

3861 #, c-format

3862 msgid "%s: 'literal' and 'glob' are incompatible"

3863 msgstr "%s : 'literal' et 'glob' sont incompatibles"

3864

3719 -#: pathspec.c:441

3865 +#: pathspec.c:440

3866 #, c-format

3867 msgid "%s: '%s' is outside repository"

3868 msgstr "%s : '%s' est hors du dépôt"

3869

3724 -#: pathspec.c:515

3870 +#: pathspec.c:514

3871 #, c-format

3872 msgid "'%s' (mnemonic: '%c')"

3873 msgstr "'%s' (mnémonique : '%c')"

3874

3729 -#: pathspec.c:525

3875 +#: pathspec.c:524

3876 #, c-format

3877 msgid "%s: pathspec magic not supported by this command: %s"

3878 msgstr ""

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

3880 "commande : %s"

3881

3736 -#: pathspec.c:592

3882 +#: pathspec.c:591

3883 #, c-format

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

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

@@ -3742,52 +3888,57 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"

3888 msgid "flush packet write failed"

3889 msgstr "échec de l'écriture du vidage de paquet"

3890

3745 -#: pkt-line.c:142 pkt-line.c:228

3891 +#: pkt-line.c:144 pkt-line.c:230

3892 msgid "protocol error: impossibly long line"

3893 msgstr "erreur de protocole : ligne impossiblement trop longue"

3894

3749 -#: pkt-line.c:158 pkt-line.c:160

3895 +#: pkt-line.c:160 pkt-line.c:162

3896 msgid "packet write with format failed"

3897 msgstr "échec de l'écriture d'un paquet avec format"

3898

3753 -#: pkt-line.c:192

3899 +#: pkt-line.c:194

3900 msgid "packet write failed - data exceeds max packet size"

3901 msgstr ""

3902 "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "

3903 "d'un paquet"

3904

3759 -#: pkt-line.c:199 pkt-line.c:206

3905 +#: pkt-line.c:201 pkt-line.c:208

3906 msgid "packet write failed"

3907 msgstr "échec de l'écriture d'un paquet"

3908

3763 -#: pkt-line.c:291

3909 +#: pkt-line.c:293

3910 msgid "read error"

3911 msgstr "erreur de lecture"

3912

3767 -#: pkt-line.c:299

3913 +#: pkt-line.c:301

3914 msgid "the remote end hung up unexpectedly"

3915 msgstr "L'hôte distant a fermé la connexion de manière inattendue"

3916

3771 -#: pkt-line.c:327

3917 +#: pkt-line.c:329

3918 #, c-format

3919 msgid "protocol error: bad line length character: %.4s"

3920 msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"

3921

3776 -#: pkt-line.c:337 pkt-line.c:342

3922 +#: pkt-line.c:339 pkt-line.c:344

3923 #, c-format

3924 msgid "protocol error: bad line length %d"

3925 msgstr "erreur de protocole : mauvaise longueur de ligne %d"

3926

3781 -#: preload-index.c:118

3927 +#: pkt-line.c:353

3928 +#, c-format

3929 +msgid "remote error: %s"

3930 +msgstr "erreur distante : %s"

3931 +

3932 +#: preload-index.c:119

3933 msgid "Refreshing index"

3934 msgstr "Rafraîchissement de l'index"

3935

3785 -#: preload-index.c:137

3936 +#: preload-index.c:138

3937 #, c-format

3938 msgid "unable to create threaded lstat: %s"

3939 msgstr "impossible de créer le lstat en fil : %s"

3940

3790 -#: pretty.c:962

3941 +#: pretty.c:963

3942 msgid "unable to parse --pretty format"

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

3944

@@ -3799,7 +3950,7 @@ msgstr "impossible de démarrer `log`"

3950 msgid "could not read `log` output"

3951 msgstr "impossible de lire la sortie de `log`"

3952

3802 -#: range-diff.c:74 sequencer.c:4764

3953 +#: range-diff.c:74 sequencer.c:4828

3954 #, c-format

3955 msgid "could not parse commit '%s'"

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

@@ -3813,11 +3964,47 @@ msgstr "échec de la génération de diff"

3964 msgid "could not parse log for '%s'"

3965 msgstr "impossible d'analyser le journal pour '%s'"

3966

3816 -#: read-cache.c:1490

3967 +#: read-cache.c:673

3968 +#, c-format

3969 +msgid "will not add file alias '%s' ('%s' already exists in index)"

3970 +msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"

3971 +

3972 +#: read-cache.c:689

3973 +msgid "cannot create an empty blob in the object database"

3974 +msgstr "impossible de créer un blob vide dans la base de donnée d'objets"

3975 +

3976 +#: read-cache.c:710

3977 +#, c-format

3978 +msgid "%s: can only add regular files, symbolic links or git-directories"

3979 +msgstr ""

3980 +"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "

3981 +"répertoires git"

3982 +

3983 +#: read-cache.c:765

3984 +#, c-format

3985 +msgid "unable to index file '%s'"

3986 +msgstr "indexation du fichier '%s' impossible"

3987 +

3988 +#: read-cache.c:784

3989 +#, c-format

3990 +msgid "unable to add '%s' to index"

3991 +msgstr "impossible d'ajouter '%s' à l'index"

3992 +

3993 +#: read-cache.c:795

3994 +#, c-format

3995 +msgid "unable to stat '%s'"

3996 +msgstr "fstat de '%s' impossible"

3997 +

3998 +#: read-cache.c:1304

3999 +#, c-format

4000 +msgid "'%s' appears as both a file and as a directory"

4001 +msgstr "'%s' existe à la fois comme un fichier et un répertoire"

4002 +

4003 +#: read-cache.c:1489

4004 msgid "Refresh index"

4005 msgstr "Rafraîchir l'index"

4006

3820 -#: read-cache.c:1604

4007 +#: read-cache.c:1603

4008 #, c-format

4009 msgid ""

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

@@ -3826,7 +4013,7 @@ msgstr ""

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

4014 "Utilisation de la version %i"

4015

3829 -#: read-cache.c:1614

4016 +#: read-cache.c:1613

4017 #, c-format

4018 msgid ""

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

@@ -3835,59 +4022,143 @@ msgstr ""

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

4023 "Utilisation de la version %i"

4024

3838 -#: read-cache.c:1792

4025 +#: read-cache.c:1684

4026 +#, c-format

4027 +msgid "bad signature 0x%08x"

4028 +msgstr "signature incorrecte 0x%08x"

4029 +

4030 +#: read-cache.c:1687

4031 +#, c-format

4032 +msgid "bad index version %d"

4033 +msgstr "mauvaise version d'index %d"

4034 +

4035 +#: read-cache.c:1696

4036 +msgid "bad index file sha1 signature"

4037 +msgstr "mauvaise signature sha1 d'index"

4038 +

4039 +#: read-cache.c:1726

4040 +#, c-format

4041 +msgid "index uses %.4s extension, which we do not understand"

4042 +msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"

4043 +

4044 +#: read-cache.c:1728

4045 +#, c-format

4046 +msgid "ignoring %.4s extension"

4047 +msgstr "extension %.4s ignorée"

4048 +

4049 +#: read-cache.c:1765

4050 +#, c-format

4051 +msgid "unknown index entry format 0x%08x"

4052 +msgstr "format d'entrée d'index inconnu 0x%08x"

4053 +

4054 +#: read-cache.c:1781

4055 #, c-format

4056 msgid "malformed name field in the index, near path '%s'"

4057 msgstr "champ de nom malformé dans l'index, près du chemin '%s'"

4058

3843 -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3844 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3845 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3846 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3847 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

4059 +#: read-cache.c:1836

4060 +msgid "unordered stage entries in index"

4061 +msgstr "entrées de préparation non ordonnées dans l'index"

4062 +

4063 +#: read-cache.c:1839

4064 +#, c-format

4065 +msgid "multiple stage entries for merged file '%s'"

4066 +msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"

4067 +

4068 +#: read-cache.c:1842

4069 +#, c-format

4070 +msgid "unordered stage entries for '%s'"

4071 +msgstr "entrées de préparation non ordonnées pour '%s'"

4072 +

4073 +#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

4074 +#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

4075 +#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

4076 +#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

4077 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

4078 +#: builtin/submodule--helper.c:330

4079 msgid "index file corrupt"

4080 msgstr "fichier d'index corrompu"

4081

3851 -#: read-cache.c:2101

4082 +#: read-cache.c:2090

4083 #, c-format

4084 msgid "unable to create load_cache_entries thread: %s"

4085 msgstr "impossible de créer le fil load_cache_entries : %s"

4086

3856 -#: read-cache.c:2114

4087 +#: read-cache.c:2103

4088 #, c-format

4089 msgid "unable to join load_cache_entries thread: %s"

4090 msgstr "impossible de joindre le fil load_cach_entries : %s"

4091

3861 -#: read-cache.c:2201

4092 +#: read-cache.c:2136

4093 +#, c-format

4094 +msgid "%s: index file open failed"

4095 +msgstr "%s : l'ouverture du fichier d'index a échoué"

4096 +

4097 +#: read-cache.c:2140

4098 +#, c-format

4099 +msgid "%s: cannot stat the open index"

4100 +msgstr "%s : impossible de faire un stat sur l'index ouvert"

4101 +

4102 +#: read-cache.c:2144

4103 +#, c-format

4104 +msgid "%s: index file smaller than expected"

4105 +msgstr "%s : fichier d'index plus petit qu'attendu"

4106 +

4107 +#: read-cache.c:2148

4108 +#, c-format

4109 +msgid "%s: unable to map index file"

4110 +msgstr "%s : impossible de mapper le fichier d'index"

4111 +

4112 +#: read-cache.c:2190

4113 #, c-format

4114 msgid "unable to create load_index_extensions thread: %s"

4115 msgstr "impossible de créer le fil load_index_extensions : %s"

4116

3866 -#: read-cache.c:2228

4117 +#: read-cache.c:2217

4118 #, c-format

4119 msgid "unable to join load_index_extensions thread: %s"

4120 msgstr "impossible de joindre le fil load_index_extensions : %s"

4121

3871 -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

4122 +#: read-cache.c:2239

4123 +#, c-format

4124 +msgid "could not freshen shared index '%s'"

4125 +msgstr "impossible de rafraîchir l'index partagé '%s'"

4126 +

4127 +#: read-cache.c:2274

4128 +#, c-format

4129 +msgid "broken index, expect %s in %s, got %s"

4130 +msgstr "index cassé, %s attendu dans %s, %s obtenu"

4131 +

4132 +#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4133 #, c-format

4134 msgid "could not close '%s'"

4135 msgstr "impossible de fermer '%s'"

4136

3876 -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

4137 +#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4138 #, c-format

4139 msgid "could not stat '%s'"

4140 msgstr "stat impossible de '%s'"

4141

3881 -#: read-cache.c:3068

4142 +#: read-cache.c:3057

4143 #, c-format

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

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

4146

3886 -#: read-cache.c:3080

4147 +#: read-cache.c:3069

4148 #, c-format

4149 msgid "unable to unlink: %s"

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

4151

4152 +#: read-cache.c:3088

4153 +#, c-format

4154 +msgid "cannot fix permission bits on '%s'"

4155 +msgstr "impossible de régler les bits de droit de '%s'"

4156 +

4157 +#: read-cache.c:3237

4158 +#, c-format

4159 +msgid "%s: cannot drop to stage #0"

4160 +msgstr "%s : impossible de revenir à l'étape 0"

4161 +

4162 #: rebase-interactive.c:10

4163 msgid ""

4164 "\n"

@@ -3976,8 +4247,8 @@ msgstr ""

4247 msgid "Note that empty commits are commented out"

4248 msgstr "Veuillez noter que les commits vides sont en commentaire"

4249

3979 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3980 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

4250 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4251 +#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4252 #, c-format

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

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

@@ -3992,7 +4263,7 @@ msgstr "%s ne pointe pas sur un objet valide!"

4263 msgid "ignoring dangling symref %s"

4264 msgstr "symref pendant %s ignoré"

4265

3995 -#: refs.c:585 ref-filter.c:1951

4266 +#: refs.c:585 ref-filter.c:1976

4267 #, c-format

4268 msgid "ignoring broken ref %s"

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

@@ -4017,15 +4288,15 @@ msgstr "la référence '%s' existe déjà"

4288 msgid "unexpected object ID when writing '%s'"

4289 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

4290

4020 -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

4021 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

4291 +#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4292 +#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4293 #: wrapper.c:656

4294 #, c-format

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

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

4297

4027 -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

4028 -#: builtin/am.c:728

4298 +#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4299 +#: builtin/am.c:713 builtin/rebase.c:575

4300 #, c-format

4301 msgid "could not open '%s' for writing"

4302 msgstr "impossible d'ouvrir '%s' en écriture"

@@ -4101,7 +4372,7 @@ msgid "invalid refspec '%s'"

4372 msgstr "spécificateur de réference invalide : '%s'"

4373

4374 # à priori on parle d'une branche ici

4104 -#: ref-filter.c:39 wt-status.c:1855

4375 +#: ref-filter.c:39 wt-status.c:1861

4376 msgid "gone"

4377 msgstr "disparue"

4378

@@ -4150,149 +4421,154 @@ msgstr "argument %%(%s) non reconnu : %s"

4421 msgid "%%(objecttype) does not take arguments"

4422 msgstr "%%(objecttype) n'accepte pas d'argument"

4423

4153 -#: ref-filter.c:235

4424 +#: ref-filter.c:245

4425 +#, c-format

4426 +msgid "unrecognized %%(objectsize) argument: %s"

4427 +msgstr "argument %%(objectsize) non reconnu : %s"

4428 +

4429 +#: ref-filter.c:253

4430 #, c-format

4155 -msgid "%%(objectsize) does not take arguments"

4156 -msgstr "%%(objectsize) n'accepte pas d'argument"

4431 +msgid "%%(deltabase) does not take arguments"

4432 +msgstr "%%(deltabase) n'accepte pas d'argument"

4433

4158 -#: ref-filter.c:247

4434 +#: ref-filter.c:265

4435 #, c-format

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

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

4438

4163 -#: ref-filter.c:256

4439 +#: ref-filter.c:274

4440 #, c-format

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

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

4443

4168 -#: ref-filter.c:278

4444 +#: ref-filter.c:296

4445 #, c-format

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

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

4448

4173 -#: ref-filter.c:307

4449 +#: ref-filter.c:325

4450 #, c-format

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

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

4453

4178 -#: ref-filter.c:309

4454 +#: ref-filter.c:327

4455 #, c-format

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

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

4458

4183 -#: ref-filter.c:324

4459 +#: ref-filter.c:342

4460 #, c-format

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

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

4463

4188 -#: ref-filter.c:328

4464 +#: ref-filter.c:346

4465 #, c-format

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

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

4468

4193 -#: ref-filter.c:358

4469 +#: ref-filter.c:376

4470 #, c-format

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

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

4473

4198 -#: ref-filter.c:370

4474 +#: ref-filter.c:388

4475 #, c-format

4476 msgid "unrecognized position:%s"

4477 msgstr "position non reconnue : %s"

4478

4203 -#: ref-filter.c:377

4479 +#: ref-filter.c:395

4480 #, c-format

4481 msgid "unrecognized width:%s"

4482 msgstr "largeur non reconnue : %s"

4483

4208 -#: ref-filter.c:386

4484 +#: ref-filter.c:404

4485 #, c-format

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

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

4488

4213 -#: ref-filter.c:394

4489 +#: ref-filter.c:412

4490 #, c-format

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

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

4493

4218 -#: ref-filter.c:412

4494 +#: ref-filter.c:430

4495 #, c-format

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

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

4498

4223 -#: ref-filter.c:508

4499 +#: ref-filter.c:527

4500 #, c-format

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

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

4503

4228 -#: ref-filter.c:535

4504 +#: ref-filter.c:554

4505 #, c-format

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

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

4508

4233 -#: ref-filter.c:539

4509 +#: ref-filter.c:558

4510 #, c-format

4511 msgid ""

4512 "not a git repository, but the field '%.*s' requires access to object data"

4513 msgstr ""

4514 "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"

4515

4240 -#: ref-filter.c:663

4516 +#: ref-filter.c:682

4517 #, c-format

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

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

4520

4245 -#: ref-filter.c:726

4521 +#: ref-filter.c:745

4522 #, c-format

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

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

4525

4250 -#: ref-filter.c:728

4526 +#: ref-filter.c:747

4527 #, c-format

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

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

4530

4255 -#: ref-filter.c:730

4531 +#: ref-filter.c:749

4532 #, c-format

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

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

4535

4260 -#: ref-filter.c:758

4536 +#: ref-filter.c:777

4537 #, c-format

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

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

4540

4265 -#: ref-filter.c:760

4541 +#: ref-filter.c:779

4542 #, c-format

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

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

4545

4270 -#: ref-filter.c:762

4546 +#: ref-filter.c:781

4547 #, c-format

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

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

4550

4275 -#: ref-filter.c:777

4551 +#: ref-filter.c:796

4552 #, c-format

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

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

4555

4280 -#: ref-filter.c:834

4556 +#: ref-filter.c:853

4557 #, c-format

4558 msgid "malformed format string %s"

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

4560

4285 -#: ref-filter.c:1424

4561 +#: ref-filter.c:1447

4562 #, c-format

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

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

4565

4290 -#: ref-filter.c:1427

4566 +#: ref-filter.c:1450

4567 #, c-format

4568 msgid "(no branch, rebasing detached HEAD %s)"

4569 msgstr "(aucune branche, rebasage de la HEAD détachée %s)"

4570

4295 -#: ref-filter.c:1430

4571 +#: ref-filter.c:1453

4572 #, c-format

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

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

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

4576 #. TRANSLATORS: make sure this matches "HEAD

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

4578 #.

4303 -#: ref-filter.c:1438

4579 +#: ref-filter.c:1461

4580 #, c-format

4581 msgid "(HEAD detached at %s)"

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

@@ -4308,145 +4584,296 @@ msgstr "(HEAD détachée sur %s)"

4584 #. TRANSLATORS: make sure this matches "HEAD

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

4586 #.

4311 -#: ref-filter.c:1445

4587 +#: ref-filter.c:1468

4588 #, c-format

4589 msgid "(HEAD detached from %s)"

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

4591

4316 -#: ref-filter.c:1449

4592 +#: ref-filter.c:1472

4593 msgid "(no branch)"

4594 msgstr "(aucune branche)"

4595

4320 -#: ref-filter.c:1483 ref-filter.c:1638

4596 +#: ref-filter.c:1506 ref-filter.c:1663

4597 #, c-format

4598 msgid "missing object %s for %s"

4599 msgstr "objet manquant %s pour %s"

4600

4325 -#: ref-filter.c:1491

4601 +#: ref-filter.c:1516

4602 #, c-format

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

4604 msgstr "échec de parse_object_buffer sur %s pour %s"

4605

4330 -#: ref-filter.c:1857

4606 +#: ref-filter.c:1882

4607 #, c-format

4608 msgid "malformed object at '%s'"

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

4610

4335 -#: ref-filter.c:1946

4611 +#: ref-filter.c:1971

4612 #, c-format

4613 msgid "ignoring ref with broken name %s"

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

4615

4340 -#: ref-filter.c:2232

4616 +#: ref-filter.c:2257

4617 #, c-format

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

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

4620

4345 -#: ref-filter.c:2338

4621 +#: ref-filter.c:2352

4622 +#, c-format

4623 +msgid "option `%s' is incompatible with --merged"

4624 +msgstr "l'option « %s » est incompatible avec --merged"

4625 +

4626 +#: ref-filter.c:2355

4627 +#, c-format

4628 +msgid "option `%s' is incompatible with --no-merged"

4629 +msgstr "l'option « %s » est incompatible avec --no-merged"

4630 +

4631 +#: ref-filter.c:2365

4632 #, c-format

4633 msgid "malformed object name %s"

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

4635

4350 -#: remote.c:607

4636 +#: ref-filter.c:2370

4637 +#, c-format

4638 +msgid "option `%s' must point to a commit"

4639 +msgstr "l'option '%s' doit pointer sur un commit"

4640 +

4641 +#: remote.c:363

4642 +#, c-format

4643 +msgid "config remote shorthand cannot begin with '/': %s"

4644 +msgstr ""

4645 +"un raccourci de configuration de distant ne peut pas commencer par '/' : %s"

4646 +

4647 +#: remote.c:410

4648 +msgid "more than one receivepack given, using the first"

4649 +msgstr "plus d'un receivepack fournis, utilisation du premier"

4650 +

4651 +#: remote.c:418

4652 +msgid "more than one uploadpack given, using the first"

4653 +msgstr "plus d'un uploadpack fournis, utilisation du premier"

4654 +

4655 +#: remote.c:608

4656 #, c-format

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

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

4659

4355 -#: remote.c:611

4660 +#: remote.c:612

4661 #, c-format

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

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

4664

4360 -#: remote.c:615

4665 +#: remote.c:616

4666 #, c-format

4667 msgid "%s tracks both %s and %s"

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

4669

4365 -#: remote.c:623

4366 -msgid "Internal error"

4367 -msgstr "Erreur interne"

4670 +#: remote.c:684

4671 +#, c-format

4672 +msgid "key '%s' of pattern had no '*'"

4673 +msgstr "la clé '%s' du modèle n'a pas de '*'"

4674 +

4675 +#: remote.c:694

4676 +#, c-format

4677 +msgid "value '%s' of pattern has no '*'"

4678 +msgstr "la valeur '%s' du modèle n'a pas de '*'"

4679 +

4680 +#: remote.c:1000

4681 +#, c-format

4682 +msgid "src refspec %s does not match any"

4683 +msgstr ""

4684 +"le spécificateur de référence source %s ne correspond à aucune référence"

4685 +

4686 +#: remote.c:1005

4687 +#, c-format

4688 +msgid "src refspec %s matches more than one"

4689 +msgstr ""

4690 +"le spécificateur de référence source %s correspond à plus d'une référence"

4691 +

4692 +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

4693 +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

4694 +#. the <src>.

4695 +#.

4696 +#: remote.c:1020

4697 +#, c-format

4698 +msgid ""

4699 +"The destination you provided is not a full refname (i.e.,\n"

4700 +"starting with \"refs/\"). We tried to guess what you meant by:\n"

4701 +"\n"

4702 +"- Looking for a ref that matches '%s' on the remote side.\n"

4703 +"- Checking if the <src> being pushed ('%s')\n"

4704 +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

4705 +" refs/{heads,tags}/ prefix on the remote side.\n"

4706 +"\n"

4707 +"Neither worked, so we gave up. You must fully qualify the ref."

4708 +msgstr ""

4709 +"La destination que vous avez fournie n'est pas un nom de référence complète\n"

4710 +"(c'est-à-dire commençant par \"ref/\"). Essai d'approximation par :\n"

4711 +"\n"

4712 +"- Recherche d'une référence qui correspond à '%s' sur le serveur distant.\n"

4713 +"- Vérification si la <source> en cours de poussée ('%s')\n"

4714 +" est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n"

4715 +" refs/{heads,tags}/ correspondant du côté distant.\n"

4716 +"\n"

4717 +"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "

4718 +"totalement qualifiée."

4719 +

4720 +#: remote.c:1040

4721 +#, c-format

4722 +msgid ""

4723 +"The <src> part of the refspec is a commit object.\n"

4724 +"Did you mean to create a new branch by pushing to\n"

4725 +"'%s:refs/heads/%s'?"

4726 +msgstr ""

4727 +"la partie <source> du spécificateur de référence est un objet commit.\n"

4728 +"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"

4729 +"'%s:refs/heads/%s' ?"

4730 +

4731 +#: remote.c:1045

4732 +#, c-format

4733 +msgid ""

4734 +"The <src> part of the refspec is a tag object.\n"

4735 +"Did you mean to create a new tag by pushing to\n"

4736 +"'%s:refs/tags/%s'?"

4737 +msgstr ""

4738 +"la partie <source> du spécificateur de référence est un objet étiquette.\n"

4739 +"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"

4740 +"'%s:refs/tags/%s' ?"

4741 +

4742 +#: remote.c:1050

4743 +#, c-format

4744 +msgid ""

4745 +"The <src> part of the refspec is a tree object.\n"

4746 +"Did you mean to tag a new tree by pushing to\n"

4747 +"'%s:refs/tags/%s'?"

4748 +msgstr ""

4749 +"la partie <source> du spécificateur de référence est un objet arbre.\n"

4750 +"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"

4751 +"'%s:refs/tags/%s' ?"

4752 +

4753 +#: remote.c:1055

4754 +#, c-format

4755 +msgid ""

4756 +"The <src> part of the refspec is a blob object.\n"

4757 +"Did you mean to tag a new blob by pushing to\n"

4758 +"'%s:refs/tags/%s'?"

4759 +msgstr ""

4760 +"la partie <source> du spécificateur de référence est un objet blob.\n"

4761 +"Souhaitiez-vous créer un nouveau blob en poussant sur\n"

4762 +"'%s:refs/tags/%s' ?"

4763 +

4764 +#: remote.c:1091

4765 +#, c-format

4766 +msgid "%s cannot be resolved to branch"

4767 +msgstr "'%s' ne peut pas être résolue comme une branche"

4768 +

4769 +#: remote.c:1102

4770 +#, c-format

4771 +msgid "unable to delete '%s': remote ref does not exist"

4772 +msgstr "suppression d '%s' impossible : la référence distante n'existe pas"

4773 +

4774 +#: remote.c:1114

4775 +#, c-format

4776 +msgid "dst refspec %s matches more than one"

4777 +msgstr ""

4778 +"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "

4779 +"références"

4780 +

4781 +#: remote.c:1121

4782 +#, c-format

4783 +msgid "dst ref %s receives from more than one src"

4784 +msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"

4785

4369 -#: remote.c:1569 remote.c:1670

4786 +#: remote.c:1624 remote.c:1725

4787 msgid "HEAD does not point to a branch"

4788 msgstr "HEAD ne pointe pas sur une branche"

4789

4373 -#: remote.c:1578

4790 +#: remote.c:1633

4791 #, c-format

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

4793 msgstr "pas de branche '%s'"

4794

4378 -#: remote.c:1581

4795 +#: remote.c:1636

4796 #, c-format

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

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

4799

4383 -#: remote.c:1587

4800 +#: remote.c:1642

4801 #, c-format

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

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

4804

4388 -#: remote.c:1602

4805 +#: remote.c:1657

4806 #, c-format

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

4808 msgstr ""

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

4810 "branche locale de suivi"

4811

4395 -#: remote.c:1614

4812 +#: remote.c:1669

4813 #, c-format

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

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

4816

4400 -#: remote.c:1624

4817 +#: remote.c:1679

4818 #, c-format

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

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

4821

4405 -#: remote.c:1637

4822 +#: remote.c:1692

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

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

4825

4409 -#: remote.c:1659

4826 +#: remote.c:1714

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

4828 msgstr ""

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

4830

4414 -#: remote.c:1935

4831 +#: remote.c:1840

4832 +#, c-format

4833 +msgid "couldn't find remote ref %s"

4834 +msgstr "impossible de trouver la référence distante %s"

4835 +

4836 +#: remote.c:1853

4837 +#, c-format

4838 +msgid "* Ignoring funny ref '%s' locally"

4839 +msgstr "* Référence bizarre '%s' ignorée localement"

4840 +

4841 +#: remote.c:1990

4842 #, c-format

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

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

4845

4419 -#: remote.c:1939

4846 +#: remote.c:1994

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

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

4849

4423 -#: remote.c:1942

4850 +#: remote.c:1997

4851 #, c-format

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

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

4854

4428 -#: remote.c:1946

4855 +#: remote.c:2001

4856 #, c-format

4857 msgid "Your branch and '%s' refer to different commits.\n"

4858 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

4859

4433 -#: remote.c:1949

4860 +#: remote.c:2004

4861 #, c-format

4862 msgid " (use \"%s\" for details)\n"

4863 msgstr " (utilisez \"%s\" pour plus de détails)\n"

4864

4438 -#: remote.c:1953

4865 +#: remote.c:2008

4866 #, c-format

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

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

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

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

4871

4445 -#: remote.c:1959

4872 +#: remote.c:2014

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

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

4875

4449 -#: remote.c:1962

4876 +#: remote.c:2017

4877 #, c-format

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

4879 msgid_plural ""

@@ -4458,11 +4885,11 @@ msgstr[1] ""

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

4886 "en avance rapide.\n"

4887

4461 -#: remote.c:1970

4888 +#: remote.c:2025

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

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

4891

4465 -#: remote.c:1973

4892 +#: remote.c:2028

4893 #, c-format

4894 msgid ""

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

@@ -4477,11 +4904,16 @@ msgstr[1] ""

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

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

4906

4480 -#: remote.c:1983

4907 +#: remote.c:2038

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

4909 msgstr ""

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

4911

4912 +#: remote.c:2221

4913 +#, c-format

4914 +msgid "cannot parse expected object name '%s'"

4915 +msgstr "impossible d'analyser le nom attendu d'objet '%s'"

4916 +

4917 #: replace-object.c:21

4918 #, c-format

4919 msgid "bad replace ref name: %s"

@@ -4505,7 +4937,8 @@ msgstr "MERGE_RR corrompu"

4937 msgid "unable to write rerere record"

4938 msgstr "impossible d'écrire l'enregistrement rerere"

4939

4508 -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4940 +#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4941 +#: builtin/fsck.c:314

4942 #, c-format

4943 msgid "could not write '%s'"

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

@@ -4560,8 +4993,8 @@ msgstr "impossible de délier '%s' qui est errant"

4993 msgid "Recorded preimage for '%s'"

4994 msgstr "Pré-image enregistrée pour '%s'"

4995

4563 -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4564 -#: builtin/submodule--helper.c:1423

4996 +#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4997 +#: builtin/submodule--helper.c:1427

4998 #, c-format

4999 msgid "could not create directory '%s'"

5000 msgstr "impossible de créer le répertoire '%s'"

@@ -4595,29 +5028,29 @@ msgstr "Résolution pour '%s' oubliée\n"

5028 msgid "unable to open rr-cache directory"

5029 msgstr "impossible d'ouvrir le répertoire rr-cache"

5030

4598 -#: revision.c:2324

5031 +#: revision.c:2484

5032 msgid "your current branch appears to be broken"

5033 msgstr "votre branche actuelle semble cassée"

5034

4602 -#: revision.c:2327

5035 +#: revision.c:2487

5036 #, c-format

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

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

5039

4607 -#: revision.c:2523

5040 +#: revision.c:2684

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

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

5043

4611 -#: run-command.c:740

5044 +#: run-command.c:742

5045 msgid "open /dev/null failed"

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

5047

4615 -#: run-command.c:1229

5048 +#: run-command.c:1231

5049 #, c-format

5050 msgid "cannot create async thread: %s"

5051 msgstr "impossible de créer un fil asynchrone : %s"

5052

4620 -#: run-command.c:1293

5053 +#: run-command.c:1295

5054 #, c-format

5055 msgid ""

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

@@ -4627,31 +5060,31 @@ msgstr ""

5060 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

5061 "false`."

5062

4630 -#: send-pack.c:142

5063 +#: send-pack.c:141

5064 msgid "unexpected flush packet while reading remote unpack status"

5065 msgstr ""

5066 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

5067 "distant"

5068

4636 -#: send-pack.c:144

5069 +#: send-pack.c:143

5070 #, c-format

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

5072 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

5073

4641 -#: send-pack.c:146

5074 +#: send-pack.c:145

5075 #, c-format

5076 msgid "remote unpack failed: %s"

5077 msgstr "le dépaquetage a échoué : %s"

5078

4646 -#: send-pack.c:308

5079 +#: send-pack.c:306

5080 msgid "failed to sign the push certificate"

5081 msgstr "impossible de signer le certificat de poussée"

5082

4650 -#: send-pack.c:421

5083 +#: send-pack.c:420

5084 msgid "the receiving end does not support --signed push"

5085 msgstr "Le receveur ne gère pas les poussées avec --signed"

5086

4654 -#: send-pack.c:423

5087 +#: send-pack.c:422

5088 msgid ""

5089 "not sending a push certificate since the receiving end does not support --"

5090 "signed push"

@@ -4659,42 +5092,42 @@ msgstr ""

5092 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

5093 "poussées avec --signed"

5094

4662 -#: send-pack.c:435

5095 +#: send-pack.c:434

5096 msgid "the receiving end does not support --atomic push"

5097 msgstr "Le receveur ne gère pas les poussées avec --atomic"

5098

4666 -#: send-pack.c:440

5099 +#: send-pack.c:439

5100 msgid "the receiving end does not support push options"

5101 msgstr "Le receveur ne gère pas les options de poussées"

5102

4670 -#: sequencer.c:183

5103 +#: sequencer.c:184

5104 #, c-format

5105 msgid "invalid commit message cleanup mode '%s'"

5106 msgstr "mode de nettoyage invalide de message de validation '%s'"

5107

4675 -#: sequencer.c:287

5108 +#: sequencer.c:288

5109 #, c-format

5110 msgid "could not delete '%s'"

5111 msgstr "Impossible de supprimer '%s'"

5112

4680 -#: sequencer.c:313

5113 +#: sequencer.c:314

5114 msgid "revert"

5115 msgstr "revert"

5116

4684 -#: sequencer.c:315

5117 +#: sequencer.c:316

5118 msgid "cherry-pick"

5119 msgstr "cherry-pick"

5120

4688 -#: sequencer.c:317

5121 +#: sequencer.c:318

5122 msgid "rebase -i"

5123 msgstr "rebase -i"

5124

4692 -#: sequencer.c:319

5125 +#: sequencer.c:320

5126 #, c-format

5127 msgid "unknown action: %d"

5128 msgstr "action inconnue : %d"

5129

4697 -#: sequencer.c:376

5130 +#: sequencer.c:378

5131 msgid ""

5132 "after resolving the conflicts, mark the corrected paths\n"

5133 "with 'git add <paths>' or 'git rm <paths>'"

@@ -4702,7 +5135,7 @@ msgstr ""

5135 "après résolution des conflits, marquez les chemins corrigés\n"

5136 "avec 'git add <chemins>' ou 'git rm <chemins>'"

5137

4705 -#: sequencer.c:379

5138 +#: sequencer.c:381

5139 msgid ""

5140 "after resolving the conflicts, mark the corrected paths\n"

5141 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -4712,39 +5145,39 @@ msgstr ""

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

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

5147

4715 -#: sequencer.c:392 sequencer.c:2632

5148 +#: sequencer.c:394 sequencer.c:2671

5149 #, c-format

5150 msgid "could not lock '%s'"

5151 msgstr "impossible de verrouiller '%s'"

5152

4720 -#: sequencer.c:399

5153 +#: sequencer.c:401

5154 #, c-format

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

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

5157

4725 -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4726 -#: sequencer.c:2885

5158 +#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5159 +#: sequencer.c:2931

5160 #, c-format

5161 msgid "failed to finalize '%s'"

5162 msgstr "échec lors de la finalisation de '%s'"

5163

4731 -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4732 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4733 -#: builtin/merge.c:1084 builtin/rebase.c:152

5164 +#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5165 +#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5166 +#: builtin/merge.c:1085 builtin/rebase.c:154

5167 #, c-format

5168 msgid "could not read '%s'"

5169 msgstr "impossible de lire '%s'"

5170

4738 -#: sequencer.c:453

5171 +#: sequencer.c:455

5172 #, c-format

5173 msgid "your local changes would be overwritten by %s."

5174 msgstr "vos modifications locales seraient écrasées par %s."

5175

4743 -#: sequencer.c:457

5176 +#: sequencer.c:459

5177 msgid "commit your changes or stash them to proceed."

5178 msgstr "validez vos modifications ou les remiser pour continuer."

5179

4747 -#: sequencer.c:486

5180 +#: sequencer.c:491

5181 #, c-format

5182 msgid "%s: fast-forward"

5183 msgstr "%s : avance rapide"

@@ -4752,70 +5185,70 @@ msgstr "%s : avance rapide"

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

5186 #. "rebase -i".

5187 #.

4755 -#: sequencer.c:575

5188 +#: sequencer.c:582

5189 #, c-format

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

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

5192

4760 -#: sequencer.c:591

5193 +#: sequencer.c:598

5194 msgid "unable to update cache tree"

5195 msgstr "impossible de mettre à jour l'arbre de cache"

5196

4764 -#: sequencer.c:604

5197 +#: sequencer.c:612

5198 msgid "could not resolve HEAD commit"

5199 msgstr "impossible de résoudre le commit HEAD"

5200

4768 -#: sequencer.c:684

5201 +#: sequencer.c:692

5202 #, c-format

5203 msgid "no key present in '%.*s'"

5204 msgstr "aucune clé présente dans '%.*s'"

5205

4773 -#: sequencer.c:695

5206 +#: sequencer.c:703

5207 #, c-format

5208 msgid "unable to dequote value of '%s'"

5209 msgstr "Impossible de décoter la valeur de '%s'"

5210

4778 -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4779 -#: builtin/am.c:811 builtin/merge.c:1081

5211 +#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5212 +#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5213 #, c-format

5214 msgid "could not open '%s' for reading"

5215 msgstr "impossible d'ouvrir '%s' en lecture"

5216

4784 -#: sequencer.c:742

5217 +#: sequencer.c:750

5218 msgid "'GIT_AUTHOR_NAME' already given"

5219 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

5220

4788 -#: sequencer.c:747

5221 +#: sequencer.c:755

5222 msgid "'GIT_AUTHOR_EMAIL' already given"

5223 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

5224

4792 -#: sequencer.c:752

5225 +#: sequencer.c:760

5226 msgid "'GIT_AUTHOR_DATE' already given"

5227 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

5228

4796 -#: sequencer.c:756

5229 +#: sequencer.c:764

5230 #, c-format

5231 msgid "unknown variable '%s'"

5232 msgstr "variable inconnue '%s'"

5233

4801 -#: sequencer.c:761

5234 +#: sequencer.c:769

5235 msgid "missing 'GIT_AUTHOR_NAME'"

5236 msgstr "'GIT_AUTHOR_NAME' manquant"

5237

4805 -#: sequencer.c:763

5238 +#: sequencer.c:771

5239 msgid "missing 'GIT_AUTHOR_EMAIL'"

5240 msgstr "'GIT_AUTHOR_EMAIL' manquant"

5241

4809 -#: sequencer.c:765

5242 +#: sequencer.c:773

5243 msgid "missing 'GIT_AUTHOR_DATE'"

5244 msgstr "'GIT_AUTHOR_DATE' manquant"

5245

4813 -#: sequencer.c:825

5246 +#: sequencer.c:833

5247 #, c-format

5248 msgid "invalid date format '%s' in '%s'"

5249 msgstr "format de date invalide '%s' dans '%s'"

5250

4818 -#: sequencer.c:842

5251 +#: sequencer.c:850

5252 #, c-format

5253 msgid ""

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

@@ -4844,15 +5277,15 @@ msgstr ""

5277 "\n"

5278 " git rebase --continue\n"

5279

4847 -#: sequencer.c:935

5280 +#: sequencer.c:945

5281 msgid "writing root commit"

5282 msgstr "écriture du commit racine"

5283

4851 -#: sequencer.c:1142

5284 +#: sequencer.c:1155

5285 msgid "'prepare-commit-msg' hook failed"

5286 msgstr "échec du crochet 'prepare-commit-msg'"

5287

4855 -#: sequencer.c:1149

5288 +#: sequencer.c:1162

5289 msgid ""

5290 "Your name and email address were configured automatically based\n"

5291 "on your username and hostname. Please check that they are accurate.\n"

@@ -4871,7 +5304,8 @@ msgstr ""

5304 "fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"

5305 "vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"

5306 "paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"

4874 -"instructions dans votre éditeur pour éditer votre fichier de configuration :\n"

5307 +"instructions dans votre éditeur pour éditer votre fichier de "

5308 +"configuration :\n"

5309 "\n"

5310 " git config --global --edit\n"

5311 "\n"

@@ -4880,7 +5314,7 @@ msgstr ""

5314 "\n"

5315 " git commit --amend --reset-author\n"

5316

4883 -#: sequencer.c:1162

5317 +#: sequencer.c:1175

5318 msgid ""

5319 "Your name and email address were configured automatically based\n"

5320 "on your username and hostname. Please check that they are accurate.\n"

@@ -4906,302 +5340,295 @@ msgstr ""

5340 "\n"

5341 " git commit --amend --reset-author\n"

5342

4909 -#: sequencer.c:1202

5343 +#: sequencer.c:1217

5344 msgid "couldn't look up newly created commit"

5345 msgstr "impossible de retrouver le commit nouvellement créé"

5346

4913 -#: sequencer.c:1204

5347 +#: sequencer.c:1219

5348 msgid "could not parse newly created commit"

5349 msgstr "impossible d'analyser le commit nouvellement créé"

5350

4917 -#: sequencer.c:1250

5351 +#: sequencer.c:1265

5352 msgid "unable to resolve HEAD after creating commit"

5353 msgstr "impossible de résoudre HEAD après création du commit"

5354

4921 -#: sequencer.c:1252

5355 +#: sequencer.c:1267

5356 msgid "detached HEAD"

5357 msgstr "HEAD détachée"

5358

4925 -#: sequencer.c:1256

5359 +#: sequencer.c:1271

5360 msgid " (root-commit)"

5361 msgstr " (commit racine)"

5362

4929 -#: sequencer.c:1277

5363 +#: sequencer.c:1292

5364 msgid "could not parse HEAD"

5365 msgstr "impossible de lire HEAD"

5366

4933 -#: sequencer.c:1279

5367 +#: sequencer.c:1294

5368 #, c-format

5369 msgid "HEAD %s is not a commit!"

5370 msgstr "HEAD %s n'est pas un commit !"

5371

4938 -#: sequencer.c:1283 builtin/commit.c:1543

5372 +#: sequencer.c:1298 builtin/commit.c:1546

5373 msgid "could not parse HEAD commit"

5374 msgstr "impossible d'analyser le commit HEAD"

5375

4942 -#: sequencer.c:1334 sequencer.c:1934

5376 +#: sequencer.c:1350 sequencer.c:1964

5377 msgid "unable to parse commit author"

5378 msgstr "impossible d'analyser l'auteur du commit"

5379

4946 -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

5380 +#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5381 msgid "git write-tree failed to write a tree"

5382 msgstr "git write-tree a échoué à écrire un arbre"

5383

4950 -#: sequencer.c:1361 sequencer.c:1416

5384 +#: sequencer.c:1377 sequencer.c:1433

5385 #, c-format

5386 msgid "unable to read commit message from '%s'"

5387 msgstr "impossible de lire le message de validation de '%s'"

5388

4955 -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4956 -#: builtin/merge.c:883

5389 +#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5390 +#: builtin/merge.c:884

5391 msgid "failed to write commit object"

5392 msgstr "échec de l'écriture de l'objet commit"

5393

4960 -#: sequencer.c:1443

5394 +#: sequencer.c:1460

5395 #, c-format

5396 msgid "could not parse commit %s"

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

5398

4965 -#: sequencer.c:1448

5399 +#: sequencer.c:1465

5400 #, c-format

5401 msgid "could not parse parent commit %s"

5402 msgstr "impossible d'analyser le commit parent %s"

5403

4970 -#: sequencer.c:1546 sequencer.c:1654

5404 +#: sequencer.c:1565 sequencer.c:1675

5405 #, c-format

5406 msgid "unknown command: %d"

5407 msgstr "commande inconnue : %d"

5408

4975 -#: sequencer.c:1601 sequencer.c:1626

5409 +#: sequencer.c:1622 sequencer.c:1647

5410 #, c-format

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

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

5413

4980 -#: sequencer.c:1611 sequencer.c:4744

5414 +#: sequencer.c:1632 sequencer.c:4808

5415 msgid "need a HEAD to fixup"

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

5417

4984 -#: sequencer.c:1613 sequencer.c:2912

5418 +#: sequencer.c:1634 sequencer.c:2958

5419 msgid "could not read HEAD"

5420 msgstr "Impossible de lire HEAD"

5421

4988 -#: sequencer.c:1615

5422 +#: sequencer.c:1636

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

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

5425

4992 -#: sequencer.c:1621

5426 +#: sequencer.c:1642

5427 #, c-format

5428 msgid "cannot write '%s'"

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

5430

4997 -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

5431 +#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

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

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

5434

5001 -#: sequencer.c:1636

5435 +#: sequencer.c:1657

5436 #, c-format

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

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

5439

5006 -#: sequencer.c:1643

5440 +#: sequencer.c:1664

5441 #, c-format

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

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

5444

5011 -#: sequencer.c:1649

5445 +#: sequencer.c:1670

5446 #, c-format

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

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

5449

5016 -#: sequencer.c:1732

5450 +#: sequencer.c:1758

5451 msgid "your index file is unmerged."

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

5453

5020 -#: sequencer.c:1739

5454 +#: sequencer.c:1765

5455 msgid "cannot fixup root commit"

5456 msgstr "impossible de réparer le commit racine"

5457

5024 -#: sequencer.c:1758

5458 +#: sequencer.c:1784

5459 #, c-format

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

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

5462

5029 -#: sequencer.c:1766

5463 +#: sequencer.c:1792 sequencer.c:1800

5464 #, c-format

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

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

5467

5034 -#: sequencer.c:1770

5035 -#, c-format

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

5037 -msgstr ""

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

5039 -"fusion."

5040 -

5041 -#: sequencer.c:1776

5468 +#: sequencer.c:1806

5469 #, c-format

5470 msgid "cannot get commit message for %s"

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

5472

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

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

5048 -#: sequencer.c:1795

5475 +#: sequencer.c:1825

5476 #, c-format

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

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

5479

5053 -#: sequencer.c:1860

5480 +#: sequencer.c:1890

5481 #, c-format

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

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

5484

5058 -#: sequencer.c:1915

5485 +#: sequencer.c:1945

5486 #, c-format

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

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

5489

5063 -#: sequencer.c:1916

5490 +#: sequencer.c:1946

5491 #, c-format

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

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

5494

5068 -#: sequencer.c:1974

5495 +#: sequencer.c:2005

5496 #, c-format

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

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

5499

5073 -#: sequencer.c:1981

5500 +#: sequencer.c:2012

5501 #, c-format

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

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

5504

5078 -#: sequencer.c:2062

5505 +#: sequencer.c:2094

5506 #, c-format

5507 msgid "%s does not accept arguments: '%s'"

5508 msgstr "%s n'accepte pas d'argument : '%s'"

5509

5083 -#: sequencer.c:2071

5510 +#: sequencer.c:2103

5511 #, c-format

5512 msgid "missing arguments for %s"

5513 msgstr "argument manquant pour %s"

5514

5088 -#: sequencer.c:2130

5515 +#: sequencer.c:2163

5516 #, c-format

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

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

5519

5093 -#: sequencer.c:2138

5520 +#: sequencer.c:2171

5521 #, c-format

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

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

5524

5098 -#: sequencer.c:2209

5525 +#: sequencer.c:2243

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

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

5528

5102 -#: sequencer.c:2211

5529 +#: sequencer.c:2245

5530 #, c-format

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

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

5533

5107 -#: sequencer.c:2216

5534 +#: sequencer.c:2250

5535 msgid "no commits parsed."

5536 msgstr "aucun commit analysé."

5537

5111 -#: sequencer.c:2227

5538 +#: sequencer.c:2261

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

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

5541

5115 -#: sequencer.c:2229

5542 +#: sequencer.c:2263

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

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

5545

5119 -#: sequencer.c:2299

5546 +#: sequencer.c:2333

5547 #, c-format

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

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

5550

5124 -#: sequencer.c:2380

5551 +#: sequencer.c:2420

5552 msgid "unusable squash-onto"

5553 msgstr "\"écrase-sur\" inutilisable"

5554

5128 -#: sequencer.c:2396

5555 +#: sequencer.c:2436

5556 #, c-format

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

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

5559

5133 -#: sequencer.c:2479 sequencer.c:4005

5560 +#: sequencer.c:2518 sequencer.c:4067

5561 msgid "empty commit set passed"

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

5563

5137 -#: sequencer.c:2487

5564 +#: sequencer.c:2526

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

5566 msgstr "un picorage ou un retour est déjà en cours"

5567

5141 -#: sequencer.c:2488

5568 +#: sequencer.c:2527

5569 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

5570 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

5571

5145 -#: sequencer.c:2491

5572 +#: sequencer.c:2530

5573 #, c-format

5574 msgid "could not create sequencer directory '%s'"

5575 msgstr "impossible de créer le répertoire de séquenceur '%s'"

5576

5150 -#: sequencer.c:2505

5577 +#: sequencer.c:2544

5578 msgid "could not lock HEAD"

5579 msgstr "impossible de verrouiller HEAD"

5580

5154 -#: sequencer.c:2560 sequencer.c:3761

5581 +#: sequencer.c:2599 sequencer.c:3819

5582 msgid "no cherry-pick or revert in progress"

5583 msgstr "aucun picorage ou retour en cours"

5584

5158 -#: sequencer.c:2562

5585 +#: sequencer.c:2601

5586 msgid "cannot resolve HEAD"

5587 msgstr "impossible de résoudre HEAD"

5588

5162 -#: sequencer.c:2564 sequencer.c:2599

5589 +#: sequencer.c:2603 sequencer.c:2638

5590 msgid "cannot abort from a branch yet to be born"

5591 msgstr "impossible d'abandonner depuis une branche non encore créée"

5592

5166 -#: sequencer.c:2585 builtin/grep.c:721

5593 +#: sequencer.c:2624 builtin/grep.c:732

5594 #, c-format

5595 msgid "cannot open '%s'"

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

5597

5171 -#: sequencer.c:2587

5598 +#: sequencer.c:2626

5599 #, c-format

5600 msgid "cannot read '%s': %s"

5601 msgstr "impossible de lire '%s' : %s"

5602

5176 -#: sequencer.c:2588

5603 +#: sequencer.c:2627

5604 msgid "unexpected end of file"

5605 msgstr "fin de fichier inattendue"

5606

5180 -#: sequencer.c:2594

5607 +#: sequencer.c:2633

5608 #, c-format

5609 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5610 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

5611

5185 -#: sequencer.c:2605

5612 +#: sequencer.c:2644

5613 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5614 msgstr ""

5615 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

5616

5190 -#: sequencer.c:2709 sequencer.c:3679

5617 +#: sequencer.c:2750 sequencer.c:3735

5618 #, c-format

5619 msgid "could not update %s"

5620 msgstr "impossible de mettre à jour %s"

5621

5195 -#: sequencer.c:2747 sequencer.c:3659

5622 +#: sequencer.c:2788 sequencer.c:3715

5623 msgid "cannot read HEAD"

5624 msgstr "impossible de lire HEAD"

5625

5199 -#: sequencer.c:2762

5626 +#: sequencer.c:2805

5627 #, c-format

5628 msgid "unable to copy '%s' to '%s'"

5629 msgstr "impossible de copier '%s' vers '%s'"

5630

5204 -#: sequencer.c:2770

5631 +#: sequencer.c:2813

5632 #, c-format

5633 msgid ""

5634 "You can amend the commit now, with\n"

@@ -5220,27 +5647,27 @@ msgstr ""

5647 "\n"

5648 " git rebase --continue\n"

5649

5223 -#: sequencer.c:2780

5650 +#: sequencer.c:2823

5651 #, c-format

5652 msgid "Could not apply %s... %.*s"

5653 msgstr "impossible d'appliquer %s... %.*s"

5654

5228 -#: sequencer.c:2787

5655 +#: sequencer.c:2830

5656 #, c-format

5657 msgid "Could not merge %.*s"

5658 msgstr "Impossible de fusionner %.*s"

5659

5233 -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5660 +#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

5661 #, c-format

5662 msgid "could not copy '%s' to '%s'"

5663 msgstr "impossible de copier '%s' vers '%s'"

5664

5238 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

5239 -#: builtin/rebase.c:1372 builtin/rebase.c:1426

5665 +#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230

5666 +#: builtin/rebase.c:1591 builtin/rebase.c:1646

5667 msgid "could not read index"

5668 msgstr "impossible de lire l'index"

5669

5243 -#: sequencer.c:2829

5670 +#: sequencer.c:2875

5671 #, c-format

5672 msgid ""

5673 "execution failed: %s\n"

@@ -5255,11 +5682,11 @@ msgstr ""

5682 "git rebase --continue\n"

5683 "\n"

5684

5258 -#: sequencer.c:2835

5685 +#: sequencer.c:2881

5686 msgid "and made changes to the index and/or the working tree\n"

5687 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

5688

5262 -#: sequencer.c:2841

5689 +#: sequencer.c:2887

5690 #, c-format

5691 msgid ""

5692 "execution succeeded: %s\n"

@@ -5276,77 +5703,77 @@ msgstr ""

5703 " git rebase --continue\n"

5704 "\n"

5705

5279 -#: sequencer.c:2902

5706 +#: sequencer.c:2948

5707 #, c-format

5708 msgid "illegal label name: '%.*s'"

5709 msgstr "nom de label illégal '%.*s'"

5710

5284 -#: sequencer.c:2954

5711 +#: sequencer.c:3002

5712 msgid "writing fake root commit"

5713 msgstr "écriture d'un commit racine bidon"

5714

5288 -#: sequencer.c:2959

5715 +#: sequencer.c:3007

5716 msgid "writing squash-onto"

5717 msgstr "écriture de 'écraser-sur'"

5718

5292 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5719 +#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

5720 #, c-format

5721 msgid "failed to find tree of %s"

5722 msgstr "impossible de trouver l'arbre de %s"

5723

5297 -#: sequencer.c:3015 builtin/rebase.c:604

5724 +#: sequencer.c:3063 builtin/rebase.c:448

5725 msgid "could not write index"

5726 msgstr "impossible d'écrire l'index"

5727

5301 -#: sequencer.c:3042

5728 +#: sequencer.c:3090

5729 #, c-format

5730 msgid "could not resolve '%s'"

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

5732

5306 -#: sequencer.c:3068

5733 +#: sequencer.c:3118

5734 msgid "cannot merge without a current revision"

5735 msgstr "impossible de fusionner avec une révision courante"

5736

5310 -#: sequencer.c:3090

5737 +#: sequencer.c:3140

5738 #, c-format

5739 msgid "unable to parse '%.*s'"

5740 msgstr "impossible d'analyser '%.*s'"

5741

5315 -#: sequencer.c:3099

5742 +#: sequencer.c:3149

5743 #, c-format

5744 msgid "nothing to merge: '%.*s'"

5745 msgstr "rien à fusionner : '%.*s'"

5746

5320 -#: sequencer.c:3111

5747 +#: sequencer.c:3161

5748 msgid "octopus merge cannot be executed on top of a [new root]"

5749 msgstr ""

5750 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

5751

5325 -#: sequencer.c:3126

5752 +#: sequencer.c:3176

5753 #, c-format

5754 msgid "could not get commit message of '%s'"

5755 msgstr "impossible de lire le message de validation de '%s'"

5756

5330 -#: sequencer.c:3274

5757 +#: sequencer.c:3325

5758 #, c-format

5759 msgid "could not even attempt to merge '%.*s'"

5760 msgstr "impossible de seulement essayer de fusionner '%.*s'"

5761

5335 -#: sequencer.c:3290

5762 +#: sequencer.c:3341

5763 msgid "merge: Unable to write new index file"

5764 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

5765

5339 -#: sequencer.c:3358 builtin/rebase.c:268

5766 +#: sequencer.c:3409 builtin/rebase.c:298

5767 #, c-format

5768 msgid "Applied autostash.\n"

5769 msgstr "Autoremisage appliqué.\n"

5770

5344 -#: sequencer.c:3370

5771 +#: sequencer.c:3421

5772 #, c-format

5773 msgid "cannot store %s"

5774 msgstr "impossible de stocker %s"

5775

5349 -#: sequencer.c:3373 builtin/rebase.c:284

5776 +#: sequencer.c:3424 builtin/rebase.c:314

5777 #, c-format

5778 msgid ""

5779 "Applying autostash resulted in conflicts.\n"

@@ -5357,31 +5784,31 @@ msgstr ""

5784 "Vos modifications sont à l'abri dans la remise.\n"

5785 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

5786

5360 -#: sequencer.c:3427

5787 +#: sequencer.c:3478

5788 #, c-format

5789 msgid "could not checkout %s"

5790 msgstr "extraction de %s impossible"

5791

5365 -#: sequencer.c:3441

5792 +#: sequencer.c:3492

5793 #, c-format

5794 msgid "%s: not a valid OID"

5795 msgstr "%s n'est pas un OID valide"

5796

5370 -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5797 +#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

5798 msgid "could not detach HEAD"

5799 msgstr "Impossible de détacher HEAD"

5800

5374 -#: sequencer.c:3461

5801 +#: sequencer.c:3512

5802 #, c-format

5803 msgid "Stopped at HEAD\n"

5804 msgstr "arrêt à HEAD\n"

5805

5379 -#: sequencer.c:3463

5806 +#: sequencer.c:3514

5807 #, c-format

5808 msgid "Stopped at %s\n"

5809 msgstr "Arrêté à %s\n"

5810

5384 -#: sequencer.c:3471

5811 +#: sequencer.c:3522

5812 #, c-format

5813 msgid ""

5814 "Could not execute the todo command\n"

@@ -5402,48 +5829,48 @@ msgstr ""

5829 " git rebase --edit-todo\n"

5830 " git rebase --continue\n"

5831

5405 -#: sequencer.c:3543

5832 +#: sequencer.c:3597

5833 #, c-format

5834 msgid "Stopped at %s... %.*s\n"

5835 msgstr "arrêt à %s... %.*s\n"

5836

5410 -#: sequencer.c:3622

5837 +#: sequencer.c:3677

5838 #, c-format

5839 msgid "unknown command %d"

5840 msgstr "commande inconnue %d"

5841

5415 -#: sequencer.c:3667

5842 +#: sequencer.c:3723

5843 msgid "could not read orig-head"

5844 msgstr "impossible de lire orig-head"

5845

5419 -#: sequencer.c:3672 sequencer.c:4741

5846 +#: sequencer.c:3728 sequencer.c:4805

5847 msgid "could not read 'onto'"

5848 msgstr "impossible de lire 'onto'"

5849

5423 -#: sequencer.c:3686

5850 +#: sequencer.c:3742

5851 #, c-format

5852 msgid "could not update HEAD to %s"

5853 msgstr "impossible de mettre à jour HEAD sur %s"

5854

5428 -#: sequencer.c:3772

5855 +#: sequencer.c:3831

5856 msgid "cannot rebase: You have unstaged changes."

5857 msgstr "impossible de rebaser : vous avez des modifications non indexées."

5858

5432 -#: sequencer.c:3781

5859 +#: sequencer.c:3840

5860 msgid "cannot amend non-existing commit"

5861 msgstr "impossible de corriger un commit non-existant"

5862

5436 -#: sequencer.c:3783

5863 +#: sequencer.c:3842

5864 #, c-format

5865 msgid "invalid file: '%s'"

5866 msgstr "fichier invalide : '%s'"

5867

5441 -#: sequencer.c:3785

5868 +#: sequencer.c:3844

5869 #, c-format

5870 msgid "invalid contents: '%s'"

5871 msgstr "contenu invalide : '%s'"

5872

5446 -#: sequencer.c:3788

5873 +#: sequencer.c:3847

5874 msgid ""

5875 "\n"

5876 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -5453,54 +5880,54 @@ msgstr ""

5880 "Vous avez des modifications non validées dans votre copie de travail.\n"

5881 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

5882

5456 -#: sequencer.c:3824 sequencer.c:3862

5883 +#: sequencer.c:3883 sequencer.c:3921

5884 #, c-format

5885 msgid "could not write file: '%s'"

5886 msgstr "impossible d'écrire le fichier : '%s'"

5887

5461 -#: sequencer.c:3877

5888 +#: sequencer.c:3936

5889 msgid "could not remove CHERRY_PICK_HEAD"

5890 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

5891

5465 -#: sequencer.c:3884

5892 +#: sequencer.c:3943

5893 msgid "could not commit staged changes."

5894 msgstr "impossible de valider les modifications indexées."

5895

5469 -#: sequencer.c:3982

5896 +#: sequencer.c:4044

5897 #, c-format

5898 msgid "%s: can't cherry-pick a %s"

5899 msgstr "%s : impossible de picorer un %s"

5900

5474 -#: sequencer.c:3986

5901 +#: sequencer.c:4048

5902 #, c-format

5903 msgid "%s: bad revision"

5904 msgstr "%s : mauvaise révision"

5905

5479 -#: sequencer.c:4021

5906 +#: sequencer.c:4083

5907 msgid "can't revert as initial commit"

5908 msgstr "impossible d'annuler en tant que commit initial"

5909

5483 -#: sequencer.c:4466

5910 +#: sequencer.c:4529

5911 msgid "make_script: unhandled options"

5912 msgstr "make_script : options non gérées"

5913

5487 -#: sequencer.c:4469

5914 +#: sequencer.c:4532

5915 msgid "make_script: error preparing revisions"

5916 msgstr "make_script : erreur lors de la préparation des révisions"

5917

5491 -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5918 +#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

5919 #, c-format

5920 msgid "unusable todo list: '%s'"

5921 msgstr "liste à faire inutilisable : '%s'"

5922

5496 -#: sequencer.c:4620

5923 +#: sequencer.c:4684

5924 #, c-format

5925 msgid ""

5926 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5927 msgstr ""

5928 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

5929

5503 -#: sequencer.c:4690

5930 +#: sequencer.c:4754

5931 #, c-format

5932 msgid ""

5933 "Warning: some commits may have been dropped accidentally.\n"

@@ -5509,7 +5936,7 @@ msgstr ""

l10n: fr.po v2.21.0 rnd 2