2233806207 · matheusbsbs/matheus-bagliano

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

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2014-02-01 08:06+0800\n"

77 -"PO-Revision-Date: 2014-02-02 14:35+0100\n"

76 +"POT-Creation-Date: 2014-04-19 12:50+0800\n"

77 +"PO-Revision-Date: 2014-04-22 21:28+0200\n"

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

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

80 "Language: fr\n"

@@ -83,16 +83,12 @@ msgstr ""

83 "Content-Transfer-Encoding: 8bit\n"

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

85

86 -#: advice.c:57

86 +#: advice.c:55

87 #, c-format

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

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

90

91 -#.

92 -#. * Message used both when 'git commit' fails and when

93 -#. * other commands doing a merge do.

94 -#.

95 -#: advice.c:87

91 +#: advice.c:85

92 msgid ""

93 "Fix them up in the work tree,\n"

94 "and then use 'git add/rm <file>' as\n"

@@ -123,76 +119,76 @@ msgstr ""

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

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

121

126 -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

122 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

123 #, c-format

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

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

126

131 -#: archive.c:327

127 +#: archive.c:328

128 msgid "fmt"

129 msgstr "fmt"

130

135 -#: archive.c:327

131 +#: archive.c:328

132 msgid "archive format"

133 msgstr "format d'archive"

134

139 -#: archive.c:328 builtin/log.c:1193

135 +#: archive.c:329 builtin/log.c:1193

136 msgid "prefix"

137 msgstr "préfixe"

138

143 -#: archive.c:329

139 +#: archive.c:330

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

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

142

147 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

148 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

149 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

150 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

151 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

143 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

144 +#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

145 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

146 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

147 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

148 msgid "file"

149 msgstr "fichier"

150

155 -#: archive.c:331 builtin/archive.c:89

151 +#: archive.c:332 builtin/archive.c:89

152 msgid "write the archive to this file"

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

154

159 -#: archive.c:333

155 +#: archive.c:334

156 msgid "read .gitattributes in working directory"

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

158

163 -#: archive.c:334

159 +#: archive.c:335

160 msgid "report archived files on stderr"

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

162

167 -#: archive.c:335

163 +#: archive.c:336

164 msgid "store only"

165 msgstr "stockage seulement"

166

171 -#: archive.c:336

167 +#: archive.c:337

168 msgid "compress faster"

169 msgstr "compression rapide"

170

175 -#: archive.c:344

171 +#: archive.c:345

172 msgid "compress better"

173 msgstr "compression efficace"

174

179 -#: archive.c:347

175 +#: archive.c:348

176 msgid "list supported archive formats"

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

178

183 -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

179 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

180 msgid "repo"

181 msgstr "dépôt"

182

187 -#: archive.c:350 builtin/archive.c:91

183 +#: archive.c:351 builtin/archive.c:91

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

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

186

191 -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

187 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

188 msgid "command"

189 msgstr "commande"

190

195 -#: archive.c:352 builtin/archive.c:93

191 +#: archive.c:353 builtin/archive.c:93

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

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

194

@@ -209,90 +205,85 @@ msgstr ""

205 msgid "Not setting branch %s as its own upstream."

206 msgstr "La branche %s ne peut pas être sa propre branche amont."

207

212 -#: branch.c:82

208 +#: branch.c:83

209 #, c-format

210 msgid "Branch %s set up to track remote branch %s from %s by rebasing."

211 msgstr ""

212 "La branche %s est paramétrée pour suivre la branche distante %s de %s en "

213 "rebasant."

214

219 -#: branch.c:83

215 +#: branch.c:84

216 #, c-format

217 msgid "Branch %s set up to track remote branch %s from %s."

218 msgstr ""

219 "La branche %s est paramétrée pour suivre la branche distante %s depuis %s."

220

225 -#: branch.c:87

221 +#: branch.c:88

222 #, c-format

223 msgid "Branch %s set up to track local branch %s by rebasing."

224 msgstr ""

225 "La branche %s est paramétrée pour suivre la branche locale %s en rebasant."

226

231 -#: branch.c:88

227 +#: branch.c:89

228 #, c-format

229 msgid "Branch %s set up to track local branch %s."

230 msgstr "La branche %s est paramétrée pour suivre la branche locale %s."

231

236 -#: branch.c:92

232 +#: branch.c:94

233 #, c-format

234 msgid "Branch %s set up to track remote ref %s by rebasing."

235 msgstr ""

236 "La branche %s est paramétrée pour suivre la référence distante %s en "

237 "rebasant."

238

243 -#: branch.c:93

239 +#: branch.c:95

240 #, c-format

241 msgid "Branch %s set up to track remote ref %s."

242 msgstr "La branche %s est paramétrée pour suivre la référence distante %s."

243

248 -#: branch.c:97

244 +#: branch.c:99

245 #, c-format

246 msgid "Branch %s set up to track local ref %s by rebasing."

247 msgstr ""

248 "La branche %s est paramétrée pour suivre la référence locale %s en rebasant."

249

254 -#: branch.c:98

250 +#: branch.c:100

251 #, c-format

252 msgid "Branch %s set up to track local ref %s."

253 msgstr "La branche %s est paramétrée pour suivre la référence locale %s."

254

259 -#: branch.c:118

260 -#, c-format

261 -msgid "Tracking not set up: name too long: %s"

262 -msgstr "Suivi de branche non paramétré : le nom est trop long : %s"

263 -

264 -#: branch.c:137

255 +#: branch.c:133

256 #, c-format

257 msgid "Not tracking: ambiguous information for ref %s"

258 msgstr "Pas de suivi : information ambiguë pour la référence %s"

259

269 -#: branch.c:182

260 +#: branch.c:178

261 #, c-format

262 msgid "'%s' is not a valid branch name."

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

264

274 -#: branch.c:187

265 +#: branch.c:183

266 #, c-format

267 msgid "A branch named '%s' already exists."

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

269

279 -#: branch.c:195

270 +#: branch.c:191

271 msgid "Cannot force update the current branch."

272 msgstr "Impossible de forcer la mise à jour de la branche courante."

273

283 -#: branch.c:215

274 +#: branch.c:211

275 #, c-format

276 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

277 msgstr ""

278 "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "

279 "pas une branche."

280

290 -#: branch.c:217

281 +#: branch.c:213

282 #, c-format

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

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

285

295 -#: branch.c:219

286 +#: branch.c:215

287 msgid ""

288 "\n"

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

@@ -312,113 +303,113 @@ msgstr ""

303 "sa jumelle distante, vous souhaiterez utiliser \"git push -u\"\n"

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

305

315 -#: branch.c:264

306 +#: branch.c:260

307 #, c-format

308 msgid "Not a valid object name: '%s'."

309 msgstr "Nom d'objet invalide : '%s'."

310

320 -#: branch.c:284

311 +#: branch.c:280

312 #, c-format

313 msgid "Ambiguous object name: '%s'."

314 msgstr "Nom d'objet ambigu : '%s'."

315

325 -#: branch.c:289

316 +#: branch.c:285

317 #, c-format

318 msgid "Not a valid branch point: '%s'."

319 msgstr "Point d'embranchement invalide : '%s'."

320

330 -#: branch.c:295

321 +#: branch.c:291

322 msgid "Failed to lock ref for update"

323 msgstr "Échec du verrouillage de la référence pour mise à jour"

324

334 -#: branch.c:313

325 +#: branch.c:309

326 msgid "Failed to write ref"

327 msgstr "Échec de l'écriture de la référence"

328

338 -#: bundle.c:37

329 +#: bundle.c:33

330 #, c-format

331 msgid "'%s' does not look like a v2 bundle file"

332 msgstr "'%s' ne semble pas être un fichier bundle v2"

333

343 -#: bundle.c:64

334 +#: bundle.c:60

335 #, c-format

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

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

338

348 -#: bundle.c:90 builtin/commit.c:706

339 +#: bundle.c:86 builtin/commit.c:706

340 #, c-format

341 msgid "could not open '%s'"

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

343

353 -#: bundle.c:141

344 +#: bundle.c:138

345 msgid "Repository lacks these prerequisite commits:"

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

347

357 -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

348 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

349 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

350 #: builtin/shortlog.c:158

351 msgid "revision walk setup failed"

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

353

363 -#: bundle.c:187

354 +#: bundle.c:184

355 #, c-format

356 msgid "The bundle contains this ref:"

357 msgid_plural "The bundle contains these %d refs:"

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

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

360

370 -#: bundle.c:194

361 +#: bundle.c:191

362 msgid "The bundle records a complete history."

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

364

374 -#: bundle.c:196

365 +#: bundle.c:193

366 #, c-format

367 msgid "The bundle requires this ref:"

368 msgid_plural "The bundle requires these %d refs:"

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

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

371

381 -#: bundle.c:296

372 +#: bundle.c:293

373 msgid "rev-list died"

374 msgstr "rev-list a disparu"

375

385 -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

376 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

377 #, c-format

378 msgid "unrecognized argument: %s"

379 msgstr "argument non reconnu : %s"

380

390 -#: bundle.c:337

381 +#: bundle.c:334

382 #, c-format

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

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

385

395 -#: bundle.c:382

386 +#: bundle.c:379

387 msgid "Refusing to create empty bundle."

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

389

399 -#: bundle.c:398

390 +#: bundle.c:395

391 msgid "Could not spawn pack-objects"

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

393

403 -#: bundle.c:416

394 +#: bundle.c:413

395 msgid "pack-objects died"

396 msgstr "les objets groupés ont disparu"

397

407 -#: bundle.c:419

398 +#: bundle.c:416

399 #, c-format

400 msgid "cannot create '%s'"

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

402

412 -#: bundle.c:441

403 +#: bundle.c:438

404 msgid "index-pack died"

405 msgstr "l'index de groupe a disparu"

406

416 -#: commit.c:53

407 +#: commit.c:54

408 #, c-format

409 msgid "could not parse %s"

410 msgstr "impossible d'analyser %s"

411

421 -#: commit.c:55

412 +#: commit.c:56

413 #, c-format

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

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

@@ -494,6 +485,7 @@ msgid_plural "%lu years"

485 msgstr[0] "%lu an"

486 msgstr[1] "%lu ans"

487

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

489 #: date.c:149

490 #, c-format

491 msgid "%s, %lu month ago"

@@ -513,6 +505,10 @@ msgstr[1] "il y a %lu ans"

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

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

507

508 +#: diffcore-rename.c:517

509 +msgid "Performing inexact rename detection"

510 +msgstr "Détection de renommage inexact en cours"

511 +

512 #: diff.c:113

513 #, c-format

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

@@ -539,7 +535,7 @@ msgstr ""

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

536 "%s"

537

542 -#: diff.c:3509

538 +#: diff.c:3495

539 #, c-format

540 msgid ""

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

@@ -548,7 +544,7 @@ msgstr ""

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

545 "%s"

546

551 -#: diff.c:3523

547 +#: diff.c:3509

548 #, c-format

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

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

@@ -575,35 +571,35 @@ msgstr "impossible de créer un fichier temporaire '%s' : %s"

571 msgid "failed writing detached signature to '%s': %s"

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

573

578 -#: grep.c:1695

574 +#: grep.c:1698

575 #, c-format

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

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

578

583 -#: grep.c:1712

579 +#: grep.c:1715

580 #, c-format

581 msgid "'%s': %s"

582 msgstr "'%s' : %s"

583

588 -#: grep.c:1723

584 +#: grep.c:1726

585 #, c-format

586 msgid "'%s': short read %s"

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

588

593 -#: help.c:210

589 +#: help.c:209

590 #, c-format

591 msgid "available git commands in '%s'"

592 msgstr "commandes git disponibles dans '%s'"

593

598 -#: help.c:217

594 +#: help.c:216

595 msgid "git commands available from elsewhere on your $PATH"

596 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

597

602 -#: help.c:233

598 +#: help.c:232

599 msgid "The most commonly used git commands are:"

600 msgstr "Les commandes git les plus utilisées sont :"

601

606 -#: help.c:290

602 +#: help.c:289

603 #, c-format

604 msgid ""

605 "'%s' appears to be a git command, but we were not\n"

@@ -612,11 +608,11 @@ msgstr ""

608 "'%s' semble être une commande git, mais elle n'a pas pu\n"

609 "être exécutée. Peut-être git-%s est-elle cassée ?"

610

615 -#: help.c:347

611 +#: help.c:346

612 msgid "Uh oh. Your system reports no Git commands at all."

613 msgstr "Ahem. Votre système n'indique aucune commande Git."

614

619 -#: help.c:369

615 +#: help.c:368

616 #, c-format

617 msgid ""

618 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -626,17 +622,17 @@ msgstr ""

622 "pas.\n"

623 "Poursuite en supposant que vous avez voulu dire '%s'"

624

629 -#: help.c:374

625 +#: help.c:373

626 #, c-format

627 msgid "in %0.1f seconds automatically..."

628 msgstr "dans %0.1f secondes automatiquement..."

629

634 -#: help.c:381

630 +#: help.c:380

631 #, c-format

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

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

634

639 -#: help.c:385 help.c:444

635 +#: help.c:384 help.c:443

636 msgid ""

637 "\n"

638 "Did you mean this?"

@@ -650,7 +646,7 @@ msgstr[1] ""

646 "\n"

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

648

653 -#: help.c:440

649 +#: help.c:439

650 #, c-format

651 msgid "%s: %s - %s"

652 msgstr "%s: %s - %s"

@@ -659,7 +655,7 @@ msgstr "%s: %s - %s"

655 msgid "failed to read the cache"

656 msgstr "impossible de lire le cache"

657

662 -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

658 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

659 #: builtin/clone.c:661

660 msgid "unable to write new index file"

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

@@ -669,75 +665,73 @@ msgstr "impossible d'écrire le nouveau fichier d'index"

665 msgid "(bad commit)\n"

666 msgstr "(mauvais commit)\n"

667

672 -#: merge-recursive.c:206

668 +#: merge-recursive.c:208

669 #, c-format

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

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

672

677 -#: merge-recursive.c:269

673 +#: merge-recursive.c:271

674 msgid "error building trees"

675 msgstr "erreur de construction des arbres"

676

681 -#: merge-recursive.c:673

677 +#: merge-recursive.c:675

678 #, c-format

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

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

681

686 -#: merge-recursive.c:684

682 +#: merge-recursive.c:686

683 #, c-format

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

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

686

691 -#. something else exists

692 -#. .. but not some other error (who really cares what?)

693 -#: merge-recursive.c:698 merge-recursive.c:719

687 +#: merge-recursive.c:700 merge-recursive.c:721

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

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

690

697 -#: merge-recursive.c:709

691 +#: merge-recursive.c:711

692 #, c-format

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

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

695

702 -#: merge-recursive.c:749

696 +#: merge-recursive.c:751

697 #, c-format

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

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

700

707 -#: merge-recursive.c:751

701 +#: merge-recursive.c:753

702 #, c-format

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

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

705

712 -#: merge-recursive.c:774 builtin/clone.c:317

706 +#: merge-recursive.c:776 builtin/clone.c:317

707 #, c-format

708 msgid "failed to open '%s'"

709 msgstr "échec à l'ouverture de '%s'"

710

717 -#: merge-recursive.c:782

711 +#: merge-recursive.c:784

712 #, c-format

713 msgid "failed to symlink '%s'"

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

715

722 -#: merge-recursive.c:785

716 +#: merge-recursive.c:787

717 #, c-format

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

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

720

727 -#: merge-recursive.c:923

721 +#: merge-recursive.c:925

722 msgid "Failed to execute internal merge"

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

724

731 -#: merge-recursive.c:927

725 +#: merge-recursive.c:929

726 #, c-format

727 msgid "Unable to add %s to database"

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

729

736 -#: merge-recursive.c:943

730 +#: merge-recursive.c:945

731 msgid "unsupported object type in the tree"

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

733

740 -#: merge-recursive.c:1022 merge-recursive.c:1036

734 +#: merge-recursive.c:1024 merge-recursive.c:1038

735 #, c-format

736 msgid ""

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

@@ -746,7 +740,7 @@ msgstr ""

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

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

742

749 -#: merge-recursive.c:1028 merge-recursive.c:1041

743 +#: merge-recursive.c:1030 merge-recursive.c:1043

744 #, c-format

745 msgid ""

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

@@ -755,20 +749,20 @@ msgstr ""

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

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

751

758 -#: merge-recursive.c:1082

752 +#: merge-recursive.c:1084

753 msgid "rename"

754 msgstr "renommage"

755

762 -#: merge-recursive.c:1082 wt-status.c:283

756 +#: merge-recursive.c:1084

757 msgid "renamed"

758 msgstr "renommé"

759

766 -#: merge-recursive.c:1138

760 +#: merge-recursive.c:1140

761 #, c-format

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

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

764

771 -#: merge-recursive.c:1160

765 +#: merge-recursive.c:1162

766 #, c-format

767 msgid ""

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

@@ -777,146 +771,146 @@ msgstr ""

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

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

773

780 -#: merge-recursive.c:1165

774 +#: merge-recursive.c:1167

775 msgid " (left unresolved)"

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

777

784 -#: merge-recursive.c:1219

778 +#: merge-recursive.c:1221

779 #, c-format

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

781 msgstr ""

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

783 ">'%s' dans %s"

784

791 -#: merge-recursive.c:1249

785 +#: merge-recursive.c:1251

786 #, c-format

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

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

789

796 -#: merge-recursive.c:1448

790 +#: merge-recursive.c:1450

791 #, c-format

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

793 msgstr ""

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

795

802 -#: merge-recursive.c:1458

796 +#: merge-recursive.c:1460

797 #, c-format

798 msgid "Adding merged %s"

799 msgstr "Ajout de %s fusionné"

800

807 -#: merge-recursive.c:1463 merge-recursive.c:1661

801 +#: merge-recursive.c:1465 merge-recursive.c:1663

802 #, c-format

803 msgid "Adding as %s instead"

804 msgstr "Ajout plutôt comme %s"

805

812 -#: merge-recursive.c:1514

806 +#: merge-recursive.c:1516

807 #, c-format

808 msgid "cannot read object %s"

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

810

817 -#: merge-recursive.c:1517

811 +#: merge-recursive.c:1519

812 #, c-format

813 msgid "object %s is not a blob"

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

815

822 -#: merge-recursive.c:1565

816 +#: merge-recursive.c:1567

817 msgid "modify"

818 msgstr "modification"

819

826 -#: merge-recursive.c:1565 wt-status.c:281

820 +#: merge-recursive.c:1567

821 msgid "modified"

822 msgstr "modifié"

823

830 -#: merge-recursive.c:1575

824 +#: merge-recursive.c:1577

825 msgid "content"

826 msgstr "contenu"

827

834 -#: merge-recursive.c:1582

828 +#: merge-recursive.c:1584

829 msgid "add/add"

830 msgstr "ajout/ajout"

831

838 -#: merge-recursive.c:1616

832 +#: merge-recursive.c:1618

833 #, c-format

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

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

836

843 -#: merge-recursive.c:1630

837 +#: merge-recursive.c:1632

838 #, c-format

839 msgid "Auto-merging %s"

840 msgstr "Fusion automatique de %s"

841

848 -#: merge-recursive.c:1634 git-submodule.sh:1148

842 +#: merge-recursive.c:1636 git-submodule.sh:1149

843 msgid "submodule"

844 msgstr "sous-module"

845

852 -#: merge-recursive.c:1635

846 +#: merge-recursive.c:1637

847 #, c-format

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

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

850

857 -#: merge-recursive.c:1725

851 +#: merge-recursive.c:1727

852 #, c-format

853 msgid "Removing %s"

854 msgstr "Suppression de %s"

855

862 -#: merge-recursive.c:1750

856 +#: merge-recursive.c:1752

857 msgid "file/directory"

858 msgstr "fichier/répertoire"

859

866 -#: merge-recursive.c:1756

860 +#: merge-recursive.c:1758

861 msgid "directory/file"

862 msgstr "répertoire/fichier"

863

870 -#: merge-recursive.c:1761

864 +#: merge-recursive.c:1763

865 #, c-format

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

867 msgstr ""

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

869

876 -#: merge-recursive.c:1771

870 +#: merge-recursive.c:1773

871 #, c-format

872 msgid "Adding %s"

873 msgstr "Ajout de %s"

874

881 -#: merge-recursive.c:1788

875 +#: merge-recursive.c:1790

876 msgid "Fatal merge failure, shouldn't happen."

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

878

885 -#: merge-recursive.c:1807

879 +#: merge-recursive.c:1809

880 msgid "Already up-to-date!"

881 msgstr "Déjà à jour !"

882

889 -#: merge-recursive.c:1816

883 +#: merge-recursive.c:1818

884 #, c-format

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

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

887

894 -#: merge-recursive.c:1846

888 +#: merge-recursive.c:1848

889 #, c-format

890 msgid "Unprocessed path??? %s"

891 msgstr "Chemin non traité ??? %s"

892

899 -#: merge-recursive.c:1891

893 +#: merge-recursive.c:1893

894 msgid "Merging:"

895 msgstr "Fusion :"

896

903 -#: merge-recursive.c:1904

897 +#: merge-recursive.c:1906

898 #, c-format

899 msgid "found %u common ancestor:"

900 msgid_plural "found %u common ancestors:"

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

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

903

910 -#: merge-recursive.c:1941

904 +#: merge-recursive.c:1943

905 msgid "merge returned no commit"

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

907

914 -#: merge-recursive.c:1998

908 +#: merge-recursive.c:2000

909 #, c-format

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

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

912

919 -#: merge-recursive.c:2010 builtin/merge.c:665

913 +#: merge-recursive.c:2012 builtin/merge.c:668

914 msgid "Unable to write index."

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

916

@@ -941,33 +935,33 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

935 msgid "Bad %s value: '%s'"

936 msgstr "Mauvaise valeur de %s : '%s'"

937

944 -#: object.c:202

938 +#: object.c:229

939 #, c-format

940 msgid "unable to parse object: %s"

941 msgstr "impossible d'analyser l'objet : %s"

942

949 -#: parse-options.c:537

943 +#: parse-options.c:532

944 msgid "..."

945 msgstr "..."

946

953 -#: parse-options.c:555

947 +#: parse-options.c:550

948 #, c-format

949 msgid "usage: %s"

950 msgstr "usage : %s"

951

952 #. TRANSLATORS: the colon here should align with the

953 #. one in "usage: %s" translation

960 -#: parse-options.c:559

954 +#: parse-options.c:554

955 #, c-format

956 msgid " or: %s"

957 msgstr " ou : %s"

958

965 -#: parse-options.c:562

959 +#: parse-options.c:557

960 #, c-format

961 msgid " %s"

962 msgstr " %s"

963

970 -#: parse-options.c:596

964 +#: parse-options.c:591

965 msgid "-NUM"

966 msgstr "-NUM"

967

@@ -1019,11 +1013,6 @@ msgstr "%s : '%s' est hors du dépôt"

1013 msgid "Pathspec '%s' is in submodule '%.*s'"

1014 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

1015

1022 -#.

1023 -#. * We may want to substitute "this command" with a command

1024 -#. * name. E.g. when add--interactive dies when running

1025 -#. * "checkout -p"

1026 -#.

1016 #: pathspec.c:353

1017 #, c-format

1018 msgid "%s: pathspec magic not supported by this command: %s"

@@ -1044,56 +1033,73 @@ msgstr ""

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

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

1035

1047 -#: remote.c:753

1036 +#: progress.c:224

1037 +msgid "done"

1038 +msgstr "fait"

1039 +

1040 +#: read-cache.c:1238

1041 +#, c-format

1042 +msgid ""

1043 +"index.version set, but the value is invalid.\n"

1044 +"Using version %i"

1045 +msgstr ""

1046 +"version d'index renseignée, mais la valeur est invalide.\n"

1047 +"Utilisation de la version %i"

1048 +

1049 +#: read-cache.c:1248

1050 +#, c-format

1051 +msgid ""

1052 +"GIT_INDEX_VERSION set, but the value is invalid.\n"

1053 +"Using version %i"

1054 +msgstr ""

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

1056 +"Utilisation de la version %i"

1057 +

1058 +#: remote.c:758

1059 #, c-format

1060 msgid "Cannot fetch both %s and %s to %s"

1061 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

1062

1052 -#: remote.c:757

1063 +#: remote.c:762

1064 #, c-format

1065 msgid "%s usually tracks %s, not %s"

1066 msgstr "%s suit habituellement %s, pas %s"

1067

1057 -#: remote.c:761

1068 +#: remote.c:766

1069 #, c-format

1070 msgid "%s tracks both %s and %s"

1071 msgstr "%s suit à la fois %s et %s"

1072

1062 -#.

1063 -#. * This last possibility doesn't occur because

1064 -#. * FETCH_HEAD_IGNORE entries always appear at

1065 -#. * the end of the list.

1066 -#.

1067 -#: remote.c:769

1073 +#: remote.c:774

1074 msgid "Internal error"

1075 msgstr "Erreur interne"

1076

1071 -#: remote.c:1871

1077 +#: remote.c:1948

1078 #, c-format

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

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

1081

1076 -#: remote.c:1875

1082 +#: remote.c:1952

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

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

1085

1080 -#: remote.c:1878

1086 +#: remote.c:1955

1087 #, c-format

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

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

1090

1085 -#: remote.c:1882

1091 +#: remote.c:1959

1092 #, c-format

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

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

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

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

1097

1092 -#: remote.c:1888

1098 +#: remote.c:1965

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

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

1101

1096 -#: remote.c:1891

1102 +#: remote.c:1968

1103 #, c-format

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

1105 msgid_plural ""

@@ -1105,11 +1111,11 @@ msgstr[1] ""

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

1112 "en avance rapide.\n"

1113

1108 -#: remote.c:1899

1114 +#: remote.c:1976

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

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

1117

1112 -#: remote.c:1902

1118 +#: remote.c:1979

1119 #, c-format

1120 msgid ""

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

@@ -1124,7 +1130,7 @@ msgstr[1] ""

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

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

1132

1127 -#: remote.c:1912

1133 +#: remote.c:1989

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

1135 msgstr ""

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

@@ -1138,14 +1144,14 @@ msgstr "échec de l'ouverture de /dev/null"

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

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

1146

1141 -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1142 -#: builtin/merge.c:1006 builtin/merge.c:1016

1147 +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1148 +#: builtin/merge.c:1009 builtin/merge.c:1019

1149 #, c-format

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

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

1152

1147 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1148 -#: builtin/merge.c:1008 builtin/merge.c:1021

1153 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1154 +#: builtin/merge.c:1011 builtin/merge.c:1024

1155 #, c-format

1156 msgid "Could not write to '%s'"

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

@@ -1168,7 +1174,7 @@ msgstr ""

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

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

1176

1171 -#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1177 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1178 #, c-format

1179 msgid "Could not write to %s"

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

@@ -1204,31 +1210,31 @@ msgstr "Impossible de résoudre le commit HEAD\n"

1210 msgid "Unable to update cache tree\n"

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

1212

1207 -#: sequencer.c:423

1213 +#: sequencer.c:430

1214 #, c-format

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

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

1217

1212 -#: sequencer.c:428

1218 +#: sequencer.c:435

1219 #, c-format

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

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

1222

1217 -#: sequencer.c:494

1223 +#: sequencer.c:501

1224 msgid "Your index file is unmerged."

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

1226

1221 -#: sequencer.c:513

1227 +#: sequencer.c:520

1228 #, c-format

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

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

1231

1226 -#: sequencer.c:521

1232 +#: sequencer.c:528

1233 #, c-format

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

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

1236

1231 -#: sequencer.c:525

1237 +#: sequencer.c:532

1238 #, c-format

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

1240 msgstr ""

@@ -1237,153 +1243,153 @@ msgstr ""

1243

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

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

1240 -#: sequencer.c:538

1246 +#: sequencer.c:545

1247 #, c-format

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

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

1250

1245 -#: sequencer.c:542

1251 +#: sequencer.c:549

1252 #, c-format

1253 msgid "Cannot get commit message for %s"

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

1255

1250 -#: sequencer.c:628

1256 +#: sequencer.c:635

1257 #, c-format

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

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

1260

1255 -#: sequencer.c:629

1261 +#: sequencer.c:636

1262 #, c-format

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

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

1265

1260 -#: sequencer.c:665

1266 +#: sequencer.c:672

1267 msgid "empty commit set passed"

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

1269

1264 -#: sequencer.c:673

1270 +#: sequencer.c:680

1271 #, c-format

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

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

1274

1269 -#: sequencer.c:678

1275 +#: sequencer.c:685

1276 #, c-format

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

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

1279

1274 -#: sequencer.c:736

1280 +#: sequencer.c:743

1281 #, c-format

1282 msgid "Cannot %s during a %s"

1283 msgstr "Impossible de %s pendant un %s"

1284

1279 -#: sequencer.c:758

1285 +#: sequencer.c:765

1286 #, c-format

1287 msgid "Could not parse line %d."

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

1289

1284 -#: sequencer.c:763

1290 +#: sequencer.c:770

1291 msgid "No commits parsed."

1292 msgstr "Aucun commit analysé."

1293

1288 -#: sequencer.c:776

1294 +#: sequencer.c:783

1295 #, c-format

1296 msgid "Could not open %s"

1297 msgstr "Impossible d'ouvrir %s"

1298

1293 -#: sequencer.c:780

1299 +#: sequencer.c:787

1300 #, c-format

1301 msgid "Could not read %s."

1302 msgstr "Impossible de lire %s."

1303

1298 -#: sequencer.c:787

1304 +#: sequencer.c:794

1305 #, c-format

1306 msgid "Unusable instruction sheet: %s"

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

1308

1303 -#: sequencer.c:815

1309 +#: sequencer.c:824

1310 #, c-format

1311 msgid "Invalid key: %s"

1312 msgstr "Clé invalide: %s"

1313

1308 -#: sequencer.c:818

1314 +#: sequencer.c:827

1315 #, c-format

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

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

1318

1313 -#: sequencer.c:830

1319 +#: sequencer.c:839

1320 #, c-format

1321 msgid "Malformed options sheet: %s"

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

1323

1318 -#: sequencer.c:851

1324 +#: sequencer.c:860

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

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

1327

1322 -#: sequencer.c:852

1328 +#: sequencer.c:861

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

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

1331

1326 -#: sequencer.c:856

1332 +#: sequencer.c:865

1333 #, c-format

1334 msgid "Could not create sequencer directory %s"

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

1336

1331 -#: sequencer.c:872 sequencer.c:957

1337 +#: sequencer.c:881 sequencer.c:966

1338 #, c-format

1339 msgid "Error wrapping up %s."

1340 msgstr "Erreur lors de l'emballage de %s."

1341

1336 -#: sequencer.c:891 sequencer.c:1025

1342 +#: sequencer.c:900 sequencer.c:1036

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

1344 msgstr "aucun picorage ou retour en cours"

1345

1340 -#: sequencer.c:893

1346 +#: sequencer.c:902

1347 msgid "cannot resolve HEAD"

1348 msgstr "impossible de résoudre HEAD"

1349

1344 -#: sequencer.c:895

1350 +#: sequencer.c:904

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

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

1353

1348 -#: sequencer.c:917 builtin/apply.c:4061

1354 +#: sequencer.c:926 builtin/apply.c:4061

1355 #, c-format

1356 msgid "cannot open %s: %s"

1357 msgstr "impossible d'ouvrir %s : %s"

1358

1353 -#: sequencer.c:920

1359 +#: sequencer.c:929

1360 #, c-format

1361 msgid "cannot read %s: %s"

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

1363

1358 -#: sequencer.c:921

1364 +#: sequencer.c:930

1365 msgid "unexpected end of file"

1366 msgstr "fin de fichier inattendue"

1367

1362 -#: sequencer.c:927

1368 +#: sequencer.c:936

1369 #, c-format

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

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

1372

1367 -#: sequencer.c:950

1373 +#: sequencer.c:959

1374 #, c-format

1375 msgid "Could not format %s."

1376 msgstr "Impossible de formater %s."

1377

1372 -#: sequencer.c:1093

1378 +#: sequencer.c:1104

1379 #, c-format

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

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

1382

1377 -#: sequencer.c:1096

1383 +#: sequencer.c:1107

1384 #, c-format

1385 msgid "%s: bad revision"

1386 msgstr "%s : mauvaise révision"

1387

1382 -#: sequencer.c:1130

1388 +#: sequencer.c:1141

1389 msgid "Can't revert as initial commit"

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

1391

1386 -#: sequencer.c:1131

1392 +#: sequencer.c:1142

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

1394 msgstr "Impossible de picorer vers une HEAD vide"

1395

@@ -1412,21 +1418,21 @@ msgstr ""

1418 "message\n"

1419 "en lançant \"git config advice.objectNameWarning false\""

1420

1415 -#: sha1_name.c:1070

1421 +#: sha1_name.c:1072

1422 msgid "HEAD does not point to a branch"

1423 msgstr "HEAD ne pointe pas sur une branche"

1424

1419 -#: sha1_name.c:1073

1425 +#: sha1_name.c:1075

1426 #, c-format

1427 msgid "No such branch: '%s'"

1428 msgstr "Branche inconnue : '%s'"

1429

1424 -#: sha1_name.c:1075

1430 +#: sha1_name.c:1077

1431 #, c-format

1432 msgid "No upstream configured for branch '%s'"

1433 msgstr "Aucune branche amont configurée pour la branche '%s'"

1434

1429 -#: sha1_name.c:1079

1435 +#: sha1_name.c:1081

1436 #, c-format

1437 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

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

@@ -1442,53 +1448,35 @@ msgstr ""

1448 msgid "Could not find section in .gitmodules where path=%s"

1449 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

1450

1445 -#. Maybe the user already did that, don't error out here

1451 #: submodule.c:76

1452 #, c-format

1453 msgid "Could not update .gitmodules entry %s"

1454 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

1455

1456 # ici %s est un chemin

1452 -#. Maybe the user already did that, don't error out here

1457 #: submodule.c:109

1458 #, c-format

1459 msgid "Could not remove .gitmodules entry for %s"

1460 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1461

1458 -#: submodule.c:127

1459 -msgid "could not find .gitmodules in index"

1460 -msgstr "impossible de trouver .gitmodules dans l'index"

1461 -

1462 -#: submodule.c:133

1463 -msgid "reading updated .gitmodules failed"

1464 -msgstr "échec de la lecture du .gitmodules mis à jour"

1465 -

1466 -#: submodule.c:135

1467 -msgid "unable to stat updated .gitmodules"

1468 -msgstr "échec de stat du .gitmodules mis à jour"

1469 -

1470 -#: submodule.c:139

1471 -msgid "unable to remove .gitmodules from index"

1472 -msgstr "suppression du .gitmodules dans l'index impossible"

1473 -

1474 -#: submodule.c:141

1475 -msgid "adding updated .gitmodules failed"

1476 -msgstr "échec de l'ajout du .gitmodules mis à jour"

1477 -

1478 -#: submodule.c:143

1462 +#: submodule.c:120

1463 msgid "staging updated .gitmodules failed"

1464 msgstr "échec de la mise en index du .gitmodules mis à jour"

1465

1482 -#: submodule.c:1144 builtin/init-db.c:363

1466 +#: submodule.c:1121 builtin/init-db.c:363

1467 #, c-format

1468 msgid "Could not create git link %s"

1469 msgstr "Impossible de créer le lien git %s"

1470

1487 -#: submodule.c:1155

1471 +#: submodule.c:1132

1472 #, c-format

1473 msgid "Could not set core.worktree in %s"

1474 msgstr "Impossible de paramétrer core.worktree dans %s"

1475

1476 +#: unpack-trees.c:206

1477 +msgid "Checking out files"

1478 +msgstr "Extraction des fichiers"

1479 +

1480 #: urlmatch.c:120

1481 msgid "invalid URL scheme name or missing '://' suffix"

1482 msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"

@@ -1603,88 +1591,97 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)"

1591 msgstr ""

1592 " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"

1593

1606 -#: wt-status.c:254

1607 -msgid "bug"

1608 -msgstr "bogue"

1609 -

1610 -#: wt-status.c:259

1594 +#: wt-status.c:252

1595 msgid "both deleted:"

1596 msgstr "supprimé des deux côtés :"

1597

1614 -#: wt-status.c:260

1598 +#: wt-status.c:254

1599 msgid "added by us:"

1600 msgstr "ajouté par nous :"

1601

1618 -#: wt-status.c:261

1602 +#: wt-status.c:256

1603 msgid "deleted by them:"

1604 msgstr "supprimé par eux :"

1605

1622 -#: wt-status.c:262

1606 +#: wt-status.c:258

1607 msgid "added by them:"

1608 msgstr "ajouté par eux :"

1609

1626 -#: wt-status.c:263

1610 +#: wt-status.c:260

1611 msgid "deleted by us:"

1612 msgstr "supprimé par nous :"

1613

1630 -#: wt-status.c:264

1614 +#: wt-status.c:262

1615 msgid "both added:"

1616 msgstr "ajouté de deux côtés :"

1617

1634 -#: wt-status.c:265

1618 +#: wt-status.c:264

1619 msgid "both modified:"

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

1621

1638 -#: wt-status.c:275

1639 -msgid "new file"

1640 -msgstr "nouveau fichier"

1622 +#: wt-status.c:266

1623 +#, c-format

1624 +msgid "bug: unhandled unmerged status %x"

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

1626 +

1627 +#: wt-status.c:274

1628 +msgid "new file:"

1629 +msgstr "nouveau fichier :"

1630

1642 -#: wt-status.c:277

1643 -msgid "copied"

1644 -msgstr "copié"

1631 +#: wt-status.c:276

1632 +msgid "copied:"

1633 +msgstr "copié :"

1634

1646 -#: wt-status.c:279

1647 -msgid "deleted"

1648 -msgstr "supprimé"

1635 +#: wt-status.c:278

1636 +msgid "deleted:"

1637 +msgstr "supprimé :"

1638

1650 -#: wt-status.c:285

1651 -msgid "typechange"

1652 -msgstr "modif. type"

1639 +#: wt-status.c:280

1640 +msgid "modified:"

1641 +msgstr "modifié :"

1642

1654 -#: wt-status.c:287

1655 -msgid "unknown"

1656 -msgstr "inconnu"

1643 +#: wt-status.c:282

1644 +msgid "renamed:"

1645 +msgstr "renommé :"

1646

1658 -#: wt-status.c:289

1659 -msgid "unmerged"

1660 -msgstr "non fusionné"

1647 +#: wt-status.c:284

1648 +msgid "typechange:"

1649 +msgstr "modif. type :"

1650

1662 -#: wt-status.c:336

1651 +#: wt-status.c:286

1652 +msgid "unknown:"

1653 +msgstr "inconnu :"

1654 +

1655 +#: wt-status.c:288

1656 +msgid "unmerged:"

1657 +msgstr "non fusionné :"

1658 +

1659 +#: wt-status.c:370

1660 msgid "new commits, "

1661 msgstr "nouveaux commits, "

1662

1666 -#: wt-status.c:338

1663 +#: wt-status.c:372

1664 msgid "modified content, "

1665 msgstr "contenu modifié, "

1666

1670 -#: wt-status.c:340

1667 +#: wt-status.c:374

1668 msgid "untracked content, "

1669 msgstr "contenu non suivi, "

1670

1674 -#: wt-status.c:357

1671 +#: wt-status.c:391

1672 #, c-format

1673 msgid "bug: unhandled diff status %c"

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

1675

1679 -#: wt-status.c:732

1676 +#: wt-status.c:765

1677 msgid "Submodules changed but not updated:"

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

1679

1683 -#: wt-status.c:734

1680 +#: wt-status.c:767

1681 msgid "Submodule changes to be committed:"

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

1683

1687 -#: wt-status.c:836

1684 +#: wt-status.c:846

1685 msgid ""

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

1687 "Everything below will be removed."

@@ -1692,68 +1689,68 @@ msgstr ""

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

1690 "Tout se qui suit sera éliminé."

1691

1695 -#: wt-status.c:899

1692 +#: wt-status.c:937

1693 msgid "You have unmerged paths."

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

1695

1699 -#: wt-status.c:902

1696 +#: wt-status.c:940

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

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

1699

1703 -#: wt-status.c:905

1700 +#: wt-status.c:943

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

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

1703

1707 -#: wt-status.c:908

1704 +#: wt-status.c:946

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

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

1707

1711 -#: wt-status.c:918

1708 +#: wt-status.c:956

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

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

1711

1715 -#: wt-status.c:921

1712 +#: wt-status.c:959

1713 msgid "The current patch is empty."

1714 msgstr "Le patch actuel est vide."

1715

1719 -#: wt-status.c:925

1716 +#: wt-status.c:963

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

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

1719

1723 -#: wt-status.c:927

1720 +#: wt-status.c:965

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

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

1723

1727 -#: wt-status.c:929

1724 +#: wt-status.c:967

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

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

1727

1731 -#: wt-status.c:989 wt-status.c:1006

1728 +#: wt-status.c:1027 wt-status.c:1044

1729 #, c-format

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

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

1732

1736 -#: wt-status.c:994 wt-status.c:1011

1733 +#: wt-status.c:1032 wt-status.c:1049

1734 msgid "You are currently rebasing."

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

1736

1740 -#: wt-status.c:997

1737 +#: wt-status.c:1035

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

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

1740

1744 -#: wt-status.c:999

1741 +#: wt-status.c:1037

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

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

1744

1748 -#: wt-status.c:1001

1745 +#: wt-status.c:1039

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

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

1748

1752 -#: wt-status.c:1014

1749 +#: wt-status.c:1052

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

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

1752

1756 -#: wt-status.c:1018

1753 +#: wt-status.c:1056

1754 #, c-format

1755 msgid ""

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

@@ -1761,120 +1758,120 @@ msgstr ""

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

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

1760

1764 -#: wt-status.c:1023

1761 +#: wt-status.c:1061

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

1763 msgstr ""

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

1765

1769 -#: wt-status.c:1026

1766 +#: wt-status.c:1064

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

1768 msgstr ""

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

1770

1774 -#: wt-status.c:1030

1771 +#: wt-status.c:1068

1772 #, c-format

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

1774 msgstr ""

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

1776 "branche '%s' sur '%s'."

1777

1781 -#: wt-status.c:1035

1778 +#: wt-status.c:1073

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

1780 msgstr ""

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

1782

1786 -#: wt-status.c:1038

1783 +#: wt-status.c:1076

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

1785 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

1786

1790 -#: wt-status.c:1040

1787 +#: wt-status.c:1078

1788 msgid ""

1789 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1790 msgstr ""

1791 " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "

1792 "modifications)"

1793

1797 -#: wt-status.c:1050

1794 +#: wt-status.c:1088

1795 #, c-format

1796 msgid "You are currently cherry-picking commit %s."

1797 msgstr "Vous êtes actuellement en train de picorer le commit %s."

1798

1802 -#: wt-status.c:1055

1799 +#: wt-status.c:1093

1800 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1801 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

1802

1806 -#: wt-status.c:1058

1803 +#: wt-status.c:1096

1804 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1805 msgstr ""

1806 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

1807

1811 -#: wt-status.c:1060

1808 +#: wt-status.c:1098

1809 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1810 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

1811

1815 -#: wt-status.c:1069

1812 +#: wt-status.c:1107

1813 #, c-format

1814 msgid "You are currently reverting commit %s."

1815 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

1816

1820 -#: wt-status.c:1074

1817 +#: wt-status.c:1112

1818 msgid " (fix conflicts and run \"git revert --continue\")"

1819 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

1820

1824 -#: wt-status.c:1077

1821 +#: wt-status.c:1115

1822 msgid " (all conflicts fixed: run \"git revert --continue\")"

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

1824

1828 -#: wt-status.c:1079

1825 +#: wt-status.c:1117

1826 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1827 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

1828

1832 -#: wt-status.c:1090

1829 +#: wt-status.c:1128

1830 #, c-format

1831 msgid "You are currently bisecting, started from branch '%s'."

1832 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

1833

1837 -#: wt-status.c:1094

1834 +#: wt-status.c:1132

1835 msgid "You are currently bisecting."

1836 msgstr "Vous êtes en cours de bissection."

1837

1841 -#: wt-status.c:1097

1838 +#: wt-status.c:1135

1839 msgid " (use \"git bisect reset\" to get back to the original branch)"

1840 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

1841

1845 -#: wt-status.c:1272

1842 +#: wt-status.c:1310

1843 msgid "On branch "

1844 msgstr "Sur la branche "

1845

1849 -#: wt-status.c:1279

1846 +#: wt-status.c:1317

1847 msgid "rebase in progress; onto "

1848 msgstr "rebasage en cours ; sur "

1849

1853 -#: wt-status.c:1286

1850 +#: wt-status.c:1324

1851 msgid "HEAD detached at "

1852 msgstr "HEAD détachée sur "

1853

1857 -#: wt-status.c:1288

1854 +#: wt-status.c:1326

1855 msgid "HEAD detached from "

1856 msgstr "HEAD détachée depuis "

1857

1861 -#: wt-status.c:1291

1858 +#: wt-status.c:1329

1859 msgid "Not currently on any branch."

1860 msgstr "Actuellement sur aucun branche."

1861

1865 -#: wt-status.c:1308

1862 +#: wt-status.c:1346

1863 msgid "Initial commit"

1864 msgstr "Validation initiale"

1865

1869 -#: wt-status.c:1322

1866 +#: wt-status.c:1360

1867 msgid "Untracked files"

1868 msgstr "Fichiers non suivis"

1869

1873 -#: wt-status.c:1324

1870 +#: wt-status.c:1362

1871 msgid "Ignored files"

1872 msgstr "Fichiers ignorés"

1873

1877 -#: wt-status.c:1328

1874 +#: wt-status.c:1366

1875 #, c-format

1876 msgid ""

1877 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1886,32 +1883,32 @@ msgstr ""

1883 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

1884 "status')."

1885

1889 -#: wt-status.c:1334

1886 +#: wt-status.c:1372

1887 #, c-format

1888 msgid "Untracked files not listed%s"

1889 msgstr "Fichiers non suivis non affichés%s"

1890

1894 -#: wt-status.c:1336

1891 +#: wt-status.c:1374

1892 msgid " (use -u option to show untracked files)"

1893 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

1894

1898 -#: wt-status.c:1342

1895 +#: wt-status.c:1380

1896 msgid "No changes"

1897 msgstr "Aucune modification"

1898

1902 -#: wt-status.c:1347

1899 +#: wt-status.c:1385

1900 #, c-format

1901 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1902 msgstr ""

1903 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

1904 "\"git commit -a\")\n"

1905

1909 -#: wt-status.c:1350

1906 +#: wt-status.c:1388

1907 #, c-format

1908 msgid "no changes added to commit\n"

1909 msgstr "aucune modification ajoutée à la validation\n"

1910

1914 -#: wt-status.c:1353

1911 +#: wt-status.c:1391

1912 #, c-format

1913 msgid ""

1914 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -1920,292 +1917,208 @@ msgstr ""

1917 "aucune modification ajoutée à la validation mais des fichiers non suivis "

1918 "sont présents (utilisez \"git add\" pour les suivre)\n"

1919

1923 -#: wt-status.c:1356

1920 +#: wt-status.c:1394

1921 #, c-format

1922 msgid "nothing added to commit but untracked files present\n"

1923 msgstr ""

1924 "aucune modification ajoutée à la validation mais des fichiers non suivis "

1925 "sont présents\n"

1926

1930 -#: wt-status.c:1359

1927 +#: wt-status.c:1397

1928 #, c-format

1929 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1930 msgstr ""

1931 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

1932 "suivre)\n"

1933

1937 -#: wt-status.c:1362 wt-status.c:1367

1934 +#: wt-status.c:1400 wt-status.c:1405

1935 #, c-format

1936 msgid "nothing to commit\n"

1937 msgstr "rien à valider\n"

1938

1942 -#: wt-status.c:1365

1939 +#: wt-status.c:1403

1940 #, c-format

1941 msgid "nothing to commit (use -u to show untracked files)\n"

1942 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

1943

1947 -#: wt-status.c:1369

1944 +#: wt-status.c:1407

1945 #, c-format

1946 msgid "nothing to commit, working directory clean\n"

1947 msgstr "rien à valider, la copie de travail est propre\n"

1948

1952 -#: wt-status.c:1478

1949 +#: wt-status.c:1516

1950 msgid "HEAD (no branch)"

1951 msgstr "HEAD (aucune branche)"

1952

1956 -#: wt-status.c:1484

1953 +#: wt-status.c:1522

1954 msgid "Initial commit on "

1955 msgstr "Validation initiale sur "

1956

1957 # à priori on parle d'une branche ici

1961 -#: wt-status.c:1514

1958 +#: wt-status.c:1554

1959 msgid "gone"

1960 msgstr "disparue"

1961

1965 -#: wt-status.c:1516

1962 +#: wt-status.c:1556 wt-status.c:1564

1963 msgid "behind "

1964 msgstr "derrière "

1965

1969 -#: wt-status.c:1519 wt-status.c:1522

1970 -msgid "ahead "

1971 -msgstr "devant "

1972 -

1973 -#: wt-status.c:1524

1974 -msgid ", behind "

1975 -msgstr ", derrière "

1976 -

1966 #: compat/precompose_utf8.c:55 builtin/clone.c:356

1967 #, c-format

1968 msgid "failed to unlink '%s'"

1969 msgstr "échec lors de l'unlink de '%s'"

1970

1982 -#: builtin/add.c:20

1971 +#: builtin/add.c:21

1972 msgid "git add [options] [--] <pathspec>..."

1973 msgstr "git add [options] [--] <chemin>..."

1974

1986 -#.

1987 -#. * To be consistent with "git add -p" and most Git

1988 -#. * commands, we should default to being tree-wide, but

1989 -#. * this is not the original behavior and can't be

1990 -#. * changed until users trained themselves not to type

1991 -#. * "git add -u" or "git add -A". For now, we warn and

1992 -#. * keep the old behavior. Later, the behavior can be changed

1993 -#. * to tree-wide, keeping the warning for a while, and

1994 -#. * eventually we can drop the warning.

1995 -#.

1996 -#: builtin/add.c:58

1997 -#, c-format

1998 -msgid ""

1999 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

2000 -"subdirectory of the tree will change in Git 2.0 and should not be used "

2001 -"anymore.\n"

2002 -"To add content for the whole tree, run:\n"

2003 -"\n"

2004 -" git add %s :/\n"

2005 -" (or git add %s :/)\n"

2006 -"\n"

2007 -"To restrict the command to the current directory, run:\n"

2008 -"\n"

2009 -" git add %s .\n"

2010 -" (or git add %s .)\n"

2011 -"\n"

2012 -"With the current Git version, the command is restricted to the current "

2013 -"directory.\n"

2014 -msgstr ""

2015 -"Le comportement de 'git add %s (ou %s)' sans argument de chemin depuis un\n"

2016 -"sous-répertoire du projet va changer dans Git 2.0 et ne doit plus être "

2017 -"utilisé.\n"

2018 -"Pour ajouter le contenu de toute l'arborescence, lancez :\n"

2019 -"\n"

2020 -" git add %s :/\n"

2021 -" (ou git add %s :/)\n"

2022 -"\n"

2023 -"Pour restreindre la commande au répertoire courant, lancez :\n"

2024 -"\n"

2025 -" git add %s .\n"

2026 -" (ou git add %s .)\n"

2027 -"\n"

2028 -"Avec la version actuelle de Git, la commande est restreinte au répertoire "

2029 -"courant.\n"

2030 -

2031 -#: builtin/add.c:100

2032 -#, c-format

2033 -msgid ""

2034 -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

2035 -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

2036 -"Paths like '%s' that are\n"

2037 -"removed from your working tree are ignored with this version of Git.\n"

2038 -"\n"

2039 -"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

2040 -" ignores paths you removed from your working tree.\n"

2041 -"\n"

2042 -"* 'git add --all <pathspec>' will let you also record the removals.\n"

2043 -"\n"

2044 -"Run 'git status' to check the paths you removed from your working tree.\n"

2045 -msgstr ""

2046 -"Vous avez lancé 'git add' sans '-A (--all)' ni '--ignore-removal',\n"

2047 -"dont le comportement va changer dans Git 2.0 avec le respect des chemins que "

2048 -"vous supprimez.\n"

2049 -"Les chemins tels que '%s' qui ont été\n"

2050 -"retirés de votre copie de travail sont ignorés avec cette version de Git.\n"

2051 -"\n"

2052 -"* 'git add --ignore-removal <chemin>', qui est l'option par défaut "

2053 -"actuelle,\n"

2054 -" ignore les chemins que vous avez supprimés de votre copie de travail.\n"

2055 -"\n"

2056 -"* 'git add --all <chemin>' permet d'enregistrer aussi les suppressions.\n"

2057 -"\n"

2058 -"Lancez 'git status' pour vérifier les chemins que vous avez supprimés de "

2059 -"votre copie de travail.\n"

2060 -

2061 -#: builtin/add.c:144

1975 +#: builtin/add.c:64

1976 #, c-format

1977 msgid "unexpected diff status %c"

1978 msgstr "status de diff inattendu %c"

1979

2066 -#: builtin/add.c:149 builtin/commit.c:260

1980 +#: builtin/add.c:69 builtin/commit.c:261

1981 msgid "updating files failed"

1982 msgstr "échec de la mise à jour des fichiers"

1983

2070 -#: builtin/add.c:163

1984 +#: builtin/add.c:79

1985 #, c-format

1986 msgid "remove '%s'\n"

1987 msgstr "suppression de '%s'\n"

1988

2075 -#: builtin/add.c:237

1989 +#: builtin/add.c:133

1990 msgid "Unstaged changes after refreshing the index:"

1991 msgstr "Modifications non indexées après rafraîchissement de l'index :"

1992

2079 -#: builtin/add.c:299

1993 +#: builtin/add.c:193

1994 msgid "Could not read the index"

1995 msgstr "Impossible de lire l'index"

1996

2083 -#: builtin/add.c:310

1997 +#: builtin/add.c:204

1998 #, c-format

1999 msgid "Could not open '%s' for writing."

2000 msgstr "Impossible d'ouvrir '%s' en écriture."

2001

2088 -#: builtin/add.c:314

2002 +#: builtin/add.c:208

2003 msgid "Could not write patch"

2004 msgstr "Impossible d'écrire le patch"

2005

2092 -#: builtin/add.c:319

2006 +#: builtin/add.c:213

2007 #, c-format

2008 msgid "Could not stat '%s'"

2009 msgstr "Stat de '%s' impossible"

2010

2097 -#: builtin/add.c:321

2011 +#: builtin/add.c:215

2012 msgid "Empty patch. Aborted."

2013 msgstr "Patch vide. Abandon."

2014

2101 -#: builtin/add.c:327

2015 +#: builtin/add.c:221

2016 #, c-format

2017 msgid "Could not apply '%s'"

2018 msgstr "Impossible d'appliquer '%s'"

2019

2106 -#: builtin/add.c:337

2020 +#: builtin/add.c:231

2021 msgid "The following paths are ignored by one of your .gitignore files:\n"

2022 msgstr ""

2023 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

2024

2111 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

2112 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

2025 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

2026 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

2027 #: builtin/rm.c:269

2028 msgid "dry run"

2029 msgstr "simuler l'action"

2030

2117 -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2118 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

2031 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

2032 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

2033 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

2034 msgid "be verbose"

2035 msgstr "mode verbeux"

2036

2123 -#: builtin/add.c:357

2037 +#: builtin/add.c:251

2038 msgid "interactive picking"

2039 msgstr "sélection interactive"

2040

2127 -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

2041 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

2042 msgid "select hunks interactively"

2043 msgstr "sélection interactive des sections"

2044

2131 -#: builtin/add.c:359

2045 +#: builtin/add.c:253

2046 msgid "edit current diff and apply"

2047 msgstr "édition du diff actuel et application"

2048

2135 -#: builtin/add.c:360

2049 +#: builtin/add.c:254

2050 msgid "allow adding otherwise ignored files"

2051 msgstr "permettre l'ajout de fichiers ignorés"

2052

2139 -#: builtin/add.c:361

2053 +#: builtin/add.c:255

2054 msgid "update tracked files"

2055 msgstr "mettre à jour les fichiers suivis"

2056

2143 -#: builtin/add.c:362

2057 +#: builtin/add.c:256

2058 msgid "record only the fact that the path will be added later"

2059 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"

2060

2147 -#: builtin/add.c:363

2061 +#: builtin/add.c:257

2062 msgid "add changes from all tracked and untracked files"

2063 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"

2064

2151 -#. takes no arguments

2152 -#: builtin/add.c:366

2065 +#: builtin/add.c:260

2066 msgid "ignore paths removed in the working tree (same as --no-all)"

2067 msgstr ""

2068 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"

2069

2157 -#: builtin/add.c:368

2070 +#: builtin/add.c:262

2071 msgid "don't add, only refresh the index"

2072 msgstr "ne pas ajouter, juste rafraîchir l'index"

2073

2161 -#: builtin/add.c:369

2074 +#: builtin/add.c:263

2075 msgid "just skip files which cannot be added because of errors"

2076 msgstr ""

2077 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "

2078 "d'erreurs"

2079

2167 -#: builtin/add.c:370

2080 +#: builtin/add.c:264

2081 msgid "check if - even missing - files are ignored in dry run"

2082 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

2083

2171 -#: builtin/add.c:392

2084 +#: builtin/add.c:286

2085 #, c-format

2086 msgid "Use -f if you really want to add them.\n"

2087 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"

2088

2176 -#: builtin/add.c:393

2089 +#: builtin/add.c:287

2090 msgid "no files added"

2091 msgstr "aucun fichier ajouté"

2092

2180 -#: builtin/add.c:399

2093 +#: builtin/add.c:293

2094 msgid "adding files failed"

2095 msgstr "échec de l'ajout de fichiers"

2096

2184 -#: builtin/add.c:438

2097 +#: builtin/add.c:330

2098 msgid "-A and -u are mutually incompatible"

2099 msgstr "-A et -u sont mutuellement incompatibles"

2100

2188 -#: builtin/add.c:456

2101 +#: builtin/add.c:337

2102 msgid "Option --ignore-missing can only be used together with --dry-run"

2103 msgstr ""

2104 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

2105

2193 -#: builtin/add.c:486

2106 +#: builtin/add.c:358

2107 #, c-format

2108 msgid "Nothing specified, nothing added.\n"

2109 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

2110

2198 -#: builtin/add.c:487

2111 +#: builtin/add.c:359

2112 #, c-format

2113 msgid "Maybe you wanted to say 'git add .'?\n"

2114 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

2115

2203 -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2204 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

2116 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2117 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2118 msgid "index file corrupt"

2119 msgstr "fichier d'index corrompu"

2120

2208 -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

2121 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2122 msgid "Unable to write new index file"

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

2124

@@ -2323,7 +2236,6 @@ msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"

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

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

2238

2326 -#. there has to be one hunk (forward hunk)

2239 #: builtin/apply.c:1900

2240 #, c-format

2241 msgid "unrecognized binary patch at line %d"

@@ -2467,7 +2379,7 @@ msgstr "%s : le patch ne s'applique pas"

2379 msgid "Checking patch %s..."

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

2381

2470 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2382 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2383 #, c-format

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

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

@@ -2518,7 +2430,6 @@ msgstr "Patch %s appliqué proprement."

2430 msgid "internal error"

2431 msgstr "erreur interne"

2432

2521 -#. Say this even without --verbose

2433 #: builtin/apply.c:4043

2434 #, c-format

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

@@ -2612,7 +2523,7 @@ msgid "build a temporary index based on embedded index information"

2523 msgstr ""

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

2525

2615 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2526 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2527 msgid "paths are separated with NUL character"

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

2529

@@ -2754,100 +2665,100 @@ msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"

2665 msgid "[rev-opts] are documented in git-rev-list(1)"

2666 msgstr "[options-de-révision] sont documentés dans git-rev-list(1)"

2667

2757 -#: builtin/blame.c:2249

2668 +#: builtin/blame.c:2242

2669 msgid "Show blame entries as we find them, incrementally"

2670 msgstr ""

2671 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

2672 "manière incrémentale"

2673

2763 -#: builtin/blame.c:2250

2674 +#: builtin/blame.c:2243

2675 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2676 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

2677

2767 -#: builtin/blame.c:2251

2678 +#: builtin/blame.c:2244

2679 msgid "Do not treat root commits as boundaries (Default: off)"

2680 msgstr ""

2681 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

2682

2772 -#: builtin/blame.c:2252

2683 +#: builtin/blame.c:2245

2684 msgid "Show work cost statistics"

2685 msgstr "Montrer les statistiques de coût d'activité"

2686

2776 -#: builtin/blame.c:2253

2687 +#: builtin/blame.c:2246

2688 msgid "Show output score for blame entries"

2689 msgstr "Montrer le score de sortie pour les éléments de blâme"

2690

2780 -#: builtin/blame.c:2254

2691 +#: builtin/blame.c:2247

2692 msgid "Show original filename (Default: auto)"

2693 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

2694

2784 -#: builtin/blame.c:2255

2695 +#: builtin/blame.c:2248

2696 msgid "Show original linenumber (Default: off)"

2697 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

2698

2788 -#: builtin/blame.c:2256

2699 +#: builtin/blame.c:2249

2700 msgid "Show in a format designed for machine consumption"

2701 msgstr "Afficher dans un format propice à la consommation par machine"

2702

2792 -#: builtin/blame.c:2257

2703 +#: builtin/blame.c:2250

2704 msgid "Show porcelain format with per-line commit information"

2705 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

2706

2796 -#: builtin/blame.c:2258

2707 +#: builtin/blame.c:2251

2708 msgid "Use the same output mode as git-annotate (Default: off)"

2709 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

2710

2800 -#: builtin/blame.c:2259

2711 +#: builtin/blame.c:2252

2712 msgid "Show raw timestamp (Default: off)"

2713 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

2714

2804 -#: builtin/blame.c:2260

2715 +#: builtin/blame.c:2253

2716 msgid "Show long commit SHA1 (Default: off)"

2717 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

2718

2808 -#: builtin/blame.c:2261

2719 +#: builtin/blame.c:2254

2720 msgid "Suppress author name and timestamp (Default: off)"

2721 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

2722

2812 -#: builtin/blame.c:2262

2723 +#: builtin/blame.c:2255

2724 msgid "Show author email instead of name (Default: off)"

2725 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

2726

2816 -#: builtin/blame.c:2263

2727 +#: builtin/blame.c:2256

2728 msgid "Ignore whitespace differences"

2729 msgstr "Ignorer les différences d'espace"

2730

2820 -#: builtin/blame.c:2264

2731 +#: builtin/blame.c:2257

2732 msgid "Spend extra cycles to find better match"

2733 msgstr ""

2734 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

2735

2825 -#: builtin/blame.c:2265

2736 +#: builtin/blame.c:2258

2737 msgid "Use revisions from <file> instead of calling git-rev-list"

2738 msgstr ""

2739 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

2740

2830 -#: builtin/blame.c:2266

2741 +#: builtin/blame.c:2259

2742 msgid "Use <file>'s contents as the final image"

2743 msgstr "Utiliser le contenu de <fichier> comme image finale"

2744

2834 -#: builtin/blame.c:2267 builtin/blame.c:2268

2745 +#: builtin/blame.c:2260 builtin/blame.c:2261

2746 msgid "score"

2747 msgstr "score"

2748

2838 -#: builtin/blame.c:2267

2749 +#: builtin/blame.c:2260

2750 msgid "Find line copies within and across files"

2751 msgstr "Trouver les copies de ligne dans et entre les fichiers"

2752

2842 -#: builtin/blame.c:2268

2753 +#: builtin/blame.c:2261

2754 msgid "Find line movements within and across files"

2755 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

2756

2846 -#: builtin/blame.c:2269

2757 +#: builtin/blame.c:2262

2758 msgid "n,m"

2759 msgstr "n,m"

2760

2850 -#: builtin/blame.c:2269

2761 +#: builtin/blame.c:2262

2762 msgid "Process only line range n,m, counting from 1"

2763 msgstr ""

2764 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

@@ -3093,8 +3004,9 @@ msgid "act on remote-tracking branches"

3004 msgstr "agir sur les branches de suivi distantes"

3005

3006 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

3096 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

3097 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

3007 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

3008 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

3009 +#: builtin/tag.c:533

3010 msgid "commit"

3011 msgstr "commit"

3012

@@ -3281,44 +3193,44 @@ msgstr "La création d'un colis requiert un dépôt."

3193 msgid "Need a repository to unbundle."

3194 msgstr "Le dépaquetage d'un colis requiert un dépôt."

3195

3284 -#: builtin/cat-file.c:328

3196 +#: builtin/cat-file.c:331

3197 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3198 msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>"

3199

3288 -#: builtin/cat-file.c:329

3200 +#: builtin/cat-file.c:332

3201 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3202 msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>"

3203

3292 -#: builtin/cat-file.c:366

3204 +#: builtin/cat-file.c:369

3205 msgid "<type> can be one of: blob, tree, commit, tag"

3206 msgstr "<type> peut être : blob, tree, commit ou tag"

3207

3296 -#: builtin/cat-file.c:367

3208 +#: builtin/cat-file.c:370

3209 msgid "show object type"

3210 msgstr "afficher le type de l'objet"

3211

3300 -#: builtin/cat-file.c:368

3212 +#: builtin/cat-file.c:371

3213 msgid "show object size"

3214 msgstr "afficher la taille de l'objet"

3215

3304 -#: builtin/cat-file.c:370

3216 +#: builtin/cat-file.c:373

3217 msgid "exit with zero when there's no error"

3218 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"

3219

3308 -#: builtin/cat-file.c:371

3220 +#: builtin/cat-file.c:374

3221 msgid "pretty-print object's content"

3222 msgstr "afficher avec mise en forme le contenu de l'objet"

3223

3312 -#: builtin/cat-file.c:373

3224 +#: builtin/cat-file.c:376

3225 msgid "for blob objects, run textconv on object's content"

3226 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

3227

3316 -#: builtin/cat-file.c:375

3228 +#: builtin/cat-file.c:378

3229 msgid "show info and content of objects fed from the standard input"

3230 msgstr ""

3231 "afficher l'information et le contenu des objets passés en entrée standard"

3232

3321 -#: builtin/cat-file.c:378

3233 +#: builtin/cat-file.c:381

3234 msgid "show info about objects fed from the standard input"

3235 msgstr "afficher l'information des objets passés en entrée standard"

3236

@@ -3348,7 +3260,7 @@ msgid "terminate input and output records by a NUL character"

3260 msgstr ""

3261 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

3262

3351 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3263 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3264 msgid "suppress progress reporting"

3265 msgstr "supprimer l'état d'avancement"

3266

@@ -3503,60 +3415,59 @@ msgstr ""

3415 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

3416 "même temps."

3417

3506 -#: builtin/checkout.c:261 builtin/checkout.c:451

3418 +#: builtin/checkout.c:261 builtin/checkout.c:450

3419 msgid "corrupt index file"

3420 msgstr "fichier d'index corrompu"

3421

3510 -#: builtin/checkout.c:322 builtin/checkout.c:329

3422 +#: builtin/checkout.c:321 builtin/checkout.c:328

3423 #, c-format

3424 msgid "path '%s' is unmerged"

3425 msgstr "le chemin '%s' n'est pas fusionné"

3426

3515 -#: builtin/checkout.c:473

3427 +#: builtin/checkout.c:472

3428 msgid "you need to resolve your current index first"

3429 msgstr "vous devez d'abord résoudre votre index courant"

3430

3519 -#: builtin/checkout.c:594

3431 +#: builtin/checkout.c:593

3432 #, c-format

3433 msgid "Can not do reflog for '%s'\n"

3434 msgstr "Impossible de faire un reflog pour '%s'\n"

3435

3524 -#: builtin/checkout.c:632

3436 +#: builtin/checkout.c:631

3437 msgid "HEAD is now at"

3438 msgstr "HEAD est maintenant sur"

3439

3528 -#: builtin/checkout.c:639

3440 +#: builtin/checkout.c:638

3441 #, c-format

3442 msgid "Reset branch '%s'\n"

3443 msgstr "Remise à zéro de la branche '%s'\n"

3444

3533 -#: builtin/checkout.c:642

3445 +#: builtin/checkout.c:641

3446 #, c-format

3447 msgid "Already on '%s'\n"

3448 msgstr "Déjà sur '%s'\n"

3449

3538 -#: builtin/checkout.c:646

3450 +#: builtin/checkout.c:645

3451 #, c-format

3452 msgid "Switched to and reset branch '%s'\n"

3453 msgstr "Basculement et remise à zéro de la branche '%s'\n"

3454

3543 -#: builtin/checkout.c:648 builtin/checkout.c:1033

3455 +#: builtin/checkout.c:647 builtin/checkout.c:1032

3456 #, c-format

3457 msgid "Switched to a new branch '%s'\n"

3458 msgstr "Basculement sur la nouvelle branche '%s'\n"

3459

3548 -#: builtin/checkout.c:650

3460 +#: builtin/checkout.c:649

3461 #, c-format

3462 msgid "Switched to branch '%s'\n"

3463 msgstr "Basculement sur la branche '%s'\n"

3464

3553 -#: builtin/checkout.c:706

3465 +#: builtin/checkout.c:705

3466 #, c-format

3467 msgid " ... and %d more.\n"

3468 msgstr " ... et %d en plus.\n"

3469

3558 -#. The singular version

3559 -#: builtin/checkout.c:712

3470 +#: builtin/checkout.c:711

3471 #, c-format

3472 msgid ""

3473 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3579,7 +3490,7 @@ msgstr[1] ""

3490 "\n"

3491 "%s\n"

3492

3582 -#: builtin/checkout.c:730

3493 +#: builtin/checkout.c:729

3494 #, c-format

3495 msgid ""

3496 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3592,143 +3503,142 @@ msgstr ""

3503 "moment\n"

3504 "de le faire avec :\n"

3505 "\n"

3595 -"git branche nouvelle_branche %s\n"

3506 +"git branch nouvelle_branche %s\n"

3507 "\n"

3508

3598 -#: builtin/checkout.c:760

3509 +#: builtin/checkout.c:759

3510 msgid "internal error in revision walk"

3511 msgstr "erreur interne lors du parcours des révisions"

3512

3602 -#: builtin/checkout.c:764

3513 +#: builtin/checkout.c:763

3514 msgid "Previous HEAD position was"

3515 msgstr "La position précédente de HEAD était"

3516

3606 -#: builtin/checkout.c:791 builtin/checkout.c:1028

3517 +#: builtin/checkout.c:790 builtin/checkout.c:1027

3518 msgid "You are on a branch yet to be born"

3519 msgstr "Vous êtes sur une branche qui doit encore naître"

3520

3610 -#: builtin/checkout.c:935

3521 +#: builtin/checkout.c:934

3522 #, c-format

3523 msgid "only one reference expected, %d given."

3524 msgstr "une seule référence attendue, %d fournies."

3525

3615 -#: builtin/checkout.c:974

3526 +#: builtin/checkout.c:973

3527 #, c-format

3528 msgid "invalid reference: %s"

3529 msgstr "référence invalide : %s"

3530

3620 -#. case (1): want a tree

3621 -#: builtin/checkout.c:1003

3531 +#: builtin/checkout.c:1002

3532 #, c-format

3533 msgid "reference is not a tree: %s"

3534 msgstr "la référence n'est pas un arbre : %s"

3535

3626 -#: builtin/checkout.c:1042

3536 +#: builtin/checkout.c:1041

3537 msgid "paths cannot be used with switching branches"

3538 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

3539

3630 -#: builtin/checkout.c:1045 builtin/checkout.c:1049

3540 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3541 #, c-format

3542 msgid "'%s' cannot be used with switching branches"

3543 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

3544

3635 -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3636 -#: builtin/checkout.c:1064

3545 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3546 +#: builtin/checkout.c:1063

3547 #, c-format

3548 msgid "'%s' cannot be used with '%s'"

3549 msgstr "'%s' ne peut pas être utilisé avec '%s'"

3550

3641 -#: builtin/checkout.c:1069

3551 +#: builtin/checkout.c:1068

3552 #, c-format

3553 msgid "Cannot switch branch to a non-commit '%s'"

3554 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

3555

3646 -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3556 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3557 #: builtin/remote.c:159 builtin/remote.c:161

3558 msgid "branch"

3559 msgstr "branche"

3560

3651 -#: builtin/checkout.c:1092

3561 +#: builtin/checkout.c:1091

3562 msgid "create and checkout a new branch"

3563 msgstr "créer et extraire une nouvelle branche"

3564

3655 -#: builtin/checkout.c:1094

3565 +#: builtin/checkout.c:1093

3566 msgid "create/reset and checkout a branch"

3567 msgstr "créer/réinitialiser et extraire une branche"

3568

3659 -#: builtin/checkout.c:1095

3569 +#: builtin/checkout.c:1094

3570 msgid "create reflog for new branch"

3571 msgstr "créer un reflog pour une nouvelle branche"

3572

3663 -#: builtin/checkout.c:1096

3573 +#: builtin/checkout.c:1095

3574 msgid "detach the HEAD at named commit"

3575 msgstr "détacher la HEAD à la validation nommée"

3576

3667 -#: builtin/checkout.c:1097

3577 +#: builtin/checkout.c:1096

3578 msgid "set upstream info for new branch"

3579 msgstr "paramétrer l'information de branche amont pour une nouvelle branche"

3580

3671 -#: builtin/checkout.c:1099

3672 -msgid "new branch"

3581 +#: builtin/checkout.c:1098

3582 +msgid "new-branch"

3583 msgstr "nouvelle branche"

3584

3675 -#: builtin/checkout.c:1099

3585 +#: builtin/checkout.c:1098

3586 msgid "new unparented branch"

3587 msgstr "nouvelle branche sans parent"

3588

3679 -#: builtin/checkout.c:1100

3589 +#: builtin/checkout.c:1099

3590 msgid "checkout our version for unmerged files"

3591 msgstr "extraire notre version pour les fichiers non fusionnés"

3592

3683 -#: builtin/checkout.c:1102

3593 +#: builtin/checkout.c:1101

3594 msgid "checkout their version for unmerged files"

3595 msgstr "extraire leur version pour les fichiers non fusionnés"

3596

3687 -#: builtin/checkout.c:1104

3597 +#: builtin/checkout.c:1103

3598 msgid "force checkout (throw away local modifications)"

3599 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

3600

3691 -#: builtin/checkout.c:1105

3601 +#: builtin/checkout.c:1104

3602 msgid "perform a 3-way merge with the new branch"

3603 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

3604

3695 -#: builtin/checkout.c:1106 builtin/merge.c:225

3605 +#: builtin/checkout.c:1105 builtin/merge.c:225

3606 msgid "update ignored files (default)"

3607 msgstr "mettre à jour les fichiers ignorés (par défaut)"

3608

3699 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3609 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3610 msgid "style"

3611 msgstr "style"

3612

3703 -#: builtin/checkout.c:1108

3613 +#: builtin/checkout.c:1107

3614 msgid "conflict style (merge or diff3)"

3615 msgstr "style de conflit (fusion ou diff3)"

3616

3707 -#: builtin/checkout.c:1111

3617 +#: builtin/checkout.c:1110

3618 msgid "do not limit pathspecs to sparse entries only"

3619 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

3620

3711 -#: builtin/checkout.c:1113

3621 +#: builtin/checkout.c:1112

3622 msgid "second guess 'git checkout no-such-branch'"

3623 msgstr "deuxième chance 'git checkout branche-inexistante'"

3624

3715 -#: builtin/checkout.c:1136

3625 +#: builtin/checkout.c:1135

3626 msgid "-b, -B and --orphan are mutually exclusive"

3627 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3628

3719 -#: builtin/checkout.c:1153

3629 +#: builtin/checkout.c:1152

3630 msgid "--track needs a branch name"

3631 msgstr "--track requiert un nom de branche"

3632

3723 -#: builtin/checkout.c:1160

3633 +#: builtin/checkout.c:1159

3634 msgid "Missing branch name; try -b"

3635 msgstr "Nom de branche manquant ; essayez -b"

3636

3727 -#: builtin/checkout.c:1197

3637 +#: builtin/checkout.c:1196

3638 msgid "invalid path specification"

3639 msgstr "spécification de chemin invalide"

3640

3731 -#: builtin/checkout.c:1204

3641 +#: builtin/checkout.c:1203

3642 #, c-format

3643 msgid ""

3644 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3738,12 +3648,12 @@ msgstr ""

3648 "en même temps.\n"

3649 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3650

3741 -#: builtin/checkout.c:1209

3651 +#: builtin/checkout.c:1208

3652 #, c-format

3653 msgid "git checkout: --detach does not take a path argument '%s'"

3654 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3655

3746 -#: builtin/checkout.c:1213

3656 +#: builtin/checkout.c:1212

3657 msgid ""

3658 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3659 "checking out of the index."

@@ -3782,7 +3692,7 @@ msgstr "Ignorerait le dépôt %s\n"

3692 msgid "failed to remove %s"

3693 msgstr "échec de la suppression de %s"

3694

3785 -#: builtin/clean.c:294

3695 +#: builtin/clean.c:295

3696 msgid ""

3697 "Prompt help:\n"

3698 "1 - select a numbered item\n"

@@ -3794,7 +3704,7 @@ msgstr ""

3704 "foo - sélectionner un élément par un préfixe unique\n"

3705 " - (vide) ne rien sélectionner"

3706

3797 -#: builtin/clean.c:298

3707 +#: builtin/clean.c:299

3708 msgid ""

3709 "Prompt help:\n"

3710 "1 - select a single item\n"

@@ -3814,35 +3724,35 @@ msgstr ""

3724 "* - choisir tous les éléments\n"

3725 " - (vide) terminer la sélection"

3726

3817 -#: builtin/clean.c:516

3727 +#: builtin/clean.c:517

3728 #, c-format

3729 msgid "Huh (%s)?"

3730 msgstr "Hein (%s) ?"

3731

3822 -#: builtin/clean.c:659

3732 +#: builtin/clean.c:660

3733 #, c-format

3734 msgid "Input ignore patterns>> "

3735 msgstr "Entrez les motifs à ignorer>> "

3736

3827 -#: builtin/clean.c:696

3737 +#: builtin/clean.c:697

3738 #, c-format

3739 msgid "WARNING: Cannot find items matched by: %s"

3740 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

3741

3832 -#: builtin/clean.c:717

3742 +#: builtin/clean.c:718

3743 msgid "Select items to delete"

3744 msgstr "Sélectionner les éléments à supprimer"

3745

3836 -#: builtin/clean.c:757

3746 +#: builtin/clean.c:758

3747 #, c-format

3748 msgid "remove %s? "

3749 msgstr "supprimer %s ? "

3750

3841 -#: builtin/clean.c:782

3751 +#: builtin/clean.c:783

3752 msgid "Bye."

3753 msgstr "Au revoir."

3754

3845 -#: builtin/clean.c:790

3755 +#: builtin/clean.c:791

3756 msgid ""

3757 "clean - start cleaning\n"

3758 "filter by pattern - exclude items from deletion\n"

@@ -3860,72 +3770,70 @@ msgstr ""

3770 "help - cet écran\n"

3771 "? - aide pour la sélection en ligne"

3772

3863 -#: builtin/clean.c:817

3773 +#: builtin/clean.c:818

3774 msgid "*** Commands ***"

3775 msgstr "*** Commandes ***"

3776

3867 -#: builtin/clean.c:818

3777 +#: builtin/clean.c:819

3778 msgid "What now"

3779 msgstr "Et maintenant ?"

3780

3871 -#: builtin/clean.c:826

3781 +#: builtin/clean.c:827

3782 msgid "Would remove the following item:"

3783 msgid_plural "Would remove the following items:"

3784 msgstr[0] "Supprimerait l'élément suivant :"

3785 msgstr[1] "Supprimerait les éléments suivants :"

3786

3877 -#: builtin/clean.c:843

3787 +#: builtin/clean.c:844

3788 msgid "No more files to clean, exiting."

3789 msgstr "Plus de fichier à nettoyer, sortie."

3790

3881 -#: builtin/clean.c:874

3791 +#: builtin/clean.c:875

3792 msgid "do not print names of files removed"

3793 msgstr "ne pas afficher les noms des fichiers supprimés"

3794

3885 -#: builtin/clean.c:876

3795 +#: builtin/clean.c:877

3796 msgid "force"

3797 msgstr "forcer"

3798

3889 -#: builtin/clean.c:877

3799 +#: builtin/clean.c:878

3800 msgid "interactive cleaning"

3801 msgstr "nettoyage interactif"

3802

3893 -#: builtin/clean.c:879

3803 +#: builtin/clean.c:880

3804 msgid "remove whole directories"

3805 msgstr "supprimer les répertoires entiers"

3806

3897 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3898 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3807 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3808 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3809 msgid "pattern"

3810 msgstr "motif"

3811

3902 -#: builtin/clean.c:881

3812 +#: builtin/clean.c:882

3813 msgid "add <pattern> to ignore rules"

3814 msgstr "ajouter <motif> aux règles ignore"

3815

3906 -#: builtin/clean.c:882

3816 +#: builtin/clean.c:883

3817 msgid "remove ignored files, too"

3818 msgstr "supprimer les fichiers ignorés, aussi"

3819

3910 -#: builtin/clean.c:884

3820 +#: builtin/clean.c:885

3821 msgid "remove only ignored files"

3822 msgstr "supprimer seulement les fichiers ignorés"

3823

3914 -#: builtin/clean.c:902

3824 +#: builtin/clean.c:903

3825 msgid "-x and -X cannot be used together"

3826 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

3827

3918 -#: builtin/clean.c:906

3828 +#: builtin/clean.c:907

3829 msgid ""

3920 -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3830 +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3831 "clean"

3922 -msgstr ""

3923 -"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

3924 -"nettoyer"

3832 +msgstr "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de nettoyer"

3833

3926 -#: builtin/clean.c:909

3834 +#: builtin/clean.c:910

3835 msgid ""

3928 -"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3836 +"clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3837 "refusing to clean"

3838 msgstr ""

3839 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "

@@ -3936,7 +3844,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

3844 msgstr "git clone [options] [--] <dépôt> [<répertoire>]"

3845

3846 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3939 -#: builtin/push.c:521

3847 +#: builtin/push.c:504

3848 msgid "force progress reporting"

3849 msgstr "forcer l'état d'avancement"

3850

@@ -3944,7 +3852,7 @@ msgstr "forcer l'état d'avancement"

3852 msgid "don't create a checkout"

3853 msgstr "ne pas créer d'extraction"

3854

3947 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3855 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3856 msgid "create a bare repository"

3857 msgstr "créer un dépôt nu"

3858

@@ -3968,11 +3876,11 @@ msgstr "régler comme dépôt partagé"

3876 msgid "initialize submodules in the clone"

3877 msgstr "initialiser les sous-modules dans le clone"

3878

3971 -#: builtin/clone.c:82 builtin/init-db.c:485

3879 +#: builtin/clone.c:82 builtin/init-db.c:483

3880 msgid "template-directory"

3881 msgstr "répertoire-modèle"

3882

3975 -#: builtin/clone.c:83 builtin/init-db.c:486

3883 +#: builtin/clone.c:83 builtin/init-db.c:484

3884 msgid "directory from which templates will be used"

3885 msgstr "répertoire depuis lequel les modèles vont être utilisés"

3886

@@ -3996,7 +3904,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

3904 msgid "path to git-upload-pack on the remote"

3905 msgstr "chemin vers git-upload-pack sur le serveur distant"

3906

3999 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3907 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3908 msgid "depth"

3909 msgstr "profondeur"

3910

@@ -4008,11 +3916,11 @@ msgstr "créer un clone superficiel de cette profondeur"

3916 msgid "clone only one branch, HEAD or --branch"

3917 msgstr "cloner seulement une branche, HEAD ou --branch"

3918

4011 -#: builtin/clone.c:96 builtin/init-db.c:494

3919 +#: builtin/clone.c:96 builtin/init-db.c:492

3920 msgid "gitdir"

3921 msgstr "gitdir"

3922

4015 -#: builtin/clone.c:97 builtin/init-db.c:495

3923 +#: builtin/clone.c:97 builtin/init-db.c:493

3924 msgid "separate git dir from working tree"

3925 msgstr "séparer le répertoire git de la copie de travail"

3926

@@ -4305,67 +4213,67 @@ msgstr ""

4213 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

4214 "des commits restants.\n"

4215

4308 -#: builtin/commit.c:287

4216 +#: builtin/commit.c:288

4217 msgid "failed to unpack HEAD tree object"

4218 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4219

4312 -#: builtin/commit.c:329

4220 +#: builtin/commit.c:330

4221 msgid "unable to create temporary index"

4222 msgstr "impossible de créer l'index temporaire"

4223

4316 -#: builtin/commit.c:335

4224 +#: builtin/commit.c:336

4225 msgid "interactive add failed"

4226 msgstr "échec de l'ajout interactif"

4227

4320 -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4228 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4229 msgid "unable to write new_index file"

4230 msgstr "impossible d'écrire le fichier new_index"

4231

4324 -#: builtin/commit.c:420

4232 +#: builtin/commit.c:421

4233 msgid "cannot do a partial commit during a merge."

4234 msgstr "impossible de faire une validation partielle pendant une fusion."

4235

4328 -#: builtin/commit.c:422

4236 +#: builtin/commit.c:423

4237 msgid "cannot do a partial commit during a cherry-pick."

4238 msgstr "impossible de faire une validation partielle pendant un picorage."

4239

4332 -#: builtin/commit.c:432

4240 +#: builtin/commit.c:433

4241 msgid "cannot read the index"

4242 msgstr "impossible de lire l'index"

4243

4336 -#: builtin/commit.c:452

4244 +#: builtin/commit.c:453

4245 msgid "unable to write temporary index file"

4246 msgstr "impossible d'écrire le fichier d'index temporaire"

4247

4340 -#: builtin/commit.c:543 builtin/commit.c:549

4248 +#: builtin/commit.c:544 builtin/commit.c:550

4249 #, c-format

4250 msgid "invalid commit: %s"

4251 msgstr "commit invalide : %s"

4252

4345 -#: builtin/commit.c:571

4253 +#: builtin/commit.c:572

4254 msgid "malformed --author parameter"

4255 msgstr "paramètre --author mal formé"

4256

4349 -#: builtin/commit.c:591

4257 +#: builtin/commit.c:592

4258 #, c-format

4259 msgid "Malformed ident string: '%s'"

4260 msgstr "Chaîne ident mal formée : '%s'"

4261

4354 -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4262 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4263 #, c-format

4264 msgid "could not lookup commit %s"

4265 msgstr "impossible de rechercher le commit %s"

4266

4359 -#: builtin/commit.c:642 builtin/shortlog.c:273

4267 +#: builtin/commit.c:641 builtin/shortlog.c:273

4268 #, c-format

4269 msgid "(reading log message from standard input)\n"

4270 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4271

4364 -#: builtin/commit.c:644

4272 +#: builtin/commit.c:643

4273 msgid "could not read log from standard input"

4274 msgstr "impossible de lire le journal depuis l'entrée standard"

4275

4368 -#: builtin/commit.c:648

4276 +#: builtin/commit.c:647

4277 #, c-format

4278 msgid "could not read log file '%s'"

4279 msgstr "impossible de lire le fichier de journal '%s'"

@@ -4391,7 +4299,7 @@ msgstr "impossible de lire '%s'"

4299 msgid "could not write commit template"

4300 msgstr "impossible d'écrire le modèle de commit"

4301

4394 -#: builtin/commit.c:760

4302 +#: builtin/commit.c:764

4303 #, c-format

4304 msgid ""

4305 "\n"

@@ -4406,7 +4314,7 @@ msgstr ""

4314 "\t%s\n"

4315 "et essayez à nouveau.\n"

4316

4409 -#: builtin/commit.c:765

4317 +#: builtin/commit.c:769

4318 #, c-format

4319 msgid ""

4320 "\n"

@@ -4421,7 +4329,7 @@ msgstr ""

4329 "\t%s\n"

4330 "et essayez à nouveau.\n"

4331

4424 -#: builtin/commit.c:777

4332 +#: builtin/commit.c:782

4333 #, c-format

4334 msgid ""

4335 "Please enter the commit message for your changes. Lines starting\n"

@@ -4431,7 +4339,7 @@ msgstr ""

4339 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4340 "validation.\n"

4341

4434 -#: builtin/commit.c:782

4342 +#: builtin/commit.c:789

4343 #, c-format

4344 msgid ""

4345 "Please enter the commit message for your changes. Lines starting\n"

@@ -4442,142 +4350,142 @@ msgstr ""

4350 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4351 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4352

4445 -#: builtin/commit.c:795

4353 +#: builtin/commit.c:802

4354 #, c-format

4355 msgid "%sAuthor: %s"

4356 msgstr "%sAuteur : %s"

4357

4450 -#: builtin/commit.c:802

4358 +#: builtin/commit.c:809

4359 #, c-format

4360 msgid "%sCommitter: %s"

4361 msgstr "%sValidateur : %s"

4362

4455 -#: builtin/commit.c:822

4363 +#: builtin/commit.c:829

4364 msgid "Cannot read index"

4365 msgstr "Impossible de lire l'index"

4366

4459 -#: builtin/commit.c:865

4367 +#: builtin/commit.c:872

4368 msgid "Error building trees"

4369 msgstr "Erreur lors de la construction des arbres"

4370

4463 -#: builtin/commit.c:880 builtin/tag.c:359

4371 +#: builtin/commit.c:887 builtin/tag.c:391

4372 #, c-format

4373 msgid "Please supply the message using either -m or -F option.\n"

4374 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4375

4468 -#: builtin/commit.c:982

4376 +#: builtin/commit.c:989

4377 #, c-format

4378 msgid "No existing author found with '%s'"

4379 msgstr "Aucun auteur existant trouvé avec '%s'"

4380

4473 -#: builtin/commit.c:997 builtin/commit.c:1237

4381 +#: builtin/commit.c:1004 builtin/commit.c:1244

4382 #, c-format

4383 msgid "Invalid untracked files mode '%s'"

4384 msgstr "Mode de fichier non suivi invalide '%s'"

4385

4478 -#: builtin/commit.c:1034

4386 +#: builtin/commit.c:1041

4387 msgid "--long and -z are incompatible"

4388 msgstr "--long et -z sont incompatibles"

4389

4482 -#: builtin/commit.c:1064

4390 +#: builtin/commit.c:1071

4391 msgid "Using both --reset-author and --author does not make sense"

4392 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4393

4486 -#: builtin/commit.c:1075

4394 +#: builtin/commit.c:1080

4395 msgid "You have nothing to amend."

4396 msgstr "Il n'y a rien à corriger."

4397

4490 -#: builtin/commit.c:1078

4398 +#: builtin/commit.c:1083

4399 msgid "You are in the middle of a merge -- cannot amend."

4400 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4401

4494 -#: builtin/commit.c:1080

4402 +#: builtin/commit.c:1085

4403 msgid "You are in the middle of a cherry-pick -- cannot amend."

4404 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4405

4498 -#: builtin/commit.c:1083

4406 +#: builtin/commit.c:1088

4407 msgid "Options --squash and --fixup cannot be used together"

4408 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4409

4502 -#: builtin/commit.c:1093

4410 +#: builtin/commit.c:1098

4411 msgid "Only one of -c/-C/-F/--fixup can be used."

4412 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4413

4506 -#: builtin/commit.c:1095

4414 +#: builtin/commit.c:1100

4415 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4416 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4417

4510 -#: builtin/commit.c:1103

4418 +#: builtin/commit.c:1108

4419 msgid "--reset-author can be used only with -C, -c or --amend."

4420 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4421

4514 -#: builtin/commit.c:1120

4422 +#: builtin/commit.c:1125

4423 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4424 msgstr ""

4425 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4426 "être utilisée."

4427

4520 -#: builtin/commit.c:1122

4428 +#: builtin/commit.c:1127

4429 msgid "No paths with --include/--only does not make sense."

4430 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4431

4524 -#: builtin/commit.c:1124

4432 +#: builtin/commit.c:1129

4433 msgid "Clever... amending the last one with dirty index."

4434 msgstr "Malin... correction du dernier avec un index sale."

4435

4528 -#: builtin/commit.c:1126

4529 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4436 +#: builtin/commit.c:1131

4437 +msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4438 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4439

4532 -#: builtin/commit.c:1136 builtin/tag.c:572

4440 +#: builtin/commit.c:1143 builtin/tag.c:639

4441 #, c-format

4442 msgid "Invalid cleanup mode %s"

4443 msgstr "Mode de nettoyage invalide %s"

4444

4537 -#: builtin/commit.c:1141

4445 +#: builtin/commit.c:1148

4446 msgid "Paths with -a does not make sense."

4447 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4448

4541 -#: builtin/commit.c:1251 builtin/commit.c:1482

4449 +#: builtin/commit.c:1258 builtin/commit.c:1516

4450 msgid "show status concisely"

4451 msgstr "afficher le statut avec concision"

4452

4545 -#: builtin/commit.c:1253 builtin/commit.c:1484

4453 +#: builtin/commit.c:1260 builtin/commit.c:1518

4454 msgid "show branch information"

4455 msgstr "afficher l'information de branche"

4456

4549 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4457 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4458 msgid "machine-readable output"

4459 msgstr "sortie pour traitement automatique"

4460

4553 -#: builtin/commit.c:1258 builtin/commit.c:1488

4461 +#: builtin/commit.c:1265 builtin/commit.c:1522

4462 msgid "show status in long format (default)"

4463 msgstr "afficher le statut en format long (par défaut)"

4464

4557 -#: builtin/commit.c:1261 builtin/commit.c:1491

4465 +#: builtin/commit.c:1268 builtin/commit.c:1525

4466 msgid "terminate entries with NUL"

4467 msgstr "terminer les éléments par NUL"

4468

4561 -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4562 -#: builtin/fast-export.c:677 builtin/tag.c:459

4469 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4470 +#: builtin/fast-export.c:677 builtin/tag.c:514

4471 msgid "mode"

4472 msgstr "mode"

4473

4566 -#: builtin/commit.c:1264 builtin/commit.c:1494

4474 +#: builtin/commit.c:1271 builtin/commit.c:1528

4475 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4476 msgstr ""

4477 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4478 "no. (Défaut : all)"

4479

4572 -#: builtin/commit.c:1267

4480 +#: builtin/commit.c:1274

4481 msgid "show ignored files"

4482 msgstr "afficher les fichiers ignorés"

4483

4576 -#: builtin/commit.c:1268 parse-options.h:156

4484 +#: builtin/commit.c:1275 parse-options.h:153

4485 msgid "when"

4486 msgstr "quand"

4487

4580 -#: builtin/commit.c:1269

4488 +#: builtin/commit.c:1276

4489 msgid ""

4490 "ignore changes to submodules, optional when: all, dirty, untracked. "

4491 "(Default: all)"

@@ -4585,217 +4493,217 @@ msgstr ""

4493 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4494 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4495

4588 -#: builtin/commit.c:1271

4496 +#: builtin/commit.c:1278

4497 msgid "list untracked files in columns"

4498 msgstr "afficher les fichiers non suivis en colonnes"

4499

4592 -#: builtin/commit.c:1340

4500 +#: builtin/commit.c:1347

4501 msgid "couldn't look up newly created commit"

4502 msgstr "impossible de retrouver le commit nouvellement créé"

4503

4596 -#: builtin/commit.c:1342

4504 +#: builtin/commit.c:1349

4505 msgid "could not parse newly created commit"

4506 msgstr "impossible d'analyser le commit nouvellement créé"

4507

4600 -#: builtin/commit.c:1383

4508 +#: builtin/commit.c:1390

4509 msgid "detached HEAD"

4510 msgstr "HEAD détachée"

4511

4604 -#: builtin/commit.c:1385

4512 +#: builtin/commit.c:1392

4513 msgid " (root-commit)"

4514 msgstr " (commit racine)"

4515

4608 -#: builtin/commit.c:1452

4516 +#: builtin/commit.c:1486

4517 msgid "suppress summary after successful commit"

4518 msgstr "supprimer le résumé après une validation réussie"

4519

4612 -#: builtin/commit.c:1453

4520 +#: builtin/commit.c:1487

4521 msgid "show diff in commit message template"

4522 msgstr "afficher les diff dans le modèle de message de validation"

4523

4616 -#: builtin/commit.c:1455

4524 +#: builtin/commit.c:1489

4525 msgid "Commit message options"

4526 msgstr "Options du message de validation"

4527

4620 -#: builtin/commit.c:1456 builtin/tag.c:457

4528 +#: builtin/commit.c:1490 builtin/tag.c:512

4529 msgid "read message from file"

4530 msgstr "lire le message depuis un fichier"

4531

4624 -#: builtin/commit.c:1457

4532 +#: builtin/commit.c:1491

4533 msgid "author"

4534 msgstr "auteur"

4535

4628 -#: builtin/commit.c:1457

4536 +#: builtin/commit.c:1491

4537 msgid "override author for commit"

4538 msgstr "remplacer l'auteur pour la validation"

4539

4632 -#: builtin/commit.c:1458 builtin/gc.c:261

4540 +#: builtin/commit.c:1492 builtin/gc.c:272

4541 msgid "date"

4542 msgstr "date"

4543

4636 -#: builtin/commit.c:1458

4544 +#: builtin/commit.c:1492

4545 msgid "override date for commit"

4546 msgstr "remplacer la date pour la validation"

4547

4640 -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4641 -#: builtin/notes.c:562 builtin/tag.c:455

4548 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4549 +#: builtin/notes.c:566 builtin/tag.c:510

4550 msgid "message"

4551 msgstr "message"

4552

4645 -#: builtin/commit.c:1459

4553 +#: builtin/commit.c:1493

4554 msgid "commit message"

4555 msgstr "message de validation"

4556

4649 -#: builtin/commit.c:1460

4557 +#: builtin/commit.c:1494

4558 msgid "reuse and edit message from specified commit"

4559 msgstr "réutiliser et éditer le message du commit spécifié"

4560

4653 -#: builtin/commit.c:1461

4561 +#: builtin/commit.c:1495

4562 msgid "reuse message from specified commit"

4563 msgstr "réutiliser le message du commit spécifié"

4564

4657 -#: builtin/commit.c:1462

4565 +#: builtin/commit.c:1496

4566 msgid "use autosquash formatted message to fixup specified commit"

4567 msgstr ""

4568 "utiliser un message formaté par autosquash pour corriger le commit spécifié"

4569

4662 -#: builtin/commit.c:1463

4570 +#: builtin/commit.c:1497

4571 msgid "use autosquash formatted message to squash specified commit"

4572 msgstr ""

4573 "utiliser un message formaté par autosquash pour compresser le commit spécifié"

4574

4667 -#: builtin/commit.c:1464

4575 +#: builtin/commit.c:1498

4576 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4577 msgstr ""

4578 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4579

4672 -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4580 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4581 msgid "add Signed-off-by:"

4582 msgstr "ajouter une entrée Signed-off-by :"

4583

4676 -#: builtin/commit.c:1466

4584 +#: builtin/commit.c:1500

4585 msgid "use specified template file"

4586 msgstr "utiliser le fichier de modèle spécifié"

4587

4680 -#: builtin/commit.c:1467

4588 +#: builtin/commit.c:1501

4589 msgid "force edit of commit"

4590 msgstr "forcer l'édition du commit"

4591

4684 -#: builtin/commit.c:1468

4592 +#: builtin/commit.c:1502

4593 msgid "default"

4594 msgstr "défaut"

4595

4688 -#: builtin/commit.c:1468 builtin/tag.c:460

4596 +#: builtin/commit.c:1502 builtin/tag.c:515

4597 msgid "how to strip spaces and #comments from message"

4598 msgstr "comment éliminer les espaces et les commentaires # du message"

4599

4692 -#: builtin/commit.c:1469

4600 +#: builtin/commit.c:1503

4601 msgid "include status in commit message template"

4602 msgstr "inclure le statut dans le modèle de message de validation"

4603

4696 -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4697 -msgid "key id"

4698 -msgstr "identifiant de clé"

4604 +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4605 +#: builtin/tag.c:516

4606 +msgid "key-id"

4607 +msgstr "id de clé"

4608

4700 -#: builtin/commit.c:1471 builtin/merge.c:224

4609 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4610 msgid "GPG sign commit"

4611 msgstr "signer la validation avec GPG"

4612

4704 -#. end commit message options

4705 -#: builtin/commit.c:1474

4613 +#: builtin/commit.c:1508

4614 msgid "Commit contents options"

4615 msgstr "Valider les options des contenus"

4616

4709 -#: builtin/commit.c:1475

4617 +#: builtin/commit.c:1509

4618 msgid "commit all changed files"

4619 msgstr "valider tous les fichiers modifiés"

4620

4713 -#: builtin/commit.c:1476

4621 +#: builtin/commit.c:1510

4622 msgid "add specified files to index for commit"

4623 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4624

4717 -#: builtin/commit.c:1477

4625 +#: builtin/commit.c:1511

4626 msgid "interactively add files"

4627 msgstr "ajouter des fichiers en mode interactif"

4628

4721 -#: builtin/commit.c:1478

4629 +#: builtin/commit.c:1512

4630 msgid "interactively add changes"

4631 msgstr "ajouter les modifications en mode interactif"

4632

4725 -#: builtin/commit.c:1479

4633 +#: builtin/commit.c:1513

4634 msgid "commit only specified files"

4635 msgstr "valider seulement les fichiers spécifiés"

4636

4729 -#: builtin/commit.c:1480

4637 +#: builtin/commit.c:1514

4638 msgid "bypass pre-commit hook"

4639 msgstr "éviter d'utiliser le crochet pre-commit"

4640

4733 -#: builtin/commit.c:1481

4641 +#: builtin/commit.c:1515

4642 msgid "show what would be committed"

4643 msgstr "afficher ce qui serait validé"

4644

4737 -#: builtin/commit.c:1492

4645 +#: builtin/commit.c:1526

4646 msgid "amend previous commit"

4647 msgstr "corriger la validation précédente"

4648

4741 -#: builtin/commit.c:1493

4649 +#: builtin/commit.c:1527

4650 msgid "bypass post-rewrite hook"

4651 msgstr "éviter d'utiliser le crochet post-rewrite"

4652

4745 -#: builtin/commit.c:1498

4653 +#: builtin/commit.c:1532

4654 msgid "ok to record an empty change"

4655 msgstr "accepter d'enregistrer une modification vide"

4656

4749 -#: builtin/commit.c:1500

4657 +#: builtin/commit.c:1534

4658 msgid "ok to record a change with an empty message"

4659 msgstr "accepter d'enregistrer une modification avec un message vide"

4660

4753 -#: builtin/commit.c:1529

4661 +#: builtin/commit.c:1562

4662 msgid "could not parse HEAD commit"

4663 msgstr "impossible d'analyser le commit HEAD"

4664

4757 -#: builtin/commit.c:1567 builtin/merge.c:518

4665 +#: builtin/commit.c:1601 builtin/merge.c:518

4666 #, c-format

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

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

4669

4762 -#: builtin/commit.c:1574

4670 +#: builtin/commit.c:1608

4671 #, c-format

4672 msgid "Corrupt MERGE_HEAD file (%s)"

4673 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4674

4767 -#: builtin/commit.c:1581

4675 +#: builtin/commit.c:1615

4676 msgid "could not read MERGE_MODE"

4677 msgstr "impossible de lire MERGE_MODE"

4678

4771 -#: builtin/commit.c:1600

4679 +#: builtin/commit.c:1634

4680 #, c-format

4681 msgid "could not read commit message: %s"

4682 msgstr "impossible de lire le message de validation : %s"

4683

4776 -#: builtin/commit.c:1611

4684 +#: builtin/commit.c:1645

4685 #, c-format

4686 msgid "Aborting commit; you did not edit the message.\n"

4687 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4688

4781 -#: builtin/commit.c:1616

4689 +#: builtin/commit.c:1650

4690 #, c-format

4691 msgid "Aborting commit due to empty commit message.\n"

4692 msgstr "Abandon de la validation du à un message de validation vide\n"

4693

4786 -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4694 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4695 msgid "failed to write commit object"

4696 msgstr "échec de l'écriture de l'objet commit"

4697

4790 -#: builtin/commit.c:1652

4698 +#: builtin/commit.c:1686

4699 msgid "cannot lock HEAD ref"

4700 msgstr "impossible de verrouiller la référence HEAD"

4701

4794 -#: builtin/commit.c:1656

4702 +#: builtin/commit.c:1690

4703 msgid "cannot update HEAD ref"

4704 msgstr "impossible de mettre à jour la référence HEAD"

4705

4798 -#: builtin/commit.c:1667

4706 +#: builtin/commit.c:1701

4707 msgid ""

4708 "Repository has been updated, but unable to write\n"

4709 "new_index file. Check that disk is not full or quota is\n"

@@ -4809,128 +4717,128 @@ msgstr ""

4717 msgid "git config [options]"

4718 msgstr "git config [options]"

4719

4812 -#: builtin/config.c:54

4720 +#: builtin/config.c:53

4721 msgid "Config file location"

4722 msgstr "Emplacement du fichier de configuration"

4723

4816 -#: builtin/config.c:55

4724 +#: builtin/config.c:54

4725 msgid "use global config file"

4726 msgstr "utiliser les fichier de configuration global"

4727

4820 -#: builtin/config.c:56

4728 +#: builtin/config.c:55

4729 msgid "use system config file"

4730 msgstr "utiliser le fichier de configuration du système"

4731

4824 -#: builtin/config.c:57

4732 +#: builtin/config.c:56

4733 msgid "use repository config file"

4734 msgstr "utiliser le fichier de configuration du dépôt"

4735

4828 -#: builtin/config.c:58

4736 +#: builtin/config.c:57

4737 msgid "use given config file"

4738 msgstr "utiliser le fichier de configuration spécifié"

4739

4832 -#: builtin/config.c:59

4740 +#: builtin/config.c:58

4741 msgid "blob-id"

4742 msgstr "blob-id"

4743

4836 -#: builtin/config.c:59

4744 +#: builtin/config.c:58

4745 msgid "read config from given blob object"

4746 msgstr "lire la configuration depuis l'objet blob fourni"

4747

4840 -#: builtin/config.c:60

4748 +#: builtin/config.c:59

4749 msgid "Action"

4750 msgstr "Action"

4751

4844 -#: builtin/config.c:61

4752 +#: builtin/config.c:60

4753 msgid "get value: name [value-regex]"

4754 msgstr "obtenir la valeur : nom [regex-de-valeur]"

4755

4848 -#: builtin/config.c:62

4756 +#: builtin/config.c:61

4757 msgid "get all values: key [value-regex]"

4758 msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]"

4759

4852 -#: builtin/config.c:63

4760 +#: builtin/config.c:62

4761 msgid "get values for regexp: name-regex [value-regex]"

4762 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"

4763

4856 -#: builtin/config.c:64

4764 +#: builtin/config.c:63

4765 msgid "get value specific for the URL: section[.var] URL"

4766 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"

4767

4860 -#: builtin/config.c:65

4768 +#: builtin/config.c:64

4769 msgid "replace all matching variables: name value [value_regex]"

4770 msgstr ""

4771 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"

4772

4865 -#: builtin/config.c:66

4773 +#: builtin/config.c:65

4774 msgid "add a new variable: name value"

4775 msgstr "ajouter une nouvelle variable : nom valeur"

4776

4869 -#: builtin/config.c:67

4777 +#: builtin/config.c:66

4778 msgid "remove a variable: name [value-regex]"

4779 msgstr "supprimer une variable : nom [regex-de-valeur]"

4780

4873 -#: builtin/config.c:68

4781 +#: builtin/config.c:67

4782 msgid "remove all matches: name [value-regex]"

4783 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"

4784

4877 -#: builtin/config.c:69

4785 +#: builtin/config.c:68

4786 msgid "rename section: old-name new-name"

4787 msgstr "renommer une section : ancien-nom nouveau-nom"

4788

4881 -#: builtin/config.c:70

4789 +#: builtin/config.c:69

4790 msgid "remove a section: name"

4791 msgstr "supprimer une section : nom"

4792

4885 -#: builtin/config.c:71

4793 +#: builtin/config.c:70

4794 msgid "list all"

4795 msgstr "afficher tout"

4796

4889 -#: builtin/config.c:72

4797 +#: builtin/config.c:71

4798 msgid "open an editor"

4799 msgstr "ouvrir un éditeur"

4800

4893 -#: builtin/config.c:73 builtin/config.c:74

4801 +#: builtin/config.c:72 builtin/config.c:73

4802 msgid "slot"

4803 msgstr "emplacement"

4804

4897 -#: builtin/config.c:73

4805 +#: builtin/config.c:72

4806 msgid "find the color configured: [default]"

4807 msgstr "trouver la couleur configurée : [par défaut]"

4808

4901 -#: builtin/config.c:74

4809 +#: builtin/config.c:73

4810 msgid "find the color setting: [stdout-is-tty]"

4811 msgstr "trouver le réglage de la couleur : [stdout-est-tty]"

4812

4905 -#: builtin/config.c:75

4813 +#: builtin/config.c:74

4814 msgid "Type"

4815 msgstr "Type"

4816

4909 -#: builtin/config.c:76

4817 +#: builtin/config.c:75

4818 msgid "value is \"true\" or \"false\""

4911 -msgstr "la valeur est \"true\" (vrai) our \"false\" (faux)"

4819 +msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"

4820

4913 -#: builtin/config.c:77

4821 +#: builtin/config.c:76

4822 msgid "value is decimal number"

4823 msgstr "la valeur est un nombre décimal"

4824

4917 -#: builtin/config.c:78

4825 +#: builtin/config.c:77

4826 msgid "value is --bool or --int"

4827 msgstr "la valeur est --bool ou --int"

4828

4921 -#: builtin/config.c:79

4829 +#: builtin/config.c:78

4830 msgid "value is a path (file or directory name)"

4831 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"

4832

4925 -#: builtin/config.c:80

4833 +#: builtin/config.c:79

4834 msgid "Other"

4835 msgstr "Autre"

4836

4929 -#: builtin/config.c:81

4837 +#: builtin/config.c:80

4838 msgid "terminate values with NUL byte"

4839 msgstr "terminer les valeurs avec un caractère NUL"

4840

4933 -#: builtin/config.c:82

4841 +#: builtin/config.c:81

4842 msgid "respect include directives on lookup"

4843 msgstr "respecter les directives d'inclusion lors de la recherche"

4844

@@ -4950,47 +4858,47 @@ msgstr "git describe [options] <commit ou apparenté>*"

4858 msgid "git describe [options] --dirty"

4859 msgstr "git describe [options] --dirty"

4860

4953 -#: builtin/describe.c:237

4861 +#: builtin/describe.c:225

4862 #, c-format

4863 msgid "annotated tag %s not available"

4864 msgstr "l'étiquette annotée %s n'est pas disponible"

4865

4958 -#: builtin/describe.c:241

4866 +#: builtin/describe.c:229

4867 #, c-format

4868 msgid "annotated tag %s has no embedded name"

4869 msgstr "l'étiquette annotée %s n'a pas de nom embarqué"

4870

4963 -#: builtin/describe.c:243

4871 +#: builtin/describe.c:231

4872 #, c-format

4873 msgid "tag '%s' is really '%s' here"

4874 msgstr "l'étiquette '%s' est en fait '%s'"

4875

4968 -#: builtin/describe.c:270

4876 +#: builtin/describe.c:258

4877 #, c-format

4878 msgid "Not a valid object name %s"

4879 msgstr "%s n'est pas un nom d'objet valide"

4880

4973 -#: builtin/describe.c:273

4881 +#: builtin/describe.c:261

4882 #, c-format

4883 msgid "%s is not a valid '%s' object"

4884 msgstr "%s n'est pas un objet '%s' valide"

4885

4978 -#: builtin/describe.c:290

4886 +#: builtin/describe.c:278

4887 #, c-format

4888 msgid "no tag exactly matches '%s'"

4889 msgstr "aucune étiquette ne correspond parfaitement à '%s'"

4890

4983 -#: builtin/describe.c:292

4891 +#: builtin/describe.c:280

4892 #, c-format

4893 msgid "searching to describe %s\n"

4894 msgstr "recherche de la description de %s\n"

4895

4988 -#: builtin/describe.c:332

4896 +#: builtin/describe.c:327

4897 #, c-format

4898 msgid "finished search at %s\n"

4899 msgstr "recherche terminée à %s\n"

4900

4993 -#: builtin/describe.c:359

4901 +#: builtin/describe.c:354

4902 #, c-format

4903 msgid ""

4904 "No annotated tags can describe '%s'.\n"

@@ -4999,7 +4907,7 @@ msgstr ""

4907 "Aucune étiquette annotée ne peut décrire '%s'.\n"

4908 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."

4909

5002 -#: builtin/describe.c:363

4910 +#: builtin/describe.c:358

4911 #, c-format

4912 msgid ""

4913 "No tags can describe '%s'.\n"

@@ -5008,12 +4916,12 @@ msgstr ""

4916 "Aucune étiquette ne peut décrire '%s'.\n"

4917 "Essayez --always, ou créez des étiquettes."

4918

5011 -#: builtin/describe.c:384

4919 +#: builtin/describe.c:379

4920 #, c-format

4921 msgid "traversed %lu commits\n"

4922 msgstr "%lu commits parcourus\n"

4923

5016 -#: builtin/describe.c:387

4924 +#: builtin/describe.c:382

4925 #, c-format

4926 msgid ""

4927 "more than %i tags found; listed %i most recent\n"

@@ -5023,64 +4931,64 @@ msgstr ""

4931 "affichées\n"

4932 "abandon de la recherche à %s\n"

4933

5026 -#: builtin/describe.c:409

4934 +#: builtin/describe.c:404

4935 msgid "find the tag that comes after the commit"

4936 msgstr "rechercher l'étiquette qui suit le commit"

4937

5030 -#: builtin/describe.c:410

4938 +#: builtin/describe.c:405

4939 msgid "debug search strategy on stderr"

4940 msgstr "déboguer la stratégie de recherche sur stderr"

4941

5034 -#: builtin/describe.c:411

4942 +#: builtin/describe.c:406

4943 msgid "use any ref"

4944 msgstr "utiliser n'importe quelle référence"

4945

5038 -#: builtin/describe.c:412

4946 +#: builtin/describe.c:407

4947 msgid "use any tag, even unannotated"

4948 msgstr "utiliser n'importe quelle étiquette, même non-annotée"

4949

5042 -#: builtin/describe.c:413

4950 +#: builtin/describe.c:408

4951 msgid "always use long format"

4952 msgstr "toujours utiliser le format long"

4953

5046 -#: builtin/describe.c:414

4954 +#: builtin/describe.c:409

4955 msgid "only follow first parent"

4956 msgstr "ne suivre que le premier parent"

4957

5050 -#: builtin/describe.c:417

4958 +#: builtin/describe.c:412

4959 msgid "only output exact matches"

4960 msgstr "n'afficher que les correspondances exactes"

4961

5054 -#: builtin/describe.c:419

4962 +#: builtin/describe.c:414

4963 msgid "consider <n> most recent tags (default: 10)"

4964 msgstr ""

4965 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"

4966

5059 -#: builtin/describe.c:421

4967 +#: builtin/describe.c:416

4968 msgid "only consider tags matching <pattern>"

4969 msgstr "ne considérer que les étiquettes correspondant à <motif>"

4970

5063 -#: builtin/describe.c:423 builtin/name-rev.c:321

4971 +#: builtin/describe.c:418 builtin/name-rev.c:321

4972 msgid "show abbreviated commit object as fallback"

4973 msgstr "afficher les objets commits abrégés en dernier recours"

4974

5067 -#: builtin/describe.c:424

4975 +#: builtin/describe.c:419

4976 msgid "mark"

4977 msgstr "marque"

4978

5071 -#: builtin/describe.c:425

4979 +#: builtin/describe.c:420

4980 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4981 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"

4982

5075 -#: builtin/describe.c:443

4983 +#: builtin/describe.c:438

4984 msgid "--long is incompatible with --abbrev=0"

4985 msgstr "--long et --abbrev=0 sont incompatibles"

4986

5079 -#: builtin/describe.c:469

4987 +#: builtin/describe.c:464

4988 msgid "No names found, cannot describe anything."

4989 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."

4990

5083 -#: builtin/describe.c:489

4991 +#: builtin/describe.c:484

4992 msgid "--dirty is incompatible with commit-ishes"

4993 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"

4994

@@ -5376,7 +5284,7 @@ msgstr "Récupération de %s\n"

5284 msgid "Could not fetch %s"

5285 msgstr "Impossible de récupérer %s"

5286

5379 -#: builtin/fetch.c:1036

5287 +#: builtin/fetch.c:1035

5288 msgid ""

5289 "No remote repository specified. Please, specify either a URL or a\n"

5290 "remote name from which new revisions should be fetched."

@@ -5420,10 +5328,10 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5328 msgstr ""

5329 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"

5330

5423 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5424 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164

5425 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446

5426 -#: parse-options.h:135 parse-options.h:242

5331 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5332 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5333 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5334 +#: parse-options.h:132 parse-options.h:239

5335 msgid "n"

5336 msgstr "n"

5337

@@ -5487,6 +5395,14 @@ msgstr "clé"

5395 msgid "field name to sort on"

5396 msgstr "nom du champ servant à trier"

5397

5398 +#: builtin/fsck.c:147 builtin/prune.c:172

5399 +msgid "Checking connectivity"

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

5401 +

5402 +#: builtin/fsck.c:544

5403 +msgid "Checking object directories"

5404 +msgstr "Vérification des répertoires d'objet"

5405 +

5406 #: builtin/fsck.c:607

5407 msgid "git fsck [options] [<object>...]"

5408 msgstr "git fsck [options] [<objet>...]"

@@ -5532,51 +5448,58 @@ msgstr "écrire les objets en suspens dans .git/lost-found"

5448 msgid "show progress"

5449 msgstr "afficher la progression"

5450

5451 +#: builtin/fsck.c:673

5452 +msgid "Checking objects"

5453 +msgstr "Vérification des objets"

5454 +

5455 #: builtin/gc.c:24

5456 msgid "git gc [options]"

5457 msgstr "git gc [options]"

5458

5539 -#: builtin/gc.c:80

5459 +#: builtin/gc.c:90

5460 #, c-format

5461 msgid "Invalid %s: '%s'"

5462 msgstr "%s invalide : '%s'"

5463

5544 -#: builtin/gc.c:107

5464 +#: builtin/gc.c:117

5465 #, c-format

5466 msgid "insanely long object directory %.*s"

5467 msgstr "objet répertoire démentiellement long %.*s"

5468

5549 -#: builtin/gc.c:262

5469 +#: builtin/gc.c:273

5470 msgid "prune unreferenced objects"

5471 msgstr "éliminer les objets non référencés"

5472

5553 -#: builtin/gc.c:264

5473 +#: builtin/gc.c:275

5474 msgid "be more thorough (increased runtime)"

5475 msgstr "être plus consciencieux (durée de traitement allongée)"

5476

5557 -#: builtin/gc.c:265

5477 +#: builtin/gc.c:276

5478 msgid "enable auto-gc mode"

5479 msgstr "activer le mode auto-gc"

5480

5561 -#: builtin/gc.c:266

5481 +#: builtin/gc.c:277

5482 msgid "force running gc even if there may be another gc running"

5483 msgstr ""

5484 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

5485 "tourne déjà"

5486

5567 -#: builtin/gc.c:306

5487 +#: builtin/gc.c:318

5488 #, c-format

5569 -msgid ""

5570 -"Auto packing the repository for optimum performance. You may also\n"

5571 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

5572 -msgstr ""

5573 -"Compression automatique du dépôt pour une performance optimum. Vous pouvez "

5574 -"aussi\n"

5575 -"lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "

5576 -"d'information.\n"

5489 +msgid "Auto packing the repository in background for optimum performance.\n"

5490 +msgstr "Compression automatique du dépôt en tâche de fond pour optimiser les performances.\n"

5491

5578 -#. be quiet on --auto

5579 -#: builtin/gc.c:316

5492 +#: builtin/gc.c:320

5493 +#, c-format

5494 +msgid "Auto packing the repository for optimum performance.\n"

5495 +msgstr "Compression du dépôt pour optimiser les performances.\n"

5496 +

5497 +#: builtin/gc.c:321

5498 +#, c-format

5499 +msgid "See \"git help gc\" for manual housekeeping.\n"

5500 +msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

5501 +

5502 +#: builtin/gc.c:336

5503 #, c-format

5504 msgid ""

5505 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5584,7 +5507,7 @@ msgstr ""

5507 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

5508 "(utilisez --force si ce n'est pas le cas)"

5509

5587 -#: builtin/gc.c:341

5510 +#: builtin/gc.c:361

5511 msgid ""

5512 "There are too many unreachable loose objects; run 'git prune' to remove them."

5513 msgstr ""

@@ -5615,218 +5538,218 @@ msgstr "impossible de lire l'arbre (%s)"

5538 msgid "unable to grep from object of type %s"

5539 msgstr "impossible de faire un grep sur un objet de type %s"

5540

5618 -#: builtin/grep.c:551

5541 +#: builtin/grep.c:549

5542 #, c-format

5543 msgid "switch `%c' expects a numerical value"

5544 msgstr "l'option '%c' attend un valeur numérique"

5545

5623 -#: builtin/grep.c:568

5546 +#: builtin/grep.c:566

5547 #, c-format

5548 msgid "cannot open '%s'"

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

5550

5628 -#: builtin/grep.c:642

5551 +#: builtin/grep.c:640

5552 msgid "search in index instead of in the work tree"

5553 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

5554

5632 -#: builtin/grep.c:644

5555 +#: builtin/grep.c:642

5556 msgid "find in contents not managed by git"

5557 msgstr "rechercher dans les contenus non gérés par git"

5558

5636 -#: builtin/grep.c:646

5559 +#: builtin/grep.c:644

5560 msgid "search in both tracked and untracked files"

5561 msgstr "rechercher dans les fichiers suivis et non-suivis"

5562

5640 -#: builtin/grep.c:648

5563 +#: builtin/grep.c:646

5564 msgid "search also in ignored files"

5565 msgstr "rechercher aussi dans les fichiers ignorés"

5566

5644 -#: builtin/grep.c:651

5567 +#: builtin/grep.c:649

5568 msgid "show non-matching lines"

5569 msgstr "afficher les lignes qui ne correspondent pas"

5570

5648 -#: builtin/grep.c:653

5571 +#: builtin/grep.c:651

5572 msgid "case insensitive matching"

5573 msgstr "correspondance insensible à la casse"

5574

5652 -#: builtin/grep.c:655

5575 +#: builtin/grep.c:653

5576 msgid "match patterns only at word boundaries"

5577 msgstr "rechercher les motifs aux séparateurs de mots"

5578

5656 -#: builtin/grep.c:657

5579 +#: builtin/grep.c:655

5580 msgid "process binary files as text"

5581 msgstr "traiter les fichiers binaires comme texte"

5582

5660 -#: builtin/grep.c:659

5583 +#: builtin/grep.c:657

5584 msgid "don't match patterns in binary files"

5585 msgstr "ne pas chercher les motifs dans les fichiers binaires"

5586

5664 -#: builtin/grep.c:662

5587 +#: builtin/grep.c:660

5588 msgid "process binary files with textconv filters"

5589 msgstr "traiter les fichiers binaires avec les filtres textconv"

5590

5668 -#: builtin/grep.c:664

5591 +#: builtin/grep.c:662

5592 msgid "descend at most <depth> levels"

5593 msgstr "descendre au plus de <profondeur> dans l'arborescence"

5594

5672 -#: builtin/grep.c:668

5595 +#: builtin/grep.c:666

5596 msgid "use extended POSIX regular expressions"

5597 msgstr "utiliser des expressions régulières étendues POSIX"

5598

5676 -#: builtin/grep.c:671

5599 +#: builtin/grep.c:669

5600 msgid "use basic POSIX regular expressions (default)"

5601 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

5602

5680 -#: builtin/grep.c:674

5603 +#: builtin/grep.c:672

5604 msgid "interpret patterns as fixed strings"

5605 msgstr "interpréter les motifs comme de chaînes fixes"

5606

5684 -#: builtin/grep.c:677

5607 +#: builtin/grep.c:675

5608 msgid "use Perl-compatible regular expressions"

5609 msgstr "utiliser des expressions régulières compatibles avec Perl"

5610

5688 -#: builtin/grep.c:680

5611 +#: builtin/grep.c:678

5612 msgid "show line numbers"

5613 msgstr "afficher les numéros de ligne"

5614

5692 -#: builtin/grep.c:681

5615 +#: builtin/grep.c:679

5616 msgid "don't show filenames"

5617 msgstr "ne pas pas afficher les noms de fichier"

5618

5696 -#: builtin/grep.c:682

5619 +#: builtin/grep.c:680

5620 msgid "show filenames"

5621 msgstr "afficher les noms de fichier"

5622

5700 -#: builtin/grep.c:684

5623 +#: builtin/grep.c:682

5624 msgid "show filenames relative to top directory"

5625 msgstr "afficher les noms de fichiers relativement au répertoire de base"

5626

5704 -#: builtin/grep.c:686

5627 +#: builtin/grep.c:684

5628 msgid "show only filenames instead of matching lines"

5629 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

5630

5708 -#: builtin/grep.c:688

5631 +#: builtin/grep.c:686

5632 msgid "synonym for --files-with-matches"

5633 msgstr "synonyme pour --files-with-matches"

5634

5712 -#: builtin/grep.c:691

5635 +#: builtin/grep.c:689

5636 msgid "show only the names of files without match"

5637 msgstr "n'afficher que les noms des fichiers sans correspondance"

5638

5716 -#: builtin/grep.c:693

5639 +#: builtin/grep.c:691

5640 msgid "print NUL after filenames"

5641 msgstr "imprimer une caractère NUL après le noms de fichier"

5642

5720 -#: builtin/grep.c:695

5643 +#: builtin/grep.c:693

5644 msgid "show the number of matches instead of matching lines"

5645 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

5646

5724 -#: builtin/grep.c:696

5647 +#: builtin/grep.c:694

5648 msgid "highlight matches"

5649 msgstr "mettre en évidence les correspondances"

5650

5728 -#: builtin/grep.c:698

5651 +#: builtin/grep.c:696

5652 msgid "print empty line between matches from different files"

5653 msgstr ""

5654 "imprimer une ligne vide entre les correspondances de fichiers différents"

5655

5733 -#: builtin/grep.c:700

5656 +#: builtin/grep.c:698

5657 msgid "show filename only once above matches from same file"

5658 msgstr ""

5659 "afficher le nom de fichier une fois au dessus des correspondances du même "

5660 "fichier"

5661

5739 -#: builtin/grep.c:703

5662 +#: builtin/grep.c:701

5663 msgid "show <n> context lines before and after matches"

5664 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

5665

5743 -#: builtin/grep.c:706

5666 +#: builtin/grep.c:704

5667 msgid "show <n> context lines before matches"

5668 msgstr "afficher <n> lignes de contexte avant les correspondances"

5669

5747 -#: builtin/grep.c:708

5670 +#: builtin/grep.c:706

5671 msgid "show <n> context lines after matches"

5672 msgstr "afficher <n> lignes de contexte après les correspondances"

5673

5751 -#: builtin/grep.c:709

5674 +#: builtin/grep.c:707

5675 msgid "shortcut for -C NUM"

5676 msgstr "raccourci pour -C NUM"

5677

5755 -#: builtin/grep.c:712

5678 +#: builtin/grep.c:710

5679 msgid "show a line with the function name before matches"

5680 msgstr ""

5681 "afficher une ligne avec le nom de la fonction avant les correspondances"

5682

5760 -#: builtin/grep.c:714

5683 +#: builtin/grep.c:712

5684 msgid "show the surrounding function"

5685 msgstr "afficher la fonction contenante"

5686

5764 -#: builtin/grep.c:717

5687 +#: builtin/grep.c:715

5688 msgid "read patterns from file"

5689 msgstr "lire les motifs depuis fichier"

5690

5768 -#: builtin/grep.c:719

5691 +#: builtin/grep.c:717

5692 msgid "match <pattern>"

5693 msgstr "rechercher <motif>"

5694

5772 -#: builtin/grep.c:721

5695 +#: builtin/grep.c:719

5696 msgid "combine patterns specified with -e"

5697 msgstr "combiner les motifs spécifiés par -e"

5698

5776 -#: builtin/grep.c:733

5699 +#: builtin/grep.c:731

5700 msgid "indicate hit with exit status without output"

5701 msgstr ""

5702 "indiquer des correspondances avec le code de sortie mais sans rien afficher"

5703

5781 -#: builtin/grep.c:735

5704 +#: builtin/grep.c:733

5705 msgid "show only matches from files that match all patterns"

5706 msgstr ""

5707 "n'afficher que les correspondances de fichiers qui correspondent à tous les "

5708 "motifs"

5709

5787 -#: builtin/grep.c:737

5710 +#: builtin/grep.c:735

5711 msgid "show parse tree for grep expression"

5712 msgstr "afficher l'arbre d'analyse pour le motif grep"

5713

5791 -#: builtin/grep.c:741

5714 +#: builtin/grep.c:739

5715 msgid "pager"

5716 msgstr "pagineur"

5717

5795 -#: builtin/grep.c:741

5718 +#: builtin/grep.c:739

5719 msgid "show matching files in the pager"

5720 msgstr "afficher les fichiers correspondant dans le pagineur"

5721

5799 -#: builtin/grep.c:744

5722 +#: builtin/grep.c:742

5723 msgid "allow calling of grep(1) (ignored by this build)"

5724 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

5725

5803 -#: builtin/grep.c:745 builtin/show-ref.c:187

5726 +#: builtin/grep.c:743 builtin/show-ref.c:187

5727 msgid "show usage"

5728 msgstr "afficher l'usage"

5729

5807 -#: builtin/grep.c:812

5730 +#: builtin/grep.c:810

5731 msgid "no pattern given."

5732 msgstr "aucun motif fourni."

5733

5811 -#: builtin/grep.c:870

5734 +#: builtin/grep.c:868

5735 msgid "--open-files-in-pager only works on the worktree"

5736 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"

5737

5815 -#: builtin/grep.c:893

5738 +#: builtin/grep.c:891

5739 msgid "--cached or --untracked cannot be used with --no-index."

5740 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."

5741

5819 -#: builtin/grep.c:898

5742 +#: builtin/grep.c:896

5743 msgid "--no-index or --untracked cannot be used with revs."

5744 msgstr ""

5745 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."

5746

5824 -#: builtin/grep.c:901

5747 +#: builtin/grep.c:899

5748 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5749 msgstr ""

5750 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."

5751

5829 -#: builtin/grep.c:909

5752 +#: builtin/grep.c:907

5753 msgid "both --cached and trees are given."

5754 msgstr "--cached et des arbres sont fournis en même temps."

5755

@@ -5842,7 +5765,7 @@ msgstr ""

5765 msgid "git hash-object --stdin-paths < <list-of-paths>"

5766 msgstr "git hash-object --stdin-paths < <liste-de-chemins>"

5767

5845 -#: builtin/hash-object.c:72

5768 +#: builtin/hash-object.c:72 builtin/tag.c:521

5769 msgid "type"

5770 msgstr "type"

5771

@@ -6082,8 +6005,8 @@ msgstr "grave incohérence dans la décompression (inflate)"

6005 msgid "SHA1 COLLISION FOUND WITH %s !"

6006 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6007

6085 -#: builtin/index-pack.c:669 builtin/pack-objects.c:171

6086 -#: builtin/pack-objects.c:263

6008 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162

6009 +#: builtin/pack-objects.c:254

6010 #, c-format

6011 msgid "unable to read %s"

6012 msgstr "impossible de lire %s"

@@ -6351,33 +6274,31 @@ msgstr "impossible de traiter le fichier de type %d"

6274 msgid "unable to move %s to %s"

6275 msgstr "impossible de déplacer %s vers %s"

6276

6354 -#.

6355 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

6356 -#. * existing" or "Initialized empty", the second " shared" or

6357 -#. * "", and the last '%s%s' is the verbatim directory name.

6358 -#.

6359 -#: builtin/init-db.c:420

6277 +#. TRANSLATORS: The first '%s' is either "Reinitialized

6278 +#. existing" or "Initialized empty", the second " shared" or

6279 +#. "", and the last '%s%s' is the verbatim directory name.

6280 +#: builtin/init-db.c:418

6281 #, c-format

6282 msgid "%s%s Git repository in %s%s\n"

6283 msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"

6284

6364 -#: builtin/init-db.c:421

6285 +#: builtin/init-db.c:419

6286 msgid "Reinitialized existing"

6287 msgstr "existant réinitialisé"

6288

6368 -#: builtin/init-db.c:421

6289 +#: builtin/init-db.c:419

6290 msgid "Initialized empty"

6291 msgstr "vide initialisé"

6292

6372 -#: builtin/init-db.c:422

6293 +#: builtin/init-db.c:420

6294 msgid " shared"

6295 msgstr " partagé"

6296

6376 -#: builtin/init-db.c:441

6297 +#: builtin/init-db.c:439

6298 msgid "cannot tell cwd"

6299 msgstr "impossible de déterminer le répertoire de travail courant"

6300

6380 -#: builtin/init-db.c:467

6301 +#: builtin/init-db.c:465

6302 msgid ""

6303 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6304 "shared[=<permissions>]] [directory]"

@@ -6385,29 +6306,29 @@ msgstr ""

6306 "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"

6307 "shared[=<permissions>]] [répertoire]"

6308

6388 -#: builtin/init-db.c:490

6309 +#: builtin/init-db.c:488

6310 msgid "permissions"

6311 msgstr "permissions"

6312

6392 -#: builtin/init-db.c:491

6313 +#: builtin/init-db.c:489

6314 msgid "specify that the git repository is to be shared amongst several users"

6315 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"

6316

6396 -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

6317 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6318 msgid "be quiet"

6319 msgstr "être silencieux"

6320

6400 -#: builtin/init-db.c:525 builtin/init-db.c:530

6321 +#: builtin/init-db.c:523 builtin/init-db.c:528

6322 #, c-format

6323 msgid "cannot mkdir %s"

6324 msgstr "impossible de créer le répertoire (mkdir) %s"

6325

6405 -#: builtin/init-db.c:534

6326 +#: builtin/init-db.c:532

6327 #, c-format

6328 msgid "cannot chdir to %s"

6329 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"

6330

6410 -#: builtin/init-db.c:556

6331 +#: builtin/init-db.c:554

6332 #, c-format

6333 msgid ""

6334 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6416,11 +6337,11 @@ msgstr ""

6337 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"

6338 "git-dir=<répertoire>)"

6339

6419 -#: builtin/init-db.c:580

6340 +#: builtin/init-db.c:578

6341 msgid "Cannot access current working directory"

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

6343

6423 -#: builtin/init-db.c:587

6344 +#: builtin/init-db.c:585

6345 #, c-format

6346 msgid "Cannot access work tree '%s'"

6347 msgstr "Impossible d'accéder à l'arbre de travail '%s'"

@@ -6688,98 +6609,98 @@ msgstr ""

6609 msgid "Unknown commit %s"

6610 msgstr "Commit inconnu %s"

6611

6691 -#: builtin/ls-files.c:398

6612 +#: builtin/ls-files.c:401

6613 msgid "git ls-files [options] [<file>...]"

6614 msgstr "git ls-files [options] [<fichier>...]"

6615

6695 -#: builtin/ls-files.c:455

6616 +#: builtin/ls-files.c:458

6617 msgid "identify the file status with tags"

6618 msgstr "identifier le statut de fichier avec les étiquettes"

6619

6699 -#: builtin/ls-files.c:457

6620 +#: builtin/ls-files.c:460

6621 msgid "use lowercase letters for 'assume unchanged' files"

6622 msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"

6623

6703 -#: builtin/ls-files.c:459

6624 +#: builtin/ls-files.c:462

6625 msgid "show cached files in the output (default)"

6626 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"

6627

6707 -#: builtin/ls-files.c:461

6628 +#: builtin/ls-files.c:464

6629 msgid "show deleted files in the output"

6630 msgstr "afficher les fichiers supprimés dans la sortie"

6631

6711 -#: builtin/ls-files.c:463

6632 +#: builtin/ls-files.c:466

6633 msgid "show modified files in the output"

6634 msgstr "afficher les fichiers modifiés dans la sortie"

6635

6715 -#: builtin/ls-files.c:465

6636 +#: builtin/ls-files.c:468

6637 msgid "show other files in the output"

6638 msgstr "afficher les autres fichiers dans la sortie"

6639

6719 -#: builtin/ls-files.c:467

6640 +#: builtin/ls-files.c:470

6641 msgid "show ignored files in the output"

6642 msgstr "afficher les fichiers ignorés dans la sortie"

6643

6723 -#: builtin/ls-files.c:470

6644 +#: builtin/ls-files.c:473

6645 msgid "show staged contents' object name in the output"

6646 msgstr "afficher les nom des objets indexés dans la sortie"

6647

6727 -#: builtin/ls-files.c:472

6648 +#: builtin/ls-files.c:475

6649 msgid "show files on the filesystem that need to be removed"

6650 msgstr ""

6651 "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"

6652

6732 -#: builtin/ls-files.c:474

6653 +#: builtin/ls-files.c:477

6654 msgid "show 'other' directories' name only"

6655 msgstr "afficher seulement les noms des répertoires 'other'"

6656

6736 -#: builtin/ls-files.c:477

6657 +#: builtin/ls-files.c:480

6658 msgid "don't show empty directories"

6659 msgstr "ne pas afficher les répertoires vides"

6660

6740 -#: builtin/ls-files.c:480

6661 +#: builtin/ls-files.c:483

6662 msgid "show unmerged files in the output"

6663 msgstr "afficher les fichiers non fusionnés dans la sortie"

6664

6744 -#: builtin/ls-files.c:482

6665 +#: builtin/ls-files.c:485

6666 msgid "show resolve-undo information"

6667 msgstr "afficher l'information resolv-undo"

6668

6748 -#: builtin/ls-files.c:484

6669 +#: builtin/ls-files.c:487

6670 msgid "skip files matching pattern"

6671 msgstr "sauter les fichiers correspondant au motif"

6672

6752 -#: builtin/ls-files.c:487

6673 +#: builtin/ls-files.c:490

6674 msgid "exclude patterns are read from <file>"

6675 msgstr "les motifs d'exclusion sont lus depuis <fichier>"

6676

6756 -#: builtin/ls-files.c:490

6677 +#: builtin/ls-files.c:493

6678 msgid "read additional per-directory exclude patterns in <file>"

6679 msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"

6680

6760 -#: builtin/ls-files.c:492

6681 +#: builtin/ls-files.c:495

6682 msgid "add the standard git exclusions"

6683 msgstr "ajouter les exclusions git standard"

6684

6764 -#: builtin/ls-files.c:495

6685 +#: builtin/ls-files.c:498

6686 msgid "make the output relative to the project top directory"

6687 msgstr "afficher en relatif par rapport au répertoire racine du projet"

6688

6768 -#: builtin/ls-files.c:498

6689 +#: builtin/ls-files.c:501

6690 msgid "if any <file> is not in the index, treat this as an error"

6691 msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"

6692

6772 -#: builtin/ls-files.c:499

6693 +#: builtin/ls-files.c:502

6694 msgid "tree-ish"

6695 msgstr "arbre ou apparenté"

6696

6776 -#: builtin/ls-files.c:500

6697 +#: builtin/ls-files.c:503

6698 msgid "pretend that paths removed since <tree-ish> are still present"

6699 msgstr ""

6700 "considérer que les chemins supprimés depuis <arbre ou apparenté> sont "

6701 "toujours présents"

6702

6782 -#: builtin/ls-files.c:502

6703 +#: builtin/ls-files.c:505

6704 msgid "show debugging data"

6705 msgstr "afficher les données de débogage"

6706

@@ -6894,7 +6815,7 @@ msgstr "abandonner si l'avance rapide n'est pas possible"

6815 msgid "Verify that the named commit has a valid GPG signature"

6816 msgstr "Vérifier que la validation a une signature GPG valide"

6817

6897 -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6818 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89

6819 msgid "strategy"

6820 msgstr "stratégie"

6821

@@ -6968,37 +6889,37 @@ msgstr "'%s' ne pointe pas sur un commit"

6889 msgid "Bad branch.%s.mergeoptions string: %s"

6890 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"

6891

6971 -#: builtin/merge.c:650

6892 +#: builtin/merge.c:653

6893 msgid "git write-tree failed to write a tree"

6894 msgstr "git write-tree a échoué à écrire un arbre"

6895

6975 -#: builtin/merge.c:678

6896 +#: builtin/merge.c:681

6897 msgid "Not handling anything other than two heads merge."

6898 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."

6899

6979 -#: builtin/merge.c:692

6900 +#: builtin/merge.c:695

6901 #, c-format

6902 msgid "Unknown option for merge-recursive: -X%s"

6903 msgstr "Options inconnue pour merge-recursive : -X%s"

6904

6984 -#: builtin/merge.c:706

6905 +#: builtin/merge.c:709

6906 #, c-format

6907 msgid "unable to write %s"

6908 msgstr "impossible d'écrire %s"

6909

6989 -#: builtin/merge.c:795

6910 +#: builtin/merge.c:798

6911 #, c-format

6912 msgid "Could not read from '%s'"

6913 msgstr "Impossible de lire depuis '%s'"

6914

6994 -#: builtin/merge.c:804

6915 +#: builtin/merge.c:807

6916 #, c-format

6917 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6918 msgstr ""

6919 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "

6920 "fusion.\n"

6921

7001 -#: builtin/merge.c:810

6922 +#: builtin/merge.c:813

6923 #, c-format

6924 msgid ""

6925 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7015,49 +6936,49 @@ msgstr ""

6936 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"

6937 "abandonne la validation.\n"

6938

7018 -#: builtin/merge.c:834

6939 +#: builtin/merge.c:837

6940 msgid "Empty commit message."

6941 msgstr "Message de validation vide."

6942

7022 -#: builtin/merge.c:846

6943 +#: builtin/merge.c:849

6944 #, c-format

6945 msgid "Wonderful.\n"

6946 msgstr "Merveilleux.\n"

6947

7027 -#: builtin/merge.c:911

6948 +#: builtin/merge.c:914

6949 #, c-format

6950 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6951 msgstr ""

6952 "La fusion automatique a échoué ; réglez les conflits et validez le "

6953 "résultat.\n"

6954

7034 -#: builtin/merge.c:927

6955 +#: builtin/merge.c:930

6956 #, c-format

6957 msgid "'%s' is not a commit"

6958 msgstr "'%s' n'est pas une validation"

6959

7039 -#: builtin/merge.c:968

6960 +#: builtin/merge.c:971

6961 msgid "No current branch."

6962 msgstr "Pas de branche courante."

6963

7043 -#: builtin/merge.c:970

6964 +#: builtin/merge.c:973

6965 msgid "No remote for the current branch."

6966 msgstr "Pas de branche distante pour la branche courante."

6967

7047 -#: builtin/merge.c:972

6968 +#: builtin/merge.c:975

6969 msgid "No default upstream defined for the current branch."

6970 msgstr "Pas de branche amont par défaut définie pour la branche courante."

6971

7051 -#: builtin/merge.c:977

6972 +#: builtin/merge.c:980

6973 #, c-format

6974 msgid "No remote-tracking branch for %s from %s"

6975 msgstr "Pas de branche de suivi pour %s depuis %s"

6976

7056 -#: builtin/merge.c:1133

6977 +#: builtin/merge.c:1136

6978 msgid "There is no merge to abort (MERGE_HEAD missing)."

6979 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."

6980

7060 -#: builtin/merge.c:1149 git-pull.sh:31

6981 +#: builtin/merge.c:1152 git-pull.sh:31

6982 msgid ""

6983 "You have not concluded your merge (MERGE_HEAD exists).\n"

6984 "Please, commit your changes before you can merge."

@@ -7065,11 +6986,11 @@ msgstr ""

6986 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"

6987 "Veuillez valider vos changements avant de pouvoir fusionner."

6988

7068 -#: builtin/merge.c:1152 git-pull.sh:34

6989 +#: builtin/merge.c:1155 git-pull.sh:34

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

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

6992

7072 -#: builtin/merge.c:1156

6993 +#: builtin/merge.c:1159

6994 msgid ""

6995 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6996 "Please, commit your changes before you can merge."

@@ -7077,103 +6998,102 @@ msgstr ""

6998 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"

6999 "Veuillez valider vos changements avant de pouvoir fusionner."

7000

7080 -#: builtin/merge.c:1159

7001 +#: builtin/merge.c:1162

7002 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7003 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."

7004

7084 -#: builtin/merge.c:1168

7005 +#: builtin/merge.c:1171

7006 msgid "You cannot combine --squash with --no-ff."

7007 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."

7008

7088 -#: builtin/merge.c:1177

7009 +#: builtin/merge.c:1180

7010 msgid "No commit specified and merge.defaultToUpstream not set."

7011 msgstr ""

7012 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."

7013

7093 -#: builtin/merge.c:1209

7014 +#: builtin/merge.c:1212

7015 msgid "Can merge only exactly one commit into empty head"

7016 msgstr ""

7017 "Possible de fusionner exactement une seule validation dans une tête vide"

7018

7098 -#: builtin/merge.c:1212

7019 +#: builtin/merge.c:1215

7020 msgid "Squash commit into empty head not supported yet"

7021 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"

7022

7102 -#: builtin/merge.c:1214

7023 +#: builtin/merge.c:1217

7024 msgid "Non-fast-forward commit does not make sense into an empty head"

7025 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"

7026

7106 -#: builtin/merge.c:1219

7027 +#: builtin/merge.c:1222

7028 #, c-format

7029 msgid "%s - not something we can merge"

7030 msgstr "%s - pas possible de fusionner ceci"

7031

7111 -#: builtin/merge.c:1270

7032 +#: builtin/merge.c:1273

7033 #, c-format

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

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

7036

7116 -#: builtin/merge.c:1273

7037 +#: builtin/merge.c:1276

7038 #, c-format

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

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

7041

7121 -#. 'N'

7122 -#: builtin/merge.c:1276

7042 +#: builtin/merge.c:1279

7043 #, c-format

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

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

7046

7127 -#: builtin/merge.c:1279

7047 +#: builtin/merge.c:1282

7048 #, c-format

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

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

7051

7132 -#: builtin/merge.c:1363

7052 +#: builtin/merge.c:1366

7053 #, c-format

7054 msgid "Updating %s..%s\n"

7055 msgstr "Mise à jour %s..%s\n"

7056

7137 -#: builtin/merge.c:1402

7057 +#: builtin/merge.c:1405

7058 #, c-format

7059 msgid "Trying really trivial in-index merge...\n"

7060 msgstr "Essai de fusion vraiment triviale dans l'index...\n"

7061

7142 -#: builtin/merge.c:1409

7062 +#: builtin/merge.c:1412

7063 #, c-format

7064 msgid "Nope.\n"

7065 msgstr "Non.\n"

7066

7147 -#: builtin/merge.c:1441

7067 +#: builtin/merge.c:1444

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

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

7070

7151 -#: builtin/merge.c:1464 builtin/merge.c:1543

7071 +#: builtin/merge.c:1467 builtin/merge.c:1546

7072 #, c-format

7073 msgid "Rewinding the tree to pristine...\n"

7074 msgstr "Retour de l'arbre à l'original...\n"

7075

7156 -#: builtin/merge.c:1468

7076 +#: builtin/merge.c:1471

7077 #, c-format

7078 msgid "Trying merge strategy %s...\n"

7079 msgstr "Essai de la stratégie de fusion %s...\n"

7080

7161 -#: builtin/merge.c:1534

7081 +#: builtin/merge.c:1537

7082 #, c-format

7083 msgid "No merge strategy handled the merge.\n"

7084 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"

7085

7166 -#: builtin/merge.c:1536

7086 +#: builtin/merge.c:1539

7087 #, c-format

7088 msgid "Merge with strategy %s failed.\n"

7089 msgstr "La fusion avec la stratégie %s a échoué.\n"

7090

7171 -#: builtin/merge.c:1545

7091 +#: builtin/merge.c:1548

7092 #, c-format

7093 msgid "Using the %s to prepare resolving by hand.\n"

7094 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"

7095

7176 -#: builtin/merge.c:1557

7096 +#: builtin/merge.c:1560

7097 #, c-format

7098 msgid "Automatic merge went well; stopped before committing as requested\n"

7099 msgstr ""

@@ -7259,19 +7179,19 @@ msgstr "ne pas avertir à propos des conflits"

7179 msgid "set labels for file1/orig_file/file2"

7180 msgstr "définir les labels pour fichier1/orig_file/fichier2"

7181

7262 -#: builtin/mktree.c:67

7182 +#: builtin/mktree.c:64

7183 msgid "git mktree [-z] [--missing] [--batch]"

7184 msgstr "git mktree [-z] [--missing] [--batch]"

7185

7266 -#: builtin/mktree.c:153

7186 +#: builtin/mktree.c:150

7187 msgid "input is NUL terminated"

7188 msgstr "l'entrée se termine par NUL"

7189

7270 -#: builtin/mktree.c:154 builtin/write-tree.c:24

7190 +#: builtin/mktree.c:151 builtin/write-tree.c:24

7191 msgid "allow missing objects"

7192 msgstr "autoriser les objets manquants"

7193

7274 -#: builtin/mktree.c:155

7194 +#: builtin/mktree.c:152

7195 msgid "allow creation of more than one tree"

7196 msgstr "autoriser la création de plus d'un arbre"

7197

@@ -7321,46 +7241,46 @@ msgstr ""

7241 msgid "Huh? %.*s is in index?"

7242 msgstr "Hein ? %.*s est dans l'index ?"

7243

7324 -#: builtin/mv.c:168

7244 +#: builtin/mv.c:169

7245 msgid "source directory is empty"

7246 msgstr "le répertoire source est vide"

7247

7328 -#: builtin/mv.c:200

7248 +#: builtin/mv.c:205

7249 msgid "not under version control"

7250 msgstr "pas sous le contrôle de version"

7251

7332 -#: builtin/mv.c:202

7252 +#: builtin/mv.c:207

7253 msgid "destination exists"

7254 msgstr "la destination existe"

7255

7336 -#: builtin/mv.c:210

7256 +#: builtin/mv.c:215

7257 #, c-format

7258 msgid "overwriting '%s'"

7259 msgstr "écrasement de '%s'"

7260

7341 -#: builtin/mv.c:213

7261 +#: builtin/mv.c:218

7262 msgid "Cannot overwrite"

7263 msgstr "Impossible d'écraser"

7264

7345 -#: builtin/mv.c:216

7265 +#: builtin/mv.c:221

7266 msgid "multiple sources for the same target"

7267 msgstr "multiples sources pour la même destination"

7268

7349 -#: builtin/mv.c:218

7269 +#: builtin/mv.c:223

7270 msgid "destination directory does not exist"

7271 msgstr "le répertoire de destination n'existe pas"

7272

7353 -#: builtin/mv.c:233

7273 +#: builtin/mv.c:243

7274 #, c-format

7275 msgid "%s, source=%s, destination=%s"

7276 msgstr "%s, source=%s, destination=%s"

7277

7358 -#: builtin/mv.c:243

7278 +#: builtin/mv.c:253

7279 #, c-format

7280 msgid "Renaming %s to %s\n"

7281 msgstr "Renommage de %s en %s\n"

7282

7363 -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

7283 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7284 #, c-format

7285 msgid "renaming '%s' failed"

7286 msgstr "le renommage de '%s' a échoué"

@@ -7532,7 +7452,7 @@ msgstr "impossible de lire la sortie de 'show'"

7452 msgid "failed to finish 'show' for object '%s'"

7453 msgstr "impossible de finir 'show' pour l'objet '%s'"

7454

7535 -#: builtin/notes.c:167 builtin/tag.c:341

7455 +#: builtin/notes.c:167 builtin/tag.c:373

7456 #, c-format

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

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

@@ -7541,7 +7461,7 @@ msgstr "impossible de créer le fichier '%s'"

7461 msgid "Please supply the note contents using either -m or -F option"

7462 msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F"

7463

7544 -#: builtin/notes.c:207 builtin/notes.c:844

7464 +#: builtin/notes.c:207 builtin/notes.c:848

7465 #, c-format

7466 msgid "Removing note for object %s\n"

7467 msgstr "Suppression de la note pour l'objet %s\n"

@@ -7555,20 +7475,20 @@ msgstr "impossible d'écrire l'objet note"

7475 msgid "The note contents has been left in %s"

7476 msgstr "Le contenu de la note a été laissé dans %s"

7477

7558 -#: builtin/notes.c:248 builtin/tag.c:537

7478 +#: builtin/notes.c:248 builtin/tag.c:604

7479 #, c-format

7480 msgid "cannot read '%s'"

7481 msgstr "impossible de lire '%s'"

7482

7563 -#: builtin/notes.c:250 builtin/tag.c:540

7483 +#: builtin/notes.c:250 builtin/tag.c:607

7484 #, c-format

7485 msgid "could not open or read '%s'"

7486 msgstr "impossible d'ouvrir ou lire '%s'"

7487

7568 -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318

7569 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515

7570 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637

7571 -#: builtin/notes.c:839 builtin/tag.c:553

7488 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322

7489 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519

7490 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641

7491 +#: builtin/notes.c:843 builtin/tag.c:620

7492 #, c-format

7493 msgid "Failed to resolve '%s' as a valid ref."

7494 msgstr "Impossible de résoudre '%s' comme une référence valide."

@@ -7578,53 +7498,58 @@ msgstr "Impossible de résoudre '%s' comme une référence valide."

7498 msgid "Failed to read object '%s'."

7499 msgstr "Impossible de lire l'objet '%s'."

7500

7581 -#: builtin/notes.c:312

7501 +#: builtin/notes.c:276

7502 +#, c-format

7503 +msgid "Cannot read note data from non-blob object '%s'."

7504 +msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."

7505 +

7506 +#: builtin/notes.c:316

7507 #, c-format

7508 msgid "Malformed input line: '%s'."

7509 msgstr "Ligne en entrée malformée : '%s'."

7510

7586 -#: builtin/notes.c:327

7511 +#: builtin/notes.c:331

7512 #, c-format

7513 msgid "Failed to copy notes from '%s' to '%s'"

7514 msgstr "Impossible de copier les notes de '%s' vers '%s'"

7515

7591 -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498

7592 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630

7593 -#: builtin/notes.c:904

7516 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502

7517 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634

7518 +#: builtin/notes.c:908

7519 msgid "too many parameters"

7520 msgstr "trop de paramètres"

7521

7597 -#: builtin/notes.c:384 builtin/notes.c:643

7522 +#: builtin/notes.c:388 builtin/notes.c:647

7523 #, c-format

7524 msgid "No note found for object %s."

7525 msgstr "Pas de note trouvée pour l'objet %s."

7526

7602 -#: builtin/notes.c:406 builtin/notes.c:563

7527 +#: builtin/notes.c:410 builtin/notes.c:567

7528 msgid "note contents as a string"

7529 msgstr "contenu de la note sous forme de chaîne"

7530

7606 -#: builtin/notes.c:409 builtin/notes.c:566

7531 +#: builtin/notes.c:413 builtin/notes.c:570

7532 msgid "note contents in a file"

7533 msgstr "contenu de la note dans un fichier"

7534

7610 -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568

7611 -#: builtin/notes.c:571 builtin/tag.c:474

7535 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572

7536 +#: builtin/notes.c:575 builtin/tag.c:539

7537 msgid "object"

7538 msgstr "objet"

7539

7615 -#: builtin/notes.c:412 builtin/notes.c:569

7540 +#: builtin/notes.c:416 builtin/notes.c:573

7541 msgid "reuse and edit specified note object"

7542 msgstr "réutiliser et éditer l'objet de note spécifié"

7543

7619 -#: builtin/notes.c:415 builtin/notes.c:572

7544 +#: builtin/notes.c:419 builtin/notes.c:576

7545 msgid "reuse specified note object"

7546 msgstr "réutiliser l'objet de note spécifié"

7547

7623 -#: builtin/notes.c:417 builtin/notes.c:485

7548 +#: builtin/notes.c:421 builtin/notes.c:489

7549 msgid "replace existing notes"

7550 msgstr "remplacer les notes existantes"

7551

7627 -#: builtin/notes.c:451

7552 +#: builtin/notes.c:455

7553 #, c-format

7554 msgid ""

7555 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7633,25 +7558,25 @@ msgstr ""

7558 "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "

7559 "Utilisez '-f' pour écraser les notes existantes"

7560

7636 -#: builtin/notes.c:456 builtin/notes.c:533

7561 +#: builtin/notes.c:460 builtin/notes.c:537

7562 #, c-format

7563 msgid "Overwriting existing notes for object %s\n"

7564 msgstr "Écrasement des notes existantes pour l'objet %s\n"

7565

7641 -#: builtin/notes.c:486

7566 +#: builtin/notes.c:490

7567 msgid "read objects from stdin"

7568 msgstr "lire les objets depuis l'entrée standard"

7569

7645 -#: builtin/notes.c:488

7570 +#: builtin/notes.c:492

7571 msgid "load rewriting config for <command> (implies --stdin)"

7572 msgstr ""

7573 "charger la configuration de réécriture pour <commande> (implique --stdin)"

7574

7650 -#: builtin/notes.c:506

7575 +#: builtin/notes.c:510

7576 msgid "too few parameters"

7577 msgstr "pas assez de paramètres"

7578

7654 -#: builtin/notes.c:527

7579 +#: builtin/notes.c:531

7580 #, c-format

7581 msgid ""

7582 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7660,12 +7585,12 @@ msgstr ""

7585 "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "

7586 "Utilisez '-f' pour écraser les notes existantes"

7587

7663 -#: builtin/notes.c:539

7588 +#: builtin/notes.c:543

7589 #, c-format

7590 msgid "Missing notes on source object %s. Cannot copy."

7591 msgstr "Notes manquantes sur l'objet source %s. Impossible de copier."

7592

7668 -#: builtin/notes.c:588

7593 +#: builtin/notes.c:592

7594 #, c-format

7595 msgid ""

7596 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7674,15 +7599,15 @@ msgstr ""

7599 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"

7600 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"

7601

7677 -#: builtin/notes.c:735

7602 +#: builtin/notes.c:739

7603 msgid "General options"

7604 msgstr "Options générales"

7605

7681 -#: builtin/notes.c:737

7606 +#: builtin/notes.c:741

7607 msgid "Merge options"

7608 msgstr "Options de fusion"

7609

7685 -#: builtin/notes.c:739

7610 +#: builtin/notes.c:743

7611 msgid ""

7612 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7613 "cat_sort_uniq)"

@@ -7690,210 +7615,234 @@ msgstr ""

7615 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"

7616 "theirs/union/cat_sort_uniq)"

7617

7693 -#: builtin/notes.c:741

7618 +#: builtin/notes.c:745

7619 msgid "Committing unmerged notes"

7620 msgstr "Validation des notes non fusionnées"

7621

7697 -#: builtin/notes.c:743

7622 +#: builtin/notes.c:747

7623 msgid "finalize notes merge by committing unmerged notes"

7624 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"

7625

7701 -#: builtin/notes.c:745

7626 +#: builtin/notes.c:749

7627 msgid "Aborting notes merge resolution"

7628 msgstr "Abandon de la résolution de fusion des notes"

7629

7705 -#: builtin/notes.c:747

7630 +#: builtin/notes.c:751

7631 msgid "abort notes merge"

7632 msgstr "abandonner la fusion de notes"

7633

7709 -#: builtin/notes.c:842

7634 +#: builtin/notes.c:846

7635 #, c-format

7636 msgid "Object %s has no note\n"

7637 msgstr "L'objet %s n'a pas de note\n"

7638

7714 -#: builtin/notes.c:854

7639 +#: builtin/notes.c:858

7640 msgid "attempt to remove non-existent note is not an error"

7641 msgstr ""

7642 "la tentative de suppression d'une note non existante n'est pas une erreur"

7643

7719 -#: builtin/notes.c:857

7644 +#: builtin/notes.c:861

7645 msgid "read object names from the standard input"

7646 msgstr "lire les noms d'objet depuis l'entrée standard"

7647

7723 -#: builtin/notes.c:938

7724 -msgid "notes_ref"

7725 -msgstr "références_notes"

7648 +#: builtin/notes.c:942

7649 +msgid "notes-ref"

7650 +msgstr "références-notes"

7651

7727 -#: builtin/notes.c:939

7652 +#: builtin/notes.c:943

7653 msgid "use notes from <notes_ref>"

7654 msgstr "utiliser les notes depuis <références_notes>"

7655

7731 -#: builtin/notes.c:974 builtin/remote.c:1593

7656 +#: builtin/notes.c:978 builtin/remote.c:1593

7657 #, c-format

7658 msgid "Unknown subcommand: %s"

7659 msgstr "Sous-commande inconnue : %s"

7660

7736 -#: builtin/pack-objects.c:23

7661 +#: builtin/pack-objects.c:25

7662 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"

7663 msgstr ""

7664 "git pack-objects --stdout [options...] [< liste-références | < liste-objets]"

7665

7741 -#: builtin/pack-objects.c:24

7666 +#: builtin/pack-objects.c:26

7667 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7668 msgstr ""

7669 "git pack-objects [options...] base-name [< liste-références | < liste-objets]"

7670

7746 -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187

7671 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7672 #, c-format

7673 msgid "deflate error (%d)"

7674 msgstr "erreur de compression (%d)"

7675

7751 -#: builtin/pack-objects.c:2396

7676 +#: builtin/pack-objects.c:771

7677 +msgid "Writing objects"

7678 +msgstr "Écriture des objets"

7679 +

7680 +#: builtin/pack-objects.c:1012

7681 +msgid "disabling bitmap writing, as some objects are not being packed"

7682 +msgstr "désactivation de l'écriture en bitmap car certains objets ne sont pas compressés"

7683 +

7684 +#: builtin/pack-objects.c:2174

7685 +msgid "Compressing objects"

7686 +msgstr "Compression des objets"

7687 +

7688 +#: builtin/pack-objects.c:2530

7689 #, c-format

7690 msgid "unsupported index version %s"

7691 msgstr "version d'index non supportée %s"

7692

7756 -#: builtin/pack-objects.c:2400

7693 +#: builtin/pack-objects.c:2534

7694 #, c-format

7695 msgid "bad index version '%s'"

7696 msgstr "mauvaise version d'index '%s'"

7697

7761 -#: builtin/pack-objects.c:2423

7698 +#: builtin/pack-objects.c:2557

7699 #, c-format

7700 msgid "option %s does not accept negative form"

7701 msgstr "l'option %s n'accepte pas de valeur négative"

7702

7766 -#: builtin/pack-objects.c:2427

7703 +#: builtin/pack-objects.c:2561

7704 #, c-format

7705 msgid "unable to parse value '%s' for option %s"

7706 msgstr "impossible d'analyser la valeur '%s' pour l'option %s"

7707

7771 -#: builtin/pack-objects.c:2446

7708 +#: builtin/pack-objects.c:2580

7709 msgid "do not show progress meter"

7710 msgstr "ne pas afficher la barre de progression"

7711

7775 -#: builtin/pack-objects.c:2448

7712 +#: builtin/pack-objects.c:2582

7713 msgid "show progress meter"

7714 msgstr "afficher la barre de progression"

7715

7779 -#: builtin/pack-objects.c:2450

7716 +#: builtin/pack-objects.c:2584

7717 msgid "show progress meter during object writing phase"

7718 msgstr "afficher la barre de progression durant la phase d'écrite des objets"

7719

7783 -#: builtin/pack-objects.c:2453

7720 +#: builtin/pack-objects.c:2587

7721 msgid "similar to --all-progress when progress meter is shown"

7722 msgstr "similaire à --all-progress quand la barre de progression est affichée"

7723

7787 -#: builtin/pack-objects.c:2454

7724 +#: builtin/pack-objects.c:2588

7725 msgid "version[,offset]"

7726 msgstr "version[,offset]"

7727

7791 -#: builtin/pack-objects.c:2455

7728 +#: builtin/pack-objects.c:2589

7729 msgid "write the pack index file in the specified idx format version"

7730 msgstr ""

7731 "écrire le fichier d'index du paquet dans le format d'index de version "

7732 "spécifié"

7733

7797 -#: builtin/pack-objects.c:2458

7734 +#: builtin/pack-objects.c:2592

7735 msgid "maximum size of each output pack file"

7736 msgstr "taille maximum de chaque fichier paquet en sortie"

7737

7801 -#: builtin/pack-objects.c:2460

7738 +#: builtin/pack-objects.c:2594

7739 msgid "ignore borrowed objects from alternate object store"

7740 msgstr "ignorer les objets empruntés à un autre magasin d'objets"

7741

7805 -#: builtin/pack-objects.c:2462

7742 +#: builtin/pack-objects.c:2596

7743 msgid "ignore packed objects"

7744 msgstr "ignorer les objets empaquetés"

7745

7809 -#: builtin/pack-objects.c:2464

7746 +#: builtin/pack-objects.c:2598

7747 msgid "limit pack window by objects"

7748 msgstr "limiter la fenêtre d'empaquetage par objets"

7749

7813 -#: builtin/pack-objects.c:2466

7750 +#: builtin/pack-objects.c:2600

7751 msgid "limit pack window by memory in addition to object limit"

7752 msgstr ""

7753 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"

7754

7818 -#: builtin/pack-objects.c:2468

7755 +#: builtin/pack-objects.c:2602

7756 msgid "maximum length of delta chain allowed in the resulting pack"

7757 msgstr ""

7758 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"

7759

7823 -#: builtin/pack-objects.c:2470

7760 +#: builtin/pack-objects.c:2604

7761 msgid "reuse existing deltas"

7762 msgstr "réutiliser les deltas existants"

7763

7827 -#: builtin/pack-objects.c:2472

7764 +#: builtin/pack-objects.c:2606

7765 msgid "reuse existing objects"

7766 msgstr "réutiliser les objets existants"

7767

7831 -#: builtin/pack-objects.c:2474

7768 +#: builtin/pack-objects.c:2608

7769 msgid "use OFS_DELTA objects"

7770 msgstr "utiliser les objets OFS_DELTA"

7771

l10n: fr translation for v2.0.0rc0 (2228t)