02cc663a76 · matheusbsbs/matheus-bagliano

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

76 msgstr ""

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

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

79 -"POT-Creation-Date: 2020-10-10 09:32+0800\n"

80 -"PO-Revision-Date: 2020-10-27 22:01+0100\n"

79 +"POT-Creation-Date: 2020-12-15 16:27+0800\n"

80 +"PO-Revision-Date: 2020-12-16 22:15+0100\n"

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

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

83 "Language: fr\n"

@@ -87,203 +87,203 @@ msgstr ""

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

88 "X-Generator: Poedit 2.2.3\n"

89

90 -#: add-interactive.c:368

90 +#: add-interactive.c:376

91 #, c-format

92 msgid "Huh (%s)?"

93 msgstr "Hein (%s) ?"

94

95 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

96 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

97 -#: builtin/rebase.c:1944

95 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

96 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

97 +#: builtin/rebase.c:1955

98 msgid "could not read index"

99 msgstr "impossible de lire l'index"

100

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

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

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

103 msgid "binary"

104 msgstr "binaire"

105

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

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

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

108 msgid "nothing"

109 msgstr "rien"

110

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

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

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

113 msgid "unchanged"

114 msgstr "inchangé"

115

116 -#: add-interactive.c:672 git-add--interactive.perl:643

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

117 msgid "Update"

118 msgstr "Mise à jour"

119

120 -#: add-interactive.c:689 add-interactive.c:877

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

121 #, c-format

122 msgid "could not stage '%s'"

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

124

125 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

125 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

126 msgid "could not write index"

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

128

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

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

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:716 git-add--interactive.perl:678

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

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:721 apply.c:4127 builtin/checkout.c:295

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

142 #: builtin/reset.c:145

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:751 git-add--interactive.perl:655

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

148 msgid "Revert"

149 msgstr "Inverser"

150

151 -#: add-interactive.c:767

151 +#: add-interactive.c:775

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

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

154

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

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

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:856 git-add--interactive.perl:695

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

163 #, c-format

164 msgid "No untracked files.\n"

165 msgstr "Aucun Fichier non suivi.\n"

166

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

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

168 msgid "Add untracked"

169 msgstr "Ajouter un fichier non-suivi"

170

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

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

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:917

178 +#: add-interactive.c:925

179 #, c-format

180 msgid "ignoring unmerged: %s"

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

182

183 -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

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

184 #, c-format

185 msgid "Only binary files changed.\n"

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

187

188 -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

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

189 #, c-format

190 msgid "No changes.\n"

191 msgstr "Aucune modification.\n"

192

193 -#: add-interactive.c:935 git-add--interactive.perl:1381

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

194 msgid "Patch update"

195 msgstr "Mise à jour par patch"

196

197 -#: add-interactive.c:974 git-add--interactive.perl:1794

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

198 msgid "Review diff"

199 msgstr "Réviser la différence"

200

201 -#: add-interactive.c:1002

201 +#: add-interactive.c:1010

202 msgid "show paths with changes"

203 msgstr "afficher les chemins comprenant des modifications"

204

205 -#: add-interactive.c:1004

205 +#: add-interactive.c:1012

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

207 msgstr ""

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

209

210 -#: add-interactive.c:1006

210 +#: add-interactive.c:1014

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

214 -#: add-interactive.c:1008

214 +#: add-interactive.c:1016

215 msgid "pick hunks and update selectively"

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

217

218 -#: add-interactive.c:1010

218 +#: add-interactive.c:1018

219 msgid "view diff between HEAD and index"

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

221

222 -#: add-interactive.c:1012

222 +#: add-interactive.c:1020

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

224 msgstr ""

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

226 "indexées"

227

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

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

229 msgid "Prompt help:"

230 msgstr "Aide :"

231

232 -#: add-interactive.c:1022

232 +#: add-interactive.c:1030

233 msgid "select a single item"

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

235

236 -#: add-interactive.c:1024

236 +#: add-interactive.c:1032

237 msgid "select a range of items"

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

239

240 -#: add-interactive.c:1026

240 +#: add-interactive.c:1034

241 msgid "select multiple ranges"

242 msgstr "sélectionner plusieurs plages"

243

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

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

245 msgid "select item based on unique prefix"

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

247

248 -#: add-interactive.c:1030

248 +#: add-interactive.c:1038

249 msgid "unselect specified items"

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

251

252 -#: add-interactive.c:1032

252 +#: add-interactive.c:1040

253 msgid "choose all items"

254 msgstr "choisir tous les éléments"

255

256 -#: add-interactive.c:1034

256 +#: add-interactive.c:1042

257 msgid "(empty) finish selecting"

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

259

260 -#: add-interactive.c:1071

260 +#: add-interactive.c:1079

261 msgid "select a numbered item"

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

263

264 -#: add-interactive.c:1075

264 +#: add-interactive.c:1083

265 msgid "(empty) select nothing"

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

267

268 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891

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

269 msgid "*** Commands ***"

270 msgstr "*** Commandes ***"

271

272 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888

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

273 msgid "What now"

274 msgstr "Et maintenant ?"

275

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

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

277 msgid "staged"

278 msgstr "indexé"

279

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

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

281 msgid "unstaged"

282 msgstr "non-indexé"

283

284 -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

285 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

286 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

284 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257

285 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

286 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

287 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

288 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

289 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

@@ -291,31 +291,31 @@ msgstr "non-indexé"

291 msgid "path"

292 msgstr "chemin"

293

294 -#: add-interactive.c:1143

294 +#: add-interactive.c:1151

295 msgid "could not refresh index"

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

297

298 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805

298 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

299 #, c-format

300 msgid "Bye.\n"

301 msgstr "Au revoir.\n"

302

303 -#: add-patch.c:34 git-add--interactive.perl:1433

303 +#: add-patch.c:34 git-add--interactive.perl:1431

304 #, c-format, perl-format

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

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

307

308 -#: add-patch.c:35 git-add--interactive.perl:1434

308 +#: add-patch.c:35 git-add--interactive.perl:1432

309 #, c-format, perl-format

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

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

312

313 -#: add-patch.c:36 git-add--interactive.perl:1435

313 +#: add-patch.c:36 git-add--interactive.perl:1433

314 #, c-format, perl-format

315 msgid "Stage addition [y,n,q,a,d%s,?]? "

316 msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "

317

318 -#: add-patch.c:37 git-add--interactive.perl:1436

318 +#: add-patch.c:37 git-add--interactive.perl:1434

319 #, c-format, perl-format

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

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

@@ -342,22 +342,22 @@ msgstr ""

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

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

344

345 -#: add-patch.c:56 git-add--interactive.perl:1439

345 +#: add-patch.c:56 git-add--interactive.perl:1437

346 #, c-format, perl-format

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

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

349

350 -#: add-patch.c:57 git-add--interactive.perl:1440

350 +#: add-patch.c:57 git-add--interactive.perl:1438

351 #, c-format, perl-format

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

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

354

355 -#: add-patch.c:58 git-add--interactive.perl:1441

355 +#: add-patch.c:58 git-add--interactive.perl:1439

356 #, c-format, perl-format

357 msgid "Stash addition [y,n,q,a,d%s,?]? "

358 msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "

359

360 -#: add-patch.c:59 git-add--interactive.perl:1442

360 +#: add-patch.c:59 git-add--interactive.perl:1440

361 #, c-format, perl-format

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

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

@@ -384,22 +384,22 @@ msgstr ""

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

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

386

387 -#: add-patch.c:80 git-add--interactive.perl:1445

387 +#: add-patch.c:80 git-add--interactive.perl:1443

388 #, c-format, perl-format

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

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

391

392 -#: add-patch.c:81 git-add--interactive.perl:1446

392 +#: add-patch.c:81 git-add--interactive.perl:1444

393 #, c-format, perl-format

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

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

396

397 -#: add-patch.c:82 git-add--interactive.perl:1447

397 +#: add-patch.c:82 git-add--interactive.perl:1445

398 #, c-format, perl-format

399 msgid "Unstage addition [y,n,q,a,d%s,?]? "

400 msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "

401

402 -#: add-patch.c:83 git-add--interactive.perl:1448

402 +#: add-patch.c:83 git-add--interactive.perl:1446

403 #, c-format, perl-format

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

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

@@ -426,22 +426,22 @@ msgstr ""

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

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

428

429 -#: add-patch.c:103 git-add--interactive.perl:1451

429 +#: add-patch.c:103 git-add--interactive.perl:1449

430 #, c-format, perl-format

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

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

433

434 -#: add-patch.c:104 git-add--interactive.perl:1452

434 +#: add-patch.c:104 git-add--interactive.perl:1450

435 #, c-format, perl-format

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

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

438

439 -#: add-patch.c:105 git-add--interactive.perl:1453

439 +#: add-patch.c:105 git-add--interactive.perl:1451

440 #, c-format, perl-format

441 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

442 msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "

443

444 -#: add-patch.c:106 git-add--interactive.perl:1454

444 +#: add-patch.c:106 git-add--interactive.perl:1452

445 #, c-format, perl-format

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

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

@@ -468,26 +468,26 @@ msgstr ""

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

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

470

471 -#: add-patch.c:126 git-add--interactive.perl:1457

472 -#: git-add--interactive.perl:1475

471 +#: add-patch.c:126 git-add--interactive.perl:1455

472 +#: git-add--interactive.perl:1473

473 #, c-format, perl-format

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

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

476

477 -#: add-patch.c:127 git-add--interactive.perl:1458

478 -#: git-add--interactive.perl:1476

477 +#: add-patch.c:127 git-add--interactive.perl:1456

478 +#: git-add--interactive.perl:1474

479 #, c-format, perl-format

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

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

482

483 -#: add-patch.c:128 git-add--interactive.perl:1459

484 -#: git-add--interactive.perl:1477

483 +#: add-patch.c:128 git-add--interactive.perl:1457

484 +#: git-add--interactive.perl:1475

485 #, c-format, perl-format

486 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

487 msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "

488

489 -#: add-patch.c:129 git-add--interactive.perl:1460

490 -#: git-add--interactive.perl:1478

489 +#: add-patch.c:129 git-add--interactive.perl:1458

490 +#: git-add--interactive.perl:1476

491 #, c-format, perl-format

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

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

@@ -514,23 +514,23 @@ msgstr ""

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

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

516

517 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

517 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

518 #, c-format, perl-format

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

520 msgstr ""

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

522

523 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

523 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

524 #, c-format, perl-format

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

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

527

528 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

528 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

529 #, c-format, perl-format

530 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

531 msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "

532

533 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

533 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

534 #, c-format, perl-format

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

536 msgstr ""

@@ -550,27 +550,27 @@ msgstr ""

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

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

552

553 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

553 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

554 #, c-format, perl-format

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

556 msgstr ""

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

558 "%s,?] ? "

559

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

560 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

561 #, c-format, perl-format

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

563 msgstr ""

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

565 "%s,?] ? "

566

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

567 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

568 #, c-format, perl-format

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

570 msgstr ""

571 "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "

572

573 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

573 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

574 #, c-format, perl-format

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

576 msgstr ""

@@ -639,7 +639,7 @@ msgstr ""

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

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

641

642 -#: add-patch.c:785

642 +#: add-patch.c:790

643 #, c-format

644 msgid ""

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

@@ -648,7 +648,7 @@ msgstr ""

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

649 "%.*s"

650

651 -#: add-patch.c:800

651 +#: add-patch.c:805

652 #, c-format

653 msgid ""

654 "hunks do not overlap:\n"

@@ -661,12 +661,12 @@ msgstr ""

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

662 "%.*s"

663

664 -#: add-patch.c:1076 git-add--interactive.perl:1117

664 +#: add-patch.c:1081 git-add--interactive.perl:1115

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

666 msgstr ""

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

668

669 -#: add-patch.c:1080

669 +#: add-patch.c:1085

670 #, c-format

671 msgid ""

672 "---\n"

@@ -680,7 +680,7 @@ msgstr ""

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

681

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

683 -#: add-patch.c:1094 git-add--interactive.perl:1131

683 +#: add-patch.c:1099 git-add--interactive.perl:1129

684 msgid ""

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

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

@@ -690,11 +690,11 @@ msgstr ""

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

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

692

693 -#: add-patch.c:1127

693 +#: add-patch.c:1132

694 msgid "could not parse hunk header"

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

696

697 -#: add-patch.c:1172

697 +#: add-patch.c:1177

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

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

700

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

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

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

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

713 -#: add-patch.c:1241 git-add--interactive.perl:1244

713 +#: add-patch.c:1246 git-add--interactive.perl:1242

714 msgid ""

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

716 msgstr ""

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

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

719

720 -#: add-patch.c:1284

720 +#: add-patch.c:1289

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

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

723

724 -#: add-patch.c:1285 git-add--interactive.perl:1348

724 +#: add-patch.c:1290 git-add--interactive.perl:1346

725 msgid "Apply them to the worktree anyway? "

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

727

728 -#: add-patch.c:1292 git-add--interactive.perl:1351

728 +#: add-patch.c:1297 git-add--interactive.perl:1349

729 msgid "Nothing was applied.\n"

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

731

732 -#: add-patch.c:1349

732 +#: add-patch.c:1354

733 msgid ""

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

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

@@ -751,73 +751,73 @@ msgstr ""

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

752 "? - afficher l'aide\n"

753

754 -#: add-patch.c:1511 add-patch.c:1521

754 +#: add-patch.c:1516 add-patch.c:1526

755 msgid "No previous hunk"

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

757

758 -#: add-patch.c:1516 add-patch.c:1526

758 +#: add-patch.c:1521 add-patch.c:1531

759 msgid "No next hunk"

760 msgstr "Pas de section suivante"

761

762 -#: add-patch.c:1532

762 +#: add-patch.c:1537

763 msgid "No other hunks to goto"

764 msgstr "Aucune autre section à atteindre"

765

766 -#: add-patch.c:1543 git-add--interactive.perl:1608

766 +#: add-patch.c:1548 git-add--interactive.perl:1606

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

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

769

770 -#: add-patch.c:1544 git-add--interactive.perl:1610

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

771 msgid "go to which hunk? "

772 msgstr "aller à quelle section ? "

773

774 -#: add-patch.c:1555

774 +#: add-patch.c:1560

775 #, c-format

776 msgid "Invalid number: '%s'"

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

778

779 -#: add-patch.c:1560

779 +#: add-patch.c:1565

780 #, c-format

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

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

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

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

785

786 -#: add-patch.c:1569

786 +#: add-patch.c:1574

787 msgid "No other hunks to search"

788 msgstr "aucune autre section à rechercher"

789

790 -#: add-patch.c:1575 git-add--interactive.perl:1663

790 +#: add-patch.c:1580 git-add--interactive.perl:1661

791 msgid "search for regex? "

792 msgstr "rechercher la regex ? "

793

794 -#: add-patch.c:1590

794 +#: add-patch.c:1595

795 #, c-format

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

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

798

799 -#: add-patch.c:1607

799 +#: add-patch.c:1612

800 msgid "No hunk matches the given pattern"

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

802

803 -#: add-patch.c:1614

803 +#: add-patch.c:1619

804 msgid "Sorry, cannot split this hunk"

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

806

807 -#: add-patch.c:1618

807 +#: add-patch.c:1623

808 #, c-format

809 msgid "Split into %d hunks."

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

811

812 -#: add-patch.c:1622

812 +#: add-patch.c:1627

813 msgid "Sorry, cannot edit this hunk"

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

815

816 -#: add-patch.c:1674

816 +#: add-patch.c:1679

817 msgid "'git apply' failed"

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

819

820 -#: advice.c:140

820 +#: advice.c:143

821 #, c-format

822 msgid ""

823 "\n"

@@ -826,37 +826,37 @@ msgstr ""

826 "\n"

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

828

829 -#: advice.c:156

829 +#: advice.c:159

830 #, c-format

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

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

833

834 -#: advice.c:247

834 +#: advice.c:250

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

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

837

838 -#: advice.c:249

838 +#: advice.c:252

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

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

841

842 -#: advice.c:251

842 +#: advice.c:254

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

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

845

846 -#: advice.c:253

846 +#: advice.c:256

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

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

849

850 -#: advice.c:255

850 +#: advice.c:258

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

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

853

854 -#: advice.c:257

854 +#: advice.c:260

855 #, c-format

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

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

858

859 -#: advice.c:265

859 +#: advice.c:268

860 msgid ""

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

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

@@ -864,23 +864,23 @@ msgstr ""

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

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

866

867 -#: advice.c:273

867 +#: advice.c:276

868 msgid "Exiting because of an unresolved conflict."

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

870

871 -#: advice.c:278 builtin/merge.c:1349

871 +#: advice.c:281 builtin/merge.c:1369

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

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

874

875 -#: advice.c:280

875 +#: advice.c:283

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

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

878

879 -#: advice.c:281

879 +#: advice.c:284

880 msgid "Exiting because of unfinished merge."

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

882

883 -#: advice.c:287

883 +#: advice.c:290

884 #, c-format

885 msgid ""

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

@@ -1182,7 +1182,7 @@ msgstr "le patch a échoué : %s:%ld"

1182 msgid "cannot checkout %s"

1183 msgstr "extraction de %s impossible"

1184

1185 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

1185 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

1186 #, c-format

1187 msgid "failed to read %s"

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

@@ -1347,7 +1347,7 @@ msgstr ""

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

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

1349

1350 -#: apply.c:4376 builtin/bisect--helper.c:537

1350 +#: apply.c:4376 builtin/bisect--helper.c:524

1351 #, c-format

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

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

@@ -1398,176 +1398,176 @@ msgstr "Section n°%d appliquée proprement."

1398 msgid "Rejected hunk #%d."

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

1400

1401 -#: apply.c:4715

1401 +#: apply.c:4720

1402 #, c-format

1403 msgid "Skipped patch '%s'."

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

1405

1406 -#: apply.c:4723

1406 +#: apply.c:4728

1407 msgid "unrecognized input"

1408 msgstr "entrée non reconnue"

1409

1410 -#: apply.c:4743

1410 +#: apply.c:4748

1411 msgid "unable to read index file"

1412 msgstr "lecture du fichier d'index impossible"

1413

1414 -#: apply.c:4900

1414 +#: apply.c:4905

1415 #, c-format

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

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

1418

1419 -#: apply.c:4927

1419 +#: apply.c:4932

1420 #, c-format

1421 msgid "squelched %d whitespace error"

1422 msgid_plural "squelched %d whitespace errors"

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

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

1425

1426 -#: apply.c:4933 apply.c:4948

1426 +#: apply.c:4938 apply.c:4953

1427 #, c-format

1428 msgid "%d line adds whitespace errors."

1429 msgid_plural "%d lines add whitespace errors."

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

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

1432

1433 -#: apply.c:4941

1433 +#: apply.c:4946

1434 #, c-format

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

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

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

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

1439

1440 -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1440 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1441 msgid "Unable to write new index file"

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

1443

1444 -#: apply.c:4985

1444 +#: apply.c:4990

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

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

1447

1448 -#: apply.c:4988

1448 +#: apply.c:4993

1449 msgid "apply changes matching the given path"

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

1451

1452 -#: apply.c:4990 builtin/am.c:2279

1452 +#: apply.c:4995 builtin/am.c:2266

1453 msgid "num"

1454 msgstr "num"

1455

1456 -#: apply.c:4991

1456 +#: apply.c:4996

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

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

1459

1460 -#: apply.c:4994

1460 +#: apply.c:4999

1461 msgid "ignore additions made by the patch"

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

1463

1464 -#: apply.c:4996

1464 +#: apply.c:5001

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

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

1467

1468 -#: apply.c:5000

1468 +#: apply.c:5005

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

1470 msgstr ""

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

1472

1473 -#: apply.c:5002

1473 +#: apply.c:5007

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

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

1476

1477 -#: apply.c:5004

1477 +#: apply.c:5009

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

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

1480

1481 -#: apply.c:5006

1481 +#: apply.c:5011

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

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

1484

1485 -#: apply.c:5008

1485 +#: apply.c:5013

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

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

1488

1489 -#: apply.c:5010

1489 +#: apply.c:5015

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

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

1492

1493 -#: apply.c:5012

1493 +#: apply.c:5017

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

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

1496

1497 -#: apply.c:5015

1497 +#: apply.c:5020

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

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

1500

1501 -#: apply.c:5017

1501 +#: apply.c:5022

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

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

1504

1505 -#: apply.c:5019

1505 +#: apply.c:5024

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

1507 msgstr ""

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

1509

1510 -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1510 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525

1511 msgid "paths are separated with NUL character"

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

1513

1514 -#: apply.c:5024

1514 +#: apply.c:5029

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

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

1517

1518 -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

1518 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98

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

1520 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1520 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1521 msgid "action"

1522 msgstr "action"

1523

1524 -#: apply.c:5026

1524 +#: apply.c:5031

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

1526 msgstr ""

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

1528 "d'espace"

1529

1530 -#: apply.c:5029 apply.c:5032

1530 +#: apply.c:5034 apply.c:5037

1531 msgid "ignore changes in whitespace when finding context"

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

1533

1534 -#: apply.c:5035

1534 +#: apply.c:5040

1535 msgid "apply the patch in reverse"

1536 msgstr "appliquer le patch en sens inverse"

1537

1538 -#: apply.c:5037

1538 +#: apply.c:5042

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

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

1541

1542 -#: apply.c:5039

1542 +#: apply.c:5044

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

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

1545

1546 -#: apply.c:5041

1546 +#: apply.c:5046

1547 msgid "allow overlapping hunks"

1548 msgstr "accepter les recouvrements de sections"

1549

1550 -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1550 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22

1551 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1552 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1552 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1553 msgid "be verbose"

1554 msgstr "mode verbeux"

1555

1556 -#: apply.c:5044

1556 +#: apply.c:5049

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

1558 msgstr ""

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

1560 "fichier"

1561

1562 -#: apply.c:5047

1562 +#: apply.c:5052

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

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

1565

1566 -#: apply.c:5049 builtin/am.c:2267

1566 +#: apply.c:5054 builtin/am.c:2254

1567 msgid "root"

1568 msgstr "racine"

1569

1570 -#: apply.c:5050

1570 +#: apply.c:5055

1571 msgid "prepend <root> to all filenames"

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

1573

@@ -1581,16 +1581,16 @@ msgstr "impossible de transmettre le blob %s en flux"

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

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

1583

1584 -#: archive-tar.c:449

1584 +#: archive-tar.c:450

1585 #, c-format

1586 msgid "unable to start '%s' filter"

1587 msgstr "impossible de démarrer le filtre '%s'"

1588

1589 -#: archive-tar.c:452

1589 +#: archive-tar.c:453

1590 msgid "unable to redirect descriptor"

1591 msgstr "impossible de rediriger un descripteur"

1592

1593 -#: archive-tar.c:459

1593 +#: archive-tar.c:460

1594 #, c-format

1595 msgid "'%s' filter reported error"

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

@@ -1639,9 +1639,9 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

1639 msgid "cannot read %s"

1640 msgstr "impossible de lire %s"

1641

1642 -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1643 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1644 -#: builtin/merge.c:1124

1642 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1643 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1644 +#: builtin/merge.c:1138

1645 #, c-format

1646 msgid "could not read '%s'"

1647 msgstr "impossible de lire '%s'"

@@ -1680,119 +1680,111 @@ msgstr "Fichier non trouvé : %s"

1680 msgid "Not a regular file: %s"

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

1682

1683 -#: archive.c:553

1683 +#: archive.c:555

1684 msgid "fmt"

1685 msgstr "fmt"

1686

1687 -#: archive.c:553

1687 +#: archive.c:555

1688 msgid "archive format"

1689 msgstr "format d'archive"

1690

1691 -#: archive.c:554 builtin/log.c:1760

1691 +#: archive.c:556 builtin/log.c:1765

1692 msgid "prefix"

1693 msgstr "préfixe"

1694

1695 -#: archive.c:555

1695 +#: archive.c:557

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

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

1698

1699 -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1700 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1699 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1700 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1701 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1702 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1702 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105

1703 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1704 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1705 msgid "file"

1706 msgstr "fichier"

1707

1708 -#: archive.c:557

1708 +#: archive.c:559

1709 msgid "add untracked file to archive"

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

1711

1712 -#: archive.c:560 builtin/archive.c:90

1712 +#: archive.c:562 builtin/archive.c:90

1713 msgid "write the archive to this file"

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

1715

1716 -#: archive.c:562

1716 +#: archive.c:564

1717 msgid "read .gitattributes in working directory"

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

1719

1720 -#: archive.c:563

1720 +#: archive.c:565

1721 msgid "report archived files on stderr"

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

1723

1724 -#: archive.c:564

1725 -msgid "store only"

1726 -msgstr "stockage seulement"

1727 -

1728 -#: archive.c:565

1729 -msgid "compress faster"

1730 -msgstr "compression rapide"

1731 -

1732 -#: archive.c:573

1733 -msgid "compress better"

1734 -msgstr "compression efficace"

1724 +#: archive.c:567

1725 +msgid "set compression level"

1726 +msgstr "régler le niveau de compression"

1727

1736 -#: archive.c:576

1728 +#: archive.c:570

1729 msgid "list supported archive formats"

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

1731

1740 -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1732 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1733 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1734 msgid "repo"

1735 msgstr "dépôt"

1736

1745 -#: archive.c:579 builtin/archive.c:92

1737 +#: archive.c:573 builtin/archive.c:92

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

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

1740

1749 -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1741 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1742 #: builtin/notes.c:498

1743 msgid "command"

1744 msgstr "commande"

1745

1754 -#: archive.c:581 builtin/archive.c:94

1746 +#: archive.c:575 builtin/archive.c:94

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

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

1749

1758 -#: archive.c:588

1750 +#: archive.c:582

1751 msgid "Unexpected option --remote"

1752 msgstr "Option --remote inattendue"

1753

1762 -#: archive.c:590

1754 +#: archive.c:584

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

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

1757

1766 -#: archive.c:592

1758 +#: archive.c:586

1759 msgid "Unexpected option --output"

1760 msgstr "Option --output inattendue"

1761

1770 -#: archive.c:594

1762 +#: archive.c:588

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

1764 msgstr ""

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

1766

1775 -#: archive.c:616

1767 +#: archive.c:610

1768 #, c-format

1769 msgid "Unknown archive format '%s'"

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

1771

1780 -#: archive.c:623

1772 +#: archive.c:619

1773 #, c-format

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

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

1776

1785 -#: attr.c:212

1777 +#: attr.c:202

1778 #, c-format

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

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

1781

1790 -#: attr.c:369

1782 +#: attr.c:359

1783 #, c-format

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

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

1786

1795 -#: attr.c:409

1787 +#: attr.c:399

1788 msgid ""

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

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

@@ -1800,22 +1792,22 @@ msgstr ""

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

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

1794

1803 -#: bisect.c:476

1795 +#: bisect.c:489

1796 #, c-format

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

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

1799

1808 -#: bisect.c:686

1800 +#: bisect.c:699

1801 #, c-format

1802 msgid "We cannot bisect more!\n"

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

1804

1813 -#: bisect.c:753

1805 +#: bisect.c:766

1806 #, c-format

1807 msgid "Not a valid commit name %s"

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

1809

1818 -#: bisect.c:778

1810 +#: bisect.c:791

1811 #, c-format

1812 msgid ""

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

@@ -1824,7 +1816,7 @@ msgstr ""

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

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

1818

1827 -#: bisect.c:783

1819 +#: bisect.c:796

1820 #, c-format

1821 msgid ""

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

@@ -1833,7 +1825,7 @@ msgstr ""

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

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

1827

1836 -#: bisect.c:788

1828 +#: bisect.c:801

1829 #, c-format

1830 msgid ""

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

@@ -1842,7 +1834,7 @@ msgstr ""

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

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

1836

1845 -#: bisect.c:796

1837 +#: bisect.c:809

1838 #, c-format

1839 msgid ""

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

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

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

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

1847

1856 -#: bisect.c:809

1848 +#: bisect.c:822

1849 #, c-format

1850 msgid ""

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

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

1857 "et %s.\n"

1858 "On continue tout de même."

1859

1868 -#: bisect.c:848

1860 +#: bisect.c:861

1861 #, c-format

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

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

1864

1873 -#: bisect.c:898

1865 +#: bisect.c:911

1866 #, c-format

1867 msgid "a %s revision is needed"

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

1869

1878 -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1870 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

1871 #, c-format

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

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

1874

1883 -#: bisect.c:974 builtin/merge.c:150

1875 +#: bisect.c:987 builtin/merge.c:152

1876 #, c-format

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

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

1879

1888 -#: bisect.c:1014

1880 +#: bisect.c:1027

1881 msgid "reading bisect refs failed"

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

1883

1892 -#: bisect.c:1044

1884 +#: bisect.c:1057

1885 #, c-format

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

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

1888

1897 -#: bisect.c:1053

1889 +#: bisect.c:1066

1890 #, c-format

1891 msgid ""

1892 "No testable commit found.\n"

@@ -1903,7 +1895,7 @@ msgstr ""

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

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

1897

1906 -#: bisect.c:1082

1898 +#: bisect.c:1095

1899 #, c-format

1900 msgid "(roughly %d step)"

1901 msgid_plural "(roughly %d steps)"

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

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

1906 #. steps)" translation.

1907 #.

1916 -#: bisect.c:1088

1908 +#: bisect.c:1101

1909 #, c-format

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

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

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

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

1914

1923 -#: blame.c:2778

1915 +#: blame.c:2777

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

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

1918

1927 -#: blame.c:2792

1919 +#: blame.c:2791

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

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

1922

1931 -#: blame.c:2813

1923 +#: blame.c:2812

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

1925 msgstr ""

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

1927 "dernier commit"

1928

1937 -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1938 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1939 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1940 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1941 -#: builtin/shortlog.c:320

1929 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1930 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1931 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1932 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1933 +#: builtin/shortlog.c:267

1934 msgid "revision walk setup failed"

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

1936

1945 -#: blame.c:2840

1937 +#: blame.c:2839

1938 msgid ""

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

1940 msgstr ""

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

1942 "premier parent"

1943

1952 -#: blame.c:2851

1944 +#: blame.c:2850

1945 #, c-format

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

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

1948

1957 -#: blame.c:2862

1949 +#: blame.c:2861

1950 #, c-format

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

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

@@ -2127,7 +2119,7 @@ msgstr "'%s' ne semble pas être un fichier colis v2 our v3"

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

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

2121

2130 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

2122 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

2123 #: builtin/commit.c:814

2124 #, c-format

2125 msgid "could not open '%s'"

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

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

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

2184

2193 -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

2185 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

2186 #, c-format

2187 msgid "unrecognized argument: %s"

2188 msgstr "argument non reconnu : %s"

@@ -2213,7 +2205,7 @@ msgstr "l'index de groupe a disparu"

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

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

2207

2216 -#: commit-graph.c:188 midx.c:46

2208 +#: commit-graph.c:188 midx.c:47

2209 msgid "invalid hash version"

2210 msgstr "version d'empreinte invalide"

2211

@@ -2283,7 +2275,7 @@ msgstr ""

2275 msgid "could not find commit %s"

2276 msgstr "impossible de trouver le commit %s"

2277

2286 -#: commit-graph.c:1042 builtin/am.c:1306

2278 +#: commit-graph.c:1042 builtin/am.c:1292

2279 #, c-format

2280 msgid "unable to parse commit %s"

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

@@ -2351,7 +2343,7 @@ msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"

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

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

2345

2354 -#: commit-graph.c:1720 midx.c:826

2346 +#: commit-graph.c:1720 midx.c:819

2347 #, c-format

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

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

@@ -2388,83 +2380,82 @@ msgstr "impossible de renommer le fichier temporaire de graphe de commits"

2380 msgid "Scanning merged commits"

2381 msgstr "Analyse des commits de fusion"

2382

2391 -#: commit-graph.c:2026

2392 -#, c-format

2393 -msgid "unexpected duplicate commit id %s"

2394 -msgstr "id de commit %s dupliqué inattendu"

2395 -

2396 -#: commit-graph.c:2049

2383 +#: commit-graph.c:2059

2384 msgid "Merging commit-graph"

2385 msgstr "fusion du graphe de commits"

2386

2400 -#: commit-graph.c:2259

2387 +#: commit-graph.c:2165

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

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

2390 +

2391 +#: commit-graph.c:2274

2392 #, c-format

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

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

2395

2405 -#: commit-graph.c:2270

2396 +#: commit-graph.c:2285

2397 msgid "too many commits to write graph"

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

2399

2409 -#: commit-graph.c:2363

2400 +#: commit-graph.c:2378

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

2402 msgstr ""

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

2404 "vraisemblablement corrompu"

2405

2415 -#: commit-graph.c:2373

2406 +#: commit-graph.c:2388

2407 #, c-format

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

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

2410

2420 -#: commit-graph.c:2383 commit-graph.c:2398

2411 +#: commit-graph.c:2398 commit-graph.c:2413

2412 #, c-format

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

2414 msgstr ""

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

2416 "%u != %u"

2417

2427 -#: commit-graph.c:2390

2418 +#: commit-graph.c:2405

2419 #, c-format

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

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

2422

2432 -#: commit-graph.c:2408

2423 +#: commit-graph.c:2423

2424 msgid "Verifying commits in commit graph"

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

2426

2436 -#: commit-graph.c:2423

2427 +#: commit-graph.c:2438

2428 #, c-format

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

2430 msgstr ""

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

2432 "graphe de commit"

2433

2443 -#: commit-graph.c:2430

2434 +#: commit-graph.c:2445

2435 #, c-format

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

2437 msgstr ""

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

2439 "%s"

2440

2450 -#: commit-graph.c:2440

2441 +#: commit-graph.c:2455

2442 #, c-format

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

2444 msgstr ""

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

2446

2456 -#: commit-graph.c:2449

2447 +#: commit-graph.c:2464

2448 #, c-format

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

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

2451

2461 -#: commit-graph.c:2463

2452 +#: commit-graph.c:2478

2453 #, c-format

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

2455 msgstr ""

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

2457

2467 -#: commit-graph.c:2468

2458 +#: commit-graph.c:2483

2459 #, c-format

2460 msgid ""

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

@@ -2472,7 +2463,7 @@ msgstr ""

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

2464 "non-nul ailleurs"

2465

2475 -#: commit-graph.c:2472

2466 +#: commit-graph.c:2487

2467 #, c-format

2468 msgid ""

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

@@ -2480,20 +2471,20 @@ msgstr ""

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

2472 "mais nul ailleurs"

2473

2483 -#: commit-graph.c:2488

2474 +#: commit-graph.c:2503

2475 #, c-format

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

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

2478

2488 -#: commit-graph.c:2494

2479 +#: commit-graph.c:2509

2480 #, c-format

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

2482 msgstr ""

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

2484 "%<PRIuMAX> != %<PRIuMAX>"

2485

2495 -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2496 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2486 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2487 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2488 #, c-format

2489 msgid "could not parse %s"

2490 msgstr "impossible d'analyser %s"

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

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

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

2592

2602 -#: config.c:408 sequencer.c:2547

2593 +#: config.c:408 sequencer.c:2580

2594 #, c-format

2595 msgid "invalid key: %s"

2596 msgstr "clé invalide : %s"

@@ -2803,77 +2794,77 @@ msgid "bad config variable '%s' in file '%s' at line %d"

2794 msgstr ""

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

2796

2806 -#: config.c:2470

2797 +#: config.c:2473

2798 #, c-format

2799 msgid "invalid section name '%s'"

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

2801

2811 -#: config.c:2502

2802 +#: config.c:2505

2803 #, c-format

2804 msgid "%s has multiple values"

2805 msgstr "%s a des valeurs multiples"

2806

2816 -#: config.c:2531

2807 +#: config.c:2534

2808 #, c-format

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

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

2811

2821 -#: config.c:2783 config.c:3107

2812 +#: config.c:2786 config.c:3112

2813 #, c-format

2814 msgid "could not lock config file %s"

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

2816

2826 -#: config.c:2794

2817 +#: config.c:2797

2818 #, c-format

2819 msgid "opening %s"

2820 msgstr "ouverture de %s"

2821

2831 -#: config.c:2829 builtin/config.c:354

2822 +#: config.c:2834 builtin/config.c:361

2823 #, c-format

2824 msgid "invalid pattern: %s"

2825 msgstr "motif invalide : %s"

2826

2836 -#: config.c:2854

2827 +#: config.c:2859

2828 #, c-format

2829 msgid "invalid config file %s"

2830 msgstr "fichier de configuration invalide %s"

2831

2841 -#: config.c:2867 config.c:3120

2832 +#: config.c:2872 config.c:3125

2833 #, c-format

2834 msgid "fstat on %s failed"

2835 msgstr "échec de fstat sur %s"

2836

2846 -#: config.c:2878

2837 +#: config.c:2883

2838 #, c-format

2839 msgid "unable to mmap '%s'"

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

2841

2851 -#: config.c:2887 config.c:3125

2842 +#: config.c:2892 config.c:3130

2843 #, c-format

2844 msgid "chmod on %s failed"

2845 msgstr "échec de chmod sur %s"

2846

2856 -#: config.c:2972 config.c:3222

2847 +#: config.c:2977 config.c:3227

2848 #, c-format

2849 msgid "could not write config file %s"

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

2851

2861 -#: config.c:3006

2852 +#: config.c:3011

2853 #, c-format

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

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

2856

2866 -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2857 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2858 #, c-format

2859 msgid "could not unset '%s'"

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

2861

2871 -#: config.c:3098

2862 +#: config.c:3103

2863 #, c-format

2864 msgid "invalid section name: %s"

2865 msgstr "nom de section invalide : %s"

2866

2876 -#: config.c:3265

2867 +#: config.c:3270

2868 #, c-format

2869 msgid "missing value for '%s'"

2870 msgstr "valeur manquante pour '%s'"

@@ -3319,6 +3310,26 @@ msgstr ""

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

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

3312

3313 +#: diff-lib.c:534

3314 +msgid "--merge-base does not work with ranges"

3315 +msgstr "--merge-base ne fonctionne pas avec des plages"

3316 +

3317 +#: diff-lib.c:536

3318 +msgid "--merge-base only works with commits"

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

3320 +

3321 +#: diff-lib.c:553

3322 +msgid "unable to get HEAD"

3323 +msgstr "impossible d'acquérir HEAD"

3324 +

3325 +#: diff-lib.c:560

3326 +msgid "no merge base found"

3327 +msgstr "aucune base de fusion trouvée"

3328 +

3329 +#: diff-lib.c:562

3330 +msgid "multiple merge bases found"

3331 +msgstr "bases multiples de fusion trouvées"

3332 +

3333 #: diff-no-index.c:238

3334 msgid "git diff --no-index [<options>] <path> <path>"

3335 msgstr "git diff --no-index [<options>] <chemin> <chemin>"

@@ -3383,35 +3394,35 @@ msgstr ""

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

3395 "%s"

3396

3386 -#: diff.c:4269

3397 +#: diff.c:4276

3398 #, c-format

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

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

3401

3391 -#: diff.c:4618

3402 +#: diff.c:4625

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

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

3405

3395 -#: diff.c:4621

3406 +#: diff.c:4628

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

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

3409

3399 -#: diff.c:4699

3410 +#: diff.c:4706

3411 msgid "--follow requires exactly one pathspec"

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

3413

3403 -#: diff.c:4747

3414 +#: diff.c:4754

3415 #, c-format

3416 msgid "invalid --stat value: %s"

3417 msgstr "valeur invalide de --stat : %s"

3418

3408 -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3419 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302

3420 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3421 #, c-format

3422 msgid "%s expects a numerical value"

3423 msgstr "%s attend une valeur numérique"

3424

3414 -#: diff.c:4784

3425 +#: diff.c:4791

3426 #, c-format

3427 msgid ""

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

@@ -3420,42 +3431,42 @@ msgstr ""

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

3432 "%s"

3433

3423 -#: diff.c:4869

3434 +#: diff.c:4876

3435 #, c-format

3436 msgid "unknown change class '%c' in --diff-filter=%s"

3437 msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"

3438

3428 -#: diff.c:4893

3439 +#: diff.c:4900

3440 #, c-format

3441 msgid "unknown value after ws-error-highlight=%.*s"

3442 msgstr "valeur inconnue après ws-error-highlight=%.*s"

3443

3433 -#: diff.c:4907

3444 +#: diff.c:4914

3445 #, c-format

3446 msgid "unable to resolve '%s'"

3447 msgstr "impossible de résoudre '%s'"

3448

3438 -#: diff.c:4957 diff.c:4963

3449 +#: diff.c:4964 diff.c:4970

3450 #, c-format

3451 msgid "%s expects <n>/<m> form"

3452 msgstr "forme <n>/<m> attendue par %s"

3453

3443 -#: diff.c:4975

3454 +#: diff.c:4982

3455 #, c-format

3456 msgid "%s expects a character, got '%s'"

3457 msgstr "caractère attendu par %s, '%s' trouvé"

3458

3448 -#: diff.c:4996

3459 +#: diff.c:5003

3460 #, c-format

3461 msgid "bad --color-moved argument: %s"

3462 msgstr "mauvais argument --color-moved : %s"

3463

3453 -#: diff.c:5015

3464 +#: diff.c:5022

3465 #, c-format

3466 msgid "invalid mode '%s' in --color-moved-ws"

3467 msgstr "mode invalide '%s' dans --color-moved-ws"

3468

3458 -#: diff.c:5055

3469 +#: diff.c:5062

3470 msgid ""

3471 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3472 "\"histogram\""

@@ -3463,155 +3474,160 @@ msgstr ""

3474 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "

3475 "\"histogram\""

3476

3466 -#: diff.c:5091 diff.c:5111

3477 +#: diff.c:5098 diff.c:5118

3478 #, c-format

3479 msgid "invalid argument to %s"

3480 msgstr "argument invalide pour %s"

3481

3471 -#: diff.c:5248

3482 +#: diff.c:5222

3483 +#, c-format

3484 +msgid "invalid regex given to -I: '%s'"

3485 +msgstr "regex invalide fournie à -I : '%s'"

3486 +

3487 +#: diff.c:5271

3488 #, c-format

3489 msgid "failed to parse --submodule option parameter: '%s'"

3490 msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"

3491

3476 -#: diff.c:5304

3492 +#: diff.c:5327

3493 #, c-format

3494 msgid "bad --word-diff argument: %s"

3495 msgstr "mauvais argument pour --word-diff : %s"

3496

3481 -#: diff.c:5327

3497 +#: diff.c:5350

3498 msgid "Diff output format options"

3499 msgstr "Options de format de sortie de diff"

3500

3485 -#: diff.c:5329 diff.c:5335

3501 +#: diff.c:5352 diff.c:5358

3502 msgid "generate patch"

3503 msgstr "générer la rustine"

3504

3489 -#: diff.c:5332 builtin/log.c:176

3505 +#: diff.c:5355 builtin/log.c:178

3506 msgid "suppress diff output"

3507 msgstr "supprimer la sortie des différences"

3508

3493 -#: diff.c:5337 diff.c:5451 diff.c:5458

3509 +#: diff.c:5360 diff.c:5474 diff.c:5481

3510 msgid "<n>"

3511 msgstr "<n>"

3512

3497 -#: diff.c:5338 diff.c:5341

3513 +#: diff.c:5361 diff.c:5364

3514 msgid "generate diffs with <n> lines context"

3515 msgstr "générer les diffs avec <n> lignes de contexte"

3516

3501 -#: diff.c:5343

3517 +#: diff.c:5366

3518 msgid "generate the diff in raw format"

3519 msgstr "générer le diff en format brut"

3520

3505 -#: diff.c:5346

3521 +#: diff.c:5369

3522 msgid "synonym for '-p --raw'"

3523 msgstr "synonyme de '-p --raw'"

3524

3509 -#: diff.c:5350

3525 +#: diff.c:5373

3526 msgid "synonym for '-p --stat'"

3527 msgstr "synonyme de '-p --stat'"

3528

3513 -#: diff.c:5354

3529 +#: diff.c:5377

3530 msgid "machine friendly --stat"

3531 msgstr "--stat pour traitement automatique"

3532

3517 -#: diff.c:5357

3533 +#: diff.c:5380

3534 msgid "output only the last line of --stat"

3535 msgstr "afficher seulement la dernière ligne de --stat"

3536

3521 -#: diff.c:5359 diff.c:5367

3537 +#: diff.c:5382 diff.c:5390

3538 msgid "<param1,param2>..."

3539 msgstr "<param1,param2>..."

3540

3525 -#: diff.c:5360

3541 +#: diff.c:5383

3542 msgid ""

3543 "output the distribution of relative amount of changes for each sub-directory"

3544 msgstr ""

3545 "afficher la distribution des quantités de modifications relatives pour "

3546 "chaque sous-répertoire"

3547

3532 -#: diff.c:5364

3548 +#: diff.c:5387

3549 msgid "synonym for --dirstat=cumulative"

3550 msgstr "synonyme pour --dirstat=cumulative"

3551

3536 -#: diff.c:5368

3552 +#: diff.c:5391

3553 msgid "synonym for --dirstat=files,param1,param2..."

3554 msgstr "synonyme pour --dirstat=files,param1,param2..."

3555

3540 -#: diff.c:5372

3556 +#: diff.c:5395

3557 msgid "warn if changes introduce conflict markers or whitespace errors"

3558 msgstr ""

3559 "avertir si les modifications introduisent des marqueurs de conflit ou des "

3560 "erreurs d'espace"

3561

3546 -#: diff.c:5375

3562 +#: diff.c:5398

3563 msgid "condensed summary such as creations, renames and mode changes"

3564 msgstr ""

3565 "résumé succinct tel que les créations, les renommages et les modifications "

3566 "de mode"

3567

3552 -#: diff.c:5378

3568 +#: diff.c:5401

3569 msgid "show only names of changed files"

3570 msgstr "n'afficher que les noms de fichiers modifiés"

3571

3556 -#: diff.c:5381

3572 +#: diff.c:5404

3573 msgid "show only names and status of changed files"

3574 msgstr "n'afficher que les noms et les status des fichiers modifiés"

3575

3560 -#: diff.c:5383

3576 +#: diff.c:5406

3577 msgid "<width>[,<name-width>[,<count>]]"

3578 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"

3579

3564 -#: diff.c:5384

3580 +#: diff.c:5407

3581 msgid "generate diffstat"

3582 msgstr "générer un diffstat"

3583

3568 -#: diff.c:5386 diff.c:5389 diff.c:5392

3584 +#: diff.c:5409 diff.c:5412 diff.c:5415

3585 msgid "<width>"

3586 msgstr "<largeur>"

3587

3572 -#: diff.c:5387

3588 +#: diff.c:5410

3589 msgid "generate diffstat with a given width"

3590 msgstr "générer un diffstat avec la largeur indiquée"

3591

3576 -#: diff.c:5390

3592 +#: diff.c:5413

3593 msgid "generate diffstat with a given name width"

3594 msgstr "génerer un diffstat avec la largeur de nom indiquée"

3595

3580 -#: diff.c:5393

3596 +#: diff.c:5416

3597 msgid "generate diffstat with a given graph width"

3598 msgstr "génerer un diffstat avec la largeur de graphe indiquée"

3599

3584 -#: diff.c:5395

3600 +#: diff.c:5418

3601 msgid "<count>"

3602 msgstr "<compte>"

3603

3588 -#: diff.c:5396

3604 +#: diff.c:5419

3605 msgid "generate diffstat with limited lines"

3606 msgstr "générer un diffstat avec des lignes limitées"

3607

3592 -#: diff.c:5399

3608 +#: diff.c:5422

3609 msgid "generate compact summary in diffstat"

3610 msgstr "générer une résumé compact dans le diffstat"

3611

3596 -#: diff.c:5402

3612 +#: diff.c:5425

3613 msgid "output a binary diff that can be applied"

3614 msgstr "produire un diff binaire qui peut être appliqué"

3615

3600 -#: diff.c:5405

3616 +#: diff.c:5428

3617 msgid "show full pre- and post-image object names on the \"index\" lines"

3618 msgstr ""

3619 "afficher les noms complets des objets pre- et post-image sur les lignes "

3620 "\"index\""

3621

3606 -#: diff.c:5407

3622 +#: diff.c:5430

3623 msgid "show colored diff"

3624 msgstr "afficher un diff coloré"

3625

3610 -#: diff.c:5408

3626 +#: diff.c:5431

3627 msgid "<kind>"

3628 msgstr "<sorte>"

3629

3614 -#: diff.c:5409

3630 +#: diff.c:5432

3631 msgid ""

3632 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3633 "diff"

@@ -3619,7 +3635,7 @@ msgstr ""

3635 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "

3636 "'nouveau' dans le diff"

3637

3622 -#: diff.c:5412

3638 +#: diff.c:5435

3639 msgid ""

3640 "do not munge pathnames and use NULs as output field terminators in --raw or "

3641 "--numstat"

@@ -3627,93 +3643,93 @@ msgstr ""

3643 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "

3644 "champs dans --raw ou --numstat"

3645

3630 -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3646 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553

3647 msgid "<prefix>"

3648 msgstr "<préfixe>"

3649

3634 -#: diff.c:5416

3650 +#: diff.c:5439

3651 msgid "show the given source prefix instead of \"a/\""

3652 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""

3653

3638 -#: diff.c:5419

3654 +#: diff.c:5442

3655 msgid "show the given destination prefix instead of \"b/\""

3656 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""

3657

3642 -#: diff.c:5422

3658 +#: diff.c:5445

3659 msgid "prepend an additional prefix to every line of output"

3660 msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"

3661

3646 -#: diff.c:5425

3662 +#: diff.c:5448

3663 msgid "do not show any source or destination prefix"

3664 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"

3665

3650 -#: diff.c:5428

3666 +#: diff.c:5451

3667 msgid "show context between diff hunks up to the specified number of lines"

3668 msgstr ""

3669 "afficher le contexte entre les sections à concurrence du nombre de ligne "

3670 "indiqué"

3671

3656 -#: diff.c:5432 diff.c:5437 diff.c:5442

3672 +#: diff.c:5455 diff.c:5460 diff.c:5465

3673 msgid "<char>"

3674 msgstr "<caractère>"

3675

3660 -#: diff.c:5433

3676 +#: diff.c:5456

3677 msgid "specify the character to indicate a new line instead of '+'"

3678 msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"

3679

3664 -#: diff.c:5438

3680 +#: diff.c:5461

3681 msgid "specify the character to indicate an old line instead of '-'"

3682 msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"

3683

3668 -#: diff.c:5443

3684 +#: diff.c:5466

3685 msgid "specify the character to indicate a context instead of ' '"

3686 msgstr ""

3687 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"

3688

3673 -#: diff.c:5446

3689 +#: diff.c:5469

3690 msgid "Diff rename options"

3691 msgstr "Options de renommage de diff"

3692

3677 -#: diff.c:5447

3693 +#: diff.c:5470

3694 msgid "<n>[/<m>]"

3695 msgstr "<n>[/<m>]"

3696

3681 -#: diff.c:5448

3697 +#: diff.c:5471

3698 msgid "break complete rewrite changes into pairs of delete and create"

3699 msgstr ""

3700 "casser les modifications d'une réécrire complète en paires de suppression et "

3701 "création"

3702

3687 -#: diff.c:5452

3703 +#: diff.c:5475

3704 msgid "detect renames"

3705 msgstr "détecter les renommages"

3706

3691 -#: diff.c:5456

3707 +#: diff.c:5479

3708 msgid "omit the preimage for deletes"

3709 msgstr "supprimer la pré-image pour les suppressions"

3710

3695 -#: diff.c:5459

3711 +#: diff.c:5482

3712 msgid "detect copies"

3713 msgstr "détecter les copies"

3714

3699 -#: diff.c:5463

3715 +#: diff.c:5486

3716 msgid "use unmodified files as source to find copies"

3717 msgstr ""

3718 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"

3719

3704 -#: diff.c:5465

3720 +#: diff.c:5488

3721 msgid "disable rename detection"

3722 msgstr "désactiver la détection de renommage"

3723

3708 -#: diff.c:5468

3724 +#: diff.c:5491

3725 msgid "use empty blobs as rename source"

3726 msgstr "utiliser des blobs vides comme source de renommage"

3727

3712 -#: diff.c:5470

3728 +#: diff.c:5493

3729 msgid "continue listing the history of a file beyond renames"

3730 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"

3731

3716 -#: diff.c:5473

3732 +#: diff.c:5496

3733 msgid ""

3734 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3735 "given limit"

@@ -3721,161 +3737,165 @@ msgstr ""

3737 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"

3738 "copie excède la limite indiquée"

3739

3724 -#: diff.c:5475

3740 +#: diff.c:5498

3741 msgid "Diff algorithm options"

3742 msgstr "Options de l'algorithme de diff"

3743

3728 -#: diff.c:5477

3744 +#: diff.c:5500

3745 msgid "produce the smallest possible diff"

3746 msgstr "produire le diff le plus petit possible"

3747

3732 -#: diff.c:5480

3748 +#: diff.c:5503

3749 msgid "ignore whitespace when comparing lines"

3750 msgstr "ignorer les espaces lors de la comparaison de ligne"

3751

3736 -#: diff.c:5483

3752 +#: diff.c:5506

3753 msgid "ignore changes in amount of whitespace"

3754 msgstr "ignorer des modifications du nombre d'espaces"

3755

3740 -#: diff.c:5486

3756 +#: diff.c:5509

3757 msgid "ignore changes in whitespace at EOL"

3758 msgstr "ignorer des modifications d'espace en fin de ligne"

3759

3744 -#: diff.c:5489

3760 +#: diff.c:5512

3761 msgid "ignore carrier-return at the end of line"

3762 msgstr "ignore le retour chariot en fin de ligne"

3763

3748 -#: diff.c:5492

3764 +#: diff.c:5515

3765 msgid "ignore changes whose lines are all blank"

3766 msgstr "ignorer les modifications dont les lignes sont vides"

3767

3752 -#: diff.c:5495

3768 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587

3769 +msgid "<regex>"

3770 +msgstr "<regex>"

3771 +

3772 +#: diff.c:5518

3773 +msgid "ignore changes whose all lines match <regex>"

3774 +msgstr "ignorer les modifications dont les lignes correspondent à <regex>"

3775 +

3776 +#: diff.c:5521

3777 msgid "heuristic to shift diff hunk boundaries for easy reading"

3778 msgstr ""

3779 "heuristique qui déplace les limites de sections de diff pour faciliter la "

3780 "lecture"

3781

3758 -#: diff.c:5498

3782 +#: diff.c:5524

3783 msgid "generate diff using the \"patience diff\" algorithm"

3784 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""

3785

3762 -#: diff.c:5502

3786 +#: diff.c:5528

3787 msgid "generate diff using the \"histogram diff\" algorithm"

3788 msgstr ""

3789 "générer un diff en utilisant l'algorithme de différence \"histogramme\""

3790

3767 -#: diff.c:5504

3791 +#: diff.c:5530

3792 msgid "<algorithm>"

3793 msgstr "<algorithme>"

3794

3771 -#: diff.c:5505

3795 +#: diff.c:5531

3796 msgid "choose a diff algorithm"

3797 msgstr "choisir un algorithme de différence"

3798

3775 -#: diff.c:5507

3799 +#: diff.c:5533

3800 msgid "<text>"

3801 msgstr "<texte>"

3802

3779 -#: diff.c:5508

3803 +#: diff.c:5534

3804 msgid "generate diff using the \"anchored diff\" algorithm"

3805 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""

3806

3783 -#: diff.c:5510 diff.c:5519 diff.c:5522

3807 +#: diff.c:5536 diff.c:5545 diff.c:5548

3808 msgid "<mode>"

3809 msgstr "<mode>"

3810

3787 -#: diff.c:5511

3811 +#: diff.c:5537

3812 msgid "show word diff, using <mode> to delimit changed words"

3813 msgstr ""

3814 "afficher des différences par mot, en utilisant <mode> pour délimiter les "

3815 "mots modifiés"

3816

3793 -#: diff.c:5513 diff.c:5516 diff.c:5561

3794 -msgid "<regex>"

3795 -msgstr "<regex>"

3796 -

3797 -#: diff.c:5514

3817 +#: diff.c:5540

3818 msgid "use <regex> to decide what a word is"

3819 msgstr "utiliser <regex> pour décider ce qu'est un mot"

3820

3801 -#: diff.c:5517

3821 +#: diff.c:5543

3822 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3823 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"

3824

3805 -#: diff.c:5520

3825 +#: diff.c:5546

3826 msgid "moved lines of code are colored differently"

3827 msgstr "les lignes déplacées sont colorées différemment"

3828

3809 -#: diff.c:5523

3829 +#: diff.c:5549

3830 msgid "how white spaces are ignored in --color-moved"

3831 msgstr "comment les espaces sont ignorés dans --color-moved"

3832

3813 -#: diff.c:5526

3833 +#: diff.c:5552

3834 msgid "Other diff options"

3835 msgstr "Autres options diff"

3836

3817 -#: diff.c:5528

3837 +#: diff.c:5554

3838 msgid "when run from subdir, exclude changes outside and show relative paths"

3839 msgstr ""

3840 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "

3841 "afficher les chemins relatifs"

3842

3823 -#: diff.c:5532

3843 +#: diff.c:5558

3844 msgid "treat all files as text"

3845 msgstr "traiter les fichiers comme texte"

3846

3827 -#: diff.c:5534

3847 +#: diff.c:5560

3848 msgid "swap two inputs, reverse the diff"

3849 msgstr "échanger les entrées, inverser le diff"

3850

3831 -#: diff.c:5536

3851 +#: diff.c:5562

3852 msgid "exit with 1 if there were differences, 0 otherwise"

3853 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"

3854

3835 -#: diff.c:5538

3855 +#: diff.c:5564

3856 msgid "disable all output of the program"

3857 msgstr "désactiver tous les affichages du programme"

3858

3839 -#: diff.c:5540

3859 +#: diff.c:5566

3860 msgid "allow an external diff helper to be executed"

3861 msgstr "autoriser l'exécution d'un assistant externe de diff"

3862

3843 -#: diff.c:5542

3863 +#: diff.c:5568

3864 msgid "run external text conversion filters when comparing binary files"

3865 msgstr ""

3866 "lancer les filtres externes de conversion en texte lors de la comparaison de "

3867 "fichiers binaires"

3868

3849 -#: diff.c:5544

3869 +#: diff.c:5570

3870 msgid "<when>"

3871 msgstr "<quand>"

3872

3853 -#: diff.c:5545

3873 +#: diff.c:5571

3874 msgid "ignore changes to submodules in the diff generation"

3875 msgstr ""

3876 "ignorer les modifications dans les sous-modules lors de la génération de diff"

3877

3858 -#: diff.c:5548

3878 +#: diff.c:5574

3879 msgid "<format>"

3880 msgstr "<format>"

3881

3862 -#: diff.c:5549

3882 +#: diff.c:5575

3883 msgid "specify how differences in submodules are shown"

3884 msgstr "spécifier comment les différences dans les sous-modules sont affichées"

3885

3866 -#: diff.c:5553

3886 +#: diff.c:5579

3887 msgid "hide 'git add -N' entries from the index"

3888 msgstr "masquer les entrées 'git add -N' de l'index"

3889

3870 -#: diff.c:5556

3890 +#: diff.c:5582

3891 msgid "treat 'git add -N' entries as real in the index"

3892 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"

3893

3874 -#: diff.c:5558

3894 +#: diff.c:5584

3895 msgid "<string>"

3896 msgstr "<chaîne>"

3897

3878 -#: diff.c:5559

3898 +#: diff.c:5585

3899 msgid ""

3900 "look for differences that change the number of occurrences of the specified "

3901 "string"

@@ -3883,7 +3903,7 @@ msgstr ""

3903 "rechercher les différences qui modifient le nombre d'occurrences de la "

3904 "chaîne spécifiée"

3905

3886 -#: diff.c:5562

3906 +#: diff.c:5588

3907 msgid ""

3908 "look for differences that change the number of occurrences of the specified "

3909 "regex"

@@ -3891,26 +3911,26 @@ msgstr ""

3911 "rechercher les différences qui modifient le nombre d'occurrences de la regex "

3912 "spécifiée"

3913

3894 -#: diff.c:5565

3914 +#: diff.c:5591

3915 msgid "show all changes in the changeset with -S or -G"

3916 msgstr ""

3917 "afficher toutes les modifications dans l'ensemble de modifications avec -S "

3918 "ou -G"

3919

3900 -#: diff.c:5568

3920 +#: diff.c:5594

3921 msgid "treat <string> in -S as extended POSIX regular expression"

3922 msgstr ""

3923 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"

3924

3905 -#: diff.c:5571

3925 +#: diff.c:5597

3926 msgid "control the order in which files appear in the output"

3927 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"

3928

3909 -#: diff.c:5572

3929 +#: diff.c:5598

3930 msgid "<object-id>"

3931 msgstr "<id-objet>"

3932

3913 -#: diff.c:5573

3933 +#: diff.c:5599

3934 msgid ""

3935 "look for differences that change the number of occurrences of the specified "

3936 "object"

@@ -3918,35 +3938,35 @@ msgstr ""

3938 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "

3939 "indiqué"

3940

3921 -#: diff.c:5575

3941 +#: diff.c:5601

3942 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3943 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3944

3925 -#: diff.c:5576

3945 +#: diff.c:5602

3946 msgid "select files by diff type"

3947 msgstr "sélectionner les fichiers par types de diff"

3948

3929 -#: diff.c:5578

3949 +#: diff.c:5604

3950 msgid "<file>"

3951 msgstr "<fichier>"

3952

3933 -#: diff.c:5579

3953 +#: diff.c:5605

3954 msgid "Output to a specific file"

3955 msgstr "Sortie vers un fichier spécifié"

3956

3937 -#: diff.c:6236

3957 +#: diff.c:6262

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

3959 msgstr ""

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

3961 "fichiers."

3962

3943 -#: diff.c:6239

3963 +#: diff.c:6265

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

3965 msgstr ""

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

3967 "grand nombre de fichiers."

3968

3949 -#: diff.c:6242

3969 +#: diff.c:6268

3970 #, c-format

3971 msgid ""

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

@@ -4054,246 +4074,246 @@ msgstr "impossible de régler GIT_DIR à '%s'"

4074 msgid "too many args to run %s"

4075 msgstr "trop d'arguments pour lancer %s"

4076

4057 -#: fetch-pack.c:176

4077 +#: fetch-pack.c:177

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

4079 msgstr "git fetch-pack : liste superficielle attendue"

4080

4061 -#: fetch-pack.c:179

4081 +#: fetch-pack.c:180

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

4083 msgstr ""

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

4085

4066 -#: fetch-pack.c:190

4086 +#: fetch-pack.c:191

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

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

4089

4070 -#: fetch-pack.c:210

4090 +#: fetch-pack.c:211

4091 #, c-format

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

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

4094

4075 -#: fetch-pack.c:221

4095 +#: fetch-pack.c:222

4096 msgid "unable to write to remote"

4097 msgstr "impossible d'écrire sur un distant"

4098

4079 -#: fetch-pack.c:282

4099 +#: fetch-pack.c:283

4100 msgid "--stateless-rpc requires multi_ack_detailed"

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

4102

4083 -#: fetch-pack.c:375 fetch-pack.c:1397

4103 +#: fetch-pack.c:378 fetch-pack.c:1406

4104 #, c-format

4105 msgid "invalid shallow line: %s"

4106 msgstr "ligne de superficiel invalide : %s"

4107

4088 -#: fetch-pack.c:381 fetch-pack.c:1403

4108 +#: fetch-pack.c:384 fetch-pack.c:1412

4109 #, c-format

4110 msgid "invalid unshallow line: %s"

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

4112

4093 -#: fetch-pack.c:383 fetch-pack.c:1405

4113 +#: fetch-pack.c:386 fetch-pack.c:1414

4114 #, c-format

4115 msgid "object not found: %s"

4116 msgstr "objet non trouvé : %s"

4117

4098 -#: fetch-pack.c:386 fetch-pack.c:1408

4118 +#: fetch-pack.c:389 fetch-pack.c:1417

4119 #, c-format

4120 msgid "error in object: %s"

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

4122

4103 -#: fetch-pack.c:388 fetch-pack.c:1410

4123 +#: fetch-pack.c:391 fetch-pack.c:1419

4124 #, c-format

4125 msgid "no shallow found: %s"

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

4127

4108 -#: fetch-pack.c:391 fetch-pack.c:1414

4128 +#: fetch-pack.c:394 fetch-pack.c:1423

4129 #, c-format

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

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

4132

4113 -#: fetch-pack.c:431

4133 +#: fetch-pack.c:434

4134 #, c-format

4135 msgid "got %s %d %s"

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

4137

4118 -#: fetch-pack.c:448

4138 +#: fetch-pack.c:451

4139 #, c-format

4140 msgid "invalid commit %s"

4141 msgstr "commit invalide %s"

4142

4123 -#: fetch-pack.c:479

4143 +#: fetch-pack.c:482

4144 msgid "giving up"

4145 msgstr "abandon"

4146

4127 -#: fetch-pack.c:492 progress.c:339

4147 +#: fetch-pack.c:495 progress.c:339

4148 msgid "done"

4149 msgstr "fait"

4150

4131 -#: fetch-pack.c:504

4151 +#: fetch-pack.c:507

4152 #, c-format

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

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

4155

4136 -#: fetch-pack.c:540

4156 +#: fetch-pack.c:543

4157 #, c-format

4158 msgid "Marking %s as complete"

4159 msgstr "Marquage de %s comme terminé"

4160

4141 -#: fetch-pack.c:755

4161 +#: fetch-pack.c:758

4162 #, c-format

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

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

4165

4146 -#: fetch-pack.c:824

4166 +#: fetch-pack.c:827

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

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

4169

4150 -#: fetch-pack.c:832

4170 +#: fetch-pack.c:835

4171 msgid "protocol error: bad pack header"

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

4173

4154 -#: fetch-pack.c:916

4174 +#: fetch-pack.c:919

4175 #, c-format

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

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

4178

4159 -#: fetch-pack.c:933

4179 +#: fetch-pack.c:937

4180 #, c-format

4181 msgid "%s failed"

4182 msgstr "échec de %s"

4183

4164 -#: fetch-pack.c:935

4184 +#: fetch-pack.c:939

4185 msgid "error in sideband demultiplexer"

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

4187

4168 -#: fetch-pack.c:978

4188 +#: fetch-pack.c:982

4189 #, c-format

4190 msgid "Server version is %.*s"

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

4192

4173 -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

4174 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

4175 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

4176 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

4193 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4194 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4195 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4196 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

4197 #, c-format

4198 msgid "Server supports %s"

4199 msgstr "Le serveur supporte %s"

4200

4181 -#: fetch-pack.c:985

4201 +#: fetch-pack.c:992

4202 msgid "Server does not support shallow clients"

4203 msgstr "Le serveur ne supporte les clients superficiels"

4204

4185 -#: fetch-pack.c:1045

4205 +#: fetch-pack.c:1052

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

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

4208

4189 -#: fetch-pack.c:1050

4209 +#: fetch-pack.c:1057

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

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

4212

4193 -#: fetch-pack.c:1054

4213 +#: fetch-pack.c:1061

4214 msgid "Server does not support --deepen"

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

4216

4197 -#: fetch-pack.c:1056

4217 +#: fetch-pack.c:1063

4218 msgid "Server does not support this repository's object format"

4219 msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"

4220

4201 -#: fetch-pack.c:1069

4221 +#: fetch-pack.c:1076

4222 msgid "no common commits"

4223 msgstr "pas de commit commun"

4224

4205 -#: fetch-pack.c:1081 fetch-pack.c:1619

4225 +#: fetch-pack.c:1088 fetch-pack.c:1628

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

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

4228

4209 -#: fetch-pack.c:1205

4229 +#: fetch-pack.c:1214

4230 #, c-format

4231 msgid "mismatched algorithms: client %s; server %s"

4232 msgstr "non-correspondance des algorithmes : client %s ; serveur %s"

4233

4214 -#: fetch-pack.c:1209

4234 +#: fetch-pack.c:1218

4235 #, c-format

4236 msgid "the server does not support algorithm '%s'"

4237 msgstr "Le serveur ne supporte pas l'algorithme '%s'"

4238

4219 -#: fetch-pack.c:1229

4239 +#: fetch-pack.c:1238

4240 msgid "Server does not support shallow requests"

4241 msgstr "Le serveur ne supporte pas les requêtes superficielles"

4242

4223 -#: fetch-pack.c:1236

4243 +#: fetch-pack.c:1245

4244 msgid "Server supports filter"

4245 msgstr "Le serveur supporte filter"

4246

4227 -#: fetch-pack.c:1275

4247 +#: fetch-pack.c:1284

4248 msgid "unable to write request to remote"

4249 msgstr "impossible d'écrire la requête sur le distant"

4250

4231 -#: fetch-pack.c:1293

4251 +#: fetch-pack.c:1302

4252 #, c-format

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

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

4255

4236 -#: fetch-pack.c:1299

4256 +#: fetch-pack.c:1308

4257 #, c-format

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

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

4260

4241 -#: fetch-pack.c:1360

4261 +#: fetch-pack.c:1369

4262 #, c-format

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

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

4265

4246 -#: fetch-pack.c:1365

4266 +#: fetch-pack.c:1374

4267 #, c-format

4268 msgid "error processing acks: %d"

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

4270

4251 -#: fetch-pack.c:1375

4271 +#: fetch-pack.c:1384

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

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

4274

4255 -#: fetch-pack.c:1377

4275 +#: fetch-pack.c:1386

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

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

4278

4259 -#: fetch-pack.c:1419

4279 +#: fetch-pack.c:1428

4280 #, c-format

4281 msgid "error processing shallow info: %d"

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

4283

4264 -#: fetch-pack.c:1466

4284 +#: fetch-pack.c:1475

4285 #, c-format

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

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

4288

4269 -#: fetch-pack.c:1471

4289 +#: fetch-pack.c:1480

4290 #, c-format

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

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

4293

4274 -#: fetch-pack.c:1476

4294 +#: fetch-pack.c:1485

4295 #, c-format

4296 msgid "error processing wanted refs: %d"

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

4298

4279 -#: fetch-pack.c:1506

4299 +#: fetch-pack.c:1515

4300 msgid "git fetch-pack: expected response end packet"

4301 msgstr "git fetch-pack : paquet de fin de réponse attendu"

4302

4283 -#: fetch-pack.c:1887

4303 +#: fetch-pack.c:1897

4304 msgid "no matching remote head"

4305 msgstr "pas de HEAD distante correspondante"

4306

4287 -#: fetch-pack.c:1910 builtin/clone.c:692

4307 +#: fetch-pack.c:1920 builtin/clone.c:693

4308 msgid "remote did not send all necessary objects"

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

4310

4291 -#: fetch-pack.c:1937

4311 +#: fetch-pack.c:1947

4312 #, c-format

4313 msgid "no such remote ref %s"

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

4315

4296 -#: fetch-pack.c:1940

4316 +#: fetch-pack.c:1950

4317 #, c-format

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

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

@@ -4316,7 +4336,7 @@ msgstr "gpg n'a pas pu signer les données"

4336 msgid "ignore invalid color '%.*s' in log.graphColors"

4337 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"

4338

4319 -#: grep.c:668

4339 +#: grep.c:640

4340 msgid ""

4341 "given pattern contains NULL byte (via -f <file>). This is only supported "

4342 "with -P under PCRE v2"

@@ -4324,18 +4344,18 @@ msgstr ""

4344 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "

4345 "supporté qu'avec -P avec PCRE v2"

4346

4327 -#: grep.c:2128

4347 +#: grep.c:2100

4348 #, c-format

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

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

4351

4332 -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

4352 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4353 #: builtin/rm.c:135

4354 #, c-format

4355 msgid "failed to stat '%s'"

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

4357

4338 -#: grep.c:2156

4358 +#: grep.c:2128

4359 #, c-format

4360 msgid "'%s': short read"

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

@@ -4429,7 +4449,7 @@ msgstr "Commandes externes"

4449 msgid "Command aliases"

4450 msgstr "Alias de commande"

4451

4432 -#: help.c:513

4452 +#: help.c:527

4453 #, c-format

4454 msgid ""

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

@@ -4438,33 +4458,33 @@ msgstr ""

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

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

4460

4441 -#: help.c:572

4461 +#: help.c:543 help.c:631

4462 +#, c-format

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

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

4465 +

4466 +#: help.c:591

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

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

4469

4445 -#: help.c:594

4470 +#: help.c:613

4471 #, c-format

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

4473 msgstr ""

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

4475

4451 -#: help.c:599

4476 +#: help.c:618

4477 #, c-format

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

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

4480

4456 -#: help.c:604

4481 +#: help.c:623

4482 #, c-format

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

4484 msgstr ""

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

4486

4462 -#: help.c:612

4463 -#, c-format

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

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

4466 -

4467 -#: help.c:616

4487 +#: help.c:635

4488 msgid ""

4489 "\n"

4490 "The most similar command is"

@@ -4478,16 +4498,16 @@ msgstr[1] ""

4498 "\n"

4499 "Les commandes les plus ressemblantes sont"

4500

4481 -#: help.c:656

4501 +#: help.c:675

4502 msgid "git version [<options>]"

4503 msgstr "git version [<options>]"

4504

4485 -#: help.c:711

4505 +#: help.c:730

4506 #, c-format

4507 msgid "%s: %s - %s"

4508 msgstr "%s: %s - %s"

4509

4490 -#: help.c:715

4510 +#: help.c:734

4511 msgid ""

4512 "\n"

4513 "Did you mean this?"

@@ -4656,6 +4676,21 @@ msgstr "Impossible de créer '%s.lock' : %s"

4676 msgid "expected flush after ls-refs arguments"

4677 msgstr "vidage attendu après les arguments ls-refs"

4678

4679 +#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4680 +#, c-format

4681 +msgid ""

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

4683 +" %s"

4684 +msgstr ""

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

4686 +"fusion :\n"

4687 +" %s"

4688 +

4689 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4690 +#, c-format

4691 +msgid "Already up to date!"

4692 +msgstr "Déjà à jour !"

4693 +

4694 #: merge-recursive.c:356

4695 msgid "(bad commit)\n"

4696 msgstr "(mauvais commit)\n"

@@ -5048,10 +5083,6 @@ msgstr "Ajout de %s"

5083 msgid "CONFLICT (add/add): Merge conflict in %s"

5084 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

5085

5051 -#: merge-recursive.c:3436

5052 -msgid "Already up to date!"

5053 -msgstr "Déjà à jour !"

5054 -

5086 #: merge-recursive.c:3445

5087 #, c-format

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

@@ -5072,22 +5103,12 @@ msgstr[1] "%u ancêtres communs trouvés :"

5103 msgid "merge returned no commit"

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

5105

5075 -#: merge-recursive.c:3672

5076 -#, c-format

5077 -msgid ""

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

5079 -" %s"

5080 -msgstr ""

5081 -"Vos modifications locales aux fichiers suivants seraient écrasées par la "

5082 -"fusion :\n"

5083 -" %s"

5084 -

5106 #: merge-recursive.c:3769

5107 #, c-format

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

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

5110

5090 -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

5111 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

5112 msgid "Unable to write index."

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

5114

@@ -5095,128 +5116,124 @@ msgstr "Impossible d'écrire l'index."

5116 msgid "failed to read the cache"

5117 msgstr "impossible de lire le cache"

5118

5098 -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

5099 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

5119 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

5120 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

5121 #: builtin/stash.c:265

5122 msgid "unable to write new index file"

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

5124

5104 -#: midx.c:79

5125 +#: midx.c:80

5126 #, c-format

5127 msgid "multi-pack-index file %s is too small"

5128 msgstr "le fichier d'index multi-paquet %s est trop petit"

5129

5109 -#: midx.c:95

5130 +#: midx.c:96

5131 #, c-format

5132 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5133 msgstr ""

5134 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "

5135 "0x%08x"

5136

5116 -#: midx.c:100

5137 +#: midx.c:101

5138 #, c-format

5139 msgid "multi-pack-index version %d not recognized"

5140 msgstr "la version d'index multi-paquet %d n'est pas reconnue"

5141

5121 -#: midx.c:105

5142 +#: midx.c:106

5143 #, c-format

5144 msgid "multi-pack-index hash version %u does not match version %u"

5145 msgstr ""

5146 "la version d'empreinte d'index multi-paquet %u ne correspond pas à la "

5147 "version %u"

5148

5128 -#: midx.c:122

5149 +#: midx.c:123

5150 msgid "invalid chunk offset (too large)"

5151 msgstr "décalage de section invalide (trop grand)"

5152

5132 -#: midx.c:146

5153 +#: midx.c:147

5154 msgid "terminating multi-pack-index chunk id appears earlier than expected"

5155 msgstr ""

5156 "identifiant de terminaison de tronçon d'index multi-paquet terminant "

5157 "apparaît plus tôt qu'attendu"

5158

5138 -#: midx.c:159

5159 +#: midx.c:160

5160 msgid "multi-pack-index missing required pack-name chunk"

5161 msgstr "index multi-paquet manque de tronçon de nom de paquet"

5162

5142 -#: midx.c:161

5163 +#: midx.c:162

5164 msgid "multi-pack-index missing required OID fanout chunk"

5165 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"

5166

5146 -#: midx.c:163

5167 +#: midx.c:164

5168 msgid "multi-pack-index missing required OID lookup chunk"

5169 msgstr "index multi-paquet manque de tronçon de recherche OID"

5170

5150 -#: midx.c:165

5171 +#: midx.c:166

5172 msgid "multi-pack-index missing required object offsets chunk"

5173 msgstr "index multi-paquet manque de tronçon de décalage d'objet"

5174

5154 -#: midx.c:179

5175 +#: midx.c:180

5176 #, c-format

5177 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5178 msgstr ""

5179 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"

5180

5160 -#: midx.c:222

5181 +#: midx.c:223

5182 #, c-format

5183 msgid "bad pack-int-id: %u (%u total packs)"

5184 msgstr "mauvais pack-int-id : %u (%u paquets au total)"

5185

5165 -#: midx.c:272

5186 +#: midx.c:273

5187 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5188 msgstr ""

5189 "l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"

5190

5170 -#: midx.c:300

5171 -msgid "error preparing packfile from multi-pack-index"

5172 -msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"

5173 -

5174 -#: midx.c:485

5191 +#: midx.c:480

5192 #, c-format

5193 msgid "failed to add packfile '%s'"

5194 msgstr "échec de l'ajout du fichier paquet '%s'"

5195

5179 -#: midx.c:491

5196 +#: midx.c:486

5197 #, c-format

5198 msgid "failed to open pack-index '%s'"

5199 msgstr "échec à l'ouverture du fichier paquet '%s'"

5200

5184 -#: midx.c:551

5201 +#: midx.c:546

5202 #, c-format

5203 msgid "failed to locate object %d in packfile"

5204 msgstr "échec de localisation de l'objet %d dans le fichier paquet"

5205

5189 -#: midx.c:853

5206 +#: midx.c:846

5207 msgid "Adding packfiles to multi-pack-index"

5208 msgstr "Ajout de fichiers paquet à un index multi-paquet"

5209

5193 -#: midx.c:886

5210 +#: midx.c:879

5211 #, c-format

5212 msgid "did not see pack-file %s to drop"

5213 msgstr "fichier paquet à éliminer %s non trouvé"

5214

5198 -#: midx.c:938

5215 +#: midx.c:931

5216 msgid "no pack files to index."

5217 msgstr "Aucun fichier paquet à l'index."

5218

5202 -#: midx.c:990

5219 +#: midx.c:982

5220 msgid "Writing chunks to multi-pack-index"

5221 msgstr "Écriture des sections dans l'index multi-paquet"

5222

5206 -#: midx.c:1068

5223 +#: midx.c:1060

5224 #, c-format

5225 msgid "failed to clear multi-pack-index at %s"

5226 msgstr "échec du nettoyage de l'index de multi-paquet à %s"

5227

5211 -#: midx.c:1124

5228 +#: midx.c:1116

5229 msgid "multi-pack-index file exists, but failed to parse"

5230 msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"

5231

5215 -#: midx.c:1132

5232 +#: midx.c:1124

5233 msgid "Looking for referenced packfiles"

5234 msgstr "Recherche de fichiers paquets référencés"

5235

5219 -#: midx.c:1147

5236 +#: midx.c:1139

5237 #, c-format

5238 msgid ""

5239 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

@@ -5224,55 +5241,55 @@ msgstr ""

5241 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "

5242 "étalement[%d]"

5243

5227 -#: midx.c:1152

5244 +#: midx.c:1144

5245 msgid "the midx contains no oid"

5246 msgstr "le midx ne contient aucun oid"

5247

5231 -#: midx.c:1161

5248 +#: midx.c:1153

5249 msgid "Verifying OID order in multi-pack-index"

5250 msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"

5251

5235 -#: midx.c:1170

5252 +#: midx.c:1162

5253 #, c-format

5254 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5255 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"

5256

5240 -#: midx.c:1190

5257 +#: midx.c:1182

5258 msgid "Sorting objects by packfile"

5259 msgstr "Classement des objets par fichier paquet"

5260

5244 -#: midx.c:1197

5261 +#: midx.c:1189

5262 msgid "Verifying object offsets"

5263 msgstr "Vérification des décalages des objets"

5264

5248 -#: midx.c:1213

5265 +#: midx.c:1205

5266 #, c-format

5267 msgid "failed to load pack entry for oid[%d] = %s"

5268 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"

5269

5253 -#: midx.c:1219

5270 +#: midx.c:1211

5271 #, c-format

5272 msgid "failed to load pack-index for packfile %s"

5273 msgstr "impossible de lire le fichier paquet %s"

5274

5258 -#: midx.c:1228

5275 +#: midx.c:1220

5276 #, c-format

5277 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5278 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"

5279

5263 -#: midx.c:1253

5280 +#: midx.c:1245

5281 msgid "Counting referenced objects"

5282 msgstr "Comptage des objets référencés"

5283

5267 -#: midx.c:1263

5284 +#: midx.c:1255

5285 msgid "Finding and deleting unreferenced packfiles"

5286 msgstr "Recherche et effacement des fichiers paquets non-référencés"

5287

5271 -#: midx.c:1454

5288 +#: midx.c:1446

5289 msgid "could not start pack-objects"

5290 msgstr "Impossible de démarrer le groupement d'objets"

5291

5275 -#: midx.c:1474

5292 +#: midx.c:1466

5293 msgid "could not finish pack-objects"

5294 msgstr "Impossible de finir le groupement d'objets"

5295

@@ -5360,16 +5377,16 @@ msgstr "incohérence de hachage %s"

5377 msgid "unable to get size of %s"

5378 msgstr "impossible de récupérer la taille de %s"

5379

5363 -#: packfile.c:630

5380 +#: packfile.c:615

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

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

5383

5367 -#: packfile.c:1922

5384 +#: packfile.c:1907

5385 #, c-format

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

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

5388

5372 -#: packfile.c:1926

5389 +#: packfile.c:1911

5390 #, c-format

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

5392 msgstr ""

@@ -5622,7 +5639,7 @@ msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"

5639 msgid "protocol error: bad line length %d"

5640 msgstr "erreur de protocole : mauvaise longueur de ligne %d"

5641

5625 -#: pkt-line.c:373 sideband.c:150

5642 +#: pkt-line.c:373 sideband.c:165

5643 #, c-format

5644 msgid "remote error: %s"

5645 msgstr "erreur distante : %s"

@@ -5673,7 +5690,7 @@ msgstr "impossible de démarrer `log`"

5690 msgid "could not read `log` output"

5691 msgstr "impossible de lire la sortie de `log`"

5692

5676 -#: range-diff.c:98 sequencer.c:5283

5693 +#: range-diff.c:98 sequencer.c:5310

5694 #, c-format

5695 msgid "could not parse commit '%s'"

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

@@ -5692,11 +5709,11 @@ msgstr ""

5709 msgid "could not parse git header '%.*s'"

5710 msgstr "impossible d'analyser l'entête git '%.*s'"

5711

5695 -#: range-diff.c:301

5712 +#: range-diff.c:299

5713 msgid "failed to generate diff"

5714 msgstr "échec de la génération de diff"

5715

5699 -#: range-diff.c:534 range-diff.c:536

5716 +#: range-diff.c:532 range-diff.c:534

5717 #, c-format

5718 msgid "could not parse log for '%s'"

5719 msgstr "impossible d'analyser le journal pour '%s'"

@@ -5814,8 +5831,8 @@ msgstr "entrées de préparation non ordonnées pour '%s'"

5831

5832 #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5833 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5817 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5818 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5834 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5835 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5836 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5837 #: builtin/submodule--helper.c:332

5838 msgid "index file corrupt"

@@ -5871,12 +5888,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'"

5888 msgid "broken index, expect %s in %s, got %s"

5889 msgstr "index cassé, %s attendu dans %s, %s obtenu"

5890

5874 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5891 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5892 #, c-format

5893 msgid "could not close '%s'"

5894 msgstr "impossible de fermer '%s'"

5895

5879 -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5896 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5897 #, c-format

5898 msgid "could not stat '%s'"

5899 msgstr "stat impossible de '%s'"

@@ -6009,14 +6026,14 @@ msgstr ""

6026 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"

6027 "\n"

6028

6012 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

6013 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

6029 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

6030 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

6031 #, c-format

6032 msgid "could not write '%s'"

6033 msgstr "impossible d'écrire '%s'"

6034

6018 -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

6019 -#: builtin/rebase.c:246

6035 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

6036 +#: builtin/rebase.c:252

6037 #, c-format

6038 msgid "could not write '%s'."

6039 msgstr "impossible d'écrire '%s'."

@@ -6048,9 +6065,9 @@ msgstr ""

6065 "Les comportements disponibles sont : ignore, warn, error.\n"

6066 "\n"

6067

6051 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

6052 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

6053 -#: builtin/rebase.c:258

6068 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

6069 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

6070 +#: builtin/rebase.c:264

6071 #, c-format

6072 msgid "could not read '%s'."

6073 msgstr "impossible de lire '%s'."

@@ -6247,61 +6264,61 @@ msgstr "format : atome %%(end) utilisé sans atome correspondant"

6264 msgid "malformed format string %s"

6265 msgstr "Chaîne de formatage mal formée %s"

6266

6250 -#: ref-filter.c:1541

6267 +#: ref-filter.c:1549

6268 #, c-format

6269 msgid "no branch, rebasing %s"

6270 msgstr "aucune branche, rebasage de %s"

6271

6255 -#: ref-filter.c:1544

6272 +#: ref-filter.c:1552

6273 #, c-format

6274 msgid "no branch, rebasing detached HEAD %s"

6275 msgstr "aucune branche, rebasage de la HEAD détachée %s"

6276

6260 -#: ref-filter.c:1547

6277 +#: ref-filter.c:1555

6278 #, c-format

6279 msgid "no branch, bisect started on %s"

6280 msgstr "aucune branche, bisect a démarré sur %s"

6281

6265 -#: ref-filter.c:1557

6282 +#: ref-filter.c:1565

6283 msgid "no branch"

6284 msgstr "aucune branche"

6285

6269 -#: ref-filter.c:1591 ref-filter.c:1800

6286 +#: ref-filter.c:1599 ref-filter.c:1808

6287 #, c-format

6288 msgid "missing object %s for %s"

6289 msgstr "objet manquant %s pour %s"

6290

6274 -#: ref-filter.c:1601

6291 +#: ref-filter.c:1609

6292 #, c-format

6293 msgid "parse_object_buffer failed on %s for %s"

6294 msgstr "échec de parse_object_buffer sur %s pour %s"

6295

6279 -#: ref-filter.c:2054

6296 +#: ref-filter.c:2062

6297 #, c-format

6298 msgid "malformed object at '%s'"

6299 msgstr "objet malformé à '%s'"

6300

6284 -#: ref-filter.c:2143

6301 +#: ref-filter.c:2151

6302 #, c-format

6303 msgid "ignoring ref with broken name %s"

6304 msgstr "réf avec un nom cassé %s ignoré"

6305

6289 -#: ref-filter.c:2148 refs.c:657

6306 +#: ref-filter.c:2156 refs.c:660

6307 #, c-format

6308 msgid "ignoring broken ref %s"

6309 msgstr "réf cassé %s ignoré"

6310

6294 -#: ref-filter.c:2464

6311 +#: ref-filter.c:2472

6312 #, c-format

6313 msgid "format: %%(end) atom missing"

6314 msgstr "format: atome %%(end) manquant"

6315

6299 -#: ref-filter.c:2563

6316 +#: ref-filter.c:2571

6317 #, c-format

6318 msgid "malformed object name %s"

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

6320

6304 -#: ref-filter.c:2568

6321 +#: ref-filter.c:2576

6322 #, c-format

6323 msgid "option `%s' must point to a commit"

6324 msgstr "l'option '%s' doit pointer sur un commit"

@@ -6311,65 +6328,65 @@ msgstr "l'option '%s' doit pointer sur un commit"

6328 msgid "%s does not point to a valid object!"

6329 msgstr "%s ne pointe pas sur un objet valide!"

6330

6314 -#: refs.c:572

6331 +#: refs.c:575

6332 #, c-format

6333 msgid "could not retrieve `%s`"

6334 msgstr "impossible de récupérer `%s`"

6335

6319 -#: refs.c:579

6336 +#: refs.c:582

6337 #, c-format

6338 msgid "invalid branch name: %s = %s"

6339 msgstr "Nom de branche invalide : %s = %s"

6340

6324 -#: refs.c:655

6341 +#: refs.c:658

6342 #, c-format

6343 msgid "ignoring dangling symref %s"

6344 msgstr "symref pendant %s ignoré"

6345

6329 -#: refs.c:892

6346 +#: refs.c:895

6347 #, c-format

6348 msgid "log for ref %s has gap after %s"

6349 msgstr "le journal pour la réf %s contient un trou après %s"

6350

6334 -#: refs.c:898

6351 +#: refs.c:901

6352 #, c-format

6353 msgid "log for ref %s unexpectedly ended on %s"

6354 msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"

6355

6339 -#: refs.c:957

6356 +#: refs.c:960

6357 #, c-format

6358 msgid "log for %s is empty"

6359 msgstr "le journal pour la réf %s est vide"

6360

6344 -#: refs.c:1049

6361 +#: refs.c:1052

6362 #, c-format

6363 msgid "refusing to update ref with bad name '%s'"

6364 msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"

6365

6349 -#: refs.c:1120

6366 +#: refs.c:1123

6367 #, c-format

6368 msgid "update_ref failed for ref '%s': %s"

6369 msgstr "échec de update_ref pour la réf '%s' : %s"

6370

6354 -#: refs.c:1944

6371 +#: refs.c:1947

6372 #, c-format

6373 msgid "multiple updates for ref '%s' not allowed"

6374 msgstr "mises à jour multiples pour la réf '%s' non permises"

6375

6359 -#: refs.c:2024

6376 +#: refs.c:2027

6377 msgid "ref updates forbidden inside quarantine environment"

6378 msgstr "mises à jour des références interdites en environnement de quarantaine"

6379

6363 -#: refs.c:2035

6380 +#: refs.c:2038

6381 msgid "ref updates aborted by hook"

6382 msgstr "mises à jour des références annulées par le crochet"

6383

6367 -#: refs.c:2135 refs.c:2165

6384 +#: refs.c:2138 refs.c:2168

6385 #, c-format

6386 msgid "'%s' exists; cannot create '%s'"

6387 msgstr "'%s' existe ; impossible de créer '%s'"

6388

6372 -#: refs.c:2141 refs.c:2176

6389 +#: refs.c:2144 refs.c:2179

6390 #, c-format

6391 msgid "cannot process '%s' and '%s' at the same time"

6392 msgstr "impossible de traiter '%s' et '%s' en même temps"

@@ -6390,7 +6407,7 @@ msgstr "Impossible de supprimer la référence %s : %s"

6407 msgid "could not delete references: %s"

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

6409

6393 -#: refspec.c:167

6410 +#: refspec.c:170

6411 #, c-format

6412 msgid "invalid refspec '%s'"

6413 msgstr "spécificateur de réference invalide : '%s'"

@@ -6540,97 +6557,97 @@ msgstr ""

6557 msgid "dst ref %s receives from more than one src"

6558 msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"

6559

6543 -#: remote.c:1703 remote.c:1804

6560 +#: remote.c:1714 remote.c:1815

6561 msgid "HEAD does not point to a branch"

6562 msgstr "HEAD ne pointe pas sur une branche"

6563

6547 -#: remote.c:1712

6564 +#: remote.c:1723

6565 #, c-format

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

6567 msgstr "pas de branche '%s'"

6568

6552 -#: remote.c:1715

6569 +#: remote.c:1726

6570 #, c-format

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

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

6573

6557 -#: remote.c:1721

6574 +#: remote.c:1732

6575 #, c-format

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

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

6578

6562 -#: remote.c:1736

6579 +#: remote.c:1747

6580 #, c-format

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

6582 msgstr ""

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

6584 "branche locale de suivi"

6585

6569 -#: remote.c:1748

6586 +#: remote.c:1759

6587 #, c-format

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

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

6590

6574 -#: remote.c:1758

6591 +#: remote.c:1769

6592 #, c-format

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

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

6595

6579 -#: remote.c:1771

6596 +#: remote.c:1782

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

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

6599

6583 -#: remote.c:1793

6600 +#: remote.c:1804

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

6602 msgstr ""

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

6604

6588 -#: remote.c:1922

6605 +#: remote.c:1933

6606 #, c-format

6607 msgid "couldn't find remote ref %s"

6608 msgstr "impossible de trouver la référence distante %s"

6609

6593 -#: remote.c:1935

6610 +#: remote.c:1946

6611 #, c-format

6612 msgid "* Ignoring funny ref '%s' locally"

6613 msgstr "* Référence bizarre '%s' ignorée localement"

6614

6598 -#: remote.c:2098

6615 +#: remote.c:2109

6616 #, c-format

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

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

6619

6603 -#: remote.c:2102

6620 +#: remote.c:2113

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

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

6623

6607 -#: remote.c:2105

6624 +#: remote.c:2116

6625 #, c-format

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

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

6628

6612 -#: remote.c:2109

6629 +#: remote.c:2120

6630 #, c-format

6631 msgid "Your branch and '%s' refer to different commits.\n"

6632 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

6633

6617 -#: remote.c:2112

6634 +#: remote.c:2123

6635 #, c-format

6636 msgid " (use \"%s\" for details)\n"

6637 msgstr " (utilisez \"%s\" pour plus de détails)\n"

6638

6622 -#: remote.c:2116

6639 +#: remote.c:2127

6640 #, c-format

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

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

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

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

6645

6629 -#: remote.c:2122

6646 +#: remote.c:2133

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

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

6649

6633 -#: remote.c:2125

6650 +#: remote.c:2136

6651 #, c-format

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

6653 msgid_plural ""

@@ -6642,11 +6659,11 @@ msgstr[1] ""

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

6660 "en avance rapide.\n"

6661

6645 -#: remote.c:2133

6662 +#: remote.c:2144

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

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

6665

6649 -#: remote.c:2136

6666 +#: remote.c:2147

6667 #, c-format

6668 msgid ""

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

@@ -6661,12 +6678,12 @@ msgstr[1] ""

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

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

6680

6664 -#: remote.c:2146

6681 +#: remote.c:2157

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

6683 msgstr ""

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

6685

6669 -#: remote.c:2337

6686 +#: remote.c:2348

6687 #, c-format

6688 msgid "cannot parse expected object name '%s'"

6689 msgstr "impossible d'analyser le nom attendu d'objet '%s'"

@@ -6744,7 +6761,7 @@ msgstr "impossible de délier '%s' qui est errant"

6761 msgid "Recorded preimage for '%s'"

6762 msgstr "Pré-image enregistrée pour '%s'"

6763

6747 -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6764 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992

6765 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6766 #, c-format

6767 msgid "could not create directory '%s'"

@@ -6783,43 +6800,43 @@ msgstr "impossible d'ouvrir le répertoire rr-cache"

6800 msgid "could not determine HEAD revision"

6801 msgstr "impossible de déterminer la révision HEAD"

6802

6786 -#: reset.c:70 reset.c:76 sequencer.c:3426

6803 +#: reset.c:70 reset.c:76 sequencer.c:3460

6804 #, c-format

6805 msgid "failed to find tree of %s"

6806 msgstr "impossible de trouver l'arbre de %s"

6807

6791 -#: revision.c:2344

6808 +#: revision.c:2336

6809 msgid "--unpacked=<packfile> no longer supported"

6810 msgstr "--unpacked=<fichier-paquet> n'est plus géré"

6811

6795 -#: revision.c:2364

6812 +#: revision.c:2356

6813 #, c-format

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

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

6816

6800 -#: revision.c:2702

6817 +#: revision.c:2694

6818 msgid "your current branch appears to be broken"

6819 msgstr "votre branche actuelle semble cassée"

6820

6804 -#: revision.c:2705

6821 +#: revision.c:2697

6822 #, c-format

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

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

6825

6809 -#: revision.c:2915

6826 +#: revision.c:2907

6827 msgid "-L does not yet support diff formats besides -p and -s"

6828 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"

6829

6813 -#: run-command.c:763

6830 +#: run-command.c:764

6831 msgid "open /dev/null failed"

6832 msgstr "échec de l'ouverture de /dev/null"

6833

6817 -#: run-command.c:1270

6834 +#: run-command.c:1271

6835 #, c-format

6836 msgid "cannot create async thread: %s"

6837 msgstr "impossible de créer un fil asynchrone : %s"

6838

6822 -#: run-command.c:1334

6839 +#: run-command.c:1335

6840 #, c-format

6841 msgid ""

6842 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6829,35 +6846,35 @@ msgstr ""

6846 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

6847 "false`."

6848

6832 -#: send-pack.c:145

6849 +#: send-pack.c:146

6850 msgid "unexpected flush packet while reading remote unpack status"

6851 msgstr ""

6852 "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

6853 "distant"

6854

6838 -#: send-pack.c:147

6855 +#: send-pack.c:148

6856 #, c-format

6857 msgid "unable to parse remote unpack status: %s"

6858 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

6859

6843 -#: send-pack.c:149

6860 +#: send-pack.c:150

6861 #, c-format

6862 msgid "remote unpack failed: %s"

6863 msgstr "le dépaquetage a échoué : %s"

6864

6848 -#: send-pack.c:372

6865 +#: send-pack.c:374

6866 msgid "failed to sign the push certificate"

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

6868

6852 -#: send-pack.c:460

6869 +#: send-pack.c:467

6870 msgid "the receiving end does not support this repository's hash algorithm"

6871 msgstr "Le receveur ne gère pas l'algorithme d'empreinte de ce dépôt"

6872

6856 -#: send-pack.c:469

6873 +#: send-pack.c:476

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

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

6876

6860 -#: send-pack.c:471

6877 +#: send-pack.c:478

6878 msgid ""

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

6880 "signed push"

@@ -6865,47 +6882,47 @@ msgstr ""

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

6883 "poussées avec --signed"

6884

6868 -#: send-pack.c:483

6885 +#: send-pack.c:490

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

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

6888

6872 -#: send-pack.c:488

6889 +#: send-pack.c:495

6890 msgid "the receiving end does not support push options"

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

6892

6876 -#: sequencer.c:194

6893 +#: sequencer.c:195

6894 #, c-format

6895 msgid "invalid commit message cleanup mode '%s'"

6896 msgstr "mode de nettoyage invalide de message de validation '%s'"

6897

6881 -#: sequencer.c:308

6898 +#: sequencer.c:323

6899 #, c-format

6900 msgid "could not delete '%s'"

6901 msgstr "Impossible de supprimer '%s'"

6902

6886 -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6903 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385

6904 #, c-format

6905 msgid "could not remove '%s'"

6906 msgstr "impossible de supprimer '%s'"

6907

6891 -#: sequencer.c:339

6908 +#: sequencer.c:353

6909 msgid "revert"

6910 msgstr "revert"

6911

6895 -#: sequencer.c:341

6912 +#: sequencer.c:355

6913 msgid "cherry-pick"

6914 msgstr "cherry-pick"

6915

6899 -#: sequencer.c:343

6916 +#: sequencer.c:357

6917 msgid "rebase"

6918 msgstr "rebase"

6919

6903 -#: sequencer.c:345

6920 +#: sequencer.c:359

6921 #, c-format

6922 msgid "unknown action: %d"

6923 msgstr "action inconnue : %d"

6924

6908 -#: sequencer.c:404

6925 +#: sequencer.c:418

6926 msgid ""

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

6928 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6913,7 +6930,7 @@ msgstr ""

6930 "après résolution des conflits, marquez les chemins corrigés\n"

6931 "avec 'git add <chemins>' ou 'git rm <chemins>'"

6932

6916 -#: sequencer.c:407

6933 +#: sequencer.c:421

6934 msgid ""

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

6936 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6923,43 +6940,43 @@ msgstr ""

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

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

6942

6926 -#: sequencer.c:420 sequencer.c:3028

6943 +#: sequencer.c:434 sequencer.c:3062

6944 #, c-format

6945 msgid "could not lock '%s'"

6946 msgstr "impossible de verrouiller '%s'"

6947

6931 -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6932 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6948 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080

6949 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631

6950 #, c-format

6951 msgid "could not write to '%s'"

6952 msgstr "impossible d'écrire dans '%s'"

6953

6937 -#: sequencer.c:427

6954 +#: sequencer.c:441

6955 #, c-format

6956 msgid "could not write eol to '%s'"

6957 msgstr "impossible d'écrire la fin de ligne dans '%s'"

6958

6942 -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6943 -#: sequencer.c:3311

6959 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082

6960 +#: sequencer.c:3345

6961 #, c-format

6962 msgid "failed to finalize '%s'"

6963 msgstr "échec lors de la finalisation de '%s'"

6964

6948 -#: sequencer.c:471

6965 +#: sequencer.c:485

6966 #, c-format

6967 msgid "your local changes would be overwritten by %s."

6968 msgstr "vos modifications locales seraient écrasées par %s."

6969

6953 -#: sequencer.c:475

6970 +#: sequencer.c:489

6971 msgid "commit your changes or stash them to proceed."

6972 msgstr "validez vos modifications ou les remiser pour continuer."

6973

6957 -#: sequencer.c:507

6974 +#: sequencer.c:521

6975 #, c-format

6976 msgid "%s: fast-forward"

6977 msgstr "%s : avance rapide"

6978

6962 -#: sequencer.c:546 builtin/tag.c:566

6979 +#: sequencer.c:560 builtin/tag.c:566

6980 #, c-format

6981 msgid "Invalid cleanup mode %s"

6982 msgstr "Mode de nettoyage invalide %s"

@@ -6967,65 +6984,65 @@ msgstr "Mode de nettoyage invalide %s"

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

6985 #. "rebase".

6986 #.

6970 -#: sequencer.c:640

6987 +#: sequencer.c:670

6988 #, c-format

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

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

6991

6975 -#: sequencer.c:657

6992 +#: sequencer.c:687

6993 msgid "unable to update cache tree"

6994 msgstr "impossible de mettre à jour l'arbre de cache"

6995

6979 -#: sequencer.c:671

6996 +#: sequencer.c:701

6997 msgid "could not resolve HEAD commit"

6998 msgstr "impossible de résoudre le commit HEAD"

6999

6983 -#: sequencer.c:751

7000 +#: sequencer.c:781

7001 #, c-format

7002 msgid "no key present in '%.*s'"

7003 msgstr "aucune clé présente dans '%.*s'"

7004

6988 -#: sequencer.c:762

7005 +#: sequencer.c:792

7006 #, c-format

7007 msgid "unable to dequote value of '%s'"

7008 msgstr "Impossible de décoter la valeur de '%s'"

7009

6993 -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6994 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

7010 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710

7011 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908

7012 #, c-format

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

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

7015

6999 -#: sequencer.c:809

7016 +#: sequencer.c:839

7017 msgid "'GIT_AUTHOR_NAME' already given"

7018 msgstr "'GIT_AUTHOR_NAME' déjà fourni"

7019

7003 -#: sequencer.c:814

7020 +#: sequencer.c:844

7021 msgid "'GIT_AUTHOR_EMAIL' already given"

7022 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"

7023

7007 -#: sequencer.c:819

7024 +#: sequencer.c:849

7025 msgid "'GIT_AUTHOR_DATE' already given"

7026 msgstr "'GIT_AUTHOR_DATE' déjà fourni"

7027

7011 -#: sequencer.c:823

7028 +#: sequencer.c:853

7029 #, c-format

7030 msgid "unknown variable '%s'"

7031 msgstr "variable inconnue '%s'"

7032

7016 -#: sequencer.c:828

7033 +#: sequencer.c:858

7034 msgid "missing 'GIT_AUTHOR_NAME'"

7035 msgstr "'GIT_AUTHOR_NAME' manquant"

7036

7020 -#: sequencer.c:830

7037 +#: sequencer.c:860

7038 msgid "missing 'GIT_AUTHOR_EMAIL'"

7039 msgstr "'GIT_AUTHOR_EMAIL' manquant"

7040

7024 -#: sequencer.c:832

7041 +#: sequencer.c:862

7042 msgid "missing 'GIT_AUTHOR_DATE'"

7043 msgstr "'GIT_AUTHOR_DATE' manquant"

7044

7028 -#: sequencer.c:897

7045 +#: sequencer.c:927

7046 #, c-format

7047 msgid ""

7048 "you have staged changes in your working tree\n"

@@ -7054,11 +7071,11 @@ msgstr ""

7071 "\n"

7072 " git rebase --continue\n"

7073

7057 -#: sequencer.c:1178

7074 +#: sequencer.c:1208

7075 msgid "'prepare-commit-msg' hook failed"

7076 msgstr "échec du crochet 'prepare-commit-msg'"

7077

7061 -#: sequencer.c:1184

7078 +#: sequencer.c:1214

7079 msgid ""

7080 "Your name and email address were configured automatically based\n"

7081 "on your username and hostname. Please check that they are accurate.\n"

@@ -7087,7 +7104,7 @@ msgstr ""

7104 "\n"

7105 " git commit --amend --reset-author\n"

7106

7090 -#: sequencer.c:1197

7107 +#: sequencer.c:1227

7108 msgid ""

7109 "Your name and email address were configured automatically based\n"

7110 "on your username and hostname. Please check that they are accurate.\n"

@@ -7113,339 +7130,339 @@ msgstr ""

7130 "\n"

7131 " git commit --amend --reset-author\n"

7132

7116 -#: sequencer.c:1239

7133 +#: sequencer.c:1269

7134 msgid "couldn't look up newly created commit"

7135 msgstr "impossible de retrouver le commit nouvellement créé"

7136

7120 -#: sequencer.c:1241

7137 +#: sequencer.c:1271

7138 msgid "could not parse newly created commit"

7139 msgstr "impossible d'analyser le commit nouvellement créé"

7140

7124 -#: sequencer.c:1287

7141 +#: sequencer.c:1317

7142 msgid "unable to resolve HEAD after creating commit"

7143 msgstr "impossible de résoudre HEAD après création du commit"

7144

7128 -#: sequencer.c:1289

7145 +#: sequencer.c:1319

7146 msgid "detached HEAD"

7147 msgstr "HEAD détachée"

7148

7132 -#: sequencer.c:1293

7149 +#: sequencer.c:1323

7150 msgid " (root-commit)"

7151 msgstr " (commit racine)"

7152

7136 -#: sequencer.c:1314

7153 +#: sequencer.c:1344

7154 msgid "could not parse HEAD"

7155 msgstr "impossible de lire HEAD"

7156

7140 -#: sequencer.c:1316

7157 +#: sequencer.c:1346

7158 #, c-format

7159 msgid "HEAD %s is not a commit!"

7160 msgstr "HEAD %s n'est pas un commit !"

7161

7145 -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577

7162 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577

7163 msgid "could not parse HEAD commit"

7164 msgstr "impossible d'analyser le commit HEAD"

7165

7149 -#: sequencer.c:1373 sequencer.c:2067

7166 +#: sequencer.c:1403 sequencer.c:2100

7167 msgid "unable to parse commit author"

7168 msgstr "impossible d'analyser l'auteur du commit"

7169

7153 -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692

7170 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701

7171 msgid "git write-tree failed to write a tree"

7172 msgstr "git write-tree a échoué à écrire un arbre"

7173

7157 -#: sequencer.c:1417 sequencer.c:1535

7174 +#: sequencer.c:1447 sequencer.c:1565

7175 #, c-format

7176 msgid "unable to read commit message from '%s'"

7177 msgstr "impossible de lire le message de validation de '%s'"

7178

7162 -#: sequencer.c:1446 sequencer.c:1478

7179 +#: sequencer.c:1476 sequencer.c:1508

7180 #, c-format

7181 msgid "invalid author identity '%s'"

7182 msgstr "identité d'auteur invalide '%s'"

7183

7167 -#: sequencer.c:1452

7184 +#: sequencer.c:1482

7185 msgid "corrupt author: missing date information"

7186 msgstr "auteur corrompu : information de date manquante"

7187

7171 -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890

7172 -#: builtin/merge.c:915

7188 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904

7189 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78

7190 msgid "failed to write commit object"

7191 msgstr "échec de l'écriture de l'objet commit"

7192

7176 -#: sequencer.c:1518 sequencer.c:4237

7193 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198

7194 #, c-format

7195 msgid "could not update %s"

7196 msgstr "impossible de mettre à jour %s"

7197

7181 -#: sequencer.c:1567

7198 +#: sequencer.c:1597

7199 #, c-format

7200 msgid "could not parse commit %s"

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

7202

7186 -#: sequencer.c:1572

7203 +#: sequencer.c:1602

7204 #, c-format

7205 msgid "could not parse parent commit %s"

7206 msgstr "impossible d'analyser le commit parent %s"

7207

7191 -#: sequencer.c:1655 sequencer.c:1766

7208 +#: sequencer.c:1685 sequencer.c:1796

7209 #, c-format

7210 msgid "unknown command: %d"

7211 msgstr "commande inconnue : %d"

7212

7196 -#: sequencer.c:1713 sequencer.c:1738

7213 +#: sequencer.c:1743 sequencer.c:1768

7214 #, c-format

7215 msgid "This is a combination of %d commits."

7216 msgstr "Ceci est la combinaison de %d commits."

7217

7201 -#: sequencer.c:1723

7218 +#: sequencer.c:1753

7219 msgid "need a HEAD to fixup"

7220 msgstr "une HEAD est nécessaire à la correction"

7221

7205 -#: sequencer.c:1725 sequencer.c:3338

7222 +#: sequencer.c:1755 sequencer.c:3372

7223 msgid "could not read HEAD"

7224 msgstr "Impossible de lire HEAD"

7225

7209 -#: sequencer.c:1727

7226 +#: sequencer.c:1757

7227 msgid "could not read HEAD's commit message"

7228 msgstr "impossible de lire le message de validation de HEAD"

7229

7213 -#: sequencer.c:1733

7230 +#: sequencer.c:1763

7231 #, c-format

7232 msgid "cannot write '%s'"

7233 msgstr "impossible d'écrire '%s'"

7234

7218 -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486

7235 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486

7236 msgid "This is the 1st commit message:"

7237 msgstr "Ceci est le premier message de validation :"

7238

7222 -#: sequencer.c:1748

7239 +#: sequencer.c:1778

7240 #, c-format

7241 msgid "could not read commit message of %s"

7242 msgstr "impossible de lire le message de validation de %s"

7243

7227 -#: sequencer.c:1755

7244 +#: sequencer.c:1785

7245 #, c-format

7246 msgid "This is the commit message #%d:"

7247 msgstr "Ceci est le message de validation numéro %d :"

7248

7232 -#: sequencer.c:1761

7249 +#: sequencer.c:1791

7250 #, c-format

7251 msgid "The commit message #%d will be skipped:"

7252 msgstr "Le message de validation %d sera ignoré :"

7253

7237 -#: sequencer.c:1849

7254 +#: sequencer.c:1879

7255 msgid "your index file is unmerged."

7256 msgstr "votre fichier d'index n'est pas fusionné."

7257

7241 -#: sequencer.c:1856

7258 +#: sequencer.c:1886

7259 msgid "cannot fixup root commit"

7260 msgstr "impossible de réparer le commit racine"

7261

7245 -#: sequencer.c:1875

7262 +#: sequencer.c:1905

7263 #, c-format

7264 msgid "commit %s is a merge but no -m option was given."

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

7266

7250 -#: sequencer.c:1883 sequencer.c:1891

7267 +#: sequencer.c:1913 sequencer.c:1921

7268 #, c-format

7269 msgid "commit %s does not have parent %d"

7270 msgstr "le commit %s n'a pas de parent %d"

7271

7255 -#: sequencer.c:1897

7272 +#: sequencer.c:1927

7273 #, c-format

7274 msgid "cannot get commit message for %s"

7275 msgstr "impossible d'obtenir un message de validation pour %s"

7276

7277 #. TRANSLATORS: The first %s will be a "todo" command like

7278 #. "revert" or "pick", the second %s a SHA1.

7262 -#: sequencer.c:1916

7279 +#: sequencer.c:1946

7280 #, c-format

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

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

7283

7267 -#: sequencer.c:1981

7284 +#: sequencer.c:2011

7285 #, c-format

7286 msgid "could not rename '%s' to '%s'"

7287 msgstr "impossible de renommer '%s' en '%s'"

7288

7272 -#: sequencer.c:2038

7289 +#: sequencer.c:2071

7290 #, c-format

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

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

7293

7277 -#: sequencer.c:2039

7294 +#: sequencer.c:2072

7295 #, c-format

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

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

7298

7282 -#: sequencer.c:2059

7299 +#: sequencer.c:2092

7300 #, c-format

7301 msgid "dropping %s %s -- patch contents already upstream\n"

7302 msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"

7303

7287 -#: sequencer.c:2117

7304 +#: sequencer.c:2150

7305 #, c-format

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

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

7308

7292 -#: sequencer.c:2124

7309 +#: sequencer.c:2157

7310 #, c-format

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

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

7313

7297 -#: sequencer.c:2201

7314 +#: sequencer.c:2234

7315 #, c-format

7316 msgid "%s does not accept arguments: '%s'"

7317 msgstr "%s n'accepte pas d'argument : '%s'"

7318

7302 -#: sequencer.c:2210

7319 +#: sequencer.c:2243

7320 #, c-format

7321 msgid "missing arguments for %s"

7322 msgstr "argument manquant pour %s"

7323

7307 -#: sequencer.c:2241

7324 +#: sequencer.c:2274

7325 #, c-format

7326 msgid "could not parse '%s'"

7327 msgstr "impossible d'analyser '%s'"

7328

7312 -#: sequencer.c:2302

7329 +#: sequencer.c:2335

7330 #, c-format

7331 msgid "invalid line %d: %.*s"

7332 msgstr "ligne %d invalide : %.*s"

7333

7317 -#: sequencer.c:2313

7334 +#: sequencer.c:2346

7335 #, c-format

7336 msgid "cannot '%s' without a previous commit"

7337 msgstr "'%s' impossible avec le commit précédent"

7338

7322 -#: sequencer.c:2399

7339 +#: sequencer.c:2432

7340 msgid "cancelling a cherry picking in progress"

7341 msgstr "annulation d'un picorage en cours"

7342

7326 -#: sequencer.c:2408

7343 +#: sequencer.c:2441

7344 msgid "cancelling a revert in progress"

7345 msgstr "annulation d'un retour en cours"

7346

7330 -#: sequencer.c:2452

7347 +#: sequencer.c:2485

7348 msgid "please fix this using 'git rebase --edit-todo'."

7349 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

7350

7334 -#: sequencer.c:2454

7351 +#: sequencer.c:2487

7352 #, c-format

7353 msgid "unusable instruction sheet: '%s'"

7354 msgstr "feuille d'instruction inutilisable : '%s'"

7355

7339 -#: sequencer.c:2459

7356 +#: sequencer.c:2492

7357 msgid "no commits parsed."

7358 msgstr "aucun commit analysé."

7359

7343 -#: sequencer.c:2470

7360 +#: sequencer.c:2503

7361 msgid "cannot cherry-pick during a revert."

7362 msgstr "impossible de picorer pendant l'annulation d'un commit."

7363

7347 -#: sequencer.c:2472

7364 +#: sequencer.c:2505

7365 msgid "cannot revert during a cherry-pick."

7366 msgstr "impossible d'annuler un commit pendant un picorage."

7367

7351 -#: sequencer.c:2550

7368 +#: sequencer.c:2583

7369 #, c-format

7370 msgid "invalid value for %s: %s"

7371 msgstr "valeur invalide pour %s : %s"

7372

7356 -#: sequencer.c:2657

7373 +#: sequencer.c:2690

7374 msgid "unusable squash-onto"

7375 msgstr "\"écrase-sur\" inutilisable"

7376

7360 -#: sequencer.c:2677

7377 +#: sequencer.c:2710

7378 #, c-format

7379 msgid "malformed options sheet: '%s'"

7380 msgstr "feuille d'options malformée : %s"

7381

7365 -#: sequencer.c:2769 sequencer.c:4609

7382 +#: sequencer.c:2803 sequencer.c:4636

7383 msgid "empty commit set passed"

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

7385

7369 -#: sequencer.c:2786

7386 +#: sequencer.c:2820

7387 msgid "revert is already in progress"

7388 msgstr "un retour est déjà en cours"

7389

7373 -#: sequencer.c:2788

7390 +#: sequencer.c:2822

7391 #, c-format

7392 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7393 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""

7394

7378 -#: sequencer.c:2791

7395 +#: sequencer.c:2825

7396 msgid "cherry-pick is already in progress"

7397 msgstr "un picorage est déjà en cours"

7398

7382 -#: sequencer.c:2793

7399 +#: sequencer.c:2827

7400 #, c-format

7401 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7402 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""

7403

7387 -#: sequencer.c:2807

7404 +#: sequencer.c:2841

7405 #, c-format

7406 msgid "could not create sequencer directory '%s'"

7407 msgstr "impossible de créer le répertoire de séquenceur '%s'"

7408

7392 -#: sequencer.c:2822

7409 +#: sequencer.c:2856

7410 msgid "could not lock HEAD"

7411 msgstr "impossible de verrouiller HEAD"

7412

7396 -#: sequencer.c:2882 sequencer.c:4325

7413 +#: sequencer.c:2916 sequencer.c:4371

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

7415 msgstr "aucun picorage ou retour en cours"

7416

7400 -#: sequencer.c:2884 sequencer.c:2895

7417 +#: sequencer.c:2918 sequencer.c:2929

7418 msgid "cannot resolve HEAD"

7419 msgstr "impossible de résoudre HEAD"

7420

7404 -#: sequencer.c:2886 sequencer.c:2930

7421 +#: sequencer.c:2920 sequencer.c:2964

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

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

7424

7408 -#: sequencer.c:2916 builtin/grep.c:745

7425 +#: sequencer.c:2950 builtin/grep.c:756

7426 #, c-format

7427 msgid "cannot open '%s'"

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

7429

7413 -#: sequencer.c:2918

7430 +#: sequencer.c:2952

7431 #, c-format

7432 msgid "cannot read '%s': %s"

7433 msgstr "impossible de lire '%s' : %s"

7434

7418 -#: sequencer.c:2919

7435 +#: sequencer.c:2953

7436 msgid "unexpected end of file"

7437 msgstr "fin de fichier inattendue"

7438

7422 -#: sequencer.c:2925

7439 +#: sequencer.c:2959

7440 #, c-format

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

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

7443

7427 -#: sequencer.c:2936

7444 +#: sequencer.c:2970

7445 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

7446 msgstr ""

7447 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

7448

7432 -#: sequencer.c:2977

7449 +#: sequencer.c:3011

7450 msgid "no revert in progress"

7451 msgstr "Pas de retour en cours ?"

7452

7436 -#: sequencer.c:2986

7453 +#: sequencer.c:3020

7454 msgid "no cherry-pick in progress"

7455 msgstr "aucun picorage en cours"

7456

7440 -#: sequencer.c:2996

7457 +#: sequencer.c:3030

7458 msgid "failed to skip the commit"

7459 msgstr "échec du saut de commit"

7460

7444 -#: sequencer.c:3003

7461 +#: sequencer.c:3037

7462 msgid "there is nothing to skip"

7463 msgstr "il n'y a rien à sauter"

7464

7448 -#: sequencer.c:3006

7465 +#: sequencer.c:3040

7466 #, c-format

7467 msgid ""

7468 "have you committed already?\n"

@@ -7454,16 +7471,16 @@ msgstr ""

7471 "Avez-vous déjà validé ?\n"

7472 "essayez \"git %s -continue\""

7473

7457 -#: sequencer.c:3168 sequencer.c:4217

7474 +#: sequencer.c:3202 sequencer.c:4263

7475 msgid "cannot read HEAD"

7476 msgstr "impossible de lire HEAD"

7477

7461 -#: sequencer.c:3185

7478 +#: sequencer.c:3219

7479 #, c-format

7480 msgid "unable to copy '%s' to '%s'"

7481 msgstr "impossible de copier '%s' vers '%s'"

7482

7466 -#: sequencer.c:3193

7483 +#: sequencer.c:3227

7484 #, c-format

7485 msgid ""

7486 "You can amend the commit now, with\n"

@@ -7482,27 +7499,27 @@ msgstr ""

7499 "\n"

7500 " git rebase --continue\n"

7501

7485 -#: sequencer.c:3203

7502 +#: sequencer.c:3237

7503 #, c-format

7504 msgid "Could not apply %s... %.*s"

7505 msgstr "impossible d'appliquer %s... %.*s"

7506

7490 -#: sequencer.c:3210

7507 +#: sequencer.c:3244

7508 #, c-format

7509 msgid "Could not merge %.*s"

7510 msgstr "Impossible de fusionner %.*s"

7511

7495 -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641

7512 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640

7513 #, c-format

7514 msgid "could not copy '%s' to '%s'"

7515 msgstr "impossible de copier '%s' vers '%s'"

7516

7500 -#: sequencer.c:3240

7517 +#: sequencer.c:3274

7518 #, c-format

7519 msgid "Executing: %s\n"

7520 msgstr "Exécution : %s\n"

7521

7505 -#: sequencer.c:3255

7522 +#: sequencer.c:3289

7523 #, c-format

7524 msgid ""

7525 "execution failed: %s\n"

@@ -7517,11 +7534,11 @@ msgstr ""

7534 "git rebase --continue\n"

7535 "\n"

7536

7520 -#: sequencer.c:3261

7537 +#: sequencer.c:3295

7538 msgid "and made changes to the index and/or the working tree\n"

7539 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

7540

7524 -#: sequencer.c:3267

7541 +#: sequencer.c:3301

7542 #, c-format

7543 msgid ""

7544 "execution succeeded: %s\n"

@@ -7538,91 +7555,91 @@ msgstr ""

7555 " git rebase --continue\n"

7556 "\n"

7557

7541 -#: sequencer.c:3328

7558 +#: sequencer.c:3362

7559 #, c-format

7560 msgid "illegal label name: '%.*s'"

7561 msgstr "nom de label illégal '%.*s'"

7562

7546 -#: sequencer.c:3382

7563 +#: sequencer.c:3416

7564 msgid "writing fake root commit"

7565 msgstr "écriture d'un commit racine bidon"

7566

7550 -#: sequencer.c:3387

7567 +#: sequencer.c:3421

7568 msgid "writing squash-onto"

7569 msgstr "écriture de 'écraser-sur'"

7570

7554 -#: sequencer.c:3471

7571 +#: sequencer.c:3505

7572 #, c-format

7573 msgid "could not resolve '%s'"

7574 msgstr "impossible de résoudre '%s'"

7575

7559 -#: sequencer.c:3502

7576 +#: sequencer.c:3538

7577 msgid "cannot merge without a current revision"

7578 msgstr "impossible de fusionner avec une révision courante"

7579

7563 -#: sequencer.c:3524

7580 +#: sequencer.c:3560

7581 #, c-format

7582 msgid "unable to parse '%.*s'"

7583 msgstr "impossible d'analyser '%.*s'"

7584

7568 -#: sequencer.c:3533

7585 +#: sequencer.c:3569

7586 #, c-format

7587 msgid "nothing to merge: '%.*s'"

7588 msgstr "rien à fusionner : '%.*s'"

7589

7573 -#: sequencer.c:3545

7590 +#: sequencer.c:3581

7591 msgid "octopus merge cannot be executed on top of a [new root]"

7592 msgstr ""

7593 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"

7594

7578 -#: sequencer.c:3561

7595 +#: sequencer.c:3597

7596 #, c-format

7597 msgid "could not get commit message of '%s'"

7598 msgstr "impossible de lire le message de validation de '%s'"

7599

7583 -#: sequencer.c:3730

7600 +#: sequencer.c:3780

7601 #, c-format

7602 msgid "could not even attempt to merge '%.*s'"

7603 msgstr "impossible de seulement essayer de fusionner '%.*s'"

7604

7588 -#: sequencer.c:3746

7605 +#: sequencer.c:3796

7606 msgid "merge: Unable to write new index file"

7607 msgstr "fusion : Impossible d'écrire le nouveau fichier index"

7608

7592 -#: sequencer.c:3820

7609 +#: sequencer.c:3870

7610 msgid "Cannot autostash"

7611 msgstr "Autoremisage impossible"

7612

7596 -#: sequencer.c:3823

7613 +#: sequencer.c:3873

7614 #, c-format

7615 msgid "Unexpected stash response: '%s'"

7616 msgstr "réponse de remisage inattendue : '%s'"

7617

7601 -#: sequencer.c:3829

7618 +#: sequencer.c:3879

7619 #, c-format

7620 msgid "Could not create directory for '%s'"

7621 msgstr "Impossible de créer le répertoire pour '%s'"

7622

7606 -#: sequencer.c:3832

7623 +#: sequencer.c:3882

7624 #, c-format

7625 msgid "Created autostash: %s\n"

7626 msgstr "Autoremisage créé : %s\n"

7627

7611 -#: sequencer.c:3836

7628 +#: sequencer.c:3886

7629 msgid "could not reset --hard"

7630 msgstr "impossible de réinitialiser --hard"

7631

7615 -#: sequencer.c:3861

7632 +#: sequencer.c:3911

7633 #, c-format

7634 msgid "Applied autostash.\n"

7635 msgstr "Autoremisage appliqué.\n"

7636

7620 -#: sequencer.c:3873

7637 +#: sequencer.c:3923

7638 #, c-format

7639 msgid "cannot store %s"

7640 msgstr "impossible de stocker %s"

7641

7625 -#: sequencer.c:3876

7642 +#: sequencer.c:3926

7643 #, c-format

7644 msgid ""

7645 "%s\n"

@@ -7633,35 +7650,30 @@ msgstr ""

7650 "Vos modifications sont à l'abri dans la remise.\n"

7651 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

7652

7636 -#: sequencer.c:3881

7653 +#: sequencer.c:3931

7654 msgid "Applying autostash resulted in conflicts."

7655 msgstr "L'application du remisage automatique a créé des conflits."

7656

7640 -#: sequencer.c:3882

7657 +#: sequencer.c:3932

7658 msgid "Autostash exists; creating a new stash entry."

7659 msgstr ""

7660 "Un remisage automatique existe ; création d'une nouvelle entrée de remisage."

7661

7645 -#: sequencer.c:3974

7646 -#, c-format

7647 -msgid "%s: not a valid OID"

7648 -msgstr "%s n'est pas un OID valide"

7649 -

7650 -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769

7662 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769

7663 msgid "could not detach HEAD"

7664 msgstr "Impossible de détacher HEAD"

7665

7654 -#: sequencer.c:3994

7666 +#: sequencer.c:4040

7667 #, c-format

7668 msgid "Stopped at HEAD\n"

7669 msgstr "arrêt à HEAD\n"

7670

7659 -#: sequencer.c:3996

7671 +#: sequencer.c:4042

7672 #, c-format

7673 msgid "Stopped at %s\n"

7674 msgstr "Arrêté à %s\n"

7675

7664 -#: sequencer.c:4004

7676 +#: sequencer.c:4050

7677 #, c-format

7678 msgid ""

7679 "Could not execute the todo command\n"

@@ -7682,58 +7694,58 @@ msgstr ""

7694 " git rebase --edit-todo\n"

7695 " git rebase --continue\n"

7696

7685 -#: sequencer.c:4050

7697 +#: sequencer.c:4096

7698 #, c-format

7699 msgid "Rebasing (%d/%d)%s"

7700 msgstr "Rebasage (%d/%d)%s"

7701

7690 -#: sequencer.c:4095

7702 +#: sequencer.c:4141

7703 #, c-format

7704 msgid "Stopped at %s... %.*s\n"

7705 msgstr "arrêt à %s... %.*s\n"

7706

7695 -#: sequencer.c:4166

7707 +#: sequencer.c:4212

7708 #, c-format

7709 msgid "unknown command %d"

7710 msgstr "commande inconnue %d"

7711

7700 -#: sequencer.c:4225

7712 +#: sequencer.c:4271

7713 msgid "could not read orig-head"

7714 msgstr "impossible de lire orig-head"

7715

7704 -#: sequencer.c:4230

7716 +#: sequencer.c:4276

7717 msgid "could not read 'onto'"

7718 msgstr "impossible de lire 'onto'"

7719

7708 -#: sequencer.c:4244

7720 +#: sequencer.c:4290

7721 #, c-format

7722 msgid "could not update HEAD to %s"

7723 msgstr "impossible de mettre à jour HEAD sur %s"

7724

7713 -#: sequencer.c:4304

7725 +#: sequencer.c:4350

7726 #, c-format

7727 msgid "Successfully rebased and updated %s.\n"

7728 msgstr "Rebasage et mise à jour de %s avec succès.\n"

7729

7718 -#: sequencer.c:4337

7730 +#: sequencer.c:4383

7731 msgid "cannot rebase: You have unstaged changes."

7732 msgstr "impossible de rebaser : vous avez des modifications non indexées."

7733

7722 -#: sequencer.c:4346

7734 +#: sequencer.c:4392

7735 msgid "cannot amend non-existing commit"

7736 msgstr "impossible de corriger un commit non-existant"

7737

7726 -#: sequencer.c:4348

7738 +#: sequencer.c:4394

7739 #, c-format

7740 msgid "invalid file: '%s'"

7741 msgstr "fichier invalide : '%s'"

7742

7731 -#: sequencer.c:4350

7743 +#: sequencer.c:4396

7744 #, c-format

7745 msgid "invalid contents: '%s'"

7746 msgstr "contenu invalide : '%s'"

7747

7736 -#: sequencer.c:4353

7748 +#: sequencer.c:4399

7749 msgid ""

7750 "\n"

7751 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -7743,55 +7755,50 @@ msgstr ""

7755 "Vous avez des modifications non validées dans votre copie de travail.\n"

7756 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

7757

7746 -#: sequencer.c:4389 sequencer.c:4428

7758 +#: sequencer.c:4435 sequencer.c:4474

7759 #, c-format

7760 msgid "could not write file: '%s'"

7761 msgstr "impossible d'écrire le fichier : '%s'"

7762

7751 -#: sequencer.c:4444

7763 +#: sequencer.c:4490

7764 msgid "could not remove CHERRY_PICK_HEAD"

7765 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

7766

7755 -#: sequencer.c:4451

7767 +#: sequencer.c:4497

7768 msgid "could not commit staged changes."

7769 msgstr "impossible de valider les modifications indexées."

7770

7759 -#: sequencer.c:4477

7760 -#, c-format

7761 -msgid "invalid committer '%s'"

7762 -msgstr "validateur invalide '%s'"

7763 -

7764 -#: sequencer.c:4586

7771 +#: sequencer.c:4613

7772 #, c-format

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

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

7775

7769 -#: sequencer.c:4590

7776 +#: sequencer.c:4617

7777 #, c-format

7778 msgid "%s: bad revision"

7779 msgstr "%s : mauvaise révision"

7780

7774 -#: sequencer.c:4625

7781 +#: sequencer.c:4652

7782 msgid "can't revert as initial commit"

7783 msgstr "impossible d'annuler en tant que commit initial"

7784

7778 -#: sequencer.c:5102

7785 +#: sequencer.c:5129

7786 msgid "make_script: unhandled options"

7787 msgstr "make_script : options non gérées"

7788

7782 -#: sequencer.c:5105

7789 +#: sequencer.c:5132

7790 msgid "make_script: error preparing revisions"

7791 msgstr "make_script : erreur lors de la préparation des révisions"

7792

7786 -#: sequencer.c:5347 sequencer.c:5364

7793 +#: sequencer.c:5374 sequencer.c:5391

7794 msgid "nothing to do"

7795 msgstr "rien à faire"

7796

7790 -#: sequencer.c:5383

7797 +#: sequencer.c:5410

7798 msgid "could not skip unnecessary pick commands"

7799 msgstr "impossible d'éviter les commandes de picorage non nécessaires"

7800

7794 -#: sequencer.c:5480

7801 +#: sequencer.c:5504

7802 msgid "the script was already rearranged."

7803 msgstr "le script a déjà été réarrangé."

7804

@@ -7964,260 +7971,260 @@ msgstr "échec de la bifurcation"

7971 msgid "setsid failed"

7972 msgstr "échec du setsid"

7973

7967 -#: sha1-file.c:470

7974 +#: sha1-file.c:480

7975 #, c-format

7976 msgid "object directory %s does not exist; check .git/objects/info/alternates"

7977 msgstr ""

7978 "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"

7979

7973 -#: sha1-file.c:521

7980 +#: sha1-file.c:531

7981 #, c-format

7982 msgid "unable to normalize alternate object path: %s"

7983 msgstr "impossible de normaliser le chemin d'objet alternatif : %s"

7984

7978 -#: sha1-file.c:593

7985 +#: sha1-file.c:603

7986 #, c-format

7987 msgid "%s: ignoring alternate object stores, nesting too deep"

7988 msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"

7989

7983 -#: sha1-file.c:600

7990 +#: sha1-file.c:610

7991 #, c-format

7992 msgid "unable to normalize object directory: %s"

7993 msgstr "impossible de normaliser le répertoire d'objet : %s"

7994

7988 -#: sha1-file.c:643

7995 +#: sha1-file.c:653

7996 msgid "unable to fdopen alternates lockfile"

7997 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"

7998

7992 -#: sha1-file.c:661

7999 +#: sha1-file.c:671

8000 msgid "unable to read alternates file"

8001 msgstr "lecture du fichier d'alternatives impossible"

8002

7996 -#: sha1-file.c:668

8003 +#: sha1-file.c:678

8004 msgid "unable to move new alternates file into place"

8005 msgstr "impossible de déplacer le nouveau fichier d'alternative"

8006

8000 -#: sha1-file.c:703

8007 +#: sha1-file.c:713

8008 #, c-format

8009 msgid "path '%s' does not exist"

8010 msgstr "le chemin '%s' n'existe pas"

8011

8005 -#: sha1-file.c:724

8012 +#: sha1-file.c:734

8013 #, c-format

8014 msgid "reference repository '%s' as a linked checkout is not supported yet."

8015 msgstr ""

8016 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

8017 "encore supporté."

8018

8012 -#: sha1-file.c:730

8019 +#: sha1-file.c:740

8020 #, c-format

8021 msgid "reference repository '%s' is not a local repository."

8022 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

8023

8017 -#: sha1-file.c:736

8024 +#: sha1-file.c:746

8025 #, c-format

8026 msgid "reference repository '%s' is shallow"

8027 msgstr "le dépôt de référence '%s' est superficiel"

8028

8022 -#: sha1-file.c:744

8029 +#: sha1-file.c:754

8030 #, c-format

8031 msgid "reference repository '%s' is grafted"

8032 msgstr "le dépôt de référence '%s' est greffé"

8033

8027 -#: sha1-file.c:804

8034 +#: sha1-file.c:814

8035 #, c-format

8036 msgid "invalid line while parsing alternate refs: %s"

8037 msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"

8038

8032 -#: sha1-file.c:954

8039 +#: sha1-file.c:964

8040 #, c-format

8041 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

8042 msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"

8043

8037 -#: sha1-file.c:975

8044 +#: sha1-file.c:985

8045 msgid "mmap failed"

8046 msgstr "échec de mmap"

8047

8041 -#: sha1-file.c:1139

8048 +#: sha1-file.c:1149

8049 #, c-format

8050 msgid "object file %s is empty"

8051 msgstr "le fichier objet %s est vide"

8052

8046 -#: sha1-file.c:1274 sha1-file.c:2467

8053 +#: sha1-file.c:1284 sha1-file.c:2477

8054 #, c-format

8055 msgid "corrupt loose object '%s'"

8056 msgstr "objet libre corrompu '%s'"

8057

8051 -#: sha1-file.c:1276 sha1-file.c:2471

8058 +#: sha1-file.c:1286 sha1-file.c:2481

8059 #, c-format

8060 msgid "garbage at end of loose object '%s'"

8061 msgstr "données incorrectes à la fin de l'objet libre '%s'"

8062

8056 -#: sha1-file.c:1318

8063 +#: sha1-file.c:1328

8064 msgid "invalid object type"

8065 msgstr "type d'objet invalide"

8066

8060 -#: sha1-file.c:1402

8067 +#: sha1-file.c:1412

8068 #, c-format

8069 msgid "unable to unpack %s header with --allow-unknown-type"

8070 msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"

8071

8065 -#: sha1-file.c:1405

8072 +#: sha1-file.c:1415

8073 #, c-format

8074 msgid "unable to unpack %s header"

8075 msgstr "impossible de dépaqueter l'entête %s"

8076

8070 -#: sha1-file.c:1411

8077 +#: sha1-file.c:1421

8078 #, c-format

8079 msgid "unable to parse %s header with --allow-unknown-type"

8080 msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"

8081

8075 -#: sha1-file.c:1414

8082 +#: sha1-file.c:1424

8083 #, c-format

8084 msgid "unable to parse %s header"

8085 msgstr "impossible d'analyser l'entête %s"

8086

8080 -#: sha1-file.c:1641

8087 +#: sha1-file.c:1651

8088 #, c-format

8089 msgid "failed to read object %s"

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

8091

8085 -#: sha1-file.c:1645

8092 +#: sha1-file.c:1655

8093 #, c-format

8094 msgid "replacement %s not found for %s"

8095 msgstr "remplacement %s non trouvé pour %s"

8096

8090 -#: sha1-file.c:1649

8097 +#: sha1-file.c:1659

8098 #, c-format

8099 msgid "loose object %s (stored in %s) is corrupt"

8100 msgstr "l'objet libre %s (stocké dans %s) est corrompu"

8101

8095 -#: sha1-file.c:1653

8102 +#: sha1-file.c:1663

8103 #, c-format

8104 msgid "packed object %s (stored in %s) is corrupt"

8105 msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"

8106

8100 -#: sha1-file.c:1758

8107 +#: sha1-file.c:1768

8108 #, c-format

8109 msgid "unable to write file %s"

8110 msgstr "impossible d'écrire le fichier %s"

8111

8105 -#: sha1-file.c:1765

8112 +#: sha1-file.c:1775

8113 #, c-format

8114 msgid "unable to set permission to '%s'"

8115 msgstr "impossible de régler les droits de '%s'"

8116

8110 -#: sha1-file.c:1772

8117 +#: sha1-file.c:1782

8118 msgid "file write error"

8119 msgstr "erreur d'écriture d'un fichier"

8120

8114 -#: sha1-file.c:1792

8121 +#: sha1-file.c:1802

8122 msgid "error when closing loose object file"

8123 msgstr "erreur en fermeture du fichier d'objet esseulé"

8124

8118 -#: sha1-file.c:1857

8125 +#: sha1-file.c:1867

8126 #, c-format

8127 msgid "insufficient permission for adding an object to repository database %s"

8128 msgstr ""

8129 "droits insuffisants pour ajouter un objet à la base de données %s du dépôt"

8130

8124 -#: sha1-file.c:1859

8131 +#: sha1-file.c:1869

8132 msgid "unable to create temporary file"

8133 msgstr "impossible de créer un fichier temporaire"

8134

8128 -#: sha1-file.c:1883

8135 +#: sha1-file.c:1893

8136 msgid "unable to write loose object file"

8137 msgstr "impossible d'écrire le fichier d'objet esseulé"

8138

8132 -#: sha1-file.c:1889

8139 +#: sha1-file.c:1899

8140 #, c-format

8141 msgid "unable to deflate new object %s (%d)"

8142 msgstr "impossible de compresser le nouvel objet %s (%d)"

8143

8137 -#: sha1-file.c:1893

8144 +#: sha1-file.c:1903

8145 #, c-format

8146 msgid "deflateEnd on object %s failed (%d)"

8147 msgstr "échec de deflateEnd sur l'objet %s (%d)"

8148

8142 -#: sha1-file.c:1897

8149 +#: sha1-file.c:1907

8150 #, c-format

8151 msgid "confused by unstable object source data for %s"

8152 msgstr "données de source d'objet instable pour %s"

8153

8147 -#: sha1-file.c:1907 builtin/pack-objects.c:1086

8154 +#: sha1-file.c:1917 builtin/pack-objects.c:1086

8155 #, c-format

8156 msgid "failed utime() on %s"

8157 msgstr "échec de utime() sur %s"

8158

8152 -#: sha1-file.c:1984

8159 +#: sha1-file.c:1994

8160 #, c-format

8161 msgid "cannot read object for %s"

8162 msgstr "impossible de lire l'objet pour %s"

8163

8157 -#: sha1-file.c:2035

8164 +#: sha1-file.c:2045

8165 msgid "corrupt commit"

8166 msgstr "commit corrompu"

8167

8161 -#: sha1-file.c:2043

8168 +#: sha1-file.c:2053

8169 msgid "corrupt tag"

8170 msgstr "étiquette corrompue"

8171

8165 -#: sha1-file.c:2143

8172 +#: sha1-file.c:2153

8173 #, c-format

8174 msgid "read error while indexing %s"

8175 msgstr "erreur de lecture à l'indexation de %s"

8176

8170 -#: sha1-file.c:2146

8177 +#: sha1-file.c:2156

8178 #, c-format

8179 msgid "short read while indexing %s"

8180 msgstr "lecture tronquée pendant l'indexation de %s"

8181

8175 -#: sha1-file.c:2219 sha1-file.c:2229

8182 +#: sha1-file.c:2229 sha1-file.c:2239

8183 #, c-format

8184 msgid "%s: failed to insert into database"

8185 msgstr "%s : échec de l'insertion dans la base de données"

8186

8180 -#: sha1-file.c:2235

8187 +#: sha1-file.c:2245

8188 #, c-format

8189 msgid "%s: unsupported file type"

8190 msgstr "%s : type de fichier non supporté"

8191

8185 -#: sha1-file.c:2259

8192 +#: sha1-file.c:2269

8193 #, c-format

8194 msgid "%s is not a valid object"

8195 msgstr "%s n'est pas un objet valide"

8196

8190 -#: sha1-file.c:2261

8197 +#: sha1-file.c:2271

8198 #, c-format

8199 msgid "%s is not a valid '%s' object"

8200 msgstr "%s n'est pas un objet '%s' valide"

8201

8195 -#: sha1-file.c:2288 builtin/index-pack.c:192

8202 +#: sha1-file.c:2298 builtin/index-pack.c:192

8203 #, c-format

8204 msgid "unable to open %s"

8205 msgstr "impossible d'ouvrir %s"

8206

8200 -#: sha1-file.c:2478 sha1-file.c:2531

8207 +#: sha1-file.c:2488 sha1-file.c:2541

8208 #, c-format

8209 msgid "hash mismatch for %s (expected %s)"

8210 msgstr "incohérence de hachage pour %s (%s attendu)"

8211

8205 -#: sha1-file.c:2502

8212 +#: sha1-file.c:2512

8213 #, c-format

8214 msgid "unable to mmap %s"

8215 msgstr "impossible de mmap %s"

8216

8210 -#: sha1-file.c:2507

8217 +#: sha1-file.c:2517

8218 #, c-format

8219 msgid "unable to unpack header of %s"

8220 msgstr "impossible de dépaqueter l'entête de %s"

8221

8215 -#: sha1-file.c:2513

8222 +#: sha1-file.c:2523

8223 #, c-format

8224 msgid "unable to parse header of %s"

8225 msgstr "impossible d'analyser l'entête de %s"

8226

8220 -#: sha1-file.c:2524

8227 +#: sha1-file.c:2534

8228 #, c-format

8229 msgid "unable to unpack contents of %s"

8230 msgstr "impossible de dépaqueter le contenu de %s"

@@ -8375,8 +8382,8 @@ msgid_plural "%u bytes/s"

8382 msgstr[0] "%u octet/s"

8383 msgstr[1] "%u octets/s"

8384

8378 -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733

8379 -#: builtin/rebase.c:858

8385 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719

8386 +#: builtin/rebase.c:864

8387 #, c-format

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

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

@@ -8614,7 +8621,7 @@ msgstr "échec de la commande trailer '%s'"

8621 msgid "unknown value '%s' for key '%s'"

8622 msgstr "valeur inconnue '%s' pour la clé '%s'"

8623

8617 -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323

8624 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324

8625 #, c-format

8626 msgid "more than one %s"

8627 msgstr "plus d'un %s"

@@ -8702,7 +8709,7 @@ msgstr "impossible de lancer fast-import"

8709 msgid "error while running fast-import"

8710 msgstr "erreur au lancement de fast-import"

8711

8705 -#: transport-helper.c:549 transport-helper.c:1226

8712 +#: transport-helper.c:549 transport-helper.c:1236

8713 #, c-format

8714 msgid "could not read ref %s"

8715 msgstr "impossible de lire la réf %s"

@@ -8722,7 +8729,7 @@ msgstr ""

8729 msgid "invalid remote service path"

8730 msgstr "chemin de service distant invalide"

8731

8725 -#: transport-helper.c:661 transport.c:1428

8732 +#: transport-helper.c:661 transport.c:1446

8733 msgid "operation not supported by protocol"

8734 msgstr "option non supportée par le protocole"

8735

@@ -8740,56 +8747,61 @@ msgstr "'option' sans directive 'ok/error' correspondante"

8747 msgid "expected ok/error, helper said '%s'"

8748 msgstr "ok/error attendu, l'assistant a dit '%s'"

8749

8743 -#: transport-helper.c:841

8750 +#: transport-helper.c:845

8751 #, c-format

8752 msgid "helper reported unexpected status of %s"

8753 msgstr "l'assistant a renvoyé un statut de retour inattendu %s"

8754

8748 -#: transport-helper.c:924

8755 +#: transport-helper.c:928

8756 #, c-format

8757 msgid "helper %s does not support dry-run"

8758 msgstr "l'assistant %s ne gère pas dry-run"

8759

8753 -#: transport-helper.c:927

8760 +#: transport-helper.c:931

8761 #, c-format

8762 msgid "helper %s does not support --signed"

8763 msgstr "l'assistant %s ne gère pas --signed"

8764

8758 -#: transport-helper.c:930

8765 +#: transport-helper.c:934

8766 #, c-format

8767 msgid "helper %s does not support --signed=if-asked"

8768 msgstr "l'assistant %s ne gère pas --signed=if-asked"

8769

8763 -#: transport-helper.c:935

8770 +#: transport-helper.c:939

8771 #, c-format

8772 msgid "helper %s does not support --atomic"

8773 msgstr "l'assistant %s ne gère pas --atomic"

8774

8768 -#: transport-helper.c:941

8775 +#: transport-helper.c:943

8776 +#, c-format

8777 +msgid "helper %s does not support --%s"

8778 +msgstr "l'assistant %s ne gère pas --%s"

8779 +

8780 +#: transport-helper.c:950

8781 #, c-format

8782 msgid "helper %s does not support 'push-option'"

8783 msgstr "l'assistant %s ne gère pas 'push-option'"

8784

8773 -#: transport-helper.c:1040

8785 +#: transport-helper.c:1050

8786 msgid "remote-helper doesn't support push; refspec needed"

8787 msgstr ""

8788 "l'assistant %s ne gère pas push ; un spécificateur de référence est "

8789 "nécessaire"

8790

8779 -#: transport-helper.c:1045

8791 +#: transport-helper.c:1055

8792 #, c-format

8793 msgid "helper %s does not support 'force'"

8794 msgstr "l'assistant %s ne gère pas 'force'"

8795

8784 -#: transport-helper.c:1092

8796 +#: transport-helper.c:1102

8797 msgid "couldn't run fast-export"

8798 msgstr "impossible de lancer fast-export"

8799

8788 -#: transport-helper.c:1097

8800 +#: transport-helper.c:1107

8801 msgid "error while running fast-export"

8802 msgstr "erreur au lancement de fast-export"

8803

8792 -#: transport-helper.c:1122

8804 +#: transport-helper.c:1132

8805 #, c-format

8806 msgid ""

8807 "No refs in common and none specified; doing nothing.\n"

@@ -8798,52 +8810,52 @@ msgstr ""

8810 "Aucune référence en commun et aucune spécfiée ; rien à faire.\n"

8811 "Vous devriez peut-être spécifier une branche.\n"

8812

8801 -#: transport-helper.c:1203

8813 +#: transport-helper.c:1213

8814 #, c-format

8815 msgid "unsupported object format '%s'"

8816 msgstr "format d'objet non géré '%s'"

8817

8806 -#: transport-helper.c:1212

8818 +#: transport-helper.c:1222

8819 #, c-format

8820 msgid "malformed response in ref list: %s"

8821 msgstr "réponse malformée dans le liste de réfs : %s"

8822

8811 -#: transport-helper.c:1364

8823 +#: transport-helper.c:1374

8824 #, c-format

8825 msgid "read(%s) failed"

8826 msgstr "échec de read(%s)"

8827

8816 -#: transport-helper.c:1391

8828 +#: transport-helper.c:1401

8829 #, c-format

8830 msgid "write(%s) failed"

8831 msgstr "échec de write(%s)"

8832

8821 -#: transport-helper.c:1440

8833 +#: transport-helper.c:1450

8834 #, c-format

l10n: fr.po: v2.30.0 rnd 1