b67e63067d · matheusbsbs/matheus-bagliano

@@ -1,7 +1,7 @@

1 # French translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Jean-Noël Avila <jn.avila@free.fr>, 2015.

4 +# Jean-Noël Avila <jn.avila@free.fr>, 2016.

5 # Sébastien Helleu <flashcode@flashtux.org>, 2013.

6 #

7 # French translations of common Git words used in this file:

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

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2016-05-24 23:42+0800\n"

77 -"PO-Revision-Date: 2016-05-26 22:46+0200\n"

76 +"POT-Creation-Date: 2016-08-27 23:21+0800\n"

77 +"PO-Revision-Date: 2016-08-28 11:26+0200\n"

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

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

80 "Language: fr\n"

@@ -88,7 +88,32 @@ msgstr ""

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

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

90

91 -#: advice.c:88

91 +#: advice.c:83

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

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

94 +

95 +#: advice.c:85

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

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

98 +

99 +#: advice.c:87

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

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

102 +

103 +#: advice.c:89

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

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

106 +

107 +#: advice.c:91

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

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

110 +

111 +#: advice.c:93

112 +#, c-format

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

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

115 +

116 +#: advice.c:101

117 msgid ""

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

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

@@ -96,18 +121,54 @@ msgstr ""

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

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

123

99 -#: advice.c:101 builtin/merge.c:1238

124 +#: advice.c:109

125 +msgid "Exiting because of an unresolved conflict."

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

127 +

128 +#: advice.c:114 builtin/merge.c:1181

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

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

131

103 -#: advice.c:103

132 +#: advice.c:116

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

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

135

107 -#: advice.c:104

136 +#: advice.c:117

137 msgid "Exiting because of unfinished merge."

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

139

140 +#: advice.c:123

141 +#, c-format

142 +msgid ""

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

144 +"\n"

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

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

147 +"state without impacting any branches by performing another checkout.\n"

148 +"\n"

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

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

151 +"\n"

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

153 +"\n"

154 +msgstr ""

155 +"Note : extraction de '%s'.\n"

156 +"\n"

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

158 +"modifications\n"

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

160 +"pour\n"

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

162 +"autres branches\n"

163 +"\n"

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

165 +"vous créez,\n"

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

167 +"ceci :\n"

168 +"\n"

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

170 +"\n"

171 +

172 #: archive.c:12

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

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

@@ -127,7 +188,7 @@ msgstr ""

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

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

190

130 -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

191 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

192 #, c-format

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

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

@@ -140,7 +201,7 @@ msgstr "fmt"

201 msgid "archive format"

202 msgstr "format d'archive"

203

143 -#: archive.c:430 builtin/log.c:1395

204 +#: archive.c:430 builtin/log.c:1422

205 msgid "prefix"

206 msgstr "préfixe"

207

@@ -148,10 +209,10 @@ msgstr "préfixe"

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

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

211

151 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549

152 -#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989

153 -#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459

154 -#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561

212 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554

213 +#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989

214 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460

215 +#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562

216 #: builtin/read-tree.c:109 parse-options.h:153

217 msgid "file"

218 msgstr "fichier"

@@ -185,7 +246,7 @@ msgid "list supported archive formats"

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

247

248 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

188 -#: builtin/submodule--helper.c:776

249 +#: builtin/submodule--helper.c:832

250 msgid "repo"

251 msgstr "dépôt"

252

@@ -193,7 +254,7 @@ msgstr "dépôt"

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

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

256

196 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

257 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

258 msgid "command"

259 msgstr "commande"

260

@@ -201,6 +262,28 @@ msgstr "commande"

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

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

264

265 +#: archive.c:461

266 +msgid "Unexpected option --remote"

267 +msgstr "Option --remote inattendue"

268 +

269 +#: archive.c:463

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

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

272 +

273 +#: archive.c:465

274 +msgid "Unexpected option --output"

275 +msgstr "Option --output inattendue"

276 +

277 +#: archive.c:487

278 +#, c-format

279 +msgid "Unknown archive format '%s'"

280 +msgstr "Format d'archive inconnu '%s'"

281 +

282 +#: archive.c:494

283 +#, c-format

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

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

286 +

287 #: attr.c:263

288 msgid ""

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

@@ -209,6 +292,130 @@ msgstr ""

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

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

294

295 +#: bisect.c:441

296 +#, c-format

297 +msgid "Could not open file '%s'"

298 +msgstr "impossible d'ouvrir le fichier '%s'"

299 +

300 +#: bisect.c:446

301 +#, c-format

302 +msgid "Badly quoted content in file '%s': %s"

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

304 +

305 +#: bisect.c:655

306 +#, c-format

307 +msgid "We cannot bisect more!\n"

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

309 +

310 +#: bisect.c:708

311 +#, c-format

312 +msgid "Not a valid commit name %s"

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

314 +

315 +#: bisect.c:732

316 +#, c-format

317 +msgid ""

318 +"The merge base %s is bad.\n"

319 +"This means the bug has been fixed between %s and [%s].\n"

320 +msgstr ""

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

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

323 +

324 +#: bisect.c:737

325 +#, c-format

326 +msgid ""

327 +"The merge base %s is new.\n"

328 +"The property has changed between %s and [%s].\n"

329 +msgstr ""

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

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

332 +

333 +#: bisect.c:742

334 +#, c-format

335 +msgid ""

336 +"The merge base %s is %s.\n"

337 +"This means the first '%s' commit is between %s and [%s].\n"

338 +msgstr ""

339 +"La base de fusion %s est %s.\n"

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

341 +

342 +#: bisect.c:750

343 +#, c-format

344 +msgid ""

345 +"Some %s revs are not ancestor of the %s rev.\n"

346 +"git bisect cannot work properly in this case.\n"

347 +"Maybe you mistook %s and %s revs?\n"

348 +msgstr ""

349 +"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"

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

351 +"Peut-être avez-vous inversé les révisions %s et %s ?\n"

352 +

353 +#: bisect.c:763

354 +#, c-format

355 +msgid ""

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

357 +"So we cannot be sure the first %s commit is between %s and %s.\n"

358 +"We continue anyway."

359 +msgstr ""

360 +"La base de fusion entre %s et [%s] doit être évitée.\n"

361 +"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "

362 +"et %s.\n"

363 +"On continue tout de même."

364 +

365 +#: bisect.c:798

366 +#, c-format

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

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

369 +

370 +#: bisect.c:849

371 +#, c-format

372 +msgid "a %s revision is needed"

373 +msgstr "une révision %s est nécessaire"

374 +

375 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

376 +#, c-format

377 +msgid "could not create file '%s'"

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

379 +

380 +#: bisect.c:917

381 +#, c-format

382 +msgid "could not read file '%s'"

383 +msgstr "impossible de lire le fichier '%s'"

384 +

385 +#: bisect.c:947

386 +msgid "reading bisect refs failed"

387 +msgstr "impossible de lire les références de bissection"

388 +

389 +#: bisect.c:967

390 +#, c-format

391 +msgid "%s was both %s and %s\n"

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

393 +

394 +#: bisect.c:975

395 +#, c-format

396 +msgid ""

397 +"No testable commit found.\n"

398 +"Maybe you started with bad path parameters?\n"

399 +msgstr ""

400 +"Aucun commit testable n'a été trouvé\n"

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

402 +

403 +#: bisect.c:994

404 +#, c-format

405 +msgid "(roughly %d step)"

406 +msgid_plural "(roughly %d steps)"

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

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

409 +

410 +#. TRANSLATORS: the last %s will be replaced with

411 +#. "(roughly %d steps)" translation

412 +#: bisect.c:998

413 +#, c-format

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

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

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

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

418 +

419 #: branch.c:53

420 #, c-format

421 msgid ""

@@ -364,7 +571,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

573

367 -#: bundle.c:87 builtin/commit.c:777

574 +#: bundle.c:87 builtin/commit.c:778

575 #, c-format

576 msgid "could not open '%s'"

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

@@ -373,10 +580,10 @@ msgstr "impossible d'ouvrir '%s'"

580 msgid "Repository lacks these prerequisite commits:"

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

582

376 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

377 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

378 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

379 -#: builtin/merge.c:361 builtin/shortlog.c:170

583 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

584 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

585 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

586 +#: builtin/merge.c:356 builtin/shortlog.c:170

587 msgid "revision walk setup failed"

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

589

@@ -415,7 +622,7 @@ msgstr "rev-list a disparu"

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

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

624

418 -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

625 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

626 #, c-format

627 msgid "unrecognized argument: %s"

628 msgstr "argument non reconnu : %s"

@@ -433,13 +640,13 @@ msgstr "impossible de créer '%s'"

640 msgid "index-pack died"

641 msgstr "l'index de groupe a disparu"

642

436 -#: color.c:275

643 +#: color.c:290

644 #, c-format

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

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

647

441 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

442 -#: builtin/am.c:2134

648 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

649 +#: builtin/am.c:2119

650 #, c-format

651 msgid "could not parse %s"

652 msgstr "impossible d'analyser %s"

@@ -453,131 +660,203 @@ msgstr "%s %s n'est pas un commit !"

660 msgid "memory exhausted"

661 msgstr "plus de mémoire"

662

456 -#: config.c:475 config.c:477

663 +#: config.c:516

664 #, c-format

458 -msgid "bad config line %d in %s %s"

459 -msgstr "ligne %d de fichier de config incorrecte dans %s %s"

665 +msgid "bad config line %d in blob %s"

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

667

461 -#: config.c:593

668 +#: config.c:520

669 #, c-format

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

464 -msgstr ""

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

670 +msgid "bad config line %d in file %s"

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

672 +

673 +#: config.c:524

674 +#, c-format

675 +msgid "bad config line %d in standard input"

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

677

467 -#: config.c:595

678 +#: config.c:528

679 +#, c-format

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

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

682 +

683 +#: config.c:532

684 +#, c-format

685 +msgid "bad config line %d in command line %s"

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

687 +

688 +#: config.c:536

689 +#, c-format

690 +msgid "bad config line %d in %s"

691 +msgstr "ligne %d de config incorrecte dans %s"

692 +

693 +#: config.c:655

694 +msgid "out of range"

695 +msgstr "hors plage"

696 +

697 +#: config.c:655

698 +msgid "invalid unit"

699 +msgstr "unité invalide"

700 +

701 +#: config.c:661

702 #, c-format

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

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

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

705 +

706 +#: config.c:666

707 +#, c-format

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

709 +msgstr ""

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

711 +"%s : %s"

712 +

713 +#: config.c:669

714 +#, c-format

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

716 +msgstr ""

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

718 +"%s : %s"

719 +

720 +#: config.c:672

721 +#, c-format

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

723 +msgstr ""

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

725 +"standard : %s"

726 +

727 +#: config.c:675

728 +#, c-format

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

730 +msgstr ""

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

732 +"sous-module %s : %s"

733 +

734 +#: config.c:678

735 +#, c-format

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

737 +msgstr ""

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

739 +"commande %s : %s"

740 +

741 +#: config.c:681

742 +#, c-format

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

744 +msgstr ""

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

746

472 -#: config.c:680

747 +#: config.c:768

748 #, c-format

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

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

751

477 -#: config.c:761 config.c:772

752 +#: config.c:849 config.c:860

753 #, c-format

754 msgid "bad zlib compression level %d"

755 msgstr "niveau de compression zlib incorrect %d"

756

482 -#: config.c:890

757 +#: config.c:978

758 #, c-format

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

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

761

487 -#: config.c:1228

762 +#: config.c:1312

763 msgid "unable to parse command-line config"

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

765

491 -#: config.c:1284

492 -msgid "unknown error occured while reading the configuration files"

766 +#: config.c:1362

767 +msgid "unknown error occurred while reading the configuration files"

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

769

495 -#: config.c:1629

770 +#: config.c:1716

771 #, c-format

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

773 msgstr ""

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

775

501 -#: config.c:1631

776 +#: config.c:1718

777 #, c-format

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

779 msgstr ""

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

781

507 -#: config.c:1690

782 +#: config.c:1777

783 #, c-format

784 msgid "%s has multiple values"

785 msgstr "%s a des valeurs multiples"

786

512 -#: config.c:2224

787 +#: config.c:2311

788 #, c-format

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

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

791

517 -#: config.c:2226

792 +#: config.c:2313

793 #, c-format

794 msgid "could not unset '%s'"

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

796

522 -#: connected.c:69

797 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

798 +msgid "Checking connectivity"

799 +msgstr "Vérification de la connectivité"

800 +

801 +#: connected.c:74

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

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

804

526 -#: connected.c:89

805 +#: connected.c:94

806 msgid "failed write to rev-list"

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

808

530 -#: connected.c:96

809 +#: connected.c:101

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

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

812

534 -#: date.c:95

813 +#: date.c:97

814 msgid "in the future"

815 msgstr "dans le futur"

816

538 -#: date.c:101

817 +#: date.c:103

818 #, c-format

819 msgid "%lu second ago"

820 msgid_plural "%lu seconds ago"

821 msgstr[0] "il y a %lu seconde"

822 msgstr[1] "il y a %lu secondes"

823

545 -#: date.c:108

824 +#: date.c:110

825 #, c-format

826 msgid "%lu minute ago"

827 msgid_plural "%lu minutes ago"

828 msgstr[0] "il y a %lu minute"

829 msgstr[1] "il y a %lu minutes"

830

552 -#: date.c:115

831 +#: date.c:117

832 #, c-format

833 msgid "%lu hour ago"

834 msgid_plural "%lu hours ago"

835 msgstr[0] "il y a %lu heure"

836 msgstr[1] "il y a %lu heures"

837

559 -#: date.c:122

838 +#: date.c:124

839 #, c-format

840 msgid "%lu day ago"

841 msgid_plural "%lu days ago"

842 msgstr[0] "il y a %lu jour"

843 msgstr[1] "il y a %lu jours"

844

566 -#: date.c:128

845 +#: date.c:130

846 #, c-format

847 msgid "%lu week ago"

848 msgid_plural "%lu weeks ago"

849 msgstr[0] "il y a %lu semaine"

850 msgstr[1] "il y a %lu semaines"

851

573 -#: date.c:135

852 +#: date.c:137

853 #, c-format

854 msgid "%lu month ago"

855 msgid_plural "%lu months ago"

856 msgstr[0] "il y a %lu mois"

857 msgstr[1] "il y a %lu mois"

858

580 -#: date.c:146

859 +#: date.c:148

860 #, c-format

861 msgid "%lu year"

862 msgid_plural "%lu years"

@@ -585,14 +864,14 @@ msgstr[0] "%lu an"

864 msgstr[1] "%lu ans"

865

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

588 -#: date.c:149

867 +#: date.c:151

868 #, c-format

869 msgid "%s, %lu month ago"

870 msgid_plural "%s, %lu months ago"

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

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

873

595 -#: date.c:154 date.c:159

874 +#: date.c:156 date.c:161

875 #, c-format

876 msgid "%lu year ago"

877 msgid_plural "%lu years ago"

@@ -604,7 +883,7 @@ msgstr[1] "il y a %lu ans"

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

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

885

607 -#: diffcore-rename.c:538

886 +#: diffcore-rename.c:540

887 msgid "Performing inexact rename detection"

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

889

@@ -634,16 +913,16 @@ msgstr ""

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

914 "%s"

915

637 -#: diff.c:3007

916 +#: diff.c:3017

917 #, c-format

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

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

920

642 -#: diff.c:3405

921 +#: diff.c:3415

922 msgid "--follow requires exactly one pathspec"

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

924

646 -#: diff.c:3568

925 +#: diff.c:3578

926 #, c-format

927 msgid ""

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

@@ -652,7 +931,7 @@ msgstr ""

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

932 "%s"

933

655 -#: diff.c:3582

934 +#: diff.c:3592

935 #, c-format

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

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

@@ -665,39 +944,30 @@ msgstr "echec de l'obtention d'information de kernel"

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

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

946

668 -#: gpg-interface.c:166 gpg-interface.c:235

669 -msgid "could not run gpg."

670 -msgstr "impossible de lancer gpg."

671 -

947 #: gpg-interface.c:178

673 -msgid "gpg did not accept the data"

674 -msgstr "gpg n'a pas accepté les données"

675 -

676 -#: gpg-interface.c:189

948 msgid "gpg failed to sign the data"

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

950

680 -#: gpg-interface.c:222

681 -#, c-format

682 -msgid "could not create temporary file '%s'"

683 -msgstr "impossible de créer un fichier temporaire '%s'"

951 +#: gpg-interface.c:208

952 +msgid "could not create temporary file"

953 +msgstr "impossible de créer un fichier temporaire"

954

685 -#: gpg-interface.c:224

955 +#: gpg-interface.c:210

956 #, c-format

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

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

959

690 -#: grep.c:1718

960 +#: grep.c:1792

961 #, c-format

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

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

964

695 -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

965 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

966 #, c-format

967 msgid "failed to stat '%s'"

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

969

700 -#: grep.c:1746

970 +#: grep.c:1820

971 #, c-format

972 msgid "'%s': short read"

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

@@ -748,7 +1018,7 @@ msgstr "dans %0.1f secondes automatiquement..."

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

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

1020

751 -#: help.c:404 help.c:464

1021 +#: help.c:404 help.c:470

1022 msgid ""

1023 "\n"

1024 "Did you mean this?"

@@ -762,7 +1032,7 @@ msgstr[1] ""

1032 "\n"

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

1034

765 -#: help.c:460

1035 +#: help.c:466

1036 #, c-format

1037 msgid "%s: %s - %s"

1038 msgstr "%s: %s - %s"

@@ -795,83 +1065,78 @@ msgstr "Impossible de créer '%s.lock' : %s"

1065 msgid "failed to read the cache"

1066 msgstr "impossible de lire le cache"

1067

798 -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

799 -#: builtin/checkout.c:586 builtin/clone.c:732

1068 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

1069 +#: builtin/checkout.c:589 builtin/clone.c:732

1070 msgid "unable to write new index file"

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

1072

803 -#: merge-recursive.c:189

804 -#, c-format

1073 +#: merge-recursive.c:209

1074 msgid "(bad commit)\n"

1075 msgstr "(mauvais commit)\n"

1076

808 -#: merge-recursive.c:209

1077 +#: merge-recursive.c:231

1078 #, c-format

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

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

1081

813 -#: merge-recursive.c:270

1082 +#: merge-recursive.c:301

1083 msgid "error building trees"

1084 msgstr "erreur de construction des arbres"

1085

817 -#: merge-recursive.c:689

1086 +#: merge-recursive.c:720

1087 #, c-format

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

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

1090

822 -#: merge-recursive.c:700

1091 +#: merge-recursive.c:731

1092 #, c-format

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

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

1095

827 -#: merge-recursive.c:714 merge-recursive.c:735

1096 +#: merge-recursive.c:745 merge-recursive.c:764

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

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

1099

831 -#: merge-recursive.c:725

1100 +#: merge-recursive.c:754

1101 #, c-format

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

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

1104

836 -#: merge-recursive.c:765

1105 +#: merge-recursive.c:796

1106 #, c-format

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

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

1109

841 -#: merge-recursive.c:767

1110 +#: merge-recursive.c:798

1111 #, c-format

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

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

1114

846 -#: merge-recursive.c:790 builtin/clone.c:376

1115 +#: merge-recursive.c:822

1116 #, c-format

848 -msgid "failed to open '%s'"

849 -msgstr "échec à l'ouverture de '%s'"

1117 +msgid "failed to open '%s': %s"

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

1119

851 -#: merge-recursive.c:798

1120 +#: merge-recursive.c:833

1121 #, c-format

853 -msgid "failed to symlink '%s'"

854 -msgstr "échec à la création du lien symbolique '%s'"

1122 +msgid "failed to symlink '%s': %s"

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

1124

856 -#: merge-recursive.c:801

1125 +#: merge-recursive.c:838

1126 #, c-format

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

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

1129

861 -#: merge-recursive.c:939

1130 +#: merge-recursive.c:978

1131 msgid "Failed to execute internal merge"

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

1133

865 -#: merge-recursive.c:943

1134 +#: merge-recursive.c:982

1135 #, c-format

1136 msgid "Unable to add %s to database"

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

1138

870 -#: merge-recursive.c:959

871 -msgid "unsupported object type in the tree"

872 -msgstr "type d'objet non supporté dans l'arbre"

873 -

874 -#: merge-recursive.c:1034 merge-recursive.c:1048

1139 +#: merge-recursive.c:1081 merge-recursive.c:1095

1140 #, c-format

1141 msgid ""

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

@@ -880,7 +1145,7 @@ msgstr ""

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

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

1147

883 -#: merge-recursive.c:1040 merge-recursive.c:1053

1148 +#: merge-recursive.c:1087 merge-recursive.c:1100

1149 #, c-format

1150 msgid ""

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

@@ -889,20 +1154,20 @@ msgstr ""

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

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

1156

892 -#: merge-recursive.c:1094

1157 +#: merge-recursive.c:1143

1158 msgid "rename"

1159 msgstr "renommage"

1160

896 -#: merge-recursive.c:1094

1161 +#: merge-recursive.c:1143

1162 msgid "renamed"

1163 msgstr "renommé"

1164

900 -#: merge-recursive.c:1150

1165 +#: merge-recursive.c:1200

1166 #, c-format

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

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

1169

905 -#: merge-recursive.c:1172

1170 +#: merge-recursive.c:1225

1171 #, c-format

1172 msgid ""

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

@@ -911,146 +1176,137 @@ msgstr ""

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

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

1178

914 -#: merge-recursive.c:1177

1179 +#: merge-recursive.c:1230

1180 msgid " (left unresolved)"

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

1182

918 -#: merge-recursive.c:1231

1183 +#: merge-recursive.c:1292

1184 #, c-format

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

1186 msgstr ""

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

1188 ">'%s' dans %s"

1189

925 -#: merge-recursive.c:1261

1190 +#: merge-recursive.c:1325

1191 #, c-format

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

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

1194

930 -#: merge-recursive.c:1460

1195 +#: merge-recursive.c:1531

1196 #, c-format

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

1198 msgstr ""

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

1200

936 -#: merge-recursive.c:1470

1201 +#: merge-recursive.c:1546

1202 #, c-format

1203 msgid "Adding merged %s"

1204 msgstr "Ajout de %s fusionné"

1205

941 -#: merge-recursive.c:1475 merge-recursive.c:1677

1206 +#: merge-recursive.c:1553 merge-recursive.c:1766

1207 #, c-format

1208 msgid "Adding as %s instead"

1209 msgstr "Ajout plutôt comme %s"

1210

946 -#: merge-recursive.c:1526

1211 +#: merge-recursive.c:1610

1212 #, c-format

1213 msgid "cannot read object %s"

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

1215

951 -#: merge-recursive.c:1529

1216 +#: merge-recursive.c:1613

1217 #, c-format

1218 msgid "object %s is not a blob"

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

1220

956 -#: merge-recursive.c:1581

1221 +#: merge-recursive.c:1666

1222 msgid "modify"

1223 msgstr "modification"

1224

960 -#: merge-recursive.c:1581

1225 +#: merge-recursive.c:1666

1226 msgid "modified"

1227 msgstr "modifié"

1228

964 -#: merge-recursive.c:1591

1229 +#: merge-recursive.c:1676

1230 msgid "content"

1231 msgstr "contenu"

1232

968 -#: merge-recursive.c:1598

1233 +#: merge-recursive.c:1683

1234 msgid "add/add"

1235 msgstr "ajout/ajout"

1236

972 -#: merge-recursive.c:1632

1237 +#: merge-recursive.c:1718

1238 #, c-format

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

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

1241

977 -#: merge-recursive.c:1646

1242 +#: merge-recursive.c:1732

1243 #, c-format

1244 msgid "Auto-merging %s"

1245 msgstr "Fusion automatique de %s"

1246

982 -#: merge-recursive.c:1650 git-submodule.sh:941

1247 +#: merge-recursive.c:1736 git-submodule.sh:919

1248 msgid "submodule"

1249 msgstr "sous-module"

1250

986 -#: merge-recursive.c:1651

1251 +#: merge-recursive.c:1737

1252 #, c-format

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

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

1255

991 -#: merge-recursive.c:1737

1256 +#: merge-recursive.c:1831

1257 #, c-format

1258 msgid "Removing %s"

1259 msgstr "Suppression de %s"

1260

996 -#: merge-recursive.c:1762

1261 +#: merge-recursive.c:1857

1262 msgid "file/directory"

1263 msgstr "fichier/répertoire"

1264

1000 -#: merge-recursive.c:1768

1265 +#: merge-recursive.c:1863

1266 msgid "directory/file"

1267 msgstr "répertoire/fichier"

1268

1004 -#: merge-recursive.c:1773

1269 +#: merge-recursive.c:1868

1270 #, c-format

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

1272 msgstr ""

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

1274

1010 -#: merge-recursive.c:1781

1275 +#: merge-recursive.c:1877

1276 #, c-format

1277 msgid "Adding %s"

1278 msgstr "Ajout de %s"

1279

1015 -#: merge-recursive.c:1798

1016 -msgid "Fatal merge failure, shouldn't happen."

1017 -msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."

1018 -

1019 -#: merge-recursive.c:1817

1280 +#: merge-recursive.c:1914

1281 msgid "Already up-to-date!"

1282 msgstr "Déjà à jour !"

1283

1023 -#: merge-recursive.c:1826

1284 +#: merge-recursive.c:1923

1285 #, c-format

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

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

1288

1028 -#: merge-recursive.c:1856

1029 -#, c-format

1030 -msgid "Unprocessed path??? %s"

1031 -msgstr "Chemin non traité ??? %s"

1032 -

1033 -#: merge-recursive.c:1904

1289 +#: merge-recursive.c:2006

1290 msgid "Merging:"

1291 msgstr "Fusion :"

1292

1037 -#: merge-recursive.c:1917

1293 +#: merge-recursive.c:2019

1294 #, c-format

1295 msgid "found %u common ancestor:"

1296 msgid_plural "found %u common ancestors:"

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

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

1299

1044 -#: merge-recursive.c:1954

1300 +#: merge-recursive.c:2058

1301 msgid "merge returned no commit"

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

1303

1048 -#: merge-recursive.c:2011

1304 +#: merge-recursive.c:2121

1305 #, c-format

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

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

1308

1053 -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

1309 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1310 msgid "Unable to write index."

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

1312

@@ -1110,7 +1366,7 @@ msgstr "-NUM"

1366 msgid "malformed object name '%s'"

1367 msgstr "nom d'objet malformé '%s'"

1368

1113 -#: path.c:796

1369 +#: path.c:798

1370 #, c-format

1371 msgid "Could not make %s writable by group"

1372 msgstr "Impossible de rendre %s inscriptible pour le groupe"

@@ -1183,7 +1439,7 @@ msgstr ""

1439 "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"

1440 "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"

1441

1186 -#: pretty.c:971

1442 +#: pretty.c:973

1443 msgid "unable to parse --pretty format"

1444 msgstr "impossible d'analyser le format --pretty"

1445

@@ -1209,23 +1465,22 @@ msgstr ""

1465 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"

1466 "Utilisation de la version %i"

1467

1212 -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1213 -#: builtin/merge.c:995

1468 +#: refs.c:551 builtin/merge.c:840

1469 #, c-format

1470 msgid "Could not open '%s' for writing"

1471 msgstr "Impossible d'ouvrir '%s' en écriture"

1472

1218 -#: refs/files-backend.c:2243

1473 +#: refs/files-backend.c:2534

1474 #, c-format

1475 msgid "could not delete reference %s: %s"

1476 msgstr "Impossible de supprimer la référence %s : %s"

1477

1223 -#: refs/files-backend.c:2246

1478 +#: refs/files-backend.c:2537

1479 #, c-format

1480 msgid "could not delete references: %s"

1481 msgstr "impossible de supprimer les références : %s"

1482

1228 -#: refs/files-backend.c:2255

1483 +#: refs/files-backend.c:2546

1484 #, c-format

1485 msgid "could not remove reference %s"

1486 msgstr "impossible de supprimer la référence %s"

@@ -1383,77 +1638,77 @@ msgstr "%s suit à la fois %s et %s"

1638 msgid "Internal error"

1639 msgstr "Erreur interne"

1640

1386 -#: remote.c:1678 remote.c:1721

1641 +#: remote.c:1677 remote.c:1720

1642 msgid "HEAD does not point to a branch"

1643 msgstr "HEAD ne pointe pas sur une branche"

1644

1390 -#: remote.c:1687

1645 +#: remote.c:1686

1646 #, c-format

1647 msgid "no such branch: '%s'"

1648 msgstr "pas de branche '%s'"

1649

1395 -#: remote.c:1690

1650 +#: remote.c:1689

1651 #, c-format

1652 msgid "no upstream configured for branch '%s'"

1653 msgstr "aucune branche amont configurée pour la branche '%s'"

1654

1400 -#: remote.c:1696

1655 +#: remote.c:1695

1656 #, c-format

1657 msgid "upstream branch '%s' not stored as a remote-tracking branch"

1658 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

1659

1405 -#: remote.c:1711

1660 +#: remote.c:1710

1661 #, c-format

1662 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1663 msgstr ""

1664 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

1665 "branche locale de suivi"

1666

1412 -#: remote.c:1726

1667 +#: remote.c:1725

1668 #, c-format

1669 msgid "branch '%s' has no remote for pushing"

1670 msgstr "la branche '%s' n'a aucune branche distante de poussée"

1671

1417 -#: remote.c:1737

1672 +#: remote.c:1736

1673 #, c-format

1674 msgid "push refspecs for '%s' do not include '%s'"

1675 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

1676

1422 -#: remote.c:1750

1677 +#: remote.c:1749

1678 msgid "push has no destination (push.default is 'nothing')"

1679 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

1680

1426 -#: remote.c:1772

1681 +#: remote.c:1771

1682 msgid "cannot resolve 'simple' push to a single destination"

1683 msgstr ""

1684 "impossible de résoudre une poussée 'simple' pour une destination unique"

1685

1431 -#: remote.c:2074

1686 +#: remote.c:2073

1687 #, c-format

1688 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1689 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

1690

1436 -#: remote.c:2078

1691 +#: remote.c:2077

1692 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1693 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

1694

1440 -#: remote.c:2081

1695 +#: remote.c:2080

1696 #, c-format

1697 msgid "Your branch is up-to-date with '%s'.\n"

1698 msgstr "Votre branche est à jour avec '%s'.\n"

1699

1445 -#: remote.c:2085

1700 +#: remote.c:2084

1701 #, c-format

1702 msgid "Your branch is ahead of '%s' by %d commit.\n"

1703 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1704 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

1705 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

1706

1452 -#: remote.c:2091

1707 +#: remote.c:2090

1708 msgid " (use \"git push\" to publish your local commits)\n"

1709 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

1710

1456 -#: remote.c:2094

1711 +#: remote.c:2093

1712 #, c-format

1713 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1714 msgid_plural ""

@@ -1465,11 +1720,11 @@ msgstr[1] ""

1720 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

1721 "en avance rapide.\n"

1722

1468 -#: remote.c:2102

1723 +#: remote.c:2101

1724 msgid " (use \"git pull\" to update your local branch)\n"

1725 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

1726

1472 -#: remote.c:2105

1727 +#: remote.c:2104

1728 #, c-format

1729 msgid ""

1730 "Your branch and '%s' have diverged,\n"

@@ -1484,21 +1739,21 @@ msgstr[1] ""

1739 "Votre branche et '%s' ont divergé,\n"

1740 "et ont %d et %d commits différents chacune respectivement.\n"

1741

1487 -#: remote.c:2115

1742 +#: remote.c:2114

1743 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1744 msgstr ""

1745 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

1746

1492 -#: revision.c:2142

1747 +#: revision.c:2132

1748 msgid "your current branch appears to be broken"

1749 msgstr "votre branche actuelle semble cassée"

1750

1496 -#: revision.c:2145

1751 +#: revision.c:2135

1752 #, c-format

1753 msgid "your current branch '%s' does not have any commits yet"

1754 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

1755

1501 -#: revision.c:2339

1756 +#: revision.c:2329

1757 msgid "--first-parent is incompatible with --bisect"

1758 msgstr "--first-parent est incompatible avec --bisect"

1759

@@ -1511,15 +1766,15 @@ msgstr "échec de l'ouverture de /dev/null"

1766 msgid "dup2(%d,%d) failed"

1767 msgstr "échec de dup2(%d,%d)"

1768

1514 -#: send-pack.c:295

1769 +#: send-pack.c:298

1770 msgid "failed to sign the push certificate"

1771 msgstr "impossible de signer le certificat de poussée"

1772

1518 -#: send-pack.c:404

1773 +#: send-pack.c:411

1774 msgid "the receiving end does not support --signed push"

1775 msgstr "Le receveur ne gère pas les poussées avec --signed"

1776

1522 -#: send-pack.c:406

1777 +#: send-pack.c:413

1778 msgid ""

1779 "not sending a push certificate since the receiving end does not support --"

1780 "signed push"

@@ -1527,10 +1782,14 @@ msgstr ""

1782 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

1783 "poussées avec --signed"

1784

1530 -#: send-pack.c:418

1785 +#: send-pack.c:425

1786 msgid "the receiving end does not support --atomic push"

1787 msgstr "Le receveur ne gère pas les poussées avec --atomic"

1788

1789 +#: send-pack.c:430

1790 +msgid "the receiving end does not support push options"

1791 +msgstr "Le receveur ne gère pas les options de poussées"

1792 +

1793 #: sequencer.c:174

1794 msgid ""

1795 "after resolving the conflicts, mark the corrected paths\n"

@@ -1549,15 +1808,15 @@ msgstr ""

1808 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"

1809 "puis validez le résultat avec 'git commit'"

1810

1552 -#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1811 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924

1812 #, c-format

1813 msgid "Could not write to %s"

1814 msgstr "Impossible d'écrire dans %s"

1815

1557 -#: sequencer.c:193

1816 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928

1817 #, c-format

1559 -msgid "Error wrapping up %s"

1560 -msgstr "Erreur à l'emballage de %s"

1818 +msgid "Error wrapping up %s."

1819 +msgstr "Erreur lors de l'emballage de %s."

1820

1821 #: sequencer.c:208

1822 msgid "Your local changes would be overwritten by cherry-pick."

@@ -1571,45 +1830,50 @@ msgstr "Vos modifications locales seraient écrasées par revert."

1830 msgid "Commit your changes or stash them to proceed."

1831 msgstr "Validez vos modifications ou les remiser pour continuer."

1832

1833 +#: sequencer.c:228

1834 +#, c-format

1835 +msgid "%s: fast-forward"

1836 +msgstr "%s : avance rapide"

1837 +

1838 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1575 -#: sequencer.c:300

1839 +#: sequencer.c:303

1840 #, c-format

1841 msgid "%s: Unable to write new index file"

1842 msgstr "%s: Impossible d'écrire le nouveau fichier index"

1843

1580 -#: sequencer.c:318

1844 +#: sequencer.c:321

1845 msgid "Could not resolve HEAD commit\n"

1846 msgstr "Impossible de résoudre le commit HEAD\n"

1847

1584 -#: sequencer.c:338

1848 +#: sequencer.c:341

1849 msgid "Unable to update cache tree\n"

1850 msgstr "Impossible de mettre à jour l'arbre de cache\n"

1851

1588 -#: sequencer.c:390

1852 +#: sequencer.c:393

1853 #, c-format

1854 msgid "Could not parse commit %s\n"

1855 msgstr "Impossible d'analyser le commit %s\n"

1856

1593 -#: sequencer.c:395

1857 +#: sequencer.c:398

1858 #, c-format

1859 msgid "Could not parse parent commit %s\n"

1860 msgstr "Impossible d'analyser le commit parent %s\n"

1861

1598 -#: sequencer.c:460

1862 +#: sequencer.c:463

1863 msgid "Your index file is unmerged."

1864 msgstr "Votre fichier d'index n'est pas fusionné."

1865

1602 -#: sequencer.c:479

1866 +#: sequencer.c:482

1867 #, c-format

1868 msgid "Commit %s is a merge but no -m option was given."

1869 msgstr "Le commit %s est une fusion mais l'option -m n'a pas été spécifiée."

1870

1607 -#: sequencer.c:487

1871 +#: sequencer.c:490

1872 #, c-format

1873 msgid "Commit %s does not have parent %d"

1874 msgstr "Le commit %s n'a pas le parent %d"

1875

1612 -#: sequencer.c:491

1876 +#: sequencer.c:494

1877 #, c-format

1878 msgid "Mainline was specified but commit %s is not a merge."

1879 msgstr ""

@@ -1618,157 +1882,191 @@ msgstr ""

1882

1883 #. TRANSLATORS: The first %s will be "revert" or

1884 #. "cherry-pick", the second %s a SHA1

1621 -#: sequencer.c:504

1885 +#: sequencer.c:507

1886 #, c-format

1887 msgid "%s: cannot parse parent commit %s"

1888 msgstr "%s : impossible d'analyser le commit parent %s"

1889

1626 -#: sequencer.c:508

1890 +#: sequencer.c:511

1891 #, c-format

1892 msgid "Cannot get commit message for %s"

1893 msgstr "Impossible d'obtenir un message de validation pour %s"

1894

1631 -#: sequencer.c:594

1895 +#: sequencer.c:597

1896 #, c-format

1897 msgid "could not revert %s... %s"

1898 msgstr "impossible d'annuler %s... %s"

1899

1636 -#: sequencer.c:595

1900 +#: sequencer.c:598

1901 #, c-format

1902 msgid "could not apply %s... %s"

1903 msgstr "impossible d'appliquer %s... %s"

1904

1641 -#: sequencer.c:630

1905 +#: sequencer.c:633

1906 msgid "empty commit set passed"

1907 msgstr "l'ensemble de commits spécifié est vide"

1908

1645 -#: sequencer.c:638

1909 +#: sequencer.c:641

1910 #, c-format

1911 msgid "git %s: failed to read the index"

1912 msgstr "git %s : échec à la lecture de l'index"

1913

1650 -#: sequencer.c:642

1914 +#: sequencer.c:645

1915 #, c-format

1916 msgid "git %s: failed to refresh the index"

1917 msgstr "git %s : échec du rafraîchissement de l'index"

1918

1655 -#: sequencer.c:702

1656 -#, c-format

1657 -msgid "Cannot %s during a %s"

1658 -msgstr "Impossible de %s pendant un %s"

1919 +#: sequencer.c:705

1920 +msgid "Cannot revert during another revert."

1921 +msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit."

1922

1660 -#: sequencer.c:724

1923 +#: sequencer.c:706

1924 +msgid "Cannot revert during a cherry-pick."

1925 +msgstr "Impossible d'annuler un commit pendant un picorage."

1926 +

1927 +#: sequencer.c:709

1928 +msgid "Cannot cherry-pick during a revert."

1929 +msgstr "Impossible de picorer pendant l'annulation d'un commit."

1930 +

1931 +#: sequencer.c:710

1932 +msgid "Cannot cherry-pick during another cherry-pick."

1933 +msgstr "Impossible de picorer pendant un autre picorage."

1934 +

1935 +#: sequencer.c:732

1936 #, c-format

1937 msgid "Could not parse line %d."

1938 msgstr "Impossible d'analyser la ligne %d."

1939

1665 -#: sequencer.c:729

1940 +#: sequencer.c:737

1941 msgid "No commits parsed."

1942 msgstr "Aucun commit analysé."

1943

1669 -#: sequencer.c:741

1944 +#: sequencer.c:749

1945 #, c-format

1946 msgid "Could not open %s"

1947 msgstr "Impossible d'ouvrir %s"

1948

1674 -#: sequencer.c:745

1949 +#: sequencer.c:753

1950 #, c-format

1951 msgid "Could not read %s."

1952 msgstr "Impossible de lire %s."

1953

1679 -#: sequencer.c:752

1954 +#: sequencer.c:760

1955 #, c-format

1956 msgid "Unusable instruction sheet: %s"

1957 msgstr "Feuille d'instruction inutilisable : %s"

1958

1684 -#: sequencer.c:782

1959 +#: sequencer.c:790

1960 #, c-format

1961 msgid "Invalid key: %s"

1962 msgstr "Clé invalide: %s"

1963

1689 -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1964 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

1965 #, c-format

1966 msgid "Invalid value for %s: %s"

1967 msgstr "Valeur invalide pour %s : %s"

1968

1694 -#: sequencer.c:795

1969 +#: sequencer.c:803

1970 #, c-format

1971 msgid "Malformed options sheet: %s"

1972 msgstr "Feuille d'options malformée : %s"

1973

1699 -#: sequencer.c:814

1974 +#: sequencer.c:822

1975 msgid "a cherry-pick or revert is already in progress"

1976 msgstr "un picorage ou un retour est déjà en cours"

1977

1703 -#: sequencer.c:815

1978 +#: sequencer.c:823

1979 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1980 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

1981

1707 -#: sequencer.c:819

1982 +#: sequencer.c:827

1983 #, c-format

1984 msgid "Could not create sequencer directory %s"

1985 msgstr "Impossible de créer le répertoire de séquenceur %s"

1986

1712 -#: sequencer.c:835 sequencer.c:916

1713 -#, c-format

1714 -msgid "Error wrapping up %s."

1715 -msgstr "Erreur lors de l'emballage de %s."

1716 -

1717 -#: sequencer.c:854 sequencer.c:986

1987 +#: sequencer.c:862 sequencer.c:998

1988 msgid "no cherry-pick or revert in progress"

1989 msgstr "aucun picorage ou retour en cours"

1990

1721 -#: sequencer.c:856

1991 +#: sequencer.c:864

1992 msgid "cannot resolve HEAD"

1993 msgstr "impossible de résoudre HEAD"

1994

1725 -#: sequencer.c:858

1995 +#: sequencer.c:866 sequencer.c:900

1996 msgid "cannot abort from a branch yet to be born"

1997 msgstr "impossible d'abandonner depuis une branche non encore créée"

1998

1729 -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1999 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

2000 #, c-format

2001 msgid "cannot open %s"

2002 msgstr "impossible d'ouvrir %s"

2003

1734 -#: sequencer.c:880

2004 +#: sequencer.c:888

2005 #, c-format

2006 msgid "cannot read %s: %s"

2007 msgstr "impossible de lire %s : %s"

2008

1739 -#: sequencer.c:881

2009 +#: sequencer.c:889

2010 msgid "unexpected end of file"

2011 msgstr "fin de fichier inattendue"

2012

1743 -#: sequencer.c:887

2013 +#: sequencer.c:895

2014 #, c-format

2015 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

2016 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

2017

1748 -#: sequencer.c:909

2018 +#: sequencer.c:921

2019 #, c-format

2020 msgid "Could not format %s."

2021 msgstr "Impossible de formater %s."

2022

1753 -#: sequencer.c:1054

2023 +#: sequencer.c:1066

2024 #, c-format

2025 msgid "%s: can't cherry-pick a %s"

2026 msgstr "%s : impossible de picorer un %s"

2027

1758 -#: sequencer.c:1057

2028 +#: sequencer.c:1069

2029 #, c-format

2030 msgid "%s: bad revision"

2031 msgstr "%s : mauvaise révision"

2032

1763 -#: sequencer.c:1091

2033 +#: sequencer.c:1102

2034 msgid "Can't revert as initial commit"

2035 msgstr "Impossible d'annuler en tant que commit initial"

2036

1767 -#: sequencer.c:1092

1768 -msgid "Can't cherry-pick into empty head"

1769 -msgstr "Impossible de picorer vers une HEAD vide"

2037 +#: setup.c:160

2038 +#, c-format

2039 +msgid ""

2040 +"%s: no such path in the working tree.\n"

2041 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2042 +msgstr ""

2043 +"%s : ce chemin n'existe pas dans la copie de travail.\n"

2044 +"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "

2045 +"n'existent pas localement."

2046 +

2047 +#: setup.c:173

2048 +#, c-format

2049 +msgid ""

2050 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

2051 +"Use '--' to separate paths from revisions, like this:\n"

2052 +"'git <command> [<revision>...] -- [<file>...]'"

2053 +msgstr ""

2054 +"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n"

2055 +"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

2056 +"'git <commande> [<révision>...] -- [<chemin>...]'"

2057 +

2058 +#: setup.c:223

2059 +#, c-format

2060 +msgid ""

2061 +"ambiguous argument '%s': both revision and filename\n"

2062 +"Use '--' to separate paths from revisions, like this:\n"

2063 +"'git <command> [<revision>...] -- [<file>...]'"

2064 +msgstr ""

2065 +"argument '%s' ambigu : révision et chemin spécifiés.\n"

2066 +"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

2067 +"'git <commande> [<révision>...] -- [<chemin>...]'"

2068

1771 -#: setup.c:248

2069 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

2070 #, c-format

2071 msgid "failed to read %s"

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

@@ -1782,16 +2080,55 @@ msgstr "Version attendue du dépôt git <= %d, %d trouvée"

2080 msgid "unknown repository extensions found:"

2081 msgstr "extensions de dépôt inconnues trouvées :"

2082

1785 -#: sha1_file.c:1080

2083 +#: setup.c:762

2084 +#, c-format

2085 +msgid "Not a git repository (or any of the parent directories): %s"

2086 +msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

2087 +

2088 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

2089 +msgid "Cannot come back to cwd"

2090 +msgstr "Impossible de revenir au répertoire de travail courant"

2091 +

2092 +#: setup.c:845

2093 +msgid "Unable to read current working directory"

2094 +msgstr "Impossible d'accéder au répertoire de travail courant"

2095 +

2096 +#: setup.c:920

2097 +#, c-format

2098 +msgid ""

2099 +"Not a git repository (or any parent up to mount point %s)\n"

2100 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

2101 +msgstr ""

2102 +"Ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "

2103 +"n'est un dépôt git\n"

2104 +"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

2105 +"n'est pas activé)."

2106 +

2107 +#: setup.c:927

2108 +#, c-format

2109 +msgid "Cannot change to '%s/..'"

2110 +msgstr "Impossible de se déplacer vers le répertoire '%s/..'"

2111 +

2112 +#: setup.c:989

2113 +#, c-format

2114 +msgid ""

2115 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

2116 +"The owner of files must always have read and write permissions."

2117 +msgstr ""

2118 +"Problème avec la valeur de core.sharedRepository (0%.3o).\n"

2119 +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

2120 +"écriture."

2121 +

2122 +#: sha1_file.c:1046

2123 msgid "offset before end of packfile (broken .idx?)"

2124 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

2125

1789 -#: sha1_file.c:2458

2126 +#: sha1_file.c:2434

2127 #, c-format

2128 msgid "offset before start of pack index for %s (corrupt index?)"

2129 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

2130

1794 -#: sha1_file.c:2462

2131 +#: sha1_file.c:2438

2132 #, c-format

2133 msgid "offset beyond end of pack index for %s (truncated index?)"

2134 msgstr ""

@@ -1852,7 +2189,7 @@ msgstr "échec de la mise en index du .gitmodules mis à jour"

2189 msgid "negative values not allowed for submodule.fetchJobs"

2190 msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

2191

1855 -#: submodule-config.c:355

2192 +#: submodule-config.c:358

2193 #, c-format

2194 msgid "invalid value for %s"

2195 msgstr "Valeur invalide pour %s"

@@ -1911,6 +2248,56 @@ msgstr "impossible de créer un fichier temporaire"

2248 msgid "could not rename temporary file to %s"

2249 msgstr "impossible de renommer un fichier temporaire en %s"

2250

2251 +#: transport.c:62

2252 +#, c-format

2253 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2254 +msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

2255 +

2256 +#: transport.c:151

2257 +#, c-format

2258 +msgid "transport: invalid depth option '%s'"

2259 +msgstr "transport : option de profondeur invalide '%s'"

2260 +

2261 +#: transport.c:771

2262 +#, c-format

2263 +msgid ""

2264 +"The following submodule paths contain changes that can\n"

2265 +"not be found on any remote:\n"

2266 +msgstr ""

2267 +"Les chemins suivant de sous-module contiennent des modifications\n"

2268 +"qui ne peuvent être trouvées sur aucun distant :\n"

2269 +

2270 +#: transport.c:775

2271 +#, c-format

2272 +msgid ""

2273 +"\n"

2274 +"Please try\n"

2275 +"\n"

2276 +"\tgit push --recurse-submodules=on-demand\n"

2277 +"\n"

2278 +"or cd to the path and use\n"

2279 +"\n"

2280 +"\tgit push\n"

2281 +"\n"

2282 +"to push them to a remote.\n"

2283 +"\n"

2284 +msgstr ""

2285 +"\n"

2286 +"Veuillez essayer\n"

2287 +"\n"

2288 +"\tgit push --recurse-submodules=on-demand\n"

2289 +"\n"

2290 +"ou bien changez de répertoire et utilisez\n"

2291 +"\n"

2292 +"\tgit push\n"

2293 +"\n"

2294 +"pour les pousser vers un serveur distant.\n"

2295 +"\n"

2296 +

2297 +#: transport.c:783

2298 +msgid "Aborting."

2299 +msgstr "Abandon."

2300 +

2301 #: transport-helper.c:1041

2302 #, c-format

2303 msgid "Could not read ref %s"

@@ -1920,10 +2307,12 @@ msgstr "impossible de lire la réf %s"

2307 #, c-format

2308 msgid ""

2309 "Your local changes to the following files would be overwritten by checkout:\n"

1923 -"%%sPlease commit your changes or stash them before you can switch branches."

2310 +"%%sPlease commit your changes or stash them before you switch branches."

2311 msgstr ""

1925 -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"

1926 -"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."

2312 +"Vos modifications locales aux fichiers suivants seraient écrasées par "

2313 +"l'extraction :\n"

2314 +"%%sVeuillez valider ou remiser vos modifications avant de basculer de "

2315 +"branche."

2316

2317 #: unpack-trees.c:66

2318 #, c-format

@@ -1931,16 +2320,18 @@ msgid ""

2320 "Your local changes to the following files would be overwritten by checkout:\n"

2321 "%%s"

2322 msgstr ""

1934 -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"

2323 +"Vos modifications locales aux fichiers suivants seraient écrasées par "

2324 +"l'extraction :\n"

2325 "%%s"

2326

2327 #: unpack-trees.c:69

2328 #, c-format

2329 msgid ""

2330 "Your local changes to the following files would be overwritten by merge:\n"

1941 -"%%sPlease commit your changes or stash them before you can merge."

2331 +"%%sPlease commit your changes or stash them before you merge."

2332 msgstr ""

1943 -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"

2333 +"Vos modifications locales aux fichiers suivants seraient écrasées par la "

2334 +"fusion :\n"

2335 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

2336

2337 #: unpack-trees.c:71

@@ -1949,14 +2340,15 @@ msgid ""

2340 "Your local changes to the following files would be overwritten by merge:\n"

2341 "%%s"

2342 msgstr ""

1952 -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"

2343 +"Vos modifications locales aux fichiers suivants seraient écrasées par la "

2344 +"fusion :\n"

2345 "%%s"

2346

2347 #: unpack-trees.c:74

2348 #, c-format

2349 msgid ""

2350 "Your local changes to the following files would be overwritten by %s:\n"

1959 -"%%sPlease commit your changes or stash them before you can %s."

2351 +"%%sPlease commit your changes or stash them before you %s."

2352 msgstr ""

2353 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

2354 "%%sVeuillez valider ou remiser vos modifications avant %s."

@@ -1976,16 +2368,18 @@ msgid ""

2368 "Updating the following directories would lose untracked files in it:\n"

2369 "%s"

2370 msgstr ""

1979 -"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"

2371 +"La mise à jour des répertoires suivants effacerait les fichiers non suivis "

2372 +"contenus :\n"

2373 "%s"

2374

2375 #: unpack-trees.c:85

2376 #, c-format

2377 msgid ""

2378 "The following untracked working tree files would be removed by checkout:\n"

1986 -"%%sPlease move or remove them before you can switch branches."

2379 +"%%sPlease move or remove them before you switch branches."

2380 msgstr ""

1988 -"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

2381 +"Les fichiers suivants non suivis de la copie de travail seraient effacés par "

2382 +"l'extraction :\n"

2383 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

2384

2385 #: unpack-trees.c:87

@@ -2001,9 +2395,10 @@ msgstr ""

2395 #, c-format

2396 msgid ""

2397 "The following untracked working tree files would be removed by merge:\n"

2004 -"%%sPlease move or remove them before you can merge."

2398 +"%%sPlease move or remove them before you merge."

2399 msgstr ""

2006 -"Les fichiers suivants non suivis seraient effacés par la fusion :\n"

2400 +"Les fichiers suivants non suivis de la copie de travail seraient effacés par "

2401 +"la fusion :\n"

2402 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

2403

2404 #: unpack-trees.c:92

@@ -2019,9 +2414,10 @@ msgstr ""

2414 #, c-format

2415 msgid ""

2416 "The following untracked working tree files would be removed by %s:\n"

2022 -"%%sPlease move or remove them before you can %s."

2417 +"%%sPlease move or remove them before you %s."

2418 msgstr ""

2024 -"Les fichiers suivants non suivis seraient effacés par %s :\n"

2419 +"Les fichiers suivants non suivis de la copie de travail seraient effacés par "

2420 +"%s :\n"

2421 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

2422

2423 #: unpack-trees.c:97

@@ -2038,9 +2434,10 @@ msgstr ""

2434 msgid ""

2435 "The following untracked working tree files would be overwritten by "

2436 "checkout:\n"

2041 -"%%sPlease move or remove them before you can switch branches."

2437 +"%%sPlease move or remove them before you switch branches."

2438 msgstr ""

2043 -"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

2439 +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "

2440 +"l'extraction :\n"

2441 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

2442

2443 #: unpack-trees.c:104

@@ -2057,9 +2454,10 @@ msgstr ""

2454 #, c-format

2455 msgid ""

2456 "The following untracked working tree files would be overwritten by merge:\n"

2060 -"%%sPlease move or remove them before you can merge."

2457 +"%%sPlease move or remove them before you merge."

2458 msgstr ""

2062 -"Les fichiers suivants non suivis seraient effacés par la fusion :\n"

2459 +"Les fichiers suivants non suivis de la copie de travail seraient effacés par "

2460 +"la fusion :\n"

2461 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

2462

2463 #: unpack-trees.c:109

@@ -2075,9 +2473,10 @@ msgstr ""

2473 #, c-format

2474 msgid ""

2475 "The following untracked working tree files would be overwritten by %s:\n"

2078 -"%%sPlease move or remove them before you can %s."

2476 +"%%sPlease move or remove them before you %s."

2477 msgstr ""

2080 -"Les fichiers suivants non suivis seraient écrasés par %s :\n"

2478 +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "

2479 +"%s :\n"

2480 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

2481

2482 #: unpack-trees.c:114

@@ -2100,7 +2499,8 @@ msgid ""

2499 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

2500 "%s"

2501 msgstr ""

2103 -"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n"

2502 +"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "

2503 +"pas à jour :\n"

2504 "%s"

2505

2506 #: unpack-trees.c:126

@@ -2110,7 +2510,8 @@ msgid ""

2510 "update:\n"

2511 "%s"

2512 msgstr ""

2113 -"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n"

2513 +"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "

2514 +"jour par extraction creuse :\n"

2515 "%s"

2516

2517 #: unpack-trees.c:128

@@ -2120,7 +2521,8 @@ msgid ""

2521 "update:\n"

2522 "%s"

2523 msgstr ""

2123 -"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"

2524 +"Les fichiers suivants de la copie de travail seraient supprimés par la mise "

2525 +"à jour par extraction creuse :\n"

2526 "%s"

2527

2528 #: unpack-trees.c:205

@@ -2161,43 +2563,43 @@ msgstr "numéro de port invalide"

2563 msgid "invalid '..' path segment"

2564 msgstr "segment de chemin '..' invalide"

2565

2164 -#: wrapper.c:222 wrapper.c:381

2566 +#: worktree.c:282

2567 +#, c-format

2568 +msgid "failed to read '%s'"

2569 +msgstr "échec de la lecture de '%s'"

2570 +

2571 +#: wrapper.c:222 wrapper.c:392

2572 #, c-format

2573 msgid "could not open '%s' for reading and writing"

2574 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

2575

2169 -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2576 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2577 #, c-format

2578 msgid "could not open '%s' for writing"

2579 msgstr "impossible d'ouvrir '%s' en écriture"

2580

2174 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

2175 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2581 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2582 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2583 #: builtin/pull.c:407

2584 #, c-format

2585 msgid "could not open '%s' for reading"

2586 msgstr "impossible d'ouvrir '%s' en lecture"

2587

2181 -#: wrapper.c:594 wrapper.c:615

2588 +#: wrapper.c:605 wrapper.c:626

2589 #, c-format

2590 msgid "unable to access '%s'"

2591 msgstr "impossible d'accéder à '%s'"

2592

2186 -#: wrapper.c:623

2593 +#: wrapper.c:634

2594 msgid "unable to get current working directory"

2595 msgstr "impossible d'accéder au répertoire de travail courant"

2596

2190 -#: wrapper.c:650

2191 -#, c-format

2192 -msgid "could not open %s for writing"

2193 -msgstr "Impossible d'ouvrir '%s' en écriture"

2194 -

2195 -#: wrapper.c:661 builtin/am.c:410

2597 +#: wrapper.c:658

2598 #, c-format

2599 msgid "could not write to %s"

2600 msgstr "Impossible d'écrire dans %s"

2601

2200 -#: wrapper.c:667

2602 +#: wrapper.c:660

2603 #, c-format

2604 msgid "could not close %s"

2605 msgstr "impossible de fermer %s"

@@ -2229,11 +2631,11 @@ msgstr ""

2631 msgid " (use \"git rm <file>...\" to mark resolution)"

2632 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

2633

2232 -#: wt-status.c:198 wt-status.c:881

2634 +#: wt-status.c:198 wt-status.c:882

2635 msgid "Changes to be committed:"

2636 msgstr "Modifications qui seront validées :"

2637

2236 -#: wt-status.c:216 wt-status.c:890

2638 +#: wt-status.c:216 wt-status.c:891

2639 msgid "Changes not staged for commit:"

2640 msgstr "Modifications qui ne seront pas validées :"

2641

@@ -2294,11 +2696,6 @@ msgstr "ajouté de deux côtés :"

2696 msgid "both modified:"

2697 msgstr "modifié des deux côtés :"

2698

2297 -#: wt-status.c:266

2298 -#, c-format

2299 -msgid "bug: unhandled unmerged status %x"

2300 -msgstr "bogue : état de non-fusion non géré %x"

2301 -

2699 #: wt-status.c:274

2700 msgid "new file:"

2701 msgstr "nouveau fichier :"

@@ -2343,20 +2740,15 @@ msgstr "contenu modifié, "

2740 msgid "untracked content, "

2741 msgstr "contenu non suivi, "

2742

2346 -#: wt-status.c:391

2347 -#, c-format

2348 -msgid "bug: unhandled diff status %c"

2349 -msgstr "bogue : état de diff non géré %c"

2350 -

2351 -#: wt-status.c:755

2743 +#: wt-status.c:756

2744 msgid "Submodules changed but not updated:"

2745 msgstr "Sous-modules modifiés mais non mis à jour :"

2746

2355 -#: wt-status.c:757

2747 +#: wt-status.c:758

2748 msgid "Submodule changes to be committed:"

2749 msgstr "Changements du sous-module à valider :"

2750

2359 -#: wt-status.c:838

2751 +#: wt-status.c:839

2752 msgid ""

2753 "Do not touch the line above.\n"

2754 "Everything below will be removed."

@@ -2364,99 +2756,103 @@ msgstr ""

2756 "Ne touchez pas à la ligne ci-dessus\n"

2757 "Tout ce qui suit sera éliminé."

2758

2367 -#: wt-status.c:949

2759 +#: wt-status.c:950

2760 msgid "You have unmerged paths."

2761 msgstr "Vous avez des chemins non fusionnés."

2762

2371 -#: wt-status.c:952

2763 +#: wt-status.c:953

2764 msgid " (fix conflicts and run \"git commit\")"

2765 msgstr " (réglez les conflits puis lancez \"git commit\")"

2766

2375 -#: wt-status.c:956

2767 +#: wt-status.c:955

2768 +msgid " (use \"git merge --abort\" to abort the merge)"

2769 +msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

2770 +

2771 +#: wt-status.c:960

2772 msgid "All conflicts fixed but you are still merging."

2773 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

2774

2379 -#: wt-status.c:959

2775 +#: wt-status.c:963

2776 msgid " (use \"git commit\" to conclude merge)"

2777 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

2778

2383 -#: wt-status.c:969

2779 +#: wt-status.c:973

2780 msgid "You are in the middle of an am session."

2781 msgstr "Vous êtes au milieu d'une session am."

2782

2387 -#: wt-status.c:972

2783 +#: wt-status.c:976

2784 msgid "The current patch is empty."

2785 msgstr "Le patch actuel est vide."

2786

2391 -#: wt-status.c:976

2787 +#: wt-status.c:980

2788 msgid " (fix conflicts and then run \"git am --continue\")"

2789 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

2790

2395 -#: wt-status.c:978

2791 +#: wt-status.c:982

2792 msgid " (use \"git am --skip\" to skip this patch)"

2793 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

2794

2399 -#: wt-status.c:980

2795 +#: wt-status.c:984

2796 msgid " (use \"git am --abort\" to restore the original branch)"

2797 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

2798

2403 -#: wt-status.c:1105

2799 +#: wt-status.c:1109

2800 msgid "No commands done."

2801 msgstr "Aucune commande réalisée."

2802

2407 -#: wt-status.c:1108

2803 +#: wt-status.c:1112

2804 #, c-format

2805 msgid "Last command done (%d command done):"

2806 msgid_plural "Last commands done (%d commands done):"

2807 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

2808 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

2809

2414 -#: wt-status.c:1119

2810 +#: wt-status.c:1123

2811 #, c-format

2812 msgid " (see more in file %s)"

2813 msgstr " (voir plus dans le fichier %s)"

2814

2419 -#: wt-status.c:1124

2815 +#: wt-status.c:1128

2816 msgid "No commands remaining."

2817 msgstr "Aucune commande restante."

2818

2423 -#: wt-status.c:1127

2819 +#: wt-status.c:1131

2820 #, c-format

2821 msgid "Next command to do (%d remaining command):"

2822 msgid_plural "Next commands to do (%d remaining commands):"

2823 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

2824 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

2825

2430 -#: wt-status.c:1135

2826 +#: wt-status.c:1139

2827 msgid " (use \"git rebase --edit-todo\" to view and edit)"

2828 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

2829

2434 -#: wt-status.c:1148

2830 +#: wt-status.c:1152

2831 #, c-format

2832 msgid "You are currently rebasing branch '%s' on '%s'."

2833 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

2834

2439 -#: wt-status.c:1153

2835 +#: wt-status.c:1157

2836 msgid "You are currently rebasing."

2837 msgstr "Vous êtes en train de rebaser."

2838

2443 -#: wt-status.c:1167

2839 +#: wt-status.c:1171

2840 msgid " (fix conflicts and then run \"git rebase --continue\")"

2841 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

2842

2447 -#: wt-status.c:1169

2843 +#: wt-status.c:1173

2844 msgid " (use \"git rebase --skip\" to skip this patch)"

2845 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

2846

2451 -#: wt-status.c:1171

2847 +#: wt-status.c:1175

2848 msgid " (use \"git rebase --abort\" to check out the original branch)"

2849 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

2850

2455 -#: wt-status.c:1177

2851 +#: wt-status.c:1181

2852 msgid " (all conflicts fixed: run \"git rebase --continue\")"

2853 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

2854

2459 -#: wt-status.c:1181

2855 +#: wt-status.c:1185

2856 #, c-format

2857 msgid ""

2858 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -2464,124 +2860,124 @@ msgstr ""

2860 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

2861 "de la branche '%s' sur '%s'."

2862

2467 -#: wt-status.c:1186

2863 +#: wt-status.c:1190

2864 msgid "You are currently splitting a commit during a rebase."

2865 msgstr ""

2866 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

2867

2472 -#: wt-status.c:1189

2868 +#: wt-status.c:1193

2869 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

2870 msgstr ""

2871 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

2872

2477 -#: wt-status.c:1193

2873 +#: wt-status.c:1197

2874 #, c-format

2875 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

2876 msgstr ""

2877 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

2878 "branche '%s' sur '%s'."

2879

2484 -#: wt-status.c:1198

2880 +#: wt-status.c:1202

2881 msgid "You are currently editing a commit during a rebase."

2882 msgstr ""

2883 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

2884

2489 -#: wt-status.c:1201

2885 +#: wt-status.c:1205

2886 msgid " (use \"git commit --amend\" to amend the current commit)"

2887 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

2888

2493 -#: wt-status.c:1203

2889 +#: wt-status.c:1207

2890 msgid ""

2891 " (use \"git rebase --continue\" once you are satisfied with your changes)"

2892 msgstr ""

2893 " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "

2894 "modifications)"

2895

2500 -#: wt-status.c:1213

2896 +#: wt-status.c:1217

2897 #, c-format

2898 msgid "You are currently cherry-picking commit %s."

2899 msgstr "Vous êtes actuellement en train de picorer le commit %s."

2900

2505 -#: wt-status.c:1218

2901 +#: wt-status.c:1222

2902 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

2903 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

2904

2509 -#: wt-status.c:1221

2905 +#: wt-status.c:1225

2906 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

2907 msgstr ""

2908 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

2909

2514 -#: wt-status.c:1223

2910 +#: wt-status.c:1227

2911 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

2912 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

2913

2518 -#: wt-status.c:1232

2914 +#: wt-status.c:1236

2915 #, c-format

2916 msgid "You are currently reverting commit %s."

2917 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

2918

2523 -#: wt-status.c:1237

2919 +#: wt-status.c:1241

2920 msgid " (fix conflicts and run \"git revert --continue\")"

2921 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

2922

2527 -#: wt-status.c:1240

2923 +#: wt-status.c:1244

2924 msgid " (all conflicts fixed: run \"git revert --continue\")"

2925 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

2926

2531 -#: wt-status.c:1242

2927 +#: wt-status.c:1246

2928 msgid " (use \"git revert --abort\" to cancel the revert operation)"

2929 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

2930

2535 -#: wt-status.c:1253

2931 +#: wt-status.c:1257

2932 #, c-format

2933 msgid "You are currently bisecting, started from branch '%s'."

2934 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

2935

2540 -#: wt-status.c:1257

2936 +#: wt-status.c:1261

2937 msgid "You are currently bisecting."

2938 msgstr "Vous êtes en cours de bissection."

2939

2544 -#: wt-status.c:1260

2940 +#: wt-status.c:1264

2941 msgid " (use \"git bisect reset\" to get back to the original branch)"

2942 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

2943

2548 -#: wt-status.c:1460

2944 +#: wt-status.c:1464

2945 msgid "On branch "

2946 msgstr "Sur la branche "

2947

2552 -#: wt-status.c:1466

2948 +#: wt-status.c:1470

2949 msgid "interactive rebase in progress; onto "

2950 msgstr "rebasage interactif en cours ; sur "

2951

2556 -#: wt-status.c:1468

2952 +#: wt-status.c:1472

2953 msgid "rebase in progress; onto "

2954 msgstr "rebasage en cours ; sur "

2955

2560 -#: wt-status.c:1473

2956 +#: wt-status.c:1477

2957 msgid "HEAD detached at "

2958 msgstr "HEAD détachée sur "

2959

2564 -#: wt-status.c:1475

2960 +#: wt-status.c:1479

2961 msgid "HEAD detached from "

2962 msgstr "HEAD détachée depuis "

2963

2568 -#: wt-status.c:1478

2964 +#: wt-status.c:1482

2965 msgid "Not currently on any branch."

2966 msgstr "Actuellement sur aucun branche."

2967

2572 -#: wt-status.c:1496

2968 +#: wt-status.c:1500

2969 msgid "Initial commit"

2970 msgstr "Validation initiale"

2971

2576 -#: wt-status.c:1510

2972 +#: wt-status.c:1514

2973 msgid "Untracked files"

2974 msgstr "Fichiers non suivis"

2975

2580 -#: wt-status.c:1512

2976 +#: wt-status.c:1516

2977 msgid "Ignored files"

2978 msgstr "Fichiers ignorés"

2979

2584 -#: wt-status.c:1516

2980 +#: wt-status.c:1520

2981 #, c-format

2982 msgid ""

2983 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -2593,32 +2989,32 @@ msgstr ""

2989 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

2990 "status')."

2991

2596 -#: wt-status.c:1522

2992 +#: wt-status.c:1526

2993 #, c-format

2994 msgid "Untracked files not listed%s"

2995 msgstr "Fichiers non suivis non affichés%s"

2996

2601 -#: wt-status.c:1524

2997 +#: wt-status.c:1528

2998 msgid " (use -u option to show untracked files)"

2999 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

3000

2605 -#: wt-status.c:1530

3001 +#: wt-status.c:1534

3002 msgid "No changes"

3003 msgstr "Aucune modification"

3004

2609 -#: wt-status.c:1535

3005 +#: wt-status.c:1539

3006 #, c-format

3007 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

3008 msgstr ""

3009 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

3010 "\"git commit -a\")\n"

3011

2616 -#: wt-status.c:1538

3012 +#: wt-status.c:1542

3013 #, c-format

3014 msgid "no changes added to commit\n"

3015 msgstr "aucune modification ajoutée à la validation\n"

3016

2621 -#: wt-status.c:1541

3017 +#: wt-status.c:1545

3018 #, c-format

3019 msgid ""

3020 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -2627,53 +3023,53 @@ msgstr ""

3023 "aucune modification ajoutée à la validation mais des fichiers non suivis "

3024 "sont présents (utilisez \"git add\" pour les suivre)\n"

3025

2630 -#: wt-status.c:1544

3026 +#: wt-status.c:1548

3027 #, c-format

3028 msgid "nothing added to commit but untracked files present\n"

3029 msgstr ""

3030 "aucune modification ajoutée à la validation mais des fichiers non suivis "

3031 "sont présents\n"

3032

2637 -#: wt-status.c:1547

3033 +#: wt-status.c:1551

3034 #, c-format

3035 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

3036 msgstr ""

3037 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

3038 "suivre)\n"

3039

2644 -#: wt-status.c:1550 wt-status.c:1555

3040 +#: wt-status.c:1554 wt-status.c:1559

3041 #, c-format

3042 msgid "nothing to commit\n"

3043 msgstr "rien à valider\n"

3044

2649 -#: wt-status.c:1553

3045 +#: wt-status.c:1557

3046 #, c-format

3047 msgid "nothing to commit (use -u to show untracked files)\n"

3048 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

3049

2654 -#: wt-status.c:1557

3050 +#: wt-status.c:1561

3051 #, c-format

2656 -msgid "nothing to commit, working directory clean\n"

3052 +msgid "nothing to commit, working tree clean\n"

3053 msgstr "rien à valider, la copie de travail est propre\n"

3054

2659 -#: wt-status.c:1664

3055 +#: wt-status.c:1668

3056 msgid "Initial commit on "

3057 msgstr "Validation initiale sur "

3058

2663 -#: wt-status.c:1668

3059 +#: wt-status.c:1672

3060 msgid "HEAD (no branch)"

3061 msgstr "HEAD (aucune branche)"

3062

3063 # à priori on parle d'une branche ici

2668 -#: wt-status.c:1697

3064 +#: wt-status.c:1701

3065 msgid "gone"

3066 msgstr "disparue"

3067

2672 -#: wt-status.c:1699 wt-status.c:1707

3068 +#: wt-status.c:1703 wt-status.c:1711

3069 msgid "behind "

3070 msgstr "derrière "

3071

2676 -#: wt-status.c:1702 wt-status.c:1705

3072 +#: wt-status.c:1706 wt-status.c:1709

3073 msgid "ahead "

3074 msgstr "devant "

3075

@@ -2691,261 +3087,275 @@ msgstr "git add [<options>] [--] <chemin>..."

3087 msgid "unexpected diff status %c"

3088 msgstr "status de diff inattendu %c"

3089

2694 -#: builtin/add.c:70 builtin/commit.c:280

3090 +#: builtin/add.c:71 builtin/commit.c:281

3091 msgid "updating files failed"

3092 msgstr "échec de la mise à jour des fichiers"

3093

2698 -#: builtin/add.c:80

3094 +#: builtin/add.c:81

3095 #, c-format

3096 msgid "remove '%s'\n"

3097 msgstr "suppression de '%s'\n"

3098

2703 -#: builtin/add.c:134

3099 +#: builtin/add.c:136

3100 msgid "Unstaged changes after refreshing the index:"

3101 msgstr "Modifications non indexées après rafraîchissement de l'index :"

3102

2707 -#: builtin/add.c:194 builtin/rev-parse.c:811

3103 +#: builtin/add.c:196 builtin/rev-parse.c:811

3104 msgid "Could not read the index"

3105 msgstr "Impossible de lire l'index"

3106

2711 -#: builtin/add.c:205

3107 +#: builtin/add.c:207

3108 #, c-format

3109 msgid "Could not open '%s' for writing."

3110 msgstr "Impossible d'ouvrir '%s' en écriture."

3111

2716 -#: builtin/add.c:209

3112 +#: builtin/add.c:211

3113 msgid "Could not write patch"

3114 msgstr "Impossible d'écrire le patch"

3115

2720 -#: builtin/add.c:212

3116 +#: builtin/add.c:214

3117 msgid "editing patch failed"

3118 msgstr "échec de l'édition du patch"

3119

2724 -#: builtin/add.c:215

3120 +#: builtin/add.c:217

3121 #, c-format

3122 msgid "Could not stat '%s'"

3123 msgstr "Stat de '%s' impossible"

3124

2729 -#: builtin/add.c:217

3125 +#: builtin/add.c:219

3126 msgid "Empty patch. Aborted."

3127 msgstr "Patch vide. Abandon."

3128

2733 -#: builtin/add.c:222

3129 +#: builtin/add.c:224

3130 #, c-format

3131 msgid "Could not apply '%s'"

3132 msgstr "Impossible d'appliquer '%s'"

3133

2738 -#: builtin/add.c:232

3134 +#: builtin/add.c:234

3135 msgid "The following paths are ignored by one of your .gitignore files:\n"

3136 msgstr ""

3137 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

3138

2743 -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2744 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2745 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

3139 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111

3140 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521

3141 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162

3142 msgid "dry run"

3143 msgstr "simuler l'action"

3144

2749 -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2750 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2751 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

3145 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19

3146 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593

3147 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114

3148 msgid "be verbose"

3149 msgstr "mode verbeux"

3150

2755 -#: builtin/add.c:252

3151 +#: builtin/add.c:256

3152 msgid "interactive picking"

3153 msgstr "sélection interactive"

3154

2759 -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

3155 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286

3156 msgid "select hunks interactively"

3157 msgstr "sélection interactive des sections"

3158

2763 -#: builtin/add.c:254

3159 +#: builtin/add.c:258

3160 msgid "edit current diff and apply"

3161 msgstr "édition du diff actuel et application"

3162

2767 -#: builtin/add.c:255

3163 +#: builtin/add.c:259

3164 msgid "allow adding otherwise ignored files"

3165 msgstr "permettre l'ajout de fichiers ignorés"

3166

2771 -#: builtin/add.c:256

3167 +#: builtin/add.c:260

3168 msgid "update tracked files"

3169 msgstr "mettre à jour les fichiers suivis"

3170

2775 -#: builtin/add.c:257

3171 +#: builtin/add.c:261

3172 msgid "record only the fact that the path will be added later"

3173 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"

3174

2779 -#: builtin/add.c:258

3175 +#: builtin/add.c:262

3176 msgid "add changes from all tracked and untracked files"

3177 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"

3178

2783 -#: builtin/add.c:261

3179 +#: builtin/add.c:265

3180 msgid "ignore paths removed in the working tree (same as --no-all)"

3181 msgstr ""

3182 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"

3183

2788 -#: builtin/add.c:263

3184 +#: builtin/add.c:267

3185 msgid "don't add, only refresh the index"

3186 msgstr "ne pas ajouter, juste rafraîchir l'index"

3187

2792 -#: builtin/add.c:264

3188 +#: builtin/add.c:268

3189 msgid "just skip files which cannot be added because of errors"

3190 msgstr ""

3191 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "

3192 "d'erreurs"

3193

2798 -#: builtin/add.c:265

3194 +#: builtin/add.c:269

3195 msgid "check if - even missing - files are ignored in dry run"

3196 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

3197

2802 -#: builtin/add.c:287

3198 +#: builtin/add.c:270 builtin/update-index.c:958

3199 +msgid "(+/-)x"

3200 +msgstr "(+/-)x"

3201 +

3202 +#: builtin/add.c:270 builtin/update-index.c:959

3203 +msgid "override the executable bit of the listed files"

3204 +msgstr "outrepasser le bit exécutable pour les fichiers listés"

3205 +

3206 +#: builtin/add.c:292

3207 #, c-format

3208 msgid "Use -f if you really want to add them.\n"

3209 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"

3210

2807 -#: builtin/add.c:294

3211 +#: builtin/add.c:300

3212 msgid "adding files failed"

3213 msgstr "échec de l'ajout de fichiers"

3214

2811 -#: builtin/add.c:330

3215 +#: builtin/add.c:336

3216 msgid "-A and -u are mutually incompatible"

3217 msgstr "-A et -u sont mutuellement incompatibles"

3218

2815 -#: builtin/add.c:337

3219 +#: builtin/add.c:343

3220 msgid "Option --ignore-missing can only be used together with --dry-run"

3221 msgstr ""

3222 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

3223

3224 #: builtin/add.c:352

3225 #, c-format

3226 +msgid "--chmod param '%s' must be either -x or +x"

3227 +msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

3228 +

3229 +#: builtin/add.c:367

3230 +#, c-format

3231 msgid "Nothing specified, nothing added.\n"

3232 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

3233

2825 -#: builtin/add.c:353

3234 +#: builtin/add.c:368

3235 #, c-format

3236 msgid "Maybe you wanted to say 'git add .'?\n"

3237 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

3238

2830 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2831 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

3239 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279

3240 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340

3241 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

3242 #: builtin/submodule--helper.c:240

3243 msgid "index file corrupt"

3244 msgstr "fichier d'index corrompu"

3245

2836 -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

3246 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431

3247 msgid "Unable to write new index file"

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

3249

2840 -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

3250 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032

3251 #, c-format

3252 msgid "could not read '%s'"

3253 msgstr "impossible de lire '%s'"

3254

2845 -#: builtin/am.c:430

3255 +#: builtin/am.c:426

3256 msgid "could not parse author script"

3257 msgstr "impossible d'analyser le script author"

3258

2849 -#: builtin/am.c:507

3259 +#: builtin/am.c:503

3260 #, c-format

3261 msgid "'%s' was deleted by the applypatch-msg hook"

3262 msgstr "'%s' a été effacé par le crochet applypatch-msg"

3263

2854 -#: builtin/am.c:548 builtin/notes.c:300

3264 +#: builtin/am.c:544 builtin/notes.c:301

3265 #, c-format

3266 msgid "Malformed input line: '%s'."

3267 msgstr "Ligne en entrée malformée : '%s'."

3268

2859 -#: builtin/am.c:585 builtin/notes.c:315

3269 +#: builtin/am.c:581 builtin/notes.c:316

3270 #, c-format

3271 msgid "Failed to copy notes from '%s' to '%s'"

3272 msgstr "Impossible de copier les notes de '%s' vers '%s'"

3273

2864 -#: builtin/am.c:611

3274 +#: builtin/am.c:607

3275 msgid "fseek failed"

3276 msgstr "échec de fseek"

3277

2868 -#: builtin/am.c:788

3278 +#: builtin/am.c:787

3279 #, c-format

3280 msgid "could not parse patch '%s'"

3281 msgstr "impossible d'analyser le patch '%s'"

3282

2873 -#: builtin/am.c:853

3283 +#: builtin/am.c:852

3284 msgid "Only one StGIT patch series can be applied at once"

3285 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

3286

2877 -#: builtin/am.c:900

3287 +#: builtin/am.c:899

3288 msgid "invalid timestamp"

3289 msgstr "horodatage invalide"

3290

2881 -#: builtin/am.c:903 builtin/am.c:911

3291 +#: builtin/am.c:902 builtin/am.c:910

3292 msgid "invalid Date line"

3293 msgstr "ligne de Date invalide"

3294

2885 -#: builtin/am.c:908

3295 +#: builtin/am.c:907

3296 msgid "invalid timezone offset"

3297 msgstr "décalage horaire invalide"

3298

2889 -#: builtin/am.c:995

3299 +#: builtin/am.c:996

3300 msgid "Patch format detection failed."

3301 msgstr "Échec de détection du format du patch."

3302

2893 -#: builtin/am.c:1000 builtin/clone.c:380

3303 +#: builtin/am.c:1001 builtin/clone.c:380

3304 #, c-format

3305 msgid "failed to create directory '%s'"

3306 msgstr "échec de la création du répertoire '%s'"

3307

2898 -#: builtin/am.c:1004

3308 +#: builtin/am.c:1005

3309 msgid "Failed to split patches."

3310 msgstr "Échec de découpage des patchs."

3311

2902 -#: builtin/am.c:1136 builtin/commit.c:365

3312 +#: builtin/am.c:1137 builtin/commit.c:366

3313 msgid "unable to write index file"

3314 msgstr "impossible d'écrire le fichier d'index"

3315

2906 -#: builtin/am.c:1187

3316 +#: builtin/am.c:1188

3317 #, c-format

3318 msgid "When you have resolved this problem, run \"%s --continue\"."

3319 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

3320

2911 -#: builtin/am.c:1188

3321 +#: builtin/am.c:1189

3322 #, c-format

3323 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

3324 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

3325

2916 -#: builtin/am.c:1189

3326 +#: builtin/am.c:1190

3327 #, c-format

3328 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

3329 msgstr ""

3330 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

3331 "abort\"."

3332

2923 -#: builtin/am.c:1327

3333 +#: builtin/am.c:1328

3334 msgid "Patch is empty. Was it split wrong?"

3335 msgstr "Le patch est vide. Le découpage était-il bon ?"

3336

2927 -#: builtin/am.c:1401 builtin/log.c:1516

3337 +#: builtin/am.c:1402 builtin/log.c:1543

3338 #, c-format

3339 msgid "invalid ident line: %s"

3340 msgstr "ligne d'identification invalide : %s"

3341

2932 -#: builtin/am.c:1428

3342 +#: builtin/am.c:1429

3343 #, c-format

3344 msgid "unable to parse commit %s"

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

3346

2937 -#: builtin/am.c:1630

3347 +#: builtin/am.c:1602

3348 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

3349 msgstr ""

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

3351 "points."

3352

2943 -#: builtin/am.c:1632

3353 +#: builtin/am.c:1604

3354 msgid "Using index info to reconstruct a base tree..."

3355 msgstr ""

3356 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

3357

2948 -#: builtin/am.c:1651

3358 +#: builtin/am.c:1623

3359 msgid ""

3360 "Did you hand edit your patch?\n"

3361 "It does not apply to blobs recorded in its index."

@@ -2953,38 +3363,38 @@ msgstr ""

3363 "Avez-vous édité le patch à la main ?\n"

3364 "Il ne s'applique pas aux blobs enregistrés dans son index."

3365

2956 -#: builtin/am.c:1657

3366 +#: builtin/am.c:1629

3367 msgid "Falling back to patching base and 3-way merge..."

3368 msgstr "Retour à un patch de la base et fusion à 3 points..."

3369

2960 -#: builtin/am.c:1672

3370 +#: builtin/am.c:1654

3371 msgid "Failed to merge in the changes."

3372 msgstr "Échec d'intégration des modifications."

3373

2964 -#: builtin/am.c:1696 builtin/merge.c:636

3374 +#: builtin/am.c:1679 builtin/merge.c:628

3375 msgid "git write-tree failed to write a tree"

3376 msgstr "git write-tree a échoué à écrire un arbre"

3377

2968 -#: builtin/am.c:1703

3378 +#: builtin/am.c:1686

3379 msgid "applying to an empty history"

3380 msgstr "application à un historique vide"

3381

2972 -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2973 -#: builtin/merge.c:866

3382 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798

3383 +#: builtin/merge.c:823

3384 msgid "failed to write commit object"

3385 msgstr "échec de l'écriture de l'objet commit"

3386

2977 -#: builtin/am.c:1748 builtin/am.c:1752

3387 +#: builtin/am.c:1731 builtin/am.c:1735

3388 #, c-format

3389 msgid "cannot resume: %s does not exist."

3390 msgstr "impossible de continuer : %s n'existe pas."

3391

2982 -#: builtin/am.c:1768

3392 +#: builtin/am.c:1751

3393 msgid "cannot be interactive without stdin connected to a terminal."

3394 msgstr ""

3395 "impossible d'être interactif sans entrée standard connectée à un terminal."

3396

2987 -#: builtin/am.c:1773

3397 +#: builtin/am.c:1756

3398 msgid "Commit Body is:"

3399 msgstr "Le corps de la validation est :"

3400

@@ -2992,35 +3402,35 @@ msgstr "Le corps de la validation est :"

3402 #. in your translation. The program will only accept English

3403 #. input at this point.

3404 #.

2995 -#: builtin/am.c:1783

3405 +#: builtin/am.c:1766

3406 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

3407 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

3408

2999 -#: builtin/am.c:1833

3409 +#: builtin/am.c:1816

3410 #, c-format

3411 msgid "Dirty index: cannot apply patches (dirty: %s)"

3412 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

3413

3004 -#: builtin/am.c:1868 builtin/am.c:1940

3414 +#: builtin/am.c:1853 builtin/am.c:1925

3415 #, c-format

3416 msgid "Applying: %.*s"

3417 msgstr "Application de %.*s"

3418

3009 -#: builtin/am.c:1884

3419 +#: builtin/am.c:1869

3420 msgid "No changes -- Patch already applied."

3421 msgstr "Pas de changement -- Patch déjà appliqué."

3422

3013 -#: builtin/am.c:1892

3423 +#: builtin/am.c:1877

3424 #, c-format

3425 msgid "Patch failed at %s %.*s"

3426 msgstr "le patch a échoué à %s %.*s"

3427

3018 -#: builtin/am.c:1898

3428 +#: builtin/am.c:1883

3429 #, c-format

3430 msgid "The copy of the patch that failed is found in: %s"

3431 msgstr "La copie du patch qui a échoué se trouve dans : %s"

3432

3023 -#: builtin/am.c:1943

3433 +#: builtin/am.c:1928

3434 msgid ""

3435 "No changes - did you forget to use 'git add'?\n"

3436 "If there is nothing left to stage, chances are that something else\n"

@@ -3031,7 +3441,7 @@ msgstr ""

3441 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

3442 "patch."

3443

3034 -#: builtin/am.c:1950

3444 +#: builtin/am.c:1935

3445 msgid ""

3446 "You still have unmerged paths in your index.\n"

3447 "Did you forget to use 'git add'?"

@@ -3039,17 +3449,17 @@ msgstr ""

3449 "Vous avez toujours des chemins non fusionnés dans votre index\n"

3450 "Auriez-vous oublié de faire 'git add' ?"

3451

3042 -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

3452 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308

3453 #: builtin/reset.c:316

3454 #, c-format

3455 msgid "Could not parse object '%s'."

3456 msgstr "Impossible d'analyser l'objet '%s'."

3457

3048 -#: builtin/am.c:2110

3458 +#: builtin/am.c:2095

3459 msgid "failed to clean index"

3460 msgstr "échec du nettoyage de l'index"

3461

3052 -#: builtin/am.c:2144

3462 +#: builtin/am.c:2129

3463 msgid ""

3464 "You seem to have moved HEAD since the last 'am' failure.\n"

3465 "Not rewinding to ORIG_HEAD"

@@ -3057,156 +3467,156 @@ msgstr ""

3467 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

3468 "Pas de retour à ORIG_HEAD"

3469

3060 -#: builtin/am.c:2205

3470 +#: builtin/am.c:2192

3471 #, c-format

3472 msgid "Invalid value for --patch-format: %s"

3473 msgstr "Valeur invalide pour --patch-format : %s"

3474

3065 -#: builtin/am.c:2238

3475 +#: builtin/am.c:2225

3476 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

3477 msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"

3478

3069 -#: builtin/am.c:2239

3479 +#: builtin/am.c:2226

3480 msgid "git am [<options>] (--continue | --skip | --abort)"

3481 msgstr "git am [<options>] (--continue | --quit | --abort)"

3482

3073 -#: builtin/am.c:2245

3483 +#: builtin/am.c:2232

3484 msgid "run interactively"

3485 msgstr "exécution interactive"

3486

3077 -#: builtin/am.c:2247

3487 +#: builtin/am.c:2234

3488 msgid "historical option -- no-op"

3489 msgstr "option historique -- no-op"

3490

3081 -#: builtin/am.c:2249

3491 +#: builtin/am.c:2236

3492 msgid "allow fall back on 3way merging if needed"

3493 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

3494

3085 -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

3086 -#: builtin/repack.c:171

3495 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57

3496 +#: builtin/repack.c:172

3497 msgid "be quiet"

3498 msgstr "être silencieux"

3499

3090 -#: builtin/am.c:2252

3500 +#: builtin/am.c:2239

3501 msgid "add a Signed-off-by line to the commit message"

3502 msgstr "ajouter une ligne Signed-off-by au message de validation"

3503

3094 -#: builtin/am.c:2255

3504 +#: builtin/am.c:2242

3505 msgid "recode into utf8 (default)"

3506 msgstr "recoder en utf-8 (par défaut)"

3507

3098 -#: builtin/am.c:2257

3508 +#: builtin/am.c:2244

3509 msgid "pass -k flag to git-mailinfo"

3510 msgstr "passer l'option -k à git-mailinfo"

3511

3102 -#: builtin/am.c:2259

3512 +#: builtin/am.c:2246

3513 msgid "pass -b flag to git-mailinfo"

3514 msgstr "passer l'option -b à git-mailinfo"

3515

3106 -#: builtin/am.c:2261

3516 +#: builtin/am.c:2248

3517 msgid "pass -m flag to git-mailinfo"

3518 msgstr "passer l'option -m à git-mailinfo"

3519

3110 -#: builtin/am.c:2263

3520 +#: builtin/am.c:2250

3521 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

3522 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

3523

3114 -#: builtin/am.c:2266

3524 +#: builtin/am.c:2253

3525 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

3526 msgstr ""

3527 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

3528

3119 -#: builtin/am.c:2269

3529 +#: builtin/am.c:2256

3530 msgid "strip everything before a scissors line"

3531 msgstr "retirer tout le contenu avant la ligne des ciseaux"

3532

3123 -#: builtin/am.c:2270 builtin/apply.c:4546

3533 +#: builtin/am.c:2257 builtin/apply.c:4837

3534 msgid "action"

3535 msgstr "action"

3536

3127 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

3128 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

3129 -#: builtin/am.c:2298

3537 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

3538 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279

3539 +#: builtin/am.c:2285

3540 msgid "pass it through git-apply"

3541 msgstr "le passer jusqu'à git-apply"

3542

3133 -#: builtin/am.c:2279 builtin/apply.c:4570

3543 +#: builtin/am.c:2266 builtin/apply.c:4861

3544 msgid "root"

3545 msgstr "racine"

3546

3137 -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

3138 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3547 +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799

3548 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96

3549 #: builtin/pull.c:179 builtin/submodule--helper.c:277

3140 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

3141 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

3142 -#: builtin/submodule--helper.c:770

3550 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482

3551 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823

3552 +#: builtin/submodule--helper.c:826

3553 msgid "path"

3554 msgstr "chemin"

3555

3146 -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3147 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193

3148 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

3556 +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3557 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193

3558 +#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645

3559 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

3560 #: parse-options.h:134 parse-options.h:244

3561 msgid "n"

3562 msgstr "n"

3563

3154 -#: builtin/am.c:2291 builtin/apply.c:4514

3564 +#: builtin/am.c:2278 builtin/apply.c:4805

3565 msgid "num"

3566 msgstr "num"

3567

3158 -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3568 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438

3569 #: builtin/tag.c:372

3570 msgid "format"

3571 msgstr "format"

3572

3163 -#: builtin/am.c:2295

3573 +#: builtin/am.c:2282

3574 msgid "format the patch(es) are in"

3575 msgstr "format de présentation des patchs"

3576

3167 -#: builtin/am.c:2301

3577 +#: builtin/am.c:2288

3578 msgid "override error message when patch failure occurs"

3579 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

3580

3171 -#: builtin/am.c:2303

3581 +#: builtin/am.c:2290

3582 msgid "continue applying patches after resolving a conflict"

3583 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

3584

3175 -#: builtin/am.c:2306

3585 +#: builtin/am.c:2293

3586 msgid "synonyms for --continue"

3587 msgstr "synonymes de --continue"

3588

3179 -#: builtin/am.c:2309

3589 +#: builtin/am.c:2296

3590 msgid "skip the current patch"

3591 msgstr "sauter le patch courant"

3592

3183 -#: builtin/am.c:2312

3593 +#: builtin/am.c:2299

3594 msgid "restore the original branch and abort the patching operation."

3595 msgstr ""

3596 "restaurer la branche originale et abandonner les applications de patch."

3597

3188 -#: builtin/am.c:2316

3598 +#: builtin/am.c:2303

3599 msgid "lie about committer date"

3600 msgstr "mentir sur la date de validation"

3601

3192 -#: builtin/am.c:2318

3602 +#: builtin/am.c:2305

3603 msgid "use current timestamp for author date"

3604 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

3605

3196 -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3606 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229

3607 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3608 msgid "key-id"

3609 msgstr "id-clé"

3610

3201 -#: builtin/am.c:2321

3611 +#: builtin/am.c:2308

3612 msgid "GPG-sign commits"

3613 msgstr "signer les commits avec GPG"

3614

3205 -#: builtin/am.c:2324

3615 +#: builtin/am.c:2311

3616 msgid "(internal use for git-rebase)"

3617 msgstr "(utilisation interne pour git-rebase)"

3618

3209 -#: builtin/am.c:2339

3619 +#: builtin/am.c:2326

3620 msgid ""

3621 "The -b/--binary option has been a no-op for long time, and\n"

3622 "it will be removed. Please do not use it anymore."

@@ -3214,17 +3624,17 @@ msgstr ""

3624 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

3625 "et elle sera supprimée. Veuillez ne plus l'utiliser."

3626

3217 -#: builtin/am.c:2346

3627 +#: builtin/am.c:2333

3628 msgid "failed to read the index"

3629 msgstr "échec à la lecture de l'index"

3630

3221 -#: builtin/am.c:2361

3631 +#: builtin/am.c:2348

3632 #, c-format

3633 msgid "previous rebase directory %s still exists but mbox given."

3634 msgstr ""

3635 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

3636

3227 -#: builtin/am.c:2385

3637 +#: builtin/am.c:2372

3638 #, c-format

3639 msgid ""

3640 "Stray %s directory found.\n"

@@ -3233,79 +3643,79 @@ msgstr ""

3643 "Répertoire abandonné %s trouvé.\n"

3644 "Utilisez \"git am --abort\" pour le supprimer."

3645

3236 -#: builtin/am.c:2391

3646 +#: builtin/am.c:2378

3647 msgid "Resolve operation not in progress, we are not resuming."

3648 msgstr ""

3649 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

3650 "reprise."

3651

3242 -#: builtin/apply.c:59

3652 +#: builtin/apply.c:122

3653 msgid "git apply [<options>] [<patch>...]"

3654 msgstr "git apply [<options>] [<patch>...]"

3655

3246 -#: builtin/apply.c:111

3656 +#: builtin/apply.c:153

3657 #, c-format

3658 msgid "unrecognized whitespace option '%s'"

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

3660

3251 -#: builtin/apply.c:126

3661 +#: builtin/apply.c:169

3662 #, c-format

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

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

3665

3256 -#: builtin/apply.c:818

3666 +#: builtin/apply.c:854

3667 #, c-format

3668 msgid "Cannot prepare timestamp regexp %s"

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

3670

3261 -#: builtin/apply.c:827

3671 +#: builtin/apply.c:863

3672 #, c-format

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

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

3675

3266 -#: builtin/apply.c:908

3676 +#: builtin/apply.c:947

3677 #, c-format

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

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

3680

3271 -#: builtin/apply.c:937

3681 +#: builtin/apply.c:984

3682 #, c-format

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

3684 msgstr ""

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

3686 "ligne %d"

3687

3278 -#: builtin/apply.c:942

3688 +#: builtin/apply.c:989

3689 #, c-format

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

3691 msgstr ""

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

3693 "à la ligne %d"

3694

3285 -#: builtin/apply.c:943

3695 +#: builtin/apply.c:990

3696 #, c-format

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

3698 msgstr ""

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

3700 "à la ligne %d"

3701

3292 -#: builtin/apply.c:949

3702 +#: builtin/apply.c:995

3703 #, c-format

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

3705 msgstr ""

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

3707

3298 -#: builtin/apply.c:1406

3708 +#: builtin/apply.c:1489

3709 #, c-format

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

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

3712

3303 -#: builtin/apply.c:1463

3713 +#: builtin/apply.c:1550

3714 #, c-format

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

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

3717

3308 -#: builtin/apply.c:1480

3718 +#: builtin/apply.c:1567

3719 #, c-format

3720 msgid ""

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

@@ -3320,77 +3730,77 @@ msgstr[1] ""

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

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

3732

3323 -#: builtin/apply.c:1646

3733 +#: builtin/apply.c:1743

3734 msgid "new file depends on old contents"

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

3736

3327 -#: builtin/apply.c:1648

3737 +#: builtin/apply.c:1745

3738 msgid "deleted file still has contents"

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

3740

3331 -#: builtin/apply.c:1674

3741 +#: builtin/apply.c:1774

3742 #, c-format

3743 msgid "corrupt patch at line %d"

3744 msgstr "patch corrompu à la ligne %d"

3745

3336 -#: builtin/apply.c:1710

3746 +#: builtin/apply.c:1810

3747 #, c-format

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

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

3750

3341 -#: builtin/apply.c:1712

3751 +#: builtin/apply.c:1812

3752 #, c-format

3753 msgid "deleted file %s still has contents"

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

3755

3346 -#: builtin/apply.c:1715

3756 +#: builtin/apply.c:1815

3757 #, c-format

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

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

3760

3351 -#: builtin/apply.c:1861

3761 +#: builtin/apply.c:1962

3762 #, c-format

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

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

3765

3356 -#: builtin/apply.c:1895

3766 +#: builtin/apply.c:1999

3767 #, c-format

3768 msgid "unrecognized binary patch at line %d"

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

3770

3361 -#: builtin/apply.c:2048

3771 +#: builtin/apply.c:2154

3772 #, c-format

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

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

3775

3366 -#: builtin/apply.c:2138

3776 +#: builtin/apply.c:2244

3777 #, c-format

3778 msgid "unable to read symlink %s"

3779 msgstr "lecture du lien symbolique %s impossible"

3780

3371 -#: builtin/apply.c:2142

3781 +#: builtin/apply.c:2248

3782 #, c-format

3783 msgid "unable to open or read %s"

3784 msgstr "ouverture ou lecture de %s impossible"

3785

3376 -#: builtin/apply.c:2775

3786 +#: builtin/apply.c:2901

3787 #, c-format

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

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

3790

3381 -#: builtin/apply.c:2894

3791 +#: builtin/apply.c:3020

3792 #, c-format

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

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

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

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

3797

3388 -#: builtin/apply.c:2906

3798 +#: builtin/apply.c:3032

3799 #, c-format

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

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

3802

3393 -#: builtin/apply.c:2912

3803 +#: builtin/apply.c:3038

3804 #, c-format

3805 msgid ""

3806 "while searching for:\n"

@@ -3399,346 +3809,341 @@ msgstr ""

3809 "pendant la recherche de :\n"

3810 "%.*s"

3811

3402 -#: builtin/apply.c:2932

3812 +#: builtin/apply.c:3060

3813 #, c-format

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

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

3816

3407 -#: builtin/apply.c:3033

3817 +#: builtin/apply.c:3163

3818 #, c-format

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

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

3821

3412 -#: builtin/apply.c:3039

3822 +#: builtin/apply.c:3169

3823 #, c-format

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

3825 msgstr ""

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

3827 "trouvé)"

3828

3419 -#: builtin/apply.c:3060

3829 +#: builtin/apply.c:3190

3830 #, c-format

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

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

3833

3424 -#: builtin/apply.c:3184

3834 +#: builtin/apply.c:3314

3835 #, c-format

3836 msgid "cannot checkout %s"

3837 msgstr "extraction de %s impossible"

3838

3429 -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3430 -#, c-format

3431 -msgid "read of %s failed"

3432 -msgstr "échec de la lecture de %s"

3433 -

3434 -#: builtin/apply.c:3237

3839 +#: builtin/apply.c:3370

3840 #, c-format

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

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

3843

3439 -#: builtin/apply.c:3265 builtin/apply.c:3487

3844 +#: builtin/apply.c:3399 builtin/apply.c:3630

3845 #, c-format

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

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

3848

3444 -#: builtin/apply.c:3346 builtin/apply.c:3501

3849 +#: builtin/apply.c:3482 builtin/apply.c:3644

3850 #, c-format

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

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

3853

3449 -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3854 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658

3855 #, c-format

3856 msgid "%s: %s"

3857 msgstr "%s : %s"

3858

3454 -#: builtin/apply.c:3355 builtin/apply.c:3509

3859 +#: builtin/apply.c:3491 builtin/apply.c:3652

3860 #, c-format

3861 msgid "%s: does not match index"

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

3863

3459 -#: builtin/apply.c:3457

3864 +#: builtin/apply.c:3597

3865 msgid "removal patch leaves file contents"

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

3867

3463 -#: builtin/apply.c:3526

3868 +#: builtin/apply.c:3669

3869 #, c-format

3870 msgid "%s: wrong type"

3871 msgstr "%s : type erroné"

3872

3468 -#: builtin/apply.c:3528

3873 +#: builtin/apply.c:3671

3874 #, c-format

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

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

3877

3473 -#: builtin/apply.c:3687 builtin/apply.c:3689

3878 +#: builtin/apply.c:3822 builtin/apply.c:3824

3879 #, c-format

3880 msgid "invalid path '%s'"

3881 msgstr "chemin invalide '%s'"

3882

3478 -#: builtin/apply.c:3744

3883 +#: builtin/apply.c:3879

3884 #, c-format

3885 msgid "%s: already exists in index"

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

3887

3483 -#: builtin/apply.c:3747

3888 +#: builtin/apply.c:3882

3889 #, c-format

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

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

3892

3488 -#: builtin/apply.c:3767

3893 +#: builtin/apply.c:3902

3894 #, c-format

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

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

3897

3493 -#: builtin/apply.c:3772

3898 +#: builtin/apply.c:3907

3899 #, c-format

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

3901 msgstr ""

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

3903

3499 -#: builtin/apply.c:3792

3904 +#: builtin/apply.c:3927

3905 #, c-format

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

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

3908

3504 -#: builtin/apply.c:3796

3909 +#: builtin/apply.c:3931

3910 #, c-format

3911 msgid "%s: patch does not apply"

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

3913

3509 -#: builtin/apply.c:3810

3914 +#: builtin/apply.c:3945

3915 #, c-format

3916 msgid "Checking patch %s..."

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

3918

3514 -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3919 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135

3920 #, c-format

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

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

3923

3519 -#: builtin/apply.c:4046

3924 +#: builtin/apply.c:4182

3925 #, c-format

3926 msgid "unable to remove %s from index"

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

3928

3524 -#: builtin/apply.c:4075

3929 +#: builtin/apply.c:4215

3930 #, c-format

3931 msgid "corrupt patch for submodule %s"

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

3933

3529 -#: builtin/apply.c:4079

3934 +#: builtin/apply.c:4219

3935 #, c-format

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

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

3938

3534 -#: builtin/apply.c:4084

3939 +#: builtin/apply.c:4224

3940 #, c-format

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

3942 msgstr ""

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

3944 "impossible"

3945

3541 -#: builtin/apply.c:4087 builtin/apply.c:4195

3946 +#: builtin/apply.c:4227 builtin/apply.c:4340

3947 #, c-format

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

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

3950

3546 -#: builtin/apply.c:4120

3951 +#: builtin/apply.c:4260

3952 #, c-format

3953 msgid "closing file '%s'"

3954 msgstr "fermeture du fichier '%s'"

3955

3551 -#: builtin/apply.c:4169

3956 +#: builtin/apply.c:4313

3957 #, c-format

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

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

3960

3556 -#: builtin/apply.c:4256

3961 +#: builtin/apply.c:4403

3962 #, c-format

3963 msgid "Applied patch %s cleanly."

3964 msgstr "Patch %s appliqué proprement."

3965

3561 -#: builtin/apply.c:4264

3966 +#: builtin/apply.c:4411

3967 msgid "internal error"

3968 msgstr "erreur interne"

3969

3565 -#: builtin/apply.c:4267

3970 +#: builtin/apply.c:4414

3971 #, c-format

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

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

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

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

3976

3572 -#: builtin/apply.c:4277

3977 +#: builtin/apply.c:4424

3978 #, c-format

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

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

3981

3577 -#: builtin/apply.c:4285

3982 +#: builtin/apply.c:4432

3983 #, c-format

3984 msgid "cannot open %s: %s"

3985 msgstr "impossible d'ouvrir %s : %s"

3986

3582 -#: builtin/apply.c:4298

3987 +#: builtin/apply.c:4445

3988 #, c-format

3989 msgid "Hunk #%d applied cleanly."

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

3991

3587 -#: builtin/apply.c:4301

3992 +#: builtin/apply.c:4448

3993 #, c-format

3994 msgid "Rejected hunk #%d."

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

3996

3592 -#: builtin/apply.c:4387

3997 +#: builtin/apply.c:4537

3998 #, c-format

3999 msgid "Skipped patch '%s'."

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

4001

3597 -#: builtin/apply.c:4395

4002 +#: builtin/apply.c:4545

4003 msgid "unrecognized input"

4004 msgstr "entrée non reconnue"

4005

3601 -#: builtin/apply.c:4406

4006 +#: builtin/apply.c:4556

4007 msgid "unable to read index file"

4008 msgstr "lecture du fichier d'index impossible"

4009

3605 -#: builtin/apply.c:4509

4010 +#: builtin/apply.c:4701

4011 +msgid "--3way outside a repository"

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

4013 +

4014 +#: builtin/apply.c:4709

4015 +msgid "--index outside a repository"

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

4017 +

4018 +#: builtin/apply.c:4712

4019 +msgid "--cached outside a repository"

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

4021 +

4022 +#: builtin/apply.c:4745

4023 +#, c-format

4024 +msgid "can't open patch '%s'"

4025 +msgstr "ouverture impossible du patch '%s'"

4026 +

4027 +#: builtin/apply.c:4760

4028 +#, c-format

4029 +msgid "squelched %d whitespace error"

4030 +msgid_plural "squelched %d whitespace errors"

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

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

4033 +

4034 +#: builtin/apply.c:4766 builtin/apply.c:4776

4035 +#, c-format

4036 +msgid "%d line adds whitespace errors."

4037 +msgid_plural "%d lines add whitespace errors."

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

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

4040 +

4041 +#: builtin/apply.c:4800

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

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

4044

3609 -#: builtin/apply.c:4512

4045 +#: builtin/apply.c:4803

4046 msgid "apply changes matching the given path"

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

4048

3613 -#: builtin/apply.c:4515

4049 +#: builtin/apply.c:4806

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

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

4052

3617 -#: builtin/apply.c:4518

4053 +#: builtin/apply.c:4809

4054 msgid "ignore additions made by the patch"

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

4056

3621 -#: builtin/apply.c:4520

4057 +#: builtin/apply.c:4811

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

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

4060

3625 -#: builtin/apply.c:4524

4061 +#: builtin/apply.c:4815

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

4063 msgstr ""

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

4065

3630 -#: builtin/apply.c:4526

4066 +#: builtin/apply.c:4817

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

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

4069

3634 -#: builtin/apply.c:4528

4070 +#: builtin/apply.c:4819

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

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

4073

3638 -#: builtin/apply.c:4530

4074 +#: builtin/apply.c:4821

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

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

4077

3642 -#: builtin/apply.c:4532

4078 +#: builtin/apply.c:4823

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

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

4081

3646 -#: builtin/apply.c:4534

4082 +#: builtin/apply.c:4825

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

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

4085

3650 -#: builtin/apply.c:4536

4086 +#: builtin/apply.c:4827

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

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

4089

3654 -#: builtin/apply.c:4538

4090 +#: builtin/apply.c:4829

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

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

4093

3658 -#: builtin/apply.c:4540

4094 +#: builtin/apply.c:4831

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

4096 msgstr ""

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

4098

3663 -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

4099 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426

4100 msgid "paths are separated with NUL character"

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

4102

3667 -#: builtin/apply.c:4545

4103 +#: builtin/apply.c:4836

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

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

4106

3671 -#: builtin/apply.c:4547

4107 +#: builtin/apply.c:4838

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

4109 msgstr ""

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

4111 "d'espace"

4112

3677 -#: builtin/apply.c:4550 builtin/apply.c:4553

4113 +#: builtin/apply.c:4841 builtin/apply.c:4844

4114 msgid "ignore changes in whitespace when finding context"

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

4116

3681 -#: builtin/apply.c:4556

4117 +#: builtin/apply.c:4847

4118 msgid "apply the patch in reverse"

4119 msgstr "appliquer le patch en sens inverse"

4120

3685 -#: builtin/apply.c:4558

4121 +#: builtin/apply.c:4849

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

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

4124

3689 -#: builtin/apply.c:4560

4125 +#: builtin/apply.c:4851

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

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

4128

3693 -#: builtin/apply.c:4562

4129 +#: builtin/apply.c:4853

4130 msgid "allow overlapping hunks"

4131 msgstr "accepter les recouvrements de sections"

4132

3697 -#: builtin/apply.c:4565

4133 +#: builtin/apply.c:4856

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

4135 msgstr ""

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

4137 "fichier"

4138

3703 -#: builtin/apply.c:4568

4139 +#: builtin/apply.c:4859

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

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

4142

3707 -#: builtin/apply.c:4571

4143 +#: builtin/apply.c:4862

4144 msgid "prepend <root> to all filenames"

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

4146

3711 -#: builtin/apply.c:4593

3712 -msgid "--3way outside a repository"

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

3714 -

3715 -#: builtin/apply.c:4601

3716 -msgid "--index outside a repository"

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

3718 -

3719 -#: builtin/apply.c:4604

3720 -msgid "--cached outside a repository"

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

3722 -

3723 -#: builtin/apply.c:4623

3724 -#, c-format

3725 -msgid "can't open patch '%s'"

3726 -msgstr "ouverture impossible du patch '%s'"

3727 -

3728 -#: builtin/apply.c:4637

3729 -#, c-format

3730 -msgid "squelched %d whitespace error"

3731 -msgid_plural "squelched %d whitespace errors"

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

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

3734 -

3735 -#: builtin/apply.c:4643 builtin/apply.c:4653

3736 -#, c-format

3737 -msgid "%d line adds whitespace errors."

3738 -msgid_plural "%d lines add whitespace errors."

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

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

3741 -

4147 #: builtin/archive.c:17

4148 #, c-format

4149 msgid "could not create archive file '%s'"

@@ -3794,108 +4199,108 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

4199 msgid "<rev-opts> are documented in git-rev-list(1)"

4200 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

4201

3797 -#: builtin/blame.c:1782

4202 +#: builtin/blame.c:1781

4203 msgid "Blaming lines"

4204 msgstr "Assignation de blâme au lignes"

4205

3801 -#: builtin/blame.c:2531

4206 +#: builtin/blame.c:2536

4207 msgid "Show blame entries as we find them, incrementally"

4208 msgstr ""

4209 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

4210 "manière incrémentale"

4211

3807 -#: builtin/blame.c:2532

4212 +#: builtin/blame.c:2537

4213 msgid "Show blank SHA-1 for boundary commits (Default: off)"

4214 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

4215

3811 -#: builtin/blame.c:2533

4216 +#: builtin/blame.c:2538

4217 msgid "Do not treat root commits as boundaries (Default: off)"

4218 msgstr ""

4219 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

4220

3816 -#: builtin/blame.c:2534

4221 +#: builtin/blame.c:2539

4222 msgid "Show work cost statistics"

4223 msgstr "Montrer les statistiques de coût d'activité"

4224

3820 -#: builtin/blame.c:2535

4225 +#: builtin/blame.c:2540

4226 msgid "Force progress reporting"

4227 msgstr "Forcer l'affichage de l'état d'avancement"

4228

3824 -#: builtin/blame.c:2536

4229 +#: builtin/blame.c:2541

4230 msgid "Show output score for blame entries"

4231 msgstr "Montrer le score de sortie pour les éléments de blâme"

4232

3828 -#: builtin/blame.c:2537

4233 +#: builtin/blame.c:2542

4234 msgid "Show original filename (Default: auto)"

4235 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

4236

3832 -#: builtin/blame.c:2538

4237 +#: builtin/blame.c:2543

4238 msgid "Show original linenumber (Default: off)"

4239 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

4240

3836 -#: builtin/blame.c:2539

4241 +#: builtin/blame.c:2544

4242 msgid "Show in a format designed for machine consumption"

4243 msgstr "Afficher dans un format propice à la consommation par machine"

4244

3840 -#: builtin/blame.c:2540

4245 +#: builtin/blame.c:2545

4246 msgid "Show porcelain format with per-line commit information"

4247 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

4248

3844 -#: builtin/blame.c:2541

4249 +#: builtin/blame.c:2546

4250 msgid "Use the same output mode as git-annotate (Default: off)"

4251 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

4252

3848 -#: builtin/blame.c:2542

4253 +#: builtin/blame.c:2547

4254 msgid "Show raw timestamp (Default: off)"

4255 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

4256

3852 -#: builtin/blame.c:2543

4257 +#: builtin/blame.c:2548

4258 msgid "Show long commit SHA1 (Default: off)"

4259 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

4260

3856 -#: builtin/blame.c:2544

4261 +#: builtin/blame.c:2549

4262 msgid "Suppress author name and timestamp (Default: off)"

4263 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

4264

3860 -#: builtin/blame.c:2545

4265 +#: builtin/blame.c:2550

4266 msgid "Show author email instead of name (Default: off)"

4267 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

4268

3864 -#: builtin/blame.c:2546

4269 +#: builtin/blame.c:2551

4270 msgid "Ignore whitespace differences"

4271 msgstr "Ignorer les différences d'espace"

4272

3868 -#: builtin/blame.c:2547

4273 +#: builtin/blame.c:2552

4274 msgid "Spend extra cycles to find better match"

4275 msgstr ""

4276 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

4277

3873 -#: builtin/blame.c:2548

4278 +#: builtin/blame.c:2553

4279 msgid "Use revisions from <file> instead of calling git-rev-list"

4280 msgstr ""

4281 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

4282

3878 -#: builtin/blame.c:2549

4283 +#: builtin/blame.c:2554

4284 msgid "Use <file>'s contents as the final image"

4285 msgstr "Utiliser le contenu de <fichier> comme image finale"

4286

3882 -#: builtin/blame.c:2550 builtin/blame.c:2551

4287 +#: builtin/blame.c:2555 builtin/blame.c:2556

4288 msgid "score"

4289 msgstr "score"

4290

3886 -#: builtin/blame.c:2550

4291 +#: builtin/blame.c:2555

4292 msgid "Find line copies within and across files"

4293 msgstr "Trouver les copies de ligne dans et entre les fichiers"

4294

3890 -#: builtin/blame.c:2551

4295 +#: builtin/blame.c:2556

4296 msgid "Find line movements within and across files"

4297 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

4298

3894 -#: builtin/blame.c:2552

4299 +#: builtin/blame.c:2557

4300 msgid "n,m"

4301 msgstr "n,m"

4302

3898 -#: builtin/blame.c:2552

4303 +#: builtin/blame.c:2557

4304 msgid "Process only line range n,m, counting from 1"

4305 msgstr ""

4306 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

@@ -3906,7 +4311,7 @@ msgstr ""

4311 #. takes 22 places, is the longest among various forms of

4312 #. relative timestamps, but your language may need more or

4313 #. fewer display columns.

3909 -#: builtin/blame.c:2641

4314 +#: builtin/blame.c:2649

4315 msgid "4 years, 11 months ago"

4316 msgstr "il y a 10 ans et 11 mois"

4317

@@ -4011,120 +4416,127 @@ msgid "Deleted branch %s (was %s).\n"

4416 msgstr "Branche %s supprimée (précédemment %s).\n"

4417

4418 # féminin pour une branche

4014 -#: builtin/branch.c:309

4419 +#: builtin/branch.c:312

4420 #, c-format

4421 msgid "[%s: gone]"

4422 msgstr "[%s: disparue]"

4423

4019 -#: builtin/branch.c:314

4424 +#: builtin/branch.c:317

4425 #, c-format

4426 msgid "[%s]"

4427 msgstr "[%s]"

4428

4024 -#: builtin/branch.c:319

4429 +#: builtin/branch.c:322

4430 #, c-format

4431 msgid "[%s: behind %d]"

4432 msgstr "[%s: en retard de %d]"

4433

4029 -#: builtin/branch.c:321

4434 +#: builtin/branch.c:324

4435 #, c-format

4436 msgid "[behind %d]"

4437 msgstr "[en retard de %d]"

4438

4034 -#: builtin/branch.c:325

4439 +#: builtin/branch.c:328

4440 #, c-format

4441 msgid "[%s: ahead %d]"

4442 msgstr "[%s : en avance de %d]"

4443

4039 -#: builtin/branch.c:327

4444 +#: builtin/branch.c:330

4445 #, c-format

4446 msgid "[ahead %d]"

4447 msgstr "[en avance de %d]"

4448

4044 -#: builtin/branch.c:330

4449 +#: builtin/branch.c:333

4450 #, c-format

4451 msgid "[%s: ahead %d, behind %d]"

4452 msgstr "[%s : en avance de %d, en retard de %d]"

4453

4049 -#: builtin/branch.c:333

4454 +#: builtin/branch.c:336

4455 #, c-format

4456 msgid "[ahead %d, behind %d]"

4457 msgstr "[en avance de %d, en retard de %d]"

4458

4054 -#: builtin/branch.c:346

4459 +#: builtin/branch.c:349

4460 msgid " **** invalid ref ****"

4461 msgstr " **** référence invalide ****"

4462

4058 -#: builtin/branch.c:372

4463 +#: builtin/branch.c:375

4464 #, c-format

4465 msgid "(no branch, rebasing %s)"

4466 msgstr "(aucune branche, rebasage de %s)"

4467

4063 -#: builtin/branch.c:375

4468 +#: builtin/branch.c:378

4469 #, c-format

4470 msgid "(no branch, bisect started on %s)"

4471 msgstr "(aucune branche, bisect a démarré sur %s)"

4472

4473 #. TRANSLATORS: make sure this matches

4474 #. "HEAD detached at " in wt-status.c

4070 -#: builtin/branch.c:381

4475 +#: builtin/branch.c:384

4476 #, c-format

4477 msgid "(HEAD detached at %s)"

4478 msgstr "(HEAD détachée sur %s)"

4479

4480 #. TRANSLATORS: make sure this matches

4481 #. "HEAD detached from " in wt-status.c

4077 -#: builtin/branch.c:386

4482 +#: builtin/branch.c:389

4483 #, c-format

4484 msgid "(HEAD detached from %s)"

4485 msgstr "(HEAD détachée depuis %s)"

4486

4082 -#: builtin/branch.c:390

4487 +#: builtin/branch.c:393

4488 msgid "(no branch)"

4489 msgstr "(aucune branche)"

4490

4086 -#: builtin/branch.c:541

4491 +#: builtin/branch.c:544

4492 #, c-format

4493 msgid "Branch %s is being rebased at %s"

4494 msgstr "La branche %s est en cours de rebasage sur %s"

4495

4091 -#: builtin/branch.c:545

4496 +#: builtin/branch.c:548

4497 #, c-format

4498 msgid "Branch %s is being bisected at %s"

4499 msgstr "La branche %s est en cours de bissection sur %s"

4500

4096 -#: builtin/branch.c:560

4501 +#: builtin/branch.c:563

4502 msgid "cannot rename the current branch while not on any."

4503 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

4504

4100 -#: builtin/branch.c:570

4505 +#: builtin/branch.c:573

4506 #, c-format

4507 msgid "Invalid branch name: '%s'"

4508 msgstr "Nom de branche invalide : '%s'"

4509

4105 -#: builtin/branch.c:587

4510 +#: builtin/branch.c:590

4511 msgid "Branch rename failed"

4512 msgstr "Échec de renommage de la branche"

4513

4109 -#: builtin/branch.c:591

4514 +#: builtin/branch.c:594

4515 #, c-format

4516 msgid "Renamed a misnamed branch '%s' away"

4517 msgstr "Renommage d'un branche mal nommée '%s'"

4518

4114 -#: builtin/branch.c:594

4519 +#: builtin/branch.c:597

4520 #, c-format

4521 msgid "Branch renamed to %s, but HEAD is not updated!"

4522 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

4523

4119 -#: builtin/branch.c:601

4524 +#: builtin/branch.c:604

4525 msgid "Branch is renamed, but update of config-file failed"

4526 msgstr ""

4527 "La branche est renommée, mais la mise à jour du fichier de configuration a "

4528 "échoué"

4529

4125 -#: builtin/branch.c:623

4126 -msgid "could not write branch description template"

4127 -msgstr "impossible d'écrire le modèle de description de branche"

4530 +#: builtin/branch.c:620

4531 +#, c-format

4532 +msgid ""

4533 +"Please edit the description for the branch\n"

4534 +" %s\n"

4535 +"Lines starting with '%c' will be stripped.\n"

4536 +msgstr ""

4537 +"Veuillez éditer la description de la branche\n"

4538 +" %s\n"

4539 +"Les lignes commençant par '%c' seront ignorées.\n"

4540

4541 #: builtin/branch.c:651

4542 msgid "Generic options"

@@ -4226,8 +4638,8 @@ msgstr "clé"

4638 msgid "field name to sort on"

4639 msgstr "nom du champ servant à trier"

4640

4229 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

4230 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4641 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402

4642 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568

4643 #: builtin/tag.c:369

4644 msgid "object"

4645 msgstr "objet"

@@ -4353,7 +4765,7 @@ msgstr "La création d'un colis requiert un dépôt."

4765 msgid "Need a repository to unbundle."

4766 msgstr "Le dépaquetage d'un colis requiert un dépôt."

4767

4356 -#: builtin/cat-file.c:428

4768 +#: builtin/cat-file.c:443

4769 msgid ""

4770 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

4771 "<type>|--textconv) <object>"

@@ -4361,58 +4773,58 @@ msgstr ""

4773 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "

4774 "| <type> | --textconv) <objet>"

4775

4364 -#: builtin/cat-file.c:429

4776 +#: builtin/cat-file.c:444

4777 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4778 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4779

4368 -#: builtin/cat-file.c:466

4780 +#: builtin/cat-file.c:481

4781 msgid "<type> can be one of: blob, tree, commit, tag"

4782 msgstr "<type> peut être : blob, tree, commit ou tag"

4783

4372 -#: builtin/cat-file.c:467

4784 +#: builtin/cat-file.c:482

4785 msgid "show object type"

4786 msgstr "afficher le type de l'objet"

4787

4376 -#: builtin/cat-file.c:468

4788 +#: builtin/cat-file.c:483

4789 msgid "show object size"

4790 msgstr "afficher la taille de l'objet"

4791

4380 -#: builtin/cat-file.c:470

4792 +#: builtin/cat-file.c:485

4793 msgid "exit with zero when there's no error"

4794 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"

4795

4384 -#: builtin/cat-file.c:471

4796 +#: builtin/cat-file.c:486

4797 msgid "pretty-print object's content"

4798 msgstr "afficher avec mise en forme le contenu de l'objet"

4799

4388 -#: builtin/cat-file.c:473

4800 +#: builtin/cat-file.c:488

4801 msgid "for blob objects, run textconv on object's content"

4802 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

4803

4392 -#: builtin/cat-file.c:475

4804 +#: builtin/cat-file.c:490

4805 msgid "allow -s and -t to work with broken/corrupt objects"

4806 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"

4807

4396 -#: builtin/cat-file.c:476

4808 +#: builtin/cat-file.c:491

4809 msgid "buffer --batch output"

4810 msgstr "bufferiser la sortie de --batch"

4811

4400 -#: builtin/cat-file.c:478

4812 +#: builtin/cat-file.c:493

4813 msgid "show info and content of objects fed from the standard input"

4814 msgstr ""

4815 "afficher l'information et le contenu des objets passés en entrée standard"

4816

4405 -#: builtin/cat-file.c:481

4817 +#: builtin/cat-file.c:496

4818 msgid "show info about objects fed from the standard input"

4819 msgstr "afficher l'information des objets passés en entrée standard"

4820

4409 -#: builtin/cat-file.c:484

4821 +#: builtin/cat-file.c:499

4822 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

4823 msgstr ""

4824 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"

4825 "batch ou --batch-check)"

4826

4415 -#: builtin/cat-file.c:486

4827 +#: builtin/cat-file.c:501

4828 msgid "show all objects with --batch or --batch-check"

4829 msgstr "montrer tous les objets avec --batch ou --batch-check"

4830

@@ -4441,7 +4853,7 @@ msgid "terminate input and output records by a NUL character"

4853 msgstr ""

4854 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

4855

4444 -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4856 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325

4857 msgid "suppress progress reporting"

4858 msgstr "supprimer l'état d'avancement"

4859

@@ -4533,9 +4945,9 @@ msgid "write the content to temporary files"

4945 msgstr "écrire le contenu dans des fichiers temporaires"

4946

4947 #: builtin/checkout-index.c:174 builtin/column.c:30

4536 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4537 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4538 -#: builtin/submodule--helper.c:774

4948 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491

4949 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497

4950 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469

4951 msgid "string"

4952 msgstr "chaîne"

4953

@@ -4603,10 +5015,6 @@ msgstr ""

5015 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

5016 "même temps."

5017

4606 -#: builtin/checkout.c:279 builtin/checkout.c:473

4607 -msgid "corrupt index file"

4608 -msgstr "fichier d'index corrompu"

4609 -

5018 #: builtin/checkout.c:339 builtin/checkout.c:346

5019 #, c-format

5020 msgid "path '%s' is unmerged"

@@ -4616,50 +5024,50 @@ msgstr "le chemin '%s' n'est pas fusionné"

5024 msgid "you need to resolve your current index first"

5025 msgstr "vous devez d'abord résoudre votre index courant"

5026

4619 -#: builtin/checkout.c:622

5027 +#: builtin/checkout.c:625

5028 #, c-format

5029 msgid "Can not do reflog for '%s': %s\n"

5030 msgstr "Impossible de faire un reflog pour '%s' : %s\n"

5031

4624 -#: builtin/checkout.c:660

5032 +#: builtin/checkout.c:664

5033 msgid "HEAD is now at"

5034 msgstr "HEAD est maintenant sur"

5035

4628 -#: builtin/checkout.c:664 builtin/clone.c:661

5036 +#: builtin/checkout.c:668 builtin/clone.c:661

5037 msgid "unable to update HEAD"

5038 msgstr "impossible de mettre à jour HEAD"

5039

4632 -#: builtin/checkout.c:668

5040 +#: builtin/checkout.c:672

5041 #, c-format

5042 msgid "Reset branch '%s'\n"

5043 msgstr "Remise à zéro de la branche '%s'\n"

5044

4637 -#: builtin/checkout.c:671

5045 +#: builtin/checkout.c:675

5046 #, c-format

5047 msgid "Already on '%s'\n"

5048 msgstr "Déjà sur '%s'\n"

5049

4642 -#: builtin/checkout.c:675

5050 +#: builtin/checkout.c:679

5051 #, c-format

5052 msgid "Switched to and reset branch '%s'\n"

5053 msgstr "Basculement et remise à zéro de la branche '%s'\n"

5054

4647 -#: builtin/checkout.c:677 builtin/checkout.c:1067

5055 +#: builtin/checkout.c:681 builtin/checkout.c:1070

5056 #, c-format

5057 msgid "Switched to a new branch '%s'\n"

5058 msgstr "Basculement sur la nouvelle branche '%s'\n"

5059

4652 -#: builtin/checkout.c:679

5060 +#: builtin/checkout.c:683

5061 #, c-format

5062 msgid "Switched to branch '%s'\n"

5063 msgstr "Basculement sur la branche '%s'\n"

5064

4657 -#: builtin/checkout.c:731

5065 +#: builtin/checkout.c:734

5066 #, c-format

5067 msgid " ... and %d more.\n"

5068 msgstr " ... et %d en plus.\n"

5069

4662 -#: builtin/checkout.c:737

5070 +#: builtin/checkout.c:740

5071 #, c-format

5072 msgid ""

5073 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -4682,7 +5090,7 @@ msgstr[1] ""

5090 "\n"

5091 "%s\n"

5092

4685 -#: builtin/checkout.c:756

5093 +#: builtin/checkout.c:759

5094 #, c-format

5095 msgid ""

5096 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -4711,151 +5119,151 @@ msgstr[1] ""

5119 "git branch <nouvelle-branche> %s\n"

5120 "\n"

5121

4714 -#: builtin/checkout.c:792

5122 +#: builtin/checkout.c:795

5123 msgid "internal error in revision walk"

5124 msgstr "erreur interne lors du parcours des révisions"

5125

4718 -#: builtin/checkout.c:796

5126 +#: builtin/checkout.c:799

5127 msgid "Previous HEAD position was"

5128 msgstr "La position précédente de HEAD était sur"

5129

4722 -#: builtin/checkout.c:823 builtin/checkout.c:1062

5130 +#: builtin/checkout.c:826 builtin/checkout.c:1065

5131 msgid "You are on a branch yet to be born"

5132 msgstr "Vous êtes sur une branche qui doit encore naître"

5133

4726 -#: builtin/checkout.c:968

5134 +#: builtin/checkout.c:971

5135 #, c-format

5136 msgid "only one reference expected, %d given."

5137 msgstr "une seule référence attendue, %d fournies."

5138

4731 -#: builtin/checkout.c:1008 builtin/worktree.c:212

5139 +#: builtin/checkout.c:1011 builtin/worktree.c:214

5140 #, c-format

5141 msgid "invalid reference: %s"

5142 msgstr "référence invalide : %s"

5143

4736 -#: builtin/checkout.c:1037

5144 +#: builtin/checkout.c:1040

5145 #, c-format

5146 msgid "reference is not a tree: %s"

5147 msgstr "la référence n'est pas un arbre : %s"

5148

4741 -#: builtin/checkout.c:1076

5149 +#: builtin/checkout.c:1079

5150 msgid "paths cannot be used with switching branches"

5151 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

5152

4745 -#: builtin/checkout.c:1079 builtin/checkout.c:1083

5153 +#: builtin/checkout.c:1082 builtin/checkout.c:1086

5154 #, c-format

5155 msgid "'%s' cannot be used with switching branches"

5156 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

5157

4750 -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4751 -#: builtin/checkout.c:1098

5158 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098

5159 +#: builtin/checkout.c:1101

5160 #, c-format

5161 msgid "'%s' cannot be used with '%s'"

5162 msgstr "'%s' ne peut pas être utilisé avec '%s'"

5163

4756 -#: builtin/checkout.c:1103

5164 +#: builtin/checkout.c:1106

5165 #, c-format

5166 msgid "Cannot switch branch to a non-commit '%s'"

5167 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

5168

4761 -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4762 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4763 -#: builtin/worktree.c:325

5169 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88

5170 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5171 +#: builtin/worktree.c:326

5172 msgid "branch"

5173 msgstr "branche"

5174

4767 -#: builtin/checkout.c:1137

5175 +#: builtin/checkout.c:1140

5176 msgid "create and checkout a new branch"

5177 msgstr "créer et extraire une nouvelle branche"

5178

4771 -#: builtin/checkout.c:1139

5179 +#: builtin/checkout.c:1142

5180 msgid "create/reset and checkout a branch"

5181 msgstr "créer/réinitialiser et extraire une branche"

5182

4775 -#: builtin/checkout.c:1140

5183 +#: builtin/checkout.c:1143

5184 msgid "create reflog for new branch"

5185 msgstr "créer un reflog pour une nouvelle branche"

5186

4779 -#: builtin/checkout.c:1141

4780 -msgid "detach the HEAD at named commit"

4781 -msgstr "détacher la HEAD à la validation nommée"

5187 +#: builtin/checkout.c:1144 builtin/worktree.c:328

5188 +msgid "detach HEAD at named commit"

5189 +msgstr "détacher la HEAD au commit nommé"

5190

4783 -#: builtin/checkout.c:1142

5191 +#: builtin/checkout.c:1145

5192 msgid "set upstream info for new branch"

5193 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

5194

4787 -#: builtin/checkout.c:1144

5195 +#: builtin/checkout.c:1147

5196 msgid "new-branch"

5197 msgstr "nouvelle branche"

5198

4791 -#: builtin/checkout.c:1144

5199 +#: builtin/checkout.c:1147

5200 msgid "new unparented branch"

5201 msgstr "nouvelle branche sans parent"

5202

4795 -#: builtin/checkout.c:1145

5203 +#: builtin/checkout.c:1148

5204 msgid "checkout our version for unmerged files"

5205 msgstr "extraire notre version pour les fichiers non fusionnés"

5206

4799 -#: builtin/checkout.c:1147

5207 +#: builtin/checkout.c:1150

5208 msgid "checkout their version for unmerged files"

5209 msgstr "extraire leur version pour les fichiers non fusionnés"

5210

4803 -#: builtin/checkout.c:1149

5211 +#: builtin/checkout.c:1152

5212 msgid "force checkout (throw away local modifications)"

5213 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

5214

4807 -#: builtin/checkout.c:1150

5215 +#: builtin/checkout.c:1153

5216 msgid "perform a 3-way merge with the new branch"

5217 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

5218

4811 -#: builtin/checkout.c:1151 builtin/merge.c:230

5219 +#: builtin/checkout.c:1154 builtin/merge.c:231

5220 msgid "update ignored files (default)"

5221 msgstr "mettre à jour les fichiers ignorés (par défaut)"

5222

4815 -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

5223 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250

5224 msgid "style"

5225 msgstr "style"

5226

4819 -#: builtin/checkout.c:1153

5227 +#: builtin/checkout.c:1156

5228 msgid "conflict style (merge or diff3)"

5229 msgstr "style de conflit (merge (fusion) ou diff3)"

5230

4823 -#: builtin/checkout.c:1156

5231 +#: builtin/checkout.c:1159

5232 msgid "do not limit pathspecs to sparse entries only"

5233 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

5234

4827 -#: builtin/checkout.c:1158

5235 +#: builtin/checkout.c:1161

5236 msgid "second guess 'git checkout <no-such-branch>'"

5237 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

5238

4831 -#: builtin/checkout.c:1160

5239 +#: builtin/checkout.c:1163

5240 msgid "do not check if another worktree is holding the given ref"

5241 msgstr ""

5242 "ne pas vérifier si une autre copie de travail contient le référence fournie"

5243

4836 -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4837 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

5244 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117

5245 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536

5246 #: builtin/send-pack.c:168

5247 msgid "force progress reporting"

5248 msgstr "forcer l'affichage de l'état d'avancement"

5249

4842 -#: builtin/checkout.c:1192

5250 +#: builtin/checkout.c:1195

5251 msgid "-b, -B and --orphan are mutually exclusive"

5252 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

5253

4846 -#: builtin/checkout.c:1209

5254 +#: builtin/checkout.c:1212

5255 msgid "--track needs a branch name"

5256 msgstr "--track requiert un nom de branche"

5257

4850 -#: builtin/checkout.c:1214

5258 +#: builtin/checkout.c:1217

5259 msgid "Missing branch name; try -b"

5260 msgstr "Nom de branche manquant ; essayez -b"

5261

4854 -#: builtin/checkout.c:1250

5262 +#: builtin/checkout.c:1253

5263 msgid "invalid path specification"

5264 msgstr "spécification de chemin invalide"

5265

4858 -#: builtin/checkout.c:1257

5266 +#: builtin/checkout.c:1260

5267 #, c-format

5268 msgid ""

5269 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4865,12 +5273,12 @@ msgstr ""

5273 "en même temps.\n"

5274 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

5275

4868 -#: builtin/checkout.c:1262

5276 +#: builtin/checkout.c:1265

5277 #, c-format

5278 msgid "git checkout: --detach does not take a path argument '%s'"

5279 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

5280

4873 -#: builtin/checkout.c:1266

5281 +#: builtin/checkout.c:1269

5282 msgid ""

5283 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

5284 "checking out of the index."

@@ -5023,7 +5431,7 @@ msgid "remove whole directories"

5431 msgstr "supprimer les répertoires entiers"

5432

5433 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

5026 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

5434 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182

5435 msgid "pattern"

5436 msgstr "motif"

5437

@@ -5067,7 +5475,7 @@ msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

5475 msgid "don't create a checkout"

5476 msgstr "ne pas créer d'extraction"

5477

5070 -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5478 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476

5479 msgid "create a bare repository"

5480 msgstr "créer un dépôt nu"

5481

@@ -5095,16 +5503,16 @@ msgstr "initialiser les sous-modules dans le clone"

5503 msgid "number of submodules cloned in parallel"

5504 msgstr "nombre de sous-modules clonés en parallèle"

5505

5098 -#: builtin/clone.c:80 builtin/init-db.c:470

5506 +#: builtin/clone.c:80 builtin/init-db.c:473

5507 msgid "template-directory"

5508 msgstr "répertoire-modèle"

5509

5102 -#: builtin/clone.c:81 builtin/init-db.c:471

5510 +#: builtin/clone.c:81 builtin/init-db.c:474

5511 msgid "directory from which templates will be used"

5512 msgstr "répertoire depuis lequel les modèles vont être utilisés"

5513

5106 -#: builtin/clone.c:83 builtin/submodule--helper.c:498

5107 -#: builtin/submodule--helper.c:777

5514 +#: builtin/clone.c:83 builtin/submodule--helper.c:495

5515 +#: builtin/submodule--helper.c:833

5516 msgid "reference repository"

5517 msgstr "dépôt de référence"

5518

@@ -5128,7 +5536,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

5536 msgid "path to git-upload-pack on the remote"

5537 msgstr "chemin vers git-upload-pack sur le serveur distant"

5538

5131 -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201

5539 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201

5540 msgid "depth"

5541 msgstr "profondeur"

5542

@@ -5144,11 +5552,11 @@ msgstr "cloner seulement une branche, HEAD ou --branch"

5552 msgid "any cloned submodules will be shallow"

5553 msgstr "tous les sous-modules clonés seront superficiels"

5554

5147 -#: builtin/clone.c:98 builtin/init-db.c:479

5555 +#: builtin/clone.c:98 builtin/init-db.c:482

5556 msgid "gitdir"

5557 msgstr "gitdir"

5558

5151 -#: builtin/clone.c:99 builtin/init-db.c:480

5559 +#: builtin/clone.c:99 builtin/init-db.c:483

5560 msgid "separate git dir from working tree"

5561 msgstr "séparer le répertoire git de la copie de travail"

5562

@@ -5160,11 +5568,11 @@ msgstr "clé=valeur"

5568 msgid "set config inside the new repository"

5569 msgstr "régler la configuration dans le nouveau dépôt"

5570

5163 -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5571 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547

5572 msgid "use IPv4 addresses only"

5573 msgstr "n'utiliser que des adresses IPv4"

5574

5167 -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5575 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549

5576 msgid "use IPv6 addresses only"

5577 msgstr "n'utiliser que des adresses IPv6"

5578

@@ -5198,6 +5606,11 @@ msgstr "le dépôt de référence '%s' est superficiel"

5606 msgid "reference repository '%s' is grafted"

5607 msgstr "le dépôt de référence '%s' est greffé"

5608

5609 +#: builtin/clone.c:376

5610 +#, c-format

5611 +msgid "failed to open '%s'"

5612 +msgstr "échec à l'ouverture de '%s'"

5613 +

5614 #: builtin/clone.c:384

5615 #, c-format

5616 msgid "%s exists and is not a directory"

@@ -5218,7 +5631,7 @@ msgstr "échec de la création du lien '%s'"

5631 msgid "failed to copy file to '%s'"

5632 msgstr "échec de la copie vers '%s'"

5633

5221 -#: builtin/clone.c:449 builtin/clone.c:633

5634 +#: builtin/clone.c:449

5635 #, c-format

5636 msgid "done.\n"

5637 msgstr "fait.\n"

@@ -5238,12 +5651,7 @@ msgstr ""

5651 msgid "Could not find remote branch %s to clone."

5652 msgstr "Impossible de trouver la branche distante '%s' à cloner."

5653

5241 -#: builtin/clone.c:628

5242 -#, c-format

5243 -msgid "Checking connectivity... "

5244 -msgstr "Vérification de la connectivité... "

5245 -

5246 -#: builtin/clone.c:631

5654 +#: builtin/clone.c:633

5655 msgid "remote did not send all necessary objects"

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

5657

@@ -5262,101 +5670,101 @@ msgstr ""

5670 msgid "unable to checkout working tree"

5671 msgstr "impossible d'extraire la copie de travail"

5672

5265 -#: builtin/clone.c:767

5673 +#: builtin/clone.c:766

5674 msgid "unable to write parameters to config file"

5675 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"

5676

5269 -#: builtin/clone.c:830

5677 +#: builtin/clone.c:829

5678 msgid "cannot repack to clean up"

5679 msgstr "impossible de remballer pour nettoyer"

5680

5273 -#: builtin/clone.c:832

5681 +#: builtin/clone.c:831

5682 msgid "cannot unlink temporary alternates file"

5683 msgstr "impossible de unlinker le fichier temporaire alternates"

5684

5277 -#: builtin/clone.c:864 builtin/receive-pack.c:1731

5685 +#: builtin/clone.c:863 builtin/receive-pack.c:1855

5686 msgid "Too many arguments."

5687 msgstr "Trop d'arguments."

5688

5281 -#: builtin/clone.c:868

5689 +#: builtin/clone.c:867

5690 msgid "You must specify a repository to clone."

5691 msgstr "Vous devez spécifier un dépôt à cloner."

5692

5285 -#: builtin/clone.c:879

5693 +#: builtin/clone.c:878

5694 #, c-format

5695 msgid "--bare and --origin %s options are incompatible."

5696 msgstr "les options --bare et --origin %s sont incompatibles."

5697

5290 -#: builtin/clone.c:882

5698 +#: builtin/clone.c:881

5699 msgid "--bare and --separate-git-dir are incompatible."

5700 msgstr "--bare et --separate-git-dir sont incompatibles."

5701

5294 -#: builtin/clone.c:895

5702 +#: builtin/clone.c:894

5703 #, c-format

5704 msgid "repository '%s' does not exist"

5705 msgstr "le dépôt '%s' n'existe pas"

5706

5299 -#: builtin/clone.c:901 builtin/fetch.c:1174

5707 +#: builtin/clone.c:900 builtin/fetch.c:1293

5708 #, c-format

5709 msgid "depth %s is not a positive number"

5710 msgstr "la profondeur %s n'est pas un entier positif"

5711

5304 -#: builtin/clone.c:911

5712 +#: builtin/clone.c:910

5713 #, c-format

5714 msgid "destination path '%s' already exists and is not an empty directory."

5715 msgstr ""

5716 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

5717

5310 -#: builtin/clone.c:921

5718 +#: builtin/clone.c:920

5719 #, c-format

5720 msgid "working tree '%s' already exists."

5721 msgstr "la copie de travail '%s' existe déjà."

5722

5315 -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5316 -#: builtin/worktree.c:220 builtin/worktree.c:247

5723 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544

5724 +#: builtin/worktree.c:222 builtin/worktree.c:249

5725 #, c-format

5726 msgid "could not create leading directories of '%s'"

5727 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

5728

5321 -#: builtin/clone.c:939

5729 +#: builtin/clone.c:938

5730 #, c-format

5731 msgid "could not create work tree dir '%s'"

5732 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

5733

5326 -#: builtin/clone.c:957

5734 +#: builtin/clone.c:956

5735 #, c-format

5736 msgid "Cloning into bare repository '%s'...\n"

5737 msgstr "Clonage dans le dépôt nu '%s'\n"

5738

5331 -#: builtin/clone.c:959

5739 +#: builtin/clone.c:958

5740 #, c-format

5741 msgid "Cloning into '%s'...\n"

5742 msgstr "Clonage dans '%s'...\n"

5743

5336 -#: builtin/clone.c:998

5744 +#: builtin/clone.c:997

5745 msgid "--depth is ignored in local clones; use file:// instead."

5746 msgstr ""

5747 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

5748

5341 -#: builtin/clone.c:1001

5749 +#: builtin/clone.c:1000

5750 msgid "source repository is shallow, ignoring --local"

5751 msgstr "le dépôt source est superficiel, option --local ignorée"

5752

5345 -#: builtin/clone.c:1006

5753 +#: builtin/clone.c:1005

5754 msgid "--local is ignored"

5755 msgstr "--local est ignoré"

5756

5349 -#: builtin/clone.c:1010

5757 +#: builtin/clone.c:1009

5758 #, c-format

5759 msgid "Don't know how to clone %s"

5760 msgstr "Je ne sais pas cloner %s"

5761

5354 -#: builtin/clone.c:1059 builtin/clone.c:1067

5762 +#: builtin/clone.c:1058 builtin/clone.c:1066

5763 #, c-format

5764 msgid "Remote branch %s not found in upstream %s"

5765 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

5766

5359 -#: builtin/clone.c:1070

5767 +#: builtin/clone.c:1069

5768 msgid "You appear to have cloned an empty repository."

5769 msgstr "Vous semblez avoir cloné un dépôt vide."

5770

@@ -5499,66 +5907,66 @@ msgstr ""

5907 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

5908 "des commits restants.\n"

5909

5502 -#: builtin/commit.c:307

5910 +#: builtin/commit.c:308

5911 msgid "failed to unpack HEAD tree object"

5912 msgstr "échec du dépaquetage de l'objet arbre HEAD"

5913

5506 -#: builtin/commit.c:348

5914 +#: builtin/commit.c:349

5915 msgid "unable to create temporary index"

5916 msgstr "impossible de créer l'index temporaire"

5917

5510 -#: builtin/commit.c:354

5918 +#: builtin/commit.c:355

5919 msgid "interactive add failed"

5920 msgstr "échec de l'ajout interactif"

5921

5514 -#: builtin/commit.c:367

5922 +#: builtin/commit.c:368

5923 msgid "unable to update temporary index"

5924 msgstr "impossible de mettre à jour l'index temporaire"

5925

5518 -#: builtin/commit.c:369

5926 +#: builtin/commit.c:370

5927 msgid "Failed to update main cache tree"

5928 msgstr "Impossible de mettre à jour l'arbre de cache principal"

5929

5522 -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5930 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466

5931 msgid "unable to write new_index file"

5932 msgstr "impossible d'écrire le fichier new_index"

5933

5526 -#: builtin/commit.c:447

5934 +#: builtin/commit.c:448

5935 msgid "cannot do a partial commit during a merge."

5936 msgstr "impossible de faire une validation partielle pendant une fusion."

5937

5530 -#: builtin/commit.c:449

5938 +#: builtin/commit.c:450

5939 msgid "cannot do a partial commit during a cherry-pick."

5940 msgstr "impossible de faire une validation partielle pendant un picorage."

5941

5534 -#: builtin/commit.c:458

5942 +#: builtin/commit.c:459

5943 msgid "cannot read the index"

5944 msgstr "impossible de lire l'index"

5945

5538 -#: builtin/commit.c:477

5946 +#: builtin/commit.c:478

5947 msgid "unable to write temporary index file"

5948 msgstr "impossible d'écrire le fichier d'index temporaire"

5949

5542 -#: builtin/commit.c:582

5950 +#: builtin/commit.c:583

5951 #, c-format

5952 msgid "commit '%s' lacks author header"

5953 msgstr "entête d'auteur manquant dans le commit '%s'"

5954

5547 -#: builtin/commit.c:584

5955 +#: builtin/commit.c:585

5956 #, c-format

5957 msgid "commit '%s' has malformed author line"

5958 msgstr "le commit '%s' a une ligne d'auteur malformée"

5959

5552 -#: builtin/commit.c:603

5960 +#: builtin/commit.c:604

5961 msgid "malformed --author parameter"

5962 msgstr "paramètre --author mal formé"

5963

5556 -#: builtin/commit.c:611

5964 +#: builtin/commit.c:612

5965 #, c-format

5966 msgid "invalid date format: %s"

5967 msgstr "format de date invalide : %s"

5968

5561 -#: builtin/commit.c:655

5969 +#: builtin/commit.c:656

5970 msgid ""

5971 "unable to select a comment character that is not used\n"

5972 "in the current commit message"

@@ -5566,38 +5974,38 @@ msgstr ""

5974 "impossible de sélectionner un caractère de commentaire\n"

5975 "qui n'est pas utilisé dans le message de validation actuel"

5976

5569 -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5977 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092

5978 #, c-format

5979 msgid "could not lookup commit %s"

5980 msgstr "impossible de rechercher le commit %s"

5981

5574 -#: builtin/commit.c:704 builtin/shortlog.c:285

5982 +#: builtin/commit.c:705 builtin/shortlog.c:286

5983 #, c-format

5984 msgid "(reading log message from standard input)\n"

5985 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

5986

5579 -#: builtin/commit.c:706

5987 +#: builtin/commit.c:707

5988 msgid "could not read log from standard input"

5989 msgstr "impossible de lire le journal depuis l'entrée standard"

5990

5583 -#: builtin/commit.c:710

5991 +#: builtin/commit.c:711

5992 #, c-format

5993 msgid "could not read log file '%s'"

5994 msgstr "impossible de lire le fichier de journal '%s'"

5995

5588 -#: builtin/commit.c:737 builtin/commit.c:745

5996 +#: builtin/commit.c:738 builtin/commit.c:746

5997 msgid "could not read SQUASH_MSG"

5998 msgstr "impossible de lire SQUASH_MSG"

5999

5592 -#: builtin/commit.c:742

6000 +#: builtin/commit.c:743

6001 msgid "could not read MERGE_MSG"

6002 msgstr "impossible de lire MERGE_MSG"

6003

5596 -#: builtin/commit.c:796

6004 +#: builtin/commit.c:797

6005 msgid "could not write commit template"

6006 msgstr "impossible d'écrire le modèle de commit"

6007

5600 -#: builtin/commit.c:814

6008 +#: builtin/commit.c:815

6009 #, c-format

6010 msgid ""

6011 "\n"

@@ -5612,7 +6020,7 @@ msgstr ""

6020 "\t%s\n"

6021 "et essayez à nouveau.\n"

6022

5615 -#: builtin/commit.c:819

6023 +#: builtin/commit.c:820

6024 #, c-format

6025 msgid ""

6026 "\n"

@@ -5627,7 +6035,7 @@ msgstr ""

6035 "\t%s\n"

6036 "et essayez à nouveau.\n"

6037

5630 -#: builtin/commit.c:832

6038 +#: builtin/commit.c:833

6039 #, c-format

6040 msgid ""

6041 "Please enter the commit message for your changes. Lines starting\n"

@@ -5637,7 +6045,7 @@ msgstr ""

6045 "commençant par '%c' seront ignorées, et un message vide abandonne la "

6046 "validation.\n"

6047

5640 -#: builtin/commit.c:839

6048 +#: builtin/commit.c:840

6049 #, c-format

6050 msgid ""

6051 "Please enter the commit message for your changes. Lines starting\n"

@@ -5648,150 +6056,150 @@ msgstr ""

6056 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

6057 "si vous le souhaitez. Un message vide abandonne la validation.\n"

6058

5651 -#: builtin/commit.c:859

6059 +#: builtin/commit.c:860

6060 #, c-format

6061 msgid "%sAuthor: %.*s <%.*s>"

6062 msgstr "%sAuteur : %.*s <%.*s>"

6063

5656 -#: builtin/commit.c:867

6064 +#: builtin/commit.c:868

6065 #, c-format

6066 msgid "%sDate: %s"

6067 msgstr "%sDate : %s"

6068

5661 -#: builtin/commit.c:874

6069 +#: builtin/commit.c:875

6070 #, c-format

6071 msgid "%sCommitter: %.*s <%.*s>"

6072 msgstr "%sValidateur : %.*s <%.*s>"

6073

5666 -#: builtin/commit.c:892

6074 +#: builtin/commit.c:893

6075 msgid "Cannot read index"

6076 msgstr "Impossible de lire l'index"

6077

5670 -#: builtin/commit.c:949

6078 +#: builtin/commit.c:950

6079 msgid "Error building trees"

6080 msgstr "Erreur lors de la construction des arbres"

6081

5674 -#: builtin/commit.c:964 builtin/tag.c:266

6082 +#: builtin/commit.c:965 builtin/tag.c:266

6083 #, c-format

6084 msgid "Please supply the message using either -m or -F option.\n"

6085 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

6086

5679 -#: builtin/commit.c:1066

6087 +#: builtin/commit.c:1067

6088 #, c-format

6089 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

6090 msgstr ""

6091 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

6092 "auteur existant"

6093

5686 -#: builtin/commit.c:1081 builtin/commit.c:1321

6094 +#: builtin/commit.c:1082 builtin/commit.c:1322

6095 #, c-format

6096 msgid "Invalid untracked files mode '%s'"

6097 msgstr "Mode de fichier non suivi invalide '%s'"

6098

5691 -#: builtin/commit.c:1118

6099 +#: builtin/commit.c:1119

6100 msgid "--long and -z are incompatible"

6101 msgstr "--long et -z sont incompatibles"

6102

5695 -#: builtin/commit.c:1148

6103 +#: builtin/commit.c:1149

6104 msgid "Using both --reset-author and --author does not make sense"

6105 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

6106

5699 -#: builtin/commit.c:1157

6107 +#: builtin/commit.c:1158

6108 msgid "You have nothing to amend."

6109 msgstr "Il n'y a rien à corriger."

6110

5703 -#: builtin/commit.c:1160

6111 +#: builtin/commit.c:1161

6112 msgid "You are in the middle of a merge -- cannot amend."

6113 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

6114

5707 -#: builtin/commit.c:1162

6115 +#: builtin/commit.c:1163

6116 msgid "You are in the middle of a cherry-pick -- cannot amend."

6117 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

6118

5711 -#: builtin/commit.c:1165

6119 +#: builtin/commit.c:1166

6120 msgid "Options --squash and --fixup cannot be used together"

6121 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

6122

5715 -#: builtin/commit.c:1175

6123 +#: builtin/commit.c:1176

6124 msgid "Only one of -c/-C/-F/--fixup can be used."

6125 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

6126

5719 -#: builtin/commit.c:1177

6127 +#: builtin/commit.c:1178

6128 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

6129 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

6130

5723 -#: builtin/commit.c:1185

6131 +#: builtin/commit.c:1186

6132 msgid "--reset-author can be used only with -C, -c or --amend."

6133 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

6134

5727 -#: builtin/commit.c:1202

6135 +#: builtin/commit.c:1203

6136 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

6137 msgstr ""

6138 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

6139 "être utilisée."

6140

5733 -#: builtin/commit.c:1204

6141 +#: builtin/commit.c:1205

6142 msgid "No paths with --include/--only does not make sense."

6143 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

6144

5737 -#: builtin/commit.c:1206

6145 +#: builtin/commit.c:1207

6146 msgid "Clever... amending the last one with dirty index."

6147 msgstr "Malin... correction du dernier avec un index sale."

6148

5741 -#: builtin/commit.c:1208

6149 +#: builtin/commit.c:1209

6150 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

6151 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

6152

5745 -#: builtin/commit.c:1220 builtin/tag.c:474

6153 +#: builtin/commit.c:1221 builtin/tag.c:474

6154 #, c-format

6155 msgid "Invalid cleanup mode %s"

6156 msgstr "Mode de nettoyage invalide %s"

6157

5750 -#: builtin/commit.c:1225

6158 +#: builtin/commit.c:1226

6159 msgid "Paths with -a does not make sense."

6160 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

6161

5754 -#: builtin/commit.c:1335 builtin/commit.c:1621

6162 +#: builtin/commit.c:1336 builtin/commit.c:1622

6163 msgid "show status concisely"

6164 msgstr "afficher le statut avec concision"

6165

5758 -#: builtin/commit.c:1337 builtin/commit.c:1623

6166 +#: builtin/commit.c:1338 builtin/commit.c:1624

6167 msgid "show branch information"

6168 msgstr "afficher l'information de branche"

6169

5762 -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5763 -#: builtin/worktree.c:437

6170 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522

6171 +#: builtin/worktree.c:440

6172 msgid "machine-readable output"

6173 msgstr "sortie pour traitement automatique"

6174

5767 -#: builtin/commit.c:1342 builtin/commit.c:1627

6175 +#: builtin/commit.c:1343 builtin/commit.c:1628

6176 msgid "show status in long format (default)"

6177 msgstr "afficher le statut en format long (par défaut)"

6178

5771 -#: builtin/commit.c:1345 builtin/commit.c:1630

6179 +#: builtin/commit.c:1346 builtin/commit.c:1631

6180 msgid "terminate entries with NUL"

6181 msgstr "terminer les éléments par NUL"

6182

5775 -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

6183 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981

6184 #: builtin/fast-export.c:984 builtin/tag.c:353

6185 msgid "mode"

6186 msgstr "mode"

6187

5780 -#: builtin/commit.c:1348 builtin/commit.c:1633

6188 +#: builtin/commit.c:1349 builtin/commit.c:1634

6189 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6190 msgstr ""

6191 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

6192 "no. (Défaut : all)"

6193

5786 -#: builtin/commit.c:1351

6194 +#: builtin/commit.c:1352

6195 msgid "show ignored files"

6196 msgstr "afficher les fichiers ignorés"

6197

5790 -#: builtin/commit.c:1352 parse-options.h:155

6198 +#: builtin/commit.c:1353 parse-options.h:155

6199 msgid "when"

6200 msgstr "quand"

6201

5794 -#: builtin/commit.c:1353

6202 +#: builtin/commit.c:1354

6203 msgid ""

6204 "ignore changes to submodules, optional when: all, dirty, untracked. "

6205 "(Default: all)"

@@ -5799,201 +6207,201 @@ msgstr ""

6207 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

6208 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

6209

5802 -#: builtin/commit.c:1355

6210 +#: builtin/commit.c:1356

6211 msgid "list untracked files in columns"

6212 msgstr "afficher les fichiers non suivis en colonnes"

6213

5806 -#: builtin/commit.c:1441

6214 +#: builtin/commit.c:1442

6215 msgid "couldn't look up newly created commit"

6216 msgstr "impossible de retrouver le commit nouvellement créé"

6217

5810 -#: builtin/commit.c:1443

6218 +#: builtin/commit.c:1444

6219 msgid "could not parse newly created commit"

6220 msgstr "impossible d'analyser le commit nouvellement créé"

6221

5814 -#: builtin/commit.c:1488

6222 +#: builtin/commit.c:1489

6223 msgid "detached HEAD"

6224 msgstr "HEAD détachée"

6225

5818 -#: builtin/commit.c:1491

6226 +#: builtin/commit.c:1492

6227 msgid " (root-commit)"

6228 msgstr " (commit racine)"

6229

5822 -#: builtin/commit.c:1591

6230 +#: builtin/commit.c:1592

6231 msgid "suppress summary after successful commit"

6232 msgstr "supprimer le résumé après une validation réussie"

6233

5826 -#: builtin/commit.c:1592

6234 +#: builtin/commit.c:1593

6235 msgid "show diff in commit message template"

6236 msgstr "afficher les diff dans le modèle de message de validation"

6237

5830 -#: builtin/commit.c:1594

6238 +#: builtin/commit.c:1595

6239 msgid "Commit message options"

6240 msgstr "Options du message de validation"

6241

5834 -#: builtin/commit.c:1595 builtin/tag.c:351

6242 +#: builtin/commit.c:1596 builtin/tag.c:351

6243 msgid "read message from file"

6244 msgstr "lire le message depuis un fichier"

6245

5838 -#: builtin/commit.c:1596

6246 +#: builtin/commit.c:1597

6247 msgid "author"

6248 msgstr "auteur"

6249

5842 -#: builtin/commit.c:1596

6250 +#: builtin/commit.c:1597

6251 msgid "override author for commit"

6252 msgstr "remplacer l'auteur pour la validation"

6253

5846 -#: builtin/commit.c:1597 builtin/gc.c:326

6254 +#: builtin/commit.c:1598 builtin/gc.c:326

6255 msgid "date"

l10n: fr.po v2.10.0-rc2