4d9c2902a1 · matheusbsbs/matheus-bagliano

@@ -75,8 +75,8 @@ msgid ""

75 msgstr ""

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

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

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

79 -"PO-Revision-Date: 2019-12-31 17:37+0100\n"

78 +"POT-Creation-Date: 2020-03-06 14:25+0800\n"

79 +"PO-Revision-Date: 2020-03-08 23:25+0100\n"

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

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

82 "Language: fr\n"

@@ -86,250 +86,512 @@ msgstr ""

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

87 "X-Generator: Poedit 2.2.3\n"

88

89 -#: add-interactive.c:347

89 +#: add-interactive.c:368

90 #, c-format

91 msgid "Huh (%s)?"

92 msgstr "Hein (%s) ?"

93

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

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

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

94 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

95 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

96 +#: builtin/rebase.c:2086 builtin/rebase.c:2130

97 msgid "could not read index"

98 msgstr "impossible de lire l'index"

99

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

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

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

102 msgid "binary"

103 msgstr "binaire"

104

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

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

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

107 msgid "nothing"

108 msgstr "rien"

109

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

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

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

112 msgid "unchanged"

113 msgstr "inchangé"

114

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

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

116 msgid "Update"

117 msgstr "Mise à jour"

118

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

119 +#: add-interactive.c:689 add-interactive.c:877

120 #, c-format

121 msgid "could not stage '%s'"

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

123

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

125 -#: builtin/rebase.c:895

124 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

125 +#: builtin/rebase.c:899

126 msgid "could not write index"

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

128

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

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

130 #, c-format, perl-format

131 msgid "updated %d path\n"

132 msgid_plural "updated %d paths\n"

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

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

135

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

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

137 #, c-format, perl-format

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

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

140

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

141 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

142 #: builtin/reset.c:144

143 #, c-format

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

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

146

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

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

148 msgid "Revert"

149 msgstr "Inverser"

150

151 -#: add-interactive.c:746

151 +#: add-interactive.c:767

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

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

154

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

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

156 #, c-format, perl-format

157 msgid "reverted %d path\n"

158 msgid_plural "reverted %d paths\n"

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

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

161

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

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

163 #, c-format

164 msgid "No untracked files.\n"

165 msgstr "Aucun Fichier non suivi.\n"

166

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

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

168 msgid "Add untracked"

169 msgstr "Ajouter un fichier non-suivi"

170

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

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

172 #, c-format, perl-format

173 msgid "added %d path\n"

174 msgid_plural "added %d paths\n"

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

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

177

178 -#: add-interactive.c:896

178 +#: add-interactive.c:917

179 #, c-format

180 msgid "ignoring unmerged: %s"

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

182

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

183 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366

184 #, c-format

185 msgid "Only binary files changed.\n"

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

187

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

188 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368

189 #, c-format

190 msgid "No changes.\n"

191 msgstr "Aucune modification.\n"

192

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

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

194 msgid "Patch update"

195 msgstr "Mise à jour par patch"

196

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

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

198 msgid "Review diff"

199 msgstr "Réviser la différence"

200

201 -#: add-interactive.c:981

201 +#: add-interactive.c:1002

202 msgid "show paths with changes"

203 msgstr "afficher les chemins comprenant des modifications"

204

205 -#: add-interactive.c:983

205 +#: add-interactive.c:1004

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

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

207 +msgstr ""

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

209

209 -#: add-interactive.c:985

210 +#: add-interactive.c:1006

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

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

213

213 -#: add-interactive.c:987

214 +#: add-interactive.c:1008

215 msgid "pick hunks and update selectively"

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

217

217 -#: add-interactive.c:989

218 +#: add-interactive.c:1010

219 msgid "view diff between HEAD and index"

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

221

221 -#: add-interactive.c:991

222 +#: add-interactive.c:1012

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

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

224 +msgstr ""

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

226 +"indexées"

227

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

228 +#: add-interactive.c:1020 add-interactive.c:1069

229 msgid "Prompt help:"

230 msgstr "Aide :"

231

229 -#: add-interactive.c:1001

232 +#: add-interactive.c:1022

233 msgid "select a single item"

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

235

233 -#: add-interactive.c:1003

236 +#: add-interactive.c:1024

237 msgid "select a range of items"

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

239

237 -#: add-interactive.c:1005

240 +#: add-interactive.c:1026

241 msgid "select multiple ranges"

242 msgstr "sélectionner plusieurs plages"

243

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

244 +#: add-interactive.c:1028 add-interactive.c:1073

245 msgid "select item based on unique prefix"

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

247

245 -#: add-interactive.c:1009

248 +#: add-interactive.c:1030

249 msgid "unselect specified items"

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

251

249 -#: add-interactive.c:1011

252 +#: add-interactive.c:1032

253 msgid "choose all items"

254 msgstr "choisir tous les éléments"

255

253 -#: add-interactive.c:1013

256 +#: add-interactive.c:1034

257 msgid "(empty) finish selecting"

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

259

257 -#: add-interactive.c:1050

260 +#: add-interactive.c:1071

261 msgid "select a numbered item"

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

263

261 -#: add-interactive.c:1054

264 +#: add-interactive.c:1075

265 msgid "(empty) select nothing"

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

267

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

268 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

269 msgid "*** Commands ***"

270 msgstr "*** Commandes ***"

271

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

272 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

273 msgid "What now"

274 msgstr "Et maintenant ?"

275

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

276 +#: add-interactive.c:1136 git-add--interactive.perl:213

277 msgid "staged"

278 msgstr "indexé"

279

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

280 +#: add-interactive.c:1136 git-add--interactive.perl:213

281 msgid "unstaged"

282 msgstr "non-indexé"

283

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

284 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197

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

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

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

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

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

286 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

287 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

288 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

289 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213

290 msgid "path"

291 msgstr "chemin"

292

290 -#: add-interactive.c:1122

293 +#: add-interactive.c:1143

294 msgid "could not refresh index"

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

296

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

297 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

298 #, c-format

299 msgid "Bye.\n"

300 msgstr "Au revoir.\n"

301

299 -#: add-patch.c:15

300 -#, c-format

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

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

302 +#: add-patch.c:33 git-add--interactive.perl:1428

303 +#, c-format, perl-format

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

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

306

304 -#: add-patch.c:16

305 -#, c-format

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

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

307 +#: add-patch.c:34 git-add--interactive.perl:1429

308 +#, c-format, perl-format

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

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

311

309 -#: add-patch.c:17

310 -#, c-format

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

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

312 +#: add-patch.c:35 git-add--interactive.perl:1430

313 +#, c-format, perl-format

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

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

316 +

317 +#: add-patch.c:37

318 +msgid ""

319 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

320 +"staging."

321 +msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme indexée."

322 +

323 +#: add-patch.c:40

324 +msgid ""

325 +"y - stage this hunk\n"

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

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

328 +"a - stage this hunk and all later hunks in the file\n"

329 +"d - do not stage this hunk or any of the later hunks in the file\n"

330 +msgstr ""

331 +"y - indexer cette section\n"

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

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

334 +"a - indexer cette section et toutes les suivantes de ce fichier\n"

335 +"d - ne pas indexer cette section ni les suivantes de ce fichier\n"

336 +

337 +#: add-patch.c:54 git-add--interactive.perl:1433

338 +#, c-format, perl-format

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

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

341 +

342 +#: add-patch.c:55 git-add--interactive.perl:1434

343 +#, c-format, perl-format

344 +msgid "Stash deletion [y,n,q,a,d%s,?]? "

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

346 +

347 +#: add-patch.c:56 git-add--interactive.perl:1435

348 +#, c-format, perl-format

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

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

351 +

352 +#: add-patch.c:58

353 +msgid ""

354 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

355 +"stashing."

356 +msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme remisée."

357 +

358 +#: add-patch.c:61

359 +msgid ""

360 +"y - stash this hunk\n"

361 +"n - do not stash this hunk\n"

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

363 +"a - stash this hunk and all later hunks in the file\n"

364 +"d - do not stash this hunk or any of the later hunks in the file\n"

365 +msgstr ""

366 +"y - remiser cette section\n"

367 +"n - ne pas remiser cette section\n"

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

369 +"a - remiser cette section et toutes les suivantes de ce fichier\n"

370 +"d - ne pas remiser cette section ni les suivantes de ce fichier\n"

371 +

372 +#: add-patch.c:77 git-add--interactive.perl:1438

373 +#, c-format, perl-format

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

375 +msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "

376 +

377 +#: add-patch.c:78 git-add--interactive.perl:1439

378 +#, c-format, perl-format

379 +msgid "Unstage deletion [y,n,q,a,d%s,?]? "

380 +msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "

381 +

382 +#: add-patch.c:79 git-add--interactive.perl:1440

383 +#, c-format, perl-format

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

385 +msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "

386 +

387 +#: add-patch.c:81

388 +msgid ""

389 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

390 +"unstaging."

391 +msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme desindexée."

392 +

393 +#: add-patch.c:84

394 +msgid ""

395 +"y - unstage this hunk\n"

396 +"n - do not unstage this hunk\n"

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

398 +"a - unstage this hunk and all later hunks in the file\n"

399 +"d - do not unstage this hunk or any of the later hunks in the file\n"

400 +msgstr ""

401 +"y - désindexer cette section\n"

402 +"n - ne pas désindexer cette section\n"

403 +"q - quitter ; ne pas désindexer cette section ni les autres restantes\n"

404 +"a - désindexer cette section et toutes les suivantes de ce fichier\n"

405 +"d - ne pas désindexer cette section ni les suivantes de ce fichier\n"

406 +

407 +#: add-patch.c:99 git-add--interactive.perl:1443

408 +#, c-format, perl-format

409 +msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

410 +msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "

411 +

412 +#: add-patch.c:100 git-add--interactive.perl:1444

413 +#, c-format, perl-format

414 +msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

415 +msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "

416 +

417 +#: add-patch.c:101 git-add--interactive.perl:1445

418 +#, c-format, perl-format

419 +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

420 +msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "

421 +

422 +#: add-patch.c:103 add-patch.c:168 add-patch.c:211

423 +msgid ""

424 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

425 +"applying."

426 +msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme appliquée."

427 +

428 +#: add-patch.c:106

429 +msgid ""

430 +"y - apply this hunk to index\n"

431 +"n - do not apply this hunk to index\n"

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

433 +"a - apply this hunk and all later hunks in the file\n"

434 +"d - do not apply this hunk or any of the later hunks in the file\n"

435 +msgstr ""

436 +"y - appliquer cette section\n"

437 +"n - ne pas appliquer cette section\n"

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

439 +"a - appliquer cette section et toutes les suivantes de ce fichier\n"

440 +"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

441 +

442 +#: add-patch.c:121 git-add--interactive.perl:1448

443 +#: git-add--interactive.perl:1463

444 +#, c-format, perl-format

445 +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

446 +msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "

447 +

448 +#: add-patch.c:122 git-add--interactive.perl:1449

449 +#: git-add--interactive.perl:1464

450 +#, c-format, perl-format

451 +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

452 +msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "

453 +

454 +#: add-patch.c:123 git-add--interactive.perl:1450

455 +#: git-add--interactive.perl:1465

456 +#, c-format, perl-format

457 +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

458 +msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "

459 +

460 +#: add-patch.c:125 add-patch.c:147 add-patch.c:190

461 +msgid ""

462 +"If the patch applies cleanly, the edited hunk will immediately be marked for "

463 +"discarding."

464 +msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme éliminée."

465

314 -#: add-patch.c:111

466 +#: add-patch.c:128 add-patch.c:193

467 +msgid ""

468 +"y - discard this hunk from worktree\n"

469 +"n - do not discard this hunk from worktree\n"

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

471 +"a - discard this hunk and all later hunks in the file\n"

472 +"d - do not discard this hunk or any of the later hunks in the file\n"

473 +msgstr ""

474 +"y - supprimer cette section\n"

475 +"n - ne pas supprimer cette section\n"

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

477 +"a - supprimer cette section et toutes les suivantes de ce fichier\n"

478 +"d - ne pas supprimer cette section ni les suivantes de ce fichier\n"

479 +

480 +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

481 +#, c-format, perl-format

482 +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

483 +msgstr ""

484 +"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "

485 +

486 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

487 +#, c-format, perl-format

488 +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

489 +msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "

490 +

491 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

492 +#, c-format, perl-format

493 +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

494 +msgstr ""

495 +"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

496 +

497 +#: add-patch.c:150

498 +msgid ""

499 +"y - discard this hunk from index and worktree\n"

500 +"n - do not discard this hunk from index and worktree\n"

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

502 +"a - discard this hunk and all later hunks in the file\n"

503 +"d - do not discard this hunk or any of the later hunks in the file\n"

504 +msgstr ""

505 +"y - éliminer cette section de l'index et de l'arbre de travail\n"

506 +"n - ne pas éliminer cette section\n"

507 +"q - quitter ; ne pas éliminer cette section ni les autres restantes\n"

508 +"a - éliminer cette section et toutes les suivantes de ce fichier\n"

509 +"d - ne pas éliminer cette section ni les suivantes de ce fichier\n"

510 +

511 +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

512 +#, c-format, perl-format

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

514 +msgstr ""

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

516 +"%s,?] ? "

517 +

518 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

519 +#, c-format, perl-format

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

521 +msgstr ""

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

523 +"%s,?] ? "

524 +

525 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

526 +#, c-format, perl-format

527 +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

528 +msgstr ""

529 +"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

530 +

531 +#: add-patch.c:171

532 +msgid ""

533 +"y - apply this hunk to index and worktree\n"

534 +"n - do not apply this hunk to index and worktree\n"

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

536 +"a - apply this hunk and all later hunks in the file\n"

537 +"d - do not apply this hunk or any of the later hunks in the file\n"

538 +msgstr ""

539 +"y - appliquer cette section à l'index et à l'arbre de travail\n"

540 +"n - ne pas appliquer cette section\n"

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

542 +"a - appliquer cette section et toutes les suivantes de ce fichier\n"

543 +"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

544 +

545 +#: add-patch.c:214

546 +msgid ""

547 +"y - apply this hunk to worktree\n"

548 +"n - do not apply this hunk to worktree\n"

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

550 +"a - apply this hunk and all later hunks in the file\n"

551 +"d - do not apply this hunk or any of the later hunks in the file\n"

552 +msgstr ""

553 +"y - appliquer cette section à l'arbre de travail\n"

554 +"n - ne pas appliquer cette section\n"

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

556 +"a - appliquer cette section et toutes les suivantes de ce fichier\n"

557 +"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"

558 +

559 +#: add-patch.c:318

560 #, c-format

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

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

563

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

564 +#: add-patch.c:337 add-patch.c:341

565 #, c-format

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

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

568

324 -#: add-patch.c:176

569 +#: add-patch.c:395

570 msgid "could not parse diff"

571 msgstr "impossible d'analyser la diff"

572

328 -#: add-patch.c:194

573 +#: add-patch.c:414

574 msgid "could not parse colored diff"

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

576

332 -#: add-patch.c:508

577 +#: add-patch.c:428

578 +#, c-format

579 +msgid "failed to run '%s'"

580 +msgstr "échec pour lancer '%s'"

581 +

582 +#: add-patch.c:587

583 +msgid "mismatched output from interactive.diffFilter"

584 +msgstr "sortie sans correspondance depuis interactive.diffFilter"

585 +

586 +#: add-patch.c:588

587 +msgid ""

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

589 +"between its input and output lines."

590 +msgstr ""

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

592 +"entre les lignes en entrée et en sortie."

593 +

594 +#: add-patch.c:761

595 #, c-format

596 msgid ""

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

@@ -338,7 +600,7 @@ msgstr ""

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

601 "%.*s"

602

341 -#: add-patch.c:523

603 +#: add-patch.c:776

604 #, c-format

605 msgid ""

606 "hunks do not overlap:\n"

@@ -351,12 +613,12 @@ msgstr ""

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

614 "%.*s"

615

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

616 +#: add-patch.c:1052 git-add--interactive.perl:1112

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

618 msgstr ""

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

620

359 -#: add-patch.c:803

621 +#: add-patch.c:1056

622 #, c-format

623 msgid ""

624 "---\n"

@@ -369,16 +631,8 @@ msgstr ""

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

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

633

372 -#: add-patch.c:810

373 -msgid ""

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

375 -"marked for staging.\n"

376 -msgstr ""

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

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

379 -

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

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

635 +#: add-patch.c:1070 git-add--interactive.perl:1126

636 msgid ""

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

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

@@ -388,11 +642,11 @@ msgstr ""

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

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

644

391 -#: add-patch.c:851

645 +#: add-patch.c:1103

646 msgid "could not parse hunk header"

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

648

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

649 +#: add-patch.c:1148

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

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

652

@@ -408,28 +662,26 @@ msgstr "'git apply --cached' a échoué"

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

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

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

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

665 +#: add-patch.c:1218 git-add--interactive.perl:1239

666 msgid ""

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

668 msgstr ""

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

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

671

418 -#: add-patch.c:1009

419 -msgid ""

420 -"y - stage this hunk\n"

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

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

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

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

425 -msgstr ""

426 -"y - indexer cette section\n"

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

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

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

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

672 +#: add-patch.c:1261

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

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

675

432 -#: add-patch.c:1016

676 +#: add-patch.c:1262 git-add--interactive.perl:1343

677 +msgid "Apply them to the worktree anyway? "

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

679 +

680 +#: add-patch.c:1269 git-add--interactive.perl:1346

681 +msgid "Nothing was applied.\n"

682 +msgstr "Rien n'a été appliqué.\n"

683 +

684 +#: add-patch.c:1326

685 msgid ""

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

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

@@ -451,99 +703,103 @@ msgstr ""

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

704 "? - afficher l'aide\n"

705

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

706 +#: add-patch.c:1447 add-patch.c:1457

707 msgid "No previous hunk"

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

709

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

710 +#: add-patch.c:1452 add-patch.c:1462

711 msgid "No next hunk"

712 msgstr "Pas de section suivante"

713

462 -#: add-patch.c:1158

714 +#: add-patch.c:1468

715 msgid "No other hunks to goto"

716 msgstr "Aucune autre section à atteindre"

717

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

718 +#: add-patch.c:1479 git-add--interactive.perl:1577

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

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

721

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

722 +#: add-patch.c:1480 git-add--interactive.perl:1579

723 msgid "go to which hunk? "

724 msgstr "aller à quelle section ? "

725

474 -#: add-patch.c:1181

726 +#: add-patch.c:1491

727 #, c-format

728 msgid "Invalid number: '%s'"

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

730

479 -#: add-patch.c:1186

731 +#: add-patch.c:1496

732 #, c-format

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

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

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

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

737

486 -#: add-patch.c:1195

738 +#: add-patch.c:1505

739 msgid "No other hunks to search"

740 msgstr "aucune autre section à rechercher"

741

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

742 +#: add-patch.c:1511 git-add--interactive.perl:1623

743 msgid "search for regex? "

744 msgstr "rechercher la regex ? "

745

494 -#: add-patch.c:1216

746 +#: add-patch.c:1526

747 #, c-format

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

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

750

499 -#: add-patch.c:1233

751 +#: add-patch.c:1543

752 msgid "No hunk matches the given pattern"

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

754

503 -#: add-patch.c:1240

755 +#: add-patch.c:1550

756 msgid "Sorry, cannot split this hunk"

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

758

507 -#: add-patch.c:1244

759 +#: add-patch.c:1554

760 #, c-format

761 msgid "Split into %d hunks."

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

763

512 -#: add-patch.c:1248

764 +#: add-patch.c:1558

765 msgid "Sorry, cannot edit this hunk"

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

767

516 -#: advice.c:111

768 +#: add-patch.c:1609

769 +msgid "'git apply' failed"

770 +msgstr "'git apply' a échoué"

771 +

772 +#: advice.c:115

773 #, c-format

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

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

776

521 -#: advice.c:164

777 +#: advice.c:168

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

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

780

525 -#: advice.c:166

781 +#: advice.c:170

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

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

784

529 -#: advice.c:168

785 +#: advice.c:172

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

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

788

533 -#: advice.c:170

789 +#: advice.c:174

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

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

792

537 -#: advice.c:172

793 +#: advice.c:176

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

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

796

541 -#: advice.c:174

797 +#: advice.c:178

798 #, c-format

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

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

801

546 -#: advice.c:182

802 +#: advice.c:186

803 msgid ""

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

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

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

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

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

809

554 -#: advice.c:190

810 +#: advice.c:194

811 msgid "Exiting because of an unresolved conflict."

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

813

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

814 +#: advice.c:199 builtin/merge.c:1335

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

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

817

562 -#: advice.c:197

818 +#: advice.c:201

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

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

821

566 -#: advice.c:198

822 +#: advice.c:202

823 msgid "Exiting because of unfinished merge."

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

825

570 -#: advice.c:204

826 +#: advice.c:208

827 #, c-format

828 msgid ""

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

@@ -830,431 +1086,431 @@ msgid "cannot apply binary patch to '%s' without full index line"

1086 msgstr ""

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

1088

833 -#: apply.c:3162

1089 +#: apply.c:3163

1090 #, c-format

1091 msgid ""

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

1093 msgstr ""

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

1095

840 -#: apply.c:3170

1096 +#: apply.c:3171

1097 #, c-format

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

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

1100

845 -#: apply.c:3188

1101 +#: apply.c:3189

1102 #, c-format

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

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

1105

850 -#: apply.c:3201

1106 +#: apply.c:3202

1107 #, c-format

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

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

1110

855 -#: apply.c:3207

1111 +#: apply.c:3209

1112 #, c-format

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

1114 msgstr ""

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

1116 "trouvé)"

1117

862 -#: apply.c:3228

1118 +#: apply.c:3230

1119 #, c-format

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

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

1122

867 -#: apply.c:3351

1123 +#: apply.c:3353

1124 #, c-format

1125 msgid "cannot checkout %s"

1126 msgstr "extraction de %s impossible"

1127

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

1128 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1129 #, c-format

1130 msgid "failed to read %s"

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

1132

877 -#: apply.c:3411

1133 +#: apply.c:3413

1134 #, c-format

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

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

1137

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

1138 +#: apply.c:3442 apply.c:3685

1139 #, c-format

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

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

1142

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

1143 +#: apply.c:3528 apply.c:3700

1144 #, c-format

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

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

1147

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

1148 +#: apply.c:3537 apply.c:3708

1149 #, c-format

1150 msgid "%s: does not match index"

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

1152

897 -#: apply.c:3570

1153 +#: apply.c:3572

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

1155 msgstr ""

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

1157 "points."

1158

903 -#: apply.c:3573

1159 +#: apply.c:3575

1160 #, c-format

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

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

1163

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

1164 +#: apply.c:3591 apply.c:3595

1165 #, c-format

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

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

1168

913 -#: apply.c:3605

1169 +#: apply.c:3607

1170 #, c-format

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

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

1173

918 -#: apply.c:3619

1174 +#: apply.c:3621

1175 #, c-format

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

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

1178

923 -#: apply.c:3624

1179 +#: apply.c:3626

1180 #, c-format

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

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

1183

928 -#: apply.c:3650

1184 +#: apply.c:3652

1185 msgid "removal patch leaves file contents"

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

1187

932 -#: apply.c:3723

1188 +#: apply.c:3725

1189 #, c-format

1190 msgid "%s: wrong type"

1191 msgstr "%s : type erroné"

1192

937 -#: apply.c:3725

1193 +#: apply.c:3727

1194 #, c-format

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

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

1197

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

943 -#: read-cache.c:1320

1198 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1199 +#: read-cache.c:1325

1200 #, c-format

1201 msgid "invalid path '%s'"

1202 msgstr "chemin invalide '%s'"

1203

948 -#: apply.c:3934

1204 +#: apply.c:3936

1205 #, c-format

1206 msgid "%s: already exists in index"

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

1208

953 -#: apply.c:3937

1209 +#: apply.c:3939

1210 #, c-format

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

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

1213

958 -#: apply.c:3957

1214 +#: apply.c:3959

1215 #, c-format

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

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

1218

963 -#: apply.c:3962

1219 +#: apply.c:3964

1220 #, c-format

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

1222 msgstr ""

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

1224

969 -#: apply.c:3982

1225 +#: apply.c:3984

1226 #, c-format

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

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

1229

974 -#: apply.c:3986

1230 +#: apply.c:3988

1231 #, c-format

1232 msgid "%s: patch does not apply"

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

1234

979 -#: apply.c:4001

1235 +#: apply.c:4003

1236 #, c-format

1237 msgid "Checking patch %s..."

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

1239

984 -#: apply.c:4093

1240 +#: apply.c:4095

1241 #, c-format

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

1243 msgstr ""

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

1245

990 -#: apply.c:4100

1246 +#: apply.c:4102

1247 #, c-format

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

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

1250

995 -#: apply.c:4103

1251 +#: apply.c:4105

1252 #, c-format

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

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

1255

1000 -#: apply.c:4112

1256 +#: apply.c:4114

1257 #, c-format

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

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

1260

1005 -#: apply.c:4122

1261 +#: apply.c:4124

1262 #, c-format

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

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

1265

1010 -#: apply.c:4260

1266 +#: apply.c:4262

1267 #, c-format

1268 msgid "unable to remove %s from index"

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

1270

1015 -#: apply.c:4294

1271 +#: apply.c:4296

1272 #, c-format

1273 msgid "corrupt patch for submodule %s"

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

1275

1020 -#: apply.c:4300

1276 +#: apply.c:4302

1277 #, c-format

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

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

1280

1025 -#: apply.c:4308

1281 +#: apply.c:4310

1282 #, c-format

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

1284 msgstr ""

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

1286 "impossible"

1287

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

1288 +#: apply.c:4316 apply.c:4461

1289 #, c-format

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

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

1292

1037 -#: apply.c:4357

1293 +#: apply.c:4359

1294 #, c-format

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

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

1297

1042 -#: apply.c:4361

1298 +#: apply.c:4363

1299 #, c-format

1300 msgid "closing file '%s'"

1301 msgstr "fermeture du fichier '%s'"

1302

1047 -#: apply.c:4431

1303 +#: apply.c:4433

1304 #, c-format

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

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

1307

1052 -#: apply.c:4529

1308 +#: apply.c:4531

1309 #, c-format

1310 msgid "Applied patch %s cleanly."

1311 msgstr "Patch %s appliqué proprement."

1312

1057 -#: apply.c:4537

1313 +#: apply.c:4539

1314 msgid "internal error"

1315 msgstr "erreur interne"

1316

1061 -#: apply.c:4540

1317 +#: apply.c:4542

1318 #, c-format

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

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

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

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

1323

1068 -#: apply.c:4551

1324 +#: apply.c:4553

1325 #, c-format

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

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

1328

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

1329 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1330 #, c-format

1331 msgid "cannot open %s"

1332 msgstr "impossible d'ouvrir %s"

1333

1078 -#: apply.c:4573

1334 +#: apply.c:4575

1335 #, c-format

1336 msgid "Hunk #%d applied cleanly."

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

1338

1083 -#: apply.c:4577

1339 +#: apply.c:4579

1340 #, c-format

1341 msgid "Rejected hunk #%d."

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

1343

1088 -#: apply.c:4696

1344 +#: apply.c:4698

1345 #, c-format

1346 msgid "Skipped patch '%s'."

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

1348

1093 -#: apply.c:4704

1349 +#: apply.c:4706

1350 msgid "unrecognized input"

1351 msgstr "entrée non reconnue"

1352

1097 -#: apply.c:4724

1353 +#: apply.c:4726

1354 msgid "unable to read index file"

1355 msgstr "lecture du fichier d'index impossible"

1356

1101 -#: apply.c:4881

1357 +#: apply.c:4883

1358 #, c-format

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

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

1361

1106 -#: apply.c:4908

1362 +#: apply.c:4910

1363 #, c-format

1364 msgid "squelched %d whitespace error"

1365 msgid_plural "squelched %d whitespace errors"

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

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

1368

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

1369 +#: apply.c:4916 apply.c:4931

1370 #, c-format

1371 msgid "%d line adds whitespace errors."

1372 msgid_plural "%d lines add whitespace errors."

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

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

1375

1120 -#: apply.c:4922

1376 +#: apply.c:4924

1377 #, c-format

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

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

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

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

1382

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

1383 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390

1384 msgid "Unable to write new index file"

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

1386

1131 -#: apply.c:4966

1387 +#: apply.c:4968

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

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

1390

1135 -#: apply.c:4969

1391 +#: apply.c:4971

1392 msgid "apply changes matching the given path"

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

1394

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

1395 +#: apply.c:4973 builtin/am.c:2206

1396 msgid "num"

1397 msgstr "num"

1398

1143 -#: apply.c:4972

1399 +#: apply.c:4974

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

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

1402

1147 -#: apply.c:4975

1403 +#: apply.c:4977

1404 msgid "ignore additions made by the patch"

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

1406

1151 -#: apply.c:4977

1407 +#: apply.c:4979

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

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

1410

1155 -#: apply.c:4981

1411 +#: apply.c:4983

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

1413 msgstr ""

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

1415

1160 -#: apply.c:4983

1416 +#: apply.c:4985

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

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

1419

1164 -#: apply.c:4985

1420 +#: apply.c:4987

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

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

1423

1168 -#: apply.c:4987

1424 +#: apply.c:4989

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

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

1427

1172 -#: apply.c:4989

1428 +#: apply.c:4991

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

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

1431

1176 -#: apply.c:4991

1432 +#: apply.c:4993

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

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

1435

1180 -#: apply.c:4993

1436 +#: apply.c:4995

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

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

1439

1184 -#: apply.c:4996

1440 +#: apply.c:4998

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

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

1443

1188 -#: apply.c:4998

1444 +#: apply.c:5000

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

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

1447

1192 -#: apply.c:5000

1448 +#: apply.c:5002

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

1450 msgstr ""

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

1452

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

1453 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1454 msgid "paths are separated with NUL character"

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

1456

1201 -#: apply.c:5005

1457 +#: apply.c:5007

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

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

1460

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

1461 +#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

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

1463 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1464 msgid "action"

1465 msgstr "action"

1466

1211 -#: apply.c:5007

1467 +#: apply.c:5009

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

1469 msgstr ""

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

1471 "d'espace"

1472

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

1473 +#: apply.c:5012 apply.c:5015

1474 msgid "ignore changes in whitespace when finding context"

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

1476

1221 -#: apply.c:5016

1477 +#: apply.c:5018

1478 msgid "apply the patch in reverse"

1479 msgstr "appliquer le patch en sens inverse"

1480

1225 -#: apply.c:5018

1481 +#: apply.c:5020

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

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

1484

1229 -#: apply.c:5020

1485 +#: apply.c:5022

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

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

1488

1233 -#: apply.c:5022

1489 +#: apply.c:5024

1490 msgid "allow overlapping hunks"

1491 msgstr "accepter les recouvrements de sections"

1492

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

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

1493 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1494 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

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

1496 msgid "be verbose"

1497 msgstr "mode verbeux"

1498

1243 -#: apply.c:5025

1499 +#: apply.c:5027

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

1501 msgstr ""

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

1503 "fichier"

1504

1249 -#: apply.c:5028

1505 +#: apply.c:5030

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

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

1508

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

1509 +#: apply.c:5032 builtin/am.c:2194

1510 msgid "root"

1511 msgstr "racine"

1512

1257 -#: apply.c:5031

1513 +#: apply.c:5033

1514 msgid "prepend <root> to all filenames"

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

1516

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

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

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

1535

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

1536 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299

1537 #, c-format

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

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

@@ -1318,8 +1574,8 @@ msgid "prepend prefix to each pathname in the archive"

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

1575

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

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

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

1577 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1578 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

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

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

1581 #: parse-options.h:190

@@ -1355,7 +1611,7 @@ msgid "list supported archive formats"

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

1612

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

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

1614 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1615 msgid "repo"

1616 msgstr "dépôt"

1617

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

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

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

1652

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

1653 +#: archive-tar.c:125 archive-zip.c:351

1654 #, c-format

1655 msgid "cannot stream blob %s"

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

1657

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

1658 +#: archive-tar.c:266 archive-zip.c:369

1659 #, c-format

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

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

1662

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

1663 +#: archive-tar.c:293 archive-zip.c:359

1664 #, c-format

1665 msgid "cannot read %s"

1666 msgstr "impossible de lire %s"

@@ -1433,12 +1689,12 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s"

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

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

1691

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

1692 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1693 #, c-format

1694 msgid "deflate error (%d)"

1695 msgstr "erreur de compression (%d)"

1696

1441 -#: archive-zip.c:614

1697 +#: archive-zip.c:615

1698 #, c-format

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

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

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

1727 msgid "We cannot bisect more!\n"

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

1729

1474 -#: bisect.c:733

1730 +#: bisect.c:745

1731 #, c-format

1732 msgid "Not a valid commit name %s"

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

1734

1479 -#: bisect.c:758

1735 +#: bisect.c:770

1736 #, c-format

1737 msgid ""

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

@@ -1485,7 +1741,7 @@ msgstr ""

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

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

1743

1488 -#: bisect.c:763

1744 +#: bisect.c:775

1745 #, c-format

1746 msgid ""

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

@@ -1494,7 +1750,7 @@ msgstr ""

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

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

1752

1497 -#: bisect.c:768

1753 +#: bisect.c:780

1754 #, c-format

1755 msgid ""

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

@@ -1503,7 +1759,7 @@ msgstr ""

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

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

1761

1506 -#: bisect.c:776

1762 +#: bisect.c:788

1763 #, c-format

1764 msgid ""

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

@@ -1514,7 +1770,7 @@ msgstr ""

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

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

1772

1517 -#: bisect.c:789

1773 +#: bisect.c:801

1774 #, c-format

1775 msgid ""

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

@@ -1526,36 +1782,36 @@ msgstr ""

1782 "et %s.\n"

1783 "On continue tout de même."

1784

1529 -#: bisect.c:822

1785 +#: bisect.c:840

1786 #, c-format

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

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

1789

1534 -#: bisect.c:865

1790 +#: bisect.c:890

1791 #, c-format

1792 msgid "a %s revision is needed"

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

1794

1539 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254

1795 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1796 #, c-format

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

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

1799

1544 -#: bisect.c:928 builtin/merge.c:148

1800 +#: bisect.c:966 builtin/merge.c:149

1801 #, c-format

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

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

1804

1549 -#: bisect.c:958

1805 +#: bisect.c:997

1806 msgid "reading bisect refs failed"

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

1808

1553 -#: bisect.c:977

1809 +#: bisect.c:1019

1810 #, c-format

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

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

1813

1558 -#: bisect.c:985

1814 +#: bisect.c:1028

1815 #, c-format

1816 msgid ""

1817 "No testable commit found.\n"

@@ -1564,7 +1820,7 @@ msgstr ""

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

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

1822

1567 -#: bisect.c:1004

1823 +#: bisect.c:1057

1824 #, c-format

1825 msgid "(roughly %d step)"

1826 msgid_plural "(roughly %d steps)"

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

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

1831 #. steps)" translation.

1832 #.

1577 -#: bisect.c:1010

1833 +#: bisect.c:1063

1834 #, c-format

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

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

@@ -1595,10 +1851,10 @@ msgstr ""

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

1852 "dernier commit"

1853

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

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

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

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

1854 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1855 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1856 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1857 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1858 #: builtin/shortlog.c:192

1859 msgid "revision walk setup failed"

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

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

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

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

2036

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

1782 -#: builtin/commit.c:811

2037 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

2038 +#: builtin/commit.c:815

2039 #, c-format

2040 msgid "could not open '%s'"

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

@@ -1849,13 +2105,13 @@ msgstr "impossible de créer '%s'"

2105 msgid "index-pack died"

2106 msgstr "l'index de groupe a disparu"

2107

1852 -#: color.c:296

2108 +#: color.c:329

2109 #, c-format

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

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

2112

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

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

2113 +#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398

2114 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457

2115 #, c-format

2116 msgid "could not parse %s"

2117 msgstr "impossible d'analyser %s"

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

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

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

2143

1888 -#: commit.c:1152

2144 +#: commit.c:1153

2145 #, c-format

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

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

2148

1893 -#: commit.c:1155

2149 +#: commit.c:1157

2150 #, c-format

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

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

2153

1898 -#: commit.c:1158

2154 +#: commit.c:1160

2155 #, c-format

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

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

2158

1903 -#: commit.c:1161

2159 +#: commit.c:1163

2160 #, c-format

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

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

2163

1908 -#: commit.c:1415

2164 +#: commit.c:1417

2165 msgid ""

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

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

@@ -1917,255 +2173,255 @@ msgstr ""

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

2174 "projet.\n"

2175

1920 -#: commit-graph.c:130

2176 +#: commit-graph.c:122

2177 msgid "commit-graph file is too small"

2178 msgstr "le graphe de commit est trop petit"

2179

1924 -#: commit-graph.c:195

2180 +#: commit-graph.c:189

2181 #, c-format

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

2183 msgstr ""

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

2185

1930 -#: commit-graph.c:202

2186 +#: commit-graph.c:196

2187 #, c-format

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

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

2190

1935 -#: commit-graph.c:209

2191 +#: commit-graph.c:203

2192 #, c-format

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

2194 msgstr ""

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

2196 "version %X"

2197

1942 -#: commit-graph.c:232

2198 +#: commit-graph.c:226

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

2200 msgstr ""

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

2202 "le fichier est peut être incomplet"

2203

1948 -#: commit-graph.c:243

2204 +#: commit-graph.c:237

2205 #, c-format

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

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

2208

1953 -#: commit-graph.c:286

2209 +#: commit-graph.c:280

2210 #, c-format

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

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

2213

1958 -#: commit-graph.c:350

2214 +#: commit-graph.c:343

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

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

2217

1962 -#: commit-graph.c:360

2218 +#: commit-graph.c:353

2219 msgid "commit-graph chain does not match"

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

2221

1966 -#: commit-graph.c:407

2222 +#: commit-graph.c:401

2223 #, c-format

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

2225 msgstr ""

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

2227

1972 -#: commit-graph.c:433

2228 +#: commit-graph.c:425

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

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

2231

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

2232 +#: commit-graph.c:558 commit-graph.c:618

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

2234 msgstr ""

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

2236 "corrompu"

2237

1982 -#: commit-graph.c:585

2238 +#: commit-graph.c:579

2239 #, c-format

2240 msgid "could not find commit %s"

2241 msgstr "impossible de trouver le commit %s"

2242

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

2243 +#: commit-graph.c:852 builtin/am.c:1287

2244 #, c-format

2245 msgid "unable to parse commit %s"

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

2247

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

2248 +#: commit-graph.c:1011 builtin/pack-objects.c:2782

2249 #, c-format

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

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

2252

1997 -#: commit-graph.c:1049

2253 +#: commit-graph.c:1043

2254 msgid "Loading known commits in commit graph"

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

2256

2001 -#: commit-graph.c:1066

2257 +#: commit-graph.c:1060

2258 msgid "Expanding reachable commits in commit graph"

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

2260

2005 -#: commit-graph.c:1085

2261 +#: commit-graph.c:1079

2262 msgid "Clearing commit marks in commit graph"

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

2264

2009 -#: commit-graph.c:1104

2265 +#: commit-graph.c:1098

2266 msgid "Computing commit graph generation numbers"

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

2268

2013 -#: commit-graph.c:1179

2269 +#: commit-graph.c:1173

2270 #, c-format

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

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

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

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

2275

2020 -#: commit-graph.c:1192

2276 +#: commit-graph.c:1186

2277 #, c-format

2278 msgid "error adding pack %s"

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

2280

2025 -#: commit-graph.c:1196

2281 +#: commit-graph.c:1190

2282 #, c-format

2283 msgid "error opening index for %s"

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

2285

2030 -#: commit-graph.c:1220

2286 +#: commit-graph.c:1214

2287 #, c-format

2288 msgid "Finding commits for commit graph from %d ref"

2289 msgid_plural "Finding commits for commit graph from %d refs"

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

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

2292

2037 -#: commit-graph.c:1240

2293 +#: commit-graph.c:1234

2294 #, c-format

2295 msgid "invalid commit object id: %s"

2296 msgstr "identifiant d'objet commit invalide : %s"

2297

2042 -#: commit-graph.c:1255

2298 +#: commit-graph.c:1249

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

2300 msgstr ""

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

2302

2047 -#: commit-graph.c:1270

2303 +#: commit-graph.c:1264

2304 msgid "Counting distinct commits in commit graph"

2305 msgstr "Comptage des commits distincts dans un graphe de commit"

2306

2051 -#: commit-graph.c:1300

2307 +#: commit-graph.c:1294

2308 msgid "Finding extra edges in commit graph"

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

2310

2055 -#: commit-graph.c:1346

2311 +#: commit-graph.c:1340

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

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

2314

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

2315 +#: commit-graph.c:1373 midx.c:814

2316 #, c-format

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

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

2319

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

2320 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2321 #, c-format

2322 msgid "unable to create '%s'"

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

2324

2069 -#: commit-graph.c:1451

2325 +#: commit-graph.c:1445

2326 #, c-format

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

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

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

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

2331

2076 -#: commit-graph.c:1492

2332 +#: commit-graph.c:1486

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

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

2335

2080 -#: commit-graph.c:1504

2336 +#: commit-graph.c:1498

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

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

2339

2084 -#: commit-graph.c:1524

2340 +#: commit-graph.c:1518

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

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

2343

2088 -#: commit-graph.c:1635

2344 +#: commit-graph.c:1631

2345 msgid "Scanning merged commits"

2346 msgstr "Analyse des commits de fusion"

2347

2092 -#: commit-graph.c:1646

2348 +#: commit-graph.c:1642

2349 #, c-format

2350 msgid "unexpected duplicate commit id %s"

2351 msgstr "id de commit %s dupliqué inattendu"

2352

2097 -#: commit-graph.c:1670

2353 +#: commit-graph.c:1665

2354 msgid "Merging commit-graph"

2355 msgstr "fusion du graphe de commits"

2356

2101 -#: commit-graph.c:1860

2357 +#: commit-graph.c:1844

2358 #, c-format

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

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

2361

2106 -#: commit-graph.c:1871

2362 +#: commit-graph.c:1855

2363 msgid "too many commits to write graph"

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

2365

2110 -#: commit-graph.c:1961

2366 +#: commit-graph.c:1944

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

2368 msgstr ""

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

2370 "vraisemblablement corrompu"

2371

2116 -#: commit-graph.c:1971

2372 +#: commit-graph.c:1954

2373 #, c-format

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

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

2376

2121 -#: commit-graph.c:1981 commit-graph.c:1996

2377 +#: commit-graph.c:1964 commit-graph.c:1979

2378 #, c-format

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

2380 msgstr ""

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

2382 "%u != %u"

2383

2128 -#: commit-graph.c:1988

2384 +#: commit-graph.c:1971

2385 #, c-format

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

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

2388

2133 -#: commit-graph.c:2006

2389 +#: commit-graph.c:1989

2390 msgid "Verifying commits in commit graph"

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

2392

2137 -#: commit-graph.c:2020

2393 +#: commit-graph.c:2003

2394 #, c-format

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

2396 msgstr ""

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

2398 "graphe de commit"

2399

2144 -#: commit-graph.c:2027

2400 +#: commit-graph.c:2010

2401 #, c-format

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

2403 msgstr ""

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

2405 "%s"

2406

2151 -#: commit-graph.c:2037

2407 +#: commit-graph.c:2020

2408 #, c-format

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

2410 msgstr ""

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

2412

2157 -#: commit-graph.c:2046

2413 +#: commit-graph.c:2029

2414 #, c-format

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

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

2417

2162 -#: commit-graph.c:2059

2418 +#: commit-graph.c:2042

2419 #, c-format

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

2421 msgstr ""

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

2423

2168 -#: commit-graph.c:2064

2424 +#: commit-graph.c:2047

2425 #, c-format

2426 msgid ""

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

@@ -2173,7 +2429,7 @@ msgstr ""

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

2430 "non-nul ailleurs"

2431

2176 -#: commit-graph.c:2068

2432 +#: commit-graph.c:2051

2433 #, c-format

2434 msgid ""

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

@@ -2181,12 +2437,12 @@ msgstr ""

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

2438 "mais nul ailleurs"

2439

2184 -#: commit-graph.c:2083

2440 +#: commit-graph.c:2066

2441 #, c-format

2442 msgid "commit-graph generation for commit %s is %u != %u"

2443 msgstr "la génération du graphe de commit pour le commit %s est %u != %u"

2444

2189 -#: commit-graph.c:2089

2445 +#: commit-graph.c:2072

2446 #, c-format

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

2448 msgstr ""

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

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

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

2495

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

2496 +#: config.c:406 sequencer.c:2444

2497 #, c-format

2498 msgid "invalid key: %s"

2499 msgstr "clé invalide : %s"

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

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

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

2642

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

2643 +#: config.c:1518 builtin/pack-objects.c:3541

2644 #, c-format

2645 msgid "bad pack compression level %d"

2646 msgstr "niveau de compression du paquet %d"

@@ -2409,109 +2665,109 @@ msgstr "impossible de résoudre le blob de config '%s'"

2665 msgid "failed to parse %s"

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

2667

2412 -#: config.c:1745

2668 +#: config.c:1743

2669 msgid "unable to parse command-line config"

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

2671

2416 -#: config.c:2096

2672 +#: config.c:2097

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

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

2675

2420 -#: config.c:2266

2676 +#: config.c:2267

2677 #, c-format

2678 msgid "Invalid %s: '%s'"

2679 msgstr "%s invalide : '%s'"

2680

2425 -#: config.c:2311

2681 +#: config.c:2312

2682 #, c-format

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

2684 msgstr ""

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

2686 "100"

2687

2432 -#: config.c:2357

2688 +#: config.c:2358

2689 #, c-format

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

2691 msgstr ""

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

2693

2438 -#: config.c:2359

2694 +#: config.c:2360

2695 #, c-format

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

2697 msgstr ""

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

2699

2444 -#: config.c:2440

2700 +#: config.c:2441

2701 #, c-format

2702 msgid "invalid section name '%s'"

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

2704

2449 -#: config.c:2472

2705 +#: config.c:2473

2706 #, c-format

2707 msgid "%s has multiple values"

2708 msgstr "%s a des valeurs multiples"

2709

2454 -#: config.c:2501

2710 +#: config.c:2502

2711 #, c-format

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

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

2714

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

2715 +#: config.c:2754 config.c:3078

2716 #, c-format

2717 msgid "could not lock config file %s"

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

2719

2464 -#: config.c:2764

2720 +#: config.c:2765

2721 #, c-format

2722 msgid "opening %s"

2723 msgstr "ouverture de %s"

2724

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

2725 +#: config.c:2800 builtin/config.c:344

2726 #, c-format

2727 msgid "invalid pattern: %s"

2728 msgstr "motif invalide : %s"

2729

2474 -#: config.c:2824

2730 +#: config.c:2825

2731 #, c-format

2732 msgid "invalid config file %s"

2733 msgstr "fichier de configuration invalide %s"

2734

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

2735 +#: config.c:2838 config.c:3091

2736 #, c-format

2737 msgid "fstat on %s failed"

2738 msgstr "échec de fstat sur %s"

2739

2484 -#: config.c:2848

2740 +#: config.c:2849

2741 #, c-format

2742 msgid "unable to mmap '%s'"

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

2744

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

2745 +#: config.c:2858 config.c:3096

2746 #, c-format

2747 msgid "chmod on %s failed"

2748 msgstr "échec de chmod sur %s"

2749

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

2750 +#: config.c:2943 config.c:3193

2751 #, c-format

2752 msgid "could not write config file %s"

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

2754

2499 -#: config.c:2976

2755 +#: config.c:2977

2756 #, c-format

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

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

2759

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

2760 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2761 #, c-format

2762 msgid "could not unset '%s'"

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

2764

2509 -#: config.c:3068

2765 +#: config.c:3069

2766 #, c-format

2767 msgid "invalid section name: %s"

2768 msgstr "nom de section invalide : %s"

2769

2514 -#: config.c:3235

2770 +#: config.c:3236

2771 #, c-format

2772 msgid "missing value for '%s'"

2773 msgstr "valeur manquante pour '%s'"

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

2933 msgid "unable to fork"

2934 msgstr "fork impossible"

2935

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

2936 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2937 msgid "Checking connectivity"

2938 msgstr "Vérification de la connectivité"

2939

2684 -#: connected.c:101

2940 +#: connected.c:110

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

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

2943

2688 -#: connected.c:121

2944 +#: connected.c:130

2945 msgid "failed write to rev-list"

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

2947

2692 -#: connected.c:128

2948 +#: connected.c:137

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

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

2951

@@ -2736,7 +2992,9 @@ msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"

2992 msgid ""

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

2994 "working-tree-encoding."

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

2995 +msgstr ""

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

2997 +"utiliser UTF-%.*s comme encodage d'arbre de travail."

2998

2999 #: convert.c:304

3000 #, c-format

@@ -3559,60 +3817,62 @@ msgstr ""

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

3818 "commande."

3819

3562 -#: dir.c:554

3820 +#: dir.c:555

3821 #, c-format

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

3823 msgstr ""

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

3825

3568 -#: dir.c:664

3826 +#: dir.c:695 dir.c:724 dir.c:737

3827 #, c-format

3828 msgid "unrecognized pattern: '%s'"

3829 msgstr "motif non reconnu : '%s'"

3830

3573 -#: dir.c:682 dir.c:696

3831 +#: dir.c:754 dir.c:768

3832 #, c-format

3833 msgid "unrecognized negative pattern: '%s'"

3834 msgstr "motif négatif non reconnu : '%s'"

3835

3578 -#: dir.c:714

3836 +#: dir.c:786

3837 #, c-format

3838 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3581 -msgstr "votre fichier d'extraction partielle pourrait présenter des problèmes : le motif '%s' est répété"

3839 +msgstr ""

3840 +"votre fichier d'extraction partielle pourrait présenter des problèmes : le "

3841 +"motif '%s' est répété"

3842

3583 -#: dir.c:724

3843 +#: dir.c:796

3844 msgid "disabling cone pattern matching"

3845 msgstr "désactivation de la correspondance de motif de cone"

3846

3587 -#: dir.c:1101

3847 +#: dir.c:1173

3848 #, c-format

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

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

3851

3592 -#: dir.c:2078

3852 +#: dir.c:2144

3853 #, c-format

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

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

3856

3597 -#: dir.c:2415

3857 +#: dir.c:2479

3858 msgid "failed to get kernel name and information"

3859 msgstr "echec de l'obtention d'information de kernel"

3860

3601 -#: dir.c:2539

3861 +#: dir.c:2603

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

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

3864

3605 -#: dir.c:3343

3865 +#: dir.c:3407

3866 #, c-format

3867 msgid "index file corrupt in repo %s"

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

3869

3610 -#: dir.c:3388 dir.c:3393

3870 +#: dir.c:3452 dir.c:3457

3871 #, c-format

3872 msgid "could not create directories for %s"

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

3874

3615 -#: dir.c:3422

3875 +#: dir.c:3486

3876 #, c-format

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

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

@@ -3860,7 +4120,7 @@ msgstr "erreur lors du traitement des références voulues : %d"

4120 msgid "no matching remote head"

4121 msgstr "pas de HEAD distante correspondante"

4122

3863 -#: fetch-pack.c:1785 builtin/clone.c:688

4123 +#: fetch-pack.c:1785 builtin/clone.c:689

4124 msgid "remote did not send all necessary objects"

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

4126

@@ -3874,19 +4134,19 @@ msgstr "référence distante inconnue %s"

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

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

4136

3877 -#: gpg-interface.c:223

4137 +#: gpg-interface.c:408

4138 +msgid "gpg failed to sign the data"

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

4140 +

4141 +#: gpg-interface.c:434

4142 msgid "could not create temporary file"

4143 msgstr "impossible de créer un fichier temporaire"

4144

3881 -#: gpg-interface.c:226

4145 +#: gpg-interface.c:437

4146 #, c-format

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

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

4149

3886 -#: gpg-interface.c:390

3887 -msgid "gpg failed to sign the data"

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

3889 -

4150 #: graph.c:98

4151 #, c-format

4152 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -3900,18 +4160,18 @@ msgstr ""

4160 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "

4161 "supporté qu'avec -P avec PCRE v2"

4162

3903 -#: grep.c:2124

4163 +#: grep.c:2128

4164 #, c-format

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

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

4167

3908 -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

4168 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4169 #: builtin/rm.c:135

4170 #, c-format

4171 msgid "failed to stat '%s'"

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

4173

3914 -#: grep.c:2152

4174 +#: grep.c:2156

4175 #, c-format

4176 msgid "'%s': short read"

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

@@ -4131,7 +4391,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

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

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

4393

4134 -#: ident.c:436 builtin/commit.c:631

4394 +#: ident.c:436 builtin/commit.c:635

4395 #, c-format

4396 msgid "invalid date format: %s"

4397 msgstr "format de date invalide : %s"

@@ -4219,112 +4479,112 @@ msgid "failed to read the cache"

4479 msgstr "impossible de lire le cache"

4480

4481 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

4222 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4482 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4483 #: builtin/stash.c:264

4484 msgid "unable to write new index file"

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

4486

4227 -#: merge-recursive.c:367

4487 +#: merge-recursive.c:356

4488 msgid "(bad commit)\n"

4489 msgstr "(mauvais commit)\n"

4490

4231 -#: merge-recursive.c:390

4491 +#: merge-recursive.c:379

4492 #, c-format

4493 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4494 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

4495

4236 -#: merge-recursive.c:399

4496 +#: merge-recursive.c:388

4497 #, c-format

4498 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4499 msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

4500

4241 -#: merge-recursive.c:885

4501 +#: merge-recursive.c:874

4502 #, c-format

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

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

4505

4246 -#: merge-recursive.c:896

4506 +#: merge-recursive.c:885

4507 #, c-format

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

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

4510

4251 -#: merge-recursive.c:910 merge-recursive.c:929

4511 +#: merge-recursive.c:899 merge-recursive.c:918

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

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

4514

4255 -#: merge-recursive.c:919

4515 +#: merge-recursive.c:908

4516 #, c-format

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

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

4519

4260 -#: merge-recursive.c:960 builtin/cat-file.c:41

4520 +#: merge-recursive.c:949 builtin/cat-file.c:41

4521 #, c-format

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

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

4524

4265 -#: merge-recursive.c:965

4525 +#: merge-recursive.c:954

4526 #, c-format

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

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

4529

4270 -#: merge-recursive.c:990

4530 +#: merge-recursive.c:979

4531 #, c-format

4532 msgid "failed to open '%s': %s"

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

4534

4275 -#: merge-recursive.c:1001

4535 +#: merge-recursive.c:990

4536 #, c-format

4537 msgid "failed to symlink '%s': %s"

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

4539

4280 -#: merge-recursive.c:1006

4540 +#: merge-recursive.c:995

4541 #, c-format

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

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

4544

4285 -#: merge-recursive.c:1199

4545 +#: merge-recursive.c:1191

4546 #, c-format

4547 msgid "Failed to merge submodule %s (not checked out)"

4548 msgstr "Échec de la fusion du sous-module %s (non extrait)"

4549

4290 -#: merge-recursive.c:1206

4550 +#: merge-recursive.c:1198

4551 #, c-format

4552 msgid "Failed to merge submodule %s (commits not present)"

4553 msgstr "Échec de fusion du sous-module %s (commits non présents)"

4554

4295 -#: merge-recursive.c:1213

4555 +#: merge-recursive.c:1205

4556 #, c-format

4557 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4558 msgstr ""

4559 "Échec de la fusion du sous-module %s (les commits ne descendent pas de la "

4560 "base de fusion)"

4561

4302 -#: merge-recursive.c:1221 merge-recursive.c:1233

4562 +#: merge-recursive.c:1213 merge-recursive.c:1225

4563 #, c-format

4564 msgid "Fast-forwarding submodule %s to the following commit:"

4565 msgstr "Avance rapide du sous-module %s au commit suivant :"

4566

4307 -#: merge-recursive.c:1224 merge-recursive.c:1236

4567 +#: merge-recursive.c:1216 merge-recursive.c:1228

4568 #, c-format

4569 msgid "Fast-forwarding submodule %s"

4570 msgstr "Avance rapide du sous-module %s"

4571

4312 -#: merge-recursive.c:1259

4572 +#: merge-recursive.c:1251

4573 #, c-format

4574 msgid "Failed to merge submodule %s (merge following commits not found)"

4575 msgstr ""

4576 "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

4577

4318 -#: merge-recursive.c:1263

4578 +#: merge-recursive.c:1255

4579 #, c-format

4580 msgid "Failed to merge submodule %s (not fast-forward)"

4581 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

4582

4323 -#: merge-recursive.c:1264

4583 +#: merge-recursive.c:1256

4584 msgid "Found a possible merge resolution for the submodule:\n"

4585 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

4586

4327 -#: merge-recursive.c:1267

4587 +#: merge-recursive.c:1259

4588 #, c-format

4589 msgid ""

4590 "If this is correct simply add it to the index for example\n"

@@ -4341,33 +4601,33 @@ msgstr ""

4601 "\n"

4602 "qui acceptera cette suggestion.\n"

4603

4344 -#: merge-recursive.c:1276

4604 +#: merge-recursive.c:1268

4605 #, c-format

4606 msgid "Failed to merge submodule %s (multiple merges found)"

4607 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

4608

4349 -#: merge-recursive.c:1349

4609 +#: merge-recursive.c:1341

4610 msgid "Failed to execute internal merge"

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

4612

4353 -#: merge-recursive.c:1354

4613 +#: merge-recursive.c:1346

4614 #, c-format

4615 msgid "Unable to add %s to database"

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

4617

4358 -#: merge-recursive.c:1386

4618 +#: merge-recursive.c:1378

4619 #, c-format

4620 msgid "Auto-merging %s"

4621 msgstr "Fusion automatique de %s"

4622

4363 -#: merge-recursive.c:1410

4623 +#: merge-recursive.c:1402

4624 #, c-format

4625 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4626 msgstr ""

4627 "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "

4628 "place."

4629

4370 -#: merge-recursive.c:1482

4630 +#: merge-recursive.c:1474

4631 #, c-format

4632 msgid ""

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

@@ -4376,7 +4636,7 @@ msgstr ""

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

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

4638

4379 -#: merge-recursive.c:1487

4639 +#: merge-recursive.c:1479

4640 #, c-format

4641 msgid ""

4642 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4385,7 +4645,7 @@ msgstr ""

4645 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

4646 "%s de %s laissée dans l'arbre."

4647

4388 -#: merge-recursive.c:1494

4648 +#: merge-recursive.c:1486

4649 #, c-format

4650 msgid ""

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

@@ -4394,7 +4654,7 @@ msgstr ""

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

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

4656

4397 -#: merge-recursive.c:1499

4657 +#: merge-recursive.c:1491

4658 #, c-format

4659 msgid ""

4660 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4403,36 +4663,36 @@ msgstr ""

4663 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

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

4665

4406 -#: merge-recursive.c:1534

4666 +#: merge-recursive.c:1526

4667 msgid "rename"

4668 msgstr "renommage"

4669

4410 -#: merge-recursive.c:1534

4670 +#: merge-recursive.c:1526

4671 msgid "renamed"

4672 msgstr "renommé"

4673

4414 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4674 +#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175

4675 #, c-format

4676 msgid "Refusing to lose dirty file at %s"

4677 msgstr "Refus de perdre le fichier modifié %s"

4678

4419 -#: merge-recursive.c:1624

4679 +#: merge-recursive.c:1616

4680 #, c-format

4681 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4682 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

4683

4424 -#: merge-recursive.c:1682

4684 +#: merge-recursive.c:1674

4685 #, c-format

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

4687 msgstr ""

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

4689

4430 -#: merge-recursive.c:1713

4690 +#: merge-recursive.c:1705

4691 #, c-format

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

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

4694

4435 -#: merge-recursive.c:1718

4695 +#: merge-recursive.c:1710

4696 #, c-format

4697 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4698 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

@@ -4535,7 +4795,7 @@ msgstr "ajout/ajout"

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

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

4797

4538 -#: merge-recursive.c:3147 git-submodule.sh:993

4798 +#: merge-recursive.c:3147 git-submodule.sh:1003

4799 msgid "submodule"

4800 msgstr "sous-module"

4801

@@ -4655,7 +4915,7 @@ msgstr ""

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

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

4917

4658 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4918 +#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877

4919 msgid "Unable to write index."

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

4921

@@ -4894,26 +5154,31 @@ msgstr "l'objet %s a un id de type inconnu %d"

5154 msgid "unable to parse object: %s"

5155 msgstr "impossible d'analyser l'objet : %s"

5156

4897 -#: object.c:266 object.c:277

5157 +#: object.c:266 object.c:278

5158 #, c-format

5159 msgid "hash mismatch %s"

5160 msgstr "incohérence de hachage %s"

5161

4902 -#: packfile.c:641

5162 +#: packfile.c:629

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

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

5165

4906 -#: packfile.c:1888

5166 +#: packfile.c:1899

5167 #, c-format

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

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

5170

4911 -#: packfile.c:1892

5171 +#: packfile.c:1903

5172 #, c-format

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

5174 msgstr ""

5175 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

5176

5177 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5178 +#, c-format

5179 +msgid "unable to get size of %s"

5180 +msgstr "impossible de récupérer la taille de %s"

5181 +

5182 #: parse-options.c:38

5183 #, c-format

5184 msgid "%s requires a value"

@@ -4944,36 +5209,36 @@ msgstr "%s n'est pas disponible"

5209 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5210 msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"

5211

4947 -#: parse-options.c:389

5212 +#: parse-options.c:388

5213 #, c-format

5214 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5215 msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"

5216

4952 -#: parse-options.c:423 parse-options.c:431

5217 +#: parse-options.c:422 parse-options.c:430

5218 #, c-format

4954 -msgid "did you mean `--%s` (with two dashes ?)"

5219 +msgid "did you mean `--%s` (with two dashes)?"

5220 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"

5221

4957 -#: parse-options.c:860

5222 +#: parse-options.c:859

5223 #, c-format

5224 msgid "unknown option `%s'"

5225 msgstr "option inconnue « %s »"

5226

4962 -#: parse-options.c:862

5227 +#: parse-options.c:861

5228 #, c-format

5229 msgid "unknown switch `%c'"

5230 msgstr "bascule inconnue « %c »"

5231

4967 -#: parse-options.c:864

5232 +#: parse-options.c:863

5233 #, c-format

5234 msgid "unknown non-ascii option in string: `%s'"

5235 msgstr "option non-ascii inconnue dans la chaîne : '%s'"

5236

4972 -#: parse-options.c:888

5237 +#: parse-options.c:887

5238 msgid "..."

5239 msgstr "..."

5240

4976 -#: parse-options.c:907

5241 +#: parse-options.c:906

5242 #, c-format

5243 msgid "usage: %s"

5244 msgstr "usage : %s"

@@ -4981,21 +5246,21 @@ msgstr "usage : %s"

5246 #. TRANSLATORS: the colon here should align with the

5247 #. one in "usage: %s" translation.

5248 #.

4984 -#: parse-options.c:913

5249 +#: parse-options.c:912

5250 #, c-format

5251 msgid " or: %s"

5252 msgstr " ou : %s"

5253

4989 -#: parse-options.c:916

5254 +#: parse-options.c:915

5255 #, c-format

5256 msgid " %s"

5257 msgstr " %s"

5258

4994 -#: parse-options.c:955

5259 +#: parse-options.c:954

5260 msgid "-NUM"

5261 msgstr "-NUM"

5262

4998 -#: parse-options.c:969

5263 +#: parse-options.c:968

5264 #, c-format

5265 msgid "alias of --%s"

5266 msgstr "alias pour --%s"

@@ -5084,27 +5349,27 @@ msgstr "%s : 'literal' et 'glob' sont incompatibles"

5349

5350 #: pathspec.c:442

5351 #, c-format

5087 -msgid "%s: '%s' is outside repository"

5088 -msgstr "%s : '%s' est hors du dépôt"

5352 +msgid "%s: '%s' is outside repository at '%s'"

5353 +msgstr "%s : '%s' est hors du dépôt à '%s'"

5354

5090 -#: pathspec.c:516

5355 +#: pathspec.c:517

5356 #, c-format

5357 msgid "'%s' (mnemonic: '%c')"

5358 msgstr "'%s' (mnémonique : '%c')"

5359

5095 -#: pathspec.c:526

5360 +#: pathspec.c:527

5361 #, c-format

5362 msgid "%s: pathspec magic not supported by this command: %s"

5363 msgstr ""

5364 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

5365 "commande : %s"

5366

5102 -#: pathspec.c:593

5367 +#: pathspec.c:594

5368 #, c-format

5369 msgid "pathspec '%s' is beyond a symbolic link"

5370 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

5371

5107 -#: pathspec.c:638

5372 +#: pathspec.c:639

5373 #, c-format

5374 msgid "line is badly quoted: %s"

5375 msgstr "la ligne est mal citée : %s"

@@ -5192,7 +5457,7 @@ msgstr "impossible de démarrer `log`"

5457 msgid "could not read `log` output"

5458 msgstr "impossible de lire la sortie de `log`"

5459

5195 -#: range-diff.c:96 sequencer.c:5163

5460 +#: range-diff.c:96 sequencer.c:5020

5461 #, c-format

5462 msgid "could not parse commit '%s'"

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

@@ -5247,16 +5512,16 @@ msgstr "impossible d'ajouter '%s' à l'index"

5512 msgid "unable to stat '%s'"

5513 msgstr "fstat de '%s' impossible"

5514

5250 -#: read-cache.c:1325

5515 +#: read-cache.c:1330

5516 #, c-format

5517 msgid "'%s' appears as both a file and as a directory"

5518 msgstr "'%s' existe à la fois comme un fichier et un répertoire"

5519

5255 -#: read-cache.c:1531

5520 +#: read-cache.c:1536

5521 msgid "Refresh index"

5522 msgstr "Rafraîchir l'index"

5523

5259 -#: read-cache.c:1646

5524 +#: read-cache.c:1651

5525 #, c-format

5526 msgid ""

5527 "index.version set, but the value is invalid.\n"

@@ -5265,7 +5530,7 @@ msgstr ""

5530 "version d'index renseignée, mais la valeur est invalide.\n"

5531 "Utilisation de la version %i"

5532

5268 -#: read-cache.c:1656

5533 +#: read-cache.c:1661

5534 #, c-format

5535 msgid ""

5536 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -5274,150 +5539,161 @@ msgstr ""

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

5540 "Utilisation de la version %i"

5541

5277 -#: read-cache.c:1712

5542 +#: read-cache.c:1717

5543 #, c-format

5544 msgid "bad signature 0x%08x"

5545 msgstr "signature incorrecte 0x%08x"

5546

5282 -#: read-cache.c:1715

5547 +#: read-cache.c:1720

5548 #, c-format

5549 msgid "bad index version %d"

5550 msgstr "mauvaise version d'index %d"

5551

5287 -#: read-cache.c:1724

5552 +#: read-cache.c:1729

5553 msgid "bad index file sha1 signature"

5554 msgstr "mauvaise signature sha1 d'index"

5555

5291 -#: read-cache.c:1754

5556 +#: read-cache.c:1759

5557 #, c-format

5558 msgid "index uses %.4s extension, which we do not understand"

5559 msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"

5560

5296 -#: read-cache.c:1756

5561 +#: read-cache.c:1761

5562 #, c-format

5563 msgid "ignoring %.4s extension"

5564 msgstr "extension %.4s ignorée"

5565

5301 -#: read-cache.c:1793

5566 +#: read-cache.c:1798

5567 #, c-format

5568 msgid "unknown index entry format 0x%08x"

5569 msgstr "format d'entrée d'index inconnu 0x%08x"

5570

5306 -#: read-cache.c:1809

5571 +#: read-cache.c:1814

5572 #, c-format

5573 msgid "malformed name field in the index, near path '%s'"

5574 msgstr "champ de nom malformé dans l'index, près du chemin '%s'"

5575

5311 -#: read-cache.c:1866

5576 +#: read-cache.c:1871

5577 msgid "unordered stage entries in index"

5578 msgstr "entrées de préparation non ordonnées dans l'index"

5579

5315 -#: read-cache.c:1869

5580 +#: read-cache.c:1874

5581 #, c-format

5582 msgid "multiple stage entries for merged file '%s'"

5583 msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"

5584

5320 -#: read-cache.c:1872

5585 +#: read-cache.c:1877

5586 #, c-format

5587 msgid "unordered stage entries for '%s'"

5588 msgstr "entrées de préparation non ordonnées pour '%s'"

5589

5325 -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5326 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5327 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5328 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

5329 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5590 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5591 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5592 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5593 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5594 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271

5595 +#: builtin/submodule--helper.c:332

5596 msgid "index file corrupt"

5597 msgstr "fichier d'index corrompu"

5598

5333 -#: read-cache.c:2119

5599 +#: read-cache.c:2124

5600 #, c-format

5601 msgid "unable to create load_cache_entries thread: %s"

5602 msgstr "impossible de créer le fil load_cache_entries : %s"

5603

5338 -#: read-cache.c:2132

5604 +#: read-cache.c:2137

5605 #, c-format

5606 msgid "unable to join load_cache_entries thread: %s"

5607 msgstr "impossible de joindre le fil load_cach_entries : %s"

5608

5343 -#: read-cache.c:2165

5609 +#: read-cache.c:2170

5610 #, c-format

5611 msgid "%s: index file open failed"

5612 msgstr "%s : l'ouverture du fichier d'index a échoué"

5613

5348 -#: read-cache.c:2169

5614 +#: read-cache.c:2174

5615 #, c-format

5616 msgid "%s: cannot stat the open index"

5617 msgstr "%s : impossible de faire un stat sur l'index ouvert"

5618

5353 -#: read-cache.c:2173

5619 +#: read-cache.c:2178

5620 #, c-format

5621 msgid "%s: index file smaller than expected"

5622 msgstr "%s : fichier d'index plus petit qu'attendu"

5623

5358 -#: read-cache.c:2177

5624 +#: read-cache.c:2182

5625 #, c-format

5626 msgid "%s: unable to map index file"

5627 msgstr "%s : impossible de mapper le fichier d'index"

5628

5363 -#: read-cache.c:2219

5629 +#: read-cache.c:2224

5630 #, c-format

5631 msgid "unable to create load_index_extensions thread: %s"

5632 msgstr "impossible de créer le fil load_index_extensions : %s"

5633

5368 -#: read-cache.c:2246

5634 +#: read-cache.c:2251

5635 #, c-format

5636 msgid "unable to join load_index_extensions thread: %s"

5637 msgstr "impossible de joindre le fil load_index_extensions : %s"

5638

5373 -#: read-cache.c:2278

5639 +#: read-cache.c:2283

5640 #, c-format

5641 msgid "could not freshen shared index '%s'"

5642 msgstr "impossible de rafraîchir l'index partagé '%s'"

5643

5378 -#: read-cache.c:2325

5644 +#: read-cache.c:2330

5645 #, c-format

5646 msgid "broken index, expect %s in %s, got %s"

5647 msgstr "index cassé, %s attendu dans %s, %s obtenu"

5648

5383 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5649 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5650 #, c-format

5651 msgid "could not close '%s'"

5652 msgstr "impossible de fermer '%s'"

5653

5388 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5654 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5655 #, c-format

5656 msgid "could not stat '%s'"

5657 msgstr "stat impossible de '%s'"

5658

5393 -#: read-cache.c:3137

5659 +#: read-cache.c:3142

5660 #, c-format

5661 msgid "unable to open git dir: %s"

5662 msgstr "impossible d'ouvrir le répertoire git : %s"

5663

5398 -#: read-cache.c:3149

5664 +#: read-cache.c:3154

5665 #, c-format

5666 msgid "unable to unlink: %s"

5667 msgstr "échec lors de l'unlink : %s"

5668

5403 -#: read-cache.c:3174

5669 +#: read-cache.c:3179

5670 #, c-format

5671 msgid "cannot fix permission bits on '%s'"

5672 msgstr "impossible de régler les bits de droit de '%s'"

5673

5408 -#: read-cache.c:3323

5674 +#: read-cache.c:3328

5675 #, c-format

5676 msgid "%s: cannot drop to stage #0"

5677 msgstr "%s : impossible de revenir à l'étape 0"

5678

5413 -#: rebase-interactive.c:26

5679 +#: rebase-interactive.c:11

5680 +msgid ""

5681 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5682 +"continue'.\n"

5683 +"Or you can abort the rebase with 'git rebase --abort'.\n"

5684 +msgstr ""

5685 +"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "

5686 +"rebase --continue'.\n"

5687 +"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

5688 +

5689 +#: rebase-interactive.c:33

5690 #, c-format

5691 msgid ""

5692 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5693 msgstr ""

5694 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

5695

5420 -#: rebase-interactive.c:35

5696 +#: rebase-interactive.c:42

5697 msgid ""

5698 "\n"

5699 "Commands:\n"

@@ -5459,14 +5735,14 @@ msgstr ""

5735 "\n"

5736 "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"

5737

5462 -#: rebase-interactive.c:56

5738 +#: rebase-interactive.c:63

5739 #, c-format

5740 msgid "Rebase %s onto %s (%d command)"

5741 msgid_plural "Rebase %s onto %s (%d commands)"

5742 msgstr[0] "Rebasage de %s sur %s (%d commande)"

5743 msgstr[1] "Rebasage de %s sur %s (%d commandes)"

5744

5469 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228

5745 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5746 msgid ""

5747 "\n"

5748 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5475,7 +5751,7 @@ msgstr ""

5751 "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "

5752 "commit.\n"

5753

5478 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232

5754 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5755 msgid ""

5756 "\n"

5757 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5483,7 +5759,7 @@ msgstr ""

5759 "\n"

5760 "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"

5761

5486 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871

5762 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5763 msgid ""

5764 "\n"

5765 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5498,7 +5774,7 @@ msgstr ""

5774 " git rebase --continue\n"

5775 "\n"

5776

5501 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948

5777 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5778 msgid ""

5779 "\n"

5780 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5508,22 +5784,19 @@ msgstr ""

5784 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"

5785 "\n"

5786

5511 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955

5512 -msgid "Note that empty commits are commented out"

5513 -msgstr "Veuillez noter que les commits vides sont en commentaire"

5514 -

5515 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5516 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5787 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5788 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5789 #, c-format

5790 msgid "could not write '%s'"

5791 msgstr "impossible d'écrire '%s'"

5792

5521 -#: rebase-interactive.c:108

5793 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5794 +#: builtin/rebase.c:234

5795 #, c-format

5523 -msgid "could not copy '%s' to '%s'."

5524 -msgstr "impossible de copier '%s' vers '%s'."

5796 +msgid "could not write '%s'."

5797 +msgstr "impossible d'écrire '%s'."

5798

5526 -#: rebase-interactive.c:173

5799 +#: rebase-interactive.c:193

5800 #, c-format

5801 msgid ""

5802 "Warning: some commits may have been dropped accidentally.\n"

@@ -5532,7 +5805,7 @@ msgstr ""

5805 "Attention : certains commits ont pu être accidentellement supprimés.\n"

5806 "Commits supprimés (du plus jeune au plus vieux) :\n"

5807

5535 -#: rebase-interactive.c:180

5808 +#: rebase-interactive.c:200

5809 #, c-format

5810 msgid ""

5811 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5550,6 +5823,13 @@ msgstr ""

5823 "Les comportements disponibles sont : ignore, warn, error.\n"

5824 "\n"

5825

5826 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5827 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5828 +#: builtin/rebase.c:246

5829 +#, c-format

5830 +msgid "could not read '%s'."

5831 +msgstr "impossible de lire '%s'."

5832 +

5833 #: refs.c:262

5834 #, c-format

5835 msgid "%s does not point to a valid object!"

@@ -5585,15 +5865,15 @@ msgstr "la référence '%s' existe déjà"

5865 msgid "unexpected object ID when writing '%s'"

5866 msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5867

5588 -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5589 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5868 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5869 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5870 #: wrapper.c:620

5871 #, c-format

5872 msgid "could not write to '%s'"

5873 msgstr "impossible d'écrire dans '%s'"

5874

5595 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5596 -#: builtin/rebase.c:1031

5875 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5876 +#: builtin/rebase.c:1029

5877 #, c-format

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

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

@@ -5647,18 +5927,18 @@ msgstr "'%s' existe ; impossible de créer '%s'"

5927 msgid "cannot process '%s' and '%s' at the same time"

5928 msgstr "impossible de traiter '%s' et '%s' en même temps"

5929

5650 -#: refs/files-backend.c:1234

5930 +#: refs/files-backend.c:1233

5931 #, c-format

5932 msgid "could not remove reference %s"

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

5934

5655 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5935 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5936 #: refs/packed-backend.c:1551

5937 #, c-format

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

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

5940

5661 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5941 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5942 #, c-format

5943 msgid "could not delete references: %s"

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

@@ -5925,46 +6205,46 @@ msgid "config remote shorthand cannot begin with '/': %s"

6205 msgstr ""

6206 "un raccourci de configuration de distant ne peut pas commencer par '/' : %s"

6207

5928 -#: remote.c:413

6208 +#: remote.c:414

6209 msgid "more than one receivepack given, using the first"

6210 msgstr "plus d'un receivepack fournis, utilisation du premier"

6211

5932 -#: remote.c:421

6212 +#: remote.c:422

6213 msgid "more than one uploadpack given, using the first"

6214 msgstr "plus d'un uploadpack fournis, utilisation du premier"

6215

5936 -#: remote.c:611

6216 +#: remote.c:612

6217 #, c-format

6218 msgid "Cannot fetch both %s and %s to %s"

6219 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

6220

5941 -#: remote.c:615

6221 +#: remote.c:616

6222 #, c-format

6223 msgid "%s usually tracks %s, not %s"

6224 msgstr "%s suit habituellement %s, pas %s"

6225

5946 -#: remote.c:619

6226 +#: remote.c:620

6227 #, c-format

6228 msgid "%s tracks both %s and %s"

6229 msgstr "%s suit à la fois %s et %s"

6230

5951 -#: remote.c:687

6231 +#: remote.c:688

6232 #, c-format

6233 msgid "key '%s' of pattern had no '*'"

6234 msgstr "la clé '%s' du modèle n'a pas de '*'"

6235

5956 -#: remote.c:697

6236 +#: remote.c:698

6237 #, c-format

6238 msgid "value '%s' of pattern has no '*'"

6239 msgstr "la valeur '%s' du modèle n'a pas de '*'"

6240

5961 -#: remote.c:1003

6241 +#: remote.c:1004

6242 #, c-format

6243 msgid "src refspec %s does not match any"

6244 msgstr ""

6245 "le spécificateur de référence source %s ne correspond à aucune référence"

6246

5967 -#: remote.c:1008

6247 +#: remote.c:1009

6248 #, c-format

6249 msgid "src refspec %s matches more than one"

6250 msgstr ""

@@ -5974,7 +6254,7 @@ msgstr ""

6254 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6255 #. the <src>.

6256 #.

5977 -#: remote.c:1023

6257 +#: remote.c:1024

6258 #, c-format

6259 msgid ""

6260 "The destination you provided is not a full refname (i.e.,\n"

@@ -5998,7 +6278,7 @@ msgstr ""

6278 "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "

6279 "totalement qualifiée."

6280

6001 -#: remote.c:1043

6281 +#: remote.c:1044

6282 #, c-format

6283 msgid ""

6284 "The <src> part of the refspec is a commit object.\n"

@@ -6009,7 +6289,7 @@ msgstr ""

6289 "Souhaitiez-vous créer une nouvelle branche en poussant sur\n"

6290 "'%s:refs/heads/%s' ?"

6291

6012 -#: remote.c:1048

6292 +#: remote.c:1049

6293 #, c-format

6294 msgid ""

6295 "The <src> part of the refspec is a tag object.\n"

@@ -6020,7 +6300,7 @@ msgstr ""

6300 "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"

6301 "'%s:refs/tags/%s' ?"

6302

6023 -#: remote.c:1053

6303 +#: remote.c:1054

6304 #, c-format

6305 msgid ""

6306 "The <src> part of the refspec is a tree object.\n"

@@ -6031,7 +6311,7 @@ msgstr ""

6311 "Souhaitiez-vous créer un nouvel arbre en poussant sur\n"

6312 "'%s:refs/tags/%s' ?"

6313

6034 -#: remote.c:1058

6314 +#: remote.c:1059

6315 #, c-format

6316 msgid ""

6317 "The <src> part of the refspec is a blob object.\n"

@@ -6042,119 +6322,119 @@ msgstr ""

6322 "Souhaitiez-vous créer un nouveau blob en poussant sur\n"

6323 "'%s:refs/tags/%s' ?"

6324

6045 -#: remote.c:1094

6325 +#: remote.c:1095

6326 #, c-format

6327 msgid "%s cannot be resolved to branch"

6328 msgstr "'%s' ne peut pas être résolue comme une branche"

6329

6050 -#: remote.c:1105

6330 +#: remote.c:1106

6331 #, c-format

6332 msgid "unable to delete '%s': remote ref does not exist"

6333 msgstr "suppression d '%s' impossible : la référence distante n'existe pas"

6334

6055 -#: remote.c:1117

6335 +#: remote.c:1118

6336 #, c-format

6337 msgid "dst refspec %s matches more than one"

6338 msgstr ""

6339 "le spécificateur de référence dst %s correspond à plus d'un spécificateur de "

6340 "références"

6341

6062 -#: remote.c:1124

6342 +#: remote.c:1125

6343 #, c-format

6344 msgid "dst ref %s receives from more than one src"

6345 msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"

6346

6067 -#: remote.c:1627 remote.c:1728

6347 +#: remote.c:1628 remote.c:1729

6348 msgid "HEAD does not point to a branch"

6349 msgstr "HEAD ne pointe pas sur une branche"

6350

6071 -#: remote.c:1636

6351 +#: remote.c:1637

6352 #, c-format

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

6354 msgstr "pas de branche '%s'"

6355

6076 -#: remote.c:1639

6356 +#: remote.c:1640

6357 #, c-format

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

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

6360

6081 -#: remote.c:1645

6361 +#: remote.c:1646

6362 #, c-format

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

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

6365

6086 -#: remote.c:1660

6366 +#: remote.c:1661

6367 #, c-format

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

6369 msgstr ""

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

6371 "branche locale de suivi"

6372

6093 -#: remote.c:1672

6373 +#: remote.c:1673

6374 #, c-format

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

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

6377

6098 -#: remote.c:1682

6378 +#: remote.c:1683

6379 #, c-format

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

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

6382

6103 -#: remote.c:1695

6383 +#: remote.c:1696

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

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

6386

6107 -#: remote.c:1717

6387 +#: remote.c:1718

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

6389 msgstr ""

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

6391

6112 -#: remote.c:1843

6392 +#: remote.c:1844

6393 #, c-format

6394 msgid "couldn't find remote ref %s"

6395 msgstr "impossible de trouver la référence distante %s"

6396

6117 -#: remote.c:1856

6397 +#: remote.c:1857

6398 #, c-format

6399 msgid "* Ignoring funny ref '%s' locally"

6400 msgstr "* Référence bizarre '%s' ignorée localement"

6401

6122 -#: remote.c:2019

6402 +#: remote.c:2020

6403 #, c-format

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

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

6406

6127 -#: remote.c:2023

6407 +#: remote.c:2024

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

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

6410

6131 -#: remote.c:2026

6411 +#: remote.c:2027

6412 #, c-format

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

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

6415

6136 -#: remote.c:2030

6416 +#: remote.c:2031

6417 #, c-format

6418 msgid "Your branch and '%s' refer to different commits.\n"

6419 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

6420

6141 -#: remote.c:2033

6421 +#: remote.c:2034

6422 #, c-format

6423 msgid " (use \"%s\" for details)\n"

6424 msgstr " (utilisez \"%s\" pour plus de détails)\n"

6425

6146 -#: remote.c:2037

6426 +#: remote.c:2038

6427 #, c-format

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

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

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

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

6432

6153 -#: remote.c:2043

6433 +#: remote.c:2044

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

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

6436

6157 -#: remote.c:2046

6437 +#: remote.c:2047

6438 #, c-format

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

6440 msgid_plural ""

@@ -6166,11 +6446,11 @@ msgstr[1] ""

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

6447 "en avance rapide.\n"

6448

6169 -#: remote.c:2054

6449 +#: remote.c:2055

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

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

6452

6173 -#: remote.c:2057

6453 +#: remote.c:2058

6454 #, c-format

6455 msgid ""

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

@@ -6185,12 +6465,12 @@ msgstr[1] ""

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

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

6467

6188 -#: remote.c:2067

6468 +#: remote.c:2068

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

6470 msgstr ""

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

6472

6193 -#: remote.c:2250

6473 +#: remote.c:2251

6474 #, c-format

6475 msgid "cannot parse expected object name '%s'"

6476 msgstr "impossible d'analyser le nom attendu d'objet '%s'"

@@ -6205,7 +6485,7 @@ msgstr "mauvaise références de remplacement : %s"

6485 msgid "duplicate replace ref: %s"

6486 msgstr "référence de remplacement dupliquée : %s"

6487

6208 -#: replace-object.c:73

6488 +#: replace-object.c:82

6489 #, c-format

6490 msgid "replace depth too high for object %s"

6491 msgstr "profondeur de remplacement trop grande pour l'objet %s"

@@ -6268,8 +6548,8 @@ msgstr "impossible de délier '%s' qui est errant"

6548 msgid "Recorded preimage for '%s'"

6549 msgstr "Pré-image enregistrée pour '%s'"

6550

6271 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6272 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6551 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6552 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6553 #, c-format

6554 msgid "could not create directory '%s'"

6555 msgstr "impossible de créer le répertoire '%s'"

@@ -6320,16 +6600,16 @@ msgstr "--first-parent est incompatible avec --bisect"

6600 msgid "-L does not yet support diff formats besides -p and -s"

6601 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

6602

6323 -#: run-command.c:762

6603 +#: run-command.c:763

6604 msgid "open /dev/null failed"

6605 msgstr "échec de l'ouverture de /dev/null"

6606

6327 -#: run-command.c:1268

6607 +#: run-command.c:1269

6608 #, c-format

6609 msgid "cannot create async thread: %s"

6610 msgstr "impossible de créer un fil asynchrone : %s"

6611

6332 -#: run-command.c:1332

6612 +#: run-command.c:1333

6613 #, c-format

6614 msgid ""

6615 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6379,39 +6659,39 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"

6659 msgid "the receiving end does not support push options"

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

6661

6382 -#: sequencer.c:189

6662 +#: sequencer.c:191

6663 #, c-format

6664 msgid "invalid commit message cleanup mode '%s'"

6665 msgstr "mode de nettoyage invalide de message de validation '%s'"

6666

6387 -#: sequencer.c:294

6667 +#: sequencer.c:296

6668 #, c-format

6669 msgid "could not delete '%s'"

6670 msgstr "Impossible de supprimer '%s'"

6671

6392 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6672 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369

6673 #, c-format

6674 msgid "could not remove '%s'"

6675 msgstr "impossible de supprimer '%s'"

6676

6397 -#: sequencer.c:323

6677 +#: sequencer.c:325

6678 msgid "revert"

6679 msgstr "revert"

6680

6401 -#: sequencer.c:325

6681 +#: sequencer.c:327

6682 msgid "cherry-pick"

6683 msgstr "cherry-pick"

6684

6405 -#: sequencer.c:327

6406 -msgid "rebase -i"

6407 -msgstr "rebase -i"

6408 -

6685 #: sequencer.c:329

6686 +msgid "rebase"

6687 +msgstr "rebase"

6688 +

6689 +#: sequencer.c:331

6690 #, c-format

6691 msgid "unknown action: %d"

6692 msgstr "action inconnue : %d"

6693

6414 -#: sequencer.c:387

6694 +#: sequencer.c:389

6695 msgid ""

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

6697 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6419,7 +6699,7 @@ msgstr ""

6699 "après résolution des conflits, marquez les chemins corrigés\n"

6700 "avec 'git add <chemins>' ou 'git rm <chemins>'"

6701

6422 -#: sequencer.c:390

6702 +#: sequencer.c:392

6703 msgid ""

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

6705 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6429,114 +6709,110 @@ msgstr ""

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

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

6711

6432 -#: sequencer.c:403 sequencer.c:2993

6712 +#: sequencer.c:405 sequencer.c:2901

6713 #, c-format

6714 msgid "could not lock '%s'"

6715 msgstr "impossible de verrouiller '%s'"

6716

6437 -#: sequencer.c:410

6717 +#: sequencer.c:412

6718 #, c-format

6719 msgid "could not write eol to '%s'"

6720 msgstr "impossible d'écrire la fin de ligne dans '%s'"

6721

6442 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6443 -#: sequencer.c:3277

6722 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6723 +#: sequencer.c:3185

6724 #, c-format

6725 msgid "failed to finalize '%s'"

6726 msgstr "échec lors de la finalisation de '%s'"

6727

6448 -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6449 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6450 -#: builtin/rebase.c:589

6728 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6729 +#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120

6730 +#: builtin/rebase.c:593

6731 #, c-format

6732 msgid "could not read '%s'"

6733 msgstr "impossible de lire '%s'"

6734

6455 -#: sequencer.c:464

6735 +#: sequencer.c:466

6736 #, c-format

6737 msgid "your local changes would be overwritten by %s."

6738 msgstr "vos modifications locales seraient écrasées par %s."

6739

6460 -#: sequencer.c:468

6740 +#: sequencer.c:470

6741 msgid "commit your changes or stash them to proceed."

6742 msgstr "validez vos modifications ou les remiser pour continuer."

6743

6464 -#: sequencer.c:500

6744 +#: sequencer.c:502

6745 #, c-format

6746 msgid "%s: fast-forward"

6747 msgstr "%s : avance rapide"

6748

6469 -#: sequencer.c:539 builtin/tag.c:565

6749 +#: sequencer.c:541 builtin/tag.c:565

6750 #, c-format

6751 msgid "Invalid cleanup mode %s"

6752 msgstr "Mode de nettoyage invalide %s"

6753

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

6475 -#. "rebase -i".

6755 +#. "rebase".

6756 #.

6477 -#: sequencer.c:633

6757 +#: sequencer.c:635

6758 #, c-format

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

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

6761

6482 -#: sequencer.c:650

6762 +#: sequencer.c:652

6763 msgid "unable to update cache tree"

6764 msgstr "impossible de mettre à jour l'arbre de cache"

6765

6486 -#: sequencer.c:664

6766 +#: sequencer.c:666

6767 msgid "could not resolve HEAD commit"

6768 msgstr "impossible de résoudre le commit HEAD"

6769

6490 -#: sequencer.c:744

6770 +#: sequencer.c:746

6771 #, c-format

6772 msgid "no key present in '%.*s'"

6773 msgstr "aucune clé présente dans '%.*s'"

6774

6495 -#: sequencer.c:755

6775 +#: sequencer.c:757

6776 #, c-format

6777 msgid "unable to dequote value of '%s'"

6778 msgstr "Impossible de décoter la valeur de '%s'"

6779

6500 -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6501 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6780 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6781 +#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072

6782 #, c-format

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

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

6785

6506 -#: sequencer.c:802

6786 +#: sequencer.c:804

6787 msgid "'GIT_AUTHOR_NAME' already given"

6788 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

6789

6510 -#: sequencer.c:807

6790 +#: sequencer.c:809

6791 msgid "'GIT_AUTHOR_EMAIL' already given"

6792 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

6793

6514 -#: sequencer.c:812

6794 +#: sequencer.c:814

6795 msgid "'GIT_AUTHOR_DATE' already given"

6796 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

6797

6518 -#: sequencer.c:816

6798 +#: sequencer.c:818

6799 #, c-format

6800 msgid "unknown variable '%s'"

6801 msgstr "variable inconnue '%s'"

6802

6523 -#: sequencer.c:821

6803 +#: sequencer.c:823

6804 msgid "missing 'GIT_AUTHOR_NAME'"

6805 msgstr "'GIT_AUTHOR_NAME' manquant"

6806

6527 -#: sequencer.c:823

6807 +#: sequencer.c:825

6808 msgid "missing 'GIT_AUTHOR_EMAIL'"

6809 msgstr "'GIT_AUTHOR_EMAIL' manquant"

6810

6531 -#: sequencer.c:825

6811 +#: sequencer.c:827

6812 msgid "missing 'GIT_AUTHOR_DATE'"

6813 msgstr "'GIT_AUTHOR_DATE' manquant"

6814

6535 -#: sequencer.c:902 sequencer.c:1427

6536 -msgid "malformed ident line"

6537 -msgstr "ligne d'identification malformée"

6538 -

6539 -#: sequencer.c:925

6815 +#: sequencer.c:876

6816 #, c-format

6817 msgid ""

6818 "you have staged changes in your working tree\n"

@@ -6565,11 +6841,11 @@ msgstr ""

6841 "\n"

6842 " git rebase --continue\n"

6843

6568 -#: sequencer.c:1218

6844 +#: sequencer.c:1148

6845 msgid "'prepare-commit-msg' hook failed"

6846 msgstr "échec du crochet 'prepare-commit-msg'"

6847

6572 -#: sequencer.c:1224

6848 +#: sequencer.c:1154

6849 msgid ""

6850 "Your name and email address were configured automatically based\n"

6851 "on your username and hostname. Please check that they are accurate.\n"

@@ -6598,7 +6874,7 @@ msgstr ""

6874 "\n"

6875 " git commit --amend --reset-author\n"

6876

6601 -#: sequencer.c:1237

6877 +#: sequencer.c:1167

6878 msgid ""

6879 "Your name and email address were configured automatically based\n"

6880 "on your username and hostname. Please check that they are accurate.\n"

@@ -6624,330 +6900,325 @@ msgstr ""

6900 "\n"

6901 " git commit --amend --reset-author\n"

6902

6627 -#: sequencer.c:1279

6903 +#: sequencer.c:1209

6904 msgid "couldn't look up newly created commit"

6905 msgstr "impossible de retrouver le commit nouvellement créé"

6906

6631 -#: sequencer.c:1281

6907 +#: sequencer.c:1211

6908 msgid "could not parse newly created commit"

6909 msgstr "impossible d'analyser le commit nouvellement créé"

6910

6635 -#: sequencer.c:1327

6911 +#: sequencer.c:1257

6912 msgid "unable to resolve HEAD after creating commit"

6913 msgstr "impossible de résoudre HEAD après création du commit"

6914

6639 -#: sequencer.c:1329

6915 +#: sequencer.c:1259

6916 msgid "detached HEAD"

6917 msgstr "HEAD détachée"

6918

6643 -#: sequencer.c:1333

6919 +#: sequencer.c:1263

6920 msgid " (root-commit)"

6921 msgstr " (commit racine)"

6922

6647 -#: sequencer.c:1354

6923 +#: sequencer.c:1284

6924 msgid "could not parse HEAD"

6925 msgstr "impossible de lire HEAD"

6926

6651 -#: sequencer.c:1356

6927 +#: sequencer.c:1286

6928 #, c-format

6929 msgid "HEAD %s is not a commit!"

6930 msgstr "HEAD %s n'est pas un commit !"

6931

6656 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6932 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6933 msgid "could not parse HEAD commit"

6934 msgstr "impossible d'analyser le commit HEAD"

6935

6660 -#: sequencer.c:1411 sequencer.c:2055

6936 +#: sequencer.c:1342 sequencer.c:1968

6937 msgid "unable to parse commit author"

6938 msgstr "impossible d'analyser l'auteur du commit"

6939

6664 -#: sequencer.c:1431

6665 -msgid "corrupted author without date information"

6666 -msgstr "ligne author corrompue sans information de date"

6667 -

6668 -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6940 +#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687

6941 msgid "git write-tree failed to write a tree"

6942 msgstr "git write-tree a échoué à écrire un arbre"

6943

6672 -#: sequencer.c:1480 sequencer.c:1550

6944 +#: sequencer.c:1386 sequencer.c:1447

6945 #, c-format

6946 msgid "unable to read commit message from '%s'"

6947 msgstr "impossible de lire le message de validation de '%s'"

6948

6677 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6678 -#: builtin/merge.c:908

6949 +#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886

6950 +#: builtin/merge.c:911

6951 msgid "failed to write commit object"

6952 msgstr "échec de l'écriture de l'objet commit"

6953

6682 -#: sequencer.c:1577

6954 +#: sequencer.c:1474

6955 #, c-format

6956 msgid "could not parse commit %s"

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

6958

6687 -#: sequencer.c:1582

6959 +#: sequencer.c:1479

6960 #, c-format

6961 msgid "could not parse parent commit %s"

6962 msgstr "impossible d'analyser le commit parent %s"

6963

6692 -#: sequencer.c:1656 sequencer.c:1767

6964 +#: sequencer.c:1562 sequencer.c:1673

6965 #, c-format

6966 msgid "unknown command: %d"

6967 msgstr "commande inconnue : %d"

6968

6697 -#: sequencer.c:1714 sequencer.c:1739

6969 +#: sequencer.c:1620 sequencer.c:1645

6970 #, c-format

6971 msgid "This is a combination of %d commits."

6972 msgstr "Ceci est la combinaison de %d commits."

6973

6702 -#: sequencer.c:1724

6974 +#: sequencer.c:1630

6975 msgid "need a HEAD to fixup"

6976 msgstr "une HEAD est nécessaire à la correction"

6977

6706 -#: sequencer.c:1726 sequencer.c:3304

6978 +#: sequencer.c:1632 sequencer.c:3212

6979 msgid "could not read HEAD"

6980 msgstr "Impossible de lire HEAD"

6981

6710 -#: sequencer.c:1728

6982 +#: sequencer.c:1634

6983 msgid "could not read HEAD's commit message"

6984 msgstr "impossible de lire le message de validation de HEAD"

6985

6714 -#: sequencer.c:1734

6986 +#: sequencer.c:1640

6987 #, c-format

6988 msgid "cannot write '%s'"

6989 msgstr "impossible d'écrire '%s'"

6990

6719 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6991 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6992 msgid "This is the 1st commit message:"

6993 msgstr "Ceci est le premier message de validation :"

6994

6723 -#: sequencer.c:1749

6995 +#: sequencer.c:1655

6996 #, c-format

6997 msgid "could not read commit message of %s"

6998 msgstr "impossible de lire le message de validation de %s"

6999

6728 -#: sequencer.c:1756

7000 +#: sequencer.c:1662

7001 #, c-format

7002 msgid "This is the commit message #%d:"

7003 msgstr "Ceci est le message de validation numéro %d :"

7004

6733 -#: sequencer.c:1762

7005 +#: sequencer.c:1668

7006 #, c-format

7007 msgid "The commit message #%d will be skipped:"

7008 msgstr "Le message de validation %d sera ignoré :"

7009

6738 -#: sequencer.c:1850

7010 +#: sequencer.c:1756

7011 msgid "your index file is unmerged."

7012 msgstr "votre fichier d'index n'est pas fusionné."

7013

6742 -#: sequencer.c:1857

7014 +#: sequencer.c:1763

7015 msgid "cannot fixup root commit"

7016 msgstr "impossible de réparer le commit racine"

7017

6746 -#: sequencer.c:1876

7018 +#: sequencer.c:1782

7019 #, c-format

7020 msgid "commit %s is a merge but no -m option was given."

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

7022

6751 -#: sequencer.c:1884 sequencer.c:1892

7023 +#: sequencer.c:1790 sequencer.c:1798

7024 #, c-format

7025 msgid "commit %s does not have parent %d"

7026 msgstr "le commit %s n'a pas de parent %d"

7027

6756 -#: sequencer.c:1898

7028 +#: sequencer.c:1804

7029 #, c-format

7030 msgid "cannot get commit message for %s"

7031 msgstr "impossible d'obtenir un message de validation pour %s"

7032

7033 #. TRANSLATORS: The first %s will be a "todo" command like

7034 #. "revert" or "pick", the second %s a SHA1.

6763 -#: sequencer.c:1917

7035 +#: sequencer.c:1823

7036 #, c-format

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

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

7039

6768 -#: sequencer.c:1982

7040 +#: sequencer.c:1888

7041 #, c-format

7042 msgid "could not rename '%s' to '%s'"

7043 msgstr "impossible de renommer '%s' en '%s'"

7044

6773 -#: sequencer.c:2037

7045 +#: sequencer.c:1943

7046 #, c-format

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

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

7049

6778 -#: sequencer.c:2038

7050 +#: sequencer.c:1944

7051 #, c-format

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

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

7054

6783 -#: sequencer.c:2105

7055 +#: sequencer.c:1961

7056 +#, c-format

7057 +msgid "dropping %s %s -- patch contents already upstream\n"

7058 +msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"

7059 +

7060 +#: sequencer.c:2018

7061 #, c-format

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

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

7064

6788 -#: sequencer.c:2112

7065 +#: sequencer.c:2025

7066 #, c-format

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

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

7069

6793 -#: sequencer.c:2189

7070 +#: sequencer.c:2102

7071 #, c-format

7072 msgid "%s does not accept arguments: '%s'"

7073 msgstr "%s n'accepte pas d'argument : '%s'"

7074

6798 -#: sequencer.c:2198

7075 +#: sequencer.c:2111

7076 #, c-format

7077 msgid "missing arguments for %s"

7078 msgstr "argument manquant pour %s"

7079

6803 -#: sequencer.c:2235

7080 +#: sequencer.c:2142

7081 #, c-format

6805 -msgid "could not parse '%.*s'"

6806 -msgstr "impossible d'analyser '%.*s'"

7082 +msgid "could not parse '%s'"

7083 +msgstr "impossible d'analyser '%s'"

7084

6808 -#: sequencer.c:2289

7085 +#: sequencer.c:2203

7086 #, c-format

7087 msgid "invalid line %d: %.*s"

7088 msgstr "ligne %d invalide : %.*s"

7089

6813 -#: sequencer.c:2300

7090 +#: sequencer.c:2214

7091 #, c-format

7092 msgid "cannot '%s' without a previous commit"

7093 msgstr "'%s' impossible avec le commit précédent"

7094

6818 -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6819 -#: builtin/rebase.c:223 builtin/rebase.c:248

6820 -#, c-format

6821 -msgid "could not read '%s'."

6822 -msgstr "impossible de lire '%s'."

6823 -

6824 -#: sequencer.c:2384

7095 +#: sequencer.c:2298

7096 msgid "cancelling a cherry picking in progress"

7097 msgstr "annulation d'un picorage en cours"

7098

6828 -#: sequencer.c:2391

7099 +#: sequencer.c:2305

7100 msgid "cancelling a revert in progress"

7101 msgstr "annulation d'un retour en cours"

7102

6832 -#: sequencer.c:2435

7103 +#: sequencer.c:2349

7104 msgid "please fix this using 'git rebase --edit-todo'."

7105 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

7106

6836 -#: sequencer.c:2437

7107 +#: sequencer.c:2351

7108 #, c-format

7109 msgid "unusable instruction sheet: '%s'"

7110 msgstr "feuille d'instruction inutilisable : '%s'"

7111

6841 -#: sequencer.c:2442

7112 +#: sequencer.c:2356

7113 msgid "no commits parsed."

7114 msgstr "aucun commit analysé."

7115

6845 -#: sequencer.c:2453

7116 +#: sequencer.c:2367

7117 msgid "cannot cherry-pick during a revert."

7118 msgstr "impossible de picorer pendant l'annulation d'un commit."

7119

6849 -#: sequencer.c:2455

7120 +#: sequencer.c:2369

7121 msgid "cannot revert during a cherry-pick."

7122 msgstr "impossible d'annuler un commit pendant un picorage."

7123

6853 -#: sequencer.c:2533

7124 +#: sequencer.c:2447

7125 #, c-format

7126 msgid "invalid value for %s: %s"

7127 msgstr "valeur invalide pour %s : %s"

7128

6858 -#: sequencer.c:2630

7129 +#: sequencer.c:2540

7130 msgid "unusable squash-onto"

7131 msgstr "\"écrase-sur\" inutilisable"

7132

6862 -#: sequencer.c:2646

7133 +#: sequencer.c:2556

7134 #, c-format

7135 msgid "malformed options sheet: '%s'"

7136 msgstr "feuille d'options malformée : %s"

7137

6867 -#: sequencer.c:2736 sequencer.c:4463

7138 +#: sequencer.c:2644 sequencer.c:4361

7139 msgid "empty commit set passed"

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

7141

6871 -#: sequencer.c:2752

7142 +#: sequencer.c:2660

7143 msgid "revert is already in progress"

7144 msgstr "un retour est déjà en cours"

7145

6875 -#: sequencer.c:2754

7146 +#: sequencer.c:2662

7147 #, c-format

7148 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7149 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""

7150

6880 -#: sequencer.c:2757

7151 +#: sequencer.c:2665

7152 msgid "cherry-pick is already in progress"

7153 msgstr "un picorage est déjà en cours"

7154

6884 -#: sequencer.c:2759

7155 +#: sequencer.c:2667

7156 #, c-format

7157 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7158 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""

7159

6889 -#: sequencer.c:2773

7160 +#: sequencer.c:2681

7161 #, c-format

7162 msgid "could not create sequencer directory '%s'"

7163 msgstr "impossible de créer le répertoire de séquenceur '%s'"

7164

6894 -#: sequencer.c:2788

7165 +#: sequencer.c:2696

7166 msgid "could not lock HEAD"

7167 msgstr "impossible de verrouiller HEAD"

7168

6898 -#: sequencer.c:2848 sequencer.c:4209

7169 +#: sequencer.c:2756 sequencer.c:4099

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

7171 msgstr "aucun picorage ou retour en cours"

7172

6902 -#: sequencer.c:2850 sequencer.c:2861

7173 +#: sequencer.c:2758 sequencer.c:2769

7174 msgid "cannot resolve HEAD"

7175 msgstr "impossible de résoudre HEAD"

7176

6906 -#: sequencer.c:2852 sequencer.c:2896

7177 +#: sequencer.c:2760 sequencer.c:2804

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

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

7180

6910 -#: sequencer.c:2882 builtin/grep.c:736

7181 +#: sequencer.c:2790 builtin/grep.c:724

7182 #, c-format

7183 msgid "cannot open '%s'"

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

7185

6915 -#: sequencer.c:2884

7186 +#: sequencer.c:2792

7187 #, c-format

7188 msgid "cannot read '%s': %s"

7189 msgstr "impossible de lire '%s' : %s"

7190

6920 -#: sequencer.c:2885

7191 +#: sequencer.c:2793

7192 msgid "unexpected end of file"

7193 msgstr "fin de fichier inattendue"

7194

6924 -#: sequencer.c:2891

7195 +#: sequencer.c:2799

7196 #, c-format

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

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

7199

6929 -#: sequencer.c:2902

7200 +#: sequencer.c:2810

7201 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

7202 msgstr ""

7203 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

7204

6934 -#: sequencer.c:2943

7205 +#: sequencer.c:2851

7206 msgid "no revert in progress"

7207 msgstr "Pas de retour en cours ?"

7208

6938 -#: sequencer.c:2951

7209 +#: sequencer.c:2859

7210 msgid "no cherry-pick in progress"

7211 msgstr "aucun picorage en cours"

7212

6942 -#: sequencer.c:2961

7213 +#: sequencer.c:2869

7214 msgid "failed to skip the commit"

7215 msgstr "échec du saut de commit"

7216

6946 -#: sequencer.c:2968

7217 +#: sequencer.c:2876

7218 msgid "there is nothing to skip"

7219 msgstr "il n'y a rien à sauter"

7220

6950 -#: sequencer.c:2971

7221 +#: sequencer.c:2879

7222 #, c-format

7223 msgid ""

7224 "have you committed already?\n"

@@ -6956,21 +7227,21 @@ msgstr ""

7227 "Avez-vous déjà validé ?\n"

7228 "essayez \"git %s -continue\""

7229

6959 -#: sequencer.c:3095 sequencer.c:4121

7230 +#: sequencer.c:3003 sequencer.c:4011

7231 #, c-format

7232 msgid "could not update %s"

7233 msgstr "impossible de mettre à jour %s"

7234

6964 -#: sequencer.c:3134 sequencer.c:4101

7235 +#: sequencer.c:3042 sequencer.c:3991

7236 msgid "cannot read HEAD"

7237 msgstr "impossible de lire HEAD"

7238

6968 -#: sequencer.c:3151

7239 +#: sequencer.c:3059

7240 #, c-format

7241 msgid "unable to copy '%s' to '%s'"

7242 msgstr "impossible de copier '%s' vers '%s'"

7243

6973 -#: sequencer.c:3159

7244 +#: sequencer.c:3067

7245 #, c-format

7246 msgid ""

7247 "You can amend the commit now, with\n"

@@ -6989,22 +7260,22 @@ msgstr ""

7260 "\n"

7261 " git rebase --continue\n"

7262

6992 -#: sequencer.c:3169

7263 +#: sequencer.c:3077

7264 #, c-format

7265 msgid "Could not apply %s... %.*s"

7266 msgstr "impossible d'appliquer %s... %.*s"

7267

6997 -#: sequencer.c:3176

7268 +#: sequencer.c:3084

7269 #, c-format

7270 msgid "Could not merge %.*s"

7271 msgstr "Impossible de fusionner %.*s"

7272

7002 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

7273 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641

7274 #, c-format

7275 msgid "could not copy '%s' to '%s'"

7276 msgstr "impossible de copier '%s' vers '%s'"

7277

7007 -#: sequencer.c:3221

7278 +#: sequencer.c:3129

7279 #, c-format

7280 msgid ""

7281 "execution failed: %s\n"

@@ -7019,11 +7290,11 @@ msgstr ""

7290 "git rebase --continue\n"

7291 "\n"

7292

7022 -#: sequencer.c:3227

7293 +#: sequencer.c:3135

7294 msgid "and made changes to the index and/or the working tree\n"

7295 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

7296

7026 -#: sequencer.c:3233

7297 +#: sequencer.c:3141

7298 #, c-format

7299 msgid ""

7300 "execution succeeded: %s\n"

@@ -7040,73 +7311,73 @@ msgstr ""

7311 " git rebase --continue\n"

7312 "\n"

7313

7043 -#: sequencer.c:3294

7314 +#: sequencer.c:3202

7315 #, c-format

7316 msgid "illegal label name: '%.*s'"

7317 msgstr "nom de label illégal '%.*s'"

7318

7048 -#: sequencer.c:3348

7319 +#: sequencer.c:3256

7320 msgid "writing fake root commit"

7321 msgstr "écriture d'un commit racine bidon"

7322

7052 -#: sequencer.c:3353

7323 +#: sequencer.c:3261

7324 msgid "writing squash-onto"

7325 msgstr "écriture de 'écraser-sur'"

7326

7056 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

7327 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886

7328 #, c-format

7329 msgid "failed to find tree of %s"

7330 msgstr "impossible de trouver l'arbre de %s"

7331

7061 -#: sequencer.c:3436

7332 +#: sequencer.c:3344

7333 #, c-format

7334 msgid "could not resolve '%s'"

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

7336

7066 -#: sequencer.c:3467

7337 +#: sequencer.c:3375

7338 msgid "cannot merge without a current revision"

7339 msgstr "impossible de fusionner avec une révision courante"

7340

7070 -#: sequencer.c:3489

7341 +#: sequencer.c:3397

7342 #, c-format

7343 msgid "unable to parse '%.*s'"

7344 msgstr "impossible d'analyser '%.*s'"

7345

7075 -#: sequencer.c:3498

7346 +#: sequencer.c:3406

7347 #, c-format

7348 msgid "nothing to merge: '%.*s'"

7349 msgstr "rien à fusionner : '%.*s'"

7350

7080 -#: sequencer.c:3510

7351 +#: sequencer.c:3418

7352 msgid "octopus merge cannot be executed on top of a [new root]"

7353 msgstr ""

7354 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

7355

7085 -#: sequencer.c:3526

7356 +#: sequencer.c:3434

7357 #, c-format

7358 msgid "could not get commit message of '%s'"

7359 msgstr "impossible de lire le message de validation de '%s'"

7360

7090 -#: sequencer.c:3688

7361 +#: sequencer.c:3594

7362 #, c-format

7363 msgid "could not even attempt to merge '%.*s'"

7364 msgstr "impossible de seulement essayer de fusionner '%.*s'"

7365

7095 -#: sequencer.c:3704

7366 +#: sequencer.c:3610

7367 msgid "merge: Unable to write new index file"

7368 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

7369

7099 -#: sequencer.c:3773 builtin/rebase.c:733

7370 +#: sequencer.c:3679 builtin/rebase.c:737

7371 #, c-format

7372 msgid "Applied autostash.\n"

7373 msgstr "Autoremisage appliqué.\n"

7374

7104 -#: sequencer.c:3785

7375 +#: sequencer.c:3691

7376 #, c-format

7377 msgid "cannot store %s"

7378 msgstr "impossible de stocker %s"

7379

7109 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

7380 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113

7381 #, c-format

7382 msgid ""

7383 "Applying autostash resulted in conflicts.\n"

@@ -7117,31 +7388,26 @@ msgstr ""

7388 "Vos modifications sont à l'abri dans la remise.\n"

7389 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

7390

7120 -#: sequencer.c:3849

7121 -#, c-format

7122 -msgid "could not checkout %s"

7123 -msgstr "extraction de %s impossible"

7124 -

7125 -#: sequencer.c:3863

7391 +#: sequencer.c:3755

7392 #, c-format

7393 msgid "%s: not a valid OID"

7394 msgstr "%s n'est pas un OID valide"

7395

7130 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

7396 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779

7397 msgid "could not detach HEAD"

7398 msgstr "Impossible de détacher HEAD"

7399

7134 -#: sequencer.c:3883

7400 +#: sequencer.c:3775

7401 #, c-format

7402 msgid "Stopped at HEAD\n"

7403 msgstr "arrêt à HEAD\n"

7404

7139 -#: sequencer.c:3885

7405 +#: sequencer.c:3777

7406 #, c-format

7407 msgid "Stopped at %s\n"

7408 msgstr "Arrêté à %s\n"

7409

7144 -#: sequencer.c:3893

7410 +#: sequencer.c:3785

7411 #, c-format

7412 msgid ""

7413 "Could not execute the todo command\n"

@@ -7162,48 +7428,48 @@ msgstr ""

7428 " git rebase --edit-todo\n"

7429 " git rebase --continue\n"

7430

7165 -#: sequencer.c:3979

7431 +#: sequencer.c:3869

7432 #, c-format

7433 msgid "Stopped at %s... %.*s\n"

7434 msgstr "arrêt à %s... %.*s\n"

7435

7170 -#: sequencer.c:4050

7436 +#: sequencer.c:3940

7437 #, c-format

7438 msgid "unknown command %d"

7439 msgstr "commande inconnue %d"

7440

7175 -#: sequencer.c:4109

7441 +#: sequencer.c:3999

7442 msgid "could not read orig-head"

7443 msgstr "impossible de lire orig-head"

7444

7179 -#: sequencer.c:4114

7445 +#: sequencer.c:4004

7446 msgid "could not read 'onto'"

7447 msgstr "impossible de lire 'onto'"

7448

7183 -#: sequencer.c:4128

7449 +#: sequencer.c:4018

7450 #, c-format

7451 msgid "could not update HEAD to %s"

7452 msgstr "impossible de mettre à jour HEAD sur %s"

7453

7188 -#: sequencer.c:4221

7454 +#: sequencer.c:4111

7455 msgid "cannot rebase: You have unstaged changes."

7456 msgstr "impossible de rebaser : vous avez des modifications non indexées."

7457

7192 -#: sequencer.c:4230

7458 +#: sequencer.c:4120

7459 msgid "cannot amend non-existing commit"

7460 msgstr "impossible de corriger un commit non-existant"

7461

7196 -#: sequencer.c:4232

7462 +#: sequencer.c:4122

7463 #, c-format

7464 msgid "invalid file: '%s'"

7465 msgstr "fichier invalide : '%s'"

7466

7201 -#: sequencer.c:4234

7467 +#: sequencer.c:4124

7468 #, c-format

7469 msgid "invalid contents: '%s'"

7470 msgstr "contenu invalide : '%s'"

7471

7206 -#: sequencer.c:4237

7472 +#: sequencer.c:4127

7473 msgid ""

7474 "\n"

7475 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -7213,69 +7479,59 @@ msgstr ""

7479 "Vous avez des modifications non validées dans votre copie de travail.\n"

7480 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

7481

7216 -#: sequencer.c:4273 sequencer.c:4312

7482 +#: sequencer.c:4163 sequencer.c:4202

7483 #, c-format

7484 msgid "could not write file: '%s'"

7485 msgstr "impossible d'écrire le fichier : '%s'"

7486

7221 -#: sequencer.c:4327

7487 +#: sequencer.c:4217

7488 msgid "could not remove CHERRY_PICK_HEAD"

7489 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

7490

7225 -#: sequencer.c:4334

7491 +#: sequencer.c:4224

7492 msgid "could not commit staged changes."

7493 msgstr "impossible de valider les modifications indexées."

7494

7229 -#: sequencer.c:4440

7495 +#: sequencer.c:4338

7496 #, c-format

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

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

7499

7234 -#: sequencer.c:4444

7500 +#: sequencer.c:4342

7501 #, c-format

7502 msgid "%s: bad revision"

7503 msgstr "%s : mauvaise révision"

7504

7239 -#: sequencer.c:4479

7505 +#: sequencer.c:4377

7506 msgid "can't revert as initial commit"

7507 msgstr "impossible d'annuler en tant que commit initial"

7508

7243 -#: sequencer.c:4952

7509 +#: sequencer.c:4846

7510 msgid "make_script: unhandled options"

7511 msgstr "make_script : options non gérées"

7512

7247 -#: sequencer.c:4955

7513 +#: sequencer.c:4849

7514 msgid "make_script: error preparing revisions"

7515 msgstr "make_script : erreur lors de la préparation des révisions"

7516

7251 -#: sequencer.c:5113

7252 -msgid ""

7253 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7254 -"continue'.\n"

7255 -"Or you can abort the rebase with 'git rebase --abort'.\n"

7256 -msgstr ""

7257 -"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "

7258 -"rebase --continue'.\n"

7259 -"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

7260 -

7261 -#: sequencer.c:5226 sequencer.c:5243

7517 +#: sequencer.c:5083 sequencer.c:5100

7518 msgid "nothing to do"

7519 msgstr "rien à faire"

7520

7265 -#: sequencer.c:5257

7521 +#: sequencer.c:5119

7522 msgid "could not skip unnecessary pick commands"

7523 msgstr "impossible d'éviter les commandes de picorage non nécessaires"

7524

7269 -#: sequencer.c:5351

7525 +#: sequencer.c:5213

7526 msgid "the script was already rearranged."

7527 msgstr "le script a déjà été réarrangé."

7528

7529 #: setup.c:124

7530 #, c-format

7275 -msgid "'%s' is outside repository"

7276 -msgstr "'%s' est hors du dépôt"

7531 +msgid "'%s' is outside repository at '%s'"

7532 +msgstr "'%s' est hors du dépôt à '%s'"

7533

7278 -#: setup.c:174

7534 +#: setup.c:175

7535 #, c-format

7536 msgid ""

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

@@ -7285,7 +7541,7 @@ msgstr ""

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

7542 "n'existent pas localement."

7543

7288 -#: setup.c:187

7544 +#: setup.c:188

7545 #, c-format

7546 msgid ""

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

@@ -7296,14 +7552,14 @@ msgstr ""

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

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

7554

7299 -#: setup.c:236

7555 +#: setup.c:254

7556 #, c-format

7557 msgid "option '%s' must come before non-option arguments"

7558 msgstr ""

7559 "l'option '%s' doit être présente avant les arguments qui ne sont pas des "

7560 "options"

7561

7306 -#: setup.c:255

7562 +#: setup.c:273

7563 #, c-format

7564 msgid ""

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

@@ -7314,94 +7570,94 @@ msgstr ""

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

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

7572

7317 -#: setup.c:391

7573 +#: setup.c:409

7574 msgid "unable to set up work tree using invalid config"

7575 msgstr ""

7576 "impossible de mettre en place le répertoire de travail en utilisant une "

7577 "configuration invalide"

7578

7323 -#: setup.c:395

7579 +#: setup.c:413

7580 msgid "this operation must be run in a work tree"

7581 msgstr "Cette opération doit être effectuée dans un arbre de travail"

7582

7327 -#: setup.c:541

7583 +#: setup.c:559

7584 #, c-format

7585 msgid "Expected git repo version <= %d, found %d"

7586 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

7587

7332 -#: setup.c:549

7588 +#: setup.c:567

7589 msgid "unknown repository extensions found:"

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

7591

7336 -#: setup.c:568

7592 +#: setup.c:586

7593 #, c-format

7594 msgid "error opening '%s'"

7595 msgstr "erreur à l'ouverture de '%s'"

7596

7341 -#: setup.c:570

7597 +#: setup.c:588

7598 #, c-format

7599 msgid "too large to be a .git file: '%s'"

7600 msgstr "trop gros pour être une fichier .git : '%s'"

7601

7346 -#: setup.c:572

7602 +#: setup.c:590

7603 #, c-format

7604 msgid "error reading %s"

7605 msgstr "erreur à la lecture de %s"

7606

7351 -#: setup.c:574

7607 +#: setup.c:592

7608 #, c-format

7609 msgid "invalid gitfile format: %s"

7610 msgstr "format de fichier git invalide : %s"

7611

7356 -#: setup.c:576

7612 +#: setup.c:594

7613 #, c-format

7614 msgid "no path in gitfile: %s"

7615 msgstr "aucun chemin dans le fichier git : %s"

7616

7361 -#: setup.c:578

7617 +#: setup.c:596

7618 #, c-format

7619 msgid "not a git repository: %s"

7620 msgstr "ce n'est pas un dépôt git : %s"

7621

7366 -#: setup.c:677

7622 +#: setup.c:695

7623 #, c-format

7624 msgid "'$%s' too big"

7625 msgstr "'$%s' trop gros"

7626

7371 -#: setup.c:691

7627 +#: setup.c:709

7628 #, c-format

7629 msgid "not a git repository: '%s'"

7630 msgstr "ce n'est pas un dépôt git : '%s'"

7631

7376 -#: setup.c:720 setup.c:722 setup.c:753

7632 +#: setup.c:738 setup.c:740 setup.c:771

7633 #, c-format

7634 msgid "cannot chdir to '%s'"

7635 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"

7636

7381 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838

7637 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856

7638 msgid "cannot come back to cwd"

7639 msgstr "impossible de revenir au répertoire de travail courant"

7640

7385 -#: setup.c:852

7641 +#: setup.c:870

7642 #, c-format

7643 msgid "failed to stat '%*s%s%s'"

7644 msgstr "échec du stat de '%*s%s%s'"

7645

7390 -#: setup.c:1090

7646 +#: setup.c:1108

7647 msgid "Unable to read current working directory"

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

7649

7394 -#: setup.c:1099 setup.c:1105

7650 +#: setup.c:1117 setup.c:1123

7651 #, c-format

7652 msgid "cannot change to '%s'"

7653 msgstr "impossible de modifier en '%s'"

7654

7399 -#: setup.c:1110

7655 +#: setup.c:1128

7656 #, c-format

7657 msgid "not a git repository (or any of the parent directories): %s"

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

7659

7404 -#: setup.c:1116

7660 +#: setup.c:1134

7661 #, c-format

7662 msgid ""

7663 "not a git repository (or any parent up to mount point %s)\n"

@@ -7412,7 +7668,7 @@ msgstr ""

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

7669 "n'est pas défini)."

7670

7415 -#: setup.c:1227

7671 +#: setup.c:1245

7672 #, c-format

7673 msgid ""

7674 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -7422,15 +7678,15 @@ msgstr ""

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

7679 "écriture."

7680

7425 -#: setup.c:1271

7681 +#: setup.c:1289

7682 msgid "open /dev/null or dup failed"

7683 msgstr "échec de l'ouverture ou au dup de /dev/null"

7684

7429 -#: setup.c:1286

7685 +#: setup.c:1304

7686 msgid "fork failed"

7687 msgstr "échec de la bifurcation"

7688

7433 -#: setup.c:1291

7689 +#: setup.c:1309

7690 msgid "setsid failed"

7691 msgstr "échec du setsid"

7692

@@ -7513,195 +7769,195 @@ msgstr "échec de mmap"

7769 msgid "object file %s is empty"

7770 msgstr "le fichier objet %s est vide"

7771

7516 -#: sha1-file.c:1252 sha1-file.c:2392

7772 +#: sha1-file.c:1263 sha1-file.c:2443

7773 #, c-format

7774 msgid "corrupt loose object '%s'"

7775 msgstr "objet libre corrompu '%s'"

7776

7521 -#: sha1-file.c:1254 sha1-file.c:2396

7777 +#: sha1-file.c:1265 sha1-file.c:2447

7778 #, c-format

7779 msgid "garbage at end of loose object '%s'"

7780 msgstr "données incorrectes à la fin de l'objet libre '%s'"

7781

7526 -#: sha1-file.c:1296

7782 +#: sha1-file.c:1307

7783 msgid "invalid object type"

7784 msgstr "type d'objet invalide"

7785

7530 -#: sha1-file.c:1380

7786 +#: sha1-file.c:1391

7787 #, c-format

7788 msgid "unable to unpack %s header with --allow-unknown-type"

7789 msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"

7790

7535 -#: sha1-file.c:1383

7791 +#: sha1-file.c:1394

7792 #, c-format

7793 msgid "unable to unpack %s header"

7794 msgstr "impossible de dépaqueter l'entête %s"

7795

7540 -#: sha1-file.c:1389

7796 +#: sha1-file.c:1400

7797 #, c-format

7798 msgid "unable to parse %s header with --allow-unknown-type"

7799 msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"

7800

7545 -#: sha1-file.c:1392

7801 +#: sha1-file.c:1403

7802 #, c-format

7803 msgid "unable to parse %s header"

7804 msgstr "impossible d'analyser l'entête %s"

7805

7550 -#: sha1-file.c:1584

7806 +#: sha1-file.c:1629

7807 #, c-format

7808 msgid "failed to read object %s"

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

7810

7555 -#: sha1-file.c:1588

7811 +#: sha1-file.c:1633

7812 #, c-format

7813 msgid "replacement %s not found for %s"

7814 msgstr "remplacement %s non trouvé pour %s"

7815

7560 -#: sha1-file.c:1592

7816 +#: sha1-file.c:1637

7817 #, c-format

7818 msgid "loose object %s (stored in %s) is corrupt"

7819 msgstr "l'objet libre %s (stocké dans %s) est corrompu"

7820

7565 -#: sha1-file.c:1596

7821 +#: sha1-file.c:1641

7822 #, c-format

7823 msgid "packed object %s (stored in %s) is corrupt"

7824 msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"

7825

7570 -#: sha1-file.c:1699

7826 +#: sha1-file.c:1746

7827 #, c-format

7828 msgid "unable to write file %s"

7829 msgstr "impossible d'écrire le fichier %s"

7830

7575 -#: sha1-file.c:1706

7831 +#: sha1-file.c:1753

7832 #, c-format

7833 msgid "unable to set permission to '%s'"

7834 msgstr "impossible de régler les droits de '%s'"

7835

7580 -#: sha1-file.c:1713

7836 +#: sha1-file.c:1760

7837 msgid "file write error"

7838 msgstr "erreur d'écriture d'un fichier"

7839

7584 -#: sha1-file.c:1732

7840 +#: sha1-file.c:1780

7841 msgid "error when closing loose object file"

7842 msgstr "erreur en fermeture du fichier d'objet esseulé"

7843

7588 -#: sha1-file.c:1797

7844 +#: sha1-file.c:1845

7845 #, c-format

7846 msgid "insufficient permission for adding an object to repository database %s"

7847 msgstr ""

7848 "droits insuffisants pour ajouter un objet à la base de données %s du dépôt"

7849

7594 -#: sha1-file.c:1799

7850 +#: sha1-file.c:1847

7851 msgid "unable to create temporary file"

7852 msgstr "impossible de créer un fichier temporaire"

7853

7598 -#: sha1-file.c:1823

7854 +#: sha1-file.c:1871

7855 msgid "unable to write loose object file"

7856 msgstr "impossible d'écrire le fichier d'objet esseulé"

7857

7602 -#: sha1-file.c:1829

7858 +#: sha1-file.c:1877

7859 #, c-format

7860 msgid "unable to deflate new object %s (%d)"

7861 msgstr "impossible de compresser le nouvel objet %s (%d)"

7862

7607 -#: sha1-file.c:1833

7863 +#: sha1-file.c:1881

7864 #, c-format

7865 msgid "deflateEnd on object %s failed (%d)"

7866 msgstr "échec de deflateEnd sur l'objet %s (%d)"

7867

7612 -#: sha1-file.c:1837

7868 +#: sha1-file.c:1885

7869 #, c-format

7870 msgid "confused by unstable object source data for %s"

7871 msgstr "données de source d'objet instable pour %s"

7872

7617 -#: sha1-file.c:1847 builtin/pack-objects.c:925

7873 +#: sha1-file.c:1895 builtin/pack-objects.c:1054

7874 #, c-format

7875 msgid "failed utime() on %s"

7876 msgstr "échec de utime() sur %s"

7877

7622 -#: sha1-file.c:1922

7878 +#: sha1-file.c:1972

7879 #, c-format

7880 msgid "cannot read object for %s"

7881 msgstr "impossible de lire l'objet pour %s"

7882

7627 -#: sha1-file.c:1962

7883 +#: sha1-file.c:2011

7884 msgid "corrupt commit"

7885 msgstr "commit corrompu"

7886

7631 -#: sha1-file.c:1970

7887 +#: sha1-file.c:2019

7888 msgid "corrupt tag"

7889 msgstr "étiquette corrompue"

7890

7635 -#: sha1-file.c:2069

7891 +#: sha1-file.c:2119

7892 #, c-format

7893 msgid "read error while indexing %s"

7894 msgstr "erreur de lecture à l'indexation de %s"

7895

7640 -#: sha1-file.c:2072

7896 +#: sha1-file.c:2122

7897 #, c-format

7898 msgid "short read while indexing %s"

7899 msgstr "lecture tronquée pendant l'indexation de %s"

7900

7645 -#: sha1-file.c:2145 sha1-file.c:2154

7901 +#: sha1-file.c:2195 sha1-file.c:2205

7902 #, c-format

7903 msgid "%s: failed to insert into database"

7904 msgstr "%s : échec de l'insertion dans la base de données"

7905

7650 -#: sha1-file.c:2160

7906 +#: sha1-file.c:2211

7907 #, c-format

7908 msgid "%s: unsupported file type"

7909 msgstr "%s : type de fichier non supporté"

7910

7655 -#: sha1-file.c:2184

7911 +#: sha1-file.c:2235

7912 #, c-format

7913 msgid "%s is not a valid object"

7914 msgstr "%s n'est pas un objet valide"

7915

7660 -#: sha1-file.c:2186

7916 +#: sha1-file.c:2237

7917 #, c-format

7918 msgid "%s is not a valid '%s' object"

7919 msgstr "%s n'est pas un objet '%s' valide"

7920

7665 -#: sha1-file.c:2213 builtin/index-pack.c:155

7921 +#: sha1-file.c:2264 builtin/index-pack.c:155

7922 #, c-format

7923 msgid "unable to open %s"

7924 msgstr "impossible d'ouvrir %s"

7925

7670 -#: sha1-file.c:2403 sha1-file.c:2455

7926 +#: sha1-file.c:2454 sha1-file.c:2507

7927 #, c-format

7928 msgid "hash mismatch for %s (expected %s)"

7929 msgstr "incohérence de hachage pour %s (%s attendu)"

7930

7675 -#: sha1-file.c:2427

7931 +#: sha1-file.c:2478

7932 #, c-format

7933 msgid "unable to mmap %s"

7934 msgstr "impossible de mmap %s"

7935

7680 -#: sha1-file.c:2432

7936 +#: sha1-file.c:2483

7937 #, c-format

7938 msgid "unable to unpack header of %s"

7939 msgstr "impossible de dépaqueter l'entête de %s"

7940

7685 -#: sha1-file.c:2438

7941 +#: sha1-file.c:2489

7942 #, c-format

7943 msgid "unable to parse header of %s"

7944 msgstr "impossible d'analyser l'entête de %s"

7945

7690 -#: sha1-file.c:2449

7946 +#: sha1-file.c:2500

7947 #, c-format

7948 msgid "unable to unpack contents of %s"

7949 msgstr "impossible de dépaqueter le contenu de %s"

7950

7695 -#: sha1-name.c:487

7951 +#: sha1-name.c:486

7952 #, c-format

7953 msgid "short SHA1 %s is ambiguous"

7954 msgstr "le SHA1 court %s est ambigu"

7955

7700 -#: sha1-name.c:498

7956 +#: sha1-name.c:497

7957 msgid "The candidates are:"

7958 msgstr "Les candidats sont :"

7959

7704 -#: sha1-name.c:797

7960 +#: sha1-name.c:796

7961 msgid ""

7962 "Git normally never creates a ref that ends with 40 hex characters\n"

7963 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -7725,44 +7981,110 @@ msgstr ""

7981 "message\n"

7982 "en lançant \"git config advice.objectNameWarning false\""

7983

7984 +#: sha1-name.c:916

7985 +#, c-format

7986 +msgid "log for '%.*s' only goes back to %s"

7987 +msgstr "le journal de '%.*s' ne remonte qu'à %s"

7988 +

7989 +#: sha1-name.c:924

7990 +#, c-format

7991 +msgid "log for '%.*s' only has %d entries"

7992 +msgstr "le journal de '%.*s' n'a que %d entrées"

7993 +

7994 +#: sha1-name.c:1689

7995 +#, c-format

7996 +msgid "path '%s' exists on disk, but not in '%.*s'"

7997 +msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"

7998 +

7999 +#: sha1-name.c:1695

8000 +#, c-format

8001 +msgid ""

8002 +"path '%s' exists, but not '%s'\n"

8003 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

8004 +msgstr ""

8005 +"le chemin '%s' existe, mais pas '%s'\n"

8006 +"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'"

8007 +

8008 +#: sha1-name.c:1704

8009 +#, c-format

8010 +msgid "path '%s' does not exist in '%.*s'"

8011 +msgstr "le chemin '%s' n'existe pas dnas '%.*s'"

8012 +

8013 +#: sha1-name.c:1732

8014 +#, c-format

8015 +msgid ""

8016 +"path '%s' is in the index, but not at stage %d\n"

8017 +"hint: Did you mean ':%d:%s'?"

8018 +msgstr ""

8019 +"le chemin '%s' est dans l'index, mais pas à l'étape %d\n"

8020 +"conseil : vous vouliez peut-être dire ':%d:%s' ?"

8021 +

8022 +#: sha1-name.c:1748

8023 +#, c-format

8024 +msgid ""

8025 +"path '%s' is in the index, but not '%s'\n"

8026 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

8027 +msgstr ""

8028 +"le chemin '%s' est dans l'index, mais pas '%s'\n"

8029 +"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s'"

8030 +

8031 +#: sha1-name.c:1756

8032 +#, c-format

8033 +msgid "path '%s' exists on disk, but not in the index"

8034 +msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"

8035 +

8036 +#: sha1-name.c:1758

8037 +#, c-format

8038 +msgid "path '%s' does not exist (neither on disk nor in the index)"

8039 +msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"

8040 +

8041 +#: sha1-name.c:1771

8042 +msgid "relative path syntax can't be used outside working tree"

8043 +msgstr "la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de travail"

8044 +

8045 +#: sha1-name.c:1909

8046 +#, c-format

8047 +msgid "invalid object name '%.*s'."

8048 +msgstr "nom d'objet invalide : '%.*s'."

8049 +

8050 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

7729 -#: strbuf.c:822

8051 +#: strbuf.c:837

8052 #, c-format

8053 msgid "%u.%2.2u GiB"

8054 msgstr "%u.%2.2u Gio"

8055

8056 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

7735 -#: strbuf.c:824

8057 +#: strbuf.c:839

8058 #, c-format

8059 msgid "%u.%2.2u GiB/s"

8060 msgstr "%u.%2.2u Gio/s"

8061

8062 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

7741 -#: strbuf.c:832

8063 +#: strbuf.c:847

8064 #, c-format

8065 msgid "%u.%2.2u MiB"

8066 msgstr "%u.%2.2u Mio"

8067

8068 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

7747 -#: strbuf.c:834

8069 +#: strbuf.c:849

8070 #, c-format

8071 msgid "%u.%2.2u MiB/s"

8072 msgstr "%u.%2.2u Mio/s"

8073

8074 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

7753 -#: strbuf.c:841

8075 +#: strbuf.c:856

8076 #, c-format

8077 msgid "%u.%2.2u KiB"

8078 msgstr "%u.%2.2u Kio"

8079

8080 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

7759 -#: strbuf.c:843

8081 +#: strbuf.c:858

8082 #, c-format

8083 msgid "%u.%2.2u KiB/s"

8084 msgstr "%u.%2.2u Kio/s"

8085

8086 #. TRANSLATORS: IEC 80000-13:2008 byte

7765 -#: strbuf.c:849

8087 +#: strbuf.c:864

8088 #, c-format

8089 msgid "%u byte"

8090 msgid_plural "%u bytes"

@@ -7770,14 +8092,14 @@ msgstr[0] "%u octet"

8092 msgstr[1] "%u octets"

8093

8094 #. TRANSLATORS: IEC 80000-13:2008 byte/second

7773 -#: strbuf.c:851

8095 +#: strbuf.c:866

8096 #, c-format

8097 msgid "%u byte/s"

8098 msgid_plural "%u bytes/s"

8099 msgstr[0] "%u octet/s"

8100 msgstr[1] "%u octets/s"

8101

7780 -#: strbuf.c:1149

8102 +#: strbuf.c:1164

8103 #, c-format

8104 msgid "could not edit '%s'"

8105 msgstr "impossible d'éditer '%s'"

@@ -7813,56 +8135,125 @@ msgstr "dans le sous-module '%s' non populé"

8135 msgid "Pathspec '%s' is in submodule '%.*s'"

8136 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

8137

8138 +#: submodule.c:434

8139 +#, c-format

8140 +msgid "bad --ignore-submodules argument: %s"

8141 +msgstr "mauvais argument --ignore-submodules : %s"

8142 +

8143 +#: submodule.c:815

8144 +#, c-format

8145 +msgid ""

8146 +"Submodule in commit %s at path: '%s' collides with a submodule named the "

8147 +"same. Skipping it."

8148 +msgstr "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un sous-module du même nom. Ignoré."

8149 +

8150 #: submodule.c:910

8151 #, c-format

8152 msgid "submodule entry '%s' (%s) is a %s, not a commit"

8153 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

8154

7821 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

8155 +#: submodule.c:995

8156 +#, c-format

8157 +msgid ""

8158 +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

8159 +"submodule %s"

8160 +msgstr "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n 1' dans le sous-module %s"

8161 +

8162 +#: submodule.c:1118

8163 +#, c-format

8164 +msgid "process for submodule '%s' failed"

8165 +msgstr "le processus pour le sous-module '%s' a échoué"

8166 +

8167 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045

8168 msgid "Failed to resolve HEAD as a valid ref."

8169 msgstr "Échec de résolution de HEAD comme référence valide."

8170

7825 -#: submodule.c:1481

8171 +#: submodule.c:1158

8172 +#, c-format

8173 +msgid "Pushing submodule '%s'\n"

8174 +msgstr "Poussée du sous-module '%s'\n"

8175 +

8176 +#: submodule.c:1161

8177 +#, c-format

8178 +msgid "Unable to push submodule '%s'\n"

8179 +msgstr "Impossible de pousser le sous-module '%s'\n"

8180 +

8181 +#: submodule.c:1453

8182 +#, c-format

8183 +msgid "Fetching submodule %s%s\n"

8184 +msgstr "Récupération du sous-module %s%s\n"

8185 +

8186 +#: submodule.c:1483

8187 #, c-format

7827 -msgid "Could not access submodule '%s'"

7828 -msgstr "Impossible d'accéder au sous-module '%s'"

8188 +msgid "Could not access submodule '%s'\n"

8189 +msgstr "Impossible d'accéder au sous-module '%s'\n"

8190

7830 -#: submodule.c:1651

8191 +#: submodule.c:1637

8192 +#, c-format

8193 +msgid ""

8194 +"Errors during submodule fetch:\n"

8195 +"%s"

8196 +msgstr ""

8197 +"Erreurs pendant la récupération du sous-module :\n"

8198 +"%s"

8199 +

8200 +#: submodule.c:1662

8201 #, c-format

8202 msgid "'%s' not recognized as a git repository"

8203 msgstr "'%s' n'est pas reconnu comme dépôt git"

8204

7835 -#: submodule.c:1789

8205 +#: submodule.c:1679

8206 +#, c-format

8207 +msgid "Could not run 'git status --porcelain=2' in submodule %s"

8208 +msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"

8209 +

8210 +#: submodule.c:1720

8211 +#, c-format

8212 +msgid "'git status --porcelain=2' failed in submodule %s"

8213 +msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"

8214 +

8215 +#: submodule.c:1800

8216 #, c-format

8217 msgid "could not start 'git status' in submodule '%s'"

8218 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

8219

7840 -#: submodule.c:1802

8220 +#: submodule.c:1813

8221 #, c-format

8222 msgid "could not run 'git status' in submodule '%s'"

8223 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

8224

7845 -#: submodule.c:1817

8225 +#: submodule.c:1828

8226 #, c-format

8227 msgid "Could not unset core.worktree setting in submodule '%s'"

8228 msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"

8229

7850 -#: submodule.c:1907

8230 +#: submodule.c:1855 submodule.c:2165

8231 +#, c-format

8232 +msgid "could not recurse into submodule '%s'"

8233 +msgstr "récursion impossible dans le sous-module '%s'"

8234 +

8235 +#: submodule.c:1876

8236 +msgid "could not reset submodule index"

8237 +msgstr "impossible de réinitialiser l'index du sous-module"

8238 +

8239 +#: submodule.c:1918

8240 #, c-format

8241 msgid "submodule '%s' has dirty index"

8242 msgstr "le sous-module '%s' a un index sale"

8243

7855 -#: submodule.c:1959

8244 +#: submodule.c:1970

8245 #, c-format

l10n: fr v2.26.0 rnd1