d01af2568e · matheusbsbs/matheus-bagliano

@@ -51,6 +51,7 @@

51 # to prune | éliminer

52 # to push | pousser

53 # to rebase | rebaser

54 +# scheduler | planificateur

55 # trailers | lignes terminales

56 # repository | dépôt

57 # remote | distante (ou serveur distant)

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

77 msgstr ""

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

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

79 -"POT-Creation-Date: 2021-08-14 07:56+0800\n"

80 -"PO-Revision-Date: 2021-08-14 08:28+0200\n"

80 +"POT-Creation-Date: 2021-10-30 09:36+0800\n"

81 +"PO-Revision-Date: 2021-10-31 17:47+0100\n"

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

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

84 "Language: fr\n"

@@ -87,216 +88,216 @@ msgstr ""

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

89 "X-Generator: Poedit 2.4.2\n"

90

90 -#: add-interactive.c:376

91 +#: add-interactive.c:380

92 #, c-format

93 msgid "Huh (%s)?"

94 msgstr "Hein (%s) ?"

95

95 -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

96 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

97 -#: builtin/rebase.c:1953

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

97 +#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233

98 +#: builtin/rebase.c:1642

99 msgid "could not read index"

100 msgstr "impossible de lire l'index"

101

101 -#: add-interactive.c:584 git-add--interactive.perl:269

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

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

104 msgid "binary"

105 msgstr "binaire"

106

106 -#: add-interactive.c:642 git-add--interactive.perl:278

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

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

109 msgid "nothing"

110 msgstr "rien"

111

111 -#: add-interactive.c:643 git-add--interactive.perl:314

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

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

114 msgid "unchanged"

115 msgstr "inchangé"

116

116 -#: add-interactive.c:680 git-add--interactive.perl:641

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

118 msgid "Update"

119 msgstr "Mise à jour"

120

120 -#: add-interactive.c:697 add-interactive.c:885

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

122 #, c-format

123 msgid "could not stage '%s'"

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

125

125 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

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

127 msgid "could not write index"

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

129

129 -#: add-interactive.c:706 git-add--interactive.perl:626

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

131 #, c-format, perl-format

132 msgid "updated %d path\n"

133 msgid_plural "updated %d paths\n"

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

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

136

136 -#: add-interactive.c:724 git-add--interactive.perl:676

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

138 #, c-format, perl-format

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

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

141

141 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

142 -#: builtin/reset.c:145

142 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

143 +#: builtin/reset.c:151

144 #, c-format

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

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

147

147 -#: add-interactive.c:759 git-add--interactive.perl:653

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

149 msgid "Revert"

150 msgstr "Inverser"

151

151 -#: add-interactive.c:775

152 +#: add-interactive.c:779

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

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

155

155 -#: add-interactive.c:813 git-add--interactive.perl:629

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

157 #, c-format, perl-format

158 msgid "reverted %d path\n"

159 msgid_plural "reverted %d paths\n"

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

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

162

162 -#: add-interactive.c:864 git-add--interactive.perl:693

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

164 #, c-format

165 msgid "No untracked files.\n"

166 msgstr "Aucun Fichier non suivi.\n"

167

167 -#: add-interactive.c:868 git-add--interactive.perl:687

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

169 msgid "Add untracked"

170 msgstr "Ajouter un fichier non-suivi"

171

171 -#: add-interactive.c:895 git-add--interactive.perl:623

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

173 #, c-format, perl-format

174 msgid "added %d path\n"

175 msgid_plural "added %d paths\n"

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

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

178

178 -#: add-interactive.c:925

179 +#: add-interactive.c:929

180 #, c-format

181 msgid "ignoring unmerged: %s"

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

183

183 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

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

185 #, c-format

186 msgid "Only binary files changed.\n"

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

188

188 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

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

190 #, c-format

191 msgid "No changes.\n"

192 msgstr "Aucune modification.\n"

193

193 -#: add-interactive.c:943 git-add--interactive.perl:1379

194 +#: add-interactive.c:947 git-add--interactive.perl:1379

195 msgid "Patch update"

196 msgstr "Mise à jour par patch"

197

197 -#: add-interactive.c:982 git-add--interactive.perl:1792

198 +#: add-interactive.c:986 git-add--interactive.perl:1792

199 msgid "Review diff"

200 msgstr "Réviser la différence"

201

201 -#: add-interactive.c:1010

202 +#: add-interactive.c:1014

203 msgid "show paths with changes"

204 msgstr "afficher les chemins comprenant des modifications"

205

205 -#: add-interactive.c:1012

206 +#: add-interactive.c:1016

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

208 msgstr ""

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

210

210 -#: add-interactive.c:1014

211 +#: add-interactive.c:1018

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

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

214

214 -#: add-interactive.c:1016

215 +#: add-interactive.c:1020

216 msgid "pick hunks and update selectively"

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

218

218 -#: add-interactive.c:1018

219 +#: add-interactive.c:1022

220 msgid "view diff between HEAD and index"

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

222

222 -#: add-interactive.c:1020

223 +#: add-interactive.c:1024

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

225 msgstr ""

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

227 "indexées"

228

228 -#: add-interactive.c:1028 add-interactive.c:1077

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

230 msgid "Prompt help:"

231 msgstr "Aide :"

232

232 -#: add-interactive.c:1030

233 +#: add-interactive.c:1034

234 msgid "select a single item"

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

236

236 -#: add-interactive.c:1032

237 +#: add-interactive.c:1036

238 msgid "select a range of items"

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

240

240 -#: add-interactive.c:1034

241 +#: add-interactive.c:1038

242 msgid "select multiple ranges"

243 msgstr "sélectionner plusieurs plages"

244

244 -#: add-interactive.c:1036 add-interactive.c:1081

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

246 msgid "select item based on unique prefix"

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

248

248 -#: add-interactive.c:1038

249 +#: add-interactive.c:1042

250 msgid "unselect specified items"

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

252

252 -#: add-interactive.c:1040

253 +#: add-interactive.c:1044

254 msgid "choose all items"

255 msgstr "choisir tous les éléments"

256

256 -#: add-interactive.c:1042

257 +#: add-interactive.c:1046

258 msgid "(empty) finish selecting"

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

260

260 -#: add-interactive.c:1079

261 +#: add-interactive.c:1083

262 msgid "select a numbered item"

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

264

264 -#: add-interactive.c:1083

265 +#: add-interactive.c:1087

266 msgid "(empty) select nothing"

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

268

268 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

269 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

270 msgid "*** Commands ***"

271 msgstr "*** Commandes ***"

272

272 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

273 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

274 msgid "What now"

275 msgstr "Et maintenant"

276

276 -#: add-interactive.c:1144 git-add--interactive.perl:213

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

278 msgid "staged"

279 msgstr "indexé"

280

280 -#: add-interactive.c:1144 git-add--interactive.perl:213

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

282 msgid "unstaged"

283 msgstr "non-indexé"

284

284 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

285 -#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

286 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

287 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

288 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

289 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

290 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

285 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

286 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

287 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190

288 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

289 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

290 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

291 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

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

293 msgid "path"

294 msgstr "chemin"

295

295 -#: add-interactive.c:1151

296 +#: add-interactive.c:1155

297 msgid "could not refresh index"

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

299

299 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

300 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

301 #, c-format

302 msgid "Bye.\n"

303 msgstr "Au revoir.\n"

@@ -818,7 +819,7 @@ msgstr "Désolé, impossible d'éditer cette section"

819 msgid "'git apply' failed"

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

821

821 -#: advice.c:145

822 +#: advice.c:78

823 #, c-format

824 msgid ""

825 "\n"

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

828 "\n"

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

830

830 -#: advice.c:161

831 +#: advice.c:94

832 #, c-format

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

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

835

835 -#: advice.c:252

836 +#: advice.c:178

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

839 -#: advice.c:254

840 +#: advice.c:180

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

843 -#: advice.c:256

844 +#: advice.c:182

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

847 -#: advice.c:258

848 +#: advice.c:184

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

851 -#: advice.c:260

852 +#: advice.c:186

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

855 -#: advice.c:262

856 +#: advice.c:188

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

860 -#: advice.c:270

861 +#: advice.c:196

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."

@@ -865,41 +866,48 @@ msgstr ""

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

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

868

868 -#: advice.c:278

869 +#: advice.c:204

870 msgid "Exiting because of an unresolved conflict."

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

872

872 -#: advice.c:283 builtin/merge.c:1375

873 +#: advice.c:209 builtin/merge.c:1379

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

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

876

876 -#: advice.c:285

877 +#: advice.c:211

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

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

880

880 -#: advice.c:286

881 +#: advice.c:212

882 msgid "Exiting because of unfinished merge."

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

884

884 -#: advice.c:296

885 +#: advice.c:217

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

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

888 +

889 +#: advice.c:227

890 #, c-format

891 msgid ""

887 -"The following pathspecs didn't match any eligible path, but they do match "

888 -"index\n"

889 -"entries outside the current sparse checkout:\n"

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

893 +"outside of your sparse-checkout definition, so will not be\n"

894 +"updated in the index:\n"

895 msgstr ""

891 -"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, "

892 -"mais correspondent\n"

893 -"dans les entrées d'index hors de l'extraction clairsemée actuelle :\n"

896 +"Les chemin ou spécificateurs de chemins suivants correspondent à des chemins\n"

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

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

899

895 -#: advice.c:303

900 +#: advice.c:234

901 msgid ""

897 -"Disable or modify the sparsity rules if you intend to update such entries."

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

903 +"* Use the --sparse option.\n"

904 +"* Disable or modify the sparsity rules."

905 msgstr ""

899 -"Désactiver ou modifier les règles de partialisation si vous allez mettre à "

900 -"jour de telles entrées."

906 +"Si vous souhaitez mettre à jour de telles entrées, essayez au choix :\n"

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

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

909

902 -#: advice.c:310

910 +#: advice.c:242

911 #, c-format

912 msgid ""

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

@@ -1089,49 +1097,49 @@ msgstr "le fichier supprimé %s a encore du contenu"

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

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

1099

1092 -#: apply.c:1977

1100 +#: apply.c:1978

1101 #, c-format

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

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

1104

1097 -#: apply.c:2014

1105 +#: apply.c:2015

1106 #, c-format

1107 msgid "unrecognized binary patch at line %d"

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

1109

1102 -#: apply.c:2176

1110 +#: apply.c:2177

1111 #, c-format

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

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

1114

1107 -#: apply.c:2262

1115 +#: apply.c:2263

1116 #, c-format

1117 msgid "unable to read symlink %s"

1118 msgstr "lecture du lien symbolique %s impossible"

1119

1112 -#: apply.c:2266

1120 +#: apply.c:2267

1121 #, c-format

1122 msgid "unable to open or read %s"

1123 msgstr "ouverture ou lecture de %s impossible"

1124

1117 -#: apply.c:2935

1125 +#: apply.c:2936

1126 #, c-format

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

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

1129

1122 -#: apply.c:3056

1130 +#: apply.c:3057

1131 #, c-format

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

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

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

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

1136

1129 -#: apply.c:3068

1137 +#: apply.c:3069

1138 #, c-format

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

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

1141

1134 -#: apply.c:3074

1142 +#: apply.c:3075

1143 #, c-format

1144 msgid ""

1145 "while searching for:\n"

@@ -1140,456 +1148,457 @@ msgstr ""

1148 "pendant la recherche de :\n"

1149 "%.*s"

1150

1143 -#: apply.c:3096

1151 +#: apply.c:3097

1152 #, c-format

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

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

1155

1148 -#: apply.c:3104

1156 +#: apply.c:3105

1157 #, c-format

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

1159 msgstr ""

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

1161 "inverse"

1162

1155 -#: apply.c:3151

1163 +#: apply.c:3152

1164 #, c-format

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

1166 msgstr ""

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

1168

1161 -#: apply.c:3162

1169 +#: apply.c:3163

1170 #, c-format

1171 msgid ""

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

1173 msgstr ""

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

1175

1168 -#: apply.c:3170

1176 +#: apply.c:3171

1177 #, c-format

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

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

1180

1173 -#: apply.c:3188

1181 +#: apply.c:3189

1182 #, c-format

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

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

1185

1178 -#: apply.c:3201

1186 +#: apply.c:3202

1187 #, c-format

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

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

1190

1183 -#: apply.c:3208

1191 +#: apply.c:3209

1192 #, c-format

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

1194 msgstr ""

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

1196 "trouvé)"

1197

1190 -#: apply.c:3229

1198 +#: apply.c:3230

1199 #, c-format

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

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

1202

1195 -#: apply.c:3352

1203 +#: apply.c:3353

1204 #, c-format

1205 msgid "cannot checkout %s"

1206 msgstr "extraction de %s impossible"

1207

1200 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1208 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1209 #: setup.c:308

1210 #, c-format

1211 msgid "failed to read %s"

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

1213

1206 -#: apply.c:3412

1214 +#: apply.c:3413

1215 #, c-format

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

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

1218

1211 -#: apply.c:3441 apply.c:3687

1219 +#: apply.c:3442 apply.c:3709

1220 #, c-format

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

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

1223

1216 -#: apply.c:3527 apply.c:3702

1224 +#: apply.c:3549 apply.c:3724

1225 #, c-format

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

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

1228

1221 -#: apply.c:3536 apply.c:3710 apply.c:3954

1229 +#: apply.c:3558 apply.c:3732 apply.c:3976

1230 #, c-format

1231 msgid "%s: does not match index"

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

1233

1226 -#: apply.c:3571

1234 +#: apply.c:3593

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

1236 msgstr ""

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

1238

1231 -#: apply.c:3574

1239 +#: apply.c:3596

1240 #, c-format

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

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

1243

1236 -#: apply.c:3590 apply.c:3594

1244 +#: apply.c:3612 apply.c:3616

1245 #, c-format

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

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

1248

1241 -#: apply.c:3606

1249 +#: apply.c:3628

1250 #, c-format

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

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

1253

1246 -#: apply.c:3620

1254 +#: apply.c:3642

1255 #, c-format

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

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

1258

1251 -#: apply.c:3625

1259 +#: apply.c:3647

1260 #, c-format

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

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

1263

1256 -#: apply.c:3642

1264 +#: apply.c:3664

1265 #, c-format

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

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

1268

1261 -#: apply.c:3654

1269 +#: apply.c:3676

1270 msgid "removal patch leaves file contents"

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

1272

1265 -#: apply.c:3727

1273 +#: apply.c:3749

1274 #, c-format

1275 msgid "%s: wrong type"

1276 msgstr "%s : type erroné"

1277

1270 -#: apply.c:3729

1278 +#: apply.c:3751

1279 #, c-format

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

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

1282

1275 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1276 -#: read-cache.c:1353

1283 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1284 +#: read-cache.c:1368

1285 #, c-format

1286 msgid "invalid path '%s'"

1287 msgstr "chemin invalide '%s'"

1288

1281 -#: apply.c:3952

1289 +#: apply.c:3974

1290 #, c-format

1291 msgid "%s: already exists in index"

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

1293

1286 -#: apply.c:3956

1294 +#: apply.c:3978

1295 #, c-format

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

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

1298

1291 -#: apply.c:3976

1299 +#: apply.c:3998

1300 #, c-format

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

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

1303

1296 -#: apply.c:3981

1304 +#: apply.c:4003

1305 #, c-format

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

1307 msgstr ""

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

1309

1302 -#: apply.c:4001

1310 +#: apply.c:4023

1311 #, c-format

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

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

1314

1307 -#: apply.c:4005

1315 +#: apply.c:4027

1316 #, c-format

1317 msgid "%s: patch does not apply"

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

1319

1312 -#: apply.c:4020

1320 +#: apply.c:4042

1321 #, c-format

1322 msgid "Checking patch %s..."

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

1324

1317 -#: apply.c:4112

1325 +#: apply.c:4134

1326 #, c-format

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

1328 msgstr ""

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

1330

1323 -#: apply.c:4119

1331 +#: apply.c:4141

1332 #, c-format

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

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

1335

1328 -#: apply.c:4122

1336 +#: apply.c:4144

1337 #, c-format

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

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

1340

1333 -#: apply.c:4131

1341 +#: apply.c:4153

1342 #, c-format

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

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

1345

1338 -#: apply.c:4141

1346 +#: apply.c:4163

1347 #, c-format

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

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

1350

1343 -#: apply.c:4279

1351 +#: apply.c:4301

1352 #, c-format

1353 msgid "unable to remove %s from index"

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

1355

1348 -#: apply.c:4313

1356 +#: apply.c:4335

1357 #, c-format

1358 msgid "corrupt patch for submodule %s"

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

1360

1353 -#: apply.c:4319

1361 +#: apply.c:4341

1362 #, c-format

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

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

1365

1358 -#: apply.c:4327

1366 +#: apply.c:4349

1367 #, c-format

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

1369 msgstr ""

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

1371 "impossible"

1372

1365 -#: apply.c:4333 apply.c:4478

1373 +#: apply.c:4355 apply.c:4500

1374 #, c-format

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

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

1377

1370 -#: apply.c:4376 builtin/bisect--helper.c:525

1378 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242

1379 +#: builtin/gc.c:2277

1380 #, c-format

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

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

1383

1375 -#: apply.c:4380

1384 +#: apply.c:4402

1385 #, c-format

1386 msgid "closing file '%s'"

1387 msgstr "fermeture du fichier '%s'"

1388

1380 -#: apply.c:4450

1389 +#: apply.c:4472

1390 #, c-format

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

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

1393

1385 -#: apply.c:4548

1394 +#: apply.c:4570

1395 #, c-format

1396 msgid "Applied patch %s cleanly."

1397 msgstr "Patch %s appliqué proprement."

1398

1390 -#: apply.c:4556

1399 +#: apply.c:4578

1400 msgid "internal error"

1401 msgstr "erreur interne"

1402

1394 -#: apply.c:4559

1403 +#: apply.c:4581

1404 #, c-format

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

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

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

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

1409

1401 -#: apply.c:4570

1410 +#: apply.c:4592

1411 #, c-format

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

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

1414

1406 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1415 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1416 #, c-format

1417 msgid "cannot open %s"

1418 msgstr "impossible d'ouvrir %s"

1419

1411 -#: apply.c:4592

1420 +#: apply.c:4614

1421 #, c-format

1422 msgid "Hunk #%d applied cleanly."

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

1424

1416 -#: apply.c:4596

1425 +#: apply.c:4618

1426 #, c-format

1427 msgid "Rejected hunk #%d."

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

1429

1421 -#: apply.c:4725

1430 +#: apply.c:4747

1431 #, c-format

1432 msgid "Skipped patch '%s'."

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

1434

1426 -#: apply.c:4733

1435 +#: apply.c:4755

1436 msgid "unrecognized input"

1437 msgstr "entrée non reconnue"

1438

1430 -#: apply.c:4753

1439 +#: apply.c:4775

1440 msgid "unable to read index file"

1441 msgstr "lecture du fichier d'index impossible"

1442

1434 -#: apply.c:4910

1443 +#: apply.c:4932

1444 #, c-format

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

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

1447

1439 -#: apply.c:4937

1448 +#: apply.c:4959

1449 #, c-format

1450 msgid "squelched %d whitespace error"

1451 msgid_plural "squelched %d whitespace errors"

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

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

1454

1446 -#: apply.c:4943 apply.c:4958

1455 +#: apply.c:4965 apply.c:4980

1456 #, c-format

1457 msgid "%d line adds whitespace errors."

1458 msgid_plural "%d lines add whitespace errors."

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

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

1461

1453 -#: apply.c:4951

1462 +#: apply.c:4973

1463 #, c-format

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

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

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

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

1468

1460 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1469 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1470 msgid "Unable to write new index file"

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

1472

1464 -#: apply.c:4995

1473 +#: apply.c:5017

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

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

1476

1468 -#: apply.c:4998

1477 +#: apply.c:5020

1478 msgid "apply changes matching the given path"

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

1480

1472 -#: apply.c:5000 builtin/am.c:2318

1481 +#: apply.c:5022 builtin/am.c:2320

1482 msgid "num"

1483 msgstr "num"

1484

1476 -#: apply.c:5001

1485 +#: apply.c:5023

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

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

1488

1480 -#: apply.c:5004

1489 +#: apply.c:5026

1490 msgid "ignore additions made by the patch"

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

1492

1484 -#: apply.c:5006

1493 +#: apply.c:5028

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

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

1496

1488 -#: apply.c:5010

1497 +#: apply.c:5032

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

1499 msgstr ""

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

1501

1493 -#: apply.c:5012

1502 +#: apply.c:5034

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

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

1505

1497 -#: apply.c:5014

1506 +#: apply.c:5036

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

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

1509

1501 -#: apply.c:5016

1510 +#: apply.c:5038

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

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

1513

1505 -#: apply.c:5018

1514 +#: apply.c:5040

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

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

1517

1509 -#: apply.c:5020

1518 +#: apply.c:5042

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

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

1521

1513 -#: apply.c:5022

1522 +#: apply.c:5044

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

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

1525

1517 -#: apply.c:5025

1526 +#: apply.c:5047

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

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

1529

1521 -#: apply.c:5027

1530 +#: apply.c:5049

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

1532 msgstr ""

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

1534

1526 -#: apply.c:5029

1535 +#: apply.c:5051

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

1537 msgstr ""

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

1539

1531 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1540 +#: apply.c:5054 builtin/checkout-index.c:196

1541 msgid "paths are separated with NUL character"

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

1543

1535 -#: apply.c:5034

1544 +#: apply.c:5056

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

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

1547

1539 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1548 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

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

1541 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1542 -#: builtin/rebase.c:1347

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

1551 +#: builtin/rebase.c:1051

1552 msgid "action"

1553 msgstr "action"

1554

1546 -#: apply.c:5036

1555 +#: apply.c:5058

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

1557 msgstr ""

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

1559 "d'espace"

1560

1552 -#: apply.c:5039 apply.c:5042

1561 +#: apply.c:5061 apply.c:5064

1562 msgid "ignore changes in whitespace when finding context"

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

1564

1556 -#: apply.c:5045

1565 +#: apply.c:5067

1566 msgid "apply the patch in reverse"

1567 msgstr "appliquer le patch en sens inverse"

1568

1560 -#: apply.c:5047

1569 +#: apply.c:5069

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

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

1572

1564 -#: apply.c:5049

1573 +#: apply.c:5071

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

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

1576

1568 -#: apply.c:5051

1577 +#: apply.c:5073

1578 msgid "allow overlapping hunks"

1579 msgstr "accepter les recouvrements de sections"

1580

1572 -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1573 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1574 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1581 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1582 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1583 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1584 msgid "be verbose"

1585 msgstr "mode verbeux"

1586

1578 -#: apply.c:5054

1587 +#: apply.c:5076

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

1589 msgstr ""

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

1591 "fichier"

1592

1584 -#: apply.c:5057

1593 +#: apply.c:5079

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

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

1596

1588 -#: apply.c:5059 builtin/am.c:2306

1597 +#: apply.c:5081 builtin/am.c:2308

1598 msgid "root"

1599 msgstr "racine"

1600

1592 -#: apply.c:5060

1601 +#: apply.c:5082

1602 msgid "prepend <root> to all filenames"

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

1604

@@ -1661,153 +1670,152 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

1670 msgid "cannot read %s"

1671 msgstr "impossible de lire %s"

1672

1664 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1665 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1666 -#: builtin/merge.c:1144

1673 +#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112

1674 +#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834

1675 +#: builtin/merge.c:1145

1676 #, c-format

1677 msgid "could not read '%s'"

1678 msgstr "impossible de lire '%s'"

1679

1671 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1680 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1681 #, c-format

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

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

1684

1676 -#: archive.c:451

1685 +#: archive.c:450

1686 #, c-format

1687 msgid "no such ref: %.*s"

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

1689

1681 -#: archive.c:457

1690 +#: archive.c:456

1691 #, c-format

1692 msgid "not a valid object name: %s"

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

1694

1686 -#: archive.c:470

1695 +#: archive.c:469

1696 #, c-format

1697 msgid "not a tree object: %s"

1698 msgstr "objet arbre invalide : %s"

1699

1691 -#: archive.c:482

1700 +#: archive.c:481

1701 msgid "current working directory is untracked"

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

1703

1695 -#: archive.c:523

1704 +#: archive.c:522

1705 #, c-format

1706 msgid "File not found: %s"

1707 msgstr "Fichier non trouvé : %s"

1708

1700 -#: archive.c:525

1709 +#: archive.c:524

1710 #, c-format

1711 msgid "Not a regular file: %s"

1712 msgstr "'%s' n'est pas un fichier normal"

1713

1705 -#: archive.c:552

1714 +#: archive.c:551

1715 msgid "fmt"

1716 msgstr "fmt"

1717

1709 -#: archive.c:552

1718 +#: archive.c:551

1719 msgid "archive format"

1720 msgstr "format d'archive"

1721

1713 -#: archive.c:553 builtin/log.c:1775

1722 +#: archive.c:552 builtin/log.c:1775

1723 msgid "prefix"

1724 msgstr "préfixe"

1725

1717 -#: archive.c:554

1726 +#: archive.c:553

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

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

1729

1721 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1722 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1723 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1724 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1725 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1726 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1730 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

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

1732 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1733 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1734 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

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

1736 msgid "file"

1737 msgstr "fichier"

1738

1730 -#: archive.c:556

1739 +#: archive.c:555

1740 msgid "add untracked file to archive"

1741 msgstr "ajouter les fichiers non suivis à l'archive"

1742

1734 -#: archive.c:559 builtin/archive.c:90

1743 +#: archive.c:558 builtin/archive.c:88

1744 msgid "write the archive to this file"

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

1746

1738 -#: archive.c:561

1747 +#: archive.c:560

1748 msgid "read .gitattributes in working directory"

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

1750

1742 -#: archive.c:562

1751 +#: archive.c:561

1752 msgid "report archived files on stderr"

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

1754

1746 -#: archive.c:564

1755 +#: archive.c:563

1756 msgid "set compression level"

1757 msgstr "régler le niveau de compression"

1758

1750 -#: archive.c:567

1759 +#: archive.c:566

1760 msgid "list supported archive formats"

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

1762

1754 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1755 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1756 -#: builtin/submodule--helper.c:2902

1763 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1764 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1765 msgid "repo"

1766 msgstr "dépôt"

1767

1760 -#: archive.c:570 builtin/archive.c:92

1768 +#: archive.c:569 builtin/archive.c:90

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

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

1771

1764 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1765 -#: builtin/notes.c:498

1772 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1773 +#: builtin/notes.c:496

1774 msgid "command"

1775 msgstr "commande"

1776

1769 -#: archive.c:572 builtin/archive.c:94

1777 +#: archive.c:571 builtin/archive.c:92

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

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

1780

1773 -#: archive.c:579

1781 +#: archive.c:578

1782 msgid "Unexpected option --remote"

1783 msgstr "Option --remote inattendue"

1784

1777 -#: archive.c:581

1785 +#: archive.c:580

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

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

1788

1781 -#: archive.c:583

1789 +#: archive.c:582

1790 msgid "Unexpected option --output"

1791 msgstr "Option --output inattendue"

1792

1785 -#: archive.c:585

1793 +#: archive.c:584

1794 msgid "Options --add-file and --remote cannot be used together"

1795 msgstr ""

1796 "Les options --add-file et --remote ne peuvent pas être utilisées ensemble"

1797

1790 -#: archive.c:607

1798 +#: archive.c:606

1799 #, c-format

1800 msgid "Unknown archive format '%s'"

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

1802

1795 -#: archive.c:616

1803 +#: archive.c:615

1804 #, c-format

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

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

1807

1800 -#: attr.c:202

1808 +#: attr.c:203

1809 #, c-format

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

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

1812

1805 -#: attr.c:363

1813 +#: attr.c:364

1814 #, c-format

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

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

1817

1810 -#: attr.c:403

1818 +#: attr.c:404

1819 msgid ""

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

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

@@ -1815,22 +1823,22 @@ msgstr ""

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

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

1825

1818 -#: bisect.c:489

1826 +#: bisect.c:488

1827 #, c-format

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

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

1830

1823 -#: bisect.c:699

1831 +#: bisect.c:698

1832 #, c-format

1833 msgid "We cannot bisect more!\n"

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

1835

1828 -#: bisect.c:766

1836 +#: bisect.c:764

1837 #, c-format

1838 msgid "Not a valid commit name %s"

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

1840

1833 -#: bisect.c:791

1841 +#: bisect.c:789

1842 #, c-format

1843 msgid ""

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

@@ -1839,7 +1847,7 @@ msgstr ""

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

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

1849

1842 -#: bisect.c:796

1850 +#: bisect.c:794

1851 #, c-format

1852 msgid ""

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

@@ -1848,7 +1856,7 @@ msgstr ""

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

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

1858

1851 -#: bisect.c:801

1859 +#: bisect.c:799

1860 #, c-format

1861 msgid ""

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

@@ -1857,7 +1865,7 @@ msgstr ""

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

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

1867

1860 -#: bisect.c:809

1868 +#: bisect.c:807

1869 #, c-format

1870 msgid ""

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

@@ -1868,7 +1876,7 @@ msgstr ""

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

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

1878

1871 -#: bisect.c:822

1879 +#: bisect.c:820

1880 #, c-format

1881 msgid ""

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

@@ -1880,36 +1888,36 @@ msgstr ""

1888 "et %s.\n"

1889 "On continue tout de même."

1890

1883 -#: bisect.c:861

1891 +#: bisect.c:859

1892 #, c-format

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

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

1895

1888 -#: bisect.c:911

1896 +#: bisect.c:909

1897 #, c-format

1898 msgid "a %s revision is needed"

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

1900

1893 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1901 +#: bisect.c:939

1902 #, c-format

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

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

1905

1898 -#: bisect.c:987 builtin/merge.c:153

1906 +#: bisect.c:985 builtin/merge.c:154

1907 #, c-format

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

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

1910

1903 -#: bisect.c:1027

1911 +#: bisect.c:1025

1912 msgid "reading bisect refs failed"

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

1914

1907 -#: bisect.c:1057

1915 +#: bisect.c:1055

1916 #, c-format

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

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

1919

1912 -#: bisect.c:1066

1920 +#: bisect.c:1064

1921 #, c-format

1922 msgid ""

1923 "No testable commit found.\n"

@@ -1918,7 +1926,7 @@ msgstr ""

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

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

1928

1921 -#: bisect.c:1095

1929 +#: bisect.c:1093

1930 #, c-format

1931 msgid "(roughly %d step)"

1932 msgid_plural "(roughly %d steps)"

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

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

1937 #. steps)" translation.

1938 #.

1931 -#: bisect.c:1101

1939 +#: bisect.c:1099

1940 #, c-format

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

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

@@ -1949,11 +1957,12 @@ msgstr ""

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

1958 "dernier commit"

1959

1952 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

1953 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1954 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1955 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1956 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1960 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1961 +#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114

1962 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1963 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1964 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1965 +#: builtin/shortlog.c:255

1966 msgid "revision walk setup failed"

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

1968

@@ -2142,8 +2151,8 @@ msgstr "'%s' ne semble pas être un fichier colis v2 our v3"

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

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

2153

2145 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2146 -#: builtin/commit.c:861

2154 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402

2155 +#: builtin/commit.c:862

2156 #, c-format

2157 msgid "could not open '%s'"

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

@@ -2201,7 +2210,7 @@ msgstr "version de colis non supportée %d"

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

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

2212

2204 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2213 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2214 #, c-format

2215 msgid "unrecognized argument: %s"

2216 msgstr "argument non reconnu : %s"

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

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

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

2254

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

2255 +#: commit-graph.c:204 midx.c:51

2256 msgid "invalid hash version"

2257 msgstr "version d'empreinte invalide"

2258

@@ -2292,200 +2301,200 @@ msgstr ""

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

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

2303

2295 -#: commit-graph.c:745 commit-graph.c:782

2304 +#: commit-graph.c:746 commit-graph.c:783

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

2306 msgstr ""

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

2308 "corrompu"

2309

2301 -#: commit-graph.c:766

2310 +#: commit-graph.c:767

2311 #, c-format

2312 msgid "could not find commit %s"

2313 msgstr "impossible de trouver le commit %s"

2314

2306 -#: commit-graph.c:799

2315 +#: commit-graph.c:800

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

2317 msgstr ""

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

2319 "n'en contient pas"

2320

2312 -#: commit-graph.c:1075 builtin/am.c:1341

2321 +#: commit-graph.c:1105 builtin/am.c:1342

2322 #, c-format

2323 msgid "unable to parse commit %s"

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

2325

2317 -#: commit-graph.c:1337 builtin/pack-objects.c:3057

2326 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2327 #, c-format

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

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

2330

2322 -#: commit-graph.c:1368

2331 +#: commit-graph.c:1398

2332 msgid "Loading known commits in commit graph"

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

2334

2326 -#: commit-graph.c:1385

2335 +#: commit-graph.c:1415

2336 msgid "Expanding reachable commits in commit graph"

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

2338

2330 -#: commit-graph.c:1405

2339 +#: commit-graph.c:1435

2340 msgid "Clearing commit marks in commit graph"

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

2342

2334 -#: commit-graph.c:1424

2343 +#: commit-graph.c:1454

2344 msgid "Computing commit graph topological levels"

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

2346

2338 -#: commit-graph.c:1477

2347 +#: commit-graph.c:1507

2348 msgid "Computing commit graph generation numbers"

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

2350

2342 -#: commit-graph.c:1558

2351 +#: commit-graph.c:1588

2352 msgid "Computing commit changed paths Bloom filters"

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

2354

2346 -#: commit-graph.c:1635

2355 +#: commit-graph.c:1665

2356 msgid "Collecting referenced commits"

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

2358

2350 -#: commit-graph.c:1660

2359 +#: commit-graph.c:1690

2360 #, c-format

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

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

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

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

2365

2357 -#: commit-graph.c:1673

2366 +#: commit-graph.c:1703

2367 #, c-format

2368 msgid "error adding pack %s"

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

2370

2362 -#: commit-graph.c:1677

2371 +#: commit-graph.c:1707

2372 #, c-format

2373 msgid "error opening index for %s"

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

2375

2367 -#: commit-graph.c:1714

2376 +#: commit-graph.c:1744

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

2378 msgstr ""

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

2380

2372 -#: commit-graph.c:1732

2381 +#: commit-graph.c:1762

2382 msgid "Finding extra edges in commit graph"

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

2384

2376 -#: commit-graph.c:1781

2385 +#: commit-graph.c:1811

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

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

2388

2380 -#: commit-graph.c:1812 midx.c:911

2389 +#: commit-graph.c:1842 midx.c:1146

2390 #, c-format

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

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

2393

2385 -#: commit-graph.c:1825

2394 +#: commit-graph.c:1855

2395 msgid "unable to create temporary graph layer"

2396 msgstr "impossible de créer une couche de graphe temporaire"

2397

2389 -#: commit-graph.c:1830

2398 +#: commit-graph.c:1860

2399 #, c-format

2400 msgid "unable to adjust shared permissions for '%s'"

2401 msgstr "impossible de régler les droits partagés pour '%s'"

2402

2394 -#: commit-graph.c:1887

2403 +#: commit-graph.c:1917

2404 #, c-format

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

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

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

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

2409

2401 -#: commit-graph.c:1923

2410 +#: commit-graph.c:1953

2411 msgid "unable to open commit-graph chain file"

2412 msgstr "impossible d'ouvrir le fichier de graphe de commit"

2413

2405 -#: commit-graph.c:1939

2414 +#: commit-graph.c:1969

2415 msgid "failed to rename base commit-graph file"

2416 msgstr "échec du renommage du fichier de graphe de commits"

2417

2409 -#: commit-graph.c:1959

2418 +#: commit-graph.c:1989

2419 msgid "failed to rename temporary commit-graph file"

2420 msgstr "impossible de renommer le fichier temporaire de graphe de commits"

2421

2413 -#: commit-graph.c:2092

2422 +#: commit-graph.c:2122

2423 msgid "Scanning merged commits"

2424 msgstr "Analyse des commits de fusion"

2425

2417 -#: commit-graph.c:2136

2426 +#: commit-graph.c:2166

2427 msgid "Merging commit-graph"

2428 msgstr "Fusion du graphe de commits"

2429

2421 -#: commit-graph.c:2244

2430 +#: commit-graph.c:2274

2431 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2432 msgstr ""

2433 "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"

2434

2426 -#: commit-graph.c:2351

2435 +#: commit-graph.c:2381

2436 msgid "too many commits to write graph"

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

2438

2430 -#: commit-graph.c:2449

2439 +#: commit-graph.c:2479

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

2441 msgstr ""

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

2443 "vraisemblablement corrompu"

2444

2436 -#: commit-graph.c:2459

2445 +#: commit-graph.c:2489

2446 #, c-format

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

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

2449

2441 -#: commit-graph.c:2469 commit-graph.c:2484

2450 +#: commit-graph.c:2499 commit-graph.c:2514

2451 #, c-format

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

2453 msgstr ""

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

2455 "%u != %u"

2456

2448 -#: commit-graph.c:2476

2457 +#: commit-graph.c:2506

2458 #, c-format

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

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

2461

2453 -#: commit-graph.c:2494

2462 +#: commit-graph.c:2524

2463 msgid "Verifying commits in commit graph"

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

2465

2457 -#: commit-graph.c:2509

2466 +#: commit-graph.c:2539

2467 #, c-format

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

2469 msgstr ""

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

2471 "graphe de commit"

2472

2464 -#: commit-graph.c:2516

2473 +#: commit-graph.c:2546

2474 #, c-format

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

2476 msgstr ""

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

2478 "%s"

2479

2471 -#: commit-graph.c:2526

2480 +#: commit-graph.c:2556

2481 #, c-format

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

2483 msgstr ""

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

2485

2477 -#: commit-graph.c:2535

2486 +#: commit-graph.c:2565

2487 #, c-format

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

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

2490

2482 -#: commit-graph.c:2549

2491 +#: commit-graph.c:2579

2492 #, c-format

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

2494 msgstr ""

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

2496

2488 -#: commit-graph.c:2554

2497 +#: commit-graph.c:2584

2498 #, c-format

2499 msgid ""

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

@@ -2493,7 +2502,7 @@ msgstr ""

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

2503 "non-nul ailleurs"

2504

2496 -#: commit-graph.c:2558

2505 +#: commit-graph.c:2588

2506 #, c-format

2507 msgid ""

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

@@ -2501,32 +2510,32 @@ msgstr ""

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

2511 "mais nul ailleurs"

2512

2504 -#: commit-graph.c:2575

2513 +#: commit-graph.c:2605

2514 #, c-format

2515 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2516 msgstr ""

2517 "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "

2518 "%<PRIuMAX>"

2519

2511 -#: commit-graph.c:2581

2520 +#: commit-graph.c:2611

2521 #, c-format

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

2523 msgstr ""

2524 "la date de validation pour le commit %s dans le graphe de commit est "

2525 "%<PRIuMAX> != %<PRIuMAX>"

2526

2518 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2519 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2527 +#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418

2528 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2529 #, c-format

2530 msgid "could not parse %s"

2531 msgstr "impossible d'analyser %s"

2532

2524 -#: commit.c:54

2533 +#: commit.c:55

2534 #, c-format

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

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

2537

2529 -#: commit.c:194

2538 +#: commit.c:196

2539 msgid ""

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

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

@@ -2546,27 +2555,27 @@ msgstr ""

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

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

2557

2549 -#: commit.c:1237

2558 +#: commit.c:1239

2559 #, c-format

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

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

2562

2554 -#: commit.c:1241

2563 +#: commit.c:1243

2564 #, c-format

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

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

2567

2559 -#: commit.c:1244

2568 +#: commit.c:1246

2569 #, c-format

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

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

2572

2564 -#: commit.c:1247

2573 +#: commit.c:1249

2574 #, c-format

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

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

2577

2569 -#: commit.c:1501

2578 +#: commit.c:1503

2579 msgid ""

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

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

@@ -2582,7 +2591,7 @@ msgstr ""

2591 msgid "memory exhausted"

2592 msgstr "plus de mémoire"

2593

2585 -#: config.c:126

2594 +#: config.c:125

2595 #, c-format

2596 msgid ""

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

@@ -2597,37 +2606,37 @@ msgstr ""

2606 "\t%s\n"

2607 "possibilité d'inclusions multiples."

2608

2600 -#: config.c:142

2609 +#: config.c:141

2610 #, c-format

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

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

2613

2605 -#: config.c:153

2614 +#: config.c:152

2615 msgid "relative config includes must come from files"

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

2617

2609 -#: config.c:199

2618 +#: config.c:201

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

2620 msgstr ""

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

2622 "fichiers"

2623

2615 -#: config.c:396

2624 +#: config.c:398

2625 #, c-format

2626 msgid "invalid config format: %s"

2627 msgstr "format de config invalide : %s"

2628

2620 -#: config.c:400

2629 +#: config.c:402

2630 #, c-format

2631 msgid "missing environment variable name for configuration '%.*s'"

2632 msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"

2633

2625 -#: config.c:405

2634 +#: config.c:407

2635 #, c-format

2636 msgid "missing environment variable '%s' for configuration '%.*s'"

2637 msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"

2638

2630 -#: config.c:442

2639 +#: config.c:443

2640 #, c-format

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

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

@@ -2637,310 +2646,310 @@ msgstr "la clé ne contient pas de section: %s"

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

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

2648

2640 -#: config.c:472 sequencer.c:2785

2649 +#: config.c:470 sequencer.c:2802

2650 #, c-format

2651 msgid "invalid key: %s"

2652 msgstr "clé invalide : %s"

2653

2645 -#: config.c:478

2654 +#: config.c:475

2655 #, c-format

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

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

2658

2650 -#: config.c:511

2659 +#: config.c:495

2660 msgid "empty config key"

2661 msgstr "clé de configuration vide"

2662

2654 -#: config.c:529 config.c:541

2663 +#: config.c:513 config.c:525

2664 #, c-format

2665 msgid "bogus config parameter: %s"

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

2667

2659 -#: config.c:555 config.c:572 config.c:579 config.c:588

2668 +#: config.c:539 config.c:556 config.c:563 config.c:572

2669 #, c-format

2670 msgid "bogus format in %s"

2671 msgstr "formatage mal formé dans %s"

2672

2664 -#: config.c:622

2673 +#: config.c:606

2674 #, c-format

2675 msgid "bogus count in %s"

2676 msgstr "compte faux dans %s"

2677

2669 -#: config.c:626

2678 +#: config.c:610

2679 #, c-format

2680 msgid "too many entries in %s"

2681 msgstr "trop d'entrées dans %s"

2682

2674 -#: config.c:636

2683 +#: config.c:620

2684 #, c-format

2685 msgid "missing config key %s"

2686 msgstr "clé de configuration %s manquante"

2687

2679 -#: config.c:644

2688 +#: config.c:628

2689 #, c-format

2690 msgid "missing config value %s"

2691 msgstr "valeur de config manquante %s"

2692

2684 -#: config.c:995

2693 +#: config.c:979

2694 #, c-format

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

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

2697

2689 -#: config.c:999

2698 +#: config.c:983

2699 #, c-format

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

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

2702

2694 -#: config.c:1003

2703 +#: config.c:987

2704 #, c-format

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

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

2707

2699 -#: config.c:1007

2708 +#: config.c:991

2709 #, c-format

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

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

2712

2704 -#: config.c:1011

2713 +#: config.c:995

2714 #, c-format

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

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

2717

2709 -#: config.c:1015

2718 +#: config.c:999

2719 #, c-format

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

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

2722

2714 -#: config.c:1152

2723 +#: config.c:1136

2724 msgid "out of range"

2725 msgstr "hors plage"

2726

2718 -#: config.c:1152

2727 +#: config.c:1136

2728 msgid "invalid unit"

2729 msgstr "unité invalide"

2730

2722 -#: config.c:1153

2731 +#: config.c:1137

2732 #, c-format

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

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

2735

2727 -#: config.c:1163

2736 +#: config.c:1147

2737 #, c-format

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

2739 msgstr ""

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

2741 "%s : %s"

2742

2734 -#: config.c:1166

2743 +#: config.c:1150

2744 #, c-format

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

2746 msgstr ""

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

2748 "%s : %s"

2749

2741 -#: config.c:1169

2750 +#: config.c:1153

2751 #, c-format

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

2753 msgstr ""

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

2755 "standard : %s"

2756

2748 -#: config.c:1172

2757 +#: config.c:1156

2758 #, c-format

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

2760 msgstr ""

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

2762 "sous-module %s : %s"

2763

2755 -#: config.c:1175

2764 +#: config.c:1159

2765 #, c-format

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

2767 msgstr ""

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

2769 "commande %s : %s"

2770

2762 -#: config.c:1178

2771 +#: config.c:1162

2772 #, c-format

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

2774 msgstr ""

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

2776

2768 -#: config.c:1257

2777 +#: config.c:1241

2778 #, c-format

2779 msgid "bad boolean config value '%s' for '%s'"

2780 msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"

2781

2773 -#: config.c:1275

2782 +#: config.c:1259

2783 #, c-format

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

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

2786

2778 -#: config.c:1284

2787 +#: config.c:1268

2788 #, c-format

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

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

2791

2783 -#: config.c:1377

2792 +#: config.c:1361

2793 #, c-format

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

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

2796

2788 -#: config.c:1391 config.c:1402

2797 +#: config.c:1375 config.c:1386

2798 #, c-format

2799 msgid "bad zlib compression level %d"

2800 msgstr "niveau de compression zlib incorrect %d"

2801

2793 -#: config.c:1494

2802 +#: config.c:1476

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

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

2805

2797 -#: config.c:1527

2806 +#: config.c:1509

2807 #, c-format

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

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

2810

2802 -#: config.c:1599

2811 +#: config.c:1581

2812 #, c-format

2813 msgid "malformed value for %s"

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

2815

2807 -#: config.c:1625

2816 +#: config.c:1607

2817 #, c-format

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

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

2820

2812 -#: config.c:1626

2821 +#: config.c:1608

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

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

2824

2816 -#: config.c:1687 builtin/pack-objects.c:4084

2825 +#: config.c:1669 builtin/pack-objects.c:4053

2826 #, c-format

2827 msgid "bad pack compression level %d"

2828 msgstr "niveau de compression du paquet %d"

2829

2821 -#: config.c:1809

2830 +#: config.c:1792

2831 #, c-format

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

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

2834

2826 -#: config.c:1812

2835 +#: config.c:1795

2836 #, c-format

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

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

2839

2831 -#: config.c:1829

2840 +#: config.c:1813

2841 #, c-format

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

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

2844

2836 -#: config.c:1874

2845 +#: config.c:1858

2846 #, c-format

2847 msgid "failed to parse %s"

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

2849

2841 -#: config.c:1930

2850 +#: config.c:1914

2851 msgid "unable to parse command-line config"

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

2853

2845 -#: config.c:2294

2854 +#: config.c:2282

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

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

2857

2849 -#: config.c:2468

2858 +#: config.c:2456

2859 #, c-format

2860 msgid "Invalid %s: '%s'"

2861 msgstr "%s invalide : '%s'"

2862

2854 -#: config.c:2513

2863 +#: config.c:2501

2864 #, c-format

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

2866 msgstr ""

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

2868 "100"

2869

2861 -#: config.c:2559

2870 +#: config.c:2547

2871 #, c-format

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

2873 msgstr ""

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

2875

2867 -#: config.c:2561

2876 +#: config.c:2549

2877 #, c-format

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

2879 msgstr ""

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

2881

2873 -#: config.c:2645

2882 +#: config.c:2633

2883 #, c-format

2884 msgid "invalid section name '%s'"

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

2886

2878 -#: config.c:2677

2887 +#: config.c:2665

2888 #, c-format

2889 msgid "%s has multiple values"

2890 msgstr "%s a des valeurs multiples"

2891

2883 -#: config.c:2706

2892 +#: config.c:2694

2893 #, c-format

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

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

2896

2888 -#: config.c:2958 config.c:3285

2897 +#: config.c:2946 config.c:3273

2898 #, c-format

2899 msgid "could not lock config file %s"

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

2901

2893 -#: config.c:2969

2902 +#: config.c:2957

2903 #, c-format

2904 msgid "opening %s"

2905 msgstr "ouverture de %s"

2906

2898 -#: config.c:3006 builtin/config.c:361

2907 +#: config.c:2994 builtin/config.c:361

2908 #, c-format

2909 msgid "invalid pattern: %s"

2910 msgstr "motif invalide : %s"

2911

2903 -#: config.c:3031

2912 +#: config.c:3019

2913 #, c-format

2914 msgid "invalid config file %s"

2915 msgstr "fichier de configuration invalide %s"

2916

2908 -#: config.c:3044 config.c:3298

2917 +#: config.c:3032 config.c:3286

2918 #, c-format

2919 msgid "fstat on %s failed"

2920 msgstr "échec de fstat sur %s"

2921

2913 -#: config.c:3055

2922 +#: config.c:3043

2923 #, c-format

2924 msgid "unable to mmap '%s'%s"

2925 msgstr "impossible de réaliser un mmap de '%s'%s"

2926

2918 -#: config.c:3065 config.c:3303

2927 +#: config.c:3053 config.c:3291

2928 #, c-format

2929 msgid "chmod on %s failed"

2930 msgstr "échec de chmod sur %s"

2931

2923 -#: config.c:3150 config.c:3400

2932 +#: config.c:3138 config.c:3388

2933 #, c-format

2934 msgid "could not write config file %s"

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

2936

2928 -#: config.c:3184

2937 +#: config.c:3172

2938 #, c-format

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

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

2941

2933 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2942 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2943 #, c-format

2944 msgid "could not unset '%s'"

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

2946

2938 -#: config.c:3276

2947 +#: config.c:3264

2948 #, c-format

2949 msgid "invalid section name: %s"

2950 msgstr "nom de section invalide : %s"

2951

2943 -#: config.c:3443

2952 +#: config.c:3431

2953 #, c-format

2954 msgid "missing value for '%s'"

2955 msgstr "valeur manquante pour '%s'"

@@ -2975,72 +2984,72 @@ msgstr "le serveur ne supporte pas la fonctionnalité '%s'"

2984 msgid "expected flush after capabilities"

2985 msgstr "vidage attendu après les capacités"

2986

2978 -#: connect.c:263

2987 +#: connect.c:265

2988 #, c-format

2989 msgid "ignoring capabilities after first line '%s'"

2990 msgstr "capacités ignorées après la première ligne '%s'"

2991

2983 -#: connect.c:284

2992 +#: connect.c:286

2993 msgid "protocol error: unexpected capabilities^{}"

2994 msgstr "erreur de protocole : capabilities^{} inattendu"

2995

2987 -#: connect.c:306

2996 +#: connect.c:308

2997 #, c-format

2998 msgid "protocol error: expected shallow sha-1, got '%s'"

2999 msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"

3000

2992 -#: connect.c:308

3001 +#: connect.c:310

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

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

3004

2996 -#: connect.c:347

3005 +#: connect.c:349

3006 msgid "invalid packet"

3007 msgstr "paquet invalide"

3008

3000 -#: connect.c:367

3009 +#: connect.c:369

3010 #, c-format

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

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

3013

3005 -#: connect.c:497

3014 +#: connect.c:499

3015 #, c-format

3016 msgid "unknown object format '%s' specified by server"

3017 msgstr "format d'objet spécifié par le serveur inconnu '%s'"

3018

3010 -#: connect.c:526

3019 +#: connect.c:528

3020 #, c-format

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

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

3023

3015 -#: connect.c:530

3024 +#: connect.c:532

3025 msgid "expected flush after ref listing"

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

3027

3019 -#: connect.c:533

3028 +#: connect.c:535

3029 msgid "expected response end packet after ref listing"

3030 msgstr "paquet de fin de réponse attendu après le listage de références"

3031

3023 -#: connect.c:666

3032 +#: connect.c:670

3033 #, c-format

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

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

3036

3028 -#: connect.c:717

3037 +#: connect.c:721

3038 msgid "unable to set SO_KEEPALIVE on socket"

3039 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"

3040

3032 -#: connect.c:757 connect.c:820

3041 +#: connect.c:761 connect.c:824

3042 #, c-format

3043 msgid "Looking up %s ... "

3044 msgstr "Recherche de %s… "

3045

3037 -#: connect.c:761

3046 +#: connect.c:765

3047 #, c-format

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

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

3050

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

3043 -#: connect.c:765 connect.c:836

3052 +#: connect.c:769 connect.c:840

3053 #, c-format

3054 msgid ""

3055 "done.\n"

@@ -3049,7 +3058,7 @@ msgstr ""

3058 "fait.\n"

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

3060

3052 -#: connect.c:787 connect.c:864

3061 +#: connect.c:791 connect.c:868

3062 #, c-format

3063 msgid ""

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

@@ -3059,80 +3068,80 @@ msgstr ""

3068 "%s"

3069

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

3062 -#: connect.c:793 connect.c:870

3071 +#: connect.c:797 connect.c:874

3072 msgid "done."

3073 msgstr "fait."

3074

3066 -#: connect.c:824

3075 +#: connect.c:828

3076 #, c-format

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

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

3079

3071 -#: connect.c:830

3080 +#: connect.c:834

3081 #, c-format

3082 msgid "unknown port %s"

3083 msgstr "port inconnu %s"

3084

3076 -#: connect.c:967 connect.c:1299

3085 +#: connect.c:971 connect.c:1303

3086 #, c-format

3087 msgid "strange hostname '%s' blocked"

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

3089

3081 -#: connect.c:969

3090 +#: connect.c:973

3091 #, c-format

3092 msgid "strange port '%s' blocked"

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

3094

3086 -#: connect.c:979

3095 +#: connect.c:983

3096 #, c-format

3097 msgid "cannot start proxy %s"

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

3099

3091 -#: connect.c:1050

3100 +#: connect.c:1054

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

3102 msgstr ""

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

3104 "d'URL valide"

3105

3097 -#: connect.c:1190

3106 +#: connect.c:1194

3107 msgid "newline is forbidden in git:// hosts and repo paths"

3108 msgstr ""

3109 "le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"

3110

3102 -#: connect.c:1247

3111 +#: connect.c:1251

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

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

3114

3106 -#: connect.c:1259

3115 +#: connect.c:1263

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

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

3118

3110 -#: connect.c:1276

3119 +#: connect.c:1280

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

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

3122

3114 -#: connect.c:1388

3123 +#: connect.c:1392

3124 #, c-format

3125 msgid "strange pathname '%s' blocked"

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

3127

3119 -#: connect.c:1436

3128 +#: connect.c:1440

3129 msgid "unable to fork"

3130 msgstr "fork impossible"

3131

3123 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3132 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

3133 msgid "Checking connectivity"

3134 msgstr "Vérification de la connectivité"

3135

3127 -#: connected.c:120

3136 +#: connected.c:122

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

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

3139

3131 -#: connected.c:144

3140 +#: connected.c:146

3141 msgid "failed write to rev-list"

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

3143

3135 -#: connected.c:149

3144 +#: connected.c:151

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

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

3147

@@ -3282,17 +3291,17 @@ msgid "refusing to work with credential missing protocol field"

3291 msgstr ""

3292 "refus de travailler avec un champ protocol manquant dans l'identification"

3293

3285 -#: credential.c:394

3294 +#: credential.c:395

3295 #, c-format

3296 msgid "url contains a newline in its %s component: %s"

3297 msgstr "l'url contient un retour chariot dans composant %s : %s"

3298

3290 -#: credential.c:438

3299 +#: credential.c:439

3300 #, c-format

3301 msgid "url has no scheme: %s"

3302 msgstr "l'url n'a pas de schéma : %s"

3303

3295 -#: credential.c:511

3304 +#: credential.c:512

3305 #, c-format

3306 msgid "credential url cannot be parsed: %s"

3307 msgstr "impossible d'analyser l'url d'identification : %s"

@@ -3396,23 +3405,23 @@ msgstr "Marquage de %d îlots, fait.\n"

3405 msgid "unknown value for --diff-merges: %s"

3406 msgstr "valeur inconnue pour --diff-merges : %s"

3407

3399 -#: diff-lib.c:557

3408 +#: diff-lib.c:561

3409 msgid "--merge-base does not work with ranges"

3410 msgstr "--merge-base ne fonctionne pas avec des plages"

3411

3403 -#: diff-lib.c:559

3412 +#: diff-lib.c:563

3413 msgid "--merge-base only works with commits"

3414 msgstr "--merge-base ne fonctionne qu'avec des commits"

3415

3407 -#: diff-lib.c:576

3416 +#: diff-lib.c:580

3417 msgid "unable to get HEAD"

3418 msgstr "impossible d'acquérir HEAD"

3419

3411 -#: diff-lib.c:583

3420 +#: diff-lib.c:587

3421 msgid "no merge base found"

3422 msgstr "aucune base de fusion trouvée"

3423

3415 -#: diff-lib.c:585

3424 +#: diff-lib.c:589

3425 msgid "multiple merge bases found"

3426 msgstr "bases multiples de fusion trouvées"

3427

@@ -3428,18 +3437,18 @@ msgstr ""

3437 "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "

3438 "arbre de travail"

3439

3431 -#: diff.c:156

3440 +#: diff.c:157

3441 #, c-format

3442 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3443 msgstr ""

3444 " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"

3445

3437 -#: diff.c:161

3446 +#: diff.c:162

3447 #, c-format

3448 msgid " Unknown dirstat parameter '%s'\n"

3449 msgstr " Paramètre dirstat inconnu '%s'\n"

3450

3442 -#: diff.c:297

3451 +#: diff.c:298

3452 msgid ""

3453 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3454 "'dimmed-zebra', 'plain'"

@@ -3447,7 +3456,7 @@ msgstr ""

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

3457 "'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"

3458

3450 -#: diff.c:325

3459 +#: diff.c:326

3460 #, c-format

3461 msgid ""

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

@@ -3457,7 +3466,7 @@ msgstr ""

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

3467 "change'"

3468

3460 -#: diff.c:333

3469 +#: diff.c:334

3470 msgid ""

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

3472 "whitespace modes"

@@ -3465,13 +3474,13 @@ msgstr ""

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

3475 "d'autres modes d'espace"

3476

3468 -#: diff.c:410

3477 +#: diff.c:411

3478 #, c-format

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

3480 msgstr ""

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

3482

3474 -#: diff.c:470

3483 +#: diff.c:471

3484 #, c-format

3485 msgid ""

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

@@ -3480,27 +3489,27 @@ msgstr ""

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

3490 "%s"

3491

3483 -#: diff.c:4282

3492 +#: diff.c:4290

3493 #, c-format

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

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

3496

3488 -#: diff.c:4634

3497 +#: diff.c:4642

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

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

3500

3492 -#: diff.c:4637

3501 +#: diff.c:4645

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

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

3504

3496 -#: diff.c:4640

3505 +#: diff.c:4648

3506 msgid ""

3507 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3508 msgstr ""

3509 "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "

3510 "avec -S"

3511

3503 -#: diff.c:4643

3512 +#: diff.c:4651

3513 msgid ""

3514 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3515 "with -G and -S"

@@ -3508,22 +3517,22 @@ msgstr ""

3517 "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"

3518 "pickaxe-all avec -G et -S"

3519

3511 -#: diff.c:4722

3520 +#: diff.c:4730

3521 msgid "--follow requires exactly one pathspec"

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

3523

3515 -#: diff.c:4770

3524 +#: diff.c:4778

3525 #, c-format

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

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

3528

3520 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3521 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3529 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3530 +#: parse-options.c:217 parse-options.c:221

3531 #, c-format

3532 msgid "%s expects a numerical value"

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

3534

3526 -#: diff.c:4807

3535 +#: diff.c:4815

3536 #, c-format

3537 msgid ""

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

@@ -3532,42 +3541,42 @@ msgstr ""

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

3542 "%s"

3543

3535 -#: diff.c:4892

3544 +#: diff.c:4900

3545 #, c-format

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

3547 msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"

3548

3540 -#: diff.c:4916

3549 +#: diff.c:4924

3550 #, c-format

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

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

3553

3545 -#: diff.c:4930

3554 +#: diff.c:4938

3555 #, c-format

3556 msgid "unable to resolve '%s'"

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

3558

3550 -#: diff.c:4980 diff.c:4986

3559 +#: diff.c:4988 diff.c:4994

3560 #, c-format

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

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

3563

3555 -#: diff.c:4998

3564 +#: diff.c:5006

3565 #, c-format

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

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

3568

3560 -#: diff.c:5019

3569 +#: diff.c:5027

3570 #, c-format

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

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

3573

3565 -#: diff.c:5038

3574 +#: diff.c:5046

3575 #, c-format

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

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

3578

3570 -#: diff.c:5078

3579 +#: diff.c:5086

3580 msgid ""

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

3582 "\"histogram\""

@@ -3575,160 +3584,160 @@ msgstr ""

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

3585 "\"histogram\""

3586

3578 -#: diff.c:5114 diff.c:5134

3587 +#: diff.c:5122 diff.c:5142

3588 #, c-format

3589 msgid "invalid argument to %s"

3590 msgstr "argument invalide pour %s"

3591

3583 -#: diff.c:5238

3592 +#: diff.c:5246

3593 #, c-format

3594 msgid "invalid regex given to -I: '%s'"

3595 msgstr "regex invalide fournie à -I : '%s'"

3596

3588 -#: diff.c:5287

3597 +#: diff.c:5295

3598 #, c-format

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

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

3601

3593 -#: diff.c:5343

3602 +#: diff.c:5351

3603 #, c-format

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

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

3606

3598 -#: diff.c:5379

3607 +#: diff.c:5387

3608 msgid "Diff output format options"

3609 msgstr "Options de format de sortie de diff"

3610

3602 -#: diff.c:5381 diff.c:5387

3611 +#: diff.c:5389 diff.c:5395

3612 msgid "generate patch"

3613 msgstr "générer la rustine"

3614

3606 -#: diff.c:5384 builtin/log.c:179

3615 +#: diff.c:5392 builtin/log.c:179

3616 msgid "suppress diff output"

3617 msgstr "supprimer la sortie des différences"

3618

3610 -#: diff.c:5389 diff.c:5503 diff.c:5510

3619 +#: diff.c:5397 diff.c:5511 diff.c:5518

3620 msgid "<n>"

3621 msgstr "<n>"

3622

3614 -#: diff.c:5390 diff.c:5393

3623 +#: diff.c:5398 diff.c:5401

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

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

3626

3618 -#: diff.c:5395

3627 +#: diff.c:5403

3628 msgid "generate the diff in raw format"

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

3630

3622 -#: diff.c:5398

3631 +#: diff.c:5406

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

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

3634

3626 -#: diff.c:5402

3635 +#: diff.c:5410

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

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

3638

3630 -#: diff.c:5406

3639 +#: diff.c:5414

3640 msgid "machine friendly --stat"

3641 msgstr "--stat pour traitement automatique"

3642

3634 -#: diff.c:5409

3643 +#: diff.c:5417

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

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

3646

3638 -#: diff.c:5411 diff.c:5419

3647 +#: diff.c:5419 diff.c:5427

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

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

3650

3642 -#: diff.c:5412

3651 +#: diff.c:5420

3652 msgid ""

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

3654 msgstr ""

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

3656 "chaque sous-répertoire"

3657

3649 -#: diff.c:5416

3658 +#: diff.c:5424

3659 msgid "synonym for --dirstat=cumulative"

3660 msgstr "synonyme pour --dirstat=cumulative"

3661

3653 -#: diff.c:5420

3662 +#: diff.c:5428

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

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

3665

3657 -#: diff.c:5424

3666 +#: diff.c:5432

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

3668 msgstr ""

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

3670 "erreurs d'espace"

3671

3663 -#: diff.c:5427

3672 +#: diff.c:5435

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

3674 msgstr ""

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

3676 "de mode"

3677

3669 -#: diff.c:5430

3678 +#: diff.c:5438

3679 msgid "show only names of changed files"

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

3681

3673 -#: diff.c:5433

3682 +#: diff.c:5441

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

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

3685

3677 -#: diff.c:5435

3686 +#: diff.c:5443

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

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

3689

3681 -#: diff.c:5436

3690 +#: diff.c:5444

3691 msgid "generate diffstat"

3692 msgstr "générer un diffstat"

3693

3685 -#: diff.c:5438 diff.c:5441 diff.c:5444

3694 +#: diff.c:5446 diff.c:5449 diff.c:5452

3695 msgid "<width>"

3696 msgstr "<largeur>"

3697

3689 -#: diff.c:5439

3698 +#: diff.c:5447

3699 msgid "generate diffstat with a given width"

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

3701

3693 -#: diff.c:5442

3702 +#: diff.c:5450

3703 msgid "generate diffstat with a given name width"

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

3705

3697 -#: diff.c:5445

3706 +#: diff.c:5453

3707 msgid "generate diffstat with a given graph width"

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

3709

3701 -#: diff.c:5447

3710 +#: diff.c:5455

3711 msgid "<count>"

3712 msgstr "<compte>"

3713

3705 -#: diff.c:5448

3714 +#: diff.c:5456

3715 msgid "generate diffstat with limited lines"

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

3717

3709 -#: diff.c:5451

3718 +#: diff.c:5459

3719 msgid "generate compact summary in diffstat"

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

3721

3713 -#: diff.c:5454

3722 +#: diff.c:5462

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

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

3725

3717 -#: diff.c:5457

3726 +#: diff.c:5465

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

3728 msgstr ""

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

3730 "\"index\""

3731

3723 -#: diff.c:5459

3732 +#: diff.c:5467

3733 msgid "show colored diff"

3734 msgstr "afficher un diff coloré"

3735

3727 -#: diff.c:5460

3736 +#: diff.c:5468

3737 msgid "<kind>"

3738 msgstr "<sorte>"

3739

3731 -#: diff.c:5461

3740 +#: diff.c:5469

3741 msgid ""

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

3743 "diff"

@@ -3736,7 +3745,7 @@ msgstr ""

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

3746 "'nouveau' dans le diff"

3747

3739 -#: diff.c:5464

3748 +#: diff.c:5472

3749 msgid ""

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

3751 "--numstat"

@@ -3744,93 +3753,93 @@ msgstr ""

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

3754 "champs dans --raw ou --numstat"

3755

3747 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3756 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3757 msgid "<prefix>"

3758 msgstr "<préfixe>"

3759

3751 -#: diff.c:5468

3760 +#: diff.c:5476

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

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

3763

3755 -#: diff.c:5471

3764 +#: diff.c:5479

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

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

3767

3759 -#: diff.c:5474

3768 +#: diff.c:5482

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

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

3771

3763 -#: diff.c:5477

3772 +#: diff.c:5485

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

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

3775

3767 -#: diff.c:5480

3776 +#: diff.c:5488

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

3778 msgstr ""

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

3780 "indiqué"

3781

3773 -#: diff.c:5484 diff.c:5489 diff.c:5494

3782 +#: diff.c:5492 diff.c:5497 diff.c:5502

3783 msgid "<char>"

3784 msgstr "<caractère>"

3785

3777 -#: diff.c:5485

3786 +#: diff.c:5493

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

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

3789

3781 -#: diff.c:5490

3790 +#: diff.c:5498

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

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

3793

3785 -#: diff.c:5495

3794 +#: diff.c:5503

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

3796 msgstr ""

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

3798

3790 -#: diff.c:5498

3799 +#: diff.c:5506

3800 msgid "Diff rename options"

3801 msgstr "Options de renommage de diff"

3802

3794 -#: diff.c:5499

3803 +#: diff.c:5507

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

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

3806

3798 -#: diff.c:5500

3807 +#: diff.c:5508

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

3809 msgstr ""

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

3811 "création"

3812

3804 -#: diff.c:5504

3813 +#: diff.c:5512

3814 msgid "detect renames"

3815 msgstr "détecter les renommages"

3816

3808 -#: diff.c:5508

3817 +#: diff.c:5516

3818 msgid "omit the preimage for deletes"

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

3820

3812 -#: diff.c:5511

3821 +#: diff.c:5519

3822 msgid "detect copies"

3823 msgstr "détecter les copies"

3824

3816 -#: diff.c:5515

3825 +#: diff.c:5523

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

3827 msgstr ""

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

3829

3821 -#: diff.c:5517

3830 +#: diff.c:5525

3831 msgid "disable rename detection"

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

3833

3825 -#: diff.c:5520

3834 +#: diff.c:5528

3835 msgid "use empty blobs as rename source"

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

3837

3829 -#: diff.c:5522

3838 +#: diff.c:5530

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

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

3841

3833 -#: diff.c:5525

3842 +#: diff.c:5533

3843 msgid ""

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

3845 "given limit"

@@ -3838,165 +3847,165 @@ msgstr ""

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

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

3849

3841 -#: diff.c:5527

3850 +#: diff.c:5535

3851 msgid "Diff algorithm options"

3852 msgstr "Options de l'algorithme de diff"

3853

3845 -#: diff.c:5529

3854 +#: diff.c:5537

3855 msgid "produce the smallest possible diff"

3856 msgstr "produire le diff le plus petit possible"

3857

3849 -#: diff.c:5532

3858 +#: diff.c:5540

3859 msgid "ignore whitespace when comparing lines"

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

3861

3853 -#: diff.c:5535

3862 +#: diff.c:5543

3863 msgid "ignore changes in amount of whitespace"

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

3865

3857 -#: diff.c:5538

3866 +#: diff.c:5546

3867 msgid "ignore changes in whitespace at EOL"

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

3869

3861 -#: diff.c:5541

3870 +#: diff.c:5549

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

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

3873

3865 -#: diff.c:5544

3874 +#: diff.c:5552

3875 msgid "ignore changes whose lines are all blank"

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

3877

3869 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3878 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3879 msgid "<regex>"

3880 msgstr "<regex>"

3881

3873 -#: diff.c:5547

3882 +#: diff.c:5555

3883 msgid "ignore changes whose all lines match <regex>"

3884 msgstr "ignorer les modifications dont les lignes correspondent à <regex>"

3885

3877 -#: diff.c:5550

3886 +#: diff.c:5558

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

3888 msgstr ""

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

3890 "lecture"

3891

3883 -#: diff.c:5553

3892 +#: diff.c:5561

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

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

3895

3887 -#: diff.c:5557

3896 +#: diff.c:5565

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

3898 msgstr ""

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

3900

3892 -#: diff.c:5559

3901 +#: diff.c:5567

3902 msgid "<algorithm>"

3903 msgstr "<algorithme>"

3904

3896 -#: diff.c:5560

3905 +#: diff.c:5568

3906 msgid "choose a diff algorithm"

3907 msgstr "choisir un algorithme de différence"

3908

3900 -#: diff.c:5562

3909 +#: diff.c:5570

3910 msgid "<text>"

3911 msgstr "<texte>"

3912

3904 -#: diff.c:5563

3913 +#: diff.c:5571

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

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

3916

3908 -#: diff.c:5565 diff.c:5574 diff.c:5577

3917 +#: diff.c:5573 diff.c:5582 diff.c:5585

3918 msgid "<mode>"

3919 msgstr "<mode>"

3920

3912 -#: diff.c:5566

3921 +#: diff.c:5574

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

3923 msgstr ""

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

3925 "mots modifiés"

3926

3918 -#: diff.c:5569

3927 +#: diff.c:5577

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

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

3930

3922 -#: diff.c:5572

3931 +#: diff.c:5580

3932 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3933 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

3934

3926 -#: diff.c:5575

3935 +#: diff.c:5583

3936 msgid "moved lines of code are colored differently"

3937 msgstr "les lignes déplacées sont colorées différemment"

3938

3930 -#: diff.c:5578

3939 +#: diff.c:5586

3940 msgid "how white spaces are ignored in --color-moved"

3941 msgstr "comment les espaces sont ignorés dans --color-moved"

3942

3934 -#: diff.c:5581

3943 +#: diff.c:5589

3944 msgid "Other diff options"

3945 msgstr "Autres options diff"

3946

3938 -#: diff.c:5583

3947 +#: diff.c:5591

3948 msgid "when run from subdir, exclude changes outside and show relative paths"

3949 msgstr ""

3950 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3951 "afficher les chemins relatifs"

3952

3944 -#: diff.c:5587

3953 +#: diff.c:5595

3954 msgid "treat all files as text"

3955 msgstr "traiter les fichiers comme texte"

3956

3948 -#: diff.c:5589

3957 +#: diff.c:5597

3958 msgid "swap two inputs, reverse the diff"

3959 msgstr "échanger les entrées, inverser le diff"

3960

3952 -#: diff.c:5591

3961 +#: diff.c:5599

3962 msgid "exit with 1 if there were differences, 0 otherwise"

3963 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3964

3956 -#: diff.c:5593

3965 +#: diff.c:5601

3966 msgid "disable all output of the program"

3967 msgstr "désactiver tous les affichages du programme"

3968

3960 -#: diff.c:5595

3969 +#: diff.c:5603

3970 msgid "allow an external diff helper to be executed"

3971 msgstr "autoriser l'exécution d'un assistant externe de diff"

3972

3964 -#: diff.c:5597

3973 +#: diff.c:5605

3974 msgid "run external text conversion filters when comparing binary files"

3975 msgstr ""

3976 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3977 "fichiers binaires"

3978

3970 -#: diff.c:5599

3979 +#: diff.c:5607

3980 msgid "<when>"

3981 msgstr "<quand>"

3982

3974 -#: diff.c:5600

3983 +#: diff.c:5608

3984 msgid "ignore changes to submodules in the diff generation"

3985 msgstr ""

3986 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3987

3979 -#: diff.c:5603

3988 +#: diff.c:5611

3989 msgid "<format>"

3990 msgstr "<format>"

3991

3983 -#: diff.c:5604

3992 +#: diff.c:5612

3993 msgid "specify how differences in submodules are shown"

3994 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3995

3987 -#: diff.c:5608

3996 +#: diff.c:5616

3997 msgid "hide 'git add -N' entries from the index"

3998 msgstr "masquer les entrées 'git add -N' de l'index"

3999

3991 -#: diff.c:5611

4000 +#: diff.c:5619

4001 msgid "treat 'git add -N' entries as real in the index"

4002 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

4003

3995 -#: diff.c:5613

4004 +#: diff.c:5621

4005 msgid "<string>"

4006 msgstr "<chaîne>"

4007

3999 -#: diff.c:5614

4008 +#: diff.c:5622

4009 msgid ""

4010 "look for differences that change the number of occurrences of the specified "

4011 "string"

@@ -4004,7 +4013,7 @@ msgstr ""

4013 "rechercher les différences qui modifient le nombre d'occurrences de la "

4014 "chaîne spécifiée"

4015

4007 -#: diff.c:5617

4016 +#: diff.c:5625

4017 msgid ""

4018 "look for differences that change the number of occurrences of the specified "

4019 "regex"

@@ -4012,38 +4021,38 @@ msgstr ""

4021 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

4022 "spécifiée"

4023

4015 -#: diff.c:5620

4024 +#: diff.c:5628

4025 msgid "show all changes in the changeset with -S or -G"

4026 msgstr ""

4027 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

4028 "ou -G"

4029

4021 -#: diff.c:5623

4030 +#: diff.c:5631

4031 msgid "treat <string> in -S as extended POSIX regular expression"

4032 msgstr ""

4033 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

4034

4026 -#: diff.c:5626

4035 +#: diff.c:5634

4036 msgid "control the order in which files appear in the output"

4037 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

4038

4030 -#: diff.c:5627 diff.c:5630

4039 +#: diff.c:5635 diff.c:5638

4040 msgid "<path>"

4041 msgstr "<chemin>"

4042

4034 -#: diff.c:5628

4043 +#: diff.c:5636

4044 msgid "show the change in the specified path first"

4045 msgstr "afficher la modification dans le chemin spécifié en premier"

4046

4038 -#: diff.c:5631

4047 +#: diff.c:5639

4048 msgid "skip the output to the specified path"

4049 msgstr "sauter la sortie pour le chemin spécifié"

4050

4042 -#: diff.c:5633

4051 +#: diff.c:5641

4052 msgid "<object-id>"

4053 msgstr "<id-objet>"

4054

4046 -#: diff.c:5634

4055 +#: diff.c:5642

4056 msgid ""

4057 "look for differences that change the number of occurrences of the specified "

4058 "object"

@@ -4051,35 +4060,35 @@ msgstr ""

4060 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

4061 "indiqué"

4062

4054 -#: diff.c:5636

4063 +#: diff.c:5644

4064 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

4065 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

4066

4058 -#: diff.c:5637

4067 +#: diff.c:5645

4068 msgid "select files by diff type"

4069 msgstr "sélectionner les fichiers par types de diff"

4070

4062 -#: diff.c:5639

4071 +#: diff.c:5647

4072 msgid "<file>"

4073 msgstr "<fichier>"

4074

4066 -#: diff.c:5640

4075 +#: diff.c:5648

4076 msgid "Output to a specific file"

4077 msgstr "Sortie vers un fichier spécifié"

4078

4070 -#: diff.c:6298

4079 +#: diff.c:6306

4080 msgid "exhaustive rename detection was skipped due to too many files."

4081 msgstr ""

4082 "détection exhaustive de renommage annulée à cause d'un trop grand nombre de "

4083 "fichiers."

4084

4076 -#: diff.c:6301

4085 +#: diff.c:6309

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

4087 msgstr ""

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

4089 "grand nombre de fichiers."

4090

4082 -#: diff.c:6304

4091 +#: diff.c:6312

4092 #, c-format

4093 msgid ""

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

@@ -4092,7 +4101,7 @@ msgstr ""

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

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

4103

4095 -#: diffcore-rename.c:1514

4104 +#: diffcore-rename.c:1564

4105 msgid "Performing inexact rename detection"

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

4107

@@ -4133,334 +4142,405 @@ msgstr "désactivation de la correspondance de motif de cone"

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

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

4144

4136 -#: dir.c:2351

4145 +#: dir.c:2464

4146 #, c-format

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

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

4149

4141 -#: dir.c:2653

4150 +#: dir.c:2766

4151 msgid "failed to get kernel name and information"

4152 msgstr "echec de l'obtention d'information de kernel"

4153

4145 -#: dir.c:2777

4154 +#: dir.c:2890

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

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

4157

4149 -#: dir.c:3610

4158 +#: dir.c:3158

4159 +msgid ""

4160 +"No directory name could be guessed.\n"

4161 +"Please specify a directory on the command line"

4162 +msgstr ""

4163 +"Aucun nom de répertoire n'a pu être deviné\n"

4164 +"Veuillez spécifier un répertoire dans la ligne de commande"

4165 +

4166 +#: dir.c:3837

4167 #, c-format

4168 msgid "index file corrupt in repo %s"

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

4170

4154 -#: dir.c:3657 dir.c:3662

4171 +#: dir.c:3884 dir.c:3889

4172 #, c-format

4173 msgid "could not create directories for %s"

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

4175

4159 -#: dir.c:3691

4176 +#: dir.c:3918

4177 #, c-format

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

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

4180

4164 -#: editor.c:74

4181 +#: editor.c:77

4182 #, c-format

4183 msgid "hint: Waiting for your editor to close the file...%c"

4184 msgstr ""

4185 "suggestion : en attente de la fermeture du fichier par votre éditeur de "

4186 "texte…%c"

4187

4171 -#: entry.c:176

4188 +#: entry.c:177

4189 msgid "Filtering content"

4190 msgstr "Filtrage du contenu"

4191

4175 -#: entry.c:497

4192 +#: entry.c:498

4193 #, c-format

4194 msgid "could not stat file '%s'"

4195 msgstr "impossible de stat le fichier '%s'"

4196

4180 -#: environment.c:152

4197 +#: environment.c:143

4198 #, c-format

4199 msgid "bad git namespace path \"%s\""

4200 msgstr "espaces de nom de Git \"%s\""

4201

4185 -#: environment.c:334

4186 -#, c-format

4187 -msgid "could not set GIT_DIR to '%s'"

4188 -msgstr "impossible de régler GIT_DIR à '%s'"

4189 -

4202 #: exec-cmd.c:363

4203 #, c-format

4204 msgid "too many args to run %s"

4205 msgstr "trop d'arguments pour lancer %s"

4206

4195 -#: fetch-pack.c:182

4207 +#: fetch-pack.c:193

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

4209 msgstr "git fetch-pack : liste superficielle attendue"

4210

4199 -#: fetch-pack.c:185

4211 +#: fetch-pack.c:196

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

4213 msgstr ""

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

4215

4204 -#: fetch-pack.c:196

4216 +#: fetch-pack.c:207

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

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

4219

4208 -#: fetch-pack.c:216

4220 +#: fetch-pack.c:227

4221 #, c-format

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

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

4224

4213 -#: fetch-pack.c:227

4225 +#: fetch-pack.c:238

4226 msgid "unable to write to remote"

4227 msgstr "impossible d'écrire sur un distant"

4228

4217 -#: fetch-pack.c:288

4229 +#: fetch-pack.c:299

4230 msgid "--stateless-rpc requires multi_ack_detailed"

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

4232

4221 -#: fetch-pack.c:383 fetch-pack.c:1423

4233 +#: fetch-pack.c:394 fetch-pack.c:1434

4234 #, c-format

4235 msgid "invalid shallow line: %s"

4236 msgstr "ligne de superficiel invalide : %s"

4237

4226 -#: fetch-pack.c:389 fetch-pack.c:1429

4238 +#: fetch-pack.c:400 fetch-pack.c:1440

4239 #, c-format

4240 msgid "invalid unshallow line: %s"

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

4242

4231 -#: fetch-pack.c:391 fetch-pack.c:1431

4243 +#: fetch-pack.c:402 fetch-pack.c:1442

4244 #, c-format

4245 msgid "object not found: %s"

4246 msgstr "objet non trouvé : %s"

4247

4236 -#: fetch-pack.c:394 fetch-pack.c:1434

4248 +#: fetch-pack.c:405 fetch-pack.c:1445

4249 #, c-format

4250 msgid "error in object: %s"

4251 msgstr "erreur dans l'objet : %s"

4252

4241 -#: fetch-pack.c:396 fetch-pack.c:1436

4253 +#: fetch-pack.c:407 fetch-pack.c:1447

4254 #, c-format

4255 msgid "no shallow found: %s"

4256 msgstr "pas de superficiel trouvé : %s"

4257

4246 -#: fetch-pack.c:399 fetch-pack.c:1440

4258 +#: fetch-pack.c:410 fetch-pack.c:1451

4259 #, c-format

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

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

4262

4251 -#: fetch-pack.c:439

4263 +#: fetch-pack.c:450

4264 #, c-format

4265 msgid "got %s %d %s"

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

4267

4256 -#: fetch-pack.c:456

4268 +#: fetch-pack.c:467

4269 #, c-format

4270 msgid "invalid commit %s"

4271 msgstr "commit invalide %s"

4272

4261 -#: fetch-pack.c:487

4273 +#: fetch-pack.c:498

4274 msgid "giving up"

4275 msgstr "abandon"

4276

4265 -#: fetch-pack.c:500 progress.c:339

4277 +#: fetch-pack.c:511 progress.c:339

4278 msgid "done"

4279 msgstr "fait"

4280

4269 -#: fetch-pack.c:512

4281 +#: fetch-pack.c:523

4282 #, c-format

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

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

4285

4274 -#: fetch-pack.c:548

4286 +#: fetch-pack.c:559

4287 #, c-format

4288 msgid "Marking %s as complete"

4289 msgstr "Marquage de %s comme terminé"

4290

4279 -#: fetch-pack.c:763

4291 +#: fetch-pack.c:774

4292 #, c-format

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

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

4295

4284 -#: fetch-pack.c:849

4296 +#: fetch-pack.c:860

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

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

4299

4288 -#: fetch-pack.c:857

4300 +#: fetch-pack.c:868

4301 msgid "protocol error: bad pack header"

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

4303

4292 -#: fetch-pack.c:951

4304 +#: fetch-pack.c:962

4305 #, c-format

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

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

4308

4297 -#: fetch-pack.c:957

4309 +#: fetch-pack.c:968

4310 msgid "fetch-pack: invalid index-pack output"

4311 msgstr "fetch-pack : sortie d'index de pack invalide"

4312

4301 -#: fetch-pack.c:974

4313 +#: fetch-pack.c:985

4314 #, c-format

4315 msgid "%s failed"

4316 msgstr "échec de %s"

4317

4306 -#: fetch-pack.c:976

4318 +#: fetch-pack.c:987

4319 msgid "error in sideband demultiplexer"

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

4321

4310 -#: fetch-pack.c:1019

4322 +#: fetch-pack.c:1030

4323 #, c-format

4324 msgid "Server version is %.*s"

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

4326

4315 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4316 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4317 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4318 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4327 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4328 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4329 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4330 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4331 #, c-format

4332 msgid "Server supports %s"

4333 msgstr "Le serveur supporte %s"

4334

4323 -#: fetch-pack.c:1029

4335 +#: fetch-pack.c:1040

4336 msgid "Server does not support shallow clients"

4337 msgstr "Le serveur ne supporte les clients superficiels"

4338

4327 -#: fetch-pack.c:1089

4339 +#: fetch-pack.c:1100

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

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

4342

4331 -#: fetch-pack.c:1094

4343 +#: fetch-pack.c:1105

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

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

4346

4335 -#: fetch-pack.c:1098

4347 +#: fetch-pack.c:1109

4348 msgid "Server does not support --deepen"

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

4350

4339 -#: fetch-pack.c:1100

4351 +#: fetch-pack.c:1111

4352 msgid "Server does not support this repository's object format"

4353 msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"

4354

4343 -#: fetch-pack.c:1113

4355 +#: fetch-pack.c:1124

4356 msgid "no common commits"

4357 msgstr "pas de commit commun"

4358

4347 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4359 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4360 msgid "source repository is shallow, reject to clone."

4361 msgstr "le dépôt source est superficiel, clonage rejeté."

4362

4351 -#: fetch-pack.c:1128 fetch-pack.c:1660

4363 +#: fetch-pack.c:1139 fetch-pack.c:1671

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

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

4366

4355 -#: fetch-pack.c:1242

4367 +#: fetch-pack.c:1253

4368 #, c-format

4369 msgid "mismatched algorithms: client %s; server %s"

4370 msgstr "non-correspondance des algorithmes : client %s ; serveur %s"

4371

4360 -#: fetch-pack.c:1246

4372 +#: fetch-pack.c:1257

4373 #, c-format

4374 msgid "the server does not support algorithm '%s'"

4375 msgstr "le serveur ne supporte pas l'algorithme '%s'"

4376

4365 -#: fetch-pack.c:1279

4377 +#: fetch-pack.c:1290

4378 msgid "Server does not support shallow requests"

4379 msgstr "Le serveur ne supporte pas les requêtes superficielles"

4380

4369 -#: fetch-pack.c:1286

4381 +#: fetch-pack.c:1297

4382 msgid "Server supports filter"

4383 msgstr "Le serveur supporte filter"

4384

4373 -#: fetch-pack.c:1329 fetch-pack.c:2043

4385 +#: fetch-pack.c:1340 fetch-pack.c:2053

4386 msgid "unable to write request to remote"

4387 msgstr "impossible d'écrire la requête sur le distant"

4388

4377 -#: fetch-pack.c:1347

4389 +#: fetch-pack.c:1358

4390 #, c-format

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

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

4393

4382 -#: fetch-pack.c:1353

4394 +#: fetch-pack.c:1364

4395 #, c-format

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

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

4398

4387 -#: fetch-pack.c:1387

4399 +#: fetch-pack.c:1398

4400 #, c-format

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

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

4403

4392 -#: fetch-pack.c:1392

4404 +#: fetch-pack.c:1403

4405 #, c-format

4406 msgid "error processing acks: %d"

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

4408

4397 -#: fetch-pack.c:1402

4409 +#: fetch-pack.c:1413

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

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

4412

4401 -#: fetch-pack.c:1404

4413 +#: fetch-pack.c:1415

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

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

4416

4405 -#: fetch-pack.c:1445

4417 +#: fetch-pack.c:1456

4418 #, c-format

4419 msgid "error processing shallow info: %d"

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

4421

4410 -#: fetch-pack.c:1494

4422 +#: fetch-pack.c:1505

4423 #, c-format

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

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

4426

4415 -#: fetch-pack.c:1499

4427 +#: fetch-pack.c:1510

4428 #, c-format

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

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

4431

4420 -#: fetch-pack.c:1504

4432 +#: fetch-pack.c:1515

4433 #, c-format

4434 msgid "error processing wanted refs: %d"

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

4436

4425 -#: fetch-pack.c:1534

4437 +#: fetch-pack.c:1545

4438 msgid "git fetch-pack: expected response end packet"

4439 msgstr "git fetch-pack : paquet de fin de réponse attendu"

4440

4429 -#: fetch-pack.c:1939

4441 +#: fetch-pack.c:1949

4442 msgid "no matching remote head"

4443 msgstr "pas de HEAD distante correspondante"

4444

4433 -#: fetch-pack.c:1962 builtin/clone.c:697

4445 +#: fetch-pack.c:1972 builtin/clone.c:581

4446 msgid "remote did not send all necessary objects"

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

4448

4437 -#: fetch-pack.c:2065

4449 +#: fetch-pack.c:2075

4450 msgid "unexpected 'ready' from remote"

4451 msgstr "'ready' inattendu depuis le distant"

4452

4441 -#: fetch-pack.c:2088

4453 +#: fetch-pack.c:2098

4454 #, c-format

4455 msgid "no such remote ref %s"

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

4457

4446 -#: fetch-pack.c:2091

4458 +#: fetch-pack.c:2101

4459 #, c-format

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

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

4462

4451 -#: gpg-interface.c:273

4463 +#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900

4464 +#: gpg-interface.c:916

4465 msgid "could not create temporary file"

4466 msgstr "impossible de créer un fichier temporaire"

4467

4455 -#: gpg-interface.c:276

4468 +#: gpg-interface.c:332 gpg-interface.c:452

4469 #, c-format

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

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

4472

4460 -#: gpg-interface.c:470

4473 +#: gpg-interface.c:443

4474 +msgid ""

4475 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4476 +"signature verification"

4477 +msgstr "gpg.ssh.allowedSignersFile doit exister et être configuré pour la vérification de signature ssh"

4478 +

4479 +#: gpg-interface.c:467

4480 +msgid ""

4481 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4482 +"verification (available in openssh version 8.2p1+)"

4483 +msgstr "ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de signature ssh (disponible depuis openssh version 8.2p1+)"

4484 +

4485 +#: gpg-interface.c:521

4486 +#, c-format

4487 +msgid "ssh signing revocation file configured but not found: %s"

4488 +msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"

4489 +

4490 +#: gpg-interface.c:574

4491 +#, c-format

4492 +msgid "bad/incompatible signature '%s'"

4493 +msgstr "signature incompatible ou mauvaise '%s'"

4494 +

4495 +#: gpg-interface.c:733 gpg-interface.c:738

4496 +#, c-format

4497 +msgid "failed to get the ssh fingerprint for key '%s'"

4498 +msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"

4499 +

4500 +#: gpg-interface.c:760

4501 +msgid ""

4502 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4503 +msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"

4504 +

4505 +#: gpg-interface.c:778

4506 +#, c-format

4507 +msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"

4508 +msgstr "gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"

4509 +

4510 +#: gpg-interface.c:784

4511 +#, c-format

4512 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4513 +msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"

4514 +

4515 +#: gpg-interface.c:872

4516 msgid "gpg failed to sign the data"

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

4518

4519 +#: gpg-interface.c:893

4520 +msgid "user.signingkey needs to be set for ssh signing"

4521 +msgstr "user.signingkey doit être configuré pour pour signer avec ssh"

4522 +

4523 +#: gpg-interface.c:904

4524 +#, c-format

4525 +msgid "failed writing ssh signing key to '%s'"

4526 +msgstr "impossible d'écrire la clé de signature ssh dans '%s'"

4527 +

4528 +#: gpg-interface.c:922

4529 +#, c-format

4530 +msgid "failed writing ssh signing key buffer to '%s'"

4531 +msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"

4532 +

4533 +#: gpg-interface.c:940

4534 +msgid ""

4535 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4536 +"8.2p1+)"

4537 +msgstr "ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible dans openssh version 8.2p1+)"

4538 +

4539 +#: gpg-interface.c:952

4540 +#, c-format

4541 +msgid "failed reading ssh signing data buffer from '%s'"

4542 +msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"

4543 +

4544 #: graph.c:98

4545 #, c-format

4546 msgid "ignored invalid color '%.*s' in log.graphColors"

@@ -4474,112 +4554,112 @@ msgstr ""

4554 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "

4555 "supporté qu'avec -P avec PCRE v2"

4556

4477 -#: grep.c:1895

4557 +#: grep.c:1907

4558 #, c-format

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

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

4561

4482 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4562 +#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4563 #: builtin/rm.c:136

4564 #, c-format

4565 msgid "failed to stat '%s'"

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

4567

4488 -#: grep.c:1923

4568 +#: grep.c:1935

4569 #, c-format

4570 msgid "'%s': short read"

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

4572

4493 -#: help.c:23

4573 +#: help.c:24

4574 msgid "start a working area (see also: git help tutorial)"

4575 msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"

4576

4497 -#: help.c:24

4577 +#: help.c:25

4578 msgid "work on the current change (see also: git help everyday)"

4579 msgstr ""

4580 "travailler sur la modification actuelle (voir aussi : git help revisions)"

4581

4502 -#: help.c:25

4582 +#: help.c:26

4583 msgid "examine the history and state (see also: git help revisions)"

4584 msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"

4585

4506 -#: help.c:26

4586 +#: help.c:27

4587 msgid "grow, mark and tweak your common history"

4588 msgstr "agrandir, marquer et modifier votre historique"

4589

4510 -#: help.c:27

4590 +#: help.c:28

4591 msgid "collaborate (see also: git help workflows)"

4592 msgstr "collaborer (voir aussi : git help workflows)"

4593

4514 -#: help.c:31

4594 +#: help.c:32

4595 msgid "Main Porcelain Commands"

4596 msgstr "Commandes Porcelaine Principales"

4597

4518 -#: help.c:32

4598 +#: help.c:33

4599 msgid "Ancillary Commands / Manipulators"

4600 msgstr "Commandes Auxiliaires / Manipulateurs"

4601

4522 -#: help.c:33

4602 +#: help.c:34

4603 msgid "Ancillary Commands / Interrogators"

4604 msgstr "Commandes Auxiliaires / Interrogateurs"

4605

4526 -#: help.c:34

4606 +#: help.c:35

4607 msgid "Interacting with Others"

4608 msgstr "Interaction avec d'autres développeurs"

4609

4530 -#: help.c:35

4610 +#: help.c:36

4611 msgid "Low-level Commands / Manipulators"

4612 msgstr "Commandes bas-niveau / Manipulateurs"

4613

4534 -#: help.c:36

4614 +#: help.c:37

4615 msgid "Low-level Commands / Interrogators"

4616 msgstr "Commandes bas niveau / Interrogateurs"

4617

4538 -#: help.c:37

4618 +#: help.c:38

4619 msgid "Low-level Commands / Syncing Repositories"

4620 msgstr "Commandes bas niveau / Synchronisation de dépôts"

4621

4542 -#: help.c:38

4622 +#: help.c:39

4623 msgid "Low-level Commands / Internal Helpers"

4624 msgstr "Commandes bas niveau / Assistants internes"

4625

4546 -#: help.c:300

4626 +#: help.c:313

4627 #, c-format

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

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

4630

4551 -#: help.c:307

4631 +#: help.c:320

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

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

4634

4555 -#: help.c:316

4635 +#: help.c:329

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

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

4638

4559 -#: help.c:365 git.c:100

4639 +#: help.c:378 git.c:100

4640 #, c-format

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

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

4643

4564 -#: help.c:405

4644 +#: help.c:418

4645 msgid "The Git concept guides are:"

4646 msgstr "Les guides des concepts de Git sont :"

4647

4568 -#: help.c:429

4648 +#: help.c:442

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

4650 msgstr ""

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

4652 "commande spécifique"

4653

4574 -#: help.c:434

4654 +#: help.c:447

4655 msgid "External commands"

4656 msgstr "Commandes externes"

4657

4578 -#: help.c:449

4658 +#: help.c:462

4659 msgid "Command aliases"

4660 msgstr "Alias de commande"

4661

4582 -#: help.c:527

4662 +#: help.c:543

4663 #, c-format

4664 msgid ""

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

@@ -4588,33 +4668,38 @@ msgstr ""

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

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

4670

4591 -#: help.c:543 help.c:631

4671 +#: help.c:565 help.c:662

4672 #, c-format

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

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

4675

4596 -#: help.c:591

4676 +#: help.c:613

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

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

4679

4600 -#: help.c:613

4680 +#: help.c:635

4681 #, c-format

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

4683 msgstr ""

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

4685

4606 -#: help.c:618

4686 +#: help.c:640

4687 #, c-format

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

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

4690

4611 -#: help.c:623

4691 +#: help.c:646

4692 +#, c-format

4693 +msgid "Run '%s' instead? (y/N)"

4694 +msgstr "Lancer '%s' à la place ? (y/N)"

4695 +

4696 +#: help.c:654

4697 #, c-format

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

4699 msgstr ""

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

4701

4617 -#: help.c:635

4702 +#: help.c:666

4703 msgid ""

4704 "\n"

4705 "The most similar command is"

@@ -4628,16 +4713,16 @@ msgstr[1] ""

4713 "\n"

4714 "Les commandes les plus ressemblantes sont"

4715

4631 -#: help.c:675

4716 +#: help.c:706

4717 msgid "git version [<options>]"

4718 msgstr "git version [<options>]"

4719

4635 -#: help.c:730

4720 +#: help.c:761

4721 #, c-format

4722 msgid "%s: %s - %s"

4723 msgstr "%s: %s - %s"

4724

4640 -#: help.c:734

4725 +#: help.c:765

4726 msgid ""

4727 "\n"

4728 "Did you mean this?"

@@ -4651,6 +4736,16 @@ msgstr[1] ""

4736 "\n"

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

4738

4739 +#: hook.c:27

4740 +#, c-format

4741 +msgid ""

4742 +"The '%s' hook was ignored because it's not set as executable.\n"

4743 +"You can disable this warning with `git config advice.ignoredHook false`."

4744 +msgstr ""

4745 +"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

4746 +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

4747 +"false`."

4748 +

4749 #: ident.c:353

4750 msgid "Author identity unknown\n"

4751 msgstr "Identité d'auteur inconnue\n"

@@ -4713,7 +4808,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

4810

4716 -#: ident.c:454 builtin/commit.c:647

4811 +#: ident.c:454 builtin/commit.c:648

4812 #, c-format

4813 msgid "invalid date format: %s"

4814 msgstr "format de date invalide : %s"

@@ -4812,7 +4907,12 @@ msgstr "Impossible de créer '%s.lock' : %s"

4907 msgid "invalid value '%s' for lsrefs.unborn"

4908 msgstr "valeur invalide '%s' pour lsrefs.unborn"

4909

4815 -#: ls-refs.c:167

4910 +#: ls-refs.c:174

4911 +#, c-format

4912 +msgid "unexpected line: '%s'"

4913 +msgstr "ligne inattendue : '%s'"

4914 +

4915 +#: ls-refs.c:178

4916 msgid "expected flush after ls-refs arguments"

4917 msgstr "vidage attendu après les arguments ls-refs"

4918

@@ -4820,39 +4920,39 @@ msgstr "vidage attendu après les arguments ls-refs"

4920 msgid "quoted CRLF detected"

4921 msgstr "CRLF citées détectées"

4922

4823 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4923 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4924 #, c-format

4925 msgid "bad action '%s' for '%s'"

4926 msgstr "action invalide '%s' pour '%s'"

4927

4828 -#: merge-ort.c:1569 merge-recursive.c:1201

4928 +#: merge-ort.c:1584 merge-recursive.c:1211

4929 #, c-format

4930 msgid "Failed to merge submodule %s (not checked out)"

4931 msgstr "Échec de la fusion du sous-module %s (non extrait)"

4932

4833 -#: merge-ort.c:1578 merge-recursive.c:1208

4933 +#: merge-ort.c:1593 merge-recursive.c:1218

4934 #, c-format

4935 msgid "Failed to merge submodule %s (commits not present)"

4936 msgstr "Échec de fusion du sous-module %s (commits non présents)"

4937

4838 -#: merge-ort.c:1587 merge-recursive.c:1215

4938 +#: merge-ort.c:1602 merge-recursive.c:1225

4939 #, c-format

4940 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4941 msgstr ""

4942 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

4943 "base de fusion)"

4944

4845 -#: merge-ort.c:1597 merge-ort.c:1604

4945 +#: merge-ort.c:1612 merge-ort.c:1620

4946 #, c-format

4947 msgid "Note: Fast-forwarding submodule %s to %s"

4948 msgstr "Note : Avance rapide du sous-module %s à %s"

4949

4850 -#: merge-ort.c:1625

4950 +#: merge-ort.c:1642

4951 #, c-format

4952 msgid "Failed to merge submodule %s"

4953 msgstr "Échec de la fusion du sous-module %s"

4954

4855 -#: merge-ort.c:1632

4955 +#: merge-ort.c:1649

4956 #, c-format

4957 msgid ""

4958 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4862,7 +4962,7 @@ msgstr ""

4962 "existe :\n"

4963 "%s\n"

4964

4865 -#: merge-ort.c:1636 merge-recursive.c:1269

4965 +#: merge-ort.c:1653 merge-recursive.c:1281

4966 #, c-format

4967 msgid ""

4968 "If this is correct simply add it to the index for example\n"

@@ -4879,7 +4979,7 @@ msgstr ""

4979 "\n"

4980 "qui acceptera cette suggestion.\n"

4981

4882 -#: merge-ort.c:1649

4982 +#: merge-ort.c:1666

4983 #, c-format

4984 msgid ""

4985 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4889,21 +4989,21 @@ msgstr ""

4989 "existent :\n"

4990 "%s"

4991

4892 -#: merge-ort.c:1868 merge-recursive.c:1358

4992 +#: merge-ort.c:1887 merge-recursive.c:1372

4993 msgid "Failed to execute internal merge"

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

4995

4896 -#: merge-ort.c:1873 merge-recursive.c:1363

4996 +#: merge-ort.c:1892 merge-recursive.c:1377

4997 #, c-format

4998 msgid "Unable to add %s to database"

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

5000

4901 -#: merge-ort.c:1880 merge-recursive.c:1396

5001 +#: merge-ort.c:1899 merge-recursive.c:1410

5002 #, c-format

5003 msgid "Auto-merging %s"

5004 msgstr "Fusion automatique de %s"

5005

4906 -#: merge-ort.c:2019 merge-recursive.c:2118

5006 +#: merge-ort.c:2038 merge-recursive.c:2132

5007 #, c-format

5008 msgid ""

5009 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4912,7 +5012,7 @@ msgstr ""

5012 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

5013 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

5014

4915 -#: merge-ort.c:2029 merge-recursive.c:2128

5015 +#: merge-ort.c:2048 merge-recursive.c:2142

5016 #, c-format

5017 msgid ""

5018 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4921,7 +5021,7 @@ msgstr ""

5021 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

5022 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

5023

4924 -#: merge-ort.c:2087

5024 +#: merge-ort.c:2106

5025 #, c-format

5026 msgid ""

5027 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4932,7 +5032,7 @@ msgstr ""

5032 "parce que le répertoire a été renommé en plusieurs autres répertoires, sans "

5033 "aucune destination récupérant la majorité des fichiers."

5034

4935 -#: merge-ort.c:2241 merge-recursive.c:2464

5035 +#: merge-ort.c:2260 merge-recursive.c:2478

5036 #, c-format

5037 msgid ""

5038 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -4941,7 +5041,7 @@ msgstr ""

5041 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

5042 "renommé."

5043

4944 -#: merge-ort.c:2385 merge-recursive.c:3247

5044 +#: merge-ort.c:2400 merge-recursive.c:3261

5045 #, c-format

5046 msgid ""

5047 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4950,7 +5050,7 @@ msgstr ""

5050 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

5051 "en %s ; déplacé dans %s."

5052

4953 -#: merge-ort.c:2392 merge-recursive.c:3254

5053 +#: merge-ort.c:2407 merge-recursive.c:3268

5054 #, c-format

5055 msgid ""

5056 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4959,7 +5059,7 @@ msgstr ""

5059 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

5060 "renommé en %s ; déplacé dans %s."

5061

4962 -#: merge-ort.c:2405 merge-recursive.c:3250

5062 +#: merge-ort.c:2420 merge-recursive.c:3264

5063 #, c-format

5064 msgid ""

5065 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4969,7 +5069,7 @@ msgstr ""

5069 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

5070 "vers %s."

5071

4972 -#: merge-ort.c:2413 merge-recursive.c:3257

5072 +#: merge-ort.c:2428 merge-recursive.c:3271

5073 #, c-format

5074 msgid ""

5075 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4979,13 +5079,13 @@ msgstr ""

5079 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

5080 "être déplacé vers %s."

5081

4982 -#: merge-ort.c:2569

5082 +#: merge-ort.c:2584

5083 #, c-format

5084 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

5085 msgstr ""

5086 "CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."

5087

4988 -#: merge-ort.c:2664

5088 +#: merge-ort.c:2679

5089 #, c-format

5090 msgid ""

5091 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4996,24 +5096,24 @@ msgstr ""

5096 "des conflits de contenu ET entre en collision avec un autre chemin ; ceci "

5097 "peut resulter en des marqueurs de conflit imbriqués."

5098

4999 -#: merge-ort.c:2683 merge-ort.c:2707

5099 +#: merge-ort.c:2698 merge-ort.c:2722

5100 #, c-format

5101 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

5102 msgstr ""

5103 "CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "

5104 "supprimé dans %s."

5105

5006 -#: merge-ort.c:3182 merge-recursive.c:3008

5106 +#: merge-ort.c:3212 merge-recursive.c:3022

5107 #, c-format

5108 msgid "cannot read object %s"

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

5110

5011 -#: merge-ort.c:3185 merge-recursive.c:3011

5111 +#: merge-ort.c:3215 merge-recursive.c:3025

5112 #, c-format

5113 msgid "object %s is not a blob"

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

5115

5016 -#: merge-ort.c:3613

5116 +#: merge-ort.c:3644

5117 #, c-format

5118 msgid ""

5119 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

@@ -5022,7 +5122,7 @@ msgstr ""

5122 "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "

5123 "déplacement dans %s à la place."

5124

5025 -#: merge-ort.c:3689

5125 +#: merge-ort.c:3721

5126 #, c-format

5127 msgid ""

5128 "CONFLICT (distinct types): %s had different types on each side; renamed both "

@@ -5031,7 +5131,7 @@ msgstr ""

5131 "CONFLIT (types différents) : %s a des types différents des deux côtés ; "

5132 "renommé chacune de manière à pouvoir enregistrer les deux quelque part."

5133

5034 -#: merge-ort.c:3696

5134 +#: merge-ort.c:3728

5135 #, c-format

5136 msgid ""

5137 "CONFLICT (distinct types): %s had different types on each side; renamed one "

@@ -5041,24 +5141,24 @@ msgstr ""

5141 "renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "

5142 "part."

5143

5044 -#: merge-ort.c:3796 merge-recursive.c:3087

5144 +#: merge-ort.c:3819 merge-recursive.c:3101

5145 msgid "content"

5146 msgstr "contenu"

5147

5048 -#: merge-ort.c:3798 merge-recursive.c:3091

5148 +#: merge-ort.c:3821 merge-recursive.c:3105

5149 msgid "add/add"

5150 msgstr "ajout/ajout"

5151

5052 -#: merge-ort.c:3800 merge-recursive.c:3136

5152 +#: merge-ort.c:3823 merge-recursive.c:3150

5153 msgid "submodule"

5154 msgstr "sous-module"

5155

5056 -#: merge-ort.c:3802 merge-recursive.c:3137

5156 +#: merge-ort.c:3825 merge-recursive.c:3151

5157 #, c-format

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

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

5160

5061 -#: merge-ort.c:3833

5161 +#: merge-ort.c:3856

5162 #, c-format

5163 msgid ""

5164 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -5067,7 +5167,7 @@ msgstr ""

5167 "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "

5168 "Version %s de %s laissée dans l'arbre."

5169

5070 -#: merge-ort.c:4120

5170 +#: merge-ort.c:4152

5171 #, c-format

5172 msgid ""

5173 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5079,12 +5179,12 @@ msgstr ""

5179 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5180 #. base, and 2-3) the trees for the two trees we're merging.

5181 #.

5082 -#: merge-ort.c:4487

5182 +#: merge-ort.c:4521

5183 #, c-format

5184 msgid "collecting merge info failed for trees %s, %s, %s"

5185 msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"

5186

5087 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

5187 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

5188 #, c-format

5189 msgid ""

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

@@ -5094,106 +5194,106 @@ msgstr ""

5194 "fusion :\n"

5195 " %s"

5196

5097 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

5197 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

5198 msgid "Already up to date."

5199 msgstr "Déjà à jour."

5200

5101 -#: merge-recursive.c:352

5201 +#: merge-recursive.c:353

5202 msgid "(bad commit)\n"

5203 msgstr "(mauvais commit)\n"

5204

5105 -#: merge-recursive.c:375

5205 +#: merge-recursive.c:381

5206 #, c-format

5207 msgid "add_cacheinfo failed for path '%s'; merge aborting."

5208 msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."

5209

5110 -#: merge-recursive.c:384

5210 +#: merge-recursive.c:390

5211 #, c-format

5212 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

5213 msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."

5214

5115 -#: merge-recursive.c:872

5215 +#: merge-recursive.c:881

5216 #, c-format

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

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

5219

5120 -#: merge-recursive.c:883

5220 +#: merge-recursive.c:892

5221 #, c-format

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

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

5224

5125 -#: merge-recursive.c:897 merge-recursive.c:916

5225 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

5228

5129 -#: merge-recursive.c:906

5229 +#: merge-recursive.c:915

5230 #, c-format

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

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

5233

5134 -#: merge-recursive.c:947 builtin/cat-file.c:41

5234 +#: merge-recursive.c:956 builtin/cat-file.c:41

5235 #, c-format

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

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

5238

5139 -#: merge-recursive.c:952

5239 +#: merge-recursive.c:961

5240 #, c-format

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

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

5243

5144 -#: merge-recursive.c:977

5244 +#: merge-recursive.c:986

5245 #, c-format

5246 msgid "failed to open '%s': %s"

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

5248

5149 -#: merge-recursive.c:988

5249 +#: merge-recursive.c:997

5250 #, c-format

5251 msgid "failed to symlink '%s': %s"

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

5253

5154 -#: merge-recursive.c:993

5254 +#: merge-recursive.c:1002

5255 #, c-format

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

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

5258

5159 -#: merge-recursive.c:1223 merge-recursive.c:1235

5259 +#: merge-recursive.c:1233 merge-recursive.c:1246

5260 #, c-format

5261 msgid "Fast-forwarding submodule %s to the following commit:"

5262 msgstr "Avance rapide du sous-module %s au commit suivant :"

5263

5164 -#: merge-recursive.c:1226 merge-recursive.c:1238

5264 +#: merge-recursive.c:1236 merge-recursive.c:1249

5265 #, c-format

5266 msgid "Fast-forwarding submodule %s"

5267 msgstr "Avance rapide du sous-module %s"

5268

5169 -#: merge-recursive.c:1261

5269 +#: merge-recursive.c:1273

5270 #, c-format

5271 msgid "Failed to merge submodule %s (merge following commits not found)"

5272 msgstr ""

5273 "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

5274

5175 -#: merge-recursive.c:1265

5275 +#: merge-recursive.c:1277

5276 #, c-format

5277 msgid "Failed to merge submodule %s (not fast-forward)"

5278 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

5279

5180 -#: merge-recursive.c:1266

5280 +#: merge-recursive.c:1278

5281 msgid "Found a possible merge resolution for the submodule:\n"

5282 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

5283

5184 -#: merge-recursive.c:1278

5284 +#: merge-recursive.c:1290

5285 #, c-format

5286 msgid "Failed to merge submodule %s (multiple merges found)"

5287 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

5288

5189 -#: merge-recursive.c:1420

5289 +#: merge-recursive.c:1434

5290 #, c-format

5291 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5292 msgstr ""

5293 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

5294 "place."

5295

5196 -#: merge-recursive.c:1492

5296 +#: merge-recursive.c:1506

5297 #, c-format

5298 msgid ""

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

@@ -5202,7 +5302,7 @@ msgstr ""

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

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

5304

5205 -#: merge-recursive.c:1497

5305 +#: merge-recursive.c:1511

5306 #, c-format

5307 msgid ""

5308 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5211,7 +5311,7 @@ msgstr ""

5311 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

5312 "%s de %s laissée dans l'arbre."

5313

5214 -#: merge-recursive.c:1504

5314 +#: merge-recursive.c:1518

5315 #, c-format

5316 msgid ""

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

@@ -5220,7 +5320,7 @@ msgstr ""

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

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

5322

5223 -#: merge-recursive.c:1509

5323 +#: merge-recursive.c:1523

5324 #, c-format

5325 msgid ""

5326 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5229,41 +5329,41 @@ msgstr ""

5329 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

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

5331

5232 -#: merge-recursive.c:1544

5332 +#: merge-recursive.c:1558

5333 msgid "rename"

5334 msgstr "renommage"

5335

5236 -#: merge-recursive.c:1544

5336 +#: merge-recursive.c:1558

5337 msgid "renamed"

5338 msgstr "renommé"

5339

5240 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5340 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

5341 #, c-format

5342 msgid "Refusing to lose dirty file at %s"

5343 msgstr "Refus de perdre le fichier modifié %s"

5344

5245 -#: merge-recursive.c:1605

5345 +#: merge-recursive.c:1619

5346 #, c-format

5347 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5348 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

5349

5250 -#: merge-recursive.c:1663

5350 +#: merge-recursive.c:1677

5351 #, c-format

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

5353 msgstr ""

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

5355

5256 -#: merge-recursive.c:1694

5356 +#: merge-recursive.c:1708

5357 #, c-format

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

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

5360

5261 -#: merge-recursive.c:1699

5361 +#: merge-recursive.c:1713

5362 #, c-format

5363 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5364 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

5365

5266 -#: merge-recursive.c:1726

5366 +#: merge-recursive.c:1740

5367 #, c-format

5368 msgid ""

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

@@ -5272,18 +5372,18 @@ msgstr ""

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

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

5374

5275 -#: merge-recursive.c:1731

5375 +#: merge-recursive.c:1745

5376 msgid " (left unresolved)"

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

5378

5279 -#: merge-recursive.c:1823

5379 +#: merge-recursive.c:1837

5380 #, c-format

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

5382 msgstr ""

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

5384 ">'%s' dans %s"

5385

5286 -#: merge-recursive.c:2086

5386 +#: merge-recursive.c:2100

5387 #, c-format

5388 msgid ""

5389 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -5294,7 +5394,7 @@ msgstr ""

5394 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

5395 "sans aucune destination récupérant la majorité des fichiers."

5396

5297 -#: merge-recursive.c:2220

5397 +#: merge-recursive.c:2234

5398 #, c-format

5399 msgid ""

5400 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -5303,80 +5403,80 @@ msgstr ""

5403 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

5404 "Renommage de répertoire %s->%s dans %s"

5405

5306 -#: merge-recursive.c:3075

5406 +#: merge-recursive.c:3089

5407 msgid "modify"

5408 msgstr "modification"

5409

5310 -#: merge-recursive.c:3075

5410 +#: merge-recursive.c:3089

5411 msgid "modified"

5412 msgstr "modifié"

5413

5314 -#: merge-recursive.c:3114

5414 +#: merge-recursive.c:3128

5415 #, c-format

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

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

5418

5319 -#: merge-recursive.c:3167

5419 +#: merge-recursive.c:3181

5420 #, c-format

5421 msgid "Adding as %s instead"

5422 msgstr "Ajout plutôt comme %s"

5423

5324 -#: merge-recursive.c:3371

5424 +#: merge-recursive.c:3385

5425 #, c-format

5426 msgid "Removing %s"

5427 msgstr "Suppression de %s"

5428

5329 -#: merge-recursive.c:3394

5429 +#: merge-recursive.c:3408

5430 msgid "file/directory"

5431 msgstr "fichier/répertoire"

5432

5333 -#: merge-recursive.c:3399

5433 +#: merge-recursive.c:3413

5434 msgid "directory/file"

5435 msgstr "répertoire/fichier"

5436

5337 -#: merge-recursive.c:3406

5437 +#: merge-recursive.c:3420

5438 #, c-format

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

5440 msgstr ""

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

5442

5343 -#: merge-recursive.c:3415

5443 +#: merge-recursive.c:3429

5444 #, c-format

5445 msgid "Adding %s"

5446 msgstr "Ajout de %s"

5447

5348 -#: merge-recursive.c:3424

5448 +#: merge-recursive.c:3438

5449 #, c-format

5450 msgid "CONFLICT (add/add): Merge conflict in %s"

5451 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

5452

5353 -#: merge-recursive.c:3477

5453 +#: merge-recursive.c:3491

5454 #, c-format

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

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

5457

5358 -#: merge-recursive.c:3571

5458 +#: merge-recursive.c:3585

5459 msgid "Merging:"

5460 msgstr "Fusion :"

5461

5362 -#: merge-recursive.c:3584

5462 +#: merge-recursive.c:3598

5463 #, c-format

5464 msgid "found %u common ancestor:"

5465 msgid_plural "found %u common ancestors:"

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

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

5468

5369 -#: merge-recursive.c:3634

5469 +#: merge-recursive.c:3648

5470 msgid "merge returned no commit"

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

5472

5373 -#: merge-recursive.c:3799

5473 +#: merge-recursive.c:3816

5474 #, c-format

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

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

5477

5378 -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

5379 -#: builtin/stash.c:473

5478 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5479 +#: builtin/stash.c:489

5480 msgid "Unable to write index."

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

5482

@@ -5384,142 +5484,174 @@ msgstr "Impossible d'écrire l'index."

5484 msgid "failed to read the cache"

5485 msgstr "impossible de lire le cache"

5486

5387 -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5388 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5389 -#: builtin/stash.c:267

5487 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5488 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5489 +#: builtin/stash.c:269

5490 msgid "unable to write new index file"

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

5492

5393 -#: midx.c:74

5493 +#: midx.c:78

5494 msgid "multi-pack-index OID fanout is of the wrong size"

5495 msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"

5496

5397 -#: midx.c:105

5497 +#: midx.c:109

5498 #, c-format

5499 msgid "multi-pack-index file %s is too small"

5500 msgstr "le fichier d'index multi-paquet %s est trop petit"

5501

5402 -#: midx.c:121

5502 +#: midx.c:125

5503 #, c-format

5504 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5505 msgstr ""

5506 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "

5507 "0x%08x"

5508

5409 -#: midx.c:126

5509 +#: midx.c:130

5510 #, c-format

5511 msgid "multi-pack-index version %d not recognized"

5512 msgstr "la version d'index multi-paquet %d n'est pas reconnue"

5513

5414 -#: midx.c:131

5514 +#: midx.c:135

5515 #, c-format

5516 msgid "multi-pack-index hash version %u does not match version %u"

5517 msgstr ""

5518 "la version d'empreinte d'index multi-paquet %u ne correspond pas à la "

5519 "version %u"

5520

5421 -#: midx.c:148

5521 +#: midx.c:152

5522 msgid "multi-pack-index missing required pack-name chunk"

5523 msgstr "index multi-paquet manque de tronçon de nom de paquet"

5524

5425 -#: midx.c:150

5525 +#: midx.c:154

5526 msgid "multi-pack-index missing required OID fanout chunk"

5527 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"

5528

5429 -#: midx.c:152

5529 +#: midx.c:156

5530 msgid "multi-pack-index missing required OID lookup chunk"

5531 msgstr "index multi-paquet manque de tronçon de recherche OID requis"

5532

5433 -#: midx.c:154

5533 +#: midx.c:158

5534 msgid "multi-pack-index missing required object offsets chunk"

5535 msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"

5536

5437 -#: midx.c:170

5537 +#: midx.c:174

5538 #, c-format

5539 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5540 msgstr ""

5541 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

5542

5443 -#: midx.c:214

5543 +#: midx.c:221

5544 #, c-format

5545 msgid "bad pack-int-id: %u (%u total packs)"

5546 msgstr "mauvais pack-int-id : %u (%u paquets au total)"

5547

5448 -#: midx.c:264

5548 +#: midx.c:271

5549 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5550 msgstr ""

5551 "l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"

5552

5453 -#: midx.c:490

5553 +#: midx.c:502

5554 #, c-format

5555 msgid "failed to add packfile '%s'"

5556 msgstr "échec de l'ajout du fichier paquet '%s'"

5557

5458 -#: midx.c:496

5558 +#: midx.c:508

5559 #, c-format

5560 msgid "failed to open pack-index '%s'"

5561 msgstr "échec à l'ouverture du fichier paquet '%s'"

5562

5463 -#: midx.c:564

5563 +#: midx.c:576

5564 #, c-format

5565 msgid "failed to locate object %d in packfile"

5566 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

5567

5468 -#: midx.c:880 builtin/index-pack.c:1533

5568 +#: midx.c:892

5569 msgid "cannot store reverse index file"

5570 msgstr "impossible de stocker le fichier d'index inversé"

5571

5472 -#: midx.c:920

5572 +#: midx.c:990

5573 +#, c-format

5574 +msgid "could not parse line: %s"

5575 +msgstr "impossible d'analyser la ligne : %s"

5576 +

5577 +#: midx.c:992

5578 +#, c-format

5579 +msgid "malformed line: %s"

5580 +msgstr "ligne malformée : %s"

5581 +

5582 +#: midx.c:1159

5583 msgid "ignoring existing multi-pack-index; checksum mismatch"

5584 msgstr ""

5585 "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"

5586

5477 -#: midx.c:943

5478 -msgid "Adding packfiles to multi-pack-index"

5479 -msgstr "Ajout de fichiers paquet à un index multi-paquet"

5587 +#: midx.c:1184

5588 +msgid "could not load pack"

5589 +msgstr "impossible de charger le paquet"

5590

5481 -#: midx.c:989

5591 +#: midx.c:1190

5592 #, c-format

5483 -msgid "did not see pack-file %s to drop"

5484 -msgstr "fichier paquet à éliminer %s non trouvé"

5593 +msgid "could not open index for %s"

5594 +msgstr "impossible d'ouvrir l'index pour %s"

5595 +

5596 +#: midx.c:1201

5597 +msgid "Adding packfiles to multi-pack-index"

5598 +msgstr "Ajout de fichiers paquet à un index multi-paquet"

5599

5486 -#: midx.c:1034

5600 +#: midx.c:1244

5601 #, c-format

5602 msgid "unknown preferred pack: '%s'"

5603 msgstr "paquet préféré inconnu : %s"

5604

5491 -#: midx.c:1039

5605 +#: midx.c:1289

5606 +#, c-format

5607 +msgid "cannot select preferred pack %s with no objects"

5608 +msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet"

5609 +

5610 +#: midx.c:1321

5611 +#, c-format

5612 +msgid "did not see pack-file %s to drop"

5613 +msgstr "fichier paquet à éliminer %s non trouvé"

5614 +

5615 +#: midx.c:1367

5616 #, c-format

5617 msgid "preferred pack '%s' is expired"

5618 msgstr "le paquet préféré '%s' est expiré"

5619

5496 -#: midx.c:1055

5620 +#: midx.c:1380

5621 msgid "no pack files to index."

5622 msgstr "aucun fichier paquet à l'index."

5623

5500 -#: midx.c:1135 builtin/clean.c:37

5624 +#: midx.c:1417

5625 +msgid "could not write multi-pack bitmap"

5626 +msgstr "impossible d'écrire le bitmap multi-paquet"

5627 +

5628 +#: midx.c:1427

5629 +msgid "could not write multi-pack-index"

5630 +msgstr "échec de l'écriture de l'index de multi-paquet"

5631 +

5632 +#: midx.c:1486 builtin/clean.c:37

5633 #, c-format

5634 msgid "failed to remove %s"

5635 msgstr "échec de la suppression de %s"

5636

5505 -#: midx.c:1166

5637 +#: midx.c:1517

5638 #, c-format

5639 msgid "failed to clear multi-pack-index at %s"

5640 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

5641

5510 -#: midx.c:1225

5642 +#: midx.c:1577

5643 msgid "multi-pack-index file exists, but failed to parse"

5644 msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"

5645

5514 -#: midx.c:1233

5646 +#: midx.c:1585

5647 msgid "incorrect checksum"

5648 msgstr "somme de contrôle incorrecte"

5649

5518 -#: midx.c:1236

5650 +#: midx.c:1588

5651 msgid "Looking for referenced packfiles"

5652 msgstr "Recherche de fichiers paquets référencés"

5653

5522 -#: midx.c:1251

5654 +#: midx.c:1603

5655 #, c-format

5656 msgid ""

5657 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

@@ -5527,55 +5659,55 @@ msgstr ""

5659 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

5660 "étalement[%d]"

5661

5530 -#: midx.c:1256

5662 +#: midx.c:1608

5663 msgid "the midx contains no oid"

5664 msgstr "le midx ne contient aucun oid"

5665

5534 -#: midx.c:1265

5666 +#: midx.c:1617

5667 msgid "Verifying OID order in multi-pack-index"

5668 msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"

5669

5538 -#: midx.c:1274

5670 +#: midx.c:1626

5671 #, c-format

5672 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5673 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

5674

5543 -#: midx.c:1294

5675 +#: midx.c:1646

5676 msgid "Sorting objects by packfile"

5677 msgstr "Classement des objets par fichier paquet"

5678

5547 -#: midx.c:1301

5679 +#: midx.c:1653

5680 msgid "Verifying object offsets"

5681 msgstr "Vérification des décalages des objets"

5682

5551 -#: midx.c:1317

5683 +#: midx.c:1669

5684 #, c-format

5685 msgid "failed to load pack entry for oid[%d] = %s"

5686 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

5687

5556 -#: midx.c:1323

5688 +#: midx.c:1675

5689 #, c-format

5690 msgid "failed to load pack-index for packfile %s"

5691 msgstr "impossible de lire le fichier paquet %s"

5692

5561 -#: midx.c:1332

5693 +#: midx.c:1684

5694 #, c-format

5695 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5696 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

5697

5566 -#: midx.c:1357

5698 +#: midx.c:1709

5699 msgid "Counting referenced objects"

5700 msgstr "Comptage des objets référencés"

5701

5570 -#: midx.c:1367

5702 +#: midx.c:1719

5703 msgid "Finding and deleting unreferenced packfiles"

5704 msgstr "Recherche et effacement des fichiers paquets non-référencés"

5705

5574 -#: midx.c:1558

5706 +#: midx.c:1911

5707 msgid "could not start pack-objects"

5708 msgstr "impossible de démarrer le groupement d'objets"

5709

5578 -#: midx.c:1578

5710 +#: midx.c:1931

5711 msgid "could not finish pack-objects"

5712 msgstr "impossible de finir le groupement d'objets"

5713

@@ -5633,261 +5765,261 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

5765 msgid "Bad %s value: '%s'"

5766 msgstr "Mauvaise valeur de %s : '%s'"

5767

5636 -#: object-file.c:526

5768 +#: object-file.c:459

5769 #, c-format

5770 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5771 msgstr ""

5772 "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"

5773

5642 -#: object-file.c:584

5774 +#: object-file.c:517

5775 #, c-format

5776 msgid "unable to normalize alternate object path: %s"

5777 msgstr "impossible de normaliser le chemin d'objet alternatif : %s"

5778

5647 -#: object-file.c:658

5779 +#: object-file.c:591

5780 #, c-format

5781 msgid "%s: ignoring alternate object stores, nesting too deep"

5782 msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"

5783

5652 -#: object-file.c:665

5784 +#: object-file.c:598

5785 #, c-format

5786 msgid "unable to normalize object directory: %s"

5787 msgstr "impossible de normaliser le répertoire d'objet : %s"

5788

5657 -#: object-file.c:708

5789 +#: object-file.c:641

5790 msgid "unable to fdopen alternates lockfile"

5791 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"

5792

5661 -#: object-file.c:726

5793 +#: object-file.c:659

5794 msgid "unable to read alternates file"

5795 msgstr "lecture du fichier d'alternatives impossible"

5796

5665 -#: object-file.c:733

5797 +#: object-file.c:666

5798 msgid "unable to move new alternates file into place"

5799 msgstr "impossible de déplacer le nouveau fichier d'alternative"

5800

5669 -#: object-file.c:768

5801 +#: object-file.c:701

5802 #, c-format

5803 msgid "path '%s' does not exist"

5804 msgstr "le chemin '%s' n'existe pas"

5805

5674 -#: object-file.c:789

5806 +#: object-file.c:722

5807 #, c-format

5808 msgid "reference repository '%s' as a linked checkout is not supported yet."

5809 msgstr ""

5810 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

5811 "encore supporté."

5812

5681 -#: object-file.c:795

5813 +#: object-file.c:728

5814 #, c-format

5815 msgid "reference repository '%s' is not a local repository."

5816 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

5817

5686 -#: object-file.c:801

5818 +#: object-file.c:734

5819 #, c-format

5820 msgid "reference repository '%s' is shallow"

5821 msgstr "le dépôt de référence '%s' est superficiel"

5822

5691 -#: object-file.c:809

5823 +#: object-file.c:742

5824 #, c-format

5825 msgid "reference repository '%s' is grafted"

5826 msgstr "le dépôt de référence '%s' est greffé"

5827

5696 -#: object-file.c:869

5828 +#: object-file.c:773

5829 +#, c-format

5830 +msgid "could not find object directory matching %s"

5831 +msgstr "impossible de trouver le répertoire objet correspondant à %s"

5832 +

5833 +#: object-file.c:823

5834 #, c-format

5835 msgid "invalid line while parsing alternate refs: %s"

5836 msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"

5837

5701 -#: object-file.c:1019

5838 +#: object-file.c:973

5839 #, c-format

5840 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5841 msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"

5842

5706 -#: object-file.c:1054

5843 +#: object-file.c:1008

5844 #, c-format

5845 msgid "mmap failed%s"

5846 msgstr "échec de mmap%s"

5847

5711 -#: object-file.c:1218

5848 +#: object-file.c:1174

5849 #, c-format

5850 msgid "object file %s is empty"

5851 msgstr "le fichier objet %s est vide"

5852

5716 -#: object-file.c:1353 object-file.c:2548

5853 +#: object-file.c:1293 object-file.c:2499

5854 #, c-format

5855 msgid "corrupt loose object '%s'"

5856 msgstr "objet libre corrompu '%s'"

5857

5721 -#: object-file.c:1355 object-file.c:2552

5858 +#: object-file.c:1295 object-file.c:2503

5859 #, c-format

5860 msgid "garbage at end of loose object '%s'"

5861 msgstr "données incorrectes à la fin de l'objet libre '%s'"

5862

5726 -#: object-file.c:1397

5863 +#: object-file.c:1417

5864 +#, c-format

5865 +msgid "unable to parse %s header"

5866 +msgstr "impossible d'analyser l'entête %s"

5867 +

5868 +#: object-file.c:1419

5869 msgid "invalid object type"

5870 msgstr "type d'objet invalide"

5871

5730 -#: object-file.c:1481

5731 -#, c-format

5732 -msgid "unable to unpack %s header with --allow-unknown-type"

5733 -msgstr "impossible de dépaqueter l'entête %s avec --allow-unknown-type"

5734 -

5735 -#: object-file.c:1484

5872 +#: object-file.c:1430

5873 #, c-format

5874 msgid "unable to unpack %s header"

5875 msgstr "impossible de dépaqueter l'entête %s"

5876

5740 -#: object-file.c:1490

5741 -#, c-format

5742 -msgid "unable to parse %s header with --allow-unknown-type"

5743 -msgstr "impossible d'analyser l'entête %s avec --allow-unknown-type"

5744 -

5745 -#: object-file.c:1493

5877 +#: object-file.c:1434

5878 #, c-format

5747 -msgid "unable to parse %s header"

5748 -msgstr "impossible d'analyser l'entête %s"

5879 +msgid "header for %s too long, exceeds %d bytes"

5880 +msgstr "entête de %s trop long, attendu %d octets"

5881

5750 -#: object-file.c:1717

5882 +#: object-file.c:1664

5883 #, c-format

5884 msgid "failed to read object %s"

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

5886

5755 -#: object-file.c:1721

5887 +#: object-file.c:1668

5888 #, c-format

5889 msgid "replacement %s not found for %s"

5890 msgstr "remplacement %s non trouvé pour %s"

5891

5760 -#: object-file.c:1725

5892 +#: object-file.c:1672

5893 #, c-format

5894 msgid "loose object %s (stored in %s) is corrupt"

5895 msgstr "l'objet libre %s (stocké dans %s) est corrompu"

5896

5765 -#: object-file.c:1729

5897 +#: object-file.c:1676

5898 #, c-format

5899 msgid "packed object %s (stored in %s) is corrupt"

5900 msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"

5901

5770 -#: object-file.c:1834

5902 +#: object-file.c:1781

5903 #, c-format

5904 msgid "unable to write file %s"

5905 msgstr "impossible d'écrire le fichier %s"

5906

5775 -#: object-file.c:1841

5907 +#: object-file.c:1788

5908 #, c-format

5909 msgid "unable to set permission to '%s'"

5910 msgstr "impossible de régler les droits de '%s'"

5911

5780 -#: object-file.c:1848

5912 +#: object-file.c:1795

5913 msgid "file write error"

5914 msgstr "erreur d'écriture d'un fichier"

5915

5784 -#: object-file.c:1868

5916 +#: object-file.c:1815

5917 msgid "error when closing loose object file"

5918 msgstr "erreur en fermeture du fichier d'objet esseulé"

5919

5788 -#: object-file.c:1933

5920 +#: object-file.c:1882

5921 #, c-format

5922 msgid "insufficient permission for adding an object to repository database %s"

5923 msgstr ""

5924 "droits insuffisants pour ajouter un objet à la base de données %s du dépôt"

5925

5794 -#: object-file.c:1935

5926 +#: object-file.c:1884

5927 msgid "unable to create temporary file"

5928 msgstr "impossible de créer un fichier temporaire"

l10n: fr v2.34.0 rnd1