f507e5dd62 · 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-08-04 14:48+0800\n"

77 -"PO-Revision-Date: 2014-08-05 19:23+0200\n"

76 +"POT-Creation-Date: 2014-11-01 07:46+0800\n"

77 +"PO-Revision-Date: 2014-11-01 16:51+0100\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"

@@ -91,107 +91,105 @@ msgstr "astuce: %.*s\n"

91 #: advice.c:88

92 msgid ""

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

94 -"as appropriate to mark resolution and make a commit, or use\n"

95 -"'git commit -a'."

94 +"as appropriate to mark resolution and make a commit."

95 msgstr ""

96 "Corrigez-les dans la copie de travail,\n"

97 "puis utilisez 'git add/rm <fichier>' si\n"

99 -"nécessaire pour marquer la résolution et valider,\n"

100 -"ou utilisez 'git commit -a'."

98 +"nécessaire pour marquer la résolution et valider."

99

102 -#: archive.c:10

100 +#: archive.c:11

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

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

103

106 -#: archive.c:11

104 +#: archive.c:12

105 msgid "git archive --list"

106 msgstr "git archive --list"

107

110 -#: archive.c:12

108 +#: archive.c:13

109 msgid ""

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

111 msgstr ""

112 "git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou "

113 "apparenté> [<chemin>...]"

114

117 -#: archive.c:13

115 +#: archive.c:14

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

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

118

121 -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

119 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

120 #, c-format

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

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

123

126 -#: archive.c:328

124 +#: archive.c:419

125 msgid "fmt"

126 msgstr "fmt"

127

130 -#: archive.c:328

128 +#: archive.c:419

129 msgid "archive format"

130 msgstr "format d'archive"

131

134 -#: archive.c:329 builtin/log.c:1201

132 +#: archive.c:420 builtin/log.c:1204

133 msgid "prefix"

134 msgstr "préfixe"

135

138 -#: archive.c:330

136 +#: archive.c:421

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

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

139

142 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

143 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

144 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

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

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

140 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

141 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

142 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

143 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

144 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

145 msgid "file"

146 msgstr "fichier"

147

150 -#: archive.c:332 builtin/archive.c:89

148 +#: archive.c:423 builtin/archive.c:89

149 msgid "write the archive to this file"

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

151

154 -#: archive.c:334

152 +#: archive.c:425

153 msgid "read .gitattributes in working directory"

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

155

158 -#: archive.c:335

156 +#: archive.c:426

157 msgid "report archived files on stderr"

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

159

162 -#: archive.c:336

160 +#: archive.c:427

161 msgid "store only"

162 msgstr "stockage seulement"

163

166 -#: archive.c:337

164 +#: archive.c:428

165 msgid "compress faster"

166 msgstr "compression rapide"

167

170 -#: archive.c:345

168 +#: archive.c:436

169 msgid "compress better"

170 msgstr "compression efficace"

171

174 -#: archive.c:348

172 +#: archive.c:439

173 msgid "list supported archive formats"

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

175

178 -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

176 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

177 msgid "repo"

178 msgstr "dépôt"

179

182 -#: archive.c:351 builtin/archive.c:91

180 +#: archive.c:442 builtin/archive.c:91

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

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

183

186 -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

184 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

185 msgid "command"

186 msgstr "commande"

187

190 -#: archive.c:353 builtin/archive.c:93

188 +#: archive.c:444 builtin/archive.c:93

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

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

191

194 -#: attr.c:259

192 +#: attr.c:258

193 msgid ""

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

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

@@ -256,33 +254,33 @@ msgstr "La branche %s est paramétrée pour suivre la référence locale %s."

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

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

256

259 -#: branch.c:178

257 +#: branch.c:162

258 #, c-format

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

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

261

264 -#: branch.c:183

262 +#: branch.c:167

263 #, c-format

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

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

266

269 -#: branch.c:191

267 +#: branch.c:175

268 msgid "Cannot force update the current branch."

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

270

273 -#: branch.c:211

271 +#: branch.c:195

272 #, c-format

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

274 msgstr ""

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

276 "pas une branche."

277

280 -#: branch.c:213

278 +#: branch.c:197

279 #, c-format

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

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

282

285 -#: branch.c:215

283 +#: branch.c:199

284 msgid ""

285 "\n"

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

@@ -302,107 +300,105 @@ msgstr ""

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

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

302

305 -#: branch.c:260

303 +#: branch.c:243

304 #, c-format

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

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

307

310 -#: branch.c:280

308 +#: branch.c:263

309 #, c-format

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

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

312

315 -#: branch.c:285

313 +#: branch.c:268

314 #, c-format

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

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

317

320 -#: branch.c:291

321 -msgid "Failed to lock ref for update"

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

323 -

324 -#: branch.c:309

325 -msgid "Failed to write ref"

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

327 -

328 -#: bundle.c:33

318 +#: bundle.c:34

319 #, c-format

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

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

322

333 -#: bundle.c:60

323 +#: bundle.c:61

324 #, c-format

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

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

327

338 -#: bundle.c:86 builtin/commit.c:755

328 +#: bundle.c:87 builtin/commit.c:788

329 #, c-format

330 msgid "could not open '%s'"

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

332

343 -#: bundle.c:138

333 +#: bundle.c:139

334 msgid "Repository lacks these prerequisite commits:"

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

336

347 -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

348 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

337 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

338 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

339 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

340 #: builtin/shortlog.c:158

341 msgid "revision walk setup failed"

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

343

353 -#: bundle.c:184

344 +#: bundle.c:185

345 #, c-format

346 msgid "The bundle contains this ref:"

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

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

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

350

360 -#: bundle.c:191

351 +#: bundle.c:192

352 msgid "The bundle records a complete history."

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

354

364 -#: bundle.c:193

355 +#: bundle.c:194

356 #, c-format

357 msgid "The bundle requires this ref:"

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

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

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

361

371 -#: bundle.c:289

362 +#: bundle.c:292

363 msgid "rev-list died"

364 msgstr "rev-list a disparu"

365

375 -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

366 +#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

367 #, c-format

368 msgid "unrecognized argument: %s"

369 msgstr "argument non reconnu : %s"

370

380 -#: bundle.c:330

371 +#: bundle.c:333

372 #, c-format

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

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

375

385 -#: bundle.c:375

376 +#: bundle.c:378

377 msgid "Refusing to create empty bundle."

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

379

389 -#: bundle.c:390

380 +#: bundle.c:393

381 msgid "Could not spawn pack-objects"

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

383

393 -#: bundle.c:408

384 +#: bundle.c:411

385 msgid "pack-objects died"

386 msgstr "les objets groupés ont disparu"

387

397 -#: bundle.c:411

388 +#: bundle.c:414

389 #, c-format

390 msgid "cannot create '%s'"

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

392

402 -#: bundle.c:433

393 +#: bundle.c:435

394 msgid "index-pack died"

395 msgstr "l'index de groupe a disparu"

396

397 +#: color.c:157

398 +#, c-format

399 +msgid "invalid color value: %.*s"

400 +msgstr "Valeur invalide de couleur : %.*s"

401 +

402 #: commit.c:40

403 #, c-format

404 msgid "could not parse %s"

@@ -417,16 +413,69 @@ msgstr "%s %s n'est pas un commit !"

413 msgid "memory exhausted"

414 msgstr "plus de mémoire"

415

420 -#: connected.c:70

416 +#: config.c:469 config.c:471

417 +#, c-format

418 +msgid "bad config file line %d in %s"

419 +msgstr "ligne %d de fichier de config incorrecte dans %s"

420 +

421 +#: config.c:587

422 +#, c-format

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

424 +msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"

425 +

426 +#: config.c:589

427 +#, c-format

428 +msgid "bad numeric config value '%s' for '%s': %s"

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

430 +

431 +#: config.c:674

432 +#, c-format

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

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

435 +

436 +#: config.c:752 config.c:763

437 +#, c-format

438 +msgid "bad zlib compression level %d"

439 +msgstr "niveau de compression zlib incorrect %d"

440 +

441 +#: config.c:885

442 +#, c-format

443 +msgid "invalid mode for object creation: %s"

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

445 +

446 +#: config.c:1201

447 +msgid "unable to parse command-line config"

448 +msgstr "lecture de la configuration de ligne de commande impossible"

449 +

450 +#: config.c:1262

451 +msgid "unknown error occured while reading the configuration files"

452 +msgstr "erreur inconnue pendant la lecture des fichiers de configuration"

453 +

454 +#: config.c:1586

455 +#, c-format

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

457 +msgstr "impossible d'analyser '%s' depuis le configuration en ligne de commande"

458 +

459 +#: config.c:1588

460 +#, c-format

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

462 +msgstr "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"

463 +

464 +#: config.c:1647

465 +#, c-format

466 +msgid "%s has multiple values"

467 +msgstr "%s a des valeurs multiples"

468 +

469 +#: connected.c:69

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

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

472

424 -#: connected.c:90

473 +#: connected.c:89

474 #, c-format

475 msgid "failed write to rev-list: %s"

476 msgstr "impossible d'écrire dans la rev-list : %s"

477

429 -#: connected.c:98

478 +#: connected.c:97

479 #, c-format

480 msgid "failed to close rev-list's stdin: %s"

481 msgstr "impossible de fermer l'entrée standard du rev-list : %s"

@@ -504,7 +553,7 @@ msgstr[1] "il y a %lu ans"

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

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

555

507 -#: diffcore-rename.c:514

556 +#: diffcore-rename.c:516

557 msgid "Performing inexact rename detection"

558 msgstr "Détection de renommage inexact en cours"

559

@@ -525,7 +574,7 @@ msgid "Unknown value for 'diff.submodule' config variable: '%s'"

574 msgstr ""

575 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"

576

528 -#: diff.c:267

577 +#: diff.c:266

578 #, c-format

579 msgid ""

580 "Found errors in 'diff.dirstat' config variable:\n"

@@ -534,16 +583,16 @@ msgstr ""

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

584 "%s"

585

537 -#: diff.c:2934

586 +#: diff.c:2957

587 #, c-format

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

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

590

542 -#: diff.c:3329

591 +#: diff.c:3352

592 msgid "--follow requires exactly one pathspec"

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

594

546 -#: diff.c:3492

595 +#: diff.c:3515

596 #, c-format

597 msgid ""

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

@@ -552,44 +601,44 @@ msgstr ""

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

602 "%s"

603

555 -#: diff.c:3506

604 +#: diff.c:3529

605 #, c-format

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

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

608

560 -#: gpg-interface.c:73 gpg-interface.c:145

609 +#: gpg-interface.c:129 gpg-interface.c:200

610 msgid "could not run gpg."

611 msgstr "impossible de lancer gpg."

612

564 -#: gpg-interface.c:85

613 +#: gpg-interface.c:141

614 msgid "gpg did not accept the data"

615 msgstr "gpg n'a pas accepté les données"

616

568 -#: gpg-interface.c:96

617 +#: gpg-interface.c:152

618 msgid "gpg failed to sign the data"

619 msgstr "gpg n'a pas pu signer les données"

620

572 -#: gpg-interface.c:129

621 +#: gpg-interface.c:185

622 #, c-format

623 msgid "could not create temporary file '%s': %s"

624 msgstr "impossible de créer un fichier temporaire '%s' : %s"

625

577 -#: gpg-interface.c:132

626 +#: gpg-interface.c:188

627 #, c-format

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

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

630

582 -#: grep.c:1703

631 +#: grep.c:1718

632 #, c-format

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

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

635

587 -#: grep.c:1720

636 +#: grep.c:1735

637 #, c-format

638 msgid "'%s': %s"

639 msgstr "'%s' : %s"

640

592 -#: grep.c:1731

641 +#: grep.c:1746

642 #, c-format

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

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

@@ -659,87 +708,95 @@ msgstr[1] ""

708 msgid "%s: %s - %s"

709 msgstr "%s: %s - %s"

710

662 -#: merge.c:40

711 +#: lockfile.c:275

712 +msgid "BUG: reopen a lockfile that is still open"

713 +msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"

714 +

715 +#: lockfile.c:277

716 +msgid "BUG: reopen a lockfile that has been committed"

717 +msgstr "BUG: réouverture d'un fichier verrou validé"

718 +

719 +#: merge.c:41

720 msgid "failed to read the cache"

721 msgstr "impossible de lire le cache"

722

666 -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

667 -#: builtin/clone.c:661

723 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

724 +#: builtin/clone.c:659

725 msgid "unable to write new index file"

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

727

671 -#: merge-recursive.c:190

728 +#: merge-recursive.c:189

729 #, c-format

730 msgid "(bad commit)\n"

731 msgstr "(mauvais commit)\n"

732

676 -#: merge-recursive.c:210

733 +#: merge-recursive.c:209

734 #, c-format

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

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

737

681 -#: merge-recursive.c:271

738 +#: merge-recursive.c:270

739 msgid "error building trees"

740 msgstr "erreur de construction des arbres"

741

685 -#: merge-recursive.c:692

742 +#: merge-recursive.c:691

743 #, c-format

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

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

746

690 -#: merge-recursive.c:703

747 +#: merge-recursive.c:702

748 #, c-format

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

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

751

695 -#: merge-recursive.c:717 merge-recursive.c:738

752 +#: merge-recursive.c:716 merge-recursive.c:737

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

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

755

699 -#: merge-recursive.c:728

756 +#: merge-recursive.c:727

757 #, c-format

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

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

760

704 -#: merge-recursive.c:768

761 +#: merge-recursive.c:767

762 #, c-format

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

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

765

709 -#: merge-recursive.c:770

766 +#: merge-recursive.c:769

767 #, c-format

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

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

770

714 -#: merge-recursive.c:793 builtin/clone.c:317

771 +#: merge-recursive.c:792 builtin/clone.c:318

772 #, c-format

773 msgid "failed to open '%s'"

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

775

719 -#: merge-recursive.c:801

776 +#: merge-recursive.c:800

777 #, c-format

778 msgid "failed to symlink '%s'"

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

780

724 -#: merge-recursive.c:804

781 +#: merge-recursive.c:803

782 #, c-format

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

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

785

729 -#: merge-recursive.c:942

786 +#: merge-recursive.c:941

787 msgid "Failed to execute internal merge"

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

789

733 -#: merge-recursive.c:946

790 +#: merge-recursive.c:945

791 #, c-format

792 msgid "Unable to add %s to database"

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

794

738 -#: merge-recursive.c:962

795 +#: merge-recursive.c:961

796 msgid "unsupported object type in the tree"

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

798

742 -#: merge-recursive.c:1037 merge-recursive.c:1051

799 +#: merge-recursive.c:1036 merge-recursive.c:1050

800 #, c-format

801 msgid ""

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

@@ -748,7 +805,7 @@ msgstr ""

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

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

807

751 -#: merge-recursive.c:1043 merge-recursive.c:1056

808 +#: merge-recursive.c:1042 merge-recursive.c:1055

809 #, c-format

810 msgid ""

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

@@ -757,20 +814,20 @@ msgstr ""

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

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

816

760 -#: merge-recursive.c:1097

817 +#: merge-recursive.c:1096

818 msgid "rename"

819 msgstr "renommage"

820

764 -#: merge-recursive.c:1097

821 +#: merge-recursive.c:1096

822 msgid "renamed"

823 msgstr "renommé"

824

768 -#: merge-recursive.c:1153

825 +#: merge-recursive.c:1152

826 #, c-format

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

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

829

773 -#: merge-recursive.c:1175

830 +#: merge-recursive.c:1174

831 #, c-format

832 msgid ""

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

@@ -779,146 +836,146 @@ msgstr ""

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

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

838

782 -#: merge-recursive.c:1180

839 +#: merge-recursive.c:1179

840 msgid " (left unresolved)"

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

842

786 -#: merge-recursive.c:1234

843 +#: merge-recursive.c:1233

844 #, c-format

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

846 msgstr ""

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

848 ">'%s' dans %s"

849

793 -#: merge-recursive.c:1264

850 +#: merge-recursive.c:1263

851 #, c-format

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

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

854

798 -#: merge-recursive.c:1463

855 +#: merge-recursive.c:1462

856 #, c-format

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

858 msgstr ""

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

860

804 -#: merge-recursive.c:1473

861 +#: merge-recursive.c:1472

862 #, c-format

863 msgid "Adding merged %s"

864 msgstr "Ajout de %s fusionné"

865

809 -#: merge-recursive.c:1478 merge-recursive.c:1676

866 +#: merge-recursive.c:1477 merge-recursive.c:1675

867 #, c-format

868 msgid "Adding as %s instead"

869 msgstr "Ajout plutôt comme %s"

870

814 -#: merge-recursive.c:1529

871 +#: merge-recursive.c:1528

872 #, c-format

873 msgid "cannot read object %s"

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

875

819 -#: merge-recursive.c:1532

876 +#: merge-recursive.c:1531

877 #, c-format

878 msgid "object %s is not a blob"

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

880

824 -#: merge-recursive.c:1580

881 +#: merge-recursive.c:1579

882 msgid "modify"

883 msgstr "modification"

884

828 -#: merge-recursive.c:1580

885 +#: merge-recursive.c:1579

886 msgid "modified"

887 msgstr "modifié"

888

832 -#: merge-recursive.c:1590

889 +#: merge-recursive.c:1589

890 msgid "content"

891 msgstr "contenu"

892

836 -#: merge-recursive.c:1597

893 +#: merge-recursive.c:1596

894 msgid "add/add"

895 msgstr "ajout/ajout"

896

840 -#: merge-recursive.c:1631

897 +#: merge-recursive.c:1630

898 #, c-format

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

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

901

845 -#: merge-recursive.c:1645

902 +#: merge-recursive.c:1644

903 #, c-format

904 msgid "Auto-merging %s"

905 msgstr "Fusion automatique de %s"

906

850 -#: merge-recursive.c:1649 git-submodule.sh:1150

907 +#: merge-recursive.c:1648 git-submodule.sh:1150

908 msgid "submodule"

909 msgstr "sous-module"

910

854 -#: merge-recursive.c:1650

911 +#: merge-recursive.c:1649

912 #, c-format

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

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

915

859 -#: merge-recursive.c:1740

916 +#: merge-recursive.c:1735

917 #, c-format

918 msgid "Removing %s"

919 msgstr "Suppression de %s"

920

864 -#: merge-recursive.c:1765

921 +#: merge-recursive.c:1760

922 msgid "file/directory"

923 msgstr "fichier/répertoire"

924

868 -#: merge-recursive.c:1771

925 +#: merge-recursive.c:1766

926 msgid "directory/file"

927 msgstr "répertoire/fichier"

928

872 -#: merge-recursive.c:1776

929 +#: merge-recursive.c:1771

930 #, c-format

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

932 msgstr ""

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

934

878 -#: merge-recursive.c:1786

935 +#: merge-recursive.c:1781

936 #, c-format

937 msgid "Adding %s"

938 msgstr "Ajout de %s"

939

883 -#: merge-recursive.c:1803

940 +#: merge-recursive.c:1798

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

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

943

887 -#: merge-recursive.c:1822

944 +#: merge-recursive.c:1817

945 msgid "Already up-to-date!"

946 msgstr "Déjà à jour !"

947

891 -#: merge-recursive.c:1831

948 +#: merge-recursive.c:1826

949 #, c-format

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

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

952

896 -#: merge-recursive.c:1861

953 +#: merge-recursive.c:1856

954 #, c-format

955 msgid "Unprocessed path??? %s"

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

957

901 -#: merge-recursive.c:1906

958 +#: merge-recursive.c:1901

959 msgid "Merging:"

960 msgstr "Fusion :"

961

905 -#: merge-recursive.c:1919

962 +#: merge-recursive.c:1914

963 #, c-format

964 msgid "found %u common ancestor:"

965 msgid_plural "found %u common ancestors:"

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

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

968

912 -#: merge-recursive.c:1956

969 +#: merge-recursive.c:1951

970 msgid "merge returned no commit"

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

972

916 -#: merge-recursive.c:2013

973 +#: merge-recursive.c:2008

974 #, c-format

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

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

977

921 -#: merge-recursive.c:2024 builtin/merge.c:666

978 +#: merge-recursive.c:2019 builtin/merge.c:666

979 msgid "Unable to write index."

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

981

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

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

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

1002

946 -#: object.c:234

1003 +#: object.c:241

1004 #, c-format

1005 msgid "unable to parse object: %s"

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

1007

951 -#: parse-options.c:534

1008 +#: parse-options.c:546

1009 msgid "..."

1010 msgstr "..."

1011

955 -#: parse-options.c:552

1012 +#: parse-options.c:564

1013 #, c-format

1014 msgid "usage: %s"

1015 msgstr "usage : %s"

1016

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

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

962 -#: parse-options.c:556

1019 +#: parse-options.c:568

1020 #, c-format

1021 msgid " or: %s"

1022 msgstr " ou : %s"

1023

967 -#: parse-options.c:559

1024 +#: parse-options.c:571

1025 #, c-format

1026 msgid " %s"

1027 msgstr " %s"

1028

972 -#: parse-options.c:593

1029 +#: parse-options.c:605

1030 msgid "-NUM"

1031 msgstr "-NUM"

1032

@@ -1041,11 +1098,15 @@ msgstr ""

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

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

1100

1101 +#: pretty.c:968

1102 +msgid "unable to parse --pretty format"

1103 +msgstr "impossible d'analyser le format --pretty"

1104 +

1105 #: progress.c:225

1106 msgid "done"

1107 msgstr "fait"

1108

1048 -#: read-cache.c:1260

1109 +#: read-cache.c:1261

1110 #, c-format

1111 msgid ""

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

@@ -1054,7 +1115,7 @@ msgstr ""

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

1116 "Utilisation de la version %i"

1117

1057 -#: read-cache.c:1270

1118 +#: read-cache.c:1271

1119 #, c-format

1120 msgid ""

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

@@ -1063,51 +1124,51 @@ msgstr ""

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

1125 "Utilisation de la version %i"

1126

1066 -#: remote.c:753

1127 +#: remote.c:782

1128 #, c-format

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

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

1131

1071 -#: remote.c:757

1132 +#: remote.c:786

1133 #, c-format

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

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

1136

1076 -#: remote.c:761

1137 +#: remote.c:790

1138 #, c-format

1139 msgid "%s tracks both %s and %s"

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

1141

1081 -#: remote.c:769

1142 +#: remote.c:798

1143 msgid "Internal error"

1144 msgstr "Erreur interne"

1145

1085 -#: remote.c:1943

1146 +#: remote.c:1968

1147 #, c-format

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

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

1150

1090 -#: remote.c:1947

1151 +#: remote.c:1972

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

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

1154

1094 -#: remote.c:1950

1155 +#: remote.c:1975

1156 #, c-format

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

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

1159

1099 -#: remote.c:1954

1160 +#: remote.c:1979

1161 #, c-format

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

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

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

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

1166

1106 -#: remote.c:1960

1167 +#: remote.c:1985

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

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

1170

1110 -#: remote.c:1963

1171 +#: remote.c:1988

1172 #, c-format

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

1174 msgid_plural ""

@@ -1119,11 +1180,11 @@ msgstr[1] ""

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

1181 "en avance rapide.\n"

1182

1122 -#: remote.c:1971

1183 +#: remote.c:1996

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

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

1186

1126 -#: remote.c:1974

1187 +#: remote.c:1999

1188 #, c-format

1189 msgid ""

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

@@ -1138,33 +1199,41 @@ msgstr[1] ""

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

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

1201

1141 -#: remote.c:1984

1202 +#: remote.c:2009

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

1204 msgstr ""

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

1206

1146 -#: run-command.c:80

1207 +#: run-command.c:87

1208 msgid "open /dev/null failed"

1209 msgstr "échec de l'ouverture de /dev/null"

1210

1150 -#: run-command.c:82

1211 +#: run-command.c:89

1212 #, c-format

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

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

1215

1155 -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1156 -#: builtin/merge.c:1003 builtin/merge.c:1013

1216 +#: send-pack.c:265

1217 +msgid "failed to sign the push certificate"

1218 +msgstr "impossible de signer le certificat de poussée"

1219 +

1220 +#: send-pack.c:322

1221 +msgid "the receiving end does not support --signed push"

1222 +msgstr "Le receveur ne gère pas les poussées avec --signed"

1223 +

1224 +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1225 +#: builtin/merge.c:1002 builtin/merge.c:1012

1226 #, c-format

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

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

1229

1161 -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1162 -#: builtin/merge.c:1005 builtin/merge.c:1018

1230 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1231 +#: builtin/merge.c:1004 builtin/merge.c:1017

1232 #, c-format

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

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

1235

1167 -#: sequencer.c:194

1236 +#: sequencer.c:195

1237 msgid ""

1238 "after resolving the conflicts, mark the corrected paths\n"

1239 "with 'git add <paths>' or 'git rm <paths>'"

@@ -1172,7 +1241,7 @@ msgstr ""

1241 "après résolution des conflits, marquez les chemins corrigés\n"

1242 "avec 'git add <chemins>' ou 'git rm <chemins>'"

1243

1175 -#: sequencer.c:197

1244 +#: sequencer.c:198

1245 msgid ""

1246 "after resolving the conflicts, mark the corrected paths\n"

1247 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -1182,71 +1251,67 @@ msgstr ""

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

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

1253

1185 -#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1254 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1255 #, c-format

1256 msgid "Could not write to %s"

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

1258

1190 -#: sequencer.c:213

1259 +#: sequencer.c:214

1260 #, c-format

1261 msgid "Error wrapping up %s"

1262 msgstr "Erreur à l'emballage de %s"

1263

1195 -#: sequencer.c:228

1264 +#: sequencer.c:229

1265 msgid "Your local changes would be overwritten by cherry-pick."

1266 msgstr "Vos modifications locales seraient écrasées par cherry-pick."

1267

1199 -#: sequencer.c:230

1268 +#: sequencer.c:231

1269 msgid "Your local changes would be overwritten by revert."

1270 msgstr "Vos modifications locales seraient écrasées par revert."

1271

1203 -#: sequencer.c:233

1272 +#: sequencer.c:234

1273 msgid "Commit your changes or stash them to proceed."

1274 msgstr "Validez vos modifications ou les remiser pour continuer."

1275

1207 -#: sequencer.c:250

1208 -msgid "Failed to lock HEAD during fast_forward_to"

1209 -msgstr "Échec du verrouillage de HEAD pendant l'avance rapide"

1210 -

1276 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1212 -#: sequencer.c:293

1277 +#: sequencer.c:304

1278 #, c-format

1279 msgid "%s: Unable to write new index file"

1280 msgstr "%s: Impossible d'écrire le nouveau fichier index"

1281

1217 -#: sequencer.c:324

1282 +#: sequencer.c:335

1283 msgid "Could not resolve HEAD commit\n"

1284 msgstr "Impossible de résoudre le commit HEAD\n"

1285

1221 -#: sequencer.c:344

1286 +#: sequencer.c:355

1287 msgid "Unable to update cache tree\n"

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

1289

1225 -#: sequencer.c:391

1290 +#: sequencer.c:402

1291 #, c-format

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

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

1294

1230 -#: sequencer.c:396

1295 +#: sequencer.c:407

1296 #, c-format

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

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

1299

1235 -#: sequencer.c:462

1300 +#: sequencer.c:473

1301 msgid "Your index file is unmerged."

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

1303

1239 -#: sequencer.c:481

1304 +#: sequencer.c:492

1305 #, c-format

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

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

1308

1244 -#: sequencer.c:489

1309 +#: sequencer.c:500

1310 #, c-format

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

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

1313

1249 -#: sequencer.c:493

1314 +#: sequencer.c:504

1315 #, c-format

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

1317 msgstr ""

@@ -1255,157 +1320,157 @@ msgstr ""

1320

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

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

1258 -#: sequencer.c:506

1323 +#: sequencer.c:517

1324 #, c-format

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

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

1327

1263 -#: sequencer.c:510

1328 +#: sequencer.c:521

1329 #, c-format

1330 msgid "Cannot get commit message for %s"

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

1332

1268 -#: sequencer.c:596

1333 +#: sequencer.c:607

1334 #, c-format

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

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

1337

1273 -#: sequencer.c:597

1338 +#: sequencer.c:608

1339 #, c-format

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

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

1342

1278 -#: sequencer.c:633

1343 +#: sequencer.c:644

1344 msgid "empty commit set passed"

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

1346

1282 -#: sequencer.c:641

1347 +#: sequencer.c:652

1348 #, c-format

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

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

1351

1287 -#: sequencer.c:645

1352 +#: sequencer.c:656

1353 #, c-format

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

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

1356

1292 -#: sequencer.c:705

1357 +#: sequencer.c:716

1358 #, c-format

1359 msgid "Cannot %s during a %s"

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

1361

1297 -#: sequencer.c:727

1362 +#: sequencer.c:738

1363 #, c-format

1364 msgid "Could not parse line %d."

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

1366

1302 -#: sequencer.c:732

1367 +#: sequencer.c:743

1368 msgid "No commits parsed."

1369 msgstr "Aucun commit analysé."

1370

1306 -#: sequencer.c:745

1371 +#: sequencer.c:756

1372 #, c-format

1373 msgid "Could not open %s"

1374 msgstr "Impossible d'ouvrir %s"

1375

1311 -#: sequencer.c:749

1376 +#: sequencer.c:760

1377 #, c-format

1378 msgid "Could not read %s."

1379 msgstr "Impossible de lire %s."

1380

1316 -#: sequencer.c:756

1381 +#: sequencer.c:767

1382 #, c-format

1383 msgid "Unusable instruction sheet: %s"

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

1385

1321 -#: sequencer.c:786

1386 +#: sequencer.c:797

1387 #, c-format

1388 msgid "Invalid key: %s"

1389 msgstr "Clé invalide: %s"

1390

1326 -#: sequencer.c:789

1391 +#: sequencer.c:800

1392 #, c-format

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

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

1395

1331 -#: sequencer.c:801

1396 +#: sequencer.c:812

1397 #, c-format

1398 msgid "Malformed options sheet: %s"

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

1400

1336 -#: sequencer.c:822

1401 +#: sequencer.c:833

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

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

1404

1340 -#: sequencer.c:823

1405 +#: sequencer.c:834

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

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

1408

1344 -#: sequencer.c:827

1409 +#: sequencer.c:838

1410 #, c-format

1411 msgid "Could not create sequencer directory %s"

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

1413

1349 -#: sequencer.c:843 sequencer.c:928

1414 +#: sequencer.c:854 sequencer.c:939

1415 #, c-format

1416 msgid "Error wrapping up %s."

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

1418

1354 -#: sequencer.c:862 sequencer.c:998

1419 +#: sequencer.c:873 sequencer.c:1009

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

1421 msgstr "aucun picorage ou retour en cours"

1422

1358 -#: sequencer.c:864

1423 +#: sequencer.c:875

1424 msgid "cannot resolve HEAD"

1425 msgstr "impossible de résoudre HEAD"

1426

1362 -#: sequencer.c:866

1427 +#: sequencer.c:877

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

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

1430

1366 -#: sequencer.c:888 builtin/apply.c:4062

1431 +#: sequencer.c:899 builtin/apply.c:4128

1432 #, c-format

1433 msgid "cannot open %s: %s"

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

1435

1371 -#: sequencer.c:891

1436 +#: sequencer.c:902

1437 #, c-format

1438 msgid "cannot read %s: %s"

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

1440

1376 -#: sequencer.c:892

1441 +#: sequencer.c:903

1442 msgid "unexpected end of file"

1443 msgstr "fin de fichier inattendue"

1444

1380 -#: sequencer.c:898

1445 +#: sequencer.c:909

1446 #, c-format

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

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

1449

1385 -#: sequencer.c:921

1450 +#: sequencer.c:932

1451 #, c-format

1452 msgid "Could not format %s."

1453 msgstr "Impossible de formater %s."

1454

1390 -#: sequencer.c:1066

1455 +#: sequencer.c:1077

1456 #, c-format

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

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

1459

1395 -#: sequencer.c:1069

1460 +#: sequencer.c:1080

1461 #, c-format

1462 msgid "%s: bad revision"

1463 msgstr "%s : mauvaise révision"

1464

1400 -#: sequencer.c:1103

1465 +#: sequencer.c:1114

1466 msgid "Can't revert as initial commit"

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

1468

1404 -#: sequencer.c:1104

1469 +#: sequencer.c:1115

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

1471 msgstr "Impossible de picorer vers une HEAD vide"

1472

1408 -#: sha1_name.c:439

1473 +#: sha1_name.c:440

1474 msgid ""

1475 "Git normally never creates a ref that ends with 40 hex characters\n"

1476 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1430,21 +1495,21 @@ msgstr ""

1495 "message\n"

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

1497

1433 -#: sha1_name.c:1060

1498 +#: sha1_name.c:1068

1499 msgid "HEAD does not point to a branch"

1500 msgstr "HEAD ne pointe pas sur une branche"

1501

1437 -#: sha1_name.c:1063

1502 +#: sha1_name.c:1071

1503 #, c-format

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

1505 msgstr "Branche inconnue : '%s'"

1506

1442 -#: sha1_name.c:1065

1507 +#: sha1_name.c:1073

1508 #, c-format

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

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

1511

1447 -#: sha1_name.c:1069

1512 +#: sha1_name.c:1077

1513 #, c-format

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

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

@@ -1475,16 +1540,41 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1540 msgid "staging updated .gitmodules failed"

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

1542

1478 -#: submodule.c:1118 builtin/init-db.c:363

1543 +#: submodule.c:1111 builtin/init-db.c:363

1544 #, c-format

1545 msgid "Could not create git link %s"

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

1547

1483 -#: submodule.c:1129

1548 +#: submodule.c:1122

1549 #, c-format

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

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

1552

1553 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1554 +#: trailer.c:570

1555 +#, c-format

1556 +msgid "unknown value '%s' for key '%s'"

1557 +msgstr "valeur inconnue '%s' pour la clé '%s'"

1558 +

1559 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1560 +#, c-format

1561 +msgid "more than one %s"

1562 +msgstr "plus d'un %s"

1563 +

1564 +#: trailer.c:587

1565 +#, c-format

1566 +msgid "empty trailer token in trailer '%s'"

1567 +msgstr "symbole vide dans la ligne de fin '%s'"

1568 +

1569 +#: trailer.c:706

1570 +#, c-format

1571 +msgid "could not read input file '%s'"

1572 +msgstr "impossible de lire le fichier d'entrée '%s'"

1573 +

1574 +#: trailer.c:709

1575 +msgid "could not read from stdin"

1576 +msgstr "Impossible de lire depuis l'entrée standard"

1577 +

1578 #: unpack-trees.c:202

1579 msgid "Checking out files"

1580 msgstr "Extraction des fichiers"

@@ -1518,27 +1608,31 @@ msgstr "numéro de port invalide"

1608 msgid "invalid '..' path segment"

1609 msgstr "segment de chemin '..' invalide"

1610

1521 -#: wrapper.c:460

1611 +#: wrapper.c:509

1612 #, c-format

1613 msgid "unable to access '%s': %s"

1614 msgstr "impossible d'accéder à '%s' : %s"

1615

1526 -#: wrapper.c:481

1616 +#: wrapper.c:530

1617 #, c-format

1618 msgid "unable to access '%s'"

1619 msgstr "impossible d'accéder à '%s'"

1620

1531 -#: wrapper.c:492

1621 +#: wrapper.c:541

1622 #, c-format

1623 msgid "unable to look up current user in the passwd file: %s"

1624 msgstr ""

1625 "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "

1626 "passe : %s"

1627

1538 -#: wrapper.c:493

1628 +#: wrapper.c:542

1629 msgid "no such user"

1630 msgstr "utilisateur inconnu"

1631

1632 +#: wrapper.c:550

1633 +msgid "unable to get current working directory"

1634 +msgstr "impossible d'accéder au répertoire de travail courant"

1635 +

1636 #: wt-status.c:150

1637 msgid "Unmerged paths:"

1638 msgstr "Chemins non fusionnés :"

@@ -1685,15 +1779,15 @@ msgstr "contenu non suivi, "

1779 msgid "bug: unhandled diff status %c"

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

1781

1688 -#: wt-status.c:764

1782 +#: wt-status.c:761

1783 msgid "Submodules changed but not updated:"

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

1785

1692 -#: wt-status.c:766

1786 +#: wt-status.c:763

1787 msgid "Submodule changes to be committed:"

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

1789

1696 -#: wt-status.c:845

1790 +#: wt-status.c:842

1791 msgid ""

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

1793 "Everything below will be removed."

@@ -1701,68 +1795,68 @@ msgstr ""

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

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

1797

1704 -#: wt-status.c:936

1798 +#: wt-status.c:933

1799 msgid "You have unmerged paths."

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

1801

1708 -#: wt-status.c:939

1802 +#: wt-status.c:936

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

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

1805

1712 -#: wt-status.c:942

1806 +#: wt-status.c:939

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

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

1809

1716 -#: wt-status.c:945

1810 +#: wt-status.c:942

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

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

1813

1720 -#: wt-status.c:955

1814 +#: wt-status.c:952

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

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

1817

1724 -#: wt-status.c:958

1818 +#: wt-status.c:955

1819 msgid "The current patch is empty."

1820 msgstr "Le patch actuel est vide."

1821

1728 -#: wt-status.c:962

1822 +#: wt-status.c:959

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

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

1825

1732 -#: wt-status.c:964

1826 +#: wt-status.c:961

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

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

1829

1736 -#: wt-status.c:966

1830 +#: wt-status.c:963

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

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

1833

1740 -#: wt-status.c:1026 wt-status.c:1043

1834 +#: wt-status.c:1023 wt-status.c:1040

1835 #, c-format

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

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

1838

1745 -#: wt-status.c:1031 wt-status.c:1048

1839 +#: wt-status.c:1028 wt-status.c:1045

1840 msgid "You are currently rebasing."

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

1842

1749 -#: wt-status.c:1034

1843 +#: wt-status.c:1031

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

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

1846

1753 -#: wt-status.c:1036

1847 +#: wt-status.c:1033

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

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

1850

1757 -#: wt-status.c:1038

1851 +#: wt-status.c:1035

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

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

1854

1761 -#: wt-status.c:1051

1855 +#: wt-status.c:1048

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

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

1858

1765 -#: wt-status.c:1055

1859 +#: wt-status.c:1052

1860 #, c-format

1861 msgid ""

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

@@ -1770,120 +1864,120 @@ msgstr ""

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

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

1866

1773 -#: wt-status.c:1060

1867 +#: wt-status.c:1057

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

1869 msgstr ""

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

1871

1778 -#: wt-status.c:1063

1872 +#: wt-status.c:1060

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

1874 msgstr ""

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

1876

1783 -#: wt-status.c:1067

1877 +#: wt-status.c:1064

1878 #, c-format

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

1880 msgstr ""

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

1882 "branche '%s' sur '%s'."

1883

1790 -#: wt-status.c:1072

1884 +#: wt-status.c:1069

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

1886 msgstr ""

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

1888

1795 -#: wt-status.c:1075

1889 +#: wt-status.c:1072

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

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

1892

1799 -#: wt-status.c:1077

1893 +#: wt-status.c:1074

1894 msgid ""

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

1896 msgstr ""

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

1898 "modifications)"

1899

1806 -#: wt-status.c:1087

1900 +#: wt-status.c:1084

1901 #, c-format

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

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

1904

1811 -#: wt-status.c:1092

1905 +#: wt-status.c:1089

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

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

1908

1815 -#: wt-status.c:1095

1909 +#: wt-status.c:1092

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

1911 msgstr ""

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

1913

1820 -#: wt-status.c:1097

1914 +#: wt-status.c:1094

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

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

1917

1824 -#: wt-status.c:1106

1918 +#: wt-status.c:1103

1919 #, c-format

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

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

1922

1829 -#: wt-status.c:1111

1923 +#: wt-status.c:1108

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

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

1926

1833 -#: wt-status.c:1114

1927 +#: wt-status.c:1111

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

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

1930

1837 -#: wt-status.c:1116

1931 +#: wt-status.c:1113

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

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

1934

1841 -#: wt-status.c:1127

1935 +#: wt-status.c:1124

1936 #, c-format

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

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

1939

1846 -#: wt-status.c:1131

1940 +#: wt-status.c:1128

1941 msgid "You are currently bisecting."

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

1943

1850 -#: wt-status.c:1134

1944 +#: wt-status.c:1131

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

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

1947

1854 -#: wt-status.c:1309

1948 +#: wt-status.c:1306

1949 msgid "On branch "

1950 msgstr "Sur la branche "

1951

1858 -#: wt-status.c:1316

1952 +#: wt-status.c:1313

1953 msgid "rebase in progress; onto "

1954 msgstr "rebasage en cours ; sur "

1955

1862 -#: wt-status.c:1323

1956 +#: wt-status.c:1320

1957 msgid "HEAD detached at "

1958 msgstr "HEAD détachée sur "

1959

1866 -#: wt-status.c:1325

1960 +#: wt-status.c:1322

1961 msgid "HEAD detached from "

1962 msgstr "HEAD détachée depuis "

1963

1870 -#: wt-status.c:1328

1964 +#: wt-status.c:1325

1965 msgid "Not currently on any branch."

1966 msgstr "Actuellement sur aucun branche."

1967

1874 -#: wt-status.c:1345

1968 +#: wt-status.c:1342

1969 msgid "Initial commit"

1970 msgstr "Validation initiale"

1971

1878 -#: wt-status.c:1359

1972 +#: wt-status.c:1356

1973 msgid "Untracked files"

1974 msgstr "Fichiers non suivis"

1975

1882 -#: wt-status.c:1361

1976 +#: wt-status.c:1358

1977 msgid "Ignored files"

1978 msgstr "Fichiers ignorés"

1979

1886 -#: wt-status.c:1365

1980 +#: wt-status.c:1362

1981 #, c-format

1982 msgid ""

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

@@ -1895,32 +1989,32 @@ msgstr ""

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

1990 "status')."

1991

1898 -#: wt-status.c:1371

1992 +#: wt-status.c:1368

1993 #, c-format

1994 msgid "Untracked files not listed%s"

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

1996

1903 -#: wt-status.c:1373

1997 +#: wt-status.c:1370

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

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

2000

1907 -#: wt-status.c:1379

2001 +#: wt-status.c:1376

2002 msgid "No changes"

2003 msgstr "Aucune modification"

2004

1911 -#: wt-status.c:1384

2005 +#: wt-status.c:1381

2006 #, c-format

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

2008 msgstr ""

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

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

2011

1918 -#: wt-status.c:1387

2012 +#: wt-status.c:1384

2013 #, c-format

2014 msgid "no changes added to commit\n"

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

2016

1923 -#: wt-status.c:1390

2017 +#: wt-status.c:1387

2018 #, c-format

2019 msgid ""

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

@@ -1929,98 +2023,98 @@ msgstr ""

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

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

2025

1932 -#: wt-status.c:1393

2026 +#: wt-status.c:1390

2027 #, c-format

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

2029 msgstr ""

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

2031 "sont présents\n"

2032

1939 -#: wt-status.c:1396

2033 +#: wt-status.c:1393

2034 #, c-format

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

2036 msgstr ""

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

2038 "suivre)\n"

2039

1946 -#: wt-status.c:1399 wt-status.c:1404

2040 +#: wt-status.c:1396 wt-status.c:1401

2041 #, c-format

2042 msgid "nothing to commit\n"

2043 msgstr "rien à valider\n"

2044

1951 -#: wt-status.c:1402

2045 +#: wt-status.c:1399

2046 #, c-format

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

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

2049

1956 -#: wt-status.c:1406

2050 +#: wt-status.c:1403

2051 #, c-format

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

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

2054

1961 -#: wt-status.c:1515

2055 +#: wt-status.c:1512

2056 msgid "HEAD (no branch)"

2057 msgstr "HEAD (aucune branche)"

2058

1965 -#: wt-status.c:1521

2059 +#: wt-status.c:1518

2060 msgid "Initial commit on "

2061 msgstr "Validation initiale sur "

2062

2063 # à priori on parle d'une branche ici

1970 -#: wt-status.c:1553

2064 +#: wt-status.c:1550

2065 msgid "gone"

2066 msgstr "disparue"

2067

1974 -#: wt-status.c:1555 wt-status.c:1563

2068 +#: wt-status.c:1552 wt-status.c:1560

2069 msgid "behind "

2070 msgstr "derrière "

2071

1978 -#: compat/precompose_utf8.c:55 builtin/clone.c:356

2072 +#: compat/precompose_utf8.c:55 builtin/clone.c:357

2073 #, c-format

2074 msgid "failed to unlink '%s'"

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

2076

1983 -#: builtin/add.c:21

2077 +#: builtin/add.c:22

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

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

2080

1987 -#: builtin/add.c:64

2081 +#: builtin/add.c:65

2082 #, c-format

2083 msgid "unexpected diff status %c"

2084 msgstr "status de diff inattendu %c"

2085

1992 -#: builtin/add.c:69 builtin/commit.c:261

2086 +#: builtin/add.c:70 builtin/commit.c:275

2087 msgid "updating files failed"

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

2089

1996 -#: builtin/add.c:79

2090 +#: builtin/add.c:80

2091 #, c-format

2092 msgid "remove '%s'\n"

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

2094

2001 -#: builtin/add.c:133

2095 +#: builtin/add.c:134

2096 msgid "Unstaged changes after refreshing the index:"

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

2098

2005 -#: builtin/add.c:193 builtin/rev-parse.c:781

2099 +#: builtin/add.c:194 builtin/rev-parse.c:785

2100 msgid "Could not read the index"

2101 msgstr "Impossible de lire l'index"

2102

2009 -#: builtin/add.c:204

2103 +#: builtin/add.c:205

2104 #, c-format

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

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

2107

2014 -#: builtin/add.c:208

2108 +#: builtin/add.c:209

2109 msgid "Could not write patch"

2110 msgstr "Impossible d'écrire le patch"

2111

2018 -#: builtin/add.c:213

2112 +#: builtin/add.c:214

2113 #, c-format

2114 msgid "Could not stat '%s'"

2115 msgstr "Stat de '%s' impossible"

2116

2023 -#: builtin/add.c:215

2117 +#: builtin/add.c:216

2118 msgid "Empty patch. Aborted."

2119 msgstr "Patch vide. Abandon."

2120

@@ -2034,15 +2128,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2128 msgstr ""

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

2130

2037 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

2038 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

2131 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2132 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

2133 #: builtin/rm.c:269

2134 msgid "dry run"

2135 msgstr "simuler l'action"

2136

2043 -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

2044 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

2045 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

2137 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2138 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

2139 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2140 msgid "be verbose"

2141 msgstr "mode verbeux"

2142

@@ -2050,7 +2144,7 @@ msgstr "mode verbeux"

2144 msgid "interactive picking"

2145 msgstr "sélection interactive"

2146

2053 -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

2147 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2148 msgid "select hunks interactively"

2149 msgstr "sélection interactive des sections"

2150

@@ -2126,81 +2220,81 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2221

2222 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2129 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2223 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2224 msgid "index file corrupt"

2225 msgstr "fichier d'index corrompu"

2226

2133 -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2227 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2228 msgid "Unable to write new index file"

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

2230

2137 -#: builtin/apply.c:57

2231 +#: builtin/apply.c:58

2232 msgid "git apply [options] [<patch>...]"

2233 msgstr "git apply [options] [<patch>...]"

2234

2141 -#: builtin/apply.c:110

2235 +#: builtin/apply.c:111

2236 #, c-format

2237 msgid "unrecognized whitespace option '%s'"

2238 msgstr "option d'espace non reconnue '%s'"

2239

2146 -#: builtin/apply.c:125

2240 +#: builtin/apply.c:126

2241 #, c-format

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

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

2244

2151 -#: builtin/apply.c:825

2245 +#: builtin/apply.c:826

2246 #, c-format

2247 msgid "Cannot prepare timestamp regexp %s"

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

2249

2156 -#: builtin/apply.c:834

2250 +#: builtin/apply.c:835

2251 #, c-format

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

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

2254

2161 -#: builtin/apply.c:915

2255 +#: builtin/apply.c:916

2256 #, c-format

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

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

2259

2166 -#: builtin/apply.c:947

2260 +#: builtin/apply.c:948

2261 #, c-format

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

2263 msgstr ""

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

2265 "ligne %d"

2266

2173 -#: builtin/apply.c:951

2267 +#: builtin/apply.c:952

2268 #, c-format

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

2270 msgstr ""

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

2272 "à la ligne %d"

2273

2180 -#: builtin/apply.c:952

2274 +#: builtin/apply.c:953

2275 #, c-format

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

2277 msgstr ""

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

2279 "à la ligne %d"

2280

2187 -#: builtin/apply.c:959

2281 +#: builtin/apply.c:960

2282 #, c-format

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

2284 msgstr ""

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

2286

2193 -#: builtin/apply.c:1422

2287 +#: builtin/apply.c:1423

2288 #, c-format

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

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

2291

2198 -#: builtin/apply.c:1479

2292 +#: builtin/apply.c:1480

2293 #, c-format

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

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

2296

2203 -#: builtin/apply.c:1496

2297 +#: builtin/apply.c:1497

2298 #, c-format

2299 msgid ""

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

@@ -2215,77 +2309,77 @@ msgstr[1] ""

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

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

2311

2218 -#: builtin/apply.c:1656

2312 +#: builtin/apply.c:1657

2313 msgid "new file depends on old contents"

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

2315

2222 -#: builtin/apply.c:1658

2316 +#: builtin/apply.c:1659

2317 msgid "deleted file still has contents"

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

2319

2226 -#: builtin/apply.c:1684

2320 +#: builtin/apply.c:1685

2321 #, c-format

2322 msgid "corrupt patch at line %d"

2323 msgstr "patch corrompu à la ligne %d"

2324

2231 -#: builtin/apply.c:1720

2325 +#: builtin/apply.c:1721

2326 #, c-format

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

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

2329

2236 -#: builtin/apply.c:1722

2330 +#: builtin/apply.c:1723

2331 #, c-format

2332 msgid "deleted file %s still has contents"

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

2334

2241 -#: builtin/apply.c:1725

2335 +#: builtin/apply.c:1726

2336 #, c-format

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

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

2339

2246 -#: builtin/apply.c:1871

2340 +#: builtin/apply.c:1872

2341 #, c-format

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

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

2344

2251 -#: builtin/apply.c:1900

2345 +#: builtin/apply.c:1901

2346 #, c-format

2347 msgid "unrecognized binary patch at line %d"

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

2349

2256 -#: builtin/apply.c:1986

2350 +#: builtin/apply.c:2052

2351 #, c-format

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

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

2354

2261 -#: builtin/apply.c:2076

2355 +#: builtin/apply.c:2142

2356 #, c-format

2357 msgid "unable to read symlink %s"

2358 msgstr "lecture du lien symbolique %s impossible"

2359

2266 -#: builtin/apply.c:2080

2360 +#: builtin/apply.c:2146

2361 #, c-format

2362 msgid "unable to open or read %s"

2363 msgstr "ouverture ou lecture de %s impossible"

2364

2271 -#: builtin/apply.c:2688

2365 +#: builtin/apply.c:2754

2366 #, c-format

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

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

2369

2276 -#: builtin/apply.c:2806

2370 +#: builtin/apply.c:2872

2371 #, c-format

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

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

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

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

2376

2283 -#: builtin/apply.c:2818

2377 +#: builtin/apply.c:2884

2378 #, c-format

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

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

2381

2288 -#: builtin/apply.c:2824

2382 +#: builtin/apply.c:2890

2383 #, c-format

2384 msgid ""

2385 "while searching for:\n"

@@ -2294,328 +2388,328 @@ msgstr ""

2388 "pendant la recherche de :\n"

2389 "%.*s"

2390

2297 -#: builtin/apply.c:2843

2391 +#: builtin/apply.c:2909

2392 #, c-format

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

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

2395

2302 -#: builtin/apply.c:2944

2396 +#: builtin/apply.c:3010

2397 #, c-format

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

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

2400

2307 -#: builtin/apply.c:2950

2401 +#: builtin/apply.c:3016

2402 #, c-format

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

2404 msgstr ""

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

2406 "trouvé)"

2407

2314 -#: builtin/apply.c:2971

2408 +#: builtin/apply.c:3037

2409 #, c-format

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

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

2412

2319 -#: builtin/apply.c:3095

2413 +#: builtin/apply.c:3161

2414 #, c-format

2415 msgid "cannot checkout %s"

2416 msgstr "extraction de %s impossible"

2417

2324 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2418 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2419 #, c-format

2420 msgid "read of %s failed"

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

2422

2329 -#: builtin/apply.c:3174 builtin/apply.c:3396

2423 +#: builtin/apply.c:3240 builtin/apply.c:3462

2424 #, c-format

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

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

2427

2334 -#: builtin/apply.c:3255 builtin/apply.c:3410

2428 +#: builtin/apply.c:3321 builtin/apply.c:3476

2429 #, c-format

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

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

2432

2339 -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2433 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2434 #, c-format

2435 msgid "%s: %s"

2436 msgstr "%s : %s"

2437

2344 -#: builtin/apply.c:3264 builtin/apply.c:3418

2438 +#: builtin/apply.c:3330 builtin/apply.c:3484

2439 #, c-format

2440 msgid "%s: does not match index"

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

2442

2349 -#: builtin/apply.c:3366

2443 +#: builtin/apply.c:3432

2444 msgid "removal patch leaves file contents"

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

2446

2353 -#: builtin/apply.c:3435

2447 +#: builtin/apply.c:3501

2448 #, c-format

2449 msgid "%s: wrong type"

2450 msgstr "%s : type erroné"

2451

2358 -#: builtin/apply.c:3437

2452 +#: builtin/apply.c:3503

2453 #, c-format

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

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

2456

2363 -#: builtin/apply.c:3538

2457 +#: builtin/apply.c:3604

2458 #, c-format

2459 msgid "%s: already exists in index"

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

2461

2368 -#: builtin/apply.c:3541

2462 +#: builtin/apply.c:3607

2463 #, c-format

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

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

2466

2373 -#: builtin/apply.c:3561

2467 +#: builtin/apply.c:3627

2468 #, c-format

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

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

2471

2378 -#: builtin/apply.c:3566

2472 +#: builtin/apply.c:3632

2473 #, c-format

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

2475 msgstr ""

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

2477

2384 -#: builtin/apply.c:3574

2478 +#: builtin/apply.c:3640

2479 #, c-format

2480 msgid "%s: patch does not apply"

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

2482

2389 -#: builtin/apply.c:3587

2483 +#: builtin/apply.c:3653

2484 #, c-format

2485 msgid "Checking patch %s..."

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

2487

2394 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2488 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2489 #, c-format

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

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

2492

2399 -#: builtin/apply.c:3823

2493 +#: builtin/apply.c:3889

2494 #, c-format

2495 msgid "unable to remove %s from index"

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

2497

2404 -#: builtin/apply.c:3852

2498 +#: builtin/apply.c:3918

2499 #, c-format

2500 msgid "corrupt patch for submodule %s"

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

2502

2409 -#: builtin/apply.c:3856

2503 +#: builtin/apply.c:3922

2504 #, c-format

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

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

2507

2414 -#: builtin/apply.c:3861

2508 +#: builtin/apply.c:3927

2509 #, c-format

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

2511 msgstr ""

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

2513 "impossible"

2514

2421 -#: builtin/apply.c:3864 builtin/apply.c:3972

2515 +#: builtin/apply.c:3930 builtin/apply.c:4038

2516 #, c-format

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

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

2519

2426 -#: builtin/apply.c:3897

2520 +#: builtin/apply.c:3963

2521 #, c-format

2522 msgid "closing file '%s'"

2523 msgstr "fermeture du fichier '%s'"

2524

2431 -#: builtin/apply.c:3946

2525 +#: builtin/apply.c:4012

2526 #, c-format

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

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

2529

2436 -#: builtin/apply.c:4033

2530 +#: builtin/apply.c:4099

2531 #, c-format

2532 msgid "Applied patch %s cleanly."

2533 msgstr "Patch %s appliqué proprement."

2534

2441 -#: builtin/apply.c:4041

2535 +#: builtin/apply.c:4107

2536 msgid "internal error"

2537 msgstr "erreur interne"

2538

2445 -#: builtin/apply.c:4044

2539 +#: builtin/apply.c:4110

2540 #, c-format

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

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

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

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

2545

2452 -#: builtin/apply.c:4054

2546 +#: builtin/apply.c:4120

2547 #, c-format

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

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

2550

2457 -#: builtin/apply.c:4075

2551 +#: builtin/apply.c:4141

2552 #, c-format

2553 msgid "Hunk #%d applied cleanly."

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

2555

2462 -#: builtin/apply.c:4078

2556 +#: builtin/apply.c:4144

2557 #, c-format

2558 msgid "Rejected hunk #%d."

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

2560

2467 -#: builtin/apply.c:4228

2561 +#: builtin/apply.c:4234

2562 msgid "unrecognized input"

2563 msgstr "entrée non reconnue"

2564

2471 -#: builtin/apply.c:4239

2565 +#: builtin/apply.c:4245

2566 msgid "unable to read index file"

2567 msgstr "lecture du fichier d'index impossible"

2568

2475 -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2569 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2570 #: builtin/fetch.c:93

2571 msgid "path"

2572 msgstr "chemin"

2573

2480 -#: builtin/apply.c:4359

2574 +#: builtin/apply.c:4363

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

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

2577

2484 -#: builtin/apply.c:4362

2578 +#: builtin/apply.c:4366

2579 msgid "apply changes matching the given path"

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

2581

2488 -#: builtin/apply.c:4364

2582 +#: builtin/apply.c:4368

2583 msgid "num"

2584 msgstr "num"

2585

2492 -#: builtin/apply.c:4365

2586 +#: builtin/apply.c:4369

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

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

2589

2496 -#: builtin/apply.c:4368

2590 +#: builtin/apply.c:4372

2591 msgid "ignore additions made by the patch"

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

2593

2500 -#: builtin/apply.c:4370

2594 +#: builtin/apply.c:4374

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

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

2597

2504 -#: builtin/apply.c:4374

2598 +#: builtin/apply.c:4378

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

2600 msgstr ""

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

2602

2509 -#: builtin/apply.c:4376

2603 +#: builtin/apply.c:4380

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

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

2606

2513 -#: builtin/apply.c:4378

2607 +#: builtin/apply.c:4382

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

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

2610

2517 -#: builtin/apply.c:4380

2611 +#: builtin/apply.c:4384

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

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

2614

2521 -#: builtin/apply.c:4382

2615 +#: builtin/apply.c:4386

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

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

2618

2525 -#: builtin/apply.c:4384

2619 +#: builtin/apply.c:4388

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

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

2622

2529 -#: builtin/apply.c:4386

2623 +#: builtin/apply.c:4390

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

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

2626

2533 -#: builtin/apply.c:4388

2627 +#: builtin/apply.c:4392

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

2629 msgstr ""

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

2631

2538 -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2632 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2633 msgid "paths are separated with NUL character"

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

2635

2542 -#: builtin/apply.c:4393

2636 +#: builtin/apply.c:4397

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

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

2639

2546 -#: builtin/apply.c:4394

2640 +#: builtin/apply.c:4398

2641 msgid "action"

2642 msgstr "action"

2643

2550 -#: builtin/apply.c:4395

2644 +#: builtin/apply.c:4399

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

2646 msgstr ""

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

2648 "d'espace"

2649

2556 -#: builtin/apply.c:4398 builtin/apply.c:4401

2650 +#: builtin/apply.c:4402 builtin/apply.c:4405

2651 msgid "ignore changes in whitespace when finding context"

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

2653

2560 -#: builtin/apply.c:4404

2654 +#: builtin/apply.c:4408

2655 msgid "apply the patch in reverse"

2656 msgstr "appliquer le patch en sens inverse"

2657

2564 -#: builtin/apply.c:4406

2658 +#: builtin/apply.c:4410

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

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

2661

2568 -#: builtin/apply.c:4408

2662 +#: builtin/apply.c:4412

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

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

2665

2572 -#: builtin/apply.c:4410

2666 +#: builtin/apply.c:4414

2667 msgid "allow overlapping hunks"

2668 msgstr "accepter les recouvrements de sections"

2669

2576 -#: builtin/apply.c:4413

2670 +#: builtin/apply.c:4417

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

2672 msgstr ""

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

2674 "fichier"

2675

2582 -#: builtin/apply.c:4416

2676 +#: builtin/apply.c:4420

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

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

2679

2586 -#: builtin/apply.c:4418

2680 +#: builtin/apply.c:4422

2681 msgid "root"

2682 msgstr "racine"

2683

2590 -#: builtin/apply.c:4419

2684 +#: builtin/apply.c:4423

2685 msgid "prepend <root> to all filenames"

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

2687

2594 -#: builtin/apply.c:4441

2688 +#: builtin/apply.c:4445

2689 msgid "--3way outside a repository"

2690 msgstr "--3way hors d'un dépôt"

2691

2598 -#: builtin/apply.c:4449

2692 +#: builtin/apply.c:4453

2693 msgid "--index outside a repository"

2694 msgstr "--index hors d'un dépôt"

2695

2602 -#: builtin/apply.c:4452

2696 +#: builtin/apply.c:4456

2697 msgid "--cached outside a repository"

2698 msgstr "--cached hors d'un dépôt"

2699

2606 -#: builtin/apply.c:4468

2700 +#: builtin/apply.c:4472

2701 #, c-format

2702 msgid "can't open patch '%s'"

2703 msgstr "ouverture impossible du patch '%s'"

2704

2611 -#: builtin/apply.c:4482

2705 +#: builtin/apply.c:4486

2706 #, c-format

2707 msgid "squelched %d whitespace error"

2708 msgid_plural "squelched %d whitespace errors"

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

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

2711

2618 -#: builtin/apply.c:4488 builtin/apply.c:4498

2712 +#: builtin/apply.c:4492 builtin/apply.c:4502

2713 #, c-format

2714 msgid "%d line adds whitespace errors."

2715 msgid_plural "%d lines add whitespace errors."

@@ -2781,7 +2875,7 @@ msgstr ""

2875 #. takes 22 places, is the longest among various forms of

2876 #. relative timestamps, but your language may need more or

2877 #. fewer display columns.

2784 -#: builtin/blame.c:2599

2878 +#: builtin/blame.c:2602

2879 msgid "4 years, 11 months ago"

2880 msgstr "il y a 10 ans et 11 mois"

2881

@@ -2801,7 +2895,7 @@ msgstr "git branch [options] [-r] (-d | -D) <nomdebranche>..."

2895 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2896 msgstr "git branch [options] (-m | -M) [<anciennebranche>] <nouvellebranche>"

2897

2804 -#: builtin/branch.c:150

2898 +#: builtin/branch.c:152

2899 #, c-format

2900 msgid ""

2901 "deleting branch '%s' that has been merged to\n"

@@ -2810,7 +2904,7 @@ msgstr ""

2904 "suppression de la branche '%s' qui a été fusionnée dans\n"

2905 " '%s', mais pas dans HEAD."

2906

2813 -#: builtin/branch.c:154

2907 +#: builtin/branch.c:156

2908 #, c-format

2909 msgid ""

2910 "not deleting branch '%s' that is not yet merged to\n"

@@ -2819,12 +2913,12 @@ msgstr ""

2913 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"

2914 " '%s', même si elle est fusionnée dans HEAD."

2915

2822 -#: builtin/branch.c:168

2916 +#: builtin/branch.c:170

2917 #, c-format

2918 msgid "Couldn't look up commit object for '%s'"

2919 msgstr "Impossible de rechercher l'objet commit pour '%s'"

2920

2827 -#: builtin/branch.c:172

2921 +#: builtin/branch.c:174

2922 #, c-format

2923 msgid ""

2924 "The branch '%s' is not fully merged.\n"

@@ -2833,304 +2927,304 @@ msgstr ""

2927 "La branche '%s' n'est pas totalement fusionnée.\n"

2928 "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."

2929

2836 -#: builtin/branch.c:185

2930 +#: builtin/branch.c:187

2931 msgid "Update of config-file failed"

2932 msgstr "Échec de la mise à jour du fichier de configuration"

2933

2840 -#: builtin/branch.c:213

2934 +#: builtin/branch.c:215

2935 msgid "cannot use -a with -d"

2936 msgstr "impossible d'utiliser -a avec -d"

2937

2844 -#: builtin/branch.c:219

2938 +#: builtin/branch.c:221

2939 msgid "Couldn't look up commit object for HEAD"

2940 msgstr "Impossible de rechercher l'objet commit pour HEAD"

2941

2848 -#: builtin/branch.c:227

2942 +#: builtin/branch.c:229

2943 #, c-format

2944 msgid "Cannot delete the branch '%s' which you are currently on."

2945 msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."

2946

2853 -#: builtin/branch.c:240

2947 +#: builtin/branch.c:245

2948 #, c-format

2949 msgid "remote branch '%s' not found."

2950 msgstr "branche distante %s' non trouvée."

2951

2858 -#: builtin/branch.c:241

2952 +#: builtin/branch.c:246

2953 #, c-format

2954 msgid "branch '%s' not found."

2955 msgstr "branche '%s' non trouvée."

2956

2863 -#: builtin/branch.c:255

2957 +#: builtin/branch.c:260

2958 #, c-format

2959 msgid "Error deleting remote branch '%s'"

2960 msgstr "Erreur lors de la suppression de la branche distante '%s'"

2961

2868 -#: builtin/branch.c:256

2962 +#: builtin/branch.c:261

2963 #, c-format

2964 msgid "Error deleting branch '%s'"

2965 msgstr "Erreur lors de la suppression de la branche '%s'"

2966

2873 -#: builtin/branch.c:263

2967 +#: builtin/branch.c:268

2968 #, c-format

2969 msgid "Deleted remote branch %s (was %s).\n"

2970 msgstr "Branche distante %s supprimée (précédemment %s).\n"

2971

2878 -#: builtin/branch.c:264

2972 +#: builtin/branch.c:269

2973 #, c-format

2974 msgid "Deleted branch %s (was %s).\n"

2975 msgstr "Branche %s supprimée (précédemment %s).\n"

2976

2883 -#: builtin/branch.c:366

2977 +#: builtin/branch.c:370

2978 #, c-format

2979 msgid "branch '%s' does not point at a commit"

2980 msgstr "la branche '%s' ne pointe pas sur un commit"

2981

2982 # féminin pour une branche

2889 -#: builtin/branch.c:454

2983 +#: builtin/branch.c:459

2984 #, c-format

2985 msgid "[%s: gone]"

2986 msgstr "[%s: disparue]"

2987

2894 -#: builtin/branch.c:459

2988 +#: builtin/branch.c:464

2989 #, c-format

2990 msgid "[%s]"

2991 msgstr "[%s]"

2992

2899 -#: builtin/branch.c:464

2993 +#: builtin/branch.c:469

2994 #, c-format

2995 msgid "[%s: behind %d]"

2996 msgstr "[%s: en retard de %d]"

2997

2904 -#: builtin/branch.c:466

2998 +#: builtin/branch.c:471

2999 #, c-format

3000 msgid "[behind %d]"

3001 msgstr "[en retard de %d]"

3002

2909 -#: builtin/branch.c:470

3003 +#: builtin/branch.c:475

3004 #, c-format

3005 msgid "[%s: ahead %d]"

3006 msgstr "[%s : en avance de %d]"

3007

2914 -#: builtin/branch.c:472

3008 +#: builtin/branch.c:477

3009 #, c-format

3010 msgid "[ahead %d]"

3011 msgstr "[en avance de %d]"

3012

2919 -#: builtin/branch.c:475

3013 +#: builtin/branch.c:480

3014 #, c-format

3015 msgid "[%s: ahead %d, behind %d]"

3016 msgstr "[%s : en avance de %d, en retard de %d]"

3017

2924 -#: builtin/branch.c:478

3018 +#: builtin/branch.c:483

3019 #, c-format

3020 msgid "[ahead %d, behind %d]"

3021 msgstr "[en avance de %d, en retard de %d]"

3022

2929 -#: builtin/branch.c:502

3023 +#: builtin/branch.c:496

3024 msgid " **** invalid ref ****"

3025 msgstr " **** référence invalide ****"

3026

2933 -#: builtin/branch.c:594

3027 +#: builtin/branch.c:587

3028 #, c-format

3029 msgid "(no branch, rebasing %s)"

3030 msgstr "(aucune branche, rebasage de %s)"

3031

2938 -#: builtin/branch.c:597

3032 +#: builtin/branch.c:590

3033 #, c-format

3034 msgid "(no branch, bisect started on %s)"

3035 msgstr "(aucune branche, bisect a démarré sur %s)"

3036

2943 -#: builtin/branch.c:600

3037 +#: builtin/branch.c:593

3038 #, c-format

3039 msgid "(detached from %s)"

3040 msgstr "(détaché de %s)"

3041

2948 -#: builtin/branch.c:603

3042 +#: builtin/branch.c:596

3043 msgid "(no branch)"

3044 msgstr "(aucune branche)"

3045

2952 -#: builtin/branch.c:649

3046 +#: builtin/branch.c:643

3047 #, c-format

3048 msgid "object '%s' does not point to a commit"

3049 msgstr "l'objet '%s' ne pointe pas sur un commit"

3050

2957 -#: builtin/branch.c:681

3051 +#: builtin/branch.c:691

3052 msgid "some refs could not be read"

3053 msgstr "des références n'ont pas pu être lues"

3054

2961 -#: builtin/branch.c:694

3055 +#: builtin/branch.c:704

3056 msgid "cannot rename the current branch while not on any."

3057 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

3058

2965 -#: builtin/branch.c:704

3059 +#: builtin/branch.c:714

3060 #, c-format

3061 msgid "Invalid branch name: '%s'"

3062 msgstr "Nom de branche invalide : '%s'"

3063

2970 -#: builtin/branch.c:719

3064 +#: builtin/branch.c:729

3065 msgid "Branch rename failed"

3066 msgstr "Échec de renommage de la branche"

3067

2974 -#: builtin/branch.c:723

3068 +#: builtin/branch.c:733

3069 #, c-format

3070 msgid "Renamed a misnamed branch '%s' away"

3071 msgstr "Renommage d'un branche mal nommée '%s'"

3072

2979 -#: builtin/branch.c:727

3073 +#: builtin/branch.c:737

3074 #, c-format

3075 msgid "Branch renamed to %s, but HEAD is not updated!"

3076 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

3077

2984 -#: builtin/branch.c:734

3078 +#: builtin/branch.c:744

3079 msgid "Branch is renamed, but update of config-file failed"

3080 msgstr ""

3081 "La branche est renommée, mais la mise à jour du fichier de configuration a "

3082 "échoué"

3083

2990 -#: builtin/branch.c:749

3084 +#: builtin/branch.c:759

3085 #, c-format

3086 msgid "malformed object name %s"

3087 msgstr "nom d'objet malformé %s"

3088

2995 -#: builtin/branch.c:773

3089 +#: builtin/branch.c:783

3090 #, c-format

3091 msgid "could not write branch description template: %s"

3092 msgstr "impossible d'écrire le modèle de description de branche : %s"

3093

3000 -#: builtin/branch.c:803

3094 +#: builtin/branch.c:813

3095 msgid "Generic options"

3096 msgstr "Options génériques"

3097

3004 -#: builtin/branch.c:805

3098 +#: builtin/branch.c:815

3099 msgid "show hash and subject, give twice for upstream branch"

3100 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

3101

3008 -#: builtin/branch.c:806

3102 +#: builtin/branch.c:816

3103 msgid "suppress informational messages"

3104 msgstr "supprimer les messages d'information"

3105

3012 -#: builtin/branch.c:807

3106 +#: builtin/branch.c:817

3107 msgid "set up tracking mode (see git-pull(1))"

3108 msgstr "régler le mode de suivi (voir git-pull(1))"

3109

3016 -#: builtin/branch.c:809

3110 +#: builtin/branch.c:819

3111 msgid "change upstream info"

3112 msgstr "modifier l'information amont"

3113

3020 -#: builtin/branch.c:813

3114 +#: builtin/branch.c:823

3115 msgid "use colored output"

3116 msgstr "utiliser la coloration dans la sortie"

3117

3024 -#: builtin/branch.c:814

3118 +#: builtin/branch.c:824

3119 msgid "act on remote-tracking branches"

3120 msgstr "agir sur les branches de suivi distantes"

3121

3028 -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

3029 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

3030 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

3031 -#: builtin/tag.c:621

3122 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

3123 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

3124 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

3125 +#: builtin/tag.c:622

3126 msgid "commit"

3127 msgstr "commit"

3128

3035 -#: builtin/branch.c:818 builtin/branch.c:824

3129 +#: builtin/branch.c:828 builtin/branch.c:834

3130 msgid "print only branches that contain the commit"

3131 msgstr "afficher seulement les branches qui contiennent le commit"

3132

3039 -#: builtin/branch.c:830

3133 +#: builtin/branch.c:840

3134 msgid "Specific git-branch actions:"

3135 msgstr "Actions spécifiques à git-branch :"

3136

3043 -#: builtin/branch.c:831

3137 +#: builtin/branch.c:841

3138 msgid "list both remote-tracking and local branches"

3139 msgstr "afficher à la fois les branches de suivi et les branches locales"

3140

3047 -#: builtin/branch.c:833

3141 +#: builtin/branch.c:843

3142 msgid "delete fully merged branch"

3143 msgstr "supprimer une branche totalement fusionnée"

3144

3051 -#: builtin/branch.c:834

3145 +#: builtin/branch.c:844

3146 msgid "delete branch (even if not merged)"

3147 msgstr "supprimer une branche (même non fusionnée)"

3148

3055 -#: builtin/branch.c:835

3149 +#: builtin/branch.c:845

3150 msgid "move/rename a branch and its reflog"

3151 msgstr "déplacer/renommer une branche et son reflog"

3152

3059 -#: builtin/branch.c:836

3153 +#: builtin/branch.c:846

3154 msgid "move/rename a branch, even if target exists"

3155 msgstr "déplacer/renommer une branche, même si la cible existe"

3156

3063 -#: builtin/branch.c:837

3157 +#: builtin/branch.c:847

3158 msgid "list branch names"

3159 msgstr "afficher les noms des branches"

3160

3067 -#: builtin/branch.c:838

3161 +#: builtin/branch.c:848

3162 msgid "create the branch's reflog"

3163 msgstr "créer le reflog de la branche"

3164

3071 -#: builtin/branch.c:840

3165 +#: builtin/branch.c:850

3166 msgid "edit the description for the branch"

3167 msgstr "éditer la description de la branche"

3168

3075 -#: builtin/branch.c:841

3169 +#: builtin/branch.c:851

3170 msgid "force creation (when already exists)"

3171 msgstr "forcer la création (même si la cible existe)"

3172

3079 -#: builtin/branch.c:844

3173 +#: builtin/branch.c:854

3174 msgid "print only not merged branches"

3175 msgstr "afficher seulement les branches non fusionnées"

3176

3083 -#: builtin/branch.c:850

3177 +#: builtin/branch.c:860

3178 msgid "print only merged branches"

3179 msgstr "afficher seulement les branches fusionnées"

3180

3087 -#: builtin/branch.c:854

3181 +#: builtin/branch.c:864

3182 msgid "list branches in columns"

3183 msgstr "afficher les branches en colonnes"

3184

3091 -#: builtin/branch.c:867

3185 +#: builtin/branch.c:877

3186 msgid "Failed to resolve HEAD as a valid ref."

3187 msgstr "Échec de résolution de HEAD comme référence valide."

3188

3095 -#: builtin/branch.c:872 builtin/clone.c:636

3189 +#: builtin/branch.c:881 builtin/clone.c:634

3190 msgid "HEAD not found below refs/heads!"

3191 msgstr "HEAD non trouvée sous refs/heads !"

3192

3099 -#: builtin/branch.c:896

3193 +#: builtin/branch.c:903

3194 msgid "--column and --verbose are incompatible"

3195 msgstr "--column et --verbose sont incompatibles"

3196

3103 -#: builtin/branch.c:902 builtin/branch.c:941

3197 +#: builtin/branch.c:909 builtin/branch.c:948

3198 msgid "branch name required"

3199 msgstr "le nom de branche est requis"

3200

3107 -#: builtin/branch.c:917

3201 +#: builtin/branch.c:924

3202 msgid "Cannot give description to detached HEAD"

3203 msgstr "Impossible de décrire une HEAD détachée"

3204

3111 -#: builtin/branch.c:922

3205 +#: builtin/branch.c:929

3206 msgid "cannot edit description of more than one branch"

3207 msgstr "impossible d'éditer la description de plus d'une branche"

3208

3115 -#: builtin/branch.c:929

3209 +#: builtin/branch.c:936

3210 #, c-format

3211 msgid "No commit on branch '%s' yet."

3212 msgstr "Aucun commit sur la branche '%s'."

3213

3120 -#: builtin/branch.c:932

3214 +#: builtin/branch.c:939

3215 #, c-format

3216 msgid "No branch named '%s'."

3217 msgstr "Aucune branche nommée '%s'."

3218

3125 -#: builtin/branch.c:947

3219 +#: builtin/branch.c:954

3220 msgid "too many branches for a rename operation"

3221 msgstr "trop de branches pour une opération de renommage"

3222

3129 -#: builtin/branch.c:952

3223 +#: builtin/branch.c:959

3224 msgid "too many branches to set new upstream"

3225 msgstr "trop de branches pour spécifier une branche amont"

3226

3133 -#: builtin/branch.c:956

3227 +#: builtin/branch.c:963

3228 #, c-format

3229 msgid ""

3230 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -3138,41 +3232,41 @@ msgstr ""

3232 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

3233 "aucune branche."

3234

3141 -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

3235 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

3236 #, c-format

3237 msgid "no such branch '%s'"

3238 msgstr "pas de branche '%s'"

3239

3146 -#: builtin/branch.c:963

3240 +#: builtin/branch.c:970

3241 #, c-format

3242 msgid "branch '%s' does not exist"

3243 msgstr "la branche '%s' n'existe pas"

3244

3151 -#: builtin/branch.c:975

3245 +#: builtin/branch.c:982

3246 msgid "too many branches to unset upstream"

3247 msgstr "trop de branches pour désactiver un amont"

3248

3155 -#: builtin/branch.c:979

3249 +#: builtin/branch.c:986

3250 msgid "could not unset upstream of HEAD when it does not point to any branch."

3251 msgstr ""

3252 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

3253 "aucune branche."

3254

3161 -#: builtin/branch.c:985

3255 +#: builtin/branch.c:992

3256 #, c-format

3257 msgid "Branch '%s' has no upstream information"

3258 msgstr "La branche '%s' n'a aucune information de branche amont"

3259

3166 -#: builtin/branch.c:999

3260 +#: builtin/branch.c:1006

3261 msgid "it does not make sense to create 'HEAD' manually"

3262 msgstr "créer manuellement 'HEAD' n'a pas de sens"

3263

3170 -#: builtin/branch.c:1005

3264 +#: builtin/branch.c:1012

3265 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3266 msgstr ""

3267 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

3268

3175 -#: builtin/branch.c:1008

3269 +#: builtin/branch.c:1015

3270 #, c-format

3271 msgid ""

3272 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3181,7 +3275,7 @@ msgstr ""

3275 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

3276 "track ou --set-upstream-to\n"

3277

3184 -#: builtin/branch.c:1025

3278 +#: builtin/branch.c:1032

3279 #, c-format

3280 msgid ""

3281 "\n"

@@ -3192,12 +3286,12 @@ msgstr ""

3286 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

3287 "\n"

3288

3195 -#: builtin/branch.c:1026

3289 +#: builtin/branch.c:1033

3290 #, c-format

3291 msgid " git branch -d %s\n"

3292 msgstr " git branch -d %s\n"

3293

3200 -#: builtin/branch.c:1027

3294 +#: builtin/branch.c:1034

3295 #, c-format

3296 msgid " git branch --set-upstream-to %s\n"

3297 msgstr " git branch --set-upstream-to %s\n"

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

3309 msgid "Need a repository to unbundle."

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

3311

3218 -#: builtin/cat-file.c:331

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

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

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

3315

3222 -#: builtin/cat-file.c:332

3316 +#: builtin/cat-file.c:333

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

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

3319

3226 -#: builtin/cat-file.c:369

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

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

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

3323

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

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

3325 msgid "show object type"

3326 msgstr "afficher le type de l'objet"

3327

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

3328 +#: builtin/cat-file.c:372

3329 msgid "show object size"

3330 msgstr "afficher la taille de l'objet"

3331

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

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

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

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

3335

3242 -#: builtin/cat-file.c:374

3336 +#: builtin/cat-file.c:375

3337 msgid "pretty-print object's content"

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

3339

3246 -#: builtin/cat-file.c:376

3340 +#: builtin/cat-file.c:377

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

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

3343

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

3344 +#: builtin/cat-file.c:379

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

3346 msgstr ""

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

3348

3255 -#: builtin/cat-file.c:381

3349 +#: builtin/cat-file.c:382

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

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

3352

@@ -3273,7 +3367,7 @@ msgstr "afficher tous les attributs associés au fichier"

3367 msgid "use .gitattributes only from the index"

3368 msgstr "utiliser .gitattributes seulement depuis l'index"

3369

3276 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

3370 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3371 msgid "read file names from stdin"

3372 msgstr "lire les noms de fichier depuis l'entrée standard"

3373

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

3376 msgstr ""

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

3378

3285 -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3379 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

3380 msgid "suppress progress reporting"

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

3382

@@ -3450,46 +3544,46 @@ msgstr "le chemin '%s' n'est pas fusionné"

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

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

3546

3453 -#: builtin/checkout.c:591

3547 +#: builtin/checkout.c:597

3548 #, c-format

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

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

3551

3458 -#: builtin/checkout.c:629

3552 +#: builtin/checkout.c:635

3553 msgid "HEAD is now at"

3554 msgstr "HEAD est maintenant sur"

3555

3462 -#: builtin/checkout.c:636

3556 +#: builtin/checkout.c:642

3557 #, c-format

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

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

3560

3467 -#: builtin/checkout.c:639

3561 +#: builtin/checkout.c:645

3562 #, c-format

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

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

3565

3472 -#: builtin/checkout.c:643

3566 +#: builtin/checkout.c:649

3567 #, c-format

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

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

3570

3477 -#: builtin/checkout.c:645 builtin/checkout.c:1026

3571 +#: builtin/checkout.c:651 builtin/checkout.c:1032

3572 #, c-format

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

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

3575

3482 -#: builtin/checkout.c:647

3576 +#: builtin/checkout.c:653

3577 #, c-format

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

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

3580

3487 -#: builtin/checkout.c:699

3581 +#: builtin/checkout.c:705

3582 #, c-format

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

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

3585

3492 -#: builtin/checkout.c:705

3586 +#: builtin/checkout.c:711

3587 #, c-format

3588 msgid ""

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

@@ -3512,7 +3606,7 @@ msgstr[1] ""

3606 "\n"

3607 "%s\n"

3608

3515 -#: builtin/checkout.c:723

3609 +#: builtin/checkout.c:729

3610 #, c-format

3611 msgid ""

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

@@ -3528,139 +3622,139 @@ msgstr ""

3622 "git branch nouvelle_branche %s\n"

3623 "\n"

3624

3531 -#: builtin/checkout.c:753

3625 +#: builtin/checkout.c:759

3626 msgid "internal error in revision walk"

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

3628

3535 -#: builtin/checkout.c:757

3629 +#: builtin/checkout.c:763

3630 msgid "Previous HEAD position was"

3537 -msgstr "La position précédente de HEAD était"

3631 +msgstr "La position précédente de HEAD était sur "

3632

3539 -#: builtin/checkout.c:784 builtin/checkout.c:1021

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

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

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

3636

3543 -#: builtin/checkout.c:928

3637 +#: builtin/checkout.c:934

3638 #, c-format

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

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

3641

3548 -#: builtin/checkout.c:967

3642 +#: builtin/checkout.c:973

3643 #, c-format

3644 msgid "invalid reference: %s"

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

3646

3553 -#: builtin/checkout.c:996

3647 +#: builtin/checkout.c:1002

3648 #, c-format

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

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

3651

3558 -#: builtin/checkout.c:1035

3652 +#: builtin/checkout.c:1041

3653 msgid "paths cannot be used with switching branches"

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

3655

3562 -#: builtin/checkout.c:1038 builtin/checkout.c:1042

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

3657 #, c-format

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

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

3660

3567 -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3568 -#: builtin/checkout.c:1057

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

3662 +#: builtin/checkout.c:1063

3663 #, c-format

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

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

3666

3573 -#: builtin/checkout.c:1062

3667 +#: builtin/checkout.c:1068

3668 #, c-format

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

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

3671

3578 -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3672 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

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

3674 msgid "branch"

3675 msgstr "branche"

3676

3583 -#: builtin/checkout.c:1085

3677 +#: builtin/checkout.c:1091

3678 msgid "create and checkout a new branch"

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

3680

3587 -#: builtin/checkout.c:1087

3681 +#: builtin/checkout.c:1093

3682 msgid "create/reset and checkout a branch"

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

3684

3591 -#: builtin/checkout.c:1088

3685 +#: builtin/checkout.c:1094

3686 msgid "create reflog for new branch"

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

3688

3595 -#: builtin/checkout.c:1089

3689 +#: builtin/checkout.c:1095

3690 msgid "detach the HEAD at named commit"

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

3692

3599 -#: builtin/checkout.c:1090

3693 +#: builtin/checkout.c:1096

3694 msgid "set upstream info for new branch"

3695 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

3696

3603 -#: builtin/checkout.c:1092

3697 +#: builtin/checkout.c:1098

3698 msgid "new-branch"

3699 msgstr "nouvelle branche"

3700

3607 -#: builtin/checkout.c:1092

3701 +#: builtin/checkout.c:1098

3702 msgid "new unparented branch"

3703 msgstr "nouvelle branche sans parent"

3704

3611 -#: builtin/checkout.c:1093

3705 +#: builtin/checkout.c:1099

3706 msgid "checkout our version for unmerged files"

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

3708

3615 -#: builtin/checkout.c:1095

3709 +#: builtin/checkout.c:1101

3710 msgid "checkout their version for unmerged files"

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

3712

3619 -#: builtin/checkout.c:1097

3713 +#: builtin/checkout.c:1103

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

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

3716

3623 -#: builtin/checkout.c:1098

3717 +#: builtin/checkout.c:1104

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

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

3720

3627 -#: builtin/checkout.c:1099 builtin/merge.c:225

3721 +#: builtin/checkout.c:1105 builtin/merge.c:226

3722 msgid "update ignored files (default)"

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

3724

3631 -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3725 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3726 msgid "style"

3727 msgstr "style"

3728

3635 -#: builtin/checkout.c:1101

3729 +#: builtin/checkout.c:1107

3730 msgid "conflict style (merge or diff3)"

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

3732

3639 -#: builtin/checkout.c:1104

3733 +#: builtin/checkout.c:1110

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

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

3736

3643 -#: builtin/checkout.c:1106

3737 +#: builtin/checkout.c:1112

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

3739 msgstr "deuxième chance 'git checkout branche-inexistante'"

3740

3647 -#: builtin/checkout.c:1129

3741 +#: builtin/checkout.c:1135

3742 msgid "-b, -B and --orphan are mutually exclusive"

3743 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3744

3651 -#: builtin/checkout.c:1146

3745 +#: builtin/checkout.c:1152

3746 msgid "--track needs a branch name"

3747 msgstr "--track requiert un nom de branche"

3748

3655 -#: builtin/checkout.c:1153

3749 +#: builtin/checkout.c:1157

3750 msgid "Missing branch name; try -b"

3751 msgstr "Nom de branche manquant ; essayez -b"

3752

3659 -#: builtin/checkout.c:1190

3753 +#: builtin/checkout.c:1194

3754 msgid "invalid path specification"

3755 msgstr "spécification de chemin invalide"

3756

3663 -#: builtin/checkout.c:1197

3757 +#: builtin/checkout.c:1201

3758 #, c-format

3759 msgid ""

3760 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3670,12 +3764,12 @@ msgstr ""

3764 "en même temps.\n"

3765 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3766

3673 -#: builtin/checkout.c:1202

3767 +#: builtin/checkout.c:1206

3768 #, c-format

3769 msgid "git checkout: --detach does not take a path argument '%s'"

3770 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3771

3678 -#: builtin/checkout.c:1206

3772 +#: builtin/checkout.c:1210

3773 msgid ""

3774 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3775 "checking out of the index."

@@ -3826,7 +3920,7 @@ msgstr "nettoyage interactif"

3920 msgid "remove whole directories"

3921 msgstr "supprimer les répertoires entiers"

3922

3829 -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3923 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3924 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3925 msgid "pattern"

3926 msgstr "motif"

@@ -3863,145 +3957,145 @@ msgstr ""

3957 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "

3958 "nettoyer"

3959

3866 -#: builtin/clone.c:36

3960 +#: builtin/clone.c:37

3961 msgid "git clone [options] [--] <repo> [<dir>]"

3962 msgstr "git clone [options] [--] <dépôt> [<répertoire>]"

3963

3870 -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3871 -#: builtin/push.c:503

3964 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3965 +#: builtin/push.c:514

3966 msgid "force progress reporting"

3967 msgstr "forcer l'affichage de l'état d'avancement"

3968

3875 -#: builtin/clone.c:66

3969 +#: builtin/clone.c:67

3970 msgid "don't create a checkout"

3971 msgstr "ne pas créer d'extraction"

3972

3879 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3973 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3974 msgid "create a bare repository"

3975 msgstr "créer un dépôt nu"

3976

3883 -#: builtin/clone.c:71

3977 +#: builtin/clone.c:72

3978 msgid "create a mirror repository (implies bare)"

3979 msgstr "créer un dépôt miroir (implique dépôt nu)"

3980

3887 -#: builtin/clone.c:73

3981 +#: builtin/clone.c:74

3982 msgid "to clone from a local repository"

3983 msgstr "pour cloner depuis un dépôt local"

3984

3891 -#: builtin/clone.c:75

3985 +#: builtin/clone.c:76

3986 msgid "don't use local hardlinks, always copy"

3987 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

3988

3895 -#: builtin/clone.c:77

3989 +#: builtin/clone.c:78

3990 msgid "setup as shared repository"

3991 msgstr "régler comme dépôt partagé"

3992

3899 -#: builtin/clone.c:79 builtin/clone.c:81

3993 +#: builtin/clone.c:80 builtin/clone.c:82

3994 msgid "initialize submodules in the clone"

3995 msgstr "initialiser les sous-modules dans le clone"

3996

3903 -#: builtin/clone.c:82 builtin/init-db.c:483

3997 +#: builtin/clone.c:83 builtin/init-db.c:485

3998 msgid "template-directory"

3999 msgstr "répertoire-modèle"

4000

3907 -#: builtin/clone.c:83 builtin/init-db.c:484

4001 +#: builtin/clone.c:84 builtin/init-db.c:486

4002 msgid "directory from which templates will be used"

4003 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4004

3911 -#: builtin/clone.c:85

4005 +#: builtin/clone.c:86

4006 msgid "reference repository"

4007 msgstr "dépôt de référence"

4008

3915 -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

4009 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

4010 msgid "name"

4011 msgstr "nom"

4012

3919 -#: builtin/clone.c:87

4013 +#: builtin/clone.c:88

4014 msgid "use <name> instead of 'origin' to track upstream"

4015 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

4016

3923 -#: builtin/clone.c:89

4017 +#: builtin/clone.c:90

4018 msgid "checkout <branch> instead of the remote's HEAD"

4019 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4020

3927 -#: builtin/clone.c:91

4021 +#: builtin/clone.c:92

4022 msgid "path to git-upload-pack on the remote"

4023 msgstr "chemin vers git-upload-pack sur le serveur distant"

4024

3931 -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

4025 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

4026 msgid "depth"

4027 msgstr "profondeur"

4028

3935 -#: builtin/clone.c:93

4029 +#: builtin/clone.c:94

4030 msgid "create a shallow clone of that depth"

4031 msgstr "créer un clone superficiel de cette profondeur"

4032

3939 -#: builtin/clone.c:95

4033 +#: builtin/clone.c:96

4034 msgid "clone only one branch, HEAD or --branch"

4035 msgstr "cloner seulement une branche, HEAD ou --branch"

4036

3943 -#: builtin/clone.c:96 builtin/init-db.c:492

4037 +#: builtin/clone.c:97 builtin/init-db.c:494

4038 msgid "gitdir"

4039 msgstr "gitdir"

4040

3947 -#: builtin/clone.c:97 builtin/init-db.c:493

4041 +#: builtin/clone.c:98 builtin/init-db.c:495

4042 msgid "separate git dir from working tree"

4043 msgstr "séparer le répertoire git de la copie de travail"

4044

3951 -#: builtin/clone.c:98

4045 +#: builtin/clone.c:99

4046 msgid "key=value"

4047 msgstr "clé=valeur"

4048

3955 -#: builtin/clone.c:99

4049 +#: builtin/clone.c:100

4050 msgid "set config inside the new repository"

4051 msgstr "régler la configuration dans le nouveau dépôt"

4052

3959 -#: builtin/clone.c:252

4053 +#: builtin/clone.c:253

4054 #, c-format

4055 msgid "reference repository '%s' is not a local repository."

4056 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

4057

3964 -#: builtin/clone.c:256

4058 +#: builtin/clone.c:257

4059 #, c-format

4060 msgid "reference repository '%s' is shallow"

4061 msgstr "le dépôt de référence '%s' est superficiel"

4062

3969 -#: builtin/clone.c:259

4063 +#: builtin/clone.c:260

4064 #, c-format

4065 msgid "reference repository '%s' is grafted"

4066 msgstr "le dépôt de référence '%s' est greffé"

4067

3974 -#: builtin/clone.c:321

4068 +#: builtin/clone.c:322

4069 #, c-format

4070 msgid "failed to create directory '%s'"

4071 msgstr "échec de la création du répertoire '%s'"

4072

3979 -#: builtin/clone.c:323 builtin/diff.c:83

4073 +#: builtin/clone.c:324 builtin/diff.c:84

4074 #, c-format

4075 msgid "failed to stat '%s'"

4076 msgstr "échec du stat de '%s'"

4077

3984 -#: builtin/clone.c:325

4078 +#: builtin/clone.c:326

4079 #, c-format

4080 msgid "%s exists and is not a directory"

4081 msgstr "%s existe et n'est pas un répertoire"

4082

3989 -#: builtin/clone.c:339

4083 +#: builtin/clone.c:340

4084 #, c-format

4085 msgid "failed to stat %s\n"

4086 msgstr "échec du stat de %s\n"

4087

3994 -#: builtin/clone.c:361

4088 +#: builtin/clone.c:362

4089 #, c-format

4090 msgid "failed to create link '%s'"

4091 msgstr "échec de la création du lien '%s'"

4092

3999 -#: builtin/clone.c:365

4093 +#: builtin/clone.c:366

4094 #, c-format

4095 msgid "failed to copy file to '%s'"

4096 msgstr "échec de la copie vers '%s'"

4097

4004 -#: builtin/clone.c:388 builtin/clone.c:565

4098 +#: builtin/clone.c:389 builtin/clone.c:563

4099 #, c-format

4100 msgid "done.\n"

4101 msgstr "fait.\n"

@@ -4016,112 +4110,112 @@ msgstr ""

4110 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4111 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4112

4019 -#: builtin/clone.c:480

4113 +#: builtin/clone.c:478

4114 #, c-format

4115 msgid "Could not find remote branch %s to clone."

4116 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4117

4024 -#: builtin/clone.c:560

4118 +#: builtin/clone.c:558

4119 #, c-format

4120 msgid "Checking connectivity... "

4121 msgstr "Vérification de la connectivité... "

4122

4029 -#: builtin/clone.c:563

4123 +#: builtin/clone.c:561

4124 msgid "remote did not send all necessary objects"

4125 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4126

4033 -#: builtin/clone.c:627

4127 +#: builtin/clone.c:625

4128 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4129 msgstr ""

4130 "la HEAD distante réfère à une référence non existante, impossible de "

4131 "l'extraire.\n"

4132

4039 -#: builtin/clone.c:658

4133 +#: builtin/clone.c:656

4134 msgid "unable to checkout working tree"

4135 msgstr "impossible d'extraire la copie de travail"

4136

4043 -#: builtin/clone.c:768

4137 +#: builtin/clone.c:765

4138 msgid "Too many arguments."

4139 msgstr "Trop d'arguments."

4140

4047 -#: builtin/clone.c:772

4141 +#: builtin/clone.c:769

4142 msgid "You must specify a repository to clone."

4143 msgstr "Vous devez spécifier un dépôt à cloner."

4144

4051 -#: builtin/clone.c:783

4145 +#: builtin/clone.c:780

4146 #, c-format

4147 msgid "--bare and --origin %s options are incompatible."

4148 msgstr "les options --bare et --origin %s sont incompatibles."

4149

4056 -#: builtin/clone.c:786

4150 +#: builtin/clone.c:783

4151 msgid "--bare and --separate-git-dir are incompatible."

4152 msgstr "--bare et --separate-git-dir sont incompatibles."

4153

4060 -#: builtin/clone.c:799

4154 +#: builtin/clone.c:796

4155 #, c-format

4156 msgid "repository '%s' does not exist"

4157 msgstr "le dépôt '%s' n'existe pas"

4158

4065 -#: builtin/clone.c:805 builtin/fetch.c:1143

4159 +#: builtin/clone.c:802 builtin/fetch.c:1155

4160 #, c-format

4161 msgid "depth %s is not a positive number"

4162 msgstr "la profondeur %s n'est pas un entier positif"

4163

4070 -#: builtin/clone.c:815

4164 +#: builtin/clone.c:812

4165 #, c-format

4166 msgid "destination path '%s' already exists and is not an empty directory."

4167 msgstr ""

4168 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4169

4076 -#: builtin/clone.c:825

4170 +#: builtin/clone.c:822

4171 #, c-format

4172 msgid "working tree '%s' already exists."

4173 msgstr "la copie de travail '%s' existe déjà."

4174

4081 -#: builtin/clone.c:838 builtin/clone.c:850

4175 +#: builtin/clone.c:835 builtin/clone.c:847

4176 #, c-format

4177 msgid "could not create leading directories of '%s'"

4178 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4179

4086 -#: builtin/clone.c:841

4180 +#: builtin/clone.c:838

4181 #, c-format

4182 msgid "could not create work tree dir '%s'."

4183 msgstr "impossible de créer le répertoire de la copie de travail '%s'."

4184

4091 -#: builtin/clone.c:860

4185 +#: builtin/clone.c:857

4186 #, c-format

4187 msgid "Cloning into bare repository '%s'...\n"

4188 msgstr "Clonage dans le dépôt nu '%s'\n"

4189

4096 -#: builtin/clone.c:862

4190 +#: builtin/clone.c:859

4191 #, c-format

4192 msgid "Cloning into '%s'...\n"

4193 msgstr "Clonage dans '%s'...\n"

4194

4101 -#: builtin/clone.c:898

4195 +#: builtin/clone.c:895

4196 msgid "--depth is ignored in local clones; use file:// instead."

4197 msgstr ""

4198 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4199

4106 -#: builtin/clone.c:901

4200 +#: builtin/clone.c:898

4201 msgid "source repository is shallow, ignoring --local"

4202 msgstr "le dépôt source est superficiel, option --local ignorée"

4203

4110 -#: builtin/clone.c:906

4204 +#: builtin/clone.c:903

4205 msgid "--local is ignored"

4206 msgstr "--local est ignoré"

4207

4114 -#: builtin/clone.c:910

4208 +#: builtin/clone.c:907

4209 #, c-format

4210 msgid "Don't know how to clone %s"

4211 msgstr "Je ne sais pas cloner %s"

4212

4119 -#: builtin/clone.c:961 builtin/clone.c:969

4213 +#: builtin/clone.c:958 builtin/clone.c:966

4214 #, c-format

4215 msgid "Remote branch %s not found in upstream %s"

4216 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4217

4124 -#: builtin/clone.c:972

4218 +#: builtin/clone.c:969

4219 msgid "You appear to have cloned an empty repository."

4220 msgstr "Vous semblez avoir cloné un dépôt vide."

4221

@@ -4157,15 +4251,41 @@ msgstr "Remplissage d'espace entre les colonnes"

4251 msgid "--command must be the first argument"

4252 msgstr "--command doit être le premier argument"

4253

4160 -#: builtin/commit.c:36

4254 +#: builtin/commit.c:37

4255 msgid "git commit [options] [--] <pathspec>..."

4256 msgstr "git commit [options] [--] <spécification-de-chemin>..."

4257

4164 -#: builtin/commit.c:41

4258 +#: builtin/commit.c:42

4259 msgid "git status [options] [--] <pathspec>..."

4260 msgstr "git status [options] [--] <spécification-de-chemin>..."

4261

4168 -#: builtin/commit.c:46

4262 +#: builtin/commit.c:47

4263 +msgid ""

4264 +"Your name and email address were configured automatically based\n"

4265 +"on your username and hostname. Please check that they are accurate.\n"

4266 +"You can suppress this message by setting them explicitly. Run the\n"

4267 +"following command and follow the instructions in your editor to edit\n"

4268 +"your configuration file:\n"

4269 +"\n"

4270 +" git config --global --edit\n"

4271 +"\n"

4272 +"After doing this, you may fix the identity used for this commit with:\n"

4273 +"\n"

4274 +" git commit --amend --reset-author\n"

4275 +msgstr ""

4276 +"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n"

4277 +"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"

4278 +"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"

4279 +"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"

4280 +"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"

4281 +"\n"

4282 +" git config --global --edit\n"

4283 +"\n"

4284 +"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation avec :\n"

4285 +"\n"

4286 +" git commit --amend --reset-author\n"

4287 +

4288 +#: builtin/commit.c:60

4289 msgid ""

4290 "Your name and email address were configured automatically based\n"

4291 "on your username and hostname. Please check that they are accurate.\n"

@@ -4191,7 +4311,7 @@ msgstr ""

4311 "\n"

4312 " git commit --amend --reset-author\n"

4313

4194 -#: builtin/commit.c:58

4314 +#: builtin/commit.c:72

4315 msgid ""

4316 "You asked to amend the most recent commit, but doing so would make\n"

4317 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4202,7 +4322,7 @@ msgstr ""

4322 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"

4323 "supprimer complètement le commit avec \"git reset HEAD^\".\n"

4324

4205 -#: builtin/commit.c:63

4325 +#: builtin/commit.c:77

4326 msgid ""

4327 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4328 "If you wish to commit it anyway, use:\n"

@@ -4217,11 +4337,11 @@ msgstr ""

4337 " git commit --allow-empty\n"

4338 "\n"

4339

4220 -#: builtin/commit.c:70

4340 +#: builtin/commit.c:84

4341 msgid "Otherwise, please use 'git reset'\n"

4342 msgstr "Sinon, veuillez utiliser 'git reset'\n"

4343

4224 -#: builtin/commit.c:73

4344 +#: builtin/commit.c:87

4345 msgid ""

4346 "If you wish to skip this commit, use:\n"

4347 "\n"

@@ -4237,58 +4357,75 @@ msgstr ""

4357 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

4358 "des commits restants.\n"

4359

4240 -#: builtin/commit.c:288

4360 +#: builtin/commit.c:302

4361 msgid "failed to unpack HEAD tree object"

4362 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4363

4244 -#: builtin/commit.c:328

4364 +#: builtin/commit.c:342

4365 msgid "unable to create temporary index"

4366 msgstr "impossible de créer l'index temporaire"

4367

4248 -#: builtin/commit.c:334

4368 +#: builtin/commit.c:348

4369 msgid "interactive add failed"

4370 msgstr "échec de l'ajout interactif"

4371

4252 -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4372 +#: builtin/commit.c:359

4373 +msgid "unable to write index file"

4374 +msgstr "impossible d'écrire le fichier d'index"

4375 +

4376 +#: builtin/commit.c:361

4377 +msgid "unable to update temporary index"

4378 +msgstr "impossible de mettre à jour l'index temporaire"

4379 +

4380 +#: builtin/commit.c:363

4381 +msgid "Failed to update main cache tree"

4382 +msgstr "Impossible de mettre à jour l'arbre de cache principal"

4383 +

4384 +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

4385 msgid "unable to write new_index file"

4386 msgstr "impossible d'écrire le fichier new_index"

4387

4256 -#: builtin/commit.c:418

4388 +#: builtin/commit.c:443

4389 msgid "cannot do a partial commit during a merge."

4390 msgstr "impossible de faire une validation partielle pendant une fusion."

4391

4260 -#: builtin/commit.c:420

4392 +#: builtin/commit.c:445

4393 msgid "cannot do a partial commit during a cherry-pick."

4394 msgstr "impossible de faire une validation partielle pendant un picorage."

4395

4264 -#: builtin/commit.c:429

4396 +#: builtin/commit.c:454

4397 msgid "cannot read the index"

4398 msgstr "impossible de lire l'index"

4399

4268 -#: builtin/commit.c:447

4400 +#: builtin/commit.c:473

4401 msgid "unable to write temporary index file"

4402 msgstr "impossible d'écrire le fichier d'index temporaire"

4403

4272 -#: builtin/commit.c:557 builtin/commit.c:563

4404 +#: builtin/commit.c:592

4405 #, c-format

4274 -msgid "invalid commit: %s"

4275 -msgstr "commit invalide : %s"

4406 +msgid "commit '%s' lacks author header"

4407 +msgstr "entête d'auteur manquant dans le commit '%s'"

4408

4277 -#: builtin/commit.c:585

4409 +#: builtin/commit.c:594

4410 +#, c-format

4411 +msgid "commit '%s' has malformed author line"

4412 +msgstr "le commit '%s' a une ligne d'auteur malformée"

4413 +

4414 +#: builtin/commit.c:613

4415 msgid "malformed --author parameter"

4416 msgstr "paramètre --author mal formé"

4417

4281 -#: builtin/commit.c:592

4418 +#: builtin/commit.c:621

4419 #, c-format

4420 msgid "invalid date format: %s"

4421 msgstr "format de date invalide : %s"

4422

4286 -#: builtin/commit.c:609

4423 +#: builtin/commit.c:642

4424 #, c-format

4425 msgid "Malformed ident string: '%s'"

4426 msgstr "Chaîne ident mal formée : '%s'"

4427

4291 -#: builtin/commit.c:642

4428 +#: builtin/commit.c:675

4429 msgid ""

4430 "unable to select a comment character that is not used\n"

4431 "in the current commit message"

@@ -4296,43 +4433,43 @@ msgstr ""

4433 "impossible de sélectionner un caractère de commentaire\n"

4434 "qui n'est pas utilisé dans le message de validation actuel"

4435

4299 -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4436 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4437 #, c-format

4438 msgid "could not lookup commit %s"

4439 msgstr "impossible de rechercher le commit %s"

4440

4304 -#: builtin/commit.c:691 builtin/shortlog.c:273

4441 +#: builtin/commit.c:724 builtin/shortlog.c:273

4442 #, c-format

4443 msgid "(reading log message from standard input)\n"

4444 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4445

4309 -#: builtin/commit.c:693

4446 +#: builtin/commit.c:726

4447 msgid "could not read log from standard input"

4448 msgstr "impossible de lire le journal depuis l'entrée standard"

4449

4313 -#: builtin/commit.c:697

4450 +#: builtin/commit.c:730

4451 #, c-format

4452 msgid "could not read log file '%s'"

4453 msgstr "impossible de lire le fichier de journal '%s'"

4454

4318 -#: builtin/commit.c:719

4455 +#: builtin/commit.c:752

4456 msgid "could not read MERGE_MSG"

4457 msgstr "impossible de lire MERGE_MSG"

4458

4322 -#: builtin/commit.c:723

4459 +#: builtin/commit.c:756

4460 msgid "could not read SQUASH_MSG"

4461 msgstr "impossible de lire SQUASH_MSG"

4462

4326 -#: builtin/commit.c:727

4463 +#: builtin/commit.c:760

4464 #, c-format

4465 msgid "could not read '%s'"

4466 msgstr "impossible de lire '%s'"

4467

4331 -#: builtin/commit.c:798

4468 +#: builtin/commit.c:831

4469 msgid "could not write commit template"

4470 msgstr "impossible d'écrire le modèle de commit"

4471

4335 -#: builtin/commit.c:816

4472 +#: builtin/commit.c:849

4473 #, c-format

4474 msgid ""

4475 "\n"

@@ -4347,7 +4484,7 @@ msgstr ""

4484 "\t%s\n"

4485 "et essayez à nouveau.\n"

4486

4350 -#: builtin/commit.c:821

4487 +#: builtin/commit.c:854

4488 #, c-format

4489 msgid ""

4490 "\n"

@@ -4362,7 +4499,7 @@ msgstr ""

4499 "\t%s\n"

4500 "et essayez à nouveau.\n"

4501

4365 -#: builtin/commit.c:834

4502 +#: builtin/commit.c:867

4503 #, c-format

4504 msgid ""

4505 "Please enter the commit message for your changes. Lines starting\n"

@@ -4372,7 +4509,7 @@ msgstr ""

4509 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4510 "validation.\n"

4511

4375 -#: builtin/commit.c:841

4512 +#: builtin/commit.c:874

4513 #, c-format

4514 msgid ""

4515 "Please enter the commit message for your changes. Lines starting\n"

@@ -4383,147 +4520,147 @@ msgstr ""

4520 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4521 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4522

4386 -#: builtin/commit.c:855

4523 +#: builtin/commit.c:888

4524 #, c-format

4525 msgid "%sAuthor: %.*s <%.*s>"

4526 msgstr "%sAuteur : %.*s <%.*s>"

4527

4391 -#: builtin/commit.c:863

4528 +#: builtin/commit.c:896

4529 #, c-format

4530 msgid "%sDate: %s"

4531 msgstr "%sDate : %s"

4532

4396 -#: builtin/commit.c:870

4533 +#: builtin/commit.c:903

4534 #, c-format

4535 msgid "%sCommitter: %.*s <%.*s>"

4536 msgstr "%sValidateur : %.*s <%.*s>"

4537

4401 -#: builtin/commit.c:888

4538 +#: builtin/commit.c:921

4539 msgid "Cannot read index"

4540 msgstr "Impossible de lire l'index"

4541

4405 -#: builtin/commit.c:945

4542 +#: builtin/commit.c:978

4543 msgid "Error building trees"

4544 msgstr "Erreur lors de la construction des arbres"

4545

4409 -#: builtin/commit.c:960 builtin/tag.c:495

4546 +#: builtin/commit.c:993 builtin/tag.c:495

4547 #, c-format

4548 msgid "Please supply the message using either -m or -F option.\n"

4549 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4550

4414 -#: builtin/commit.c:1061

4551 +#: builtin/commit.c:1095

4552 #, c-format

4553 msgid "No existing author found with '%s'"

4554 msgstr "Aucun auteur existant trouvé avec '%s'"

4555

4419 -#: builtin/commit.c:1076 builtin/commit.c:1316

4556 +#: builtin/commit.c:1110 builtin/commit.c:1350

4557 #, c-format

4558 msgid "Invalid untracked files mode '%s'"

4559 msgstr "Mode de fichier non suivi invalide '%s'"

4560

4424 -#: builtin/commit.c:1113

4561 +#: builtin/commit.c:1147

4562 msgid "--long and -z are incompatible"

4563 msgstr "--long et -z sont incompatibles"

4564

4428 -#: builtin/commit.c:1143

4565 +#: builtin/commit.c:1177

4566 msgid "Using both --reset-author and --author does not make sense"

4567 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4568

4432 -#: builtin/commit.c:1152

4569 +#: builtin/commit.c:1186

4570 msgid "You have nothing to amend."

4571 msgstr "Il n'y a rien à corriger."

4572

4436 -#: builtin/commit.c:1155

4573 +#: builtin/commit.c:1189

4574 msgid "You are in the middle of a merge -- cannot amend."

4575 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4576

4440 -#: builtin/commit.c:1157

4577 +#: builtin/commit.c:1191

4578 msgid "You are in the middle of a cherry-pick -- cannot amend."

4579 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4580

4444 -#: builtin/commit.c:1160

4581 +#: builtin/commit.c:1194

4582 msgid "Options --squash and --fixup cannot be used together"

4583 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4584

4448 -#: builtin/commit.c:1170

4585 +#: builtin/commit.c:1204

4586 msgid "Only one of -c/-C/-F/--fixup can be used."

4587 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4588

4452 -#: builtin/commit.c:1172

4589 +#: builtin/commit.c:1206

4590 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4591 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4592

4456 -#: builtin/commit.c:1180

4593 +#: builtin/commit.c:1214

4594 msgid "--reset-author can be used only with -C, -c or --amend."

4595 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4596

4460 -#: builtin/commit.c:1197

4597 +#: builtin/commit.c:1231

4598 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4599 msgstr ""

4600 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4601 "être utilisée."

4602

4466 -#: builtin/commit.c:1199

4603 +#: builtin/commit.c:1233

4604 msgid "No paths with --include/--only does not make sense."

4605 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4606

4470 -#: builtin/commit.c:1201

4607 +#: builtin/commit.c:1235

4608 msgid "Clever... amending the last one with dirty index."

4609 msgstr "Malin... correction du dernier avec un index sale."

4610

4474 -#: builtin/commit.c:1203

4611 +#: builtin/commit.c:1237

4612 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4613 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4614

4478 -#: builtin/commit.c:1215 builtin/tag.c:727

4615 +#: builtin/commit.c:1249 builtin/tag.c:728

4616 #, c-format

4617 msgid "Invalid cleanup mode %s"

4618 msgstr "Mode de nettoyage invalide %s"

4619

4483 -#: builtin/commit.c:1220

4620 +#: builtin/commit.c:1254

4621 msgid "Paths with -a does not make sense."

4622 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4623

4487 -#: builtin/commit.c:1330 builtin/commit.c:1595

4624 +#: builtin/commit.c:1364 builtin/commit.c:1644

4625 msgid "show status concisely"

4626 msgstr "afficher le statut avec concision"

4627

4491 -#: builtin/commit.c:1332 builtin/commit.c:1597

4628 +#: builtin/commit.c:1366 builtin/commit.c:1646

4629 msgid "show branch information"

4630 msgstr "afficher l'information de branche"

4631

4495 -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4632 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4633 msgid "machine-readable output"

4634 msgstr "sortie pour traitement automatique"

4635

4499 -#: builtin/commit.c:1337 builtin/commit.c:1601

4636 +#: builtin/commit.c:1371 builtin/commit.c:1650

4637 msgid "show status in long format (default)"

4638 msgstr "afficher le statut en format long (par défaut)"

4639

4503 -#: builtin/commit.c:1340 builtin/commit.c:1604

4640 +#: builtin/commit.c:1374 builtin/commit.c:1653

4641 msgid "terminate entries with NUL"

4642 msgstr "terminer les éléments par NUL"

4643

4507 -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4508 -#: builtin/fast-export.c:706 builtin/tag.c:602

4644 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4645 +#: builtin/fast-export.c:983 builtin/tag.c:603

4646 msgid "mode"

4647 msgstr "mode"

4648

4512 -#: builtin/commit.c:1343 builtin/commit.c:1607

4649 +#: builtin/commit.c:1377 builtin/commit.c:1656

4650 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4651 msgstr ""

4652 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4653 "no. (Défaut : all)"

4654

4518 -#: builtin/commit.c:1346

4655 +#: builtin/commit.c:1380

4656 msgid "show ignored files"

4657 msgstr "afficher les fichiers ignorés"

4658

4522 -#: builtin/commit.c:1347 parse-options.h:153

4659 +#: builtin/commit.c:1381 parse-options.h:153

4660 msgid "when"

4661 msgstr "quand"

4662

4526 -#: builtin/commit.c:1348

4663 +#: builtin/commit.c:1382

4664 msgid ""

4665 "ignore changes to submodules, optional when: all, dirty, untracked. "

4666 "(Default: all)"

@@ -4531,220 +4668,212 @@ msgstr ""

4668 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4669 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4670

4534 -#: builtin/commit.c:1350

4671 +#: builtin/commit.c:1384

4672 msgid "list untracked files in columns"

4673 msgstr "afficher les fichiers non suivis en colonnes"

4674

4538 -#: builtin/commit.c:1419

4675 +#: builtin/commit.c:1471

4676 msgid "couldn't look up newly created commit"

4677 msgstr "impossible de retrouver le commit nouvellement créé"

4678

4542 -#: builtin/commit.c:1421

4679 +#: builtin/commit.c:1473

4680 msgid "could not parse newly created commit"

4681 msgstr "impossible d'analyser le commit nouvellement créé"

4682

4546 -#: builtin/commit.c:1469

4683 +#: builtin/commit.c:1518

4684 msgid "detached HEAD"

4685 msgstr "HEAD détachée"

4686

4550 -#: builtin/commit.c:1471

4687 +#: builtin/commit.c:1521

4688 msgid " (root-commit)"

4689 msgstr " (commit racine)"

4690

4554 -#: builtin/commit.c:1565

4691 +#: builtin/commit.c:1614

4692 msgid "suppress summary after successful commit"

4693 msgstr "supprimer le résumé après une validation réussie"

4694

4558 -#: builtin/commit.c:1566

4695 +#: builtin/commit.c:1615

4696 msgid "show diff in commit message template"

4697 msgstr "afficher les diff dans le modèle de message de validation"

4698

4562 -#: builtin/commit.c:1568

4699 +#: builtin/commit.c:1617

4700 msgid "Commit message options"

4701 msgstr "Options du message de validation"

4702

4566 -#: builtin/commit.c:1569 builtin/tag.c:600

4703 +#: builtin/commit.c:1618 builtin/tag.c:601

4704 msgid "read message from file"

4705 msgstr "lire le message depuis un fichier"

4706

4570 -#: builtin/commit.c:1570

4707 +#: builtin/commit.c:1619

4708 msgid "author"

4709 msgstr "auteur"

4710

4574 -#: builtin/commit.c:1570

4711 +#: builtin/commit.c:1619

4712 msgid "override author for commit"

4713 msgstr "remplacer l'auteur pour la validation"

4714

4578 -#: builtin/commit.c:1571 builtin/gc.c:286

4715 +#: builtin/commit.c:1620 builtin/gc.c:275

4716 msgid "date"

4717 msgstr "date"

4718

4582 -#: builtin/commit.c:1571

4719 +#: builtin/commit.c:1620

4720 msgid "override date for commit"

4721 msgstr "remplacer la date pour la validation"

4722

4586 -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4587 -#: builtin/notes.c:566 builtin/tag.c:598

4723 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4724 +#: builtin/notes.c:565 builtin/tag.c:599

4725 msgid "message"

4726 msgstr "message"

4727

4591 -#: builtin/commit.c:1572

4728 +#: builtin/commit.c:1621

4729 msgid "commit message"

4730 msgstr "message de validation"

4731

4595 -#: builtin/commit.c:1573

4732 +#: builtin/commit.c:1622

4733 msgid "reuse and edit message from specified commit"

4734 msgstr "réutiliser et éditer le message du commit spécifié"

4735

4599 -#: builtin/commit.c:1574

4736 +#: builtin/commit.c:1623

4737 msgid "reuse message from specified commit"

4738 msgstr "réutiliser le message du commit spécifié"

4739

4603 -#: builtin/commit.c:1575

4740 +#: builtin/commit.c:1624

4741 msgid "use autosquash formatted message to fixup specified commit"

4742 msgstr ""

4743 "utiliser un message au format autosquash pour corriger le commit spécifié"

4744

4608 -#: builtin/commit.c:1576

4745 +#: builtin/commit.c:1625

4746 msgid "use autosquash formatted message to squash specified commit"

4747 msgstr ""

4748 "utiliser un message au format autosquash pour compresser le commit spécifié"

4749

4613 -#: builtin/commit.c:1577

4750 +#: builtin/commit.c:1626

4751 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4752 msgstr ""

4753 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4754

4618 -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4755 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4756 msgid "add Signed-off-by:"

4757 msgstr "ajouter une entrée Signed-off-by :"

4758

4622 -#: builtin/commit.c:1579

4759 +#: builtin/commit.c:1628

4760 msgid "use specified template file"

4761 msgstr "utiliser le fichier de modèle spécifié"

4762

4626 -#: builtin/commit.c:1580

4763 +#: builtin/commit.c:1629

4764 msgid "force edit of commit"

4765 msgstr "forcer l'édition du commit"

4766

4630 -#: builtin/commit.c:1581

4767 +#: builtin/commit.c:1630

4768 msgid "default"

4769 msgstr "défaut"

4770

4634 -#: builtin/commit.c:1581 builtin/tag.c:603

4771 +#: builtin/commit.c:1630 builtin/tag.c:604

4772 msgid "how to strip spaces and #comments from message"

4773 msgstr "comment éliminer les espaces et les commentaires # du message"

4774

4638 -#: builtin/commit.c:1582

4775 +#: builtin/commit.c:1631

4776 msgid "include status in commit message template"

4777 msgstr "inclure le statut dans le modèle de message de validation"

4778

4642 -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4643 -#: builtin/tag.c:604

4779 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4780 +#: builtin/tag.c:605

4781 msgid "key-id"

4782 msgstr "id de clé"

4783

4647 -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4784 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4785 msgid "GPG sign commit"

4786 msgstr "signer la validation avec GPG"

4787

4651 -#: builtin/commit.c:1587

4788 +#: builtin/commit.c:1636

4789 msgid "Commit contents options"

4790 msgstr "Valider les options des contenus"

4791

4655 -#: builtin/commit.c:1588

4792 +#: builtin/commit.c:1637

4793 msgid "commit all changed files"

4794 msgstr "valider tous les fichiers modifiés"

4795

4659 -#: builtin/commit.c:1589

4796 +#: builtin/commit.c:1638

4797 msgid "add specified files to index for commit"

4798 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4799

4663 -#: builtin/commit.c:1590

4800 +#: builtin/commit.c:1639

4801 msgid "interactively add files"

4802 msgstr "ajouter des fichiers en mode interactif"

4803

4667 -#: builtin/commit.c:1591

4804 +#: builtin/commit.c:1640

4805 msgid "interactively add changes"

4806 msgstr "ajouter les modifications en mode interactif"

4807

4671 -#: builtin/commit.c:1592

4808 +#: builtin/commit.c:1641

4809 msgid "commit only specified files"

4810 msgstr "valider seulement les fichiers spécifiés"

4811

4675 -#: builtin/commit.c:1593

4812 +#: builtin/commit.c:1642

4813 msgid "bypass pre-commit hook"

4814 msgstr "éviter d'utiliser le crochet pre-commit"

4815

4679 -#: builtin/commit.c:1594

4816 +#: builtin/commit.c:1643

4817 msgid "show what would be committed"

4818 msgstr "afficher ce qui serait validé"

4819

4683 -#: builtin/commit.c:1605

4820 +#: builtin/commit.c:1654

4821 msgid "amend previous commit"

4822 msgstr "corriger la validation précédente"

4823

4687 -#: builtin/commit.c:1606

4824 +#: builtin/commit.c:1655

4825 msgid "bypass post-rewrite hook"

4826 msgstr "éviter d'utiliser le crochet post-rewrite"

4827

4691 -#: builtin/commit.c:1611

4828 +#: builtin/commit.c:1660

4829 msgid "ok to record an empty change"

4830 msgstr "accepter d'enregistrer une modification vide"

4831

4695 -#: builtin/commit.c:1613

4832 +#: builtin/commit.c:1662

4833 msgid "ok to record a change with an empty message"

4834 msgstr "accepter d'enregistrer une modification avec un message vide"

4835

4699 -#: builtin/commit.c:1641

4836 +#: builtin/commit.c:1691

4837 msgid "could not parse HEAD commit"

4838 msgstr "impossible d'analyser le commit HEAD"

4839

4703 -#: builtin/commit.c:1680 builtin/merge.c:518

4840 +#: builtin/commit.c:1730 builtin/merge.c:518

4841 #, c-format

4842 msgid "could not open '%s' for reading"

4843 msgstr "impossible d'ouvrir '%s' en lecture"

4844

4708 -#: builtin/commit.c:1687

4845 +#: builtin/commit.c:1737

4846 #, c-format

4847 msgid "Corrupt MERGE_HEAD file (%s)"

4848 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4849

4713 -#: builtin/commit.c:1694

4850 +#: builtin/commit.c:1744

4851 msgid "could not read MERGE_MODE"

4852 msgstr "impossible de lire MERGE_MODE"

4853

4717 -#: builtin/commit.c:1713

4854 +#: builtin/commit.c:1763

4855 #, c-format

4856 msgid "could not read commit message: %s"

4857 msgstr "impossible de lire le message de validation : %s"

4858

4722 -#: builtin/commit.c:1724

4859 +#: builtin/commit.c:1774

4860 #, c-format

4861 msgid "Aborting commit; you did not edit the message.\n"

4862 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4863

4727 -#: builtin/commit.c:1729

4864 +#: builtin/commit.c:1779

4865 #, c-format

4866 msgid "Aborting commit due to empty commit message.\n"

4867 msgstr "Abandon de la validation du à un message de validation vide\n"

4868

4732 -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4869 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4870 msgid "failed to write commit object"

4871 msgstr "échec de l'écriture de l'objet commit"

4872

4736 -#: builtin/commit.c:1756

4737 -msgid "cannot lock HEAD ref"

4738 -msgstr "impossible de verrouiller la référence HEAD"

4739 -

4740 -#: builtin/commit.c:1769

4741 -msgid "cannot update HEAD ref"

4742 -msgstr "impossible de mettre à jour la référence HEAD"

4743 -

4744 -#: builtin/commit.c:1780

4873 +#: builtin/commit.c:1827

4874 msgid ""

4875 "Repository has been updated, but unable to write\n"

4747 -"new_index file. Check that disk is not full or quota is\n"

4876 +"new_index file. Check that disk is not full and quota is\n"

4877 "not exceeded, and then \"git reset HEAD\" to recover."

4878 msgstr ""

4879 "Le dépôt a été mis à jour, mais impossible d'écrire le fichier\n"

@@ -4880,63 +5009,87 @@ msgstr "terminer les valeurs avec un caractère NUL"

5009 msgid "respect include directives on lookup"

5010 msgstr "respecter les directives d'inclusion lors de la recherche"

5011

4883 -#: builtin/count-objects.c:82

5012 +#: builtin/config.c:315

5013 +msgid "unable to parse default color value"

5014 +msgstr "impossible de lire la valeur de couleur par défaut"

5015 +

5016 +#: builtin/config.c:455

5017 +#, c-format

5018 +msgid ""

5019 +"# This is Git's per-user configuration file.\n"

5020 +"[core]\n"

5021 +"# Please adapt and uncomment the following lines:\n"

5022 +"#\tuser = %s\n"

5023 +"#\temail = %s\n"

5024 +msgstr ""

5025 +"# Ceci est le fichier de configuration personnel.\n"

5026 +"[core]\n"

5027 +"# Veuillez adapter et décommenter les lignes suivantes :\n"

5028 +"#\tuser = %s\n"

5029 +"#\temail = %s\n"

5030 +

5031 +#: builtin/config.c:590

5032 +#, c-format

5033 +msgid "cannot create configuration file %s"

5034 +msgstr "création impossible du fichier de configuration '%s'"

5035 +

5036 +#: builtin/count-objects.c:55

5037 msgid "git count-objects [-v] [-H | --human-readable]"

5038 msgstr "git count-objects [-v] [-H | --human-readable]"

5039

4887 -#: builtin/count-objects.c:97

5040 +#: builtin/count-objects.c:65

5041 msgid "print sizes in human readable format"

5042 msgstr "affiche les tailles dans un format humainement lisible"

5043

4891 -#: builtin/describe.c:16

5044 +#: builtin/describe.c:17

5045 msgid "git describe [options] <commit-ish>*"

5046 msgstr "git describe [options] <commit ou apparenté>*"

5047

4895 -#: builtin/describe.c:17

5048 +#: builtin/describe.c:18

5049 msgid "git describe [options] --dirty"

5050 msgstr "git describe [options] --dirty"

5051

4899 -#: builtin/describe.c:216

5052 +#: builtin/describe.c:217

5053 #, c-format

5054 msgid "annotated tag %s not available"

5055 msgstr "l'étiquette annotée %s n'est pas disponible"

5056

4904 -#: builtin/describe.c:220

5057 +#: builtin/describe.c:221

5058 #, c-format

5059 msgid "annotated tag %s has no embedded name"

5060 msgstr "l'étiquette annotée %s n'a pas de nom embarqué"

5061

4909 -#: builtin/describe.c:222

5062 +#: builtin/describe.c:223

5063 #, c-format

5064 msgid "tag '%s' is really '%s' here"

5065 msgstr "l'étiquette '%s' est en fait '%s'"

5066

4914 -#: builtin/describe.c:249

5067 +#: builtin/describe.c:250 builtin/log.c:452

5068 #, c-format

5069 msgid "Not a valid object name %s"

5070 msgstr "%s n'est pas un nom d'objet valide"

5071

4919 -#: builtin/describe.c:252

5072 +#: builtin/describe.c:253

5073 #, c-format

5074 msgid "%s is not a valid '%s' object"

5075 msgstr "%s n'est pas un objet '%s' valide"

5076

4924 -#: builtin/describe.c:269

5077 +#: builtin/describe.c:270

5078 #, c-format

5079 msgid "no tag exactly matches '%s'"

5080 msgstr "aucune étiquette ne correspond parfaitement à '%s'"

5081

4929 -#: builtin/describe.c:271

5082 +#: builtin/describe.c:272

5083 #, c-format

5084 msgid "searching to describe %s\n"

5085 msgstr "recherche de la description de %s\n"

5086

4934 -#: builtin/describe.c:318

5087 +#: builtin/describe.c:319

5088 #, c-format

5089 msgid "finished search at %s\n"

5090 msgstr "recherche terminée à %s\n"

5091

4939 -#: builtin/describe.c:345

5092 +#: builtin/describe.c:346

5093 #, c-format

5094 msgid ""

5095 "No annotated tags can describe '%s'.\n"

@@ -4945,7 +5098,7 @@ msgstr ""

5098 "Aucune étiquette annotée ne peut décrire '%s'.\n"

5099 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."

5100

4948 -#: builtin/describe.c:349

5101 +#: builtin/describe.c:350

5102 #, c-format

5103 msgid ""

5104 "No tags can describe '%s'.\n"

@@ -4954,12 +5107,12 @@ msgstr ""

5107 "Aucune étiquette ne peut décrire '%s'.\n"

5108 "Essayez --always, ou créez des étiquettes."

5109

4957 -#: builtin/describe.c:370

5110 +#: builtin/describe.c:371

5111 #, c-format

5112 msgid "traversed %lu commits\n"

5113 msgstr "%lu commits parcourus\n"

5114

4962 -#: builtin/describe.c:373

5115 +#: builtin/describe.c:374

5116 #, c-format

5117 msgid ""

5118 "more than %i tags found; listed %i most recent\n"

@@ -4969,145 +5122,149 @@ msgstr ""

5122 "affichées\n"

5123 "abandon de la recherche à %s\n"

5124

4972 -#: builtin/describe.c:395

5125 +#: builtin/describe.c:396

5126 msgid "find the tag that comes after the commit"

5127 msgstr "rechercher l'étiquette qui suit le commit"

5128

4976 -#: builtin/describe.c:396

5129 +#: builtin/describe.c:397

5130 msgid "debug search strategy on stderr"

5131 msgstr "déboguer la stratégie de recherche sur stderr"

5132

4980 -#: builtin/describe.c:397

5133 +#: builtin/describe.c:398

5134 msgid "use any ref"

5135 msgstr "utiliser n'importe quelle référence"

5136

4984 -#: builtin/describe.c:398

5137 +#: builtin/describe.c:399

5138 msgid "use any tag, even unannotated"

5139 msgstr "utiliser n'importe quelle étiquette, même non-annotée"

5140

4988 -#: builtin/describe.c:399

5141 +#: builtin/describe.c:400

5142 msgid "always use long format"

5143 msgstr "toujours utiliser le format long"

5144

4992 -#: builtin/describe.c:400

5145 +#: builtin/describe.c:401

5146 msgid "only follow first parent"

5147 msgstr "ne suivre que le premier parent"

5148

4996 -#: builtin/describe.c:403

5149 +#: builtin/describe.c:404

5150 msgid "only output exact matches"

5151 msgstr "n'afficher que les correspondances exactes"

5152

5000 -#: builtin/describe.c:405

5153 +#: builtin/describe.c:406

5154 msgid "consider <n> most recent tags (default: 10)"

5155 msgstr ""

5156 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"

5157

5005 -#: builtin/describe.c:407

5158 +#: builtin/describe.c:408

5159 msgid "only consider tags matching <pattern>"

5160 msgstr "ne considérer que les étiquettes correspondant à <motif>"

5161

5009 -#: builtin/describe.c:409 builtin/name-rev.c:318

5162 +#: builtin/describe.c:410 builtin/name-rev.c:318

5163 msgid "show abbreviated commit object as fallback"

5164 msgstr "afficher les objets commits abrégés en dernier recours"

5165

5013 -#: builtin/describe.c:410

5166 +#: builtin/describe.c:411

5167 msgid "mark"

5168 msgstr "marque"

5169

5017 -#: builtin/describe.c:411

5170 +#: builtin/describe.c:412

5171 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

5172 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"

5173

5021 -#: builtin/describe.c:429

5174 +#: builtin/describe.c:430

5175 msgid "--long is incompatible with --abbrev=0"

5176 msgstr "--long et --abbrev=0 sont incompatibles"

5177

5025 -#: builtin/describe.c:455

5178 +#: builtin/describe.c:456

5179 msgid "No names found, cannot describe anything."

5180 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."

5181

5029 -#: builtin/describe.c:475

5182 +#: builtin/describe.c:476

5183 msgid "--dirty is incompatible with commit-ishes"

5184 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"

5185

5033 -#: builtin/diff.c:85

5186 +#: builtin/diff.c:86

5187 #, c-format

5188 msgid "'%s': not a regular file or symlink"

5189 msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"

5190

5038 -#: builtin/diff.c:236

5191 +#: builtin/diff.c:237

5192 #, c-format

5193 msgid "invalid option: %s"

5194 msgstr "option invalide : %s"

5195

5043 -#: builtin/diff.c:357

5196 +#: builtin/diff.c:358

5197 msgid "Not a git repository"

5198 msgstr "Ce n'est pas un dépôt git !"

5199

5047 -#: builtin/diff.c:400

5200 +#: builtin/diff.c:401

5201 #, c-format

5202 msgid "invalid object '%s' given."

5203 msgstr "objet spécifié '%s' invalide."

5204

5052 -#: builtin/diff.c:409

5205 +#: builtin/diff.c:410

5206 #, c-format

5207 msgid "more than two blobs given: '%s'"

5208 msgstr "plus de deux blobs spécifiés : '%s'"

5209

5057 -#: builtin/diff.c:416

5210 +#: builtin/diff.c:417

5211 #, c-format

5212 msgid "unhandled object '%s' given."

5213 msgstr "objet non géré '%s' spécifié."

5214

5062 -#: builtin/fast-export.c:23

5215 +#: builtin/fast-export.c:24

5216 msgid "git fast-export [rev-list-opts]"

5217 msgstr "git fast-export [options-de-liste-de-révisions]"

5218

5066 -#: builtin/fast-export.c:702

5219 +#: builtin/fast-export.c:979

5220 msgid "show progress after <n> objects"

5221 msgstr "afficher la progression après <n> objets"

5222

5070 -#: builtin/fast-export.c:704

5223 +#: builtin/fast-export.c:981

5224 msgid "select handling of signed tags"

5225 msgstr "sélectionner la gestion des étiquettes signées"

5226

5074 -#: builtin/fast-export.c:707

5227 +#: builtin/fast-export.c:984

5228 msgid "select handling of tags that tag filtered objects"

5229 msgstr ""

5230 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"

5231

5079 -#: builtin/fast-export.c:710

5232 +#: builtin/fast-export.c:987

5233 msgid "Dump marks to this file"

5234 msgstr "Enregistrer les marques dans ce fichier"

5235

5083 -#: builtin/fast-export.c:712

5236 +#: builtin/fast-export.c:989

5237 msgid "Import marks from this file"

5238 msgstr "importer les marques depuis ce fichier"

5239

5087 -#: builtin/fast-export.c:714

5240 +#: builtin/fast-export.c:991

5241 msgid "Fake a tagger when tags lack one"

5242 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"

5243

5091 -#: builtin/fast-export.c:716

5244 +#: builtin/fast-export.c:993

5245 msgid "Output full tree for each commit"

5246 msgstr "Afficher l'arbre complet pour chaque commit"

5247

5095 -#: builtin/fast-export.c:718

5248 +#: builtin/fast-export.c:995

5249 msgid "Use the done feature to terminate the stream"

5250 msgstr "Utiliser la fonction \"done\" pour terminer le flux"

5251

5099 -#: builtin/fast-export.c:719

5252 +#: builtin/fast-export.c:996

5253 msgid "Skip output of blob data"

5254 msgstr "Sauter l'affichage de données de blob"

5255

5103 -#: builtin/fast-export.c:720

5256 +#: builtin/fast-export.c:997

5257 msgid "refspec"

5258 msgstr "spécificateur de référence"

5259

5107 -#: builtin/fast-export.c:721

5260 +#: builtin/fast-export.c:998

5261 msgid "Apply refspec to exported refs"

5262 msgstr "Appliquer le spécificateur de référence aux références exportées"

5263

5264 +#: builtin/fast-export.c:999

5265 +msgid "anonymize output"

5266 +msgstr "anonymise la sortie"

5267 +

5268 #: builtin/fetch.c:20

5269 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5270 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"

@@ -5182,7 +5339,7 @@ msgstr "approfondir l'historique d'un clone superficiel"

5339 msgid "convert to a complete repository"

5340 msgstr "convertir en un dépôt complet"

5341

5185 -#: builtin/fetch.c:118 builtin/log.c:1205

5342 +#: builtin/fetch.c:118 builtin/log.c:1208

5343 msgid "dir"

5344 msgstr "dir"

5345

@@ -5210,78 +5367,78 @@ msgstr "spécifier une correspondance de référence pour la récupération"

5367 msgid "Couldn't find remote ref HEAD"

5368 msgstr "impossible de trouver la référence HEAD distante"

5369

5213 -#: builtin/fetch.c:440

5370 +#: builtin/fetch.c:454

5371 #, c-format

5372 msgid "object %s not found"

5373 msgstr "objet %s non trouvé"

5374

5218 -#: builtin/fetch.c:445

5375 +#: builtin/fetch.c:459

5376 msgid "[up to date]"

5377 msgstr "[à jour]"

5378

5222 -#: builtin/fetch.c:459

5379 +#: builtin/fetch.c:473

5380 #, c-format

5381 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5382 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5383

5227 -#: builtin/fetch.c:460 builtin/fetch.c:546

5384 +#: builtin/fetch.c:474 builtin/fetch.c:560

5385 msgid "[rejected]"

5386 msgstr "[rejeté]"

5387

5231 -#: builtin/fetch.c:471

5388 +#: builtin/fetch.c:485

5389 msgid "[tag update]"

5390 msgstr "[mise à jour de l'étiquette]"

5391

5235 -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5392 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5393 msgid " (unable to update local ref)"

5394 msgstr " (impossible de mettre à jour la référence locale)"

5395

5239 -#: builtin/fetch.c:491

5396 +#: builtin/fetch.c:505

5397 msgid "[new tag]"

5398 msgstr "[nouvelle étiquette]"

5399

5243 -#: builtin/fetch.c:494

5400 +#: builtin/fetch.c:508

5401 msgid "[new branch]"

5402 msgstr "[nouvelle branche]"

5403

5247 -#: builtin/fetch.c:497

5404 +#: builtin/fetch.c:511

5405 msgid "[new ref]"

5406 msgstr "[nouvelle référence]"

5407

5251 -#: builtin/fetch.c:542

5408 +#: builtin/fetch.c:556

5409 msgid "unable to update local ref"

5410 msgstr "impossible de mettre à jour la référence locale"

5411

5255 -#: builtin/fetch.c:542

5412 +#: builtin/fetch.c:556

5413 msgid "forced update"

5414 msgstr "mise à jour forcée"

5415

5259 -#: builtin/fetch.c:548

5416 +#: builtin/fetch.c:562

5417 msgid "(non-fast-forward)"

5418 msgstr "(pas d'avance rapide)"

5419

5263 -#: builtin/fetch.c:581 builtin/fetch.c:814

5420 +#: builtin/fetch.c:595 builtin/fetch.c:828

5421 #, c-format

5422 msgid "cannot open %s: %s\n"

5423 msgstr "impossible d'ouvrir %s : %s\n"

5424

5268 -#: builtin/fetch.c:590

5425 +#: builtin/fetch.c:604

5426 #, c-format

5427 msgid "%s did not send all necessary objects\n"

5428 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

5429

5273 -#: builtin/fetch.c:608

5430 +#: builtin/fetch.c:622

5431 #, c-format

5432 msgid "reject %s because shallow roots are not allowed to be updated"

5433 msgstr ""

5434 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

5435

5279 -#: builtin/fetch.c:696 builtin/fetch.c:779

5436 +#: builtin/fetch.c:710 builtin/fetch.c:793

5437 #, c-format

5438 msgid "From %.*s\n"

5439 msgstr "Depuis %.*s\n"

5440

5284 -#: builtin/fetch.c:707

5441 +#: builtin/fetch.c:721

5442 #, c-format

5443 msgid ""

5444 "some local refs could not be updated; try running\n"

@@ -5290,55 +5447,55 @@ msgstr ""

5447 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

5448 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

5449

5293 -#: builtin/fetch.c:759

5450 +#: builtin/fetch.c:773

5451 #, c-format

5452 msgid " (%s will become dangling)"

5453 msgstr " (%s sera en suspens)"

5454

5298 -#: builtin/fetch.c:760

5455 +#: builtin/fetch.c:774

5456 #, c-format

5457 msgid " (%s has become dangling)"

5458 msgstr " (%s est devenu en suspens)"

5459

5303 -#: builtin/fetch.c:784

5460 +#: builtin/fetch.c:798

5461 msgid "[deleted]"

5462 msgstr "[supprimé]"

5463

5307 -#: builtin/fetch.c:785 builtin/remote.c:1059

5464 +#: builtin/fetch.c:799 builtin/remote.c:1063

5465 msgid "(none)"

5466 msgstr "(aucun(e))"

5467

5311 -#: builtin/fetch.c:804

5468 +#: builtin/fetch.c:818

5469 #, c-format

5470 msgid "Refusing to fetch into current branch %s of non-bare repository"

5471 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

5472

5316 -#: builtin/fetch.c:823

5473 +#: builtin/fetch.c:837

5474 #, c-format

5475 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5476 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

5477

5321 -#: builtin/fetch.c:826

5478 +#: builtin/fetch.c:840

5479 #, c-format

5480 msgid "Option \"%s\" is ignored for %s\n"

5481 msgstr "L'option \"%s\" est ignorée pour %s\n"

5482

5326 -#: builtin/fetch.c:882

5483 +#: builtin/fetch.c:896

5484 #, c-format

5485 msgid "Don't know how to fetch from %s"

5486 msgstr "Je ne sais pas récupérer depuis %s"

5487

5331 -#: builtin/fetch.c:1044

5488 +#: builtin/fetch.c:1058

5489 #, c-format

5490 msgid "Fetching %s\n"

5491 msgstr "Récupération de %s\n"

5492

5336 -#: builtin/fetch.c:1046 builtin/remote.c:90

5493 +#: builtin/fetch.c:1060 builtin/remote.c:90

5494 #, c-format

5495 msgid "Could not fetch %s"

5496 msgstr "Impossible de récupérer %s"

5497

5341 -#: builtin/fetch.c:1064

5498 +#: builtin/fetch.c:1078

5499 msgid ""

5500 "No remote repository specified. Please, specify either a URL or a\n"

5501 "remote name from which new revisions should be fetched."

@@ -5346,32 +5503,32 @@ msgstr ""

5503 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

5504 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

5505

5349 -#: builtin/fetch.c:1087

5506 +#: builtin/fetch.c:1101

5507 msgid "You need to specify a tag name."

5508 msgstr "Vous devez spécifier un nom d'étiquette."

5509

5353 -#: builtin/fetch.c:1131

5510 +#: builtin/fetch.c:1143

5511 msgid "--depth and --unshallow cannot be used together"

5512 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

5513

5357 -#: builtin/fetch.c:1133

5514 +#: builtin/fetch.c:1145

5515 msgid "--unshallow on a complete repository does not make sense"

5516 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

5517

5361 -#: builtin/fetch.c:1156

5518 +#: builtin/fetch.c:1168

5519 msgid "fetch --all does not take a repository argument"

5520 msgstr "fetch --all n'accepte pas d'argument de dépôt"

5521

5365 -#: builtin/fetch.c:1158

5522 +#: builtin/fetch.c:1170

5523 msgid "fetch --all does not make sense with refspecs"

5524 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

5525

5369 -#: builtin/fetch.c:1169

5526 +#: builtin/fetch.c:1181

5527 #, c-format

5528 msgid "No such remote or remote group: %s"

5529 msgstr "distant ou groupe distant inexistant : %s"

5530

5374 -#: builtin/fetch.c:1177

5531 +#: builtin/fetch.c:1189

5532 msgid "Fetching a group and specifying refspecs does not make sense"

5533 msgstr ""

5534 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -5383,8 +5540,8 @@ msgstr ""

5540 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"

5541

5542 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5386 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5387 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5543 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

5544 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5545 #: parse-options.h:132 parse-options.h:239

5546 msgid "n"

5547 msgstr "n"

@@ -5409,100 +5566,104 @@ msgstr "utiliser <texte> comme début de message"

5566 msgid "file to read from"

5567 msgstr "fichier d'où lire"

5568

5412 -#: builtin/for-each-ref.c:1051

5569 +#: builtin/for-each-ref.c:676

5570 +msgid "unable to parse format"

5571 +msgstr "impossible d'analyser le format"

5572 +

5573 +#: builtin/for-each-ref.c:1057

5574 msgid "git for-each-ref [options] [<pattern>]"

5575 msgstr "git for-each-ref [options] [<motif>]"

5576

5416 -#: builtin/for-each-ref.c:1066

5577 +#: builtin/for-each-ref.c:1072

5578 msgid "quote placeholders suitably for shells"

5579 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

5580

5420 -#: builtin/for-each-ref.c:1068

5581 +#: builtin/for-each-ref.c:1074

5582 msgid "quote placeholders suitably for perl"

5583 msgstr "échapper les champs réservés pour perl"

5584

5424 -#: builtin/for-each-ref.c:1070

5585 +#: builtin/for-each-ref.c:1076

5586 msgid "quote placeholders suitably for python"

5587 msgstr "échapper les champs réservés pour python"

5588

5428 -#: builtin/for-each-ref.c:1072

5589 +#: builtin/for-each-ref.c:1078

5590 msgid "quote placeholders suitably for tcl"

5591 msgstr "échapper les champs réservés pour tcl"

5592

5432 -#: builtin/for-each-ref.c:1075

5593 +#: builtin/for-each-ref.c:1081

5594 msgid "show only <n> matched refs"

5595 msgstr "n'afficher que <n> références correspondant"

5596

5436 -#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5597 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438

5598 msgid "format"

5599 msgstr "format"

5600

5440 -#: builtin/for-each-ref.c:1076

5601 +#: builtin/for-each-ref.c:1082

5602 msgid "format to use for the output"

5603 msgstr "format à utiliser pour la sortie"

5604

5444 -#: builtin/for-each-ref.c:1077

5605 +#: builtin/for-each-ref.c:1083

5606 msgid "key"

5607 msgstr "clé"

5608

5448 -#: builtin/for-each-ref.c:1078

5609 +#: builtin/for-each-ref.c:1084

5610 msgid "field name to sort on"

5611 msgstr "nom du champ servant à trier"

5612

5452 -#: builtin/fsck.c:147 builtin/prune.c:172

5613 +#: builtin/fsck.c:147 builtin/prune.c:136

5614 msgid "Checking connectivity"

5615 msgstr "Vérification de la connectivité"

5616

5456 -#: builtin/fsck.c:538

5617 +#: builtin/fsck.c:540

5618 msgid "Checking object directories"

5619 msgstr "Vérification des répertoires d'objet"

5620

5460 -#: builtin/fsck.c:601

5621 +#: builtin/fsck.c:603

5622 msgid "git fsck [options] [<object>...]"

5623 msgstr "git fsck [options] [<objet>...]"

5624

5464 -#: builtin/fsck.c:607

5625 +#: builtin/fsck.c:609

5626 msgid "show unreachable objects"

5627 msgstr "afficher les objets inaccessibles"

5628

5468 -#: builtin/fsck.c:608

5629 +#: builtin/fsck.c:610

5630 msgid "show dangling objects"

5631 msgstr "afficher les objets en suspens"

5632

5472 -#: builtin/fsck.c:609

5633 +#: builtin/fsck.c:611

5634 msgid "report tags"

5635 msgstr "afficher les étiquettes"

5636

5476 -#: builtin/fsck.c:610

5637 +#: builtin/fsck.c:612

5638 msgid "report root nodes"

5639 msgstr "signaler les nœuds racines"

5640

5480 -#: builtin/fsck.c:611

5641 +#: builtin/fsck.c:613

5642 msgid "make index objects head nodes"

5643 msgstr "considérer les objets de l'index comme nœuds tête"

5644

5645 # translated from man page

5485 -#: builtin/fsck.c:612

5646 +#: builtin/fsck.c:614

5647 msgid "make reflogs head nodes (default)"

5648 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

5649

5489 -#: builtin/fsck.c:613

5650 +#: builtin/fsck.c:615

5651 msgid "also consider packs and alternate objects"

5652 msgstr "inspecter aussi les objets pack et alternatifs"

5653

5493 -#: builtin/fsck.c:614

5654 +#: builtin/fsck.c:616

5655 msgid "enable more strict checking"

5656 msgstr "activer une vérification plus strict"

5657

5497 -#: builtin/fsck.c:616

5658 +#: builtin/fsck.c:618

5659 msgid "write dangling objects in .git/lost-found"

5660 msgstr "écrire les objets en suspens dans .git/lost-found"

5661

5501 -#: builtin/fsck.c:617 builtin/prune.c:144

5662 +#: builtin/fsck.c:619 builtin/prune.c:108

5663 msgid "show progress"

5664 msgstr "afficher la progression"

5665

5505 -#: builtin/fsck.c:667

5666 +#: builtin/fsck.c:669

5667 msgid "Checking objects"

5668 msgstr "Vérification des objets"

5669

@@ -5510,52 +5671,52 @@ msgstr "Vérification des objets"

5671 msgid "git gc [options]"

5672 msgstr "git gc [options]"

5673

5513 -#: builtin/gc.c:91

5674 +#: builtin/gc.c:79

5675 #, c-format

5515 -msgid "Invalid %s: '%s'"

5516 -msgstr "%s invalide : '%s'"

5676 +msgid "Invalid gc.pruneexpire: '%s'"

5677 +msgstr "gc.pruneexpire invalide : '%s'"

5678

5518 -#: builtin/gc.c:118

5679 +#: builtin/gc.c:107

5680 #, c-format

5681 msgid "insanely long object directory %.*s"

5682 msgstr "objet répertoire démentiellement long %.*s"

5683

5523 -#: builtin/gc.c:287

5684 +#: builtin/gc.c:276

5685 msgid "prune unreferenced objects"

5686 msgstr "éliminer les objets non référencés"

5687

5527 -#: builtin/gc.c:289

5688 +#: builtin/gc.c:278

5689 msgid "be more thorough (increased runtime)"

5690 msgstr "être plus consciencieux (durée de traitement allongée)"

5691

5531 -#: builtin/gc.c:290

5692 +#: builtin/gc.c:279

5693 msgid "enable auto-gc mode"

5694 msgstr "activer le mode auto-gc"

5695

5535 -#: builtin/gc.c:291

5696 +#: builtin/gc.c:280

5697 msgid "force running gc even if there may be another gc running"

5698 msgstr ""

5699 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

5700 "tourne déjà"

5701

5541 -#: builtin/gc.c:332

5702 +#: builtin/gc.c:321

5703 #, c-format

5704 msgid "Auto packing the repository in background for optimum performance.\n"

5705 msgstr ""

5706 "Compression automatique du dépôt en tâche de fond pour optimiser les "

5707 "performances.\n"

5708

5548 -#: builtin/gc.c:334

5709 +#: builtin/gc.c:323

5710 #, c-format

5711 msgid "Auto packing the repository for optimum performance.\n"

5712 msgstr "Compression du dépôt pour optimiser les performances.\n"

5713

5553 -#: builtin/gc.c:335

5714 +#: builtin/gc.c:324

5715 #, c-format

5716 msgid "See \"git help gc\" for manual housekeeping.\n"

5717 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

5718

5558 -#: builtin/gc.c:353

5719 +#: builtin/gc.c:342

5720 #, c-format

5721 msgid ""

5722 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5563,7 +5724,7 @@ msgstr ""

5724 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

5725 "(utilisez --force si ce n'est pas le cas)"

5726

5566 -#: builtin/gc.c:375

5727 +#: builtin/gc.c:364

l10n: fr.po (2296t) update for version 2.2.0