48fd05399b · matheusbsbs/matheus-bagliano

@@ -59,6 +59,7 @@

59 # shallow | superficiel

60 # shell | interpréteur de commandes

61 # sparse | clairsemé

62 +# split (index) | index scindé

63 # stash | remisage

64 # to stash | remiser

65 # tag | étiquette

@@ -77,8 +78,8 @@ msgid ""

78 msgstr ""

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

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

80 -"POT-Creation-Date: 2022-01-17 08:34+0800\n"

81 -"PO-Revision-Date: 2022-01-12 21:11+0100\n"

81 +"POT-Creation-Date: 2022-04-06 14:40+0800\n"

82 +"PO-Revision-Date: 2022-04-09 18:50+0200\n"

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

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

85 "Language: fr\n"

@@ -88,216 +89,215 @@ msgstr ""

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

90 "X-Generator: Poedit 3.0.1\n"

91

91 -#: add-interactive.c:380

92 +#: add-interactive.c:382

93 #, c-format

94 msgid "Huh (%s)?"

95 msgstr "Hein (%s) ?"

96

96 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509

97 -#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233

98 -#: builtin/rebase.c:1642

97 +#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505

98 +#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261

99 +#: builtin/rebase.c:1671

100 msgid "could not read index"

101 msgstr "impossible de lire l'index"

102

102 -#: add-interactive.c:588 git-add--interactive.perl:269

103 +#: add-interactive.c:590 git-add--interactive.perl:269

104 #: git-add--interactive.perl:294

105 msgid "binary"

106 msgstr "binaire"

107

107 -#: add-interactive.c:646 git-add--interactive.perl:278

108 +#: add-interactive.c:648 git-add--interactive.perl:278

109 #: git-add--interactive.perl:332

110 msgid "nothing"

111 msgstr "rien"

112

112 -#: add-interactive.c:647 git-add--interactive.perl:314

113 +#: add-interactive.c:649 git-add--interactive.perl:314

114 #: git-add--interactive.perl:329

115 msgid "unchanged"

116 msgstr "inchangé"

117

117 -#: add-interactive.c:684 git-add--interactive.perl:641

118 +#: add-interactive.c:686 git-add--interactive.perl:641

119 msgid "Update"

120 msgstr "Mise à jour"

121

121 -#: add-interactive.c:701 add-interactive.c:889

122 +#: add-interactive.c:703 add-interactive.c:891

123 #, c-format

124 msgid "could not stage '%s'"

125 msgstr "impossible d'indexer '%s'"

126

126 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713

127 +#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709

128 msgid "could not write index"

129 msgstr "impossible d'écrire l'index"

130

130 -#: add-interactive.c:710 git-add--interactive.perl:626

131 +#: add-interactive.c:712 git-add--interactive.perl:626

132 #, c-format, perl-format

133 msgid "updated %d path\n"

134 msgid_plural "updated %d paths\n"

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

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

137

137 -#: add-interactive.c:728 git-add--interactive.perl:676

138 +#: add-interactive.c:730 git-add--interactive.perl:676

139 #, c-format, perl-format

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

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

142

142 -#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306

143 +#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311

144 #: builtin/reset.c:167

145 #, c-format

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

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

148

148 -#: add-interactive.c:763 git-add--interactive.perl:653

149 +#: add-interactive.c:765 git-add--interactive.perl:653

150 msgid "Revert"

151 msgstr "Inverser"

152

152 -#: add-interactive.c:779

153 +#: add-interactive.c:781

154 msgid "Could not parse HEAD^{tree}"

155 msgstr "Impossible d'analyser HEAD^{tree}"

156

156 -#: add-interactive.c:817 git-add--interactive.perl:629

157 +#: add-interactive.c:819 git-add--interactive.perl:629

158 #, c-format, perl-format

159 msgid "reverted %d path\n"

160 msgid_plural "reverted %d paths\n"

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

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

163

163 -#: add-interactive.c:868 git-add--interactive.perl:693

164 +#: add-interactive.c:870 git-add--interactive.perl:693

165 #, c-format

166 msgid "No untracked files.\n"

167 msgstr "Aucun Fichier non suivi.\n"

168

168 -#: add-interactive.c:872 git-add--interactive.perl:687

169 +#: add-interactive.c:874 git-add--interactive.perl:687

170 msgid "Add untracked"

171 msgstr "Ajouter un fichier non-suivi"

172

172 -#: add-interactive.c:899 git-add--interactive.perl:623

173 +#: add-interactive.c:901 git-add--interactive.perl:623

174 #, c-format, perl-format

175 msgid "added %d path\n"

176 msgid_plural "added %d paths\n"

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

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

179

179 -#: add-interactive.c:929

180 +#: add-interactive.c:931

181 #, c-format

182 msgid "ignoring unmerged: %s"

183 msgstr "fichier non-fusionné ignoré : %s"

184

184 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371

185 +#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371

186 #, c-format

187 msgid "Only binary files changed.\n"

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

189

189 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373

190 +#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373

191 #, c-format

192 msgid "No changes.\n"

193 msgstr "Aucune modification.\n"

194

194 -#: add-interactive.c:947 git-add--interactive.perl:1381

195 +#: add-interactive.c:949 git-add--interactive.perl:1381

196 msgid "Patch update"

197 msgstr "Mise à jour par patch"

198

198 -#: add-interactive.c:986 git-add--interactive.perl:1794

199 +#: add-interactive.c:988 git-add--interactive.perl:1794

200 msgid "Review diff"

201 msgstr "Réviser la différence"

202

202 -#: add-interactive.c:1014

203 +#: add-interactive.c:1016

204 msgid "show paths with changes"

205 msgstr "afficher les chemins comprenant des modifications"

206

206 -#: add-interactive.c:1016

207 +#: add-interactive.c:1018

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

209 msgstr ""

210 "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"

211

211 -#: add-interactive.c:1018

212 +#: add-interactive.c:1020

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

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

215

215 -#: add-interactive.c:1020

216 +#: add-interactive.c:1022

217 msgid "pick hunks and update selectively"

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

219

219 -#: add-interactive.c:1022

220 +#: add-interactive.c:1024

221 msgid "view diff between HEAD and index"

222 msgstr "visualiser les diffs entre HEAD et l'index"

223

223 -#: add-interactive.c:1024

224 +#: add-interactive.c:1026

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

226 msgstr ""

227 "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications "

228 "indexées"

229

229 -#: add-interactive.c:1032 add-interactive.c:1081

230 +#: add-interactive.c:1034 add-interactive.c:1083

231 msgid "Prompt help:"

232 msgstr "Aide :"

233

233 -#: add-interactive.c:1034

234 +#: add-interactive.c:1036

235 msgid "select a single item"

236 msgstr "sélectionner un seul élément"

237

237 -#: add-interactive.c:1036

238 +#: add-interactive.c:1038

239 msgid "select a range of items"

240 msgstr "sélectionner une plage d'éléments"

241

241 -#: add-interactive.c:1038

242 +#: add-interactive.c:1040

243 msgid "select multiple ranges"

244 msgstr "sélectionner plusieurs plages"

245

245 -#: add-interactive.c:1040 add-interactive.c:1085

246 +#: add-interactive.c:1042 add-interactive.c:1087

247 msgid "select item based on unique prefix"

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

249

249 -#: add-interactive.c:1042

250 +#: add-interactive.c:1044

251 msgid "unselect specified items"

252 msgstr "désélectionner les éléments spécifiés"

253

253 -#: add-interactive.c:1044

254 +#: add-interactive.c:1046

255 msgid "choose all items"

256 msgstr "choisir tous les éléments"

257

257 -#: add-interactive.c:1046

258 +#: add-interactive.c:1048

259 msgid "(empty) finish selecting"

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

261

261 -#: add-interactive.c:1083

262 +#: add-interactive.c:1085

263 msgid "select a numbered item"

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

265

265 -#: add-interactive.c:1087

266 +#: add-interactive.c:1089

267 msgid "(empty) select nothing"

268 msgstr "(vide) ne rien sélectionner"

269

269 -#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898

270 +#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898

271 msgid "*** Commands ***"

272 msgstr "*** Commandes ***"

273

273 -#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895

274 +#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895

275 msgid "What now"

276 msgstr "Et maintenant"

277

277 -#: add-interactive.c:1148 git-add--interactive.perl:213

278 +#: add-interactive.c:1150 git-add--interactive.perl:213

279 msgid "staged"

280 msgstr "indexé"

281

281 -#: add-interactive.c:1148 git-add--interactive.perl:213

282 +#: add-interactive.c:1150 git-add--interactive.perl:213

283 msgid "unstaged"

284 msgstr "non-indexé"

285

285 -#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367

286 -#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128

287 -#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194

288 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858

289 -#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504

290 -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574

291 -#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812

286 +#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370

287 +#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132

288 +#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194

289 +#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872

290 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709

291 +#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891

292 #: git-add--interactive.perl:213

293 msgid "path"

294 msgstr "chemin"

295

296 -#: add-interactive.c:1155

296 +#: add-interactive.c:1157

297 msgid "could not refresh index"

298 msgstr "impossible de rafraîchir l'index"

299

300 -#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805

300 +#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805

301 #, c-format

302 msgid "Bye.\n"

303 msgstr "Au revoir.\n"

@@ -556,15 +556,15 @@ msgstr ""

556 #, c-format, perl-format

557 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

558 msgstr ""

559 -"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"

560 -"%s,?] ? "

559 +"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"

560 +"d%s,?] ? "

561

562 #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

563 #, c-format, perl-format

564 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

565 msgstr ""

566 -"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"

567 -"%s,?] ? "

566 +"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,"

567 +"d%s,?] ? "

568

569 #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

570 #, c-format, perl-format

@@ -616,24 +616,24 @@ msgstr "impossible d'analyser l'entête de section '%.*s'"

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

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

618

619 -#: add-patch.c:420

619 +#: add-patch.c:431

620 msgid "could not parse diff"

621 msgstr "impossible d'analyser la diff"

622

623 -#: add-patch.c:439

623 +#: add-patch.c:450

624 msgid "could not parse colored diff"

625 msgstr "impossible d'analyser la diff colorée"

626

627 -#: add-patch.c:453

627 +#: add-patch.c:464

628 #, c-format

629 msgid "failed to run '%s'"

630 msgstr "échec pour lancer '%s'"

631

632 -#: add-patch.c:612

632 +#: add-patch.c:618

633 msgid "mismatched output from interactive.diffFilter"

634 msgstr "sortie sans correspondance depuis interactive.diffFilter"

635

636 -#: add-patch.c:613

636 +#: add-patch.c:619

637 msgid ""

638 "Your filter must maintain a one-to-one correspondence\n"

639 "between its input and output lines."

@@ -641,7 +641,7 @@ msgstr ""

641 "Votre filtre doit maintenir une correspondance un-pour-un\n"

642 "entre les lignes en entrée et en sortie."

643

644 -#: add-patch.c:791

644 +#: add-patch.c:797

645 #, c-format

646 msgid ""

647 "expected context line #%d in\n"

@@ -650,7 +650,7 @@ msgstr ""

650 "ligne de contexte attendue #%d dans\n"

651 "%.*s"

652

653 -#: add-patch.c:806

653 +#: add-patch.c:812

654 #, c-format

655 msgid ""

656 "hunks do not overlap:\n"

@@ -663,12 +663,12 @@ msgstr ""

663 "\tne se termine pas par :\n"

664 "%.*s"

665

666 -#: add-patch.c:1082 git-add--interactive.perl:1115

666 +#: add-patch.c:1088 git-add--interactive.perl:1115

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

668 msgstr ""

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

670

671 -#: add-patch.c:1086

671 +#: add-patch.c:1092

672 #, c-format

673 msgid ""

674 "---\n"

@@ -682,7 +682,7 @@ msgstr ""

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

683

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

685 -#: add-patch.c:1100 git-add--interactive.perl:1129

685 +#: add-patch.c:1106 git-add--interactive.perl:1129

686 msgid ""

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

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

@@ -692,11 +692,11 @@ msgstr ""

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

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

694

695 -#: add-patch.c:1133

695 +#: add-patch.c:1139

696 msgid "could not parse hunk header"

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

698

699 -#: add-patch.c:1178

699 +#: add-patch.c:1184

700 msgid "'git apply --cached' failed"

701 msgstr "'git apply --cached' a échoué"

702

@@ -712,26 +712,26 @@ msgstr "'git apply --cached' a échoué"

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

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

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

715 -#: add-patch.c:1247 git-add--interactive.perl:1244

715 +#: add-patch.c:1253 git-add--interactive.perl:1244

716 msgid ""

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

718 msgstr ""

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

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

721

722 -#: add-patch.c:1290

722 +#: add-patch.c:1296

723 msgid "The selected hunks do not apply to the index!"

724 msgstr "Les sections sélectionnées ne s'applique pas à l'index !"

725

726 -#: add-patch.c:1291 git-add--interactive.perl:1348

726 +#: add-patch.c:1297 git-add--interactive.perl:1348

727 msgid "Apply them to the worktree anyway? "

728 msgstr "Les appliquer quand même à l'arbre de travail ? "

729

730 -#: add-patch.c:1298 git-add--interactive.perl:1351

730 +#: add-patch.c:1304 git-add--interactive.perl:1351

731 msgid "Nothing was applied.\n"

732 msgstr "Rien n'a été appliqué.\n"

733

734 -#: add-patch.c:1355

734 +#: add-patch.c:1361

735 msgid ""

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

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

@@ -753,73 +753,73 @@ msgstr ""

753 "e - éditer manuellement la section actuelle\n"

754 "? - afficher l'aide\n"

755

756 -#: add-patch.c:1517 add-patch.c:1527

756 +#: add-patch.c:1523 add-patch.c:1533

757 msgid "No previous hunk"

758 msgstr "Pas de section précédente"

759

760 -#: add-patch.c:1522 add-patch.c:1532

760 +#: add-patch.c:1528 add-patch.c:1538

761 msgid "No next hunk"

762 msgstr "Pas de section suivante"

763

764 -#: add-patch.c:1538

764 +#: add-patch.c:1544

765 msgid "No other hunks to goto"

766 msgstr "Aucune autre section à atteindre"

767

768 -#: add-patch.c:1549 git-add--interactive.perl:1608

768 +#: add-patch.c:1555 git-add--interactive.perl:1608

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

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

771

772 -#: add-patch.c:1550 git-add--interactive.perl:1610

772 +#: add-patch.c:1556 git-add--interactive.perl:1610

773 msgid "go to which hunk? "

774 msgstr "aller à quelle section ? "

775

776 -#: add-patch.c:1561

776 +#: add-patch.c:1567

777 #, c-format

778 msgid "Invalid number: '%s'"

779 msgstr "Numéro invalide : '%s'"

780

781 -#: add-patch.c:1566

781 +#: add-patch.c:1572

782 #, c-format

783 msgid "Sorry, only %d hunk available."

784 msgid_plural "Sorry, only %d hunks available."

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

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

787

788 -#: add-patch.c:1575

788 +#: add-patch.c:1581

789 msgid "No other hunks to search"

790 msgstr "Aucune autre section à rechercher"

791

792 -#: add-patch.c:1581 git-add--interactive.perl:1663

792 +#: add-patch.c:1587 git-add--interactive.perl:1663

793 msgid "search for regex? "

794 msgstr "rechercher la regex ? "

795

796 -#: add-patch.c:1596

796 +#: add-patch.c:1602

797 #, c-format

798 msgid "Malformed search regexp %s: %s"

799 msgstr "Regex de recherche malformée %s : %s"

800

801 -#: add-patch.c:1613

801 +#: add-patch.c:1619

802 msgid "No hunk matches the given pattern"

803 msgstr "Aucune section ne correspond au motif donné"

804

805 -#: add-patch.c:1620

805 +#: add-patch.c:1626

806 msgid "Sorry, cannot split this hunk"

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

808

809 -#: add-patch.c:1624

809 +#: add-patch.c:1630

810 #, c-format

811 msgid "Split into %d hunks."

812 msgstr "Découpée en %d sections."

813

814 -#: add-patch.c:1628

814 +#: add-patch.c:1634

815 msgid "Sorry, cannot edit this hunk"

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

817

818 -#: add-patch.c:1680

818 +#: add-patch.c:1686

819 msgid "'git apply' failed"

820 msgstr "'git apply' a échoué"

821

822 -#: advice.c:78

822 +#: advice.c:81

823 #, c-format

824 msgid ""

825 "\n"

@@ -828,37 +828,37 @@ msgstr ""

828 "\n"

829 "Désactivez ce message avec \"git config advice.%s false\""

830

831 -#: advice.c:94

831 +#: advice.c:97

832 #, c-format

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

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

835

836 -#: advice.c:178

836 +#: advice.c:181

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

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

839

840 -#: advice.c:180

840 +#: advice.c:183

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

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

843

844 -#: advice.c:182

844 +#: advice.c:185

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

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

847

848 -#: advice.c:184

848 +#: advice.c:187

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

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

851

852 -#: advice.c:186

852 +#: advice.c:189

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

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

855

856 -#: advice.c:188

856 +#: advice.c:191

857 #, c-format

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

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

860

861 -#: advice.c:196

861 +#: advice.c:199

862 msgid ""

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

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

@@ -866,27 +866,27 @@ msgstr ""

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

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

868

869 -#: advice.c:204

869 +#: advice.c:207

870 msgid "Exiting because of an unresolved conflict."

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

872

873 -#: advice.c:209 builtin/merge.c:1382

873 +#: advice.c:212 builtin/merge.c:1388

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

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

876

877 -#: advice.c:211

877 +#: advice.c:214

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

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

880

881 -#: advice.c:212

881 +#: advice.c:215

882 msgid "Exiting because of unfinished merge."

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

884

885 -#: advice.c:217

885 +#: advice.c:220

886 msgid "Not possible to fast-forward, aborting."

887 msgstr "Pas possible d'avancer rapidement, abandon."

888

889 -#: advice.c:227

889 +#: advice.c:230

890 #, c-format

891 msgid ""

892 "The following paths and/or pathspecs matched paths that exist\n"

@@ -898,7 +898,7 @@ msgstr ""

898 "qui existent hors de votre définition d'extraction clairsemée, et ne seront\n"

899 "donc pas mis à jour dans l'index :\n"

900

901 -#: advice.c:234

901 +#: advice.c:237

902 msgid ""

903 "If you intend to update such entries, try one of the following:\n"

904 "* Use the --sparse option.\n"

@@ -908,7 +908,7 @@ msgstr ""

908 "* d'utiliser l'option --sparse,\n"

909 "* de désactiver ou modifier les règles de choix clairsemé."

910

911 -#: advice.c:242

911 +#: advice.c:245

912 #, c-format

913 msgid ""

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

@@ -971,87 +971,90 @@ msgstr "option d'espace non reconnue '%s'"

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

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

973

974 -#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307

975 -#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870

976 -#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885

977 -#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541

978 -#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470

979 -#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757

980 -#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361

981 -#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155

982 -#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038

983 -#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560

984 -#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778

985 -#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073

986 -#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

987 -#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199

988 -#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426

989 -#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710

990 -#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316

991 -#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572

992 -#: builtin/worktree.c:702

974 +#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555

975 +#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332

976 +#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907

977 +#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509

978 +#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755

979 +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663

980 +#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921

981 +#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200

982 +#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593

983 +#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245

984 +#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167

985 +#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560

986 +#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778

987 +#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409

988 +#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592

989 +#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

990 +#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227

991 +#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433

992 +#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711

993 +#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328

994 +#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573

995 +#: builtin/worktree.c:779

996 #, c-format

997 msgid "options '%s' and '%s' cannot be used together"

998 msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"

999

997 -#: apply.c:139 apply.c:150 apply.c:153

1000 +#: apply.c:141 apply.c:152 apply.c:155

1001 #, c-format

1002 msgid "'%s' outside a repository"

1003 msgstr "'%s' hors d'un dépôt"

1004

1002 -#: apply.c:800

1005 +#: apply.c:807

1006 #, c-format

1007 msgid "Cannot prepare timestamp regexp %s"

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

1009

1007 -#: apply.c:809

1010 +#: apply.c:816

1011 #, c-format

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

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

1014

1012 -#: apply.c:883

1015 +#: apply.c:890

1016 #, c-format

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

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

1019

1017 -#: apply.c:921

1020 +#: apply.c:928

1021 #, c-format

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

1023 msgstr ""

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

1025 "ligne %d"

1026

1024 -#: apply.c:927

1027 +#: apply.c:934

1028 #, c-format

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

1030 msgstr ""

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

1032 "à la ligne %d"

1033

1031 -#: apply.c:928

1034 +#: apply.c:935

1035 #, c-format

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

1037 msgstr ""

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

1039 "à la ligne %d"

1040

1038 -#: apply.c:933

1041 +#: apply.c:940

1042 #, c-format

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

1044 msgstr ""

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

1046

1044 -#: apply.c:962

1047 +#: apply.c:969

1048 #, c-format

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

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

1051

1049 -#: apply.c:1281

1052 +#: apply.c:1288

1053 #, c-format

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

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

1056

1054 -#: apply.c:1371

1057 +#: apply.c:1378

1058 #, c-format

1059 msgid ""

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

@@ -1066,93 +1069,93 @@ msgstr[1] ""

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

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

1071

1069 -#: apply.c:1384

1072 +#: apply.c:1391

1073 #, c-format

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

1075 msgstr ""

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

1077

1075 -#: apply.c:1480

1078 +#: apply.c:1487

1079 #, c-format

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

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

1082

1080 -#: apply.c:1549

1083 +#: apply.c:1556

1084 #, c-format

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

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

1087

1085 -#: apply.c:1752

1088 +#: apply.c:1759

1089 msgid "new file depends on old contents"

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

1091

1089 -#: apply.c:1754

1092 +#: apply.c:1761

1093 msgid "deleted file still has contents"

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

1095

1093 -#: apply.c:1788

1096 +#: apply.c:1795

1097 #, c-format

1098 msgid "corrupt patch at line %d"

1099 msgstr "patch corrompu à la ligne %d"

1100

1098 -#: apply.c:1825

1101 +#: apply.c:1832

1102 #, c-format

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

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

1105

1103 -#: apply.c:1827

1106 +#: apply.c:1834

1107 #, c-format

1108 msgid "deleted file %s still has contents"

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

1110

1108 -#: apply.c:1830

1111 +#: apply.c:1837

1112 #, c-format

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

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

1115

1113 -#: apply.c:1978

1116 +#: apply.c:1985

1117 #, c-format

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

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

1120

1118 -#: apply.c:2015

1121 +#: apply.c:2022

1122 #, c-format

1123 msgid "unrecognized binary patch at line %d"

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

1125

1123 -#: apply.c:2177

1126 +#: apply.c:2184

1127 #, c-format

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

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

1130

1128 -#: apply.c:2263

1131 +#: apply.c:2270

1132 #, c-format

1133 msgid "unable to read symlink %s"

1134 msgstr "lecture du lien symbolique %s impossible"

1135

1133 -#: apply.c:2267

1136 +#: apply.c:2274

1137 #, c-format

1138 msgid "unable to open or read %s"

1139 msgstr "ouverture ou lecture de %s impossible"

1140

1138 -#: apply.c:2936

1141 +#: apply.c:2943

1142 #, c-format

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

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

1145

1143 -#: apply.c:3057

1146 +#: apply.c:3064

1147 #, c-format

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

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

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

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

1152

1150 -#: apply.c:3069

1153 +#: apply.c:3076

1154 #, c-format

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

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

1157

1155 -#: apply.c:3075

1158 +#: apply.c:3082

1159 #, c-format

1160 msgid ""

1161 "while searching for:\n"

@@ -1161,464 +1164,464 @@ msgstr ""

1164 "pendant la recherche de :\n"

1165 "%.*s"

1166

1164 -#: apply.c:3097

1167 +#: apply.c:3104

1168 #, c-format

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

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

1171

1169 -#: apply.c:3105

1172 +#: apply.c:3112

1173 #, c-format

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

1175 msgstr ""

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

1177 "inverse"

1178

1176 -#: apply.c:3152

1179 +#: apply.c:3159

1180 #, c-format

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

1182 msgstr ""

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

1184

1182 -#: apply.c:3163

1185 +#: apply.c:3170

1186 #, c-format

1187 msgid ""

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

1189 msgstr ""

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

1191

1189 -#: apply.c:3171

1192 +#: apply.c:3178

1193 #, c-format

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

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

1196

1194 -#: apply.c:3189

1197 +#: apply.c:3196

1198 #, c-format

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

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

1201

1199 -#: apply.c:3202

1202 +#: apply.c:3209

1203 #, c-format

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

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

1206

1204 -#: apply.c:3209

1207 +#: apply.c:3216

1208 #, c-format

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

1210 msgstr ""

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

1212 "trouvé)"

1213

1211 -#: apply.c:3230

1214 +#: apply.c:3237

1215 #, c-format

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

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

1218

1216 -#: apply.c:3353

1219 +#: apply.c:3360

1220 #, c-format

1221 msgid "cannot checkout %s"

1222 msgstr "extraction de %s impossible"

1223

1221 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214

1224 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214

1225 #: setup.c:309

1226 #, c-format

1227 msgid "failed to read %s"

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

1229

1227 -#: apply.c:3413

1230 +#: apply.c:3420

1231 #, c-format

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

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

1234

1232 -#: apply.c:3442 apply.c:3711

1235 +#: apply.c:3449 apply.c:3721

1236 #, c-format

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

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

1239

1237 -#: apply.c:3549 apply.c:3726

1240 +#: apply.c:3559 apply.c:3736

1241 #, c-format

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

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

1244

1242 -#: apply.c:3558 apply.c:3734 apply.c:3978

1245 +#: apply.c:3568 apply.c:3744 apply.c:3960

1246 #, c-format

1247 msgid "%s: does not match index"

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

1249

1247 -#: apply.c:3595

1250 +#: apply.c:3605

1251 msgid "repository lacks the necessary blob to perform 3-way merge."

1252 msgstr ""

1253 "le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."

1254

1252 -#: apply.c:3598

1255 +#: apply.c:3608

1256 #, c-format

1257 msgid "Performing three-way merge...\n"

1258 msgstr "Application d'une fusion à 3 points…\n"

1259

1257 -#: apply.c:3614 apply.c:3618

1260 +#: apply.c:3624 apply.c:3628

1261 #, c-format

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

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

1264

1262 -#: apply.c:3630

1265 +#: apply.c:3640

1266 #, c-format

1267 msgid "Failed to perform three-way merge...\n"

1268 msgstr "Échec de l'application de la fusion à 3 points…\n"

1269

1267 -#: apply.c:3644

1270 +#: apply.c:3654

1271 #, c-format

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

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

1274

1272 -#: apply.c:3649

1275 +#: apply.c:3659

1276 #, c-format

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

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

1279

1277 -#: apply.c:3666

1280 +#: apply.c:3676

1281 #, c-format

1282 msgid "Falling back to direct application...\n"

1283 msgstr "Retour à une application directe…\n"

1284

1282 -#: apply.c:3678

1285 +#: apply.c:3688

1286 msgid "removal patch leaves file contents"

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

1288

1286 -#: apply.c:3751

1289 +#: apply.c:3761

1290 #, c-format

1291 msgid "%s: wrong type"

1292 msgstr "%s : type erroné"

1293

1291 -#: apply.c:3753

1294 +#: apply.c:3763

1295 #, c-format

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

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

1298

1296 -#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918

1297 -#: read-cache.c:1381

1299 +#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932

1300 +#: read-cache.c:1399

1301 #, c-format

1302 msgid "invalid path '%s'"

1303 msgstr "chemin invalide '%s'"

1304

1302 -#: apply.c:3976

1305 +#: apply.c:3958

1306 #, c-format

1307 msgid "%s: already exists in index"

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

1309

1307 -#: apply.c:3980

1310 +#: apply.c:3962

1311 #, c-format

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

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

1314

1312 -#: apply.c:4000

1315 +#: apply.c:3982

1316 #, c-format

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

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

1319

1317 -#: apply.c:4005

1320 +#: apply.c:3987

1321 #, c-format

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

1323 msgstr ""

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

1325

1323 -#: apply.c:4025

1326 +#: apply.c:4007

1327 #, c-format

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

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

1330

1328 -#: apply.c:4029

1331 +#: apply.c:4011

1332 #, c-format

1333 msgid "%s: patch does not apply"

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

1335

1333 -#: apply.c:4044

1336 +#: apply.c:4026

1337 #, c-format

1338 msgid "Checking patch %s..."

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

1340

1338 -#: apply.c:4136

1341 +#: apply.c:4118

1342 #, c-format

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

1344 msgstr ""

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

1346

1344 -#: apply.c:4143

1347 +#: apply.c:4125

1348 #, c-format

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

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

1351

1349 -#: apply.c:4146

1352 +#: apply.c:4128

1353 #, c-format

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

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

1356

1354 -#: apply.c:4155

1357 +#: apply.c:4137

1358 #, c-format

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

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

1361

1359 -#: apply.c:4165

1362 +#: apply.c:4147

1363 #, c-format

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

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

1366

1364 -#: apply.c:4303

1367 +#: apply.c:4285

1368 #, c-format

1369 msgid "unable to remove %s from index"

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

1371

1369 -#: apply.c:4337

1372 +#: apply.c:4319

1373 #, c-format

1374 msgid "corrupt patch for submodule %s"

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

1376

1374 -#: apply.c:4343

1377 +#: apply.c:4325

1378 #, c-format

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

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

1381

1379 -#: apply.c:4351

1382 +#: apply.c:4333

1383 #, c-format

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

1385 msgstr ""

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

1387 "impossible"

1388

1386 -#: apply.c:4357 apply.c:4502

1389 +#: apply.c:4339 apply.c:4484

1390 #, c-format

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

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

1393

1391 -#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258

1394 +#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258

1395 #: builtin/gc.c:2293

1396 #, c-format

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

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

1399

1397 -#: apply.c:4404

1400 +#: apply.c:4386

1401 #, c-format

1402 msgid "closing file '%s'"

1403 msgstr "fermeture du fichier '%s'"

1404

1402 -#: apply.c:4474

1405 +#: apply.c:4456

1406 #, c-format

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

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

1409

1407 -#: apply.c:4572

1410 +#: apply.c:4554

1411 #, c-format

1412 msgid "Applied patch %s cleanly."

1413 msgstr "Patch %s appliqué proprement."

1414

1412 -#: apply.c:4580

1415 +#: apply.c:4562

1416 msgid "internal error"

1417 msgstr "erreur interne"

1418

1416 -#: apply.c:4583

1419 +#: apply.c:4565

1420 #, c-format

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

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

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

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

1425

1423 -#: apply.c:4594

1426 +#: apply.c:4576

1427 #, c-format

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

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

1430

1428 -#: apply.c:4602

1431 +#: apply.c:4584

1432 #, c-format

1433 msgid "cannot open %s"

1434 msgstr "impossible d'ouvrir %s"

1435

1433 -#: apply.c:4616

1436 +#: apply.c:4598

1437 #, c-format

1438 msgid "Hunk #%d applied cleanly."

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

1440

1438 -#: apply.c:4620

1441 +#: apply.c:4602

1442 #, c-format

1443 msgid "Rejected hunk #%d."

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

1445

1443 -#: apply.c:4749

1446 +#: apply.c:4731

1447 #, c-format

1448 msgid "Skipped patch '%s'."

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

1450

1448 -#: apply.c:4758

1451 +#: apply.c:4740

1452 msgid "No valid patches in input (allow with \"--allow-empty\")"

1453 msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")"

1454

1452 -#: apply.c:4779

1455 +#: apply.c:4761

1456 msgid "unable to read index file"

1457 msgstr "lecture du fichier d'index impossible"

1458

1456 -#: apply.c:4936

1459 +#: apply.c:4918

1460 #, c-format

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

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

1463

1461 -#: apply.c:4963

1464 +#: apply.c:4945

1465 #, c-format

1466 msgid "squelched %d whitespace error"

1467 msgid_plural "squelched %d whitespace errors"

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

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

1470

1468 -#: apply.c:4969 apply.c:4984

1471 +#: apply.c:4951 apply.c:4966

1472 #, c-format

1473 msgid "%d line adds whitespace errors."

1474 msgid_plural "%d lines add whitespace errors."

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

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

1477

1475 -#: apply.c:4977

1478 +#: apply.c:4959

1479 #, c-format

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

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

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

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

1484

1482 -#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430

1485 +#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430

1486 msgid "Unable to write new index file"

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

1488

1486 -#: apply.c:5021

1489 +#: apply.c:5003

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

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

1492

1490 -#: apply.c:5024

1493 +#: apply.c:5006

1494 msgid "apply changes matching the given path"

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

1496

1494 -#: apply.c:5026 builtin/am.c:2376

1497 +#: apply.c:5008 builtin/am.c:2379

1498 msgid "num"

1499 msgstr "num"

1500

1498 -#: apply.c:5027

1501 +#: apply.c:5009

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

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

1504

1502 -#: apply.c:5030

1505 +#: apply.c:5012

1506 msgid "ignore additions made by the patch"

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

1508

1506 -#: apply.c:5032

1509 +#: apply.c:5014

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

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

1512

1510 -#: apply.c:5036

1513 +#: apply.c:5018

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

1515 msgstr ""

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

1517

1515 -#: apply.c:5038

1518 +#: apply.c:5020

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

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

1521

1519 -#: apply.c:5040

1522 +#: apply.c:5022

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

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

1525

1523 -#: apply.c:5042

1526 +#: apply.c:5024

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

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

1529

1527 -#: apply.c:5044

1530 +#: apply.c:5026

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

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

1533

1531 -#: apply.c:5046

1534 +#: apply.c:5028

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

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

1537

1535 -#: apply.c:5048

1538 +#: apply.c:5030

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

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

1541

1539 -#: apply.c:5051

1542 +#: apply.c:5033

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

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

1545

1543 -#: apply.c:5053

1546 +#: apply.c:5035

1547 msgid "attempt three-way merge, fall back on normal patch if that fails"

1548 msgstr ""

1549 "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"

1550

1548 -#: apply.c:5055

1551 +#: apply.c:5037

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

1553 msgstr ""

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

1555

1553 -#: apply.c:5058 builtin/checkout-index.c:196

1556 +#: apply.c:5040 builtin/checkout-index.c:230

1557 msgid "paths are separated with NUL character"

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

1559

1557 -#: apply.c:5060

1560 +#: apply.c:5042

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

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

1563

1561 -#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355

1564 +#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358

1565 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1563 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1564 -#: builtin/rebase.c:1051

1566 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983

1567 +#: builtin/rebase.c:1079

1568 msgid "action"

1569 msgstr "action"

1570

1568 -#: apply.c:5062

1571 +#: apply.c:5044

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

1573 msgstr ""

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

1575 "d'espace"

1576

1574 -#: apply.c:5065 apply.c:5068

1577 +#: apply.c:5047 apply.c:5050

1578 msgid "ignore changes in whitespace when finding context"

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

1580

1578 -#: apply.c:5071

1581 +#: apply.c:5053

1582 msgid "apply the patch in reverse"

1583 msgstr "appliquer le patch en sens inverse"

1584

1582 -#: apply.c:5073

1585 +#: apply.c:5055

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

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

1588

1586 -#: apply.c:5075

1589 +#: apply.c:5057

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

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

1592

1590 -#: apply.c:5077

1593 +#: apply.c:5059

1594 msgid "allow overlapping hunks"

1595 msgstr "accepter les recouvrements de sections"

1596

1594 -#: apply.c:5080

1597 +#: apply.c:5062

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

1599 msgstr ""

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

1601 "fichier"

1602

1600 -#: apply.c:5083

1603 +#: apply.c:5065

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

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

1606

1604 -#: apply.c:5085 builtin/am.c:2364

1607 +#: apply.c:5067 builtin/am.c:2367

1608 msgid "root"

1609 msgstr "racine"

1610

1608 -#: apply.c:5086

1611 +#: apply.c:5068

1612 msgid "prepend <root> to all filenames"

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

1614

1612 -#: apply.c:5089

1615 +#: apply.c:5071

1616 msgid "don't return error for empty patches"

1617 msgstr "ne pas renvoyer d'erreur pour les rustines vides"

1618

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

1619 +#: archive-tar.c:125 archive-zip.c:346

1620 #, c-format

1621 msgid "cannot stream blob %s"

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

1623

1621 -#: archive-tar.c:265 archive-zip.c:358

1624 +#: archive-tar.c:265 archive-zip.c:359

1625 #, c-format

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

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

@@ -1637,22 +1640,22 @@ msgstr "impossible de rediriger un descripteur"

1640 msgid "'%s' filter reported error"

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

1642

1640 -#: archive-zip.c:318

1643 +#: archive-zip.c:319

1644 #, c-format

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

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

1647

1645 -#: archive-zip.c:322

1648 +#: archive-zip.c:323

1649 #, c-format

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

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

1652

1650 -#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368

1653 +#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366

1654 #, c-format

1655 msgid "deflate error (%d)"

1656 msgstr "erreur de compression (%d)"

1657

1655 -#: archive-zip.c:603

1658 +#: archive-zip.c:604

1659 #, c-format

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

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

@@ -1661,10 +1664,6 @@ msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"

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

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

1666

1664 -#: archive.c:15

1665 -msgid "git archive --list"

1666 -msgstr "git archive --list"

1667 -

1667 #: archive.c:16

1668 msgid ""

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

@@ -1677,12 +1676,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list"

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

1677

1678 #: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238

1680 -#: builtin/tag.c:578

1679 +#: builtin/tag.c:579

1680 #, c-format

1681 msgid "cannot read '%s'"

1682 msgstr "impossible de lire '%s'"

1683

1685 -#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334

1684 +#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334

1685 #, c-format

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

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

@@ -1724,7 +1723,7 @@ msgstr "fmt"

1723 msgid "archive format"

1724 msgstr "format d'archive"

1725

1727 -#: archive.c:552 builtin/log.c:1790

1726 +#: archive.c:552 builtin/log.c:1809

1727 msgid "prefix"

1728 msgstr "préfixe"

1729

@@ -1732,12 +1731,12 @@ msgstr "préfixe"

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

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

1733

1735 -#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1736 -#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1734 +#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885

1735 +#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135

1736 #: builtin/fast-export.c:1181 builtin/fast-export.c:1183

1738 -#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103

1737 +#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104

1738 #: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410

1740 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1739 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195

1740 msgid "file"

1741 msgstr "fichier"

1742

@@ -1765,8 +1764,8 @@ msgstr "régler le niveau de compression"

1764 msgid "list supported archive formats"

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

1766

1768 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1769 -#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513

1767 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125

1768 +#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718

1769 msgid "repo"

1770 msgstr "dépôt"

1771

@@ -1787,11 +1786,12 @@ msgstr "chemin vers la commande distante git-upload-archive"

1786 msgid "Unexpected option --remote"

1787 msgstr "Option --remote inattendue"

1788

1790 -#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544

1791 -#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370

1792 -#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115

1793 -#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281

1794 -#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144

1789 +#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530

1790 +#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099

1791 +#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230

1792 +#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442

1793 +#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708

1794 +#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144

1795 #: http-fetch.c:153

1796 #, c-format

1797 msgid "the option '%s' requires '%s'"

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

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

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

1813

1814 -#: attr.c:203

1814 +#: attr.c:202

1815 #, c-format

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

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

1818

1819 -#: attr.c:364

1819 +#: attr.c:363

1820 #, c-format

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

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

1823

1824 -#: attr.c:404

1824 +#: attr.c:403

1825 msgid ""

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

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

@@ -1839,12 +1839,12 @@ msgstr "Contenu mal cité dans le fichier '%s' : %s"

1839 msgid "We cannot bisect more!\n"

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

1841

1842 -#: bisect.c:764

1842 +#: bisect.c:765

1843 #, c-format

1844 msgid "Not a valid commit name %s"

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

1846

1847 -#: bisect.c:789

1847 +#: bisect.c:790

1848 #, c-format

1849 msgid ""

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

@@ -1853,7 +1853,7 @@ msgstr ""

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

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

1855

1856 -#: bisect.c:794

1856 +#: bisect.c:795

1857 #, c-format

1858 msgid ""

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

@@ -1862,7 +1862,7 @@ msgstr ""

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

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

1864

1865 -#: bisect.c:799

1865 +#: bisect.c:800

1866 #, c-format

1867 msgid ""

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

@@ -1871,7 +1871,7 @@ msgstr ""

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

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

1873

1874 -#: bisect.c:807

1874 +#: bisect.c:808

1875 #, c-format

1876 msgid ""

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

@@ -1882,7 +1882,7 @@ msgstr ""

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

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

1884

1885 -#: bisect.c:820

1885 +#: bisect.c:821

1886 #, c-format

1887 msgid ""

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

@@ -1894,36 +1894,36 @@ msgstr ""

1894 "et %s.\n"

1895 "On continue tout de même."

1896

1897 -#: bisect.c:859

1897 +#: bisect.c:860

1898 #, c-format

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

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

1901

1902 -#: bisect.c:909

1902 +#: bisect.c:910

1903 #, c-format

1904 msgid "a %s revision is needed"

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

1906

1907 -#: bisect.c:939

1907 +#: bisect.c:940

1908 #, c-format

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

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

1911

1912 -#: bisect.c:985 builtin/merge.c:155

1912 +#: bisect.c:986 builtin/merge.c:155

1913 #, c-format

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

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

1916

1917 -#: bisect.c:1025

1917 +#: bisect.c:1026

1918 msgid "reading bisect refs failed"

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

1920

1921 -#: bisect.c:1055

1921 +#: bisect.c:1056

1922 #, c-format

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

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

1925

1926 -#: bisect.c:1064

1926 +#: bisect.c:1065

1927 #, c-format

1928 msgid ""

1929 "No testable commit found.\n"

@@ -1932,7 +1932,7 @@ msgstr ""

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

1933 "Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"

1934

1935 -#: bisect.c:1093

1935 +#: bisect.c:1094

1936 #, c-format

1937 msgid "(roughly %d step)"

1938 msgid_plural "(roughly %d steps)"

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

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

1943 #. steps)" translation.

1944 #.

1945 -#: bisect.c:1099

1945 +#: bisect.c:1100

1946 #, c-format

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

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

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

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

1951

1952 -#: blame.c:2776

1952 +#: blame.c:2773

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

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

1955

1956 -#: blame.c:2790

1956 +#: blame.c:2787

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

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

1959

1960 -#: blame.c:2811

1960 +#: blame.c:2808

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

1962 msgstr ""

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

1964 "dernier commit"

1965

1966 -#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158

1967 -#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114

1968 -#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071

1969 -#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373

1970 -#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1966 +#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157

1967 +#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118

1968 +#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096

1969 +#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381

1970 +#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796

1971 #: builtin/shortlog.c:255

1972 msgid "revision walk setup failed"

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

1974

1975 -#: blame.c:2838

1975 +#: blame.c:2835

1976 msgid ""

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

1978 msgstr ""

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

1980 "premier parent"

1981

1982 -#: blame.c:2849

1982 +#: blame.c:2846

1983 #, c-format

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

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

1986

1987 -#: blame.c:2860

1987 +#: blame.c:2857

1988 #, c-format

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

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

1991

1992 -#: branch.c:77

1992 +#: branch.c:93

1993 msgid ""

1994 "cannot inherit upstream tracking configuration of multiple refs when "

1995 "rebasing is requested"

@@ -1997,31 +1997,31 @@ msgstr ""

1997 "impossible d'hériter la configuration de suivi de référence amont depuis "

1998 "plusieurs références quand un rebasage est demandé"

1999

2000 -#: branch.c:88

2000 +#: branch.c:104

2001 #, c-format

2002 msgid "not setting branch '%s' as its own upstream"

2003 msgstr "la branche %s ne peut pas être sa propre branche amont"

2004

2005 -#: branch.c:144

2005 +#: branch.c:160

2006 #, c-format

2007 msgid "branch '%s' set up to track '%s' by rebasing."

2008 msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant."

2009

2010 -#: branch.c:145

2010 +#: branch.c:161

2011 #, c-format

2012 msgid "branch '%s' set up to track '%s'."

2013 msgstr "la branche '%s' est paramétrée pour suivre '%s'."

2014

2015 -#: branch.c:148

2015 +#: branch.c:164

2016 #, c-format

2017 msgid "branch '%s' set up to track:"

2018 msgstr "la branche '%s' est paramétrée pour suivre :"

2019

2020 -#: branch.c:160

2020 +#: branch.c:176

2021 msgid "unable to write upstream branch configuration"

2022 msgstr "échec de l'écriture de la configuration de branche amont"

2023

2024 -#: branch.c:162

2024 +#: branch.c:178

2025 msgid ""

2026 "\n"

2027 "After fixing the error cause you may try to fix up\n"

@@ -2031,52 +2031,90 @@ msgstr ""

2031 "Après correction de la cause de l'erreur, vous pouvez essayer\n"

2032 "de corriger l'information de suivi distant en invoquant :"

2033

2034 -#: branch.c:203

2034 +#: branch.c:219

2035 #, c-format

2036 msgid "asked to inherit tracking from '%s', but no remote is set"

2037 msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré"

2038

2039 -#: branch.c:209

2039 +#: branch.c:225

2040 #, c-format

2041 msgid "asked to inherit tracking from '%s', but no merge configuration is set"

2042 msgstr ""

2043 "héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion "

2044 "renseignée"

2045

2046 -#: branch.c:252

2046 +#: branch.c:277

2047 +#, c-format

2048 +msgid "not tracking: ambiguous information for ref '%s'"

2049 +msgstr "pas de suivi : information ambiguë pour la référence '%s'"

2050 +

2051 +#. TRANSLATORS: This is a line listing a remote with duplicate

2052 +#. refspecs in the advice message below. For RTL languages you'll

2053 +#. probably want to swap the "%s" and leading " " space around.

2054 +#.

2055 +#. TRANSLATORS: This is line item of ambiguous object output

2056 +#. from describe_ambiguous_object() above. For RTL languages

2057 +#. you'll probably want to swap the "%s" and leading " " space

2058 +#. around.

2059 +#.

2060 +#: branch.c:289 object-name.c:464

2061 +#, c-format

2062 +msgid " %s\n"

2063 +msgstr " %s\n"

2064 +

2065 +#. TRANSLATORS: The second argument is a \n-delimited list of

2066 +#. duplicate refspecs, composed above.

2067 +#.

2068 +#: branch.c:295

2069 #, c-format

2048 -msgid "not tracking: ambiguous information for ref %s"

2049 -msgstr "pas de suivi : information ambiguë pour la référence %s"

2070 +msgid ""

2071 +"There are multiple remotes whose fetch refspecs map to the remote\n"

2072 +"tracking ref '%s':\n"

2073 +"%s\n"

2074 +"This is typically a configuration error.\n"

2075 +"\n"

2076 +"To support setting up tracking branches, ensure that\n"

2077 +"different remotes' fetch refspecs map into different\n"

2078 +"tracking namespaces."

2079 +msgstr ""

2080 +"Il y a plusieurs distants dont les spécificateurs de référence de\n"

2081 +"récupération correspondent à la référence de suivi '%s' :\n"

2082 +"%s\n"

2083 +"C'est typiquement une erreur de configuration.\n"

2084 +"\n"

2085 +"Pour gérer le réglage des branches de suivi, assurez-vous\n"

2086 +"que des réfspecs de récupération de distants différents\n"

2087 +"correspondent à des espaces de nommage de suivi différents."

2088

2051 -#: branch.c:287

2089 +#: branch.c:344

2090 #, c-format

2091 msgid "'%s' is not a valid branch name"

2092 msgstr "'%s' n'est pas un nom de branche valide"

2093

2056 -#: branch.c:307

2094 +#: branch.c:364

2095 #, c-format

2096 msgid "a branch named '%s' already exists"

2097 msgstr "Une branche nommée '%s' existe déjà"

2098

2061 -#: branch.c:313

2099 +#: branch.c:370

2100 #, c-format

2101 msgid "cannot force update the branch '%s' checked out at '%s'"

2102 msgstr ""

2103 "impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"

2104

2067 -#: branch.c:336

2105 +#: branch.c:393

2106 #, c-format

2107 msgid "cannot set up tracking information; starting point '%s' is not a branch"

2108 msgstr ""

2109 "Impossible de configurer le suivi de branche ; le point de départ '%s' n'est "

2110 "pas une branche"

2111

2074 -#: branch.c:338

2112 +#: branch.c:395

2113 #, c-format

2114 msgid "the requested upstream branch '%s' does not exist"

2115 msgstr "la branche amont demandée '%s' n'existe pas"

2116

2079 -#: branch.c:340

2117 +#: branch.c:397

2118 msgid ""

2119 "\n"

2120 "If you are planning on basing your work on an upstream\n"

@@ -2096,126 +2134,143 @@ msgstr ""

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

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

2136

2099 -#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377

2137 +#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377

2138 #: builtin/replace.c:423 builtin/replace.c:453

2139 #, c-format

2140 msgid "not a valid object name: '%s'"

2141 msgstr "nom d'objet invalide : '%s'"

2142

2105 -#: branch.c:404

2143 +#: branch.c:465

2144 #, c-format

2145 msgid "ambiguous object name: '%s'"

2146 msgstr "Nom d'objet ambigu : '%s'"

2147

2110 -#: branch.c:409

2148 +#: branch.c:470

2149 #, c-format

2150 msgid "not a valid branch point: '%s'"

2151 msgstr "point d'embranchement invalide : '%s'"

2152

2115 -#: branch.c:469

2153 +#: branch.c:658

2154 +#, c-format

2155 +msgid "submodule '%s': unable to find submodule"

2156 +msgstr "sous-module '%s' : impossible de trouver le sous-module"

2157 +

2158 +#: branch.c:661

2159 +#, c-format

2160 +msgid ""

2161 +"You may try updating the submodules using 'git checkout %s && git submodule "

2162 +"update --init'"

2163 +msgstr "Vous pouvez essayer de mettre à jour les sous-modules en utilisant 'git checkout %s && git submodule update --init'"

2164 +

2165 +#: branch.c:672 branch.c:698

2166 +#, c-format

2167 +msgid "submodule '%s': cannot create branch '%s'"

2168 +msgstr "sous-module '%s' : impossible de créer la branche '%s'"

2169 +

2170 +#: branch.c:730

2171 #, c-format

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

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

2174

2120 -#: branch.c:494

2175 +#: branch.c:755

2176 #, c-format

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

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

2179

2125 -#: bundle.c:44

2180 +#: bundle.c:45

2181 #, c-format

2182 msgid "unrecognized bundle hash algorithm: %s"

2183 msgstr "algorithme d'empreinte du colis inconnu : %s"

2184

2130 -#: bundle.c:48

2185 +#: bundle.c:53

2186 #, c-format

2187 msgid "unknown capability '%s'"

2188 msgstr "capacité inconnue '%s'"

2189

2135 -#: bundle.c:74

2190 +#: bundle.c:79

2191 #, c-format

2192 msgid "'%s' does not look like a v2 or v3 bundle file"

2193 msgstr "'%s' ne semble pas être un fichier colis v2 our v3"

2194

2140 -#: bundle.c:113

2195 +#: bundle.c:118

2196 #, c-format

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

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

2199

2145 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406

2146 -#: builtin/commit.c:862

2200 +#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402

2201 +#: builtin/commit.c:865

2202 #, c-format

2203 msgid "could not open '%s'"

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

2205

2151 -#: bundle.c:198

2206 +#: bundle.c:203

2207 msgid "Repository lacks these prerequisite commits:"

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

2209

2155 -#: bundle.c:201

2210 +#: bundle.c:206

2211 msgid "need a repository to verify a bundle"

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

2213

2159 -#: bundle.c:257

2214 +#: bundle.c:264

2215 #, c-format

2216 msgid "The bundle contains this ref:"

2162 -msgid_plural "The bundle contains these %d refs:"

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

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

2217 +msgid_plural "The bundle contains these %<PRIuMAX> refs:"

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

2219 +msgstr[1] "Le colis contient ces %<PRIuMAX> références :"

2220

2166 -#: bundle.c:264

2221 +#: bundle.c:272

2222 msgid "The bundle records a complete history."

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

2224

2170 -#: bundle.c:266

2225 +#: bundle.c:274

2226 #, c-format

2227 msgid "The bundle requires this ref:"

2173 -msgid_plural "The bundle requires these %d refs:"

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

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

2228 +msgid_plural "The bundle requires these %<PRIuMAX> refs:"

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

2230 +msgstr[1] "Le colis exige ces %<PRIuMAX> références :"

2231

2177 -#: bundle.c:333

2232 +#: bundle.c:350

2233 msgid "unable to dup bundle descriptor"

2234 msgstr "impossible de dupliquer le descripteur de liasse"

2235

2181 -#: bundle.c:340

2236 +#: bundle.c:357

2237 msgid "Could not spawn pack-objects"

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

2239

2185 -#: bundle.c:351

2240 +#: bundle.c:368

2241 msgid "pack-objects died"

2242 msgstr "les objets groupés ont disparu"

2243

2189 -#: bundle.c:400

2244 +#: bundle.c:417

2245 #, c-format

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

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

2248

2194 -#: bundle.c:504

2249 +#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400

2250 +#, c-format

2251 +msgid "unrecognized argument: %s"

2252 +msgstr "argument non reconnu : %s"

2253 +

2254 +#: bundle.c:548

2255 #, c-format

2256 msgid "unsupported bundle version %d"

2257 msgstr "version de colis non supportée %d"

2258

2199 -#: bundle.c:506

2259 +#: bundle.c:550

2260 #, c-format

2261 msgid "cannot write bundle version %d with algorithm %s"

2262 msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"

2263

2204 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399

2205 -#, c-format

2206 -msgid "unrecognized argument: %s"

2207 -msgstr "argument non reconnu : %s"

2208 -

2209 -#: bundle.c:553

2264 +#: bundle.c:600

2265 msgid "Refusing to create empty bundle."

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

2267

2213 -#: bundle.c:563

2268 +#: bundle.c:610

2269 #, c-format

2270 msgid "cannot create '%s'"

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

2272

2218 -#: bundle.c:588

2273 +#: bundle.c:639

2274 msgid "index-pack died"

2275 msgstr "l'index de groupe a disparu"

2276

@@ -2243,7 +2298,7 @@ msgstr "la section finale a un id non nul %<PRIx32>"

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

2299 msgstr "valeur invalide de couleur : %.*s"

2300

2246 -#: commit-graph.c:204 midx.c:51

2301 +#: commit-graph.c:204 midx.c:52

2302 msgid "invalid hash version"

2303 msgstr "version d'empreinte invalide"

2304

@@ -2274,218 +2329,219 @@ msgstr ""

2329 msgid "commit-graph file is too small to hold %u chunks"

2330 msgstr "le graphe de commit est trop petit pour contenir %u sections"

2331

2277 -#: commit-graph.c:482

2332 +#: commit-graph.c:485

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

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

2335

2281 -#: commit-graph.c:492

2336 +#: commit-graph.c:495

2337 msgid "commit-graph chain does not match"

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

2339

2285 -#: commit-graph.c:540

2340 +#: commit-graph.c:543

2341 #, c-format

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

2343 msgstr ""

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

2345

2291 -#: commit-graph.c:564

2346 +#: commit-graph.c:567

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

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

2349

2295 -#: commit-graph.c:749 commit-graph.c:786

2350 +#: commit-graph.c:752 commit-graph.c:789

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

2352 msgstr ""

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

2354 "corrompu"

2355

2301 -#: commit-graph.c:770

2356 +#: commit-graph.c:773

2357 #, c-format

2358 msgid "could not find commit %s"

2359 msgstr "impossible de trouver le commit %s"

2360

2306 -#: commit-graph.c:803

2361 +#: commit-graph.c:806

2362 msgid "commit-graph requires overflow generation data but has none"

2363 msgstr ""

2364 "le graphe de commits requiert des données de génération de débordement mais "

2365 "n'en contient pas"

2366

2312 -#: commit-graph.c:1108 builtin/am.c:1369

2367 +#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775

2368 +#: builtin/clone.c:705

2369 #, c-format

2370 msgid "unable to parse commit %s"

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

2372

2317 -#: commit-graph.c:1370 builtin/pack-objects.c:3070

2373 +#: commit-graph.c:1373 builtin/pack-objects.c:3078

2374 #, c-format

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

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

2377

2322 -#: commit-graph.c:1401

2378 +#: commit-graph.c:1404

2379 msgid "Loading known commits in commit graph"

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

2381

2326 -#: commit-graph.c:1418

2382 +#: commit-graph.c:1421

2383 msgid "Expanding reachable commits in commit graph"

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

2385

2330 -#: commit-graph.c:1438

2386 +#: commit-graph.c:1441

2387 msgid "Clearing commit marks in commit graph"

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

2389

2334 -#: commit-graph.c:1457

2390 +#: commit-graph.c:1460

2391 msgid "Computing commit graph topological levels"

2392 msgstr "Calcul des niveaux topologiques du graphe de commits"

2393

2338 -#: commit-graph.c:1510

2394 +#: commit-graph.c:1513

2395 msgid "Computing commit graph generation numbers"

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

2397

2342 -#: commit-graph.c:1591

2398 +#: commit-graph.c:1598

2399 msgid "Computing commit changed paths Bloom filters"

2400 msgstr "Calcul des filtres Bloom des chemins modifiés du commit"

2401

2346 -#: commit-graph.c:1668

2402 +#: commit-graph.c:1675

2403 msgid "Collecting referenced commits"

2404 msgstr "Collecte des commits référencés"

2405

2350 -#: commit-graph.c:1693

2406 +#: commit-graph.c:1701

2407 #, c-format

2352 -msgid "Finding commits for commit graph in %d pack"

2353 -msgid_plural "Finding commits for commit graph in %d packs"

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

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

2408 +msgid "Finding commits for commit graph in %<PRIuMAX> pack"

2409 +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"

2410 +msgstr[0] "Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquet"

2411 +msgstr[1] "Recherche de commits pour un graphe de commits dans %<PRIuMAX> paquets"

2412

2357 -#: commit-graph.c:1706

2413 +#: commit-graph.c:1714

2414 #, c-format

2415 msgid "error adding pack %s"

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

2417

2362 -#: commit-graph.c:1710

2418 +#: commit-graph.c:1718

2419 #, c-format

2420 msgid "error opening index for %s"

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

2422

2367 -#: commit-graph.c:1747

2423 +#: commit-graph.c:1756

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

2425 msgstr ""

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

2427

2372 -#: commit-graph.c:1765

2428 +#: commit-graph.c:1774

2429 msgid "Finding extra edges in commit graph"

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

2431

2376 -#: commit-graph.c:1814

2432 +#: commit-graph.c:1823

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

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

2435

2380 -#: commit-graph.c:1845 midx.c:1149

2436 +#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475

2437 #, c-format

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

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

2440

2385 -#: commit-graph.c:1858

2441 +#: commit-graph.c:1868

2442 msgid "unable to create temporary graph layer"

2443 msgstr "impossible de créer une couche de graphe temporaire"

2444

2389 -#: commit-graph.c:1863

2445 +#: commit-graph.c:1873

2446 #, c-format

2447 msgid "unable to adjust shared permissions for '%s'"

2448 msgstr "impossible de régler les droits partagés pour '%s'"

2449

2394 -#: commit-graph.c:1920

2450 +#: commit-graph.c:1930

2451 #, c-format

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

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

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

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

2456

2401 -#: commit-graph.c:1956

2457 +#: commit-graph.c:1967

2458 msgid "unable to open commit-graph chain file"

2459 msgstr "impossible d'ouvrir le fichier de graphe de commit"

2460

2405 -#: commit-graph.c:1972

2461 +#: commit-graph.c:1983

2462 msgid "failed to rename base commit-graph file"

2463 msgstr "échec du renommage du fichier de graphe de commits"

2464

2409 -#: commit-graph.c:1992

2465 +#: commit-graph.c:2004

2466 msgid "failed to rename temporary commit-graph file"

2467 msgstr "impossible de renommer le fichier temporaire de graphe de commits"

2468

2413 -#: commit-graph.c:2125

2469 +#: commit-graph.c:2137

2470 msgid "Scanning merged commits"

2471 msgstr "Analyse des commits de fusion"

2472

2417 -#: commit-graph.c:2169

2473 +#: commit-graph.c:2181

2474 msgid "Merging commit-graph"

2475 msgstr "Fusion du graphe de commits"

2476

2421 -#: commit-graph.c:2277

2477 +#: commit-graph.c:2289

2478 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2479 msgstr ""

2480 "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"

2481

2426 -#: commit-graph.c:2384

2482 +#: commit-graph.c:2396

2483 msgid "too many commits to write graph"

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

2485

2430 -#: commit-graph.c:2482

2486 +#: commit-graph.c:2494

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

2488 msgstr ""

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

2490 "vraisemblablement corrompu"

2491

2436 -#: commit-graph.c:2492

2492 +#: commit-graph.c:2504

2493 #, c-format

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

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

2496

2441 -#: commit-graph.c:2502 commit-graph.c:2517

2497 +#: commit-graph.c:2514 commit-graph.c:2529

2498 #, c-format

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

2500 msgstr ""

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

2502 "%u != %u"

2503

2448 -#: commit-graph.c:2509

2504 +#: commit-graph.c:2521

2505 #, c-format

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

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

2508

2453 -#: commit-graph.c:2527

2509 +#: commit-graph.c:2539

2510 msgid "Verifying commits in commit graph"

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

2512

2457 -#: commit-graph.c:2542

2513 +#: commit-graph.c:2554

2514 #, c-format

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

2516 msgstr ""

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

2518 "graphe de commit"

2519

2464 -#: commit-graph.c:2549

2520 +#: commit-graph.c:2561

2521 #, c-format

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

2523 msgstr ""

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

2525 "%s"

2526

2471 -#: commit-graph.c:2559

2527 +#: commit-graph.c:2571

2528 #, c-format

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

2530 msgstr ""

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

2532

2477 -#: commit-graph.c:2568

2533 +#: commit-graph.c:2580

2534 #, c-format

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

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

2537

2482 -#: commit-graph.c:2582

2538 +#: commit-graph.c:2594

2539 #, c-format

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

2541 msgstr ""

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

2543

2488 -#: commit-graph.c:2587

2544 +#: commit-graph.c:2599

2545 #, c-format

2546 msgid ""

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

@@ -2493,7 +2549,7 @@ msgstr ""

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

2550 "non-nul ailleurs"

2551

2496 -#: commit-graph.c:2591

2552 +#: commit-graph.c:2603

2553 #, c-format

2554 msgid ""

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

@@ -2501,32 +2557,32 @@ msgstr ""

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

2558 "mais nul ailleurs"

2559

2504 -#: commit-graph.c:2608

2560 +#: commit-graph.c:2620

2561 #, c-format

2562 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2563 msgstr ""

2564 "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "

2565 "%<PRIuMAX>"

2566

2511 -#: commit-graph.c:2614

2567 +#: commit-graph.c:2626

2568 #, c-format

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

2570 msgstr ""

2571 "la date de validation pour le commit %s dans le graphe de commit est "

2572 "%<PRIuMAX> != %<PRIuMAX>"

2573

2518 -#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444

2519 -#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456

2574 +#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445

2575 +#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456

2576 #, c-format

2577 msgid "could not parse %s"

2578 msgstr "impossible d'analyser %s"

2579

2524 -#: commit.c:55

2580 +#: commit.c:56

2581 #, c-format

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

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

2584

2529 -#: commit.c:196

2585 +#: commit.c:197

2586 msgid ""

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

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

@@ -2546,27 +2602,27 @@ msgstr ""

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

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

2604

2549 -#: commit.c:1241

2605 +#: commit.c:1252

2606 #, c-format

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

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

2609

2554 -#: commit.c:1245

2610 +#: commit.c:1256

2611 #, c-format

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

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

2614

2559 -#: commit.c:1248

2615 +#: commit.c:1259

2616 #, c-format

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

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

2619

2564 -#: commit.c:1251

2620 +#: commit.c:1262

2621 #, c-format

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

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

2624

2569 -#: commit.c:1505

2625 +#: commit.c:1516

2626 msgid ""

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

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

@@ -2582,7 +2638,15 @@ msgstr ""

2638 msgid "memory exhausted"

2639 msgstr "plus de mémoire"

2640

2585 -#: config.c:125

2641 +#: compat/terminal.c:167

2642 +msgid "cannot resume in the background, please use 'fg' to resume"

2643 +msgstr "impossible de reprendre en arrière plan, veuillez utiliser 'fg' pour reprendre"

2644 +

2645 +#: compat/terminal.c:168

2646 +msgid "cannot restore terminal settings"

2647 +msgstr "impossible de restaurer les réglages du terminal"

2648 +

2649 +#: config.c:143

2650 #, c-format

2651 msgid ""

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

@@ -2597,350 +2661,375 @@ msgstr ""

2661 "\t%s\n"

2662 "possibilité d'inclusions multiples."

2663

2600 -#: config.c:141

2664 +#: config.c:159

2665 #, c-format

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

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

2668

2605 -#: config.c:152

2669 +#: config.c:170

2670 msgid "relative config includes must come from files"

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

2672

2609 -#: config.c:201

2673 +#: config.c:219

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

2675 msgstr ""

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

2677 "fichiers"

2678

2615 -#: config.c:398

2679 +#: config.c:364

2680 +msgid ""

2681 +"remote URLs cannot be configured in file directly or indirectly included by "

2682 +"includeIf.hasconfig:remote.*.url"

2683 +msgstr "les URL distantes ne peuvent pas être configurées dans un fichier directement ou indirectement inclus par includeIf.hasconfig:remote.*.url"

2684 +

2685 +#: config.c:508

2686 #, c-format

2687 msgid "invalid config format: %s"

2688 msgstr "format de config invalide : %s"

2689

2620 -#: config.c:402

2690 +#: config.c:512

2691 #, c-format

2692 msgid "missing environment variable name for configuration '%.*s'"

2693 msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"

2694

2625 -#: config.c:407

2695 +#: config.c:517

2696 #, c-format

2697 msgid "missing environment variable '%s' for configuration '%.*s'"

2698 msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"

2699

2630 -#: config.c:443

2700 +#: config.c:553

2701 #, c-format

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

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

2704

2635 -#: config.c:448

2705 +#: config.c:558

2706 #, c-format

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

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

2709

2640 -#: config.c:470 sequencer.c:2806

2710 +#: config.c:580 sequencer.c:2802

2711 #, c-format

2712 msgid "invalid key: %s"

2713 msgstr "clé invalide : %s"

2714

2645 -#: config.c:475

2715 +#: config.c:585

2716 #, c-format

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

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

2719

2650 -#: config.c:495

2720 +#: config.c:605

2721 msgid "empty config key"

2722 msgstr "clé de configuration vide"

2723

2654 -#: config.c:513 config.c:525

2724 +#: config.c:623 config.c:635

2725 #, c-format

2726 msgid "bogus config parameter: %s"

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

2728

2659 -#: config.c:539 config.c:556 config.c:563 config.c:572

2729 +#: config.c:649 config.c:666 config.c:673 config.c:682

2730 #, c-format

2731 msgid "bogus format in %s"

2732 msgstr "formatage mal formé dans %s"

2733

2664 -#: config.c:606

2734 +#: config.c:716

2735 #, c-format

2736 msgid "bogus count in %s"

2737 msgstr "compte faux dans %s"

2738

2669 -#: config.c:610

2739 +#: config.c:720

2740 #, c-format

2741 msgid "too many entries in %s"

2742 msgstr "trop d'entrées dans %s"

2743

2674 -#: config.c:620

2744 +#: config.c:730

2745 #, c-format

2746 msgid "missing config key %s"

2747 msgstr "clé de configuration %s manquante"

2748

2679 -#: config.c:628

2749 +#: config.c:738

2750 #, c-format

2751 msgid "missing config value %s"

2752 msgstr "valeur de config manquante %s"

2753

2684 -#: config.c:979

2754 +#: config.c:1089

2755 #, c-format

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

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

2758

2689 -#: config.c:983

2759 +#: config.c:1093

2760 #, c-format

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

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

2763

2694 -#: config.c:987

2764 +#: config.c:1097

2765 #, c-format

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

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

2768

2699 -#: config.c:991

2769 +#: config.c:1101

2770 #, c-format

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

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

2773

2704 -#: config.c:995

2774 +#: config.c:1105

2775 #, c-format

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

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

2778

2709 -#: config.c:999

2779 +#: config.c:1109

2780 #, c-format

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

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

2783

2714 -#: config.c:1136

2784 +#: config.c:1246

2785 msgid "out of range"

2786 msgstr "hors plage"

2787

2718 -#: config.c:1136

2788 +#: config.c:1246

2789 msgid "invalid unit"

2790 msgstr "unité invalide"

2791

2722 -#: config.c:1137

2792 +#: config.c:1247

2793 #, c-format

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

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

2796

2727 -#: config.c:1147

2797 +#: config.c:1257

2798 #, c-format

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

2800 msgstr ""

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

2802 "%s : %s"

2803

2734 -#: config.c:1150

2804 +#: config.c:1260

2805 #, c-format

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

2807 msgstr ""

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

2809 "%s : %s"

2810

2741 -#: config.c:1153

2811 +#: config.c:1263

2812 #, c-format

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

2814 msgstr ""

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

2816 "standard : %s"

2817

2748 -#: config.c:1156

2818 +#: config.c:1266

2819 #, c-format

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

2821 msgstr ""

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

2823 "sous-module %s : %s"

2824

2755 -#: config.c:1159

2825 +#: config.c:1269

2826 #, c-format

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

2828 msgstr ""

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

2830 "commande %s : %s"

2831

2762 -#: config.c:1162

2832 +#: config.c:1272

2833 #, c-format

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

2835 msgstr ""

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

2837

2768 -#: config.c:1241

2838 +#: config.c:1368

2839 +#, c-format

2840 +msgid "invalid value for variable %s"

2841 +msgstr "valeur invalide pour la variable %s"

2842 +

2843 +#: config.c:1389

2844 +#, c-format

2845 +msgid "ignoring unknown core.fsync component '%s'"

2846 +msgstr "ignore le composant core.fsync inconne '%s'"

2847 +

2848 +#: config.c:1425

2849 #, c-format

2850 msgid "bad boolean config value '%s' for '%s'"

2851 msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"

2852

2773 -#: config.c:1259

2853 +#: config.c:1443

2854 #, c-format

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

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

2857

2778 -#: config.c:1268

2858 +#: config.c:1452

2859 #, c-format

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

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

2862

2783 -#: config.c:1361

2863 +#: config.c:1545

2864 #, c-format

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

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

2867

2788 -#: config.c:1375 config.c:1386

2868 +#: config.c:1559 config.c:1570

2869 #, c-format

2870 msgid "bad zlib compression level %d"

2871 msgstr "niveau de compression zlib incorrect %d"

2872

2793 -#: config.c:1476

2873 +#: config.c:1660

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

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

2876

2797 -#: config.c:1509

2877 +#: config.c:1692

2878 +#, c-format

2879 +msgid "ignoring unknown core.fsyncMethod value '%s'"

2880 +msgstr "valeur inconnue '%s' de core.fsyncMethod"

2881 +

2882 +#: config.c:1698

2883 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"

2884 +msgstr "core.fsyncObjectFiles est obsolète ; utilisez core.fsync à la place"

2885 +

2886 +#: config.c:1714

2887 #, c-format

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

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

2890

2802 -#: config.c:1584

2891 +#: config.c:1800

2892 #, c-format

2893 msgid "malformed value for %s"

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

2895

2807 -#: config.c:1610

2896 +#: config.c:1826

2897 #, c-format

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

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

2900

2812 -#: config.c:1611

2901 +#: config.c:1827

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

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

2904

2816 -#: config.c:1672 builtin/pack-objects.c:4053

2905 +#: config.c:1888 builtin/pack-objects.c:4078

2906 #, c-format

2907 msgid "bad pack compression level %d"

2908 msgstr "niveau de compression du paquet %d"

2909

2821 -#: config.c:1795

2910 +#: config.c:2014

2911 #, c-format

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

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

2914

2826 -#: config.c:1798

2915 +#: config.c:2017

2916 #, c-format

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

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

2919

2831 -#: config.c:1816

2920 +#: config.c:2035

2921 #, c-format

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

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

2924

2836 -#: config.c:1861

2925 +#: config.c:2080

2926 #, c-format

2927 msgid "failed to parse %s"

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

2929

2841 -#: config.c:1917

2930 +#: config.c:2136

2931 msgid "unable to parse command-line config"

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

2933

2845 -#: config.c:2285

2934 +#: config.c:2512

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

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

2937

2849 -#: config.c:2459

2938 +#: config.c:2686

2939 #, c-format

2940 msgid "Invalid %s: '%s'"

2941 msgstr "%s invalide : '%s'"

2942

2854 -#: config.c:2504

2943 +#: config.c:2731

2944 #, c-format

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

2946 msgstr ""

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

2948 "100"

2949

2861 -#: config.c:2550

2950 +#: config.c:2763

2951 #, c-format

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

2953 msgstr ""

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

2955

2867 -#: config.c:2552

2956 +#: config.c:2765

2957 #, c-format

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

2959 msgstr ""

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

2961

2873 -#: config.c:2637

2962 +#: config.c:2850

2963 #, c-format

2964 msgid "invalid section name '%s'"

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

2966

2878 -#: config.c:2669

2967 +#: config.c:2882

2968 #, c-format

2969 msgid "%s has multiple values"

2970 msgstr "%s a des valeurs multiples"

2971

2883 -#: config.c:2698

2972 +#: config.c:2911

2973 #, c-format

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

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

2976

2888 -#: config.c:2950 config.c:3277

2977 +#: config.c:3177 config.c:3518

2978 #, c-format

2979 msgid "could not lock config file %s"

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

2981

2893 -#: config.c:2961

2982 +#: config.c:3188

2983 #, c-format

2984 msgid "opening %s"

2985 msgstr "ouverture de %s"

2986

2898 -#: config.c:2998 builtin/config.c:361

2987 +#: config.c:3225 builtin/config.c:361

2988 #, c-format

2989 msgid "invalid pattern: %s"

2990 msgstr "motif invalide : %s"

2991

2903 -#: config.c:3023

2992 +#: config.c:3250

2993 #, c-format

2994 msgid "invalid config file %s"

2995 msgstr "fichier de configuration invalide %s"

2996

2908 -#: config.c:3036 config.c:3290

2997 +#: config.c:3263 config.c:3531

2998 #, c-format

2999 msgid "fstat on %s failed"

3000 msgstr "échec de fstat sur %s"

3001

2913 -#: config.c:3047

3002 +#: config.c:3274

3003 #, c-format

3004 msgid "unable to mmap '%s'%s"

3005 msgstr "impossible de réaliser un mmap de '%s'%s"

3006

2918 -#: config.c:3057 config.c:3295

3007 +#: config.c:3284 config.c:3536

3008 #, c-format

3009 msgid "chmod on %s failed"

3010 msgstr "échec de chmod sur %s"

3011

2923 -#: config.c:3142 config.c:3392

3012 +#: config.c:3369 config.c:3633

3013 #, c-format

3014 msgid "could not write config file %s"

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

3016

2928 -#: config.c:3176

3017 +#: config.c:3403

3018 #, c-format

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

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

3021

2933 -#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

3022 +#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893

3023 #, c-format

3024 msgid "could not unset '%s'"

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

3026

2938 -#: config.c:3268

3027 +#: config.c:3509

3028 #, c-format

3029 msgid "invalid section name: %s"

3030 msgstr "nom de section invalide : %s"

3031

2943 -#: config.c:3435

3032 +#: config.c:3676

3033 #, c-format

3034 msgid "missing value for '%s'"

3035 msgstr "valeur manquante pour '%s'"

@@ -3282,68 +3371,68 @@ msgid "refusing to work with credential missing protocol field"

3371 msgstr ""

3372 "refus de travailler avec un champ protocol manquant dans l'identification"

3373

3285 -#: credential.c:395

3374 +#: credential.c:396

3375 #, c-format

3376 msgid "url contains a newline in its %s component: %s"

3377 msgstr "l'url contient un retour chariot dans composant %s : %s"

3378

3290 -#: credential.c:439

3379 +#: credential.c:440

3380 #, c-format

3381 msgid "url has no scheme: %s"

3382 msgstr "l'url n'a pas de schéma : %s"

3383

3295 -#: credential.c:512

3384 +#: credential.c:513

3385 #, c-format

3386 msgid "credential url cannot be parsed: %s"

3387 msgstr "impossible d'analyser l'url d'identification : %s"

3388

3300 -#: date.c:138

3389 +#: date.c:139

3390 msgid "in the future"

3391 msgstr "dans le futur"

3392

3304 -#: date.c:144

3393 +#: date.c:145

3394 #, c-format

3395 msgid "%<PRIuMAX> second ago"

3396 msgid_plural "%<PRIuMAX> seconds ago"

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

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

3399

3311 -#: date.c:151

3400 +#: date.c:152

3401 #, c-format

3402 msgid "%<PRIuMAX> minute ago"

3403 msgid_plural "%<PRIuMAX> minutes ago"

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

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

3406

3318 -#: date.c:158

3407 +#: date.c:159

3408 #, c-format

3409 msgid "%<PRIuMAX> hour ago"

3410 msgid_plural "%<PRIuMAX> hours ago"

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

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

3413

3325 -#: date.c:165

3414 +#: date.c:166

3415 #, c-format

3416 msgid "%<PRIuMAX> day ago"

3417 msgid_plural "%<PRIuMAX> days ago"

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

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

3420

3332 -#: date.c:171

3421 +#: date.c:172

3422 #, c-format

3423 msgid "%<PRIuMAX> week ago"

3424 msgid_plural "%<PRIuMAX> weeks ago"

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

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

3427

3339 -#: date.c:178

3428 +#: date.c:179

3429 #, c-format

3430 msgid "%<PRIuMAX> month ago"

3431 msgid_plural "%<PRIuMAX> months ago"

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

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

3434

3346 -#: date.c:189

3435 +#: date.c:190

3436 #, c-format

3437 msgid "%<PRIuMAX> year"

3438 msgid_plural "%<PRIuMAX> years"

@@ -3351,14 +3440,14 @@ msgstr[0] "%<PRIuMAX> an"

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

3441

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

3354 -#: date.c:192

3443 +#: date.c:193

3444 #, c-format

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

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

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

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

3449

3361 -#: date.c:197 date.c:202

3450 +#: date.c:198 date.c:203

3451 #, c-format

3452 msgid "%<PRIuMAX> year ago"

3453 msgid_plural "%<PRIuMAX> years ago"

@@ -3391,10 +3480,14 @@ msgstr ""

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

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

3482

3394 -#: diff-merges.c:70

3483 +#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37

3484 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203

3485 +#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742

3486 +#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45

3487 +#: builtin/pull.c:47 builtin/pull.c:321

3488 #, c-format

3396 -msgid "unknown value for --diff-merges: %s"

3397 -msgstr "valeur inconnue pour --diff-merges : %s"

3489 +msgid "invalid value for '%s': '%s'"

3490 +msgstr "valeur invalide pour '%s' : '%s'"

3491

3492 #: diff-lib.c:561

3493 msgid "--merge-base does not work with ranges"

@@ -3428,18 +3521,18 @@ msgstr ""

3521 "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "

3522 "arbre de travail"

3523

3431 -#: diff.c:158

3524 +#: diff.c:159

3525 #, c-format

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

3527 msgstr ""

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

3529

3437 -#: diff.c:163

3530 +#: diff.c:164

3531 #, c-format

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

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

3534

3442 -#: diff.c:299

3535 +#: diff.c:300

3536 msgid ""

3537 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3538 "'dimmed-zebra', 'plain'"

@@ -3447,7 +3540,7 @@ msgstr ""

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

3541 "'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"

3542

3450 -#: diff.c:327

3543 +#: diff.c:328

3544 #, c-format

3545 msgid ""

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

@@ -3457,7 +3550,7 @@ msgstr ""

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

3551 "change'"

3552

3460 -#: diff.c:335

3553 +#: diff.c:336

3554 msgid ""

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

3556 "whitespace modes"

@@ -3465,13 +3558,13 @@ msgstr ""

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

3559 "d'autres modes d'espace"

3560

3468 -#: diff.c:412

3561 +#: diff.c:413

3562 #, c-format

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

3564 msgstr ""

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

3566

3474 -#: diff.c:472

3567 +#: diff.c:473

3568 #, c-format

3569 msgid ""

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

@@ -3480,30 +3573,30 @@ msgstr ""

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

3574 "%s"

3575

3483 -#: diff.c:4237

3576 +#: diff.c:4282

3577 #, c-format

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

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

3580

3488 -#: diff.c:4589

3581 +#: diff.c:4677 parse-options.c:1114

3582 #, c-format

3583 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

3584 msgstr ""

3585 "les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"

3586

3494 -#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506

3587 +#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578

3588 #, c-format

3589 msgid "options '%s', '%s', and '%s' cannot be used together"

3590 msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"

3591

3499 -#: diff.c:4597

3592 +#: diff.c:4685

3593 #, c-format

3594 msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"

3595 msgstr ""

3596 "les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "

3597 "'%s' avec '%s'"

3598

3506 -#: diff.c:4601

3599 +#: diff.c:4689

3600 #, c-format

3601 msgid ""

3602 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

@@ -3511,22 +3604,22 @@ msgstr ""

3604 "les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "

3605 "'%s' avec '%s' et '%s'"

3606

3514 -#: diff.c:4681

3607 +#: diff.c:4769

3608 msgid "--follow requires exactly one pathspec"

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

3610

3518 -#: diff.c:4729

3611 +#: diff.c:4823

3612 #, c-format

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

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

3615

3523 -#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277

3616 +#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319

3617 #: parse-options.c:217 parse-options.c:221

3618 #, c-format

3619 msgid "%s expects a numerical value"

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

3621

3529 -#: diff.c:4766

3622 +#: diff.c:4860

3623 #, c-format

3624 msgid ""

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

@@ -3535,42 +3628,42 @@ msgstr ""

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

3629 "%s"

3630

3538 -#: diff.c:4851

3631 +#: diff.c:4893

3632 #, c-format

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

3634 msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"

3635

3543 -#: diff.c:4875

3636 +#: diff.c:4917

3637 #, c-format

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

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

3640

3548 -#: diff.c:4889

3641 +#: diff.c:4931

3642 #, c-format

3643 msgid "unable to resolve '%s'"

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

3645

3553 -#: diff.c:4939 diff.c:4945

3646 +#: diff.c:4981 diff.c:4987

3647 #, c-format

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

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

3650

3558 -#: diff.c:4957

3651 +#: diff.c:4999

3652 #, c-format

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

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

3655

3563 -#: diff.c:4978

3656 +#: diff.c:5020

3657 #, c-format

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

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

3660

3568 -#: diff.c:4997

3661 +#: diff.c:5039

3662 #, c-format

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

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

3665

3573 -#: diff.c:5037

3666 +#: diff.c:5079

3667 msgid ""

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

3669 "\"histogram\""

@@ -3578,160 +3671,160 @@ msgstr ""

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

3672 "\"histogram\""

3673

3581 -#: diff.c:5073 diff.c:5093

3674 +#: diff.c:5115 diff.c:5135

3675 #, c-format

3676 msgid "invalid argument to %s"

3677 msgstr "argument invalide pour %s"

3678

3586 -#: diff.c:5197

3679 +#: diff.c:5239

3680 #, c-format

3681 msgid "invalid regex given to -I: '%s'"

3682 msgstr "regex invalide fournie à -I : '%s'"

3683

3591 -#: diff.c:5246

3684 +#: diff.c:5288

3685 #, c-format

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

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

3688

3596 -#: diff.c:5302

3689 +#: diff.c:5344

3690 #, c-format

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

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

3693

3601 -#: diff.c:5338

3694 +#: diff.c:5380

3695 msgid "Diff output format options"

3696 msgstr "Options de format de sortie de diff"

3697

3605 -#: diff.c:5340 diff.c:5346

3698 +#: diff.c:5382 diff.c:5388

3699 msgid "generate patch"

3700 msgstr "générer la rustine"

3701

3609 -#: diff.c:5343 builtin/log.c:179

3702 +#: diff.c:5385 builtin/log.c:180

3703 msgid "suppress diff output"

3704 msgstr "supprimer la sortie des différences"

3705

3613 -#: diff.c:5348 diff.c:5462 diff.c:5469

3706 +#: diff.c:5390 diff.c:5504 diff.c:5511

3707 msgid "<n>"

3708 msgstr "<n>"

3709

3617 -#: diff.c:5349 diff.c:5352

3710 +#: diff.c:5391 diff.c:5394

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

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

3713

3621 -#: diff.c:5354

3714 +#: diff.c:5396

3715 msgid "generate the diff in raw format"

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

3717

3625 -#: diff.c:5357

3718 +#: diff.c:5399

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

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

3721

3629 -#: diff.c:5361

3722 +#: diff.c:5403

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

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

3725

3633 -#: diff.c:5365

3726 +#: diff.c:5407

3727 msgid "machine friendly --stat"

3728 msgstr "--stat pour traitement automatique"

3729

3637 -#: diff.c:5368

3730 +#: diff.c:5410

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

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

3733

3641 -#: diff.c:5370 diff.c:5378

3734 +#: diff.c:5412 diff.c:5420

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

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

3737

3645 -#: diff.c:5371

3738 +#: diff.c:5413

3739 msgid ""

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

3741 msgstr ""

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

3743 "chaque sous-répertoire"

3744

3652 -#: diff.c:5375

3745 +#: diff.c:5417

3746 msgid "synonym for --dirstat=cumulative"

3747 msgstr "synonyme pour --dirstat=cumulative"

3748

3656 -#: diff.c:5379

3749 +#: diff.c:5421

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

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

3752

3660 -#: diff.c:5383

3753 +#: diff.c:5425

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

3755 msgstr ""

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

3757 "erreurs d'espace"

3758

3666 -#: diff.c:5386

3759 +#: diff.c:5428

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

3761 msgstr ""

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

3763 "de mode"

3764

3672 -#: diff.c:5389

3765 +#: diff.c:5431

3766 msgid "show only names of changed files"

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

3768

3676 -#: diff.c:5392

3769 +#: diff.c:5434

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

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

3772

3680 -#: diff.c:5394

3773 +#: diff.c:5436

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

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

3776

3684 -#: diff.c:5395

3777 +#: diff.c:5437

3778 msgid "generate diffstat"

3779 msgstr "générer un diffstat"

3780

3688 -#: diff.c:5397 diff.c:5400 diff.c:5403

3781 +#: diff.c:5439 diff.c:5442 diff.c:5445

3782 msgid "<width>"

3783 msgstr "<largeur>"

3784

3692 -#: diff.c:5398

3785 +#: diff.c:5440

3786 msgid "generate diffstat with a given width"

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

3788

3696 -#: diff.c:5401

3789 +#: diff.c:5443

3790 msgid "generate diffstat with a given name width"

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

3792

3700 -#: diff.c:5404

3793 +#: diff.c:5446

3794 msgid "generate diffstat with a given graph width"

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

3796

3704 -#: diff.c:5406

3797 +#: diff.c:5448

3798 msgid "<count>"

3799 msgstr "<compte>"

3800

3708 -#: diff.c:5407

3801 +#: diff.c:5449

3802 msgid "generate diffstat with limited lines"

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

3804

3712 -#: diff.c:5410

3805 +#: diff.c:5452

3806 msgid "generate compact summary in diffstat"

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

3808

3716 -#: diff.c:5413

3809 +#: diff.c:5455

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

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

3812

3720 -#: diff.c:5416

3813 +#: diff.c:5458

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

3815 msgstr ""

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

3817 "\"index\""

3818

3726 -#: diff.c:5418

3819 +#: diff.c:5460

3820 msgid "show colored diff"

3821 msgstr "afficher un diff coloré"

3822

3730 -#: diff.c:5419

3823 +#: diff.c:5461

3824 msgid "<kind>"

3825 msgstr "<sorte>"

3826

3734 -#: diff.c:5420

3827 +#: diff.c:5462

3828 msgid ""

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

3830 "diff"

@@ -3739,7 +3832,7 @@ msgstr ""

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

3833 "'nouveau' dans le diff"

3834

3742 -#: diff.c:5423

3835 +#: diff.c:5465

3836 msgid ""

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

3838 "--numstat"

@@ -3747,93 +3840,93 @@ msgstr ""

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

3841 "champs dans --raw ou --numstat"

3842

3750 -#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541

3843 +#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583

3844 msgid "<prefix>"

3845 msgstr "<préfixe>"

3846

3754 -#: diff.c:5427

3847 +#: diff.c:5469

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

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

3850

3758 -#: diff.c:5430

3851 +#: diff.c:5472

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

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

3854

3762 -#: diff.c:5433

3855 +#: diff.c:5475

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

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

3858

3766 -#: diff.c:5436

3859 +#: diff.c:5478

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

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

3862

3770 -#: diff.c:5439

3863 +#: diff.c:5481

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

3865 msgstr ""

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

3867 "indiqué"

3868

3776 -#: diff.c:5443 diff.c:5448 diff.c:5453

3869 +#: diff.c:5485 diff.c:5490 diff.c:5495

3870 msgid "<char>"

3871 msgstr "<caractère>"

3872

3780 -#: diff.c:5444

3873 +#: diff.c:5486

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

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

3876

3784 -#: diff.c:5449

3877 +#: diff.c:5491

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

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

3880

3788 -#: diff.c:5454

3881 +#: diff.c:5496

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

3883 msgstr ""

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

3885

3793 -#: diff.c:5457

3886 +#: diff.c:5499

3887 msgid "Diff rename options"

3888 msgstr "Options de renommage de diff"

3889

3797 -#: diff.c:5458

3890 +#: diff.c:5500

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

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

3893

3801 -#: diff.c:5459

3894 +#: diff.c:5501

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

3896 msgstr ""

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

3898 "création"

3899

3807 -#: diff.c:5463

3900 +#: diff.c:5505

3901 msgid "detect renames"

3902 msgstr "détecter les renommages"

3903

3811 -#: diff.c:5467

3904 +#: diff.c:5509

3905 msgid "omit the preimage for deletes"

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

3907

3815 -#: diff.c:5470

3908 +#: diff.c:5512

3909 msgid "detect copies"

3910 msgstr "détecter les copies"

3911

3819 -#: diff.c:5474

3912 +#: diff.c:5516

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

3914 msgstr ""

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

3916

3824 -#: diff.c:5476

3917 +#: diff.c:5518

3918 msgid "disable rename detection"

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

3920

3828 -#: diff.c:5479

3921 +#: diff.c:5521

3922 msgid "use empty blobs as rename source"

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

3924

3832 -#: diff.c:5481

3925 +#: diff.c:5523

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

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

3928

3836 -#: diff.c:5484

3929 +#: diff.c:5526

3930 msgid ""

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

3932 "given limit"

@@ -3841,165 +3934,165 @@ msgstr ""

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

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

3936

3844 -#: diff.c:5486

3937 +#: diff.c:5528

3938 msgid "Diff algorithm options"

3939 msgstr "Options de l'algorithme de diff"

3940

3848 -#: diff.c:5488

3941 +#: diff.c:5530

3942 msgid "produce the smallest possible diff"

3943 msgstr "produire le diff le plus petit possible"

3944

3852 -#: diff.c:5491

3945 +#: diff.c:5533

3946 msgid "ignore whitespace when comparing lines"

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

3948

3856 -#: diff.c:5494

3949 +#: diff.c:5536

3950 msgid "ignore changes in amount of whitespace"

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

3952

3860 -#: diff.c:5497

3953 +#: diff.c:5539

3954 msgid "ignore changes in whitespace at EOL"

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

3956

3864 -#: diff.c:5500

3957 +#: diff.c:5542

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

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

3960

3868 -#: diff.c:5503

3961 +#: diff.c:5545

3962 msgid "ignore changes whose lines are all blank"

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

3964

3872 -#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575

3965 +#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617

3966 msgid "<regex>"

3967 msgstr "<regex>"

3968

3876 -#: diff.c:5506

3969 +#: diff.c:5548

3970 msgid "ignore changes whose all lines match <regex>"

3971 msgstr "ignorer les modifications dont les lignes correspondent à <regex>"

3972

3880 -#: diff.c:5509

3973 +#: diff.c:5551

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

3975 msgstr ""

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

3977 "lecture"

3978

3886 -#: diff.c:5512

3979 +#: diff.c:5554

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

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

3982

3890 -#: diff.c:5516

3983 +#: diff.c:5558

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

3985 msgstr ""

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

3987

3895 -#: diff.c:5518

3988 +#: diff.c:5560

3989 msgid "<algorithm>"

3990 msgstr "<algorithme>"

3991

3899 -#: diff.c:5519

3992 +#: diff.c:5561

3993 msgid "choose a diff algorithm"

3994 msgstr "choisir un algorithme de différence"

3995

3903 -#: diff.c:5521

3996 +#: diff.c:5563

3997 msgid "<text>"

3998 msgstr "<texte>"

3999

3907 -#: diff.c:5522

4000 +#: diff.c:5564

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

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

4003

3911 -#: diff.c:5524 diff.c:5533 diff.c:5536

4004 +#: diff.c:5566 diff.c:5575 diff.c:5578

4005 msgid "<mode>"

4006 msgstr "<mode>"

4007

3915 -#: diff.c:5525

4008 +#: diff.c:5567

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

4010 msgstr ""

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

4012 "mots modifiés"

4013

3921 -#: diff.c:5528

4014 +#: diff.c:5570

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

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

4017

3925 -#: diff.c:5531

4018 +#: diff.c:5573

4019 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

4020 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

4021

3929 -#: diff.c:5534

4022 +#: diff.c:5576

4023 msgid "moved lines of code are colored differently"

4024 msgstr "les lignes déplacées sont colorées différemment"

4025

3933 -#: diff.c:5537

4026 +#: diff.c:5579

4027 msgid "how white spaces are ignored in --color-moved"

4028 msgstr "comment les espaces sont ignorés dans --color-moved"

4029

3937 -#: diff.c:5540

4030 +#: diff.c:5582

4031 msgid "Other diff options"

4032 msgstr "Autres options diff"

4033

3941 -#: diff.c:5542

4034 +#: diff.c:5584

4035 msgid "when run from subdir, exclude changes outside and show relative paths"

4036 msgstr ""

4037 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

4038 "afficher les chemins relatifs"

4039

3947 -#: diff.c:5546

4040 +#: diff.c:5588

4041 msgid "treat all files as text"

4042 msgstr "traiter les fichiers comme texte"

4043

3951 -#: diff.c:5548

4044 +#: diff.c:5590

4045 msgid "swap two inputs, reverse the diff"

4046 msgstr "échanger les entrées, inverser le diff"

4047

3955 -#: diff.c:5550

4048 +#: diff.c:5592

4049 msgid "exit with 1 if there were differences, 0 otherwise"

4050 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

4051

3959 -#: diff.c:5552

4052 +#: diff.c:5594

4053 msgid "disable all output of the program"

4054 msgstr "désactiver tous les affichages du programme"

4055

3963 -#: diff.c:5554

4056 +#: diff.c:5596

4057 msgid "allow an external diff helper to be executed"

4058 msgstr "autoriser l'exécution d'un assistant externe de diff"

4059

3967 -#: diff.c:5556

4060 +#: diff.c:5598

4061 msgid "run external text conversion filters when comparing binary files"

4062 msgstr ""

4063 "lancer les filtres externes de conversion en texte lors de la comparaison de "

4064 "fichiers binaires"

4065

3973 -#: diff.c:5558

4066 +#: diff.c:5600

4067 msgid "<when>"

4068 msgstr "<quand>"

4069

3977 -#: diff.c:5559

4070 +#: diff.c:5601

4071 msgid "ignore changes to submodules in the diff generation"

4072 msgstr ""

4073 "ignorer les modifications dans les sous-modules lors de la génération de diff"

4074

3982 -#: diff.c:5562

4075 +#: diff.c:5604

4076 msgid "<format>"

4077 msgstr "<format>"

4078

3986 -#: diff.c:5563

4079 +#: diff.c:5605

4080 msgid "specify how differences in submodules are shown"

4081 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

4082

3990 -#: diff.c:5567

4083 +#: diff.c:5609

4084 msgid "hide 'git add -N' entries from the index"

4085 msgstr "masquer les entrées 'git add -N' de l'index"

4086

3994 -#: diff.c:5570

4087 +#: diff.c:5612

4088 msgid "treat 'git add -N' entries as real in the index"

4089 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

4090

3998 -#: diff.c:5572

4091 +#: diff.c:5614

4092 msgid "<string>"

4093 msgstr "<chaîne>"

4094

4002 -#: diff.c:5573

4095 +#: diff.c:5615

4096 msgid ""

4097 "look for differences that change the number of occurrences of the specified "

4098 "string"

@@ -4007,7 +4100,7 @@ msgstr ""

4100 "rechercher les différences qui modifient le nombre d'occurrences de la "

4101 "chaîne spécifiée"

4102

4010 -#: diff.c:5576

4103 +#: diff.c:5618

4104 msgid ""

4105 "look for differences that change the number of occurrences of the specified "

4106 "regex"

@@ -4015,38 +4108,38 @@ msgstr ""

4108 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

4109 "spécifiée"

4110

4018 -#: diff.c:5579

4111 +#: diff.c:5621

4112 msgid "show all changes in the changeset with -S or -G"

4113 msgstr ""

4114 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

4115 "ou -G"

4116

4024 -#: diff.c:5582

4117 +#: diff.c:5624

4118 msgid "treat <string> in -S as extended POSIX regular expression"

4119 msgstr ""

4120 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

4121

4029 -#: diff.c:5585

4122 +#: diff.c:5627

4123 msgid "control the order in which files appear in the output"

4124 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

4125

4033 -#: diff.c:5586 diff.c:5589

4126 +#: diff.c:5628 diff.c:5631

4127 msgid "<path>"

4128 msgstr "<chemin>"

4129

4037 -#: diff.c:5587

4130 +#: diff.c:5629

4131 msgid "show the change in the specified path first"

4132 msgstr "afficher la modification dans le chemin spécifié en premier"

4133

4041 -#: diff.c:5590

4134 +#: diff.c:5632

4135 msgid "skip the output to the specified path"

4136 msgstr "sauter la sortie pour le chemin spécifié"

4137

4045 -#: diff.c:5592

4138 +#: diff.c:5634

4139 msgid "<object-id>"

4140 msgstr "<id-objet>"

4141

4049 -#: diff.c:5593

4142 +#: diff.c:5635

4143 msgid ""

4144 "look for differences that change the number of occurrences of the specified "

4145 "object"

@@ -4054,35 +4147,35 @@ msgstr ""

4147 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

4148 "indiqué"

4149

4057 -#: diff.c:5595

4150 +#: diff.c:5637

4151 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

4152 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

4153

4061 -#: diff.c:5596

4154 +#: diff.c:5638

4155 msgid "select files by diff type"

4156 msgstr "sélectionner les fichiers par types de diff"

4157

4065 -#: diff.c:5598

4158 +#: diff.c:5640

4159 msgid "<file>"

4160 msgstr "<fichier>"

4161

4069 -#: diff.c:5599

4070 -msgid "Output to a specific file"

4071 -msgstr "Sortie vers un fichier spécifié"

4162 +#: diff.c:5641

4163 +msgid "output to a specific file"

4164 +msgstr "sortie vers un fichier spécifique"

4165

4073 -#: diff.c:6257

4166 +#: diff.c:6321

4167 msgid "exhaustive rename detection was skipped due to too many files."

4168 msgstr ""

4169 "détection exhaustive de renommage annulée à cause d'un trop grand nombre de "

4170 "fichiers."

4171

4079 -#: diff.c:6260

4172 +#: diff.c:6324

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

4174 msgstr ""

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

4176 "grand nombre de fichiers."

4177

4085 -#: diff.c:6263

4178 +#: diff.c:6327

4179 #, c-format

4180 msgid ""

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

@@ -4136,20 +4229,20 @@ msgstr "désactivation de la correspondance de motif de cone"

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

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

4231

4139 -#: dir.c:2418

4232 +#: dir.c:2419

4233 #, c-format

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

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

4236

4144 -#: dir.c:2720

4237 +#: dir.c:2721

4238 msgid "failed to get kernel name and information"

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

4240

4148 -#: dir.c:2844

4241 +#: dir.c:2846

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

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

4244

4152 -#: dir.c:3112

4245 +#: dir.c:3119

4246 msgid ""

4247 "No directory name could be guessed.\n"

4248 "Please specify a directory on the command line"

@@ -4157,17 +4250,17 @@ msgstr ""

4250 "Aucun nom de répertoire n'a pu être deviné\n"

4251 "Veuillez spécifier un répertoire dans la ligne de commande"

4252

4160 -#: dir.c:3800

4253 +#: dir.c:3807

4254 #, c-format

4255 msgid "index file corrupt in repo %s"

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

4257

4165 -#: dir.c:3847 dir.c:3852

4258 +#: dir.c:3854 dir.c:3859

4259 #, c-format

4260 msgid "could not create directories for %s"

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

4262

4170 -#: dir.c:3881

4263 +#: dir.c:3888

4264 #, c-format

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

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

@@ -4188,7 +4281,7 @@ msgstr "Filtrage du contenu"

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

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

4283

4191 -#: environment.c:145

4284 +#: environment.c:147

4285 #, c-format

4286 msgid "bad git namespace path \"%s\""

4287 msgstr "espaces de nom de Git \"%s\""

@@ -4220,247 +4313,274 @@ msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

4313 msgid "unable to write to remote"

4314 msgstr "impossible d'écrire sur un distant"

4315

4223 -#: fetch-pack.c:395 fetch-pack.c:1439

4316 +#: fetch-pack.c:397 fetch-pack.c:1460

4317 #, c-format

4318 msgid "invalid shallow line: %s"

4319 msgstr "ligne de superficiel invalide : %s"

4320

4228 -#: fetch-pack.c:401 fetch-pack.c:1445

4321 +#: fetch-pack.c:403 fetch-pack.c:1466

4322 #, c-format

4323 msgid "invalid unshallow line: %s"

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

4325

4233 -#: fetch-pack.c:403 fetch-pack.c:1447

4326 +#: fetch-pack.c:405 fetch-pack.c:1468

4327 #, c-format

4328 msgid "object not found: %s"

4329 msgstr "objet non trouvé : %s"

4330

4238 -#: fetch-pack.c:406 fetch-pack.c:1450

4331 +#: fetch-pack.c:408 fetch-pack.c:1471

4332 #, c-format

4333 msgid "error in object: %s"

4334 msgstr "erreur dans l'objet : %s"

4335

4243 -#: fetch-pack.c:408 fetch-pack.c:1452

4336 +#: fetch-pack.c:410 fetch-pack.c:1473

4337 #, c-format

4338 msgid "no shallow found: %s"

4339 msgstr "pas de superficiel trouvé : %s"

4340

4248 -#: fetch-pack.c:411 fetch-pack.c:1456

4341 +#: fetch-pack.c:413 fetch-pack.c:1477

4342 #, c-format

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

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

4345

4253 -#: fetch-pack.c:451

4346 +#: fetch-pack.c:453

4347 #, c-format

4348 msgid "got %s %d %s"

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

4350

4258 -#: fetch-pack.c:468

4351 +#: fetch-pack.c:470

4352 #, c-format

4353 msgid "invalid commit %s"

4354 msgstr "commit invalide %s"

4355

4263 -#: fetch-pack.c:499

4356 +#: fetch-pack.c:501

4357 msgid "giving up"

4358 msgstr "abandon"

4359

4267 -#: fetch-pack.c:512 progress.c:339

4360 +#: fetch-pack.c:514 progress.h:25

4361 msgid "done"

4362 msgstr "fait"

4363

4271 -#: fetch-pack.c:524

4364 +#: fetch-pack.c:526

4365 #, c-format

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

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

4368

4276 -#: fetch-pack.c:560

4369 +#: fetch-pack.c:562

4370 #, c-format

4371 msgid "Marking %s as complete"

4372 msgstr "Marquage de %s comme terminé"

4373

4281 -#: fetch-pack.c:775

4374 +#: fetch-pack.c:784

4375 #, c-format

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

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

4378

4286 -#: fetch-pack.c:861

4379 +#: fetch-pack.c:870

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

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

4382

4290 -#: fetch-pack.c:869

4383 +#: fetch-pack.c:878

4384 msgid "protocol error: bad pack header"

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

4386

4294 -#: fetch-pack.c:965

4387 +#: fetch-pack.c:974

4388 #, c-format

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

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

4391

4299 -#: fetch-pack.c:971

4392 +#: fetch-pack.c:980

4393 msgid "fetch-pack: invalid index-pack output"

4394 msgstr "fetch-pack : sortie d'index de pack invalide"

4395

4303 -#: fetch-pack.c:988

4396 +#: fetch-pack.c:997

4397 #, c-format

4398 msgid "%s failed"

4399 msgstr "échec de %s"

4400

4308 -#: fetch-pack.c:990

4401 +#: fetch-pack.c:999

4402 msgid "error in sideband demultiplexer"

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

4404

4312 -#: fetch-pack.c:1035

4405 +#: fetch-pack.c:1048

4406 #, c-format

4407 msgid "Server version is %.*s"

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

4409

4317 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058

4318 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4319 -#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090

4320 -#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112

4410 +#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071

4411 +#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087

4412 +#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103

4413 +#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125

4414 #, c-format

4415 msgid "Server supports %s"

4416 msgstr "Le serveur supporte %s"

4417

4325 -#: fetch-pack.c:1045

4418 +#: fetch-pack.c:1058

4419 msgid "Server does not support shallow clients"

4420 msgstr "Le serveur ne supporte les clients superficiels"

4421

4329 -#: fetch-pack.c:1105

4422 +#: fetch-pack.c:1118

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

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

4425

4333 -#: fetch-pack.c:1110

4426 +#: fetch-pack.c:1123

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

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

4429

4337 -#: fetch-pack.c:1114

4430 +#: fetch-pack.c:1127

4431 msgid "Server does not support --deepen"

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

4433

4341 -#: fetch-pack.c:1116

4434 +#: fetch-pack.c:1129

4435 msgid "Server does not support this repository's object format"

4436 msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"

4437

4345 -#: fetch-pack.c:1129

4438 +#: fetch-pack.c:1142

4439 msgid "no common commits"

4440 msgstr "pas de commit commun"

4441

4349 -#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130

4442 +#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166

4443 msgid "source repository is shallow, reject to clone."

4444 msgstr "le dépôt source est superficiel, clonage rejeté."

4445

4353 -#: fetch-pack.c:1144 fetch-pack.c:1681

4446 +#: fetch-pack.c:1157 fetch-pack.c:1705

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

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

4449

4357 -#: fetch-pack.c:1258

4450 +#: fetch-pack.c:1271

4451 #, c-format

4452 msgid "mismatched algorithms: client %s; server %s"

4453 msgstr "non-correspondance des algorithmes : client %s ; serveur %s"

4454

4362 -#: fetch-pack.c:1262

4455 +#: fetch-pack.c:1275

4456 #, c-format

4457 msgid "the server does not support algorithm '%s'"

4458 msgstr "le serveur ne supporte pas l'algorithme '%s'"

4459

4367 -#: fetch-pack.c:1295

4460 +#: fetch-pack.c:1308

4461 msgid "Server does not support shallow requests"

4462 msgstr "Le serveur ne supporte pas les requêtes superficielles"

4463

4371 -#: fetch-pack.c:1302

4464 +#: fetch-pack.c:1315

4465 msgid "Server supports filter"

4466 msgstr "Le serveur supporte filter"

4467

4375 -#: fetch-pack.c:1345 fetch-pack.c:2063

4468 +#: fetch-pack.c:1358 fetch-pack.c:2087

4469 msgid "unable to write request to remote"

4470 msgstr "impossible d'écrire la requête sur le distant"

4471

4379 -#: fetch-pack.c:1363

4472 +#: fetch-pack.c:1376

4473 #, c-format

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

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

4476

4384 -#: fetch-pack.c:1369

4477 +#: fetch-pack.c:1382

4478 #, c-format

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

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

4481

4389 -#: fetch-pack.c:1403

4482 +#: fetch-pack.c:1416

4483 #, c-format

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

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

4486

4394 -#: fetch-pack.c:1408

4487 +#: fetch-pack.c:1421

4488 #, c-format

4489 msgid "error processing acks: %d"

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

4491

4399 -#: fetch-pack.c:1418

4400 -msgid "expected packfile to be sent after 'ready'"

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

4492 +#. TRANSLATORS: The parameter will be 'ready', a protocol

4493 +#. keyword.

4494 +#.

4495 +#: fetch-pack.c:1435

4496 +#, c-format

4497 +msgid "expected packfile to be sent after '%s'"

4498 +msgstr "fichier paquet attendu à envoyer après '%s'"

4499

4403 -#: fetch-pack.c:1420

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

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

4500 +#. TRANSLATORS: The parameter will be 'ready', a protocol

4501 +#. keyword.

4502 +#.

4503 +#: fetch-pack.c:1441

4504 +#, c-format

4505 +msgid "expected no other sections to be sent after no '%s'"

4506 +msgstr "aucune autre section attendue à envoyer après absence de '%s'"

4507

4407 -#: fetch-pack.c:1461

4508 +#: fetch-pack.c:1482

4509 #, c-format

4510 msgid "error processing shallow info: %d"

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

4512

4412 -#: fetch-pack.c:1510

4513 +#: fetch-pack.c:1531

4514 #, c-format

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

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

4517

4417 -#: fetch-pack.c:1515

4518 +#: fetch-pack.c:1536

4519 #, c-format

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

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

4522

4422 -#: fetch-pack.c:1520

4523 +#: fetch-pack.c:1541

4524 #, c-format

4525 msgid "error processing wanted refs: %d"

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

4527

4427 -#: fetch-pack.c:1550

4528 +#: fetch-pack.c:1571

4529 msgid "git fetch-pack: expected response end packet"

4530 msgstr "git fetch-pack : paquet de fin de réponse attendu"

4531

4431 -#: fetch-pack.c:1959

4532 +#: fetch-pack.c:1983

4533 msgid "no matching remote head"

4534 msgstr "pas de HEAD distante correspondante"

4535

4435 -#: fetch-pack.c:1982 builtin/clone.c:581

4536 +#: fetch-pack.c:2006 builtin/clone.c:587

4537 msgid "remote did not send all necessary objects"

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

4539

4439 -#: fetch-pack.c:2085

4540 +#: fetch-pack.c:2109

4541 msgid "unexpected 'ready' from remote"

4542 msgstr "'ready' inattendu depuis le distant"

4543

4443 -#: fetch-pack.c:2108

4544 +#: fetch-pack.c:2132

4545 #, c-format

4546 msgid "no such remote ref %s"

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

4548

4448 -#: fetch-pack.c:2111

4549 +#: fetch-pack.c:2135

4550 #, c-format

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

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

4553

4453 -#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974

4454 -#: gpg-interface.c:990

4554 +#: fsmonitor-ipc.c:119

4555 +#, c-format

4556 +msgid "fsmonitor_ipc__send_query: invalid path '%s'"

4557 +msgstr "fsmonitor_ipc__send_query : chemin invalide '%s'"

4558 +

4559 +#: fsmonitor-ipc.c:125

4560 +#, c-format

4561 +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"

4562 +msgstr "fsmonitor_ipc__send_query : erreur non spécifiée sur '%s'"

4563 +

4564 +#: fsmonitor-ipc.c:155

4565 +msgid "fsmonitor--daemon is not running"

4566 +msgstr "fsmonitor--daemon n'est pas en cours d'exécution"

4567 +

4568 +#: fsmonitor-ipc.c:164

4569 +#, c-format

4570 +msgid "could not send '%s' command to fsmonitor--daemon"

4571 +msgstr "impossible de lancer la commmand '%s' à fsmonitor--daemon"

4572 +

4573 +#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995

4574 +#: gpg-interface.c:1011

4575 msgid "could not create temporary file"

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

4577

4458 -#: gpg-interface.c:332 gpg-interface.c:460

4578 +#: gpg-interface.c:332 gpg-interface.c:459

4579 #, c-format

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

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

4582

4463 -#: gpg-interface.c:451

4583 +#: gpg-interface.c:450

4584 msgid ""

4585 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4586 "signature verification"

@@ -4468,7 +4588,7 @@ msgstr ""

4588 "gpg.ssh.allowedSignersFile doit exister et être configuré pour la "

4589 "vérification de signature ssh"

4590

4471 -#: gpg-interface.c:480

4591 +#: gpg-interface.c:479

4592 msgid ""

4593 "ssh-keygen -Y find-principals/verify is needed for ssh signature "

4594 "verification (available in openssh version 8.2p1+)"

@@ -4476,56 +4596,56 @@ msgstr ""

4596 "ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de "

4597 "signature ssh (disponible depuis openssh version 8.2p1+)"

4598

4479 -#: gpg-interface.c:536

4599 +#: gpg-interface.c:550

4600 #, c-format

4601 msgid "ssh signing revocation file configured but not found: %s"

4602 msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"

4603

4484 -#: gpg-interface.c:624

4604 +#: gpg-interface.c:638

4605 #, c-format

4606 msgid "bad/incompatible signature '%s'"

4607 msgstr "signature incompatible ou mauvaise '%s'"

4608

4489 -#: gpg-interface.c:801 gpg-interface.c:806

4609 +#: gpg-interface.c:815 gpg-interface.c:820

4610 #, c-format

4611 msgid "failed to get the ssh fingerprint for key '%s'"

4612 msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"

4613

4494 -#: gpg-interface.c:829

4614 +#: gpg-interface.c:843

4615 msgid ""

4616 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4617 msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"

4618

4499 -#: gpg-interface.c:851

4619 +#: gpg-interface.c:865

4620 #, c-format

4621 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4622 msgstr ""

4623 "gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"

4624

4505 -#: gpg-interface.c:857

4625 +#: gpg-interface.c:871

4626 #, c-format

4627 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4628 msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"

4629

4510 -#: gpg-interface.c:945

4630 +#: gpg-interface.c:966

4631 msgid "gpg failed to sign the data"

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

4633

4514 -#: gpg-interface.c:967

4634 +#: gpg-interface.c:988

4635 msgid "user.signingkey needs to be set for ssh signing"

4636 msgstr "user.signingkey doit être configuré pour pour signer avec ssh"

4637

4518 -#: gpg-interface.c:978

4638 +#: gpg-interface.c:999

4639 #, c-format

4640 msgid "failed writing ssh signing key to '%s'"

4641 msgstr "impossible d'écrire la clé de signature ssh dans '%s'"

4642

4523 -#: gpg-interface.c:996

4643 +#: gpg-interface.c:1017

4644 #, c-format

4645 msgid "failed writing ssh signing key buffer to '%s'"

4646 msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"

4647

4528 -#: gpg-interface.c:1014

4648 +#: gpg-interface.c:1035

4649 msgid ""

4650 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4651 "8.2p1+)"

@@ -4533,7 +4653,7 @@ msgstr ""

4653 "ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "

4654 "dans openssh version 8.2p1+)"

4655

4536 -#: gpg-interface.c:1026

4656 +#: gpg-interface.c:1047

4657 #, c-format

4658 msgid "failed reading ssh signing data buffer from '%s'"

4659 msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"

@@ -4543,7 +4663,7 @@ msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"

4663 msgid "ignored invalid color '%.*s' in log.graphColors"

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

4665

4546 -#: grep.c:531

4666 +#: grep.c:446

4667 msgid ""

4668 "given pattern contains NULL byte (via -f <file>). This is only supported "

4669 "with -P under PCRE v2"

@@ -4551,112 +4671,112 @@ msgstr ""

4671 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "

4672 "supporté qu'avec -P avec PCRE v2"

4673

4554 -#: grep.c:1942

4674 +#: grep.c:1859

4675 #, c-format

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

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

4678

4559 -#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90

4679 +#: grep.c:1876 setup.c:177 builtin/clone.c:308 builtin/diff.c:90

4680 #: builtin/rm.c:136

4681 #, c-format

4682 msgid "failed to stat '%s'"

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

4684

4565 -#: grep.c:1970

4685 +#: grep.c:1887

4686 #, c-format

4687 msgid "'%s': short read"

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

4689

4570 -#: help.c:24

4690 +#: help.c:25

4691 msgid "start a working area (see also: git help tutorial)"

4692 msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"

4693

4574 -#: help.c:25

4694 +#: help.c:26

4695 msgid "work on the current change (see also: git help everyday)"

4696 msgstr ""

4697 "travailler sur la modification actuelle (voir aussi : git help revisions)"

4698

4579 -#: help.c:26

4699 +#: help.c:27

4700 msgid "examine the history and state (see also: git help revisions)"

4701 msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"

4702

4583 -#: help.c:27

4703 +#: help.c:28

4704 msgid "grow, mark and tweak your common history"

4705 msgstr "agrandir, marquer et modifier votre historique"

4706

4587 -#: help.c:28

4707 +#: help.c:29

4708 msgid "collaborate (see also: git help workflows)"

4709 msgstr "collaborer (voir aussi : git help workflows)"

4710

4591 -#: help.c:32

4711 +#: help.c:33

4712 msgid "Main Porcelain Commands"

4713 msgstr "Commandes Porcelaine Principales"

4714

4595 -#: help.c:33

4715 +#: help.c:34

4716 msgid "Ancillary Commands / Manipulators"

4717 msgstr "Commandes Auxiliaires / Manipulateurs"

4718

4599 -#: help.c:34

4719 +#: help.c:35

4720 msgid "Ancillary Commands / Interrogators"

4721 msgstr "Commandes Auxiliaires / Interrogateurs"

4722

4603 -#: help.c:35

4723 +#: help.c:36

4724 msgid "Interacting with Others"

4725 msgstr "Interaction avec d'autres développeurs"

4726

4607 -#: help.c:36

4727 +#: help.c:37

4728 msgid "Low-level Commands / Manipulators"

4729 msgstr "Commandes bas-niveau / Manipulateurs"

4730

4611 -#: help.c:37

4731 +#: help.c:38

4732 msgid "Low-level Commands / Interrogators"

4733 msgstr "Commandes bas niveau / Interrogateurs"

4734

4615 -#: help.c:38

4735 +#: help.c:39

4736 msgid "Low-level Commands / Syncing Repositories"

4737 msgstr "Commandes bas niveau / Synchronisation de dépôts"

4738

4619 -#: help.c:39

4739 +#: help.c:40

4740 msgid "Low-level Commands / Internal Helpers"

4741 msgstr "Commandes bas niveau / Assistants internes"

4742

4623 -#: help.c:313

4743 +#: help.c:316

4744 #, c-format

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

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

4747

4628 -#: help.c:320

4748 +#: help.c:323

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

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

4751

4632 -#: help.c:329

4752 +#: help.c:332

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

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

4755

4636 -#: help.c:378 git.c:100

4756 +#: help.c:382 git.c:100

4757 #, c-format

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

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

4760

4641 -#: help.c:418

4761 +#: help.c:422

4762 msgid "The Git concept guides are:"

4763 msgstr "Les guides des concepts de Git sont :"

4764

4645 -#: help.c:442

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

4647 -msgstr ""

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

4649 -"commande spécifique"

4650 -

4651 -#: help.c:447

4765 +#: help.c:446

4766 msgid "External commands"

4767 msgstr "Commandes externes"

4768

4655 -#: help.c:462

4769 +#: help.c:468

4770 msgid "Command aliases"

4771 msgstr "Alias de commande"

4772

4659 -#: help.c:543

4773 +#: help.c:486

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

4775 +msgstr ""

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

4777 +"commande spécifique"

4778 +

4779 +#: help.c:563

4780 #, c-format

4781 msgid ""

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

@@ -4665,38 +4785,38 @@ msgstr ""

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

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

4787

4668 -#: help.c:565 help.c:662

4788 +#: help.c:585 help.c:682

4789 #, c-format

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

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

4792

4673 -#: help.c:613

4793 +#: help.c:633

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

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

4796

4677 -#: help.c:635

4797 +#: help.c:655

4798 #, c-format

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

4800 msgstr ""

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

4802

4683 -#: help.c:640

4803 +#: help.c:660

4804 #, c-format

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

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

4807

4688 -#: help.c:646

4808 +#: help.c:666

4809 #, c-format

4810 msgid "Run '%s' instead [y/N]? "

4811 msgstr "Lancer '%s' à la place [y/N] ? "

4812

4693 -#: help.c:654

4813 +#: help.c:674

4814 #, c-format

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

4816 msgstr ""

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

4818

4699 -#: help.c:666

4819 +#: help.c:686

4820 msgid ""

4821 "\n"

4822 "The most similar command is"

@@ -4710,16 +4830,16 @@ msgstr[1] ""

4830 "\n"

4831 "Les commandes les plus ressemblantes sont"

4832

4713 -#: help.c:706

4833 +#: help.c:729

4834 msgid "git version [<options>]"

4835 msgstr "git version [<options>]"

4836

4717 -#: help.c:761

4837 +#: help.c:784

4838 #, c-format

4839 msgid "%s: %s - %s"

4840 msgstr "%s: %s - %s"

4841

4722 -#: help.c:765

4842 +#: help.c:788

4843 msgid ""

4844 "\n"

4845 "Did you mean this?"

@@ -4733,7 +4853,7 @@ msgstr[1] ""

4853 "\n"

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

4855

4736 -#: hook.c:27

4856 +#: hook.c:28

4857 #, c-format

4858 msgid ""

4859 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -4743,15 +4863,20 @@ msgstr ""

4863 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

4864 "false`."

4865

4746 -#: ident.c:353

4866 +#: hook.c:87

4867 +#, c-format

4868 +msgid "Couldn't start hook '%s'\n"

4869 +msgstr "impossible de démarrer le crochet '%s'\n"

4870 +

4871 +#: ident.c:354

4872 msgid "Author identity unknown\n"

4873 msgstr "Identité d'auteur inconnue\n"

4874

4750 -#: ident.c:356

4875 +#: ident.c:357

4876 msgid "Committer identity unknown\n"

4877 msgstr "Indentité de validateur inconnue\n"

4878

4754 -#: ident.c:362

4879 +#: ident.c:363

4880 msgid ""

4881 "\n"

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

@@ -4777,72 +4902,72 @@ msgstr ""

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

4903 "\n"

4904

4780 -#: ident.c:397

4905 +#: ident.c:398

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

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

4908

4784 -#: ident.c:402

4909 +#: ident.c:403

4910 #, c-format

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

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

4913

4789 -#: ident.c:419

4914 +#: ident.c:420

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

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

4917

4793 -#: ident.c:425

4918 +#: ident.c:426

4919 #, c-format

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

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

4922

4798 -#: ident.c:433

4923 +#: ident.c:434

4924 #, c-format

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

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

4927

4803 -#: ident.c:439

4928 +#: ident.c:440

4929 #, c-format

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

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

4932

4808 -#: ident.c:454 builtin/commit.c:648

4933 +#: ident.c:455 builtin/commit.c:649

4934 #, c-format

4935 msgid "invalid date format: %s"

4936 msgstr "format de date invalide : %s"

4937

4813 -#: list-objects-filter-options.c:83

4938 +#: list-objects-filter-options.c:68

4939 msgid "expected 'tree:<depth>'"

4940 msgstr "attendu : 'tree:<profondeur>'"

4941

4817 -#: list-objects-filter-options.c:98

4942 +#: list-objects-filter-options.c:83

4943 msgid "sparse:path filters support has been dropped"

4944 msgstr "sparse : le support des filtres de chemin a été abandonné"

4945

4821 -#: list-objects-filter-options.c:105

4946 +#: list-objects-filter-options.c:90

4947 #, c-format

4948 msgid "'%s' for 'object:type=<type>' is not a valid object type"

4949 msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide"

4950

4826 -#: list-objects-filter-options.c:124

4951 +#: list-objects-filter-options.c:109

4952 #, c-format

4953 msgid "invalid filter-spec '%s'"

4954 msgstr "spécificateur de filtre invalide '%s'"

4955

4831 -#: list-objects-filter-options.c:140

4956 +#: list-objects-filter-options.c:125

4957 #, c-format

4958 msgid "must escape char in sub-filter-spec: '%c'"

4959 msgstr ""

4960 "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"

4961

4837 -#: list-objects-filter-options.c:182

4962 +#: list-objects-filter-options.c:167

4963 msgid "expected something after combine:"

4964 msgstr "quelque chose attendu après combine :"

4965

4841 -#: list-objects-filter-options.c:264

4966 +#: list-objects-filter-options.c:249

4967 msgid "multiple filter-specs cannot be combined"

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

4969

4845 -#: list-objects-filter-options.c:376

4970 +#: list-objects-filter-options.c:365

4971 msgid "unable to upgrade repository format to support partial clone"

4972 msgstr ""

4973 "impossible de mettre à jour le format de dépôt pour supporter les clones "

@@ -4858,19 +4983,19 @@ msgstr "impossible d'accéder au blob clairsemé dans '%s'"

4983 msgid "unable to parse sparse filter data in %s"

4984 msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"

4985

4861 -#: list-objects.c:127

4986 +#: list-objects.c:144

4987 #, c-format

4988 msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4989 msgstr ""

4990 "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"

4991

4867 -#: list-objects.c:140

4992 +#: list-objects.c:157

4993 #, c-format

4994 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4995 msgstr ""

4996 "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"

4997

4873 -#: list-objects.c:398

4998 +#: list-objects.c:415

4999 #, c-format

5000 msgid "unable to load root tree for commit %s"

5001 msgstr "impossible de charger l'arbre racine pour le commit %s"

@@ -4899,17 +5024,12 @@ msgstr ""

5024 msgid "Unable to create '%s.lock': %s"

5025 msgstr "Impossible de créer '%s.lock' : %s"

5026

4902 -#: ls-refs.c:37

4903 -#, c-format

4904 -msgid "invalid value '%s' for lsrefs.unborn"

4905 -msgstr "valeur invalide '%s' pour lsrefs.unborn"

4906 -

4907 -#: ls-refs.c:174

5027 +#: ls-refs.c:175

5028 #, c-format

5029 msgid "unexpected line: '%s'"

5030 msgstr "ligne inattendue : '%s'"

5031

4912 -#: ls-refs.c:178

5032 +#: ls-refs.c:179

5033 msgid "expected flush after ls-refs arguments"

5034 msgstr "vidage attendu après les arguments ls-refs"

5035

@@ -4917,39 +5037,39 @@ msgstr "vidage attendu après les arguments ls-refs"

5037 msgid "quoted CRLF detected"

5038 msgstr "CRLF citées détectées"

5039

4920 -#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46

5040 +#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46

5041 #, c-format

5042 msgid "bad action '%s' for '%s'"

5043 msgstr "action invalide '%s' pour '%s'"

5044

4925 -#: merge-ort.c:1584 merge-recursive.c:1211

5045 +#: merge-ort.c:1630 merge-recursive.c:1214

5046 #, c-format

5047 msgid "Failed to merge submodule %s (not checked out)"

5048 msgstr "Échec de la fusion du sous-module %s (non extrait)"

5049

4930 -#: merge-ort.c:1593 merge-recursive.c:1218

5050 +#: merge-ort.c:1639 merge-recursive.c:1221

5051 #, c-format

5052 msgid "Failed to merge submodule %s (commits not present)"

5053 msgstr "Échec de fusion du sous-module %s (commits non présents)"

5054

4935 -#: merge-ort.c:1602 merge-recursive.c:1225

5055 +#: merge-ort.c:1648 merge-recursive.c:1228

5056 #, c-format

5057 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

5058 msgstr ""

5059 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

5060 "base de fusion)"

5061

4942 -#: merge-ort.c:1612 merge-ort.c:1620

5062 +#: merge-ort.c:1658 merge-ort.c:1666

5063 #, c-format

5064 msgid "Note: Fast-forwarding submodule %s to %s"

5065 msgstr "Note : Avance rapide du sous-module %s à %s"

5066

4947 -#: merge-ort.c:1642

5067 +#: merge-ort.c:1688

5068 #, c-format

5069 msgid "Failed to merge submodule %s"

5070 msgstr "Échec de la fusion du sous-module %s"

5071

4952 -#: merge-ort.c:1649

5072 +#: merge-ort.c:1695

5073 #, c-format

5074 msgid ""

5075 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4959,7 +5079,7 @@ msgstr ""

5079 "existe :\n"

5080 "%s\n"

5081

4962 -#: merge-ort.c:1653 merge-recursive.c:1281

5082 +#: merge-ort.c:1699 merge-recursive.c:1284

5083 #, c-format

5084 msgid ""

5085 "If this is correct simply add it to the index for example\n"

@@ -4976,7 +5096,7 @@ msgstr ""

5096 "\n"

5097 "qui acceptera cette suggestion.\n"

5098

4979 -#: merge-ort.c:1666

5099 +#: merge-ort.c:1712

5100 #, c-format

5101 msgid ""

5102 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4986,21 +5106,21 @@ msgstr ""

5106 "existent :\n"

5107 "%s"

5108

4989 -#: merge-ort.c:1887 merge-recursive.c:1372

5109 +#: merge-ort.c:1937 merge-recursive.c:1375

5110 msgid "Failed to execute internal merge"

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

5112

4993 -#: merge-ort.c:1892 merge-recursive.c:1377

5113 +#: merge-ort.c:1942 merge-recursive.c:1380

5114 #, c-format

5115 msgid "Unable to add %s to database"

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

5117

4998 -#: merge-ort.c:1899 merge-recursive.c:1410

5118 +#: merge-ort.c:1949 merge-recursive.c:1413

5119 #, c-format

5120 msgid "Auto-merging %s"

5121 msgstr "Fusion automatique de %s"

5122

5003 -#: merge-ort.c:2038 merge-recursive.c:2132

5123 +#: merge-ort.c:2088 merge-recursive.c:2135

5124 #, c-format

5125 msgid ""

5126 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -5009,7 +5129,7 @@ msgstr ""

5129 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

5130 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

5131

5012 -#: merge-ort.c:2048 merge-recursive.c:2142

5132 +#: merge-ort.c:2098 merge-recursive.c:2145

5133 #, c-format

5134 msgid ""

5135 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -5018,7 +5138,7 @@ msgstr ""

5138 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

5139 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

5140

5021 -#: merge-ort.c:2106

5141 +#: merge-ort.c:2156

5142 #, c-format

5143 msgid ""

5144 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -5029,7 +5149,7 @@ msgstr ""

5149 "parce que le répertoire a été renommé en plusieurs autres répertoires, sans "

5150 "aucune destination récupérant la majorité des fichiers."

5151

5032 -#: merge-ort.c:2260 merge-recursive.c:2478

5152 +#: merge-ort.c:2310 merge-recursive.c:2481

5153 #, c-format

5154 msgid ""

5155 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -5038,7 +5158,7 @@ msgstr ""

5158 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

5159 "renommé."

5160

5041 -#: merge-ort.c:2400 merge-recursive.c:3261

5161 +#: merge-ort.c:2450 merge-recursive.c:3264

5162 #, c-format

5163 msgid ""

5164 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -5047,7 +5167,7 @@ msgstr ""

5167 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

5168 "en %s ; déplacé dans %s."

5169

5050 -#: merge-ort.c:2407 merge-recursive.c:3268

5170 +#: merge-ort.c:2457 merge-recursive.c:3271

5171 #, c-format

5172 msgid ""

5173 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -5056,7 +5176,7 @@ msgstr ""

5176 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

5177 "renommé en %s ; déplacé dans %s."

5178

5059 -#: merge-ort.c:2420 merge-recursive.c:3264

5179 +#: merge-ort.c:2470 merge-recursive.c:3267

5180 #, c-format

5181 msgid ""

5182 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -5066,7 +5186,7 @@ msgstr ""

5186 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

5187 "vers %s."

5188

5069 -#: merge-ort.c:2428 merge-recursive.c:3271

5189 +#: merge-ort.c:2478 merge-recursive.c:3274

5190 #, c-format

5191 msgid ""

5192 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -5076,13 +5196,13 @@ msgstr ""

5196 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

5197 "être déplacé vers %s."

5198

5079 -#: merge-ort.c:2584

5199 +#: merge-ort.c:2634

5200 #, c-format

5201 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

5202 msgstr ""

5203 "CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."

5204

5085 -#: merge-ort.c:2679

5205 +#: merge-ort.c:2729

5206 #, c-format

5207 msgid ""

5208 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -5093,24 +5213,24 @@ msgstr ""

5213 "des conflits de contenu ET entre en collision avec un autre chemin ; ceci "

5214 "peut resulter en des marqueurs de conflit imbriqués."

5215

5096 -#: merge-ort.c:2698 merge-ort.c:2722

5216 +#: merge-ort.c:2748 merge-ort.c:2772

5217 #, c-format

5218 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

5219 msgstr ""

5220 "CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "

5221 "supprimé dans %s."

5222

5103 -#: merge-ort.c:3212 merge-recursive.c:3022

5223 +#: merge-ort.c:3261 merge-recursive.c:3025

5224 #, c-format

5225 msgid "cannot read object %s"

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

5227

5108 -#: merge-ort.c:3215 merge-recursive.c:3025

5228 +#: merge-ort.c:3264 merge-recursive.c:3028

5229 #, c-format

5230 msgid "object %s is not a blob"

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

5232

5113 -#: merge-ort.c:3644

5233 +#: merge-ort.c:3693

5234 #, c-format

5235 msgid ""

5236 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

@@ -5119,7 +5239,7 @@ msgstr ""

5239 "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "

5240 "déplacement dans %s à la place."

5241

5122 -#: merge-ort.c:3721

5242 +#: merge-ort.c:3770

5243 #, c-format

5244 msgid ""

5245 "CONFLICT (distinct types): %s had different types on each side; renamed both "

@@ -5128,7 +5248,7 @@ msgstr ""

5248 "CONFLIT (types différents) : %s a des types différents des deux côtés ; "

5249 "renommé chacune de manière à pouvoir enregistrer les deux quelque part."

5250

5131 -#: merge-ort.c:3728

5251 +#: merge-ort.c:3777

5252 #, c-format

5253 msgid ""

5254 "CONFLICT (distinct types): %s had different types on each side; renamed one "

@@ -5138,24 +5258,24 @@ msgstr ""

5258 "renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "

5259 "part."

5260

5141 -#: merge-ort.c:3819 merge-recursive.c:3101

5261 +#: merge-ort.c:3866 merge-recursive.c:3104

5262 msgid "content"

5263 msgstr "contenu"

5264

5145 -#: merge-ort.c:3821 merge-recursive.c:3105

5265 +#: merge-ort.c:3868 merge-recursive.c:3108

5266 msgid "add/add"

5267 msgstr "ajout/ajout"

5268

5149 -#: merge-ort.c:3823 merge-recursive.c:3150

5269 +#: merge-ort.c:3870 merge-recursive.c:3153

5270 msgid "submodule"

5271 msgstr "sous-module"

5272

5153 -#: merge-ort.c:3825 merge-recursive.c:3151

5273 +#: merge-ort.c:3872 merge-recursive.c:3154

5274 #, c-format

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

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

5277

5158 -#: merge-ort.c:3869

5278 +#: merge-ort.c:3916

5279 #, c-format

5280 msgid ""

5281 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -5164,7 +5284,7 @@ msgstr ""

5284 "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "

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

5286

5167 -#: merge-ort.c:4165

5287 +#: merge-ort.c:4212

5288 #, c-format

5289 msgid ""

5290 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5176,12 +5296,12 @@ msgstr ""

5296 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5297 #. base, and 2-3) the trees for the two trees we're merging.

5298 #.

5179 -#: merge-ort.c:4534

5299 +#: merge-ort.c:4586

5300 #, c-format

5301 msgid "collecting merge info failed for trees %s, %s, %s"

5302 msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"

5303

5184 -#: merge-ort-wrappers.c:13 merge-recursive.c:3716

5304 +#: merge-ort-wrappers.c:13 merge-recursive.c:3723

5305 #, c-format

5306 msgid ""

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

@@ -5191,7 +5311,7 @@ msgstr ""

5311 "fusion :\n"

5312 " %s"

5313

5194 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405

5314 +#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405

5315 msgid "Already up to date."

5316 msgstr "Déjà à jour."

5317

@@ -5228,7 +5348,7 @@ msgstr ": peut-être un conflit D/F ?"

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

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

5350

5231 -#: merge-recursive.c:956 builtin/cat-file.c:41

5351 +#: merge-recursive.c:956 builtin/cat-file.c:47

5352 #, c-format

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

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

@@ -5253,44 +5373,44 @@ msgstr "échec à la création du lien symbolique '%s' : %s"

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

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

5375

5256 -#: merge-recursive.c:1233 merge-recursive.c:1246

5376 +#: merge-recursive.c:1236 merge-recursive.c:1249

5377 #, c-format

5378 msgid "Fast-forwarding submodule %s to the following commit:"

5379 msgstr "Avance rapide du sous-module %s au commit suivant :"

5380

5261 -#: merge-recursive.c:1236 merge-recursive.c:1249

5381 +#: merge-recursive.c:1239 merge-recursive.c:1252

5382 #, c-format

5383 msgid "Fast-forwarding submodule %s"

5384 msgstr "Avance rapide du sous-module %s"

5385

5266 -#: merge-recursive.c:1273

5386 +#: merge-recursive.c:1276

5387 #, c-format

5388 msgid "Failed to merge submodule %s (merge following commits not found)"

5389 msgstr ""

5390 "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

5391

5272 -#: merge-recursive.c:1277

5392 +#: merge-recursive.c:1280

5393 #, c-format

5394 msgid "Failed to merge submodule %s (not fast-forward)"

5395 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

5396

5277 -#: merge-recursive.c:1278

5397 +#: merge-recursive.c:1281

5398 msgid "Found a possible merge resolution for the submodule:\n"

5399 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

5400

5281 -#: merge-recursive.c:1290

5401 +#: merge-recursive.c:1293

5402 #, c-format

5403 msgid "Failed to merge submodule %s (multiple merges found)"

5404 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

5405

5286 -#: merge-recursive.c:1434

5406 +#: merge-recursive.c:1437

5407 #, c-format

5408 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5409 msgstr ""

5410 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

5411 "place."

5412

5293 -#: merge-recursive.c:1506

5413 +#: merge-recursive.c:1509

5414 #, c-format

5415 msgid ""

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

@@ -5299,7 +5419,7 @@ msgstr ""

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

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

5421

5302 -#: merge-recursive.c:1511

5422 +#: merge-recursive.c:1514

5423 #, c-format

5424 msgid ""

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

@@ -5308,7 +5428,7 @@ msgstr ""

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

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

5430

5311 -#: merge-recursive.c:1518

5431 +#: merge-recursive.c:1521

5432 #, c-format

5433 msgid ""

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

@@ -5317,7 +5437,7 @@ msgstr ""

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

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

5439

5320 -#: merge-recursive.c:1523

5440 +#: merge-recursive.c:1526

5441 #, c-format

5442 msgid ""

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

@@ -5326,61 +5446,61 @@ msgstr ""

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

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

5448

5329 -#: merge-recursive.c:1558

5449 +#: merge-recursive.c:1561

5450 msgid "rename"

5451 msgstr "renommage"

5452

5333 -#: merge-recursive.c:1558

5453 +#: merge-recursive.c:1561

5454 msgid "renamed"

5455 msgstr "renommé"

l10n: fr: v2.36 round 1