3d8b14c2bc · 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: 2015-12-22 22:50+0800\n"

77 -"PO-Revision-Date: 2015-12-24 07:36+0100\n"

76 +"POT-Creation-Date: 2016-02-28 20:31+0800\n"

77 +"PO-Revision-Date: 2016-02-28 22:44+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"

@@ -96,7 +96,7 @@ msgstr ""

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

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

98

99 -#: advice.c:101 builtin/merge.c:1225

99 +#: advice.c:101 builtin/merge.c:1226

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

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

102

@@ -140,7 +140,7 @@ msgstr "fmt"

140 msgid "archive format"

141 msgstr "format d'archive"

142

143 -#: archive.c:430 builtin/log.c:1229

143 +#: archive.c:430 builtin/log.c:1232

144 msgid "prefix"

145 msgstr "préfixe"

146

@@ -148,10 +148,10 @@ msgstr "préfixe"

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

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

150

151 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 builtin/blame.c:2536

152 -#: builtin/config.c:58 builtin/fast-export.c:987 builtin/fast-export.c:989

153 -#: builtin/grep.c:707 builtin/hash-object.c:99 builtin/ls-files.c:446

154 -#: builtin/ls-files.c:449 builtin/notes.c:395 builtin/notes.c:558

151 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548

152 +#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989

153 +#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459

154 +#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561

155 #: builtin/read-tree.c:109 parse-options.h:153

156 msgid "file"

157 msgstr "fichier"

@@ -184,7 +184,7 @@ msgstr "compression efficace"

184 msgid "list supported archive formats"

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

186

187 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

187 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

188 msgid "repo"

189 msgstr "dépôt"

190

@@ -192,7 +192,7 @@ msgstr "dépôt"

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

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

194

195 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

195 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

196 msgid "command"

197 msgstr "commande"

198

@@ -200,7 +200,7 @@ msgstr "commande"

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

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

202

203 -#: attr.c:265

203 +#: attr.c:263

204 msgid ""

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

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

@@ -208,90 +208,107 @@ msgstr ""

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

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

210

211 -#: branch.c:61

211 +#: branch.c:53

212 +#, c-format

213 +msgid ""

214 +"\n"

215 +"After fixing the error cause you may try to fix up\n"

216 +"the remote tracking information by invoking\n"

217 +"\"git branch --set-upstream-to=%s%s%s\"."

218 +msgstr ""

219 +"\n"

220 +"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"

221 +"l'information de suivi distant en invoquant\n"

222 +"\"git branch --setup-upstream-to=%s%s%s\"."

223 +

224 +#: branch.c:67

225 #, c-format

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

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

228

216 -#: branch.c:84

229 +#: branch.c:93

230 #, c-format

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

232 msgstr ""

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

234 "rebasant."

235

223 -#: branch.c:85

236 +#: branch.c:94

237 #, c-format

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

239 msgstr ""

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

241

229 -#: branch.c:89

242 +#: branch.c:98

243 #, c-format

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

245 msgstr ""

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

247

235 -#: branch.c:90

248 +#: branch.c:99

249 #, c-format

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

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

252

240 -#: branch.c:95

253 +#: branch.c:104

254 #, c-format

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

256 msgstr ""

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

258 "rebasant."

259

247 -#: branch.c:96

260 +#: branch.c:105

261 #, c-format

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

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

264

252 -#: branch.c:100

265 +#: branch.c:109

266 #, c-format

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

268 msgstr ""

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

270

258 -#: branch.c:101

271 +#: branch.c:110

272 #, c-format

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

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

275

263 -#: branch.c:134

276 +#: branch.c:119

277 +msgid "Unable to write upstream branch configuration"

278 +msgstr "Échec de l'écriture de la configuration de branche amont"

279 +

280 +#: branch.c:156

281 #, c-format

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

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

284

268 -#: branch.c:163

285 +#: branch.c:185

286 #, c-format

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

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

289

273 -#: branch.c:168

290 +#: branch.c:190

291 #, c-format

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

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

294

278 -#: branch.c:176

295 +#: branch.c:198

296 msgid "Cannot force update the current branch."

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

298

282 -#: branch.c:196

299 +#: branch.c:218

300 #, c-format

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

302 msgstr ""

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

304 "pas une branche."

305

289 -#: branch.c:198

306 +#: branch.c:220

307 #, c-format

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

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

310

294 -#: branch.c:200

311 +#: branch.c:222

312 msgid ""

313 "\n"

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

@@ -311,22 +328,22 @@ msgstr ""

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

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

330

314 -#: branch.c:244

331 +#: branch.c:266

332 #, c-format

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

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

335

319 -#: branch.c:264

336 +#: branch.c:286

337 #, c-format

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

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

340

324 -#: branch.c:269

341 +#: branch.c:291

342 #, c-format

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

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

345

329 -#: branch.c:322

346 +#: branch.c:344

347 #, c-format

348 msgid "'%s' is already checked out at '%s'"

349 msgstr "'%s' est déjà extrait dans '%s'"

@@ -350,10 +367,10 @@ msgstr "impossible d'ouvrir '%s'"

367 msgid "Repository lacks these prerequisite commits:"

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

369

353 -#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

354 -#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

355 -#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

356 -#: builtin/shortlog.c:158

370 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

371 +#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

372 +#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

373 +#: builtin/shortlog.c:170

374 msgid "revision walk setup failed"

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

376

@@ -392,7 +409,7 @@ msgstr "rev-list a disparu"

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

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

411

395 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

412 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

413 #, c-format

414 msgid "unrecognized argument: %s"

415 msgstr "argument non reconnu : %s"

@@ -415,8 +432,8 @@ msgstr "l'index de groupe a disparu"

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

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

434

418 -#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

419 -#: builtin/am.c:2149

435 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

436 +#: builtin/am.c:2135

437 #, c-format

438 msgid "could not parse %s"

439 msgstr "impossible d'analyser %s"

@@ -430,62 +447,66 @@ msgstr "%s %s n'est pas un commit !"

447 msgid "memory exhausted"

448 msgstr "plus de mémoire"

449

433 -#: config.c:474 config.c:476

450 +#: config.c:475 config.c:477

451 #, c-format

435 -msgid "bad config file line %d in %s"

436 -msgstr "ligne %d de fichier de config incorrecte dans %s"

452 +msgid "bad config line %d in %s %s"

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

454

438 -#: config.c:592

455 +#: config.c:593

456 #, c-format

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

441 -msgstr ""

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

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

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

459

444 -#: config.c:594

460 +#: config.c:595

461 #, c-format

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

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

464

449 -#: config.c:679

465 +#: config.c:680

466 #, c-format

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

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

469

454 -#: config.c:757 config.c:768

470 +#: config.c:758 config.c:769

471 #, c-format

472 msgid "bad zlib compression level %d"

473 msgstr "niveau de compression zlib incorrect %d"

474

459 -#: config.c:890

475 +#: config.c:891

476 #, c-format

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

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

479

464 -#: config.c:1216

480 +#: config.c:1220

481 msgid "unable to parse command-line config"

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

483

468 -#: config.c:1277

484 +#: config.c:1281

485 msgid "unknown error occured while reading the configuration files"

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

487

472 -#: config.c:1601

488 +#: config.c:1629

489 #, c-format

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

491 msgstr ""

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

493

478 -#: config.c:1603

494 +#: config.c:1631

495 #, c-format

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

497 msgstr ""

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

499

484 -#: config.c:1662

500 +#: config.c:1690

501 #, c-format

502 msgid "%s has multiple values"

503 msgstr "%s a des valeurs multiples"

504

505 +#: config.c:2226

506 +#, c-format

507 +msgid "Could not set '%s' to '%s'"

508 +msgstr "Impossible de régler '%s' à '%s'"

509 +

510 #: connected.c:69

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

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

@@ -603,16 +624,16 @@ msgstr ""

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

625 "%s"

626

606 -#: diff.c:3000

627 +#: diff.c:2997

628 #, c-format

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

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

631

611 -#: diff.c:3396

632 +#: diff.c:3393

633 msgid "--follow requires exactly one pathspec"

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

635

615 -#: diff.c:3559

636 +#: diff.c:3556

637 #, c-format

638 msgid ""

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

@@ -621,18 +642,18 @@ msgstr ""

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

643 "%s"

644

624 -#: diff.c:3573

645 +#: diff.c:3570

646 #, c-format

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

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

649

629 -#: dir.c:1915

650 +#: dir.c:2004

651 msgid "failed to get kernel name and information"

652 msgstr "echec de l'obtention d'information de kernel"

653

633 -#: dir.c:1998

634 -msgid "Untracked cache is disabled on this system."

635 -msgstr "Le cache non suivi est désactivé sur ce système."

654 +#: dir.c:2123

655 +msgid "Untracked cache is disabled on this system or location."

656 +msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."

657

658 #: gpg-interface.c:166 gpg-interface.c:237

659 msgid "could not run gpg."

@@ -671,20 +692,20 @@ msgstr "'%s' : %s"

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

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

694

674 -#: help.c:207

695 +#: help.c:205

696 #, c-format

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

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

699

679 -#: help.c:214

700 +#: help.c:212

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

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

703

683 -#: help.c:246

704 +#: help.c:244

705 msgid "These are common Git commands used in various situations:"

706 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"

707

687 -#: help.c:311

708 +#: help.c:309

709 #, c-format

710 msgid ""

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

@@ -693,11 +714,11 @@ msgstr ""

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

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

716

696 -#: help.c:368

717 +#: help.c:366

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

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

720

700 -#: help.c:390

721 +#: help.c:388

722 #, c-format

723 msgid ""

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

@@ -707,17 +728,17 @@ msgstr ""

728 "pas.\n"

729 "Continuons en supposant que vous avez voulu dire '%s'"

730

710 -#: help.c:395

731 +#: help.c:393

732 #, c-format

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

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

735

715 -#: help.c:402

736 +#: help.c:400

737 #, c-format

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

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

740

720 -#: help.c:406 help.c:466

741 +#: help.c:404 help.c:464

742 msgid ""

743 "\n"

744 "Did you mean this?"

@@ -731,7 +752,7 @@ msgstr[1] ""

752 "\n"

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

754

734 -#: help.c:462

755 +#: help.c:460

756 #, c-format

757 msgid "%s: %s - %s"

758 msgstr "%s: %s - %s"

@@ -740,8 +761,8 @@ msgstr "%s: %s - %s"

761 msgid "failed to read the cache"

762 msgstr "impossible de lire le cache"

763

743 -#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

744 -#: builtin/checkout.c:587 builtin/clone.c:722

764 +#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

765 +#: builtin/checkout.c:587 builtin/clone.c:730

766 msgid "unable to write new index file"

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

768

@@ -759,64 +780,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"

780 msgid "error building trees"

781 msgstr "erreur de construction des arbres"

782

762 -#: merge-recursive.c:686

783 +#: merge-recursive.c:689

784 #, c-format

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

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

787

767 -#: merge-recursive.c:697

788 +#: merge-recursive.c:700

789 #, c-format

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

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

792

772 -#: merge-recursive.c:711 merge-recursive.c:732

793 +#: merge-recursive.c:714 merge-recursive.c:735

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

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

796

776 -#: merge-recursive.c:722

797 +#: merge-recursive.c:725

798 #, c-format

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

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

801

781 -#: merge-recursive.c:762

802 +#: merge-recursive.c:765

803 #, c-format

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

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

806

786 -#: merge-recursive.c:764

807 +#: merge-recursive.c:767

808 #, c-format

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

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

811

791 -#: merge-recursive.c:787 builtin/clone.c:369

812 +#: merge-recursive.c:790 builtin/clone.c:374

813 #, c-format

814 msgid "failed to open '%s'"

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

816

796 -#: merge-recursive.c:795

817 +#: merge-recursive.c:798

818 #, c-format

819 msgid "failed to symlink '%s'"

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

821

801 -#: merge-recursive.c:798

822 +#: merge-recursive.c:801

823 #, c-format

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

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

826

806 -#: merge-recursive.c:936

827 +#: merge-recursive.c:939

828 msgid "Failed to execute internal merge"

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

830

810 -#: merge-recursive.c:940

831 +#: merge-recursive.c:943

832 #, c-format

833 msgid "Unable to add %s to database"

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

835

815 -#: merge-recursive.c:956

836 +#: merge-recursive.c:959

837 msgid "unsupported object type in the tree"

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

839

819 -#: merge-recursive.c:1031 merge-recursive.c:1045

840 +#: merge-recursive.c:1034 merge-recursive.c:1048

841 #, c-format

842 msgid ""

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

@@ -825,7 +846,7 @@ msgstr ""

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

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

848

828 -#: merge-recursive.c:1037 merge-recursive.c:1050

849 +#: merge-recursive.c:1040 merge-recursive.c:1053

850 #, c-format

851 msgid ""

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

@@ -834,20 +855,20 @@ msgstr ""

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

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

857

837 -#: merge-recursive.c:1091

858 +#: merge-recursive.c:1094

859 msgid "rename"

860 msgstr "renommage"

861

841 -#: merge-recursive.c:1091

862 +#: merge-recursive.c:1094

863 msgid "renamed"

864 msgstr "renommé"

865

845 -#: merge-recursive.c:1147

866 +#: merge-recursive.c:1150

867 #, c-format

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

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

870

850 -#: merge-recursive.c:1169

871 +#: merge-recursive.c:1172

872 #, c-format

873 msgid ""

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

@@ -856,146 +877,146 @@ msgstr ""

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

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

879

859 -#: merge-recursive.c:1174

880 +#: merge-recursive.c:1177

881 msgid " (left unresolved)"

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

883

863 -#: merge-recursive.c:1228

884 +#: merge-recursive.c:1231

885 #, c-format

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

887 msgstr ""

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

889 ">'%s' dans %s"

890

870 -#: merge-recursive.c:1258

891 +#: merge-recursive.c:1261

892 #, c-format

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

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

895

875 -#: merge-recursive.c:1457

896 +#: merge-recursive.c:1460

897 #, c-format

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

899 msgstr ""

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

901

881 -#: merge-recursive.c:1467

902 +#: merge-recursive.c:1470

903 #, c-format

904 msgid "Adding merged %s"

905 msgstr "Ajout de %s fusionné"

906

886 -#: merge-recursive.c:1472 merge-recursive.c:1674

907 +#: merge-recursive.c:1475 merge-recursive.c:1677

908 #, c-format

909 msgid "Adding as %s instead"

910 msgstr "Ajout plutôt comme %s"

911

891 -#: merge-recursive.c:1523

912 +#: merge-recursive.c:1526

913 #, c-format

914 msgid "cannot read object %s"

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

916

896 -#: merge-recursive.c:1526

917 +#: merge-recursive.c:1529

918 #, c-format

919 msgid "object %s is not a blob"

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

921

901 -#: merge-recursive.c:1578

922 +#: merge-recursive.c:1581

923 msgid "modify"

924 msgstr "modification"

925

905 -#: merge-recursive.c:1578

926 +#: merge-recursive.c:1581

927 msgid "modified"

928 msgstr "modifié"

929

909 -#: merge-recursive.c:1588

930 +#: merge-recursive.c:1591

931 msgid "content"

932 msgstr "contenu"

933

913 -#: merge-recursive.c:1595

934 +#: merge-recursive.c:1598

935 msgid "add/add"

936 msgstr "ajout/ajout"

937

917 -#: merge-recursive.c:1629

938 +#: merge-recursive.c:1632

939 #, c-format

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

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

942

922 -#: merge-recursive.c:1643

943 +#: merge-recursive.c:1646

944 #, c-format

945 msgid "Auto-merging %s"

946 msgstr "Fusion automatique de %s"

947

927 -#: merge-recursive.c:1647 git-submodule.sh:1025

948 +#: merge-recursive.c:1650 git-submodule.sh:1048

949 msgid "submodule"

950 msgstr "sous-module"

951

931 -#: merge-recursive.c:1648

952 +#: merge-recursive.c:1651

953 #, c-format

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

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

956

936 -#: merge-recursive.c:1734

957 +#: merge-recursive.c:1737

958 #, c-format

959 msgid "Removing %s"

960 msgstr "Suppression de %s"

961

941 -#: merge-recursive.c:1759

962 +#: merge-recursive.c:1762

963 msgid "file/directory"

964 msgstr "fichier/répertoire"

965

945 -#: merge-recursive.c:1765

966 +#: merge-recursive.c:1768

967 msgid "directory/file"

968 msgstr "répertoire/fichier"

969

949 -#: merge-recursive.c:1770

970 +#: merge-recursive.c:1773

971 #, c-format

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

973 msgstr ""

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

975

955 -#: merge-recursive.c:1780

976 +#: merge-recursive.c:1783

977 #, c-format

978 msgid "Adding %s"

979 msgstr "Ajout de %s"

980

960 -#: merge-recursive.c:1797

981 +#: merge-recursive.c:1800

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

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

984

964 -#: merge-recursive.c:1816

985 +#: merge-recursive.c:1819

986 msgid "Already up-to-date!"

987 msgstr "Déjà à jour !"

988

968 -#: merge-recursive.c:1825

989 +#: merge-recursive.c:1828

990 #, c-format

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

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

993

973 -#: merge-recursive.c:1855

994 +#: merge-recursive.c:1858

995 #, c-format

996 msgid "Unprocessed path??? %s"

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

998

978 -#: merge-recursive.c:1903

999 +#: merge-recursive.c:1906

1000 msgid "Merging:"

1001 msgstr "Fusion :"

1002

982 -#: merge-recursive.c:1916

1003 +#: merge-recursive.c:1919

1004 #, c-format

1005 msgid "found %u common ancestor:"

1006 msgid_plural "found %u common ancestors:"

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

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

1009

989 -#: merge-recursive.c:1953

1010 +#: merge-recursive.c:1956

1011 msgid "merge returned no commit"

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

1013

993 -#: merge-recursive.c:2010

1014 +#: merge-recursive.c:2013

1015 #, c-format

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

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

1018

998 -#: merge-recursive.c:2021 builtin/merge.c:645

1019 +#: merge-recursive.c:2024 builtin/merge.c:646

1020 msgid "Unable to write index."

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

1022

@@ -1115,12 +1136,12 @@ msgstr ""

1136 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

1137 "commande : %s"

1138

1118 -#: pathspec.c:432

1139 +#: pathspec.c:433

1140 #, c-format

1141 msgid "pathspec '%s' is beyond a symbolic link"

1142 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

1143

1123 -#: pathspec.c:441

1144 +#: pathspec.c:442

1145 msgid ""

1146 "There is nothing to exclude from by :(exclude) patterns.\n"

1147 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -1154,166 +1175,192 @@ msgstr ""

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

1176 "Utilisation de la version %i"

1177

1157 -#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1158 -#: builtin/merge.c:983

1178 +#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1179 +#: builtin/merge.c:984

1180 #, c-format

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

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

1183

1163 -#: refs/files-backend.c:2359

1184 +#: refs/files-backend.c:2374

1185 #, c-format

1186 msgid "could not delete reference %s: %s"

1187 msgstr "Impossible de supprimer la référence %s : %s"

1188

1168 -#: refs/files-backend.c:2362

1189 +#: refs/files-backend.c:2377

1190 #, c-format

1191 msgid "could not delete references: %s"

1192 msgstr "impossible de supprimer les références : %s"

1193

1173 -#: refs/files-backend.c:2371

1194 +#: refs/files-backend.c:2386

1195 #, c-format

1196 msgid "could not remove reference %s"

1197 msgstr "impossible de supprimer la référence %s"

1198

1178 -#: ref-filter.c:245

1199 +#: ref-filter.c:55

1200 #, c-format

1180 -msgid "format: %%(end) atom used without corresponding atom"

1181 -msgstr "format : atome %%(end) utilisé sans atome correspondant"

1201 +msgid "expected format: %%(color:<color>)"

1202 +msgstr "format attendu : %%(color:<couleur>)"

1203 +

1204 +#: ref-filter.c:57

1205 +#, c-format

1206 +msgid "unrecognized color: %%(color:%s)"

1207 +msgstr "couleur non reconnue : %%(color:%s)"

1208 +

1209 +#: ref-filter.c:71

1210 +#, c-format

1211 +msgid "unrecognized format: %%(%s)"

1212 +msgstr "format non reconnu %%(%s)"

1213

1183 -#: ref-filter.c:704

1214 +#: ref-filter.c:101

1215 #, c-format

1216 msgid "positive value expected contents:lines=%s"

1217 msgstr "valeur positive attendue contents:lines=%s"

1218

1188 -#: ref-filter.c:833

1219 +#: ref-filter.c:103

1220 #, c-format

1190 -msgid "expected format: %%(color:<color>)"

1191 -msgstr "format attendu : %%(color:<couleur>)"

1221 +msgid "unrecognized %%(contents) argument: %s"

1222 +msgstr "argument %%(contents) non reconnu : %s"

1223

1193 -#: ref-filter.c:835

1194 -msgid "unable to parse format"

1195 -msgstr "impossible d'analyser le format"

1224 +#: ref-filter.c:113

1225 +#, c-format

1226 +msgid "unrecognized %%(objectname) argument: %s"

1227 +msgstr "argument %%(objectname) non reconnu : %s"

1228

1197 -#: ref-filter.c:870

1229 +#: ref-filter.c:135

1230 #, c-format

1231 msgid "expected format: %%(align:<width>,<position>)"

1232 msgstr "format attendu : %%(align:<largeur>,<position>)"

1233

1202 -#: ref-filter.c:893

1234 +#: ref-filter.c:147

1235 +#, c-format

1236 +msgid "unrecognized position:%s"

1237 +msgstr "position non reconnue : %s"

1238 +

1239 +#: ref-filter.c:151

1240 +#, c-format

1241 +msgid "unrecognized width:%s"

1242 +msgstr "largeur non reconnue : %s"

1243 +

1244 +#: ref-filter.c:157

1245 #, c-format

1204 -msgid "improper format entered align:%s"

1205 -msgstr "format non convenable align:%s"

1246 +msgid "unrecognized %%(align) argument: %s"

1247 +msgstr "argument %%(align) non reconnu : %s"

1248

1207 -#: ref-filter.c:898

1249 +#: ref-filter.c:161

1250 #, c-format

1251 msgid "positive width expected with the %%(align) atom"

1252 msgstr "valeur positive attendue avec l'atome %%(align)"

1253

1212 -#: ref-filter.c:1219

1254 +#: ref-filter.c:372

1255 +#, c-format

1256 +msgid "format: %%(end) atom used without corresponding atom"

1257 +msgstr "format : atome %%(end) utilisé sans atome correspondant"

1258 +

1259 +#: ref-filter.c:1311

1260 #, c-format

1261 msgid "malformed object at '%s'"

1262 msgstr "objet malformé à '%s'"

1263

1217 -#: ref-filter.c:1561

1264 +#: ref-filter.c:1651

1265 #, c-format

1266 msgid "format: %%(end) atom missing"

1267 msgstr "format: atome %%(end) manquant"

1268

1222 -#: ref-filter.c:1615

1269 +#: ref-filter.c:1705

1270 #, c-format

1271 msgid "malformed object name %s"

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

1273

1227 -#: remote.c:756

1274 +#: remote.c:745

1275 #, c-format

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

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

1278

1232 -#: remote.c:760

1279 +#: remote.c:749

1280 #, c-format

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

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

1283

1237 -#: remote.c:764

1284 +#: remote.c:753

1285 #, c-format

1286 msgid "%s tracks both %s and %s"

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

1288

1242 -#: remote.c:772

1289 +#: remote.c:761

1290 msgid "Internal error"

1291 msgstr "Erreur interne"

1292

1246 -#: remote.c:1687 remote.c:1730

1293 +#: remote.c:1677 remote.c:1720

1294 msgid "HEAD does not point to a branch"

1295 msgstr "HEAD ne pointe pas sur une branche"

1296

1250 -#: remote.c:1696

1297 +#: remote.c:1686

1298 #, c-format

1299 msgid "no such branch: '%s'"

1300 msgstr "pas de branche '%s'"

1301

1255 -#: remote.c:1699

1302 +#: remote.c:1689

1303 #, c-format

1304 msgid "no upstream configured for branch '%s'"

1305 msgstr "aucune branche amont configurée pour la branche '%s'"

1306

1260 -#: remote.c:1705

1307 +#: remote.c:1695

1308 #, c-format

1309 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

1311

1265 -#: remote.c:1720

1312 +#: remote.c:1710

1313 #, c-format

1314 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1315 msgstr ""

1316 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

1317 "branche locale de suivi"

1318

1272 -#: remote.c:1735

1319 +#: remote.c:1725

1320 #, c-format

1321 msgid "branch '%s' has no remote for pushing"

1322 msgstr "la branche '%s' n'a aucune branche distante de poussée"

1323

1277 -#: remote.c:1746

1324 +#: remote.c:1736

1325 #, c-format

1326 msgid "push refspecs for '%s' do not include '%s'"

1327 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

1328

1282 -#: remote.c:1759

1329 +#: remote.c:1749

1330 msgid "push has no destination (push.default is 'nothing')"

1331 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

1332

1286 -#: remote.c:1781

1333 +#: remote.c:1771

1334 msgid "cannot resolve 'simple' push to a single destination"

1335 msgstr ""

1336 "impossible de résoudre une poussée 'simple' pour une destination unique"

1337

1291 -#: remote.c:2083

1338 +#: remote.c:2073

1339 #, c-format

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

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

1342

1296 -#: remote.c:2087

1343 +#: remote.c:2077

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

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

1346

1300 -#: remote.c:2090

1347 +#: remote.c:2080

1348 #, c-format

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

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

1351

1305 -#: remote.c:2094

1352 +#: remote.c:2084

1353 #, c-format

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

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

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

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

1358

1312 -#: remote.c:2100

1359 +#: remote.c:2090

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

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

1362

1316 -#: remote.c:2103

1363 +#: remote.c:2093

1364 #, c-format

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

1366 msgid_plural ""

@@ -1325,11 +1372,11 @@ msgstr[1] ""

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

1373 "en avance rapide.\n"

1374

1328 -#: remote.c:2111

1375 +#: remote.c:2101

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

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

1378

1332 -#: remote.c:2114

1379 +#: remote.c:2104

1380 #, c-format

1381 msgid ""

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

@@ -1344,29 +1391,29 @@ msgstr[1] ""

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

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

1393

1347 -#: remote.c:2124

1394 +#: remote.c:2114

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

1396 msgstr ""

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

1398

1352 -#: revision.c:2193

1399 +#: revision.c:2131

1400 msgid "your current branch appears to be broken"

1401 msgstr "votre branche actuelle semble cassée"

1402

1356 -#: revision.c:2196

1403 +#: revision.c:2134

1404 #, c-format

1405 msgid "your current branch '%s' does not have any commits yet"

1406 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

1407

1361 -#: revision.c:2390

1408 +#: revision.c:2328

1409 msgid "--first-parent is incompatible with --bisect"

1410 msgstr "--first-parent est incompatible avec --bisect"

1411

1365 -#: run-command.c:90

1412 +#: run-command.c:92

1413 msgid "open /dev/null failed"

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

1415

1369 -#: run-command.c:92

1416 +#: run-command.c:94

1417 #, c-format

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

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

@@ -1391,7 +1438,7 @@ msgstr ""

1438 msgid "the receiving end does not support --atomic push"

1439 msgstr "Le receveur ne gère pas les poussées avec --atomic"

1440

1394 -#: sequencer.c:183

1441 +#: sequencer.c:174

1442 msgid ""

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

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

@@ -1399,7 +1446,7 @@ msgstr ""

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

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

1448

1402 -#: sequencer.c:186

1449 +#: sequencer.c:177

1450 msgid ""

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

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

@@ -1409,67 +1456,67 @@ msgstr ""

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

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

1458

1412 -#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1459 +#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1460 #, c-format

1461 msgid "Could not write to %s"

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

1463

1417 -#: sequencer.c:202

1464 +#: sequencer.c:193

1465 #, c-format

1466 msgid "Error wrapping up %s"

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

1468

1422 -#: sequencer.c:217

1469 +#: sequencer.c:208

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

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

1472

1426 -#: sequencer.c:219

1473 +#: sequencer.c:210

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

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

1476

1430 -#: sequencer.c:222

1477 +#: sequencer.c:213

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

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

1480

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

1435 -#: sequencer.c:309

1482 +#: sequencer.c:300

1483 #, c-format

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

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

1486

1440 -#: sequencer.c:327

1487 +#: sequencer.c:318

1488 msgid "Could not resolve HEAD commit\n"

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

1490

1444 -#: sequencer.c:347

1491 +#: sequencer.c:338

1492 msgid "Unable to update cache tree\n"

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

1494

1448 -#: sequencer.c:399

1495 +#: sequencer.c:390

1496 #, c-format

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

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

1499

1453 -#: sequencer.c:404

1500 +#: sequencer.c:395

1501 #, c-format

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

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

1504

1458 -#: sequencer.c:469

1505 +#: sequencer.c:460

1506 msgid "Your index file is unmerged."

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

1508

1462 -#: sequencer.c:488

1509 +#: sequencer.c:479

1510 #, c-format

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

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

1513

1467 -#: sequencer.c:496

1514 +#: sequencer.c:487

1515 #, c-format

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

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

1518

1472 -#: sequencer.c:500

1519 +#: sequencer.c:491

1520 #, c-format

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

1522 msgstr ""

@@ -1478,162 +1525,162 @@ msgstr ""

1525

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

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

1481 -#: sequencer.c:513

1528 +#: sequencer.c:504

1529 #, c-format

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

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

1532

1486 -#: sequencer.c:517

1533 +#: sequencer.c:508

1534 #, c-format

1535 msgid "Cannot get commit message for %s"

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

1537

1491 -#: sequencer.c:603

1538 +#: sequencer.c:594

1539 #, c-format

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

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

1542

1496 -#: sequencer.c:604

1543 +#: sequencer.c:595

1544 #, c-format

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

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

1547

1501 -#: sequencer.c:639

1548 +#: sequencer.c:630

1549 msgid "empty commit set passed"

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

1551

1505 -#: sequencer.c:647

1552 +#: sequencer.c:638

1553 #, c-format

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

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

1556

1510 -#: sequencer.c:651

1557 +#: sequencer.c:642

1558 #, c-format

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

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

1561

1515 -#: sequencer.c:711

1562 +#: sequencer.c:702

1563 #, c-format

1564 msgid "Cannot %s during a %s"

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

1566

1520 -#: sequencer.c:733

1567 +#: sequencer.c:724

1568 #, c-format

1569 msgid "Could not parse line %d."

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

1571

1525 -#: sequencer.c:738

1572 +#: sequencer.c:729

1573 msgid "No commits parsed."

1574 msgstr "Aucun commit analysé."

1575

1529 -#: sequencer.c:750

1576 +#: sequencer.c:741

1577 #, c-format

1578 msgid "Could not open %s"

1579 msgstr "Impossible d'ouvrir %s"

1580

1534 -#: sequencer.c:754

1581 +#: sequencer.c:745

1582 #, c-format

1583 msgid "Could not read %s."

1584 msgstr "Impossible de lire %s."

1585

1539 -#: sequencer.c:761

1586 +#: sequencer.c:752

1587 #, c-format

1588 msgid "Unusable instruction sheet: %s"

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

1590

1544 -#: sequencer.c:791

1591 +#: sequencer.c:782

1592 #, c-format

1593 msgid "Invalid key: %s"

1594 msgstr "Clé invalide: %s"

1595

1549 -#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1596 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1597 #, c-format

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

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

1600

1554 -#: sequencer.c:804

1601 +#: sequencer.c:795

1602 #, c-format

1603 msgid "Malformed options sheet: %s"

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

1605

1559 -#: sequencer.c:823

1606 +#: sequencer.c:814

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

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

1609

1563 -#: sequencer.c:824

1610 +#: sequencer.c:815

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

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

1613

1567 -#: sequencer.c:828

1614 +#: sequencer.c:819

1615 #, c-format

1616 msgid "Could not create sequencer directory %s"

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

1618

1572 -#: sequencer.c:844 sequencer.c:926

1619 +#: sequencer.c:835 sequencer.c:917

1620 #, c-format

1621 msgid "Error wrapping up %s."

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

1623

1577 -#: sequencer.c:863 sequencer.c:996

1624 +#: sequencer.c:854 sequencer.c:987

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

1626 msgstr "aucun picorage ou retour en cours"

1627

1581 -#: sequencer.c:865

1628 +#: sequencer.c:856

1629 msgid "cannot resolve HEAD"

1630 msgstr "impossible de résoudre HEAD"

1631

1585 -#: sequencer.c:867

1632 +#: sequencer.c:858

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

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

1635

1589 -#: sequencer.c:887 builtin/apply.c:4287

1636 +#: sequencer.c:878 builtin/apply.c:4287

1637 #, c-format

1638 msgid "cannot open %s: %s"

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

1640

1594 -#: sequencer.c:890

1641 +#: sequencer.c:881

1642 #, c-format

1643 msgid "cannot read %s: %s"

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

1645

1599 -#: sequencer.c:891

1646 +#: sequencer.c:882

1647 msgid "unexpected end of file"

1648 msgstr "fin de fichier inattendue"

1649

1603 -#: sequencer.c:897

1650 +#: sequencer.c:888

1651 #, c-format

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

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

1654

1608 -#: sequencer.c:919

1655 +#: sequencer.c:910

1656 #, c-format

1657 msgid "Could not format %s."

1658 msgstr "Impossible de formater %s."

1659

1613 -#: sequencer.c:1064

1660 +#: sequencer.c:1055

1661 #, c-format

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

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

1664

1618 -#: sequencer.c:1067

1665 +#: sequencer.c:1058

1666 #, c-format

1667 msgid "%s: bad revision"

1668 msgstr "%s : mauvaise révision"

1669

1623 -#: sequencer.c:1101

1670 +#: sequencer.c:1092

1671 msgid "Can't revert as initial commit"

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

1673

1627 -#: sequencer.c:1102

1674 +#: sequencer.c:1093

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

1676 msgstr "Impossible de picorer vers une HEAD vide"

1677

1631 -#: setup.c:248

1678 +#: setup.c:246

1679 #, c-format

1680 msgid "failed to read %s"

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

1682

1636 -#: sha1_name.c:463

1683 +#: sha1_name.c:462

1684 msgid ""

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

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

@@ -1658,63 +1705,82 @@ msgstr ""

1705 "message\n"

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

1707

1661 -#: submodule.c:61 submodule.c:95

1708 +#: submodule.c:62 submodule.c:96

1709 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1710 msgstr ""

1711 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

1712 "d'abord"

1713

1667 -#: submodule.c:65 submodule.c:99

1714 +#: submodule.c:66 submodule.c:100

1715 #, c-format

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

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

1718

1672 -#: submodule.c:73

1719 +#: submodule.c:74

1720 #, c-format

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

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

1723

1724 # ici %s est un chemin

1678 -#: submodule.c:106

1725 +#: submodule.c:107

1726 #, c-format

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

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

1729

1683 -#: submodule.c:117

1730 +#: submodule.c:118

1731 msgid "staging updated .gitmodules failed"

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

1733

1687 -#: submodule.c:1040

1688 -#, c-format

1689 -msgid "Could not set core.worktree in %s"

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

1691 -

1692 -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1693 -#: trailer.c:561

1734 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1735 +#: trailer.c:562

1736 #, c-format

1737 msgid "unknown value '%s' for key '%s'"

1738 msgstr "valeur inconnue '%s' pour la clé '%s'"

1739

1698 -#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1740 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289

1741 #, c-format

1742 msgid "more than one %s"

1743 msgstr "plus d'un %s"

1744

1703 -#: trailer.c:581

1745 +#: trailer.c:582

1746 #, c-format

1747 msgid "empty trailer token in trailer '%.*s'"

1748 msgstr "symbole vide dans la ligne de fin '%.*s'"

1749

1708 -#: trailer.c:701

1750 +#: trailer.c:702

1751 #, c-format

1752 msgid "could not read input file '%s'"

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

1754

1713 -#: trailer.c:704

1755 +#: trailer.c:705

1756 msgid "could not read from stdin"

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

1758

1717 -#: transport-helper.c:1025

1759 +#: trailer.c:857 builtin/am.c:42

1760 +#, c-format

1761 +msgid "could not stat %s"

1762 +msgstr "stat impossible de %s"

1763 +

1764 +#: trailer.c:859

1765 +#, c-format

1766 +msgid "file %s is not a regular file"

1767 +msgstr "%s n'est pas un fichier régulier"

1768 +

1769 +#: trailer.c:861

1770 +#, c-format

1771 +msgid "file %s is not writable by user"

1772 +msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"

1773 +

1774 +#: trailer.c:873

1775 +msgid "could not open temporary file"

1776 +msgstr "impossible de créer un fichier temporaire"

1777 +

1778 +#: trailer.c:912

1779 +#, c-format

1780 +msgid "could not rename temporary file to %s"

1781 +msgstr "impossible de renommer un fichier temporaire en %s"

1782 +

1783 +#: transport-helper.c:1041

1784 #, c-format

1785 msgid "Could not read ref %s"

1786 msgstr "impossible de lire la réf %s"

@@ -1752,47 +1818,47 @@ msgstr "numéro de port invalide"

1818 msgid "invalid '..' path segment"

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

1820

1755 -#: wrapper.c:219 wrapper.c:362

1821 +#: wrapper.c:222 wrapper.c:381

1822 #, c-format

1823 msgid "could not open '%s' for reading and writing"

1824 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

1825

1760 -#: wrapper.c:221 wrapper.c:364

1826 +#: wrapper.c:224 wrapper.c:383

1827 #, c-format

1828 msgid "could not open '%s' for writing"

1829 msgstr "impossible d'ouvrir '%s' en écriture"

1830

1765 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1766 -#: builtin/merge.c:1074 builtin/pull.c:380

1831 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1832 +#: builtin/merge.c:1075 builtin/pull.c:387

1833 #, c-format

1834 msgid "could not open '%s' for reading"

1835 msgstr "impossible d'ouvrir '%s' en lecture"

1836

1771 -#: wrapper.c:579

1837 +#: wrapper.c:611

1838 #, c-format

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

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

1841

1776 -#: wrapper.c:600

1842 +#: wrapper.c:632

1843 #, c-format

1844 msgid "unable to access '%s'"

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

1846

1781 -#: wrapper.c:608

1847 +#: wrapper.c:640

1848 msgid "unable to get current working directory"

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

1850

1785 -#: wrapper.c:635

1851 +#: wrapper.c:667

1852 #, c-format

1853 msgid "could not open %s for writing"

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

1855

1790 -#: wrapper.c:646 builtin/am.c:425

1856 +#: wrapper.c:678 builtin/am.c:410

1857 #, c-format

1858 msgid "could not write to %s"

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

1860

1795 -#: wrapper.c:652

1861 +#: wrapper.c:684

1862 #, c-format

1863 msgid "could not close %s"

1864 msgstr "impossible de fermer %s"

@@ -2268,7 +2334,7 @@ msgstr "disparue"

2334 msgid "behind "

2335 msgstr "derrière "

2336

2271 -#: compat/precompose_utf8.c:56 builtin/clone.c:408

2337 +#: compat/precompose_utf8.c:57 builtin/clone.c:413

2338 #, c-format

2339 msgid "failed to unlink '%s'"

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

@@ -2295,7 +2361,7 @@ msgstr "suppression de '%s'\n"

2361 msgid "Unstaged changes after refreshing the index:"

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

2363

2298 -#: builtin/add.c:194 builtin/rev-parse.c:796

2364 +#: builtin/add.c:194 builtin/rev-parse.c:797

2365 msgid "Could not read the index"

2366 msgstr "Impossible de lire l'index"

2367

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

2397 msgstr ""

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

2399

2334 -#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2335 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2336 -#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2400 +#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2401 +#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2402 +#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2403 msgid "dry run"

2404 msgstr "simuler l'action"

2405

2340 -#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2406 +#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2407 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2342 -#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

2408 +#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2409 msgid "be verbose"

2410 msgstr "mode verbeux"

2411

@@ -2347,7 +2413,7 @@ msgstr "mode verbeux"

2413 msgid "interactive picking"

2414 msgstr "sélection interactive"

2415

2350 -#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2416 +#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2417 msgid "select hunks interactively"

2418 msgstr "sélection interactive des sections"

2419

@@ -2418,140 +2484,135 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"

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

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

2486

2421 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2422 -#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2423 -#: builtin/submodule--helper.c:40

2487 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2488 +#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2489 +#: builtin/submodule--helper.c:35

2490 msgid "index file corrupt"

2491 msgstr "fichier d'index corrompu"

2492

2427 -#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2493 +#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2494 msgid "Unable to write new index file"

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

2496

2431 -#: builtin/am.c:42

2432 -#, c-format

2433 -msgid "could not stat %s"

2434 -msgstr "stat impossible de %s"

2435 -

2436 -#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2497 +#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2498 #, c-format

2499 msgid "could not read '%s'"

2500 msgstr "impossible de lire '%s'"

2501

2441 -#: builtin/am.c:445

2502 +#: builtin/am.c:430

2503 msgid "could not parse author script"

2504 msgstr "impossible d'analyser le script author"

2505

2445 -#: builtin/am.c:522

2506 +#: builtin/am.c:507

2507 #, c-format

2508 msgid "'%s' was deleted by the applypatch-msg hook"

2509 msgstr "'%s' a été effacé par le crochet applypatch-msg"

2510

2450 -#: builtin/am.c:563 builtin/notes.c:300

2511 +#: builtin/am.c:548 builtin/notes.c:300

2512 #, c-format

2513 msgid "Malformed input line: '%s'."

2514 msgstr "Ligne en entrée malformée : '%s'."

2515

2455 -#: builtin/am.c:600 builtin/notes.c:315

2516 +#: builtin/am.c:585 builtin/notes.c:315

2517 #, c-format

2518 msgid "Failed to copy notes from '%s' to '%s'"

2519 msgstr "Impossible de copier les notes de '%s' vers '%s'"

2520

2460 -#: builtin/am.c:626

2521 +#: builtin/am.c:611

2522 msgid "fseek failed"

2523 msgstr "échec de fseek"

2524

2464 -#: builtin/am.c:787 builtin/am.c:875

2525 +#: builtin/am.c:772 builtin/am.c:860

2526 #, c-format

2527 msgid "could not open '%s' for reading: %s"

2528 msgstr "impossible d'ouvrir '%s' en lecture : %s"

2529

2469 -#: builtin/am.c:794

2530 +#: builtin/am.c:779

2531 #, c-format

2532 msgid "could not open '%s' for writing: %s"

2533 msgstr "impossible d'ouvrir '%s' en écriture : %s"

2534

2474 -#: builtin/am.c:803

2535 +#: builtin/am.c:788

2536 #, c-format

2537 msgid "could not parse patch '%s'"

2538 msgstr "impossible d'analyser le patch '%s'"

2539

2479 -#: builtin/am.c:868

2540 +#: builtin/am.c:853

2541 msgid "Only one StGIT patch series can be applied at once"

2542 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

2543

2483 -#: builtin/am.c:916

2544 +#: builtin/am.c:901

2545 msgid "invalid timestamp"

2546 msgstr "horodatage invalide"

2547

2487 -#: builtin/am.c:919 builtin/am.c:927

2548 +#: builtin/am.c:904 builtin/am.c:912

2549 msgid "invalid Date line"

2550 msgstr "ligne de Date invalide"

2551

2491 -#: builtin/am.c:924

2552 +#: builtin/am.c:909

2553 msgid "invalid timezone offset"

2554 msgstr "décalage horaire invalide"

2555

2495 -#: builtin/am.c:1011

2556 +#: builtin/am.c:996

2557 msgid "Patch format detection failed."

2558 msgstr "Échec de détection du format du patch."

2559

2499 -#: builtin/am.c:1016 builtin/clone.c:373

2560 +#: builtin/am.c:1001 builtin/clone.c:378

2561 #, c-format

2562 msgid "failed to create directory '%s'"

2563 msgstr "échec de la création du répertoire '%s'"

2564

2504 -#: builtin/am.c:1020

2565 +#: builtin/am.c:1005

2566 msgid "Failed to split patches."

2567 msgstr "Échec de découpage des patchs."

2568

2508 -#: builtin/am.c:1152 builtin/commit.c:363

2569 +#: builtin/am.c:1137 builtin/commit.c:363

2570 msgid "unable to write index file"

2571 msgstr "impossible d'écrire le fichier d'index"

2572

2512 -#: builtin/am.c:1203

2573 +#: builtin/am.c:1188

2574 #, c-format

2575 msgid "When you have resolved this problem, run \"%s --continue\"."

2576 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

2577

2517 -#: builtin/am.c:1204

2578 +#: builtin/am.c:1189

2579 #, c-format

2580 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2581 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

2582

2522 -#: builtin/am.c:1205

2583 +#: builtin/am.c:1190

2584 #, c-format

2585 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2586 msgstr ""

2587 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

2588 "abort\"."

2589

2529 -#: builtin/am.c:1343

2590 +#: builtin/am.c:1328

2591 msgid "Patch is empty. Was it split wrong?"

2592 msgstr "Le patch est vide. Le découpage était-il bon ?"

2593

2533 -#: builtin/am.c:1417 builtin/log.c:1347

2594 +#: builtin/am.c:1402 builtin/log.c:1350

2595 #, c-format

2596 msgid "invalid ident line: %s"

2597 msgstr "ligne d'identification invalide : %s"

2598

2538 -#: builtin/am.c:1444

2599 +#: builtin/am.c:1429

2600 #, c-format

2601 msgid "unable to parse commit %s"

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

2603

2543 -#: builtin/am.c:1646

2604 +#: builtin/am.c:1631

2605 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2606 msgstr ""

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

2608 "points."

2609

2549 -#: builtin/am.c:1648

2610 +#: builtin/am.c:1633

2611 msgid "Using index info to reconstruct a base tree..."

2612 msgstr ""

2613 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

2614

2554 -#: builtin/am.c:1667

2615 +#: builtin/am.c:1652

2616 msgid ""

2617 "Did you hand edit your patch?\n"

2618 "It does not apply to blobs recorded in its index."

@@ -2559,38 +2620,38 @@ msgstr ""

2620 "Avez-vous édité le patch à la main ?\n"

2621 "Il ne s'applique pas aux blobs enregistrés dans son index."

2622

2562 -#: builtin/am.c:1673

2623 +#: builtin/am.c:1658

2624 msgid "Falling back to patching base and 3-way merge..."

2625 msgstr "Retour à un patch de la base et fusion à 3 points..."

2626

2566 -#: builtin/am.c:1688

2627 +#: builtin/am.c:1673

2628 msgid "Failed to merge in the changes."

2629 msgstr "Échec d'intégration des modifications."

2630

2570 -#: builtin/am.c:1712 builtin/merge.c:632

2631 +#: builtin/am.c:1697 builtin/merge.c:633

2632 msgid "git write-tree failed to write a tree"

2633 msgstr "git write-tree a échoué à écrire un arbre"

2634

2574 -#: builtin/am.c:1719

2635 +#: builtin/am.c:1704

2636 msgid "applying to an empty history"

2637 msgstr "application à un historique vide"

2638

2578 -#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2579 -#: builtin/merge.c:854

2639 +#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2640 +#: builtin/merge.c:855

2641 msgid "failed to write commit object"

2642 msgstr "échec de l'écriture de l'objet commit"

2643

2583 -#: builtin/am.c:1764 builtin/am.c:1768

2644 +#: builtin/am.c:1749 builtin/am.c:1753

2645 #, c-format

2646 msgid "cannot resume: %s does not exist."

2647 msgstr "impossible de continuer : %s n'existe pas."

2648

2588 -#: builtin/am.c:1784

2649 +#: builtin/am.c:1769

2650 msgid "cannot be interactive without stdin connected to a terminal."

2651 msgstr ""

2652 "impossible d'être interactif sans entrée standard connectée à un terminal."

2653

2593 -#: builtin/am.c:1789

2654 +#: builtin/am.c:1774

2655 msgid "Commit Body is:"

2656 msgstr "Le corps de la validation est :"

2657

@@ -2598,35 +2659,35 @@ msgstr "Le corps de la validation est :"

2659 #. in your translation. The program will only accept English

2660 #. input at this point.

2661 #.

2601 -#: builtin/am.c:1799

2662 +#: builtin/am.c:1784

2663 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2664 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

2665

2605 -#: builtin/am.c:1849

2666 +#: builtin/am.c:1834

2667 #, c-format

2668 msgid "Dirty index: cannot apply patches (dirty: %s)"

2669 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

2670

2610 -#: builtin/am.c:1884 builtin/am.c:1955

2671 +#: builtin/am.c:1869 builtin/am.c:1941

2672 #, c-format

2673 msgid "Applying: %.*s"

2674 msgstr "Application de %.*s"

2675

2615 -#: builtin/am.c:1900

2676 +#: builtin/am.c:1885

2677 msgid "No changes -- Patch already applied."

2678 msgstr "Pas de changement -- Patch déjà appliqué."

2679

2619 -#: builtin/am.c:1908

2680 +#: builtin/am.c:1893

2681 #, c-format

2682 msgid "Patch failed at %s %.*s"

2683 msgstr "le patch a échoué à %s %.*s"

2684

2624 -#: builtin/am.c:1914

2685 +#: builtin/am.c:1899

2686 #, c-format

2687 msgid "The copy of the patch that failed is found in: %s"

2688 msgstr "La copie du patch qui a échoué se trouve dans : %s"

2689

2629 -#: builtin/am.c:1958

2690 +#: builtin/am.c:1944

2691 msgid ""

2692 "No changes - did you forget to use 'git add'?\n"

2693 "If there is nothing left to stage, chances are that something else\n"

@@ -2637,7 +2698,7 @@ msgstr ""

2698 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

2699 "patch."

2700

2640 -#: builtin/am.c:1965

2701 +#: builtin/am.c:1951

2702 msgid ""

2703 "You still have unmerged paths in your index.\n"

2704 "Did you forget to use 'git add'?"

@@ -2645,17 +2706,17 @@ msgstr ""

2706 "Vous avez toujours des chemins non fusionnés dans votre index\n"

2707 "Auriez-vous oublié de faire 'git add' ?"

2708

2648 -#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2709 +#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2710 #: builtin/reset.c:316

2711 #, c-format

2712 msgid "Could not parse object '%s'."

2713 msgstr "Impossible d'analyser l'objet '%s'."

2714

2654 -#: builtin/am.c:2125

2715 +#: builtin/am.c:2111

2716 msgid "failed to clean index"

2717 msgstr "échec du nettoyage de l'index"

2718

2658 -#: builtin/am.c:2159

2719 +#: builtin/am.c:2145

2720 msgid ""

2721 "You seem to have moved HEAD since the last 'am' failure.\n"

2722 "Not rewinding to ORIG_HEAD"

@@ -2663,154 +2724,154 @@ msgstr ""

2724 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

2725 "Pas de retour à ORIG_HEAD"

2726

2666 -#: builtin/am.c:2220

2727 +#: builtin/am.c:2206

2728 #, c-format

2729 msgid "Invalid value for --patch-format: %s"

2730 msgstr "Valeur invalide pour --patch-format : %s"

2731

2671 -#: builtin/am.c:2253

2732 +#: builtin/am.c:2239

2733 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2734 msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"

2735

2675 -#: builtin/am.c:2254

2736 +#: builtin/am.c:2240

2737 msgid "git am [<options>] (--continue | --skip | --abort)"

2738 msgstr "git am [<options>] (--continue | --quit | --abort)"

2739

2679 -#: builtin/am.c:2260

2740 +#: builtin/am.c:2246

2741 msgid "run interactively"

2742 msgstr "exécution interactive"

2743

2683 -#: builtin/am.c:2262

2744 +#: builtin/am.c:2248

2745 msgid "historical option -- no-op"

2746 msgstr "option historique -- no-op"

2747

2687 -#: builtin/am.c:2264

2748 +#: builtin/am.c:2250

2749 msgid "allow fall back on 3way merging if needed"

2750 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

2751

2691 -#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2752 +#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

2753 #: builtin/repack.c:171

2754 msgid "be quiet"

2755 msgstr "être silencieux"

2756

2696 -#: builtin/am.c:2267

2757 +#: builtin/am.c:2253

2758 msgid "add a Signed-off-by line to the commit message"

2759 msgstr "ajouter une ligne Signed-off-by au message de validation"

2760

2700 -#: builtin/am.c:2270

2761 +#: builtin/am.c:2256

2762 msgid "recode into utf8 (default)"

2763 msgstr "recoder en utf-8 (par défaut)"

2764

2704 -#: builtin/am.c:2272

2765 +#: builtin/am.c:2258

2766 msgid "pass -k flag to git-mailinfo"

2767 msgstr "passer l'option -k à git-mailinfo"

2768

2708 -#: builtin/am.c:2274

2769 +#: builtin/am.c:2260

2770 msgid "pass -b flag to git-mailinfo"

2771 msgstr "passer l'option -b à git-mailinfo"

2772

2712 -#: builtin/am.c:2276

2773 +#: builtin/am.c:2262

2774 msgid "pass -m flag to git-mailinfo"

2775 msgstr "passer l'option -m à git-mailinfo"

2776

2716 -#: builtin/am.c:2278

2777 +#: builtin/am.c:2264

2778 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2779 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

2780

2720 -#: builtin/am.c:2281

2781 +#: builtin/am.c:2267

2782 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2783 msgstr ""

2784 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

2785

2725 -#: builtin/am.c:2284

2786 +#: builtin/am.c:2270

2787 msgid "strip everything before a scissors line"

2788 msgstr "retirer tout le contenu avant la ligne des ciseaux"

2789

2729 -#: builtin/am.c:2285 builtin/apply.c:4554

2790 +#: builtin/am.c:2271 builtin/apply.c:4544

2791 msgid "action"

2792 msgstr "action"

2793

2733 -#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2734 -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2735 -#: builtin/am.c:2313

2794 +#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2795 +#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2796 +#: builtin/am.c:2299

2797 msgid "pass it through git-apply"

2798 msgstr "le passer jusqu'à git-apply"

2799

2739 -#: builtin/am.c:2294 builtin/apply.c:4578

2800 +#: builtin/am.c:2280 builtin/apply.c:4568

2801 msgid "root"

2802 msgstr "racine"

2803

2743 -#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2744 -#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2745 -#: builtin/pull.c:167 builtin/submodule--helper.c:78

2746 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2804 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2805 +#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2806 +#: builtin/pull.c:171 builtin/submodule--helper.c:72

2807 +#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

2808 msgid "path"

2809 msgstr "chemin"

2810

2750 -#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2751 -#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2811 +#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2812 +#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185

2813 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2814 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2815 #: parse-options.h:134 parse-options.h:244

2816 msgid "n"

2817 msgstr "n"

2818

2758 -#: builtin/am.c:2306 builtin/apply.c:4522

2819 +#: builtin/am.c:2292 builtin/apply.c:4512

2820 msgid "num"

2821 msgstr "num"

2822

2762 -#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2823 +#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

2824 #: builtin/tag.c:372

2825 msgid "format"

2826 msgstr "format"

2827

2767 -#: builtin/am.c:2310

2828 +#: builtin/am.c:2296

2829 msgid "format the patch(es) are in"

2830 msgstr "format de présentation des patchs"

2831

2771 -#: builtin/am.c:2316

2832 +#: builtin/am.c:2302

2833 msgid "override error message when patch failure occurs"

2834 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

2835

2775 -#: builtin/am.c:2318

2836 +#: builtin/am.c:2304

2837 msgid "continue applying patches after resolving a conflict"

2838 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

2839

2779 -#: builtin/am.c:2321

2840 +#: builtin/am.c:2307

2841 msgid "synonyms for --continue"

2842 msgstr "synonymes de --continue"

2843

2783 -#: builtin/am.c:2324

2844 +#: builtin/am.c:2310

2845 msgid "skip the current patch"

2846 msgstr "sauter le patch courant"

2847

2787 -#: builtin/am.c:2327

2848 +#: builtin/am.c:2313

2849 msgid "restore the original branch and abort the patching operation."

2850 msgstr ""

2851 "restaurer la branche originale et abandonner les applications de patch."

2852

2792 -#: builtin/am.c:2331

2853 +#: builtin/am.c:2317

2854 msgid "lie about committer date"

2855 msgstr "mentir sur la date de validation"

2856

2796 -#: builtin/am.c:2333

2857 +#: builtin/am.c:2319

2858 msgid "use current timestamp for author date"

2859 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

2860

2800 -#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2801 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2861 +#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2862 +#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

2863 msgid "key-id"

2864 msgstr "id de clé"

2865

2805 -#: builtin/am.c:2336

2866 +#: builtin/am.c:2322

2867 msgid "GPG-sign commits"

2868 msgstr "signer les commits avec GPG"

2869

2809 -#: builtin/am.c:2339

2870 +#: builtin/am.c:2325

2871 msgid "(internal use for git-rebase)"

2872 msgstr "(utilisation interne pour git-rebase)"

2873

2813 -#: builtin/am.c:2354

2874 +#: builtin/am.c:2340

2875 msgid ""

2876 "The -b/--binary option has been a no-op for long time, and\n"

2877 "it will be removed. Please do not use it anymore."

@@ -2818,17 +2879,17 @@ msgstr ""

2879 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

2880 "et elle sera supprimée. Veuillez ne plus l'utiliser."

2881

2821 -#: builtin/am.c:2361

2882 +#: builtin/am.c:2347

2883 msgid "failed to read the index"

2884 msgstr "échec à la lecture de l'index"

2885

2825 -#: builtin/am.c:2376

2886 +#: builtin/am.c:2362

2887 #, c-format

2888 msgid "previous rebase directory %s still exists but mbox given."

2889 msgstr ""

2890 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

2891

2831 -#: builtin/am.c:2400

2892 +#: builtin/am.c:2386

2893 #, c-format

2894 msgid ""

2895 "Stray %s directory found.\n"

@@ -2837,7 +2898,7 @@ msgstr ""

2898 "Répertoire abandonné %s trouvé.\n"

2899 "Utilisez \"git am --abort\" pour le supprimer."

2900

2840 -#: builtin/am.c:2406

2901 +#: builtin/am.c:2392

2902 msgid "Resolve operation not in progress, we are not resuming."

2903 msgstr ""

2904 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

@@ -3196,137 +3257,137 @@ msgstr "entrée non reconnue"

3257 msgid "unable to read index file"

3258 msgstr "lecture du fichier d'index impossible"

3259

3199 -#: builtin/apply.c:4517

3260 +#: builtin/apply.c:4507

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

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

3263

3203 -#: builtin/apply.c:4520

3264 +#: builtin/apply.c:4510

3265 msgid "apply changes matching the given path"

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

3267

3207 -#: builtin/apply.c:4523

3268 +#: builtin/apply.c:4513

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

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

3271

3211 -#: builtin/apply.c:4526

3272 +#: builtin/apply.c:4516

3273 msgid "ignore additions made by the patch"

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

3275

3215 -#: builtin/apply.c:4528

3276 +#: builtin/apply.c:4518

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

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

3279

3219 -#: builtin/apply.c:4532

3280 +#: builtin/apply.c:4522

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

3282 msgstr ""

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

3284

3224 -#: builtin/apply.c:4534

3285 +#: builtin/apply.c:4524

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

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

3288

3228 -#: builtin/apply.c:4536

3289 +#: builtin/apply.c:4526

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

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

3292

3232 -#: builtin/apply.c:4538

3293 +#: builtin/apply.c:4528

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

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

3296

3236 -#: builtin/apply.c:4540

3297 +#: builtin/apply.c:4530

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

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

3300

3240 -#: builtin/apply.c:4542

3301 +#: builtin/apply.c:4532

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

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

3304

3244 -#: builtin/apply.c:4544

3305 +#: builtin/apply.c:4534

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

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

3308

3248 -#: builtin/apply.c:4546

3309 +#: builtin/apply.c:4536

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

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

3312

3252 -#: builtin/apply.c:4548

3313 +#: builtin/apply.c:4538

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

3315 msgstr ""

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

3317

3257 -#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3318 +#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3319 msgid "paths are separated with NUL character"

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

3321

3261 -#: builtin/apply.c:4553

3322 +#: builtin/apply.c:4543

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

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

3325

3265 -#: builtin/apply.c:4555

3326 +#: builtin/apply.c:4545

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

3328 msgstr ""

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

3330 "d'espace"

3331

3271 -#: builtin/apply.c:4558 builtin/apply.c:4561

3332 +#: builtin/apply.c:4548 builtin/apply.c:4551

3333 msgid "ignore changes in whitespace when finding context"

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

3335

3275 -#: builtin/apply.c:4564

3336 +#: builtin/apply.c:4554

3337 msgid "apply the patch in reverse"

3338 msgstr "appliquer le patch en sens inverse"

3339

3279 -#: builtin/apply.c:4566

3340 +#: builtin/apply.c:4556

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

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

3343

3283 -#: builtin/apply.c:4568

3344 +#: builtin/apply.c:4558

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

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

3347

3287 -#: builtin/apply.c:4570

3348 +#: builtin/apply.c:4560

3349 msgid "allow overlapping hunks"

3350 msgstr "accepter les recouvrements de sections"

3351

3291 -#: builtin/apply.c:4573

3352 +#: builtin/apply.c:4563

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

3354 msgstr ""

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

3356 "fichier"

3357

3297 -#: builtin/apply.c:4576

3358 +#: builtin/apply.c:4566

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

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

3361

3301 -#: builtin/apply.c:4579

3362 +#: builtin/apply.c:4569

3363 msgid "prepend <root> to all filenames"

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

3365

3305 -#: builtin/apply.c:4601

3366 +#: builtin/apply.c:4591

3367 msgid "--3way outside a repository"

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

3369

3309 -#: builtin/apply.c:4609

3370 +#: builtin/apply.c:4599

3371 msgid "--index outside a repository"

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

3373

3313 -#: builtin/apply.c:4612

3374 +#: builtin/apply.c:4602

3375 msgid "--cached outside a repository"

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

3377

3317 -#: builtin/apply.c:4631

3378 +#: builtin/apply.c:4621

3379 #, c-format

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

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

3382

3322 -#: builtin/apply.c:4645

3383 +#: builtin/apply.c:4635

3384 #, c-format

3385 msgid "squelched %d whitespace error"

3386 msgid_plural "squelched %d whitespace errors"

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

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

3389

3329 -#: builtin/apply.c:4651 builtin/apply.c:4661

3390 +#: builtin/apply.c:4641 builtin/apply.c:4651

3391 #, c-format

3392 msgid "%d line adds whitespace errors."

3393 msgid_plural "%d lines add whitespace errors."

@@ -3380,108 +3441,116 @@ msgstr "effectuer 'git bisect next'"

3441 msgid "update BISECT_HEAD instead of checking out the current commit"

3442 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"

3443

3383 -#: builtin/blame.c:32

3444 +#: builtin/blame.c:33

3445 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3446 msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

3447

3387 -#: builtin/blame.c:37

3448 +#: builtin/blame.c:38

3449 msgid "<rev-opts> are documented in git-rev-list(1)"

3450 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

3451

3391 -#: builtin/blame.c:2519

3452 +#: builtin/blame.c:1782

3453 +msgid "Blaming lines"

3454 +msgstr "Assignation de blâme au lignes"

3455 +

3456 +#: builtin/blame.c:2530

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

3458 msgstr ""

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

3460 "manière incrémentale"

3461

3397 -#: builtin/blame.c:2520

3462 +#: builtin/blame.c:2531

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

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

3465

3401 -#: builtin/blame.c:2521

3466 +#: builtin/blame.c:2532

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

3468 msgstr ""

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

3470

3406 -#: builtin/blame.c:2522

3471 +#: builtin/blame.c:2533

3472 msgid "Show work cost statistics"

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

3474

3410 -#: builtin/blame.c:2523

3475 +#: builtin/blame.c:2534

3476 +msgid "Force progress reporting"

3477 +msgstr "Forcer l'affichage de l'état d'avancement"

3478 +

3479 +#: builtin/blame.c:2535

3480 msgid "Show output score for blame entries"

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

3482

3414 -#: builtin/blame.c:2524

3483 +#: builtin/blame.c:2536

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

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

3486

3418 -#: builtin/blame.c:2525

3487 +#: builtin/blame.c:2537

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

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

3490

3422 -#: builtin/blame.c:2526

3491 +#: builtin/blame.c:2538

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

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

3494

3426 -#: builtin/blame.c:2527

3495 +#: builtin/blame.c:2539

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

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

3498

3430 -#: builtin/blame.c:2528

3499 +#: builtin/blame.c:2540

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

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

3502

3434 -#: builtin/blame.c:2529

3503 +#: builtin/blame.c:2541

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

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

3506

3438 -#: builtin/blame.c:2530

3507 +#: builtin/blame.c:2542

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

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

3510

3442 -#: builtin/blame.c:2531

3511 +#: builtin/blame.c:2543

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

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

3514

3446 -#: builtin/blame.c:2532

3515 +#: builtin/blame.c:2544

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

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

3518

3450 -#: builtin/blame.c:2533

3519 +#: builtin/blame.c:2545

3520 msgid "Ignore whitespace differences"

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

3522

3454 -#: builtin/blame.c:2534

3523 +#: builtin/blame.c:2546

3524 msgid "Spend extra cycles to find better match"

3525 msgstr ""

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

3527

3459 -#: builtin/blame.c:2535

3528 +#: builtin/blame.c:2547

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

3530 msgstr ""

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

3532

3464 -#: builtin/blame.c:2536

3533 +#: builtin/blame.c:2548

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

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

3536

3468 -#: builtin/blame.c:2537 builtin/blame.c:2538

3537 +#: builtin/blame.c:2549 builtin/blame.c:2550

3538 msgid "score"

3539 msgstr "score"

3540

3472 -#: builtin/blame.c:2537

3541 +#: builtin/blame.c:2549

3542 msgid "Find line copies within and across files"

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

3544

3476 -#: builtin/blame.c:2538

3545 +#: builtin/blame.c:2550

3546 msgid "Find line movements within and across files"

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

3548

3480 -#: builtin/blame.c:2539

3549 +#: builtin/blame.c:2551

3550 msgid "n,m"

3551 msgstr "n,m"

3552

3484 -#: builtin/blame.c:2539

3553 +#: builtin/blame.c:2551

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

3555 msgstr ""

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

@@ -3492,7 +3561,7 @@ msgstr ""

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

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

3563 #. fewer display columns.

3495 -#: builtin/blame.c:2620

3564 +#: builtin/blame.c:2640

3565 msgid "4 years, 11 months ago"

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

3567

@@ -3694,156 +3763,156 @@ msgstr ""

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

3764 "échoué"

3765

3697 -#: builtin/branch.c:587

3766 +#: builtin/branch.c:586

3767 #, c-format

3768 msgid "could not write branch description template: %s"

3769 msgstr "impossible d'écrire le modèle de description de branche : %s"

3770

3702 -#: builtin/branch.c:616

3771 +#: builtin/branch.c:615

3772 msgid "Generic options"

3773 msgstr "Options génériques"

3774

3706 -#: builtin/branch.c:618

3775 +#: builtin/branch.c:617

3776 msgid "show hash and subject, give twice for upstream branch"

3777 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

3778

3710 -#: builtin/branch.c:619

3779 +#: builtin/branch.c:618

3780 msgid "suppress informational messages"

3781 msgstr "supprimer les messages d'information"

3782

3714 -#: builtin/branch.c:620

3783 +#: builtin/branch.c:619

3784 msgid "set up tracking mode (see git-pull(1))"

3785 msgstr "régler le mode de suivi (voir git-pull(1))"

3786

3718 -#: builtin/branch.c:622

3787 +#: builtin/branch.c:621

3788 msgid "change upstream info"

3789 msgstr "modifier l'information amont"

3790

3722 -#: builtin/branch.c:626

3791 +#: builtin/branch.c:625

3792 msgid "use colored output"

3793 msgstr "utiliser la coloration dans la sortie"

3794

3726 -#: builtin/branch.c:627

3795 +#: builtin/branch.c:626

3796 msgid "act on remote-tracking branches"

3797 msgstr "agir sur les branches de suivi distantes"

3798

3730 -#: builtin/branch.c:629 builtin/branch.c:630

3799 +#: builtin/branch.c:628 builtin/branch.c:629

3800 msgid "print only branches that contain the commit"

3801 msgstr "afficher seulement les branches qui contiennent le commit"

3802

3734 -#: builtin/branch.c:633

3803 +#: builtin/branch.c:632

3804 msgid "Specific git-branch actions:"

3805 msgstr "Actions spécifiques à git-branch :"

3806

3738 -#: builtin/branch.c:634

3807 +#: builtin/branch.c:633

3808 msgid "list both remote-tracking and local branches"

3809 msgstr "afficher à la fois les branches de suivi et les branches locales"

3810

3742 -#: builtin/branch.c:636

3811 +#: builtin/branch.c:635

3812 msgid "delete fully merged branch"

3813 msgstr "supprimer une branche totalement fusionnée"

3814

3746 -#: builtin/branch.c:637

3815 +#: builtin/branch.c:636

3816 msgid "delete branch (even if not merged)"

3817 msgstr "supprimer une branche (même non fusionnée)"

3818

3750 -#: builtin/branch.c:638

3819 +#: builtin/branch.c:637

3820 msgid "move/rename a branch and its reflog"

3821 msgstr "déplacer/renommer une branche et son reflog"

3822

3754 -#: builtin/branch.c:639

3823 +#: builtin/branch.c:638

3824 msgid "move/rename a branch, even if target exists"

3825 msgstr "déplacer/renommer une branche, même si la cible existe"

3826

3758 -#: builtin/branch.c:640

3827 +#: builtin/branch.c:639

3828 msgid "list branch names"

3829 msgstr "afficher les noms des branches"

3830

3762 -#: builtin/branch.c:641

3831 +#: builtin/branch.c:640

3832 msgid "create the branch's reflog"

3833 msgstr "créer le reflog de la branche"

3834

3766 -#: builtin/branch.c:643

3835 +#: builtin/branch.c:642

3836 msgid "edit the description for the branch"

3837 msgstr "éditer la description de la branche"

3838

3770 -#: builtin/branch.c:644

3839 +#: builtin/branch.c:643

3840 msgid "force creation, move/rename, deletion"

3841 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

3842

3774 -#: builtin/branch.c:645

3843 +#: builtin/branch.c:644

3844 msgid "print only branches that are merged"

3845 msgstr "afficher seulement les branches qui sont fusionnées"

3846

3778 -#: builtin/branch.c:646

3847 +#: builtin/branch.c:645

3848 msgid "print only branches that are not merged"

3849 msgstr "afficher seulement les branches qui ne sont pas fusionnées"

3850

3782 -#: builtin/branch.c:647

3851 +#: builtin/branch.c:646

3852 msgid "list branches in columns"

3853 msgstr "afficher les branches en colonnes"

3854

3786 -#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3855 +#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

3856 msgid "key"

3857 msgstr "clé"

3858

3790 -#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3859 +#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

3860 msgid "field name to sort on"

3861 msgstr "nom du champ servant à trier"

3862

3794 -#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3795 -#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3863 +#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

3864 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

3865 #: builtin/tag.c:369

3866 msgid "object"

3867 msgstr "objet"

3868

3800 -#: builtin/branch.c:652

3869 +#: builtin/branch.c:651

3870 msgid "print only branches of the object"

3871 msgstr "afficher seulement les branches de l'objet"

3872

3804 -#: builtin/branch.c:670

3873 +#: builtin/branch.c:669

3874 msgid "Failed to resolve HEAD as a valid ref."

3875 msgstr "Échec de résolution de HEAD comme référence valide."

3876

3808 -#: builtin/branch.c:674 builtin/clone.c:697

3877 +#: builtin/branch.c:673 builtin/clone.c:705

3878 msgid "HEAD not found below refs/heads!"

3879 msgstr "HEAD non trouvée sous refs/heads !"

3880

3812 -#: builtin/branch.c:694

3881 +#: builtin/branch.c:693

3882 msgid "--column and --verbose are incompatible"

3883 msgstr "--column et --verbose sont incompatibles"

3884

3816 -#: builtin/branch.c:705 builtin/branch.c:747

3885 +#: builtin/branch.c:704 builtin/branch.c:746

3886 msgid "branch name required"

3887 msgstr "le nom de branche est requis"

3888

3820 -#: builtin/branch.c:723

3889 +#: builtin/branch.c:722

3890 msgid "Cannot give description to detached HEAD"

3891 msgstr "Impossible de décrire une HEAD détachée"

3892

3824 -#: builtin/branch.c:728

3893 +#: builtin/branch.c:727

3894 msgid "cannot edit description of more than one branch"

3895 msgstr "impossible d'éditer la description de plus d'une branche"

3896

3828 -#: builtin/branch.c:735

3897 +#: builtin/branch.c:734

3898 #, c-format

3899 msgid "No commit on branch '%s' yet."

3900 msgstr "Aucun commit sur la branche '%s'."

3901

3833 -#: builtin/branch.c:738

3902 +#: builtin/branch.c:737

3903 #, c-format

3904 msgid "No branch named '%s'."

3905 msgstr "Aucune branche nommée '%s'."

3906

3838 -#: builtin/branch.c:753

3907 +#: builtin/branch.c:752

3908 msgid "too many branches for a rename operation"

3909 msgstr "trop de branches pour une opération de renommage"

3910

3842 -#: builtin/branch.c:758

3911 +#: builtin/branch.c:757

3912 msgid "too many branches to set new upstream"

3913 msgstr "trop de branches pour spécifier une branche amont"

3914

3846 -#: builtin/branch.c:762

3915 +#: builtin/branch.c:761

3916 #, c-format

3917 msgid ""

3918 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -3851,41 +3920,41 @@ msgstr ""

3920 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

3921 "aucune branche."

3922

3854 -#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3923 +#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

3924 #, c-format

3925 msgid "no such branch '%s'"

3926 msgstr "pas de branche '%s'"

3927

3859 -#: builtin/branch.c:769

3928 +#: builtin/branch.c:768

3929 #, c-format

3930 msgid "branch '%s' does not exist"

3931 msgstr "la branche '%s' n'existe pas"

3932

3864 -#: builtin/branch.c:781

3933 +#: builtin/branch.c:780

3934 msgid "too many branches to unset upstream"

3935 msgstr "trop de branches pour désactiver un amont"

3936

3868 -#: builtin/branch.c:785

3937 +#: builtin/branch.c:784

3938 msgid "could not unset upstream of HEAD when it does not point to any branch."

3939 msgstr ""

3940 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

3941 "aucune branche."

3942

3874 -#: builtin/branch.c:791

3943 +#: builtin/branch.c:790

3944 #, c-format

3945 msgid "Branch '%s' has no upstream information"

3946 msgstr "La branche '%s' n'a aucune information de branche amont"

3947

3879 -#: builtin/branch.c:805

3948 +#: builtin/branch.c:804

3949 msgid "it does not make sense to create 'HEAD' manually"

3950 msgstr "créer manuellement 'HEAD' n'a pas de sens"

3951

3883 -#: builtin/branch.c:811

3952 +#: builtin/branch.c:810

3953 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3954 msgstr ""

3955 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

3956

3888 -#: builtin/branch.c:814

3957 +#: builtin/branch.c:813

3958 #, c-format

3959 msgid ""

3960 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3894,7 +3963,7 @@ msgstr ""

3963 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

3964 "track ou --set-upstream-to\n"

3965

3897 -#: builtin/branch.c:831

3966 +#: builtin/branch.c:830

3967 #, c-format

3968 msgid ""

3969 "\n"

@@ -3905,12 +3974,12 @@ msgstr ""

3974 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

3975 "\n"

3976

3908 -#: builtin/branch.c:832

3977 +#: builtin/branch.c:831

3978 #, c-format

3979 msgid " git branch -d %s\n"

3980 msgstr " git branch -d %s\n"

3981

3913 -#: builtin/branch.c:833

3982 +#: builtin/branch.c:832

3983 #, c-format

3984 msgid " git branch --set-upstream-to %s\n"

3985 msgstr " git branch --set-upstream-to %s\n"

@@ -4007,7 +4076,7 @@ msgstr "afficher tous les attributs associés au fichier"

4076 msgid "use .gitattributes only from the index"

4077 msgstr "utiliser .gitattributes seulement depuis l'index"

4078

4010 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

4079 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97

4080 msgid "read file names from stdin"

4081 msgstr "lire les noms de fichier depuis l'entrée standard"

4082

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

4085 msgstr ""

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

4087

4019 -#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

4088 +#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4089 msgid "suppress progress reporting"

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

4091

@@ -4069,51 +4138,55 @@ msgstr "impossible d'analyser le contact : %s"

4138 msgid "no contacts specified"

4139 msgstr "aucun contact spécifié"

4140

4072 -#: builtin/checkout-index.c:126

4141 +#: builtin/checkout-index.c:127

4142 msgid "git checkout-index [<options>] [--] [<file>...]"

4143 msgstr "git checkout-index [<options>] [--] [<fichier>...]"

4144

4076 -#: builtin/checkout-index.c:188

4145 +#: builtin/checkout-index.c:144

4146 +msgid "stage should be between 1 and 3 or all"

4147 +msgstr "stage doit valoir entre 1 et 3, ou all"

4148 +

4149 +#: builtin/checkout-index.c:160

4150 msgid "check out all files in the index"

4151 msgstr "extraire tous les fichiers présents dans l'index"

4152

4080 -#: builtin/checkout-index.c:189

4153 +#: builtin/checkout-index.c:161

4154 msgid "force overwrite of existing files"

4155 msgstr "forcer l'écrasement des fichiers existants"

4156

4084 -#: builtin/checkout-index.c:191

4157 +#: builtin/checkout-index.c:163

4158 msgid "no warning for existing files and files not in index"

4159 msgstr ""

4160 "pas d'avertissement pour les fichiers existants et les fichiers absents de "

4161 "l'index"

4162

4090 -#: builtin/checkout-index.c:193

4163 +#: builtin/checkout-index.c:165

4164 msgid "don't checkout new files"

4165 msgstr "ne pas extraire les nouveaux fichiers"

4166

4094 -#: builtin/checkout-index.c:195

4167 +#: builtin/checkout-index.c:167

4168 msgid "update stat information in the index file"

4169 msgstr "mettre à jour l'information de stat dans le fichier d'index"

4170

4098 -#: builtin/checkout-index.c:201

4171 +#: builtin/checkout-index.c:171

4172 msgid "read list of paths from the standard input"

4173 msgstr "lire la liste des chemins depuis l'entrée standard"

4174

4102 -#: builtin/checkout-index.c:203

4175 +#: builtin/checkout-index.c:173

4176 msgid "write the content to temporary files"

4177 msgstr "écrire le contenu dans des fichiers temporaires"

4178

4106 -#: builtin/checkout-index.c:204 builtin/column.c:30

4179 +#: builtin/checkout-index.c:174 builtin/column.c:30

4180 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4181 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4108 -#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4182 msgid "string"

4183 msgstr "chaîne"

4184

4112 -#: builtin/checkout-index.c:205

4185 +#: builtin/checkout-index.c:175

4186 msgid "when creating files, prepend <string>"

4187 msgstr "lors de la création de fichiers, préfixer par <chaîne>"

4188

4116 -#: builtin/checkout-index.c:208

4189 +#: builtin/checkout-index.c:177

4190 msgid "copy out the files from named stage"

4191 msgstr "copier les fichiers depuis l'index nommé"

4192

@@ -4195,37 +4268,37 @@ msgstr "Impossible de faire un reflog pour '%s' : %s\n"

4268 msgid "HEAD is now at"

4269 msgstr "HEAD est maintenant sur"

4270

4198 -#: builtin/checkout.c:668

4271 +#: builtin/checkout.c:669

4272 #, c-format

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

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

4275

4203 -#: builtin/checkout.c:671

4276 +#: builtin/checkout.c:672

4277 #, c-format

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

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

4280

4208 -#: builtin/checkout.c:675

4281 +#: builtin/checkout.c:676

4282 #, c-format

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

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

4285

4213 -#: builtin/checkout.c:677 builtin/checkout.c:1066

4286 +#: builtin/checkout.c:678 builtin/checkout.c:1068

4287 #, c-format

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

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

4290

4218 -#: builtin/checkout.c:679

4291 +#: builtin/checkout.c:680

4292 #, c-format

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

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

4295

4223 -#: builtin/checkout.c:731

4296 +#: builtin/checkout.c:732

4297 #, c-format

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

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

4300

4228 -#: builtin/checkout.c:737

4301 +#: builtin/checkout.c:738

4302 #, c-format

4303 msgid ""

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

@@ -4248,7 +4321,7 @@ msgstr[1] ""

4321 "\n"

4322 "%s\n"

4323

4251 -#: builtin/checkout.c:756

4324 +#: builtin/checkout.c:757

4325 #, c-format

4326 msgid ""

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

@@ -4277,151 +4350,151 @@ msgstr[1] ""

4350 "git branch <nouvelle-branche> %s\n"

4351 "\n"

4352

4280 -#: builtin/checkout.c:792

4353 +#: builtin/checkout.c:793

4354 msgid "internal error in revision walk"

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

4356

4284 -#: builtin/checkout.c:796

4357 +#: builtin/checkout.c:797

4358 msgid "Previous HEAD position was"

4359 msgstr "La position précédente de HEAD était sur"

4360

4288 -#: builtin/checkout.c:823 builtin/checkout.c:1061

4361 +#: builtin/checkout.c:824 builtin/checkout.c:1063

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

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

4364

4292 -#: builtin/checkout.c:968

4365 +#: builtin/checkout.c:969

4366 #, c-format

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

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

4369

4297 -#: builtin/checkout.c:1007 builtin/worktree.c:213

4370 +#: builtin/checkout.c:1009 builtin/worktree.c:211

4371 #, c-format

4372 msgid "invalid reference: %s"

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

4374

4302 -#: builtin/checkout.c:1036

4375 +#: builtin/checkout.c:1038

4376 #, c-format

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

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

4379

4307 -#: builtin/checkout.c:1075

4380 +#: builtin/checkout.c:1077

4381 msgid "paths cannot be used with switching branches"

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

4383

4311 -#: builtin/checkout.c:1078 builtin/checkout.c:1082

4384 +#: builtin/checkout.c:1080 builtin/checkout.c:1084

4385 #, c-format

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

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

4388

4316 -#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4317 -#: builtin/checkout.c:1097

4389 +#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4390 +#: builtin/checkout.c:1099

4391 #, c-format

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

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

4394

4322 -#: builtin/checkout.c:1102

4395 +#: builtin/checkout.c:1104

4396 #, c-format

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

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

4399

4327 -#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4328 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4329 -#: builtin/worktree.c:322

4400 +#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4401 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4402 +#: builtin/worktree.c:320

4403 msgid "branch"

4404 msgstr "branche"

4405

4333 -#: builtin/checkout.c:1136

4406 +#: builtin/checkout.c:1138

4407 msgid "create and checkout a new branch"

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

4409

4337 -#: builtin/checkout.c:1138

4410 +#: builtin/checkout.c:1140

4411 msgid "create/reset and checkout a branch"

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

4413

4341 -#: builtin/checkout.c:1139

4414 +#: builtin/checkout.c:1141

4415 msgid "create reflog for new branch"

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

4417

4345 -#: builtin/checkout.c:1140

4418 +#: builtin/checkout.c:1142

4419 msgid "detach the HEAD at named commit"

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

4421

4349 -#: builtin/checkout.c:1141

4422 +#: builtin/checkout.c:1143

4423 msgid "set upstream info for new branch"

4424 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

4425

4353 -#: builtin/checkout.c:1143

4426 +#: builtin/checkout.c:1145

4427 msgid "new-branch"

4428 msgstr "nouvelle branche"

4429

4357 -#: builtin/checkout.c:1143

4430 +#: builtin/checkout.c:1145

4431 msgid "new unparented branch"

4432 msgstr "nouvelle branche sans parent"

4433

4361 -#: builtin/checkout.c:1144

4434 +#: builtin/checkout.c:1146

4435 msgid "checkout our version for unmerged files"

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

4437

4365 -#: builtin/checkout.c:1146

4438 +#: builtin/checkout.c:1148

4439 msgid "checkout their version for unmerged files"

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

4441

4369 -#: builtin/checkout.c:1148

4442 +#: builtin/checkout.c:1150

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

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

4445

4373 -#: builtin/checkout.c:1149

4446 +#: builtin/checkout.c:1151

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

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

4449

4377 -#: builtin/checkout.c:1150 builtin/merge.c:227

4450 +#: builtin/checkout.c:1152 builtin/merge.c:227

4451 msgid "update ignored files (default)"

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

4453

4381 -#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4454 +#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4455 msgid "style"

4456 msgstr "style"

4457

4385 -#: builtin/checkout.c:1152

4458 +#: builtin/checkout.c:1154

4459 msgid "conflict style (merge or diff3)"

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

4461

4389 -#: builtin/checkout.c:1155

4462 +#: builtin/checkout.c:1157

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

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

4465

4393 -#: builtin/checkout.c:1157

4466 +#: builtin/checkout.c:1159

4467 msgid "second guess 'git checkout <no-such-branch>'"

4468 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

4469

4397 -#: builtin/checkout.c:1159

4470 +#: builtin/checkout.c:1161

4471 msgid "do not check if another worktree is holding the given ref"

4472 msgstr ""

4473 "ne pas vérifier si une autre copie de travail contient le référence fournie"

4474

4402 -#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4403 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4475 +#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4476 +#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4477 #: builtin/send-pack.c:168

4478 msgid "force progress reporting"

4479 msgstr "forcer l'affichage de l'état d'avancement"

4480

4408 -#: builtin/checkout.c:1191

4481 +#: builtin/checkout.c:1193

4482 msgid "-b, -B and --orphan are mutually exclusive"

4483 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

4484

4412 -#: builtin/checkout.c:1208

4485 +#: builtin/checkout.c:1210

4486 msgid "--track needs a branch name"

4487 msgstr "--track requiert un nom de branche"

4488

4416 -#: builtin/checkout.c:1213

4489 +#: builtin/checkout.c:1215

4490 msgid "Missing branch name; try -b"

4491 msgstr "Nom de branche manquant ; essayez -b"

4492

4420 -#: builtin/checkout.c:1249

4493 +#: builtin/checkout.c:1251

4494 msgid "invalid path specification"

4495 msgstr "spécification de chemin invalide"

4496

4424 -#: builtin/checkout.c:1256

4497 +#: builtin/checkout.c:1258

4498 #, c-format

4499 msgid ""

4500 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4431,12 +4504,12 @@ msgstr ""

4504 "en même temps.\n"

4505 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

4506

4434 -#: builtin/checkout.c:1261

4507 +#: builtin/checkout.c:1263

4508 #, c-format

4509 msgid "git checkout: --detach does not take a path argument '%s'"

4510 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

4511

4439 -#: builtin/checkout.c:1265

4512 +#: builtin/checkout.c:1267

4513 msgid ""

4514 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4515 "checking out of the index."

@@ -4475,7 +4548,7 @@ msgstr "Ignorerait le dépôt %s\n"

4548 msgid "failed to remove %s"

4549 msgstr "échec de la suppression de %s"

4550

4478 -#: builtin/clean.c:315

4551 +#: builtin/clean.c:291

4552 msgid ""

4553 "Prompt help:\n"

4554 "1 - select a numbered item\n"

@@ -4487,7 +4560,7 @@ msgstr ""

4560 "foo - sélectionner un élément par un préfixe unique\n"

4561 " - (vide) ne rien sélectionner"

4562

4490 -#: builtin/clean.c:319

4563 +#: builtin/clean.c:295

4564 msgid ""

4565 "Prompt help:\n"

4566 "1 - select a single item\n"

@@ -4507,36 +4580,36 @@ msgstr ""

4580 "* - choisir tous les éléments\n"

4581 " - (vide) terminer la sélection"

4582

4510 -#: builtin/clean.c:535

4583 +#: builtin/clean.c:511

4584 #, c-format

4585 msgid "Huh (%s)?"

4586 msgstr "Hein (%s) ?"

4587

4515 -#: builtin/clean.c:677

4588 +#: builtin/clean.c:653

4589 #, c-format

4590 msgid "Input ignore patterns>> "

4591 msgstr "Entrez les motifs à ignorer>> "

4592

4520 -#: builtin/clean.c:714

4593 +#: builtin/clean.c:690

4594 #, c-format

4595 msgid "WARNING: Cannot find items matched by: %s"

4596 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

4597

4525 -#: builtin/clean.c:735

4598 +#: builtin/clean.c:711

4599 msgid "Select items to delete"

4600 msgstr "Sélectionner les éléments à supprimer"

4601

4602 #. TRANSLATORS: Make sure to keep [y/N] as is

4530 -#: builtin/clean.c:776

4603 +#: builtin/clean.c:752

4604 #, c-format

4605 msgid "Remove %s [y/N]? "

4606 msgstr "Supprimer %s [y/N] ? "

4607

4535 -#: builtin/clean.c:801

4608 +#: builtin/clean.c:777

4609 msgid "Bye."

4610 msgstr "Au revoir."

4611

4539 -#: builtin/clean.c:809

4612 +#: builtin/clean.c:785

4613 msgid ""

4614 "clean - start cleaning\n"

4615 "filter by pattern - exclude items from deletion\n"

@@ -4554,62 +4627,62 @@ msgstr ""

4627 "help - cet écran\n"

4628 "? - aide pour la sélection en ligne"

4629

4557 -#: builtin/clean.c:836

4630 +#: builtin/clean.c:812

4631 msgid "*** Commands ***"

4632 msgstr "*** Commandes ***"

4633

4561 -#: builtin/clean.c:837

4634 +#: builtin/clean.c:813

4635 msgid "What now"

4636 msgstr "Et maintenant ?"

4637

4565 -#: builtin/clean.c:845

4638 +#: builtin/clean.c:821

4639 msgid "Would remove the following item:"

4640 msgid_plural "Would remove the following items:"

4641 msgstr[0] "Supprimerait l'élément suivant :"

4642 msgstr[1] "Supprimerait les éléments suivants :"

4643

4571 -#: builtin/clean.c:862

4644 +#: builtin/clean.c:838

4645 msgid "No more files to clean, exiting."

4646 msgstr "Plus de fichier à nettoyer, sortie."

4647

4575 -#: builtin/clean.c:893

4648 +#: builtin/clean.c:869

4649 msgid "do not print names of files removed"

4650 msgstr "ne pas afficher les noms des fichiers supprimés"

4651

4579 -#: builtin/clean.c:895

4652 +#: builtin/clean.c:871

4653 msgid "force"

4654 msgstr "forcer"

4655

4583 -#: builtin/clean.c:896

4656 +#: builtin/clean.c:872

4657 msgid "interactive cleaning"

4658 msgstr "nettoyage interactif"

4659

4587 -#: builtin/clean.c:898

4660 +#: builtin/clean.c:874

4661 msgid "remove whole directories"

4662 msgstr "supprimer les répertoires entiers"

4663

4591 -#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4592 -#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4664 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4665 +#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4666 msgid "pattern"

4667 msgstr "motif"

4668

4596 -#: builtin/clean.c:900

4669 +#: builtin/clean.c:876

4670 msgid "add <pattern> to ignore rules"

4671 msgstr "ajouter <motif> aux règles ignore"

4672

4600 -#: builtin/clean.c:901

4673 +#: builtin/clean.c:877

4674 msgid "remove ignored files, too"

4675 msgstr "supprimer les fichiers ignorés, aussi"

4676

4604 -#: builtin/clean.c:903

4677 +#: builtin/clean.c:879

4678 msgid "remove only ignored files"

4679 msgstr "supprimer seulement les fichiers ignorés"

4680

4608 -#: builtin/clean.c:921

4681 +#: builtin/clean.c:897

4682 msgid "-x and -X cannot be used together"

4683 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

4684

4612 -#: builtin/clean.c:925

4685 +#: builtin/clean.c:901

4686 msgid ""

4687 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4688 "clean"

@@ -4617,7 +4690,7 @@ msgstr ""

4690 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

4691 "nettoyer"

4692

4620 -#: builtin/clean.c:928

4693 +#: builtin/clean.c:904

4694 msgid ""

4695 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4696 "refusing to clean"

@@ -4629,147 +4702,153 @@ msgstr ""

4702 msgid "git clone [<options>] [--] <repo> [<dir>]"

4703 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

4704

4632 -#: builtin/clone.c:59

4705 +#: builtin/clone.c:60

4706 msgid "don't create a checkout"

4707 msgstr "ne pas créer d'extraction"

4708

4636 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4709 +#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4710 msgid "create a bare repository"

4711 msgstr "créer un dépôt nu"

4712

4640 -#: builtin/clone.c:64

4713 +#: builtin/clone.c:65

4714 msgid "create a mirror repository (implies bare)"

4715 msgstr "créer un dépôt miroir (implique dépôt nu)"

4716

4644 -#: builtin/clone.c:66

4717 +#: builtin/clone.c:67

4718 msgid "to clone from a local repository"

4719 msgstr "pour cloner depuis un dépôt local"

4720

4648 -#: builtin/clone.c:68

4721 +#: builtin/clone.c:69

4722 msgid "don't use local hardlinks, always copy"

4723 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

4724

4652 -#: builtin/clone.c:70

4725 +#: builtin/clone.c:71

4726 msgid "setup as shared repository"

4727 msgstr "régler comme dépôt partagé"

4728

4656 -#: builtin/clone.c:72 builtin/clone.c:74

4729 +#: builtin/clone.c:73 builtin/clone.c:75

4730 msgid "initialize submodules in the clone"

4731 msgstr "initialiser les sous-modules dans le clone"

4732

4660 -#: builtin/clone.c:75 builtin/init-db.c:466

4733 +#: builtin/clone.c:76 builtin/init-db.c:466

4734 msgid "template-directory"

4735 msgstr "répertoire-modèle"

4736

4664 -#: builtin/clone.c:76 builtin/init-db.c:467

4737 +#: builtin/clone.c:77 builtin/init-db.c:467

4738 msgid "directory from which templates will be used"

4739 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4740

4668 -#: builtin/clone.c:78 builtin/submodule--helper.c:179

4741 +#: builtin/clone.c:79 builtin/submodule--helper.c:173

4742 msgid "reference repository"

4743 msgstr "dépôt de référence"

4744

4672 -#: builtin/clone.c:80

4745 +#: builtin/clone.c:81

4746 msgid "use --reference only while cloning"

4747 msgstr "utiliser seulement --reference pour cloner"

4748

4676 -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4749 +#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4750 msgid "name"

4751 msgstr "nom"

4752

4680 -#: builtin/clone.c:82

4753 +#: builtin/clone.c:83

4754 msgid "use <name> instead of 'origin' to track upstream"

4755 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

4756

4684 -#: builtin/clone.c:84

4757 +#: builtin/clone.c:85

4758 msgid "checkout <branch> instead of the remote's HEAD"

4759 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4760

4688 -#: builtin/clone.c:86

4761 +#: builtin/clone.c:87

4762 msgid "path to git-upload-pack on the remote"

4763 msgstr "chemin vers git-upload-pack sur le serveur distant"

4764

4692 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186

4765 +#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193

4766 msgid "depth"

4767 msgstr "profondeur"

4768

4696 -#: builtin/clone.c:88

4769 +#: builtin/clone.c:89

4770 msgid "create a shallow clone of that depth"

4771 msgstr "créer un clone superficiel de cette profondeur"

4772

4700 -#: builtin/clone.c:90

4773 +#: builtin/clone.c:91

4774 msgid "clone only one branch, HEAD or --branch"

4775 msgstr "cloner seulement une branche, HEAD ou --branch"

4776

4704 -#: builtin/clone.c:91 builtin/init-db.c:475

4777 +#: builtin/clone.c:92 builtin/init-db.c:475

4778 msgid "gitdir"

4779 msgstr "gitdir"

4780

4708 -#: builtin/clone.c:92 builtin/init-db.c:476

4781 +#: builtin/clone.c:93 builtin/init-db.c:476

4782 msgid "separate git dir from working tree"

4783 msgstr "séparer le répertoire git de la copie de travail"

4784

4712 -#: builtin/clone.c:93

4785 +#: builtin/clone.c:94

4786 msgid "key=value"

4787 msgstr "clé=valeur"

4788

4716 -#: builtin/clone.c:94

4789 +#: builtin/clone.c:95

4790 msgid "set config inside the new repository"

4791 msgstr "régler la configuration dans le nouveau dépôt"

4792

4720 -#: builtin/clone.c:300

4793 +#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

4794 +msgid "use IPv4 addresses only"

4795 +msgstr "n'utiliser que des adresses IPv4"

4796 +

4797 +#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

4798 +msgid "use IPv6 addresses only"

4799 +msgstr "n'utiliser que des adresses IPv6"

4800 +

4801 +#: builtin/clone.c:305

4802 #, c-format

4803 msgid "reference repository '%s' as a linked checkout is not supported yet."

4723 -msgstr ""

4724 -"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

4725 -"encore supporté"

4804 +msgstr "extraire le dépôt de référence '%s' comme une extraction liée n'est pas encore supporté."

4805

4727 -#: builtin/clone.c:302

4806 +#: builtin/clone.c:307

4807 #, c-format

4808 msgid "reference repository '%s' is not a local repository."

4809 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

4810

4732 -#: builtin/clone.c:307

4811 +#: builtin/clone.c:312

4812 #, c-format

4813 msgid "reference repository '%s' is shallow"

4814 msgstr "le dépôt de référence '%s' est superficiel"

4815

4737 -#: builtin/clone.c:310

4816 +#: builtin/clone.c:315

4817 #, c-format

4818 msgid "reference repository '%s' is grafted"

4819 msgstr "le dépôt de référence '%s' est greffé"

4820

4742 -#: builtin/clone.c:375 builtin/diff.c:84

4821 +#: builtin/clone.c:380 builtin/diff.c:84

4822 #, c-format

4823 msgid "failed to stat '%s'"

4824 msgstr "échec du stat de '%s'"

4825

4747 -#: builtin/clone.c:377

4826 +#: builtin/clone.c:382

4827 #, c-format

4828 msgid "%s exists and is not a directory"

4829 msgstr "%s existe et n'est pas un répertoire"

4830

4752 -#: builtin/clone.c:391

4831 +#: builtin/clone.c:396

4832 #, c-format

4833 msgid "failed to stat %s\n"

4834 msgstr "échec du stat de %s\n"

4835

4757 -#: builtin/clone.c:413

4836 +#: builtin/clone.c:418

4837 #, c-format

4838 msgid "failed to create link '%s'"

4839 msgstr "échec de la création du lien '%s'"

4840

4762 -#: builtin/clone.c:417

4841 +#: builtin/clone.c:422

4842 #, c-format

4843 msgid "failed to copy file to '%s'"

4844 msgstr "échec de la copie vers '%s'"

4845

4767 -#: builtin/clone.c:442 builtin/clone.c:626

4846 +#: builtin/clone.c:447 builtin/clone.c:631

4847 #, c-format

4848 msgid "done.\n"

4849 msgstr "fait.\n"

4850

4772 -#: builtin/clone.c:454

4851 +#: builtin/clone.c:459

4852 msgid ""

4853 "Clone succeeded, but checkout failed.\n"

4854 "You can inspect what was checked out with 'git status'\n"

@@ -4779,121 +4858,121 @@ msgstr ""

4858 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4859 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4860

4782 -#: builtin/clone.c:531

4861 +#: builtin/clone.c:536

4862 #, c-format

4863 msgid "Could not find remote branch %s to clone."

4864 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4865

4787 -#: builtin/clone.c:621

4866 +#: builtin/clone.c:626

4867 #, c-format

4868 msgid "Checking connectivity... "

4869 msgstr "Vérification de la connectivité... "

4870

4792 -#: builtin/clone.c:624

4871 +#: builtin/clone.c:629

4872 msgid "remote did not send all necessary objects"

4873 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4874

4796 -#: builtin/clone.c:688

4875 +#: builtin/clone.c:696

4876 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4877 msgstr ""

4878 "la HEAD distante réfère à une référence non existante, impossible de "

4879 "l'extraire.\n"

4880

4802 -#: builtin/clone.c:719

4881 +#: builtin/clone.c:727

4882 msgid "unable to checkout working tree"

4883 msgstr "impossible d'extraire la copie de travail"

4884

4806 -#: builtin/clone.c:808

4885 +#: builtin/clone.c:816

4886 msgid "cannot repack to clean up"

4887 msgstr "impossible de remballer pour nettoyer"

4888

4810 -#: builtin/clone.c:810

4889 +#: builtin/clone.c:818

4890 msgid "cannot unlink temporary alternates file"

4891 msgstr "impossible de unlinker le fichier temporaire alternates"

4892

4814 -#: builtin/clone.c:842

4893 +#: builtin/clone.c:850

4894 msgid "Too many arguments."

4895 msgstr "Trop d'arguments."

4896

4818 -#: builtin/clone.c:846

4897 +#: builtin/clone.c:854

4898 msgid "You must specify a repository to clone."

4899 msgstr "Vous devez spécifier un dépôt à cloner."

4900

4822 -#: builtin/clone.c:857

4901 +#: builtin/clone.c:865

4902 #, c-format

4903 msgid "--bare and --origin %s options are incompatible."

4904 msgstr "les options --bare et --origin %s sont incompatibles."

4905

4827 -#: builtin/clone.c:860

4906 +#: builtin/clone.c:868

4907 msgid "--bare and --separate-git-dir are incompatible."

4908 msgstr "--bare et --separate-git-dir sont incompatibles."

4909

4831 -#: builtin/clone.c:873

4910 +#: builtin/clone.c:881

4911 #, c-format

4912 msgid "repository '%s' does not exist"

4913 msgstr "le dépôt '%s' n'existe pas"

4914

4836 -#: builtin/clone.c:879 builtin/fetch.c:1166

4915 +#: builtin/clone.c:887 builtin/fetch.c:1174

4916 #, c-format

4917 msgid "depth %s is not a positive number"

4918 msgstr "la profondeur %s n'est pas un entier positif"

4919

4841 -#: builtin/clone.c:889

4920 +#: builtin/clone.c:897

4921 #, c-format

4922 msgid "destination path '%s' already exists and is not an empty directory."

4923 msgstr ""

4924 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4925

4847 -#: builtin/clone.c:899

4926 +#: builtin/clone.c:907

4927 #, c-format

4928 msgid "working tree '%s' already exists."

4929 msgstr "la copie de travail '%s' existe déjà."

4930

4852 -#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4853 -#: builtin/worktree.c:221 builtin/worktree.c:248

4931 +#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4932 +#: builtin/worktree.c:219 builtin/worktree.c:246

4933 #, c-format

4934 msgid "could not create leading directories of '%s'"

4935 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4936

4858 -#: builtin/clone.c:917

4937 +#: builtin/clone.c:925

4938 #, c-format

4939 msgid "could not create work tree dir '%s'"

4940 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

4941

4863 -#: builtin/clone.c:935

4942 +#: builtin/clone.c:943

4943 #, c-format

4944 msgid "Cloning into bare repository '%s'...\n"

4945 msgstr "Clonage dans le dépôt nu '%s'\n"

4946

4868 -#: builtin/clone.c:937

4947 +#: builtin/clone.c:945

4948 #, c-format

4949 msgid "Cloning into '%s'...\n"

4950 msgstr "Clonage dans '%s'...\n"

4951

4873 -#: builtin/clone.c:975

4952 +#: builtin/clone.c:984

4953 msgid "--depth is ignored in local clones; use file:// instead."

4954 msgstr ""

4955 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4956

4878 -#: builtin/clone.c:978

4957 +#: builtin/clone.c:987

4958 msgid "source repository is shallow, ignoring --local"

4959 msgstr "le dépôt source est superficiel, option --local ignorée"

4960

4882 -#: builtin/clone.c:983

4961 +#: builtin/clone.c:992

4962 msgid "--local is ignored"

4963 msgstr "--local est ignoré"

4964

4886 -#: builtin/clone.c:987

4965 +#: builtin/clone.c:996

4966 #, c-format

4967 msgid "Don't know how to clone %s"

4968 msgstr "Je ne sais pas cloner %s"

4969

4891 -#: builtin/clone.c:1036 builtin/clone.c:1044

4970 +#: builtin/clone.c:1045 builtin/clone.c:1053

4971 #, c-format

4972 msgid "Remote branch %s not found in upstream %s"

4973 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4974

4896 -#: builtin/clone.c:1047

4975 +#: builtin/clone.c:1056

4976 msgid "You appear to have cloned an empty repository."

4977 msgstr "Vous semblez avoir cloné un dépôt vide."

4978

@@ -5108,7 +5187,7 @@ msgstr ""

5187 msgid "could not lookup commit %s"

5188 msgstr "impossible de rechercher le commit %s"

5189

5111 -#: builtin/commit.c:702 builtin/shortlog.c:273

5190 +#: builtin/commit.c:702 builtin/shortlog.c:285

5191 #, c-format

5192 msgid "(reading log message from standard input)\n"

5193 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

@@ -5296,8 +5375,8 @@ msgstr "afficher le statut avec concision"

5375 msgid "show branch information"

5376 msgstr "afficher l'information de branche"

5377

5299 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

5300 -#: builtin/worktree.c:423

5378 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5379 +#: builtin/worktree.c:430

5380 msgid "machine-readable output"

5381 msgstr "sortie pour traitement automatique"

5382

@@ -5388,8 +5467,8 @@ msgstr "date"

5467 msgid "override date for commit"

5468 msgstr "remplacer la date pour la validation"

5469

5391 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5392 -#: builtin/notes.c:555 builtin/tag.c:349

5470 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5471 +#: builtin/notes.c:558 builtin/tag.c:349

5472 msgid "message"

5473 msgstr "message"

5474

@@ -5425,7 +5504,7 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)"

5504 msgstr ""

5505 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

5506

5428 -#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5507 +#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5508 msgid "add Signed-off-by:"

5509 msgstr "ajouter une entrée Signed-off-by :"

5510

@@ -5449,7 +5528,7 @@ msgstr "comment éliminer les espaces et les commentaires # du message"

5528 msgid "include status in commit message template"

5529 msgstr "inclure le statut dans le modèle de message de validation"

5530

5452 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5531 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5532 #: builtin/revert.c:93

5533 msgid "GPG sign commit"

5534 msgstr "signer la validation avec GPG"

@@ -5540,140 +5619,144 @@ msgstr ""

5619 "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"

5620 "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."

5621

5543 -#: builtin/config.c:8

5622 +#: builtin/config.c:9

5623 msgid "git config [<options>]"

5624 msgstr "git config [<options>]"

5625

5547 -#: builtin/config.c:54

5626 +#: builtin/config.c:56

5627 msgid "Config file location"

5628 msgstr "Emplacement du fichier de configuration"

5629

5551 -#: builtin/config.c:55

5630 +#: builtin/config.c:57

5631 msgid "use global config file"

5632 msgstr "utiliser les fichier de configuration global"

5633

5555 -#: builtin/config.c:56

5634 +#: builtin/config.c:58

5635 msgid "use system config file"

5636 msgstr "utiliser le fichier de configuration du système"

5637

5559 -#: builtin/config.c:57

5638 +#: builtin/config.c:59

5639 msgid "use repository config file"

5640 msgstr "utiliser le fichier de configuration du dépôt"

5641

5563 -#: builtin/config.c:58

5642 +#: builtin/config.c:60

5643 msgid "use given config file"

5644 msgstr "utiliser le fichier de configuration spécifié"

5645

5567 -#: builtin/config.c:59

5646 +#: builtin/config.c:61

5647 msgid "blob-id"

5648 msgstr "blob-id"

5649

5571 -#: builtin/config.c:59

5650 +#: builtin/config.c:61

5651 msgid "read config from given blob object"

5652 msgstr "lire la configuration depuis l'objet blob fourni"

5653

5575 -#: builtin/config.c:60

5654 +#: builtin/config.c:62

5655 msgid "Action"

5656 msgstr "Action"

5657

5579 -#: builtin/config.c:61

5658 +#: builtin/config.c:63

5659 msgid "get value: name [value-regex]"

5660 msgstr "obtenir la valeur : nom [regex-de-valeur]"

5661

5583 -#: builtin/config.c:62

5662 +#: builtin/config.c:64

5663 msgid "get all values: key [value-regex]"

5664 msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"

5665

5587 -#: builtin/config.c:63

5666 +#: builtin/config.c:65

5667 msgid "get values for regexp: name-regex [value-regex]"

5668 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"

5669

5591 -#: builtin/config.c:64

5670 +#: builtin/config.c:66

5671 msgid "get value specific for the URL: section[.var] URL"

5672 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"

5673

5595 -#: builtin/config.c:65

5674 +#: builtin/config.c:67

5675 msgid "replace all matching variables: name value [value_regex]"

5676 msgstr ""

5677 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"

5678

5600 -#: builtin/config.c:66

5679 +#: builtin/config.c:68

5680 msgid "add a new variable: name value"

5681 msgstr "ajouter une nouvelle variable : nom valeur"

5682

5604 -#: builtin/config.c:67

5683 +#: builtin/config.c:69

5684 msgid "remove a variable: name [value-regex]"

5685 msgstr "supprimer une variable : nom [regex-de-valeur]"

5686

5608 -#: builtin/config.c:68

5687 +#: builtin/config.c:70

5688 msgid "remove all matches: name [value-regex]"

5689 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"

5690

5612 -#: builtin/config.c:69

5691 +#: builtin/config.c:71

5692 msgid "rename section: old-name new-name"

5693 msgstr "renommer une section : ancien-nom nouveau-nom"

5694

5616 -#: builtin/config.c:70

5695 +#: builtin/config.c:72

5696 msgid "remove a section: name"

5697 msgstr "supprimer une section : nom"

5698

5620 -#: builtin/config.c:71

5699 +#: builtin/config.c:73

5700 msgid "list all"

5701 msgstr "afficher tout"

5702

5624 -#: builtin/config.c:72

5703 +#: builtin/config.c:74

5704 msgid "open an editor"

5705 msgstr "ouvrir un éditeur"

5706

5628 -#: builtin/config.c:73

5707 +#: builtin/config.c:75

5708 msgid "find the color configured: slot [default]"

5709 msgstr "trouver la couleur configurée : slot [par défaut]"

5710

5632 -#: builtin/config.c:74

5711 +#: builtin/config.c:76

5712 msgid "find the color setting: slot [stdout-is-tty]"

5713 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"

5714

5636 -#: builtin/config.c:75

5715 +#: builtin/config.c:77

5716 msgid "Type"

5717 msgstr "Type"

5718

5640 -#: builtin/config.c:76

5719 +#: builtin/config.c:78

5720 msgid "value is \"true\" or \"false\""

5721 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"

5722

5644 -#: builtin/config.c:77

5723 +#: builtin/config.c:79

5724 msgid "value is decimal number"

5725 msgstr "la valeur est un nombre décimal"

5726

5648 -#: builtin/config.c:78

5727 +#: builtin/config.c:80

5728 msgid "value is --bool or --int"

5729 msgstr "la valeur est --bool ou --int"

5730

5652 -#: builtin/config.c:79

5731 +#: builtin/config.c:81

5732 msgid "value is a path (file or directory name)"

5733 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"

5734

5656 -#: builtin/config.c:80

5735 +#: builtin/config.c:82

5736 msgid "Other"

5737 msgstr "Autre"

5738

5660 -#: builtin/config.c:81

5739 +#: builtin/config.c:83

5740 msgid "terminate values with NUL byte"

5741 msgstr "terminer les valeurs avec un caractère NUL"

5742

5664 -#: builtin/config.c:82

5743 +#: builtin/config.c:84

5744 msgid "show variable names only"

5745 msgstr "n'afficher que les noms de variable"

5746

5668 -#: builtin/config.c:83

5747 +#: builtin/config.c:85

5748 msgid "respect include directives on lookup"

5749 msgstr "respecter les directives d'inclusion lors de la recherche"

5750

5672 -#: builtin/config.c:303

5751 +#: builtin/config.c:86

5752 +msgid "show origin of config (file, standard input, blob, command line)"

5753 +msgstr "afficher l'origine de la configuration (fichier, entrée standard, blob, ligne de commande)"

5754 +

5755 +#: builtin/config.c:328

5756 msgid "unable to parse default color value"

5757 msgstr "impossible de lire la valeur de couleur par défaut"

5758

5676 -#: builtin/config.c:441

5759 +#: builtin/config.c:469

5760 #, c-format

5761 msgid ""

5762 "# This is Git's per-user configuration file.\n"

@@ -5688,7 +5771,7 @@ msgstr ""

5771 "#\tname = %s\n"

5772 "#\temail = %s\n"

5773

5691 -#: builtin/config.c:575

5774 +#: builtin/config.c:611

5775 #, c-format

5776 msgid "cannot create configuration file %s"

5777 msgstr "création impossible du fichier de configuration '%s'"

@@ -5941,164 +6024,168 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

6024 msgid "git fetch --all [<options>]"

6025 msgstr "git fetch --all [<options>]"

6026

5944 -#: builtin/fetch.c:90 builtin/pull.c:162

6027 +#: builtin/fetch.c:92 builtin/pull.c:166

6028 msgid "fetch from all remotes"

6029 msgstr "récupérer depuis tous le dépôts distants"

6030

5948 -#: builtin/fetch.c:92 builtin/pull.c:165

6031 +#: builtin/fetch.c:94 builtin/pull.c:169

6032 msgid "append to .git/FETCH_HEAD instead of overwriting"

6033 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

6034

5952 -#: builtin/fetch.c:94 builtin/pull.c:168

6035 +#: builtin/fetch.c:96 builtin/pull.c:172

6036 msgid "path to upload pack on remote end"

6037 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

6038

5956 -#: builtin/fetch.c:95 builtin/pull.c:170

6039 +#: builtin/fetch.c:97 builtin/pull.c:174

6040 msgid "force overwrite of local branch"

6041 msgstr "forcer l'écrasement de la branche locale"

6042

5960 -#: builtin/fetch.c:97

6043 +#: builtin/fetch.c:99

6044 msgid "fetch from multiple remotes"

6045 msgstr "récupérer depuis plusieurs dépôts distants"

6046

5964 -#: builtin/fetch.c:99 builtin/pull.c:172

6047 +#: builtin/fetch.c:101 builtin/pull.c:176

6048 msgid "fetch all tags and associated objects"

6049 msgstr "récupérer toutes les étiquettes et leurs objets associés"

6050

5968 -#: builtin/fetch.c:101

6051 +#: builtin/fetch.c:103

6052 msgid "do not fetch all tags (--no-tags)"

6053 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

6054

5972 -#: builtin/fetch.c:103 builtin/pull.c:175

6055 +#: builtin/fetch.c:105

6056 +msgid "number of submodules fetched in parallel"

6057 +msgstr "nombre de sous-modules récupérés en parallèle"

6058 +

6059 +#: builtin/fetch.c:107 builtin/pull.c:179

6060 msgid "prune remote-tracking branches no longer on remote"

6061 msgstr ""

6062 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

6063 "dépôt distant"

6064

5978 -#: builtin/fetch.c:104 builtin/pull.c:178

6065 +#: builtin/fetch.c:108 builtin/pull.c:182

6066 msgid "on-demand"

6067 msgstr "à la demande"

6068

5982 -#: builtin/fetch.c:105 builtin/pull.c:179

6069 +#: builtin/fetch.c:109 builtin/pull.c:183

6070 msgid "control recursive fetching of submodules"

6071 msgstr "contrôler la récupération récursive dans les sous-modules"

6072

5986 -#: builtin/fetch.c:109 builtin/pull.c:184

6073 +#: builtin/fetch.c:113 builtin/pull.c:191

6074 msgid "keep downloaded pack"

6075 msgstr "conserver le paquet téléchargé"

6076

5990 -#: builtin/fetch.c:111

6077 +#: builtin/fetch.c:115

6078 msgid "allow updating of HEAD ref"

6079 msgstr "permettre la mise à jour de la référence HEAD"

6080

5994 -#: builtin/fetch.c:114 builtin/pull.c:187

6081 +#: builtin/fetch.c:118 builtin/pull.c:194

6082 msgid "deepen history of shallow clone"

6083 msgstr "approfondir l'historique d'un clone superficiel"

6084

5998 -#: builtin/fetch.c:116 builtin/pull.c:190

6085 +#: builtin/fetch.c:120 builtin/pull.c:197

6086 msgid "convert to a complete repository"

6087 msgstr "convertir en un dépôt complet"

6088

6002 -#: builtin/fetch.c:118 builtin/log.c:1233

6089 +#: builtin/fetch.c:122 builtin/log.c:1236

6090 msgid "dir"

6091 msgstr "dir"

6092

6006 -#: builtin/fetch.c:119

6093 +#: builtin/fetch.c:123

6094 msgid "prepend this to submodule path output"

6095 msgstr "préfixer ceci à la sortie du chemin du sous-module"

6096

6010 -#: builtin/fetch.c:122

6097 +#: builtin/fetch.c:126

6098 msgid "default mode for recursion"

6099 msgstr "mode par défaut pour la récursion"

6100

6014 -#: builtin/fetch.c:124 builtin/pull.c:193

6101 +#: builtin/fetch.c:128 builtin/pull.c:200

6102 msgid "accept refs that update .git/shallow"

6103 msgstr "accepter les références qui mettent à jour .git/shallow"

6104

6018 -#: builtin/fetch.c:125 builtin/pull.c:195

6105 +#: builtin/fetch.c:129 builtin/pull.c:202

6106 msgid "refmap"

6107 msgstr "correspondance de référence"

6108

6022 -#: builtin/fetch.c:126 builtin/pull.c:196

6109 +#: builtin/fetch.c:130 builtin/pull.c:203

6110 msgid "specify fetch refmap"

6111 msgstr "spécifier une correspondance de référence pour la récupération"

6112

6026 -#: builtin/fetch.c:378

6113 +#: builtin/fetch.c:386

6114 msgid "Couldn't find remote ref HEAD"

6115 msgstr "impossible de trouver la référence HEAD distante"

6116

6030 -#: builtin/fetch.c:458

6117 +#: builtin/fetch.c:466

6118 #, c-format

6119 msgid "object %s not found"

6120 msgstr "objet %s non trouvé"

6121

6035 -#: builtin/fetch.c:463

6122 +#: builtin/fetch.c:471

6123 msgid "[up to date]"

6124 msgstr "[à jour]"

6125

6039 -#: builtin/fetch.c:477

6126 +#: builtin/fetch.c:485

6127 #, c-format

6128 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

6129 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

6130

6044 -#: builtin/fetch.c:478 builtin/fetch.c:566

6131 +#: builtin/fetch.c:486 builtin/fetch.c:574

6132 msgid "[rejected]"

6133 msgstr "[rejeté]"

6134

6048 -#: builtin/fetch.c:489

6135 +#: builtin/fetch.c:497

6136 msgid "[tag update]"

6137 msgstr "[mise à jour de l'étiquette]"

6138

6052 -#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

6139 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552

6140 msgid " (unable to update local ref)"

6141 msgstr " (impossible de mettre à jour la référence locale)"

6142

6056 -#: builtin/fetch.c:509

6143 +#: builtin/fetch.c:517

6144 msgid "[new tag]"

6145 msgstr "[nouvelle étiquette]"

6146

6060 -#: builtin/fetch.c:512

6147 +#: builtin/fetch.c:520

6148 msgid "[new branch]"

6149 msgstr "[nouvelle branche]"

6150

6064 -#: builtin/fetch.c:515

6151 +#: builtin/fetch.c:523

6152 msgid "[new ref]"

6153 msgstr "[nouvelle référence]"

6154

6068 -#: builtin/fetch.c:561

6155 +#: builtin/fetch.c:569

6156 msgid "unable to update local ref"

6157 msgstr "impossible de mettre à jour la référence locale"

6158

6072 -#: builtin/fetch.c:561

6159 +#: builtin/fetch.c:569

6160 msgid "forced update"

6161 msgstr "mise à jour forcée"

6162

6076 -#: builtin/fetch.c:568

6163 +#: builtin/fetch.c:576

6164 msgid "(non-fast-forward)"

6165 msgstr "(pas d'avance rapide)"

6166

6080 -#: builtin/fetch.c:602 builtin/fetch.c:843

6167 +#: builtin/fetch.c:610 builtin/fetch.c:851

6168 #, c-format

6169 msgid "cannot open %s: %s\n"

6170 msgstr "impossible d'ouvrir %s : %s\n"

6171

6085 -#: builtin/fetch.c:611

6172 +#: builtin/fetch.c:619

6173 #, c-format

6174 msgid "%s did not send all necessary objects\n"

6175 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

6176

6090 -#: builtin/fetch.c:629

6177 +#: builtin/fetch.c:637

6178 #, c-format

6179 msgid "reject %s because shallow roots are not allowed to be updated"

6180 msgstr ""

6181 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

6182

6096 -#: builtin/fetch.c:716 builtin/fetch.c:808

6183 +#: builtin/fetch.c:724 builtin/fetch.c:816

6184 #, c-format

6185 msgid "From %.*s\n"

6186 msgstr "Depuis %.*s\n"

6187

6101 -#: builtin/fetch.c:727

6188 +#: builtin/fetch.c:735

6189 #, c-format

6190 msgid ""

6191 "some local refs could not be updated; try running\n"

@@ -6107,55 +6194,55 @@ msgstr ""

6194 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

6195 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

6196

6110 -#: builtin/fetch.c:779

6197 +#: builtin/fetch.c:787

6198 #, c-format

6199 msgid " (%s will become dangling)"

6200 msgstr " (%s sera en suspens)"

6201

6115 -#: builtin/fetch.c:780

6202 +#: builtin/fetch.c:788

6203 #, c-format

6204 msgid " (%s has become dangling)"

6205 msgstr " (%s est devenu en suspens)"

6206

6120 -#: builtin/fetch.c:812

6207 +#: builtin/fetch.c:820

6208 msgid "[deleted]"

6209 msgstr "[supprimé]"

6210

6124 -#: builtin/fetch.c:813 builtin/remote.c:1040

6211 +#: builtin/fetch.c:821 builtin/remote.c:1025

6212 msgid "(none)"

6213 msgstr "(aucun(e))"

6214

6128 -#: builtin/fetch.c:833

6215 +#: builtin/fetch.c:841

6216 #, c-format

6217 msgid "Refusing to fetch into current branch %s of non-bare repository"

6218 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

6219

6133 -#: builtin/fetch.c:852

6220 +#: builtin/fetch.c:860

6221 #, c-format

6222 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6223 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

6224

6138 -#: builtin/fetch.c:855

6225 +#: builtin/fetch.c:863

6226 #, c-format

6227 msgid "Option \"%s\" is ignored for %s\n"

6228 msgstr "L'option \"%s\" est ignorée pour %s\n"

6229

6143 -#: builtin/fetch.c:911

6230 +#: builtin/fetch.c:920

6231 #, c-format

6232 msgid "Don't know how to fetch from %s"

6233 msgstr "Je ne sais pas récupérer depuis %s"

6234

6148 -#: builtin/fetch.c:1072

6235 +#: builtin/fetch.c:1080

6236 #, c-format

6237 msgid "Fetching %s\n"

6238 msgstr "Récupération de %s\n"

6239

6153 -#: builtin/fetch.c:1074 builtin/remote.c:96

6240 +#: builtin/fetch.c:1082 builtin/remote.c:96

6241 #, c-format

6242 msgid "Could not fetch %s"

6243 msgstr "Impossible de récupérer %s"

6244

6158 -#: builtin/fetch.c:1092

6245 +#: builtin/fetch.c:1100

6246 msgid ""

6247 "No remote repository specified. Please, specify either a URL or a\n"

6248 "remote name from which new revisions should be fetched."

@@ -6163,32 +6250,32 @@ msgstr ""

6250 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

6251 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

6252

6166 -#: builtin/fetch.c:1115

6253 +#: builtin/fetch.c:1123

6254 msgid "You need to specify a tag name."

6255 msgstr "Vous devez spécifier un nom d'étiquette."

6256

6170 -#: builtin/fetch.c:1157

6257 +#: builtin/fetch.c:1165

6258 msgid "--depth and --unshallow cannot be used together"

6259 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

6260

6174 -#: builtin/fetch.c:1159

6261 +#: builtin/fetch.c:1167

6262 msgid "--unshallow on a complete repository does not make sense"

6263 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

6264

6178 -#: builtin/fetch.c:1179

6265 +#: builtin/fetch.c:1187

6266 msgid "fetch --all does not take a repository argument"

6267 msgstr "fetch --all n'accepte pas d'argument de dépôt"

6268

6182 -#: builtin/fetch.c:1181

6269 +#: builtin/fetch.c:1189

6270 msgid "fetch --all does not make sense with refspecs"

6271 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

6272

6186 -#: builtin/fetch.c:1192

6273 +#: builtin/fetch.c:1200

6274 #, c-format

6275 msgid "No such remote or remote group: %s"

6276 msgstr "distant ou groupe distant inexistant : %s"

6277

6191 -#: builtin/fetch.c:1200

6278 +#: builtin/fetch.c:1208

6279 msgid "Fetching a group and specifying refspecs does not make sense"

6280 msgstr ""

6281 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -6421,233 +6508,247 @@ msgstr ""

6508 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

6509 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"

6510

6424 -#: builtin/grep.c:218

6511 +#: builtin/grep.c:219

6512 #, c-format

6513 msgid "grep: failed to create thread: %s"

6514 msgstr "grep : échec de création du fil: %s"

6515

6429 -#: builtin/grep.c:441 builtin/grep.c:476

6516 +#: builtin/grep.c:277

6517 +#, c-format

6518 +msgid "invalid number of threads specified (%d) for %s"

6519 +msgstr "nombre de fils spécifié invalide (%d) pour %s"

6520 +

6521 +#: builtin/grep.c:452 builtin/grep.c:487

6522 #, c-format

6523 msgid "unable to read tree (%s)"

6524 msgstr "impossible de lire l'arbre (%s)"

6525

6434 -#: builtin/grep.c:491

6526 +#: builtin/grep.c:502

6527 #, c-format

6528 msgid "unable to grep from object of type %s"

6529 msgstr "impossible de faire un grep sur un objet de type %s"

6530

6439 -#: builtin/grep.c:547

6531 +#: builtin/grep.c:558

6532 #, c-format

6533 msgid "switch `%c' expects a numerical value"

6534 msgstr "l'option '%c' attend un valeur numérique"

6535

6444 -#: builtin/grep.c:564

6536 +#: builtin/grep.c:575

6537 #, c-format

6538 msgid "cannot open '%s'"

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

6540

6449 -#: builtin/grep.c:633

6541 +#: builtin/grep.c:644

6542 msgid "search in index instead of in the work tree"

6543 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

6544

6453 -#: builtin/grep.c:635

6545 +#: builtin/grep.c:646

6546 msgid "find in contents not managed by git"

6547 msgstr "rechercher dans les contenus non gérés par git"

6548

6457 -#: builtin/grep.c:637

6549 +#: builtin/grep.c:648

6550 msgid "search in both tracked and untracked files"

6551 msgstr "rechercher dans les fichiers suivis et non-suivis"

6552

6461 -#: builtin/grep.c:639

6553 +#: builtin/grep.c:650

6554 msgid "ignore files specified via '.gitignore'"

6555 msgstr "ignorer les fichiers spécifiés via '.gitignore'"

6556

6465 -#: builtin/grep.c:642

6557 +#: builtin/grep.c:653

6558 msgid "show non-matching lines"

6559 msgstr "afficher les lignes qui ne correspondent pas"

6560

6469 -#: builtin/grep.c:644

6561 +#: builtin/grep.c:655

6562 msgid "case insensitive matching"

6563 msgstr "correspondance insensible à la casse"

6564

6473 -#: builtin/grep.c:646

6565 +#: builtin/grep.c:657

6566 msgid "match patterns only at word boundaries"

6567 msgstr "rechercher les motifs aux séparateurs de mots"

6568

6477 -#: builtin/grep.c:648

6569 +#: builtin/grep.c:659

6570 msgid "process binary files as text"

6571 msgstr "traiter les fichiers binaires comme texte"

6572

6481 -#: builtin/grep.c:650

6573 +#: builtin/grep.c:661

6574 msgid "don't match patterns in binary files"

6575 msgstr "ne pas chercher les motifs dans les fichiers binaires"

6576

6485 -#: builtin/grep.c:653

6577 +#: builtin/grep.c:664

6578 msgid "process binary files with textconv filters"

6579 msgstr "traiter les fichiers binaires avec les filtres textconv"

6580

6489 -#: builtin/grep.c:655

6581 +#: builtin/grep.c:666

6582 msgid "descend at most <depth> levels"

6583 msgstr "descendre au plus de <profondeur> dans l'arborescence"

6584

6493 -#: builtin/grep.c:659

6585 +#: builtin/grep.c:670

6586 msgid "use extended POSIX regular expressions"

6587 msgstr "utiliser des expressions régulières étendues POSIX"

6588

6497 -#: builtin/grep.c:662

6589 +#: builtin/grep.c:673

6590 msgid "use basic POSIX regular expressions (default)"

6591 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

6592

6501 -#: builtin/grep.c:665

6593 +#: builtin/grep.c:676

6594 msgid "interpret patterns as fixed strings"

6595 msgstr "interpréter les motifs comme de chaînes fixes"

6596

6505 -#: builtin/grep.c:668

6597 +#: builtin/grep.c:679

6598 msgid "use Perl-compatible regular expressions"

6599 msgstr "utiliser des expressions régulières compatibles avec Perl"

6600

6509 -#: builtin/grep.c:671

6601 +#: builtin/grep.c:682

6602 msgid "show line numbers"

6603 msgstr "afficher les numéros de ligne"

6604

6513 -#: builtin/grep.c:672

6605 +#: builtin/grep.c:683

6606 msgid "don't show filenames"

6607 msgstr "ne pas pas afficher les noms de fichier"

6608

6517 -#: builtin/grep.c:673

6609 +#: builtin/grep.c:684

6610 msgid "show filenames"

6611 msgstr "afficher les noms de fichier"

6612

6521 -#: builtin/grep.c:675

6613 +#: builtin/grep.c:686

6614 msgid "show filenames relative to top directory"

6615 msgstr "afficher les noms de fichiers relativement au répertoire de base"

6616

6525 -#: builtin/grep.c:677

6617 +#: builtin/grep.c:688

6618 msgid "show only filenames instead of matching lines"

6619 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

6620

6529 -#: builtin/grep.c:679

6621 +#: builtin/grep.c:690

6622 msgid "synonym for --files-with-matches"

6623 msgstr "synonyme pour --files-with-matches"

6624

6533 -#: builtin/grep.c:682

6625 +#: builtin/grep.c:693

6626 msgid "show only the names of files without match"

6627 msgstr "n'afficher que les noms des fichiers sans correspondance"

6628

6537 -#: builtin/grep.c:684

6629 +#: builtin/grep.c:695

6630 msgid "print NUL after filenames"

6631 msgstr "imprimer une caractère NUL après le noms de fichier"

6632

6541 -#: builtin/grep.c:686

6633 +#: builtin/grep.c:697

6634 msgid "show the number of matches instead of matching lines"

6635 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

6636

6545 -#: builtin/grep.c:687

6637 +#: builtin/grep.c:698

6638 msgid "highlight matches"

6639 msgstr "mettre en évidence les correspondances"

6640

6549 -#: builtin/grep.c:689

6641 +#: builtin/grep.c:700

6642 msgid "print empty line between matches from different files"

6643 msgstr ""

6644 "imprimer une ligne vide entre les correspondances de fichiers différents"

6645

6554 -#: builtin/grep.c:691

6646 +#: builtin/grep.c:702

6647 msgid "show filename only once above matches from same file"

6648 msgstr ""

6649 "afficher le nom de fichier une fois au dessus des correspondances du même "

6650 "fichier"

6651

6560 -#: builtin/grep.c:694

6652 +#: builtin/grep.c:705

6653 msgid "show <n> context lines before and after matches"

6654 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

6655

6564 -#: builtin/grep.c:697

6656 +#: builtin/grep.c:708

6657 msgid "show <n> context lines before matches"

6658 msgstr "afficher <n> lignes de contexte avant les correspondances"

6659

6568 -#: builtin/grep.c:699

6660 +#: builtin/grep.c:710

6661 msgid "show <n> context lines after matches"

6662 msgstr "afficher <n> lignes de contexte après les correspondances"

6663

6572 -#: builtin/grep.c:700

6664 +#: builtin/grep.c:712

6665 +msgid "use <n> worker threads"

6666 +msgstr "utiliser <n> fils de travail"

6667 +

6668 +#: builtin/grep.c:713

6669 msgid "shortcut for -C NUM"

6670 msgstr "raccourci pour -C NUM"

6671

6576 -#: builtin/grep.c:703

6672 +#: builtin/grep.c:716

6673 msgid "show a line with the function name before matches"

6674 msgstr ""

6675 "afficher une ligne avec le nom de la fonction avant les correspondances"

6676

6581 -#: builtin/grep.c:705

6677 +#: builtin/grep.c:718

6678 msgid "show the surrounding function"

6679 msgstr "afficher la fonction contenante"

6680

6585 -#: builtin/grep.c:708

6681 +#: builtin/grep.c:721

6682 msgid "read patterns from file"

6683 msgstr "lire les motifs depuis fichier"

6684

6589 -#: builtin/grep.c:710

6685 +#: builtin/grep.c:723

6686 msgid "match <pattern>"

6687 msgstr "rechercher <motif>"

6688

6593 -#: builtin/grep.c:712

6689 +#: builtin/grep.c:725

6690 msgid "combine patterns specified with -e"

6691 msgstr "combiner les motifs spécifiés par -e"

6692

6597 -#: builtin/grep.c:724

6693 +#: builtin/grep.c:737

6694 msgid "indicate hit with exit status without output"

6695 msgstr ""

6696 "indiquer des correspondances avec le code de sortie mais sans rien afficher"

6697

6602 -#: builtin/grep.c:726

6698 +#: builtin/grep.c:739

6699 msgid "show only matches from files that match all patterns"

6700 msgstr ""

6701 "n'afficher que les correspondances de fichiers qui correspondent à tous les "

6702 "motifs"

6703

6608 -#: builtin/grep.c:728

6704 +#: builtin/grep.c:741

6705 msgid "show parse tree for grep expression"

6706 msgstr "afficher l'arbre d'analyse pour le motif grep"

6707

6612 -#: builtin/grep.c:732

6708 +#: builtin/grep.c:745

6709 msgid "pager"

6710 msgstr "pagineur"

6711

6616 -#: builtin/grep.c:732

6712 +#: builtin/grep.c:745

6713 msgid "show matching files in the pager"

6714 msgstr "afficher les fichiers correspondant dans le pagineur"

6715

6620 -#: builtin/grep.c:735

6716 +#: builtin/grep.c:748

6717 msgid "allow calling of grep(1) (ignored by this build)"

6718 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

6719

6624 -#: builtin/grep.c:793

6720 +#: builtin/grep.c:811

6721 msgid "no pattern given."

6722 msgstr "aucun motif fourni."

6723

6628 -#: builtin/grep.c:851

6724 +#: builtin/grep.c:843 builtin/index-pack.c:1475

6725 +#, c-format

6726 +msgid "invalid number of threads specified (%d)"

6727 +msgstr "nombre de fils spécifié invalide (%d)"

6728 +

6729 +#: builtin/grep.c:873

6730 msgid "--open-files-in-pager only works on the worktree"

6731 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"

6732

6632 -#: builtin/grep.c:877

6733 +#: builtin/grep.c:899

6734 msgid "--cached or --untracked cannot be used with --no-index."

6735 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."

6736

6636 -#: builtin/grep.c:882

6737 +#: builtin/grep.c:904

6738 msgid "--no-index or --untracked cannot be used with revs."

6739 msgstr ""

6740 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."

6741

6641 -#: builtin/grep.c:885

6742 +#: builtin/grep.c:907

6743 msgid "--[no-]exclude-standard cannot be used for tracked contents."

6744 msgstr ""

6745 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."

6746

6646 -#: builtin/grep.c:893

6747 +#: builtin/grep.c:915

6748 msgid "both --cached and trees are given."

6749 msgstr "--cached et des arbres sont fournis en même temps."

6750

6650 -#: builtin/hash-object.c:80

6751 +#: builtin/hash-object.c:81

6752 msgid ""

6753 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6754 "[--] <file>..."

@@ -6655,38 +6756,38 @@ msgstr ""

6756 "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "

6757 "[--] <fichier>..."

6758

6658 -#: builtin/hash-object.c:81

6759 +#: builtin/hash-object.c:82

6760 msgid "git hash-object --stdin-paths"

6761 msgstr "git hash-object --stdin-paths"

6762

6662 -#: builtin/hash-object.c:92

6763 +#: builtin/hash-object.c:93

6764 msgid "type"

6765 msgstr "type"

6766

6666 -#: builtin/hash-object.c:92

6767 +#: builtin/hash-object.c:93

6768 msgid "object type"

6769 msgstr "type d'objet"

6770

6670 -#: builtin/hash-object.c:93

6771 +#: builtin/hash-object.c:94

6772 msgid "write the object into the object database"

6773 msgstr "écrire l'objet dans la base de donnée d'objets"

6774

6674 -#: builtin/hash-object.c:95

6775 +#: builtin/hash-object.c:96

6776 msgid "read the object from stdin"

6777 msgstr "lire l'objet depuis l'entrée standard"

6778

6678 -#: builtin/hash-object.c:97

6779 +#: builtin/hash-object.c:98

6780 msgid "store file as is without filters"

6781 msgstr "stocker le fichier tel quel sans filtrage"

6782

6682 -#: builtin/hash-object.c:98

6783 +#: builtin/hash-object.c:99

6784 msgid ""

6785 "just hash any random garbage to create corrupt objects for debugging Git"

6786 msgstr ""

6787 "juste hasher n'importe quel contenu pour créer des objets corrompus pour "

6788 "debugger Git"

6789

6689 -#: builtin/hash-object.c:99

6790 +#: builtin/hash-object.c:100

6791 msgid "process file as it were from this path"

6792 msgstr "traiter le fichier comme s'il venait de ce chemin"

6793

@@ -6737,7 +6838,7 @@ msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."

6838 msgid "failed to exec '%s': %s"

6839 msgstr "échec de l'exécution de '%s' : %s"

6840

6740 -#: builtin/help.c:208

6841 +#: builtin/help.c:205

6842 #, c-format

6843 msgid ""

6844 "'%s': path for unsupported man viewer.\n"

@@ -6746,7 +6847,7 @@ msgstr ""

6847 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"

6848 "Veuillez utiliser plutôt 'man.<outil>.cmd'."

6849

6749 -#: builtin/help.c:220

6850 +#: builtin/help.c:217

6851 #, c-format

6852 msgid ""

6853 "'%s': cmd for supported man viewer.\n"

@@ -6755,62 +6856,62 @@ msgstr ""

6856 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"

6857 "Veuillez utiliser plutôt 'man.<outil>.cmd'."

6858

6758 -#: builtin/help.c:337

6859 +#: builtin/help.c:334

6860 #, c-format

6861 msgid "'%s': unknown man viewer."

6862 msgstr "'%s' : visualiseur de manuel inconnu."

6863

6763 -#: builtin/help.c:354

6864 +#: builtin/help.c:351

6865 msgid "no man viewer handled the request"

6866 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"

6867

6767 -#: builtin/help.c:362

6868 +#: builtin/help.c:359

6869 msgid "no info viewer handled the request"

6870 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"

6871

6771 -#: builtin/help.c:411

6872 +#: builtin/help.c:408

6873 msgid "Defining attributes per path"

6874 msgstr "Définition des attributs par chemin"

6875

6775 -#: builtin/help.c:412

6876 +#: builtin/help.c:409

6877 msgid "Everyday Git With 20 Commands Or So"

6878 msgstr "Git de tous les jours avec à peu près 20 commandes"

6879

6779 -#: builtin/help.c:413

6880 +#: builtin/help.c:410

6881 msgid "A Git glossary"

6882 msgstr "Un glossaire Git"

6883

6783 -#: builtin/help.c:414

6884 +#: builtin/help.c:411

6885 msgid "Specifies intentionally untracked files to ignore"

6886 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"

6887

6787 -#: builtin/help.c:415

6888 +#: builtin/help.c:412

6889 msgid "Defining submodule properties"

6890 msgstr "Définition des propriétés de sous-module"

6891

6791 -#: builtin/help.c:416

6892 +#: builtin/help.c:413

6893 msgid "Specifying revisions and ranges for Git"

6894 msgstr "Spécification des révisions et portées pour Git"

6895

6795 -#: builtin/help.c:417

6896 +#: builtin/help.c:414

6897 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

6898 msgstr ""

6899 "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"

6900

6800 -#: builtin/help.c:418

6901 +#: builtin/help.c:415

6902 msgid "An overview of recommended workflows with Git"

6903 msgstr "Un aperçu des flux de travail recommandés avec Git"

6904

6804 -#: builtin/help.c:430

6905 +#: builtin/help.c:427

6906 msgid "The common Git guides are:\n"

6907 msgstr "Les guides Git populaires sont : \n"

6908

6808 -#: builtin/help.c:451 builtin/help.c:468

6909 +#: builtin/help.c:448 builtin/help.c:465

6910 #, c-format

6911 msgid "usage: %s%s"

6912 msgstr "usage : %s%s"

6913

6813 -#: builtin/help.c:484

6914 +#: builtin/help.c:481

6915 #, c-format

6916 msgid "`git %s' is aliased to `%s'"

6917 msgstr "`git %s\" est un alias de `%s'"

@@ -7047,11 +7148,6 @@ msgstr "impossible de stocker le fichier d'index"

7148 msgid "bad pack.indexversion=%<PRIu32>"

7149 msgstr "mauvais pack.indexversion=%<PRIu32>"

7150

7050 -#: builtin/index-pack.c:1475

7051 -#, c-format

7052 -msgid "invalid number of threads specified (%d)"

7053 -msgstr "nombre de fils spécifié invalide (%d)"

7054 -

7151 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663

7152 #, c-format

7153 msgid "no threads support, ignoring %s"

@@ -7227,24 +7323,30 @@ msgstr "Impossible d'accéder à l'arbre de travail '%s'"

7323

7324 #: builtin/interpret-trailers.c:15

7325 msgid ""

7230 -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "

7231 -"[<file>...]"

7232 -msgstr ""

7233 -"git interpret-trailers [--trim-empty] [(--trailer "

7234 -"<symbole>[(=|:)<valeur>])...] [<fichier>...]"

7326 +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

7327 +"<token>[(=|:)<value>])...] [<file>...]"

7328 +msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <symbole>[(=|:)<valeur>])...] [<fichier>...]"

7329

7236 -#: builtin/interpret-trailers.c:25

7330 +#: builtin/interpret-trailers.c:26

7331 +msgid "edit files in place"

7332 +msgstr "éditer les fichiers sur place"

7333 +

7334 +#: builtin/interpret-trailers.c:27

7335 msgid "trim empty trailers"

7336 msgstr "éliminer les lignes de fin vides"

7337

7240 -#: builtin/interpret-trailers.c:26

7338 +#: builtin/interpret-trailers.c:28

7339 msgid "trailer"

7340 msgstr "ligne de fin"

7341

7244 -#: builtin/interpret-trailers.c:27

7342 +#: builtin/interpret-trailers.c:29

7343 msgid "trailer(s) to add"

7344 msgstr "ligne(s) de fin à ajouter"

7345

7346 +#: builtin/interpret-trailers.c:42

7347 +msgid "no input file given for in-place editing"

7348 +msgstr "aucun fichier en entrée pour l'éditon sur place"

7349 +

7350 #: builtin/log.c:43

7351 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

7352 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"

@@ -7300,226 +7402,226 @@ msgstr "Impossible de lire l'objet %s"

7402 msgid "Unknown type: %d"

7403 msgstr "Type inconnu : %d"

7404

7303 -#: builtin/log.c:714

7405 +#: builtin/log.c:715

7406 msgid "format.headers without value"

7407 msgstr "format.headers sans valeur"

7408

7307 -#: builtin/log.c:798

7409 +#: builtin/log.c:801

7410 msgid "name of output directory is too long"

7411 msgstr "le nom du répertoire de sortie est trop long"

7412

7311 -#: builtin/log.c:813

7413 +#: builtin/log.c:816

7414 #, c-format

7415 msgid "Cannot open patch file %s"

7416 msgstr "Impossible d'ouvrir le fichier correctif %s"

7417

7316 -#: builtin/log.c:827

7418 +#: builtin/log.c:830

7419 msgid "Need exactly one range."

7420 msgstr "Exactement une plage nécessaire."

7421

7320 -#: builtin/log.c:837

7422 +#: builtin/log.c:840

7423 msgid "Not a range."

7424 msgstr "Ceci n'est pas une plage."

7425

7324 -#: builtin/log.c:943

7426 +#: builtin/log.c:946

7427 msgid "Cover letter needs email format"

7428 msgstr "La lettre de motivation doit être au format e-mail"

7429

7328 -#: builtin/log.c:1022

7430 +#: builtin/log.c:1025

7431 #, c-format

7432 msgid "insane in-reply-to: %s"

7433 msgstr "in-reply-to aberrant : %s"

7434

7333 -#: builtin/log.c:1050

7435 +#: builtin/log.c:1053

7436 msgid "git format-patch [<options>] [<since> | <revision-range>]"

7437 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"

7438

7337 -#: builtin/log.c:1095

7439 +#: builtin/log.c:1098

7440 msgid "Two output directories?"

7441 msgstr "Deux répertoires de sortie ?"

7442

7341 -#: builtin/log.c:1211

7443 +#: builtin/log.c:1214

7444 msgid "use [PATCH n/m] even with a single patch"

7445 msgstr "utiliser [PATCH n/m] même avec un patch unique"

7446

7345 -#: builtin/log.c:1214

7447 +#: builtin/log.c:1217

7448 msgid "use [PATCH] even with multiple patches"

7449 msgstr "utiliser [PATCH] même avec des patchs multiples"

7450

7349 -#: builtin/log.c:1218

7451 +#: builtin/log.c:1221

7452 msgid "print patches to standard out"

7453 msgstr "afficher les patchs sur la sortie standard"

7454

7353 -#: builtin/log.c:1220

7455 +#: builtin/log.c:1223

7456 msgid "generate a cover letter"

7457 msgstr "générer une lettre de motivation"

7458

7357 -#: builtin/log.c:1222

7459 +#: builtin/log.c:1225

7460 msgid "use simple number sequence for output file names"

7461 msgstr ""

7462 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"

7463

7362 -#: builtin/log.c:1223

7464 +#: builtin/log.c:1226

7465 msgid "sfx"

7466 msgstr "sfx"

7467

7366 -#: builtin/log.c:1224

7468 +#: builtin/log.c:1227

7469 msgid "use <sfx> instead of '.patch'"

7470 msgstr "utiliser <sfx> au lieu de '.patch'"

7471

7370 -#: builtin/log.c:1226

7472 +#: builtin/log.c:1229

7473 msgid "start numbering patches at <n> instead of 1"

7474 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"

7475

7374 -#: builtin/log.c:1228

7476 +#: builtin/log.c:1231

7477 msgid "mark the series as Nth re-roll"

7478 msgstr "marquer la série comme une Nième réédition"

7479

7378 -#: builtin/log.c:1230

7480 +#: builtin/log.c:1233

7481 msgid "Use [<prefix>] instead of [PATCH]"

7482 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"

7483

7382 -#: builtin/log.c:1233

7484 +#: builtin/log.c:1236

7485 msgid "store resulting files in <dir>"

7486 msgstr "stocker les fichiers résultats dans <répertoire>"

7487

7386 -#: builtin/log.c:1236

7488 +#: builtin/log.c:1239

7489 msgid "don't strip/add [PATCH]"

7490 msgstr "ne pas retirer/ajouter [PATCH]"

7491

7390 -#: builtin/log.c:1239

7492 +#: builtin/log.c:1242

7493 msgid "don't output binary diffs"

7494 msgstr "ne pas imprimer les diffs binaires"

7495

7394 -#: builtin/log.c:1241

7496 +#: builtin/log.c:1244

7497 msgid "output all-zero hash in From header"

7498 msgstr "écrire une empreinte à zéro dans l'entête From"

7499

7398 -#: builtin/log.c:1243

7500 +#: builtin/log.c:1246

7501 msgid "don't include a patch matching a commit upstream"

7502 msgstr "ne pas inclure un patch correspondant à un commit amont"

7503

7402 -#: builtin/log.c:1245

7504 +#: builtin/log.c:1248

7505 msgid "show patch format instead of default (patch + stat)"

7506 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"

7507

7406 -#: builtin/log.c:1247

7508 +#: builtin/log.c:1250

7509 msgid "Messaging"

7510 msgstr "Communication"

7511

7410 -#: builtin/log.c:1248

7512 +#: builtin/log.c:1251

7513 msgid "header"

7514 msgstr "en-tête"

7515

7414 -#: builtin/log.c:1249

7516 +#: builtin/log.c:1252

7517 msgid "add email header"

7518 msgstr "ajouter l'en-tête d'e-mail"

7519

7418 -#: builtin/log.c:1250 builtin/log.c:1252

7520 +#: builtin/log.c:1253 builtin/log.c:1255

7521 msgid "email"

7522 msgstr "e-mail"

7523

7422 -#: builtin/log.c:1250

7524 +#: builtin/log.c:1253

7525 msgid "add To: header"

7526 msgstr "ajouter l'en-tête \"To:\""

7527

7426 -#: builtin/log.c:1252

7528 +#: builtin/log.c:1255

7529 msgid "add Cc: header"

7530 msgstr "ajouter l'en-tête \"Cc:\""

7531

7430 -#: builtin/log.c:1254

7532 +#: builtin/log.c:1257

7533 msgid "ident"

7534 msgstr "ident"

7535

7434 -#: builtin/log.c:1255

7536 +#: builtin/log.c:1258

7537 msgid "set From address to <ident> (or committer ident if absent)"

7538 msgstr ""

7539 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"

7540

7439 -#: builtin/log.c:1257

7541 +#: builtin/log.c:1260

7542 msgid "message-id"

7543 msgstr "id-message"

7544

7443 -#: builtin/log.c:1258

7545 +#: builtin/log.c:1261

7546 msgid "make first mail a reply to <message-id>"

7547 msgstr "répondre dans le premier message à <id-message>"

7548

7447 -#: builtin/log.c:1259 builtin/log.c:1262

7549 +#: builtin/log.c:1262 builtin/log.c:1265

7550 msgid "boundary"

7551 msgstr "limite"

7552

7451 -#: builtin/log.c:1260

7553 +#: builtin/log.c:1263

7554 msgid "attach the patch"

7555 msgstr "attacher le patch"

7556

7455 -#: builtin/log.c:1263

7557 +#: builtin/log.c:1266

7558 msgid "inline the patch"

7559 msgstr "patch à l'intérieur"

7560

7459 -#: builtin/log.c:1267

7561 +#: builtin/log.c:1270

7562 msgid "enable message threading, styles: shallow, deep"

7563 msgstr ""

7564 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"

7565

7464 -#: builtin/log.c:1269

7566 +#: builtin/log.c:1272

7567 msgid "signature"

7568 msgstr "signature"

7569

7468 -#: builtin/log.c:1270

7570 +#: builtin/log.c:1273

7571 msgid "add a signature"

7572 msgstr "ajouter une signature"

7573

7472 -#: builtin/log.c:1272

7574 +#: builtin/log.c:1275

7575 msgid "add a signature from a file"

7576 msgstr "ajouter une signature depuis un fichier"

7577

7476 -#: builtin/log.c:1273

7578 +#: builtin/log.c:1276

7579 msgid "don't print the patch filenames"

7580 msgstr "ne pas afficher les noms de fichiers des patchs"

7581

7480 -#: builtin/log.c:1362

7582 +#: builtin/log.c:1365

7583 msgid "-n and -k are mutually exclusive."

7584 msgstr "-n et -k sont mutuellement exclusifs."

7585

7484 -#: builtin/log.c:1364

7586 +#: builtin/log.c:1367

7587 msgid "--subject-prefix and -k are mutually exclusive."

7588 msgstr "--subject-prefix et -k sont mutuellement exclusifs."

7589

7488 -#: builtin/log.c:1372

7590 +#: builtin/log.c:1375

7591 msgid "--name-only does not make sense"

7592 msgstr "--name-only n'a pas de sens"

7593

7492 -#: builtin/log.c:1374

7594 +#: builtin/log.c:1377

7595 msgid "--name-status does not make sense"

7596 msgstr "--name-status n'a pas de sens"

7597

7496 -#: builtin/log.c:1376

7598 +#: builtin/log.c:1379

7599 msgid "--check does not make sense"

7600 msgstr "--check n'a pas de sens"

7601

7500 -#: builtin/log.c:1401

7602 +#: builtin/log.c:1407

7603 msgid "standard output, or directory, which one?"

7604 msgstr "sortie standard, ou répertoire, lequel ?"

7605

7504 -#: builtin/log.c:1403

7606 +#: builtin/log.c:1409

7607 #, c-format

7608 msgid "Could not create directory '%s'"

7609 msgstr "Impossible de créer le répertoire '%s'"

7610

7509 -#: builtin/log.c:1500

7611 +#: builtin/log.c:1506

7612 #, c-format

7613 msgid "unable to read signature file '%s'"

7614 msgstr "lecture du fichier de signature '%s' impossible"

7615

7514 -#: builtin/log.c:1563

7616 +#: builtin/log.c:1569

7617 msgid "Failed to create output files"

7618 msgstr "Échec de création des fichiers en sortie"

7619

7518 -#: builtin/log.c:1611

7620 +#: builtin/log.c:1617

7621 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7622 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"

7623

7522 -#: builtin/log.c:1665

7624 +#: builtin/log.c:1671

7625 #, c-format

7626 msgid ""

7627 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

@@ -7527,106 +7629,156 @@ msgstr ""

7629 "Impossible de trouver une branche distante suivie, merci de spécifier "

7630 "<branche_amont> manuellement.\n"

7631

7530 -#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7632 +#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696

7633 #, c-format

7634 msgid "Unknown commit %s"

7635 msgstr "Commit inconnu %s"

7636

7535 -#: builtin/ls-files.c:358

7637 +#: builtin/ls-files.c:378

7638 msgid "git ls-files [<options>] [<file>...]"

7639 msgstr "git ls-files [<options>] [<fichier>...]"

7640

7539 -#: builtin/ls-files.c:415

7641 +#: builtin/ls-files.c:427

7642 msgid "identify the file status with tags"

7643 msgstr "identifier le statut de fichier avec les étiquettes"

7644

7543 -#: builtin/ls-files.c:417

7645 +#: builtin/ls-files.c:429

7646 msgid "use lowercase letters for 'assume unchanged' files"

7647 msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"

7648

7547 -#: builtin/ls-files.c:419

7649 +#: builtin/ls-files.c:431

7650 msgid "show cached files in the output (default)"

7651 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"

7652

7551 -#: builtin/ls-files.c:421

7653 +#: builtin/ls-files.c:433

7654 msgid "show deleted files in the output"

7655 msgstr "afficher les fichiers supprimés dans la sortie"

7656

7555 -#: builtin/ls-files.c:423

7657 +#: builtin/ls-files.c:435

7658 msgid "show modified files in the output"

7659 msgstr "afficher les fichiers modifiés dans la sortie"

7660

7559 -#: builtin/ls-files.c:425

7661 +#: builtin/ls-files.c:437

7662 msgid "show other files in the output"

7663 msgstr "afficher les autres fichiers dans la sortie"

7664

7563 -#: builtin/ls-files.c:427

7665 +#: builtin/ls-files.c:439

7666 msgid "show ignored files in the output"

7667 msgstr "afficher les fichiers ignorés dans la sortie"

7668

7567 -#: builtin/ls-files.c:430

7669 +#: builtin/ls-files.c:442

7670 msgid "show staged contents' object name in the output"

7671 msgstr "afficher les nom des objets indexés dans la sortie"

7672

7571 -#: builtin/ls-files.c:432

7673 +#: builtin/ls-files.c:444

7674 msgid "show files on the filesystem that need to be removed"

7675 msgstr ""

7676 "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"

7677

7576 -#: builtin/ls-files.c:434

7678 +#: builtin/ls-files.c:446

7679 msgid "show 'other' directories' names only"

7680 msgstr "afficher seulement les noms des répertoires 'other'"

7681

7580 -#: builtin/ls-files.c:437

7682 +#: builtin/ls-files.c:448

7683 +msgid "show line endings of files"

7684 +msgstr "afficher les fins de lignes des fichiers"

7685 +

7686 +#: builtin/ls-files.c:450

7687 msgid "don't show empty directories"

7688 msgstr "ne pas afficher les répertoires vides"

7689

7584 -#: builtin/ls-files.c:440

7690 +#: builtin/ls-files.c:453

7691 msgid "show unmerged files in the output"

7692 msgstr "afficher les fichiers non fusionnés dans la sortie"

7693

7588 -#: builtin/ls-files.c:442

7694 +#: builtin/ls-files.c:455

7695 msgid "show resolve-undo information"

7696 msgstr "afficher l'information resolv-undo"

7697

7592 -#: builtin/ls-files.c:444

7698 +#: builtin/ls-files.c:457

7699 msgid "skip files matching pattern"

7700 msgstr "sauter les fichiers correspondant au motif"

7701

7596 -#: builtin/ls-files.c:447

7702 +#: builtin/ls-files.c:460

7703 msgid "exclude patterns are read from <file>"

7704 msgstr "les motifs d'exclusion sont lus depuis <fichier>"

7705

7600 -#: builtin/ls-files.c:450

7706 +#: builtin/ls-files.c:463

7707 msgid "read additional per-directory exclude patterns in <file>"

7708 msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"

7709

7604 -#: builtin/ls-files.c:452

7710 +#: builtin/ls-files.c:465

7711 msgid "add the standard git exclusions"

7712 msgstr "ajouter les exclusions git standard"

7713

7608 -#: builtin/ls-files.c:455

7714 +#: builtin/ls-files.c:468

7715 msgid "make the output relative to the project top directory"

7716 msgstr "afficher en relatif par rapport au répertoire racine du projet"

7717

7612 -#: builtin/ls-files.c:458

7718 +#: builtin/ls-files.c:471

7719 msgid "if any <file> is not in the index, treat this as an error"

7720 msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"

7721

7616 -#: builtin/ls-files.c:459

7722 +#: builtin/ls-files.c:472

7723 msgid "tree-ish"

7724 msgstr "arbre ou apparenté"

7725

7620 -#: builtin/ls-files.c:460

7726 +#: builtin/ls-files.c:473

7727 msgid "pretend that paths removed since <tree-ish> are still present"

7728 msgstr ""

7729 "considérer que les chemins supprimés depuis <arbre ou apparenté> sont "

7730 "toujours présents"

7731

7626 -#: builtin/ls-files.c:462

7732 +#: builtin/ls-files.c:475

7733 msgid "show debugging data"

7734 msgstr "afficher les données de débogage"

7735

7736 +#: builtin/ls-remote.c:7

7737 +msgid ""

7738 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7739 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7740 +" [--symref] [<repository> [<refs>...]]"

7741 +msgstr ""

7742 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

7743 +" [-q | --quiet] [--exit-code] [--get-url]\n"

7744 +" [--symref] [<dépôt> [<références>...]]"

7745 +

7746 +#: builtin/ls-remote.c:50

7747 +msgid "do not print remote URL"

7748 +msgstr "ne pas afficher les URL distantes"

7749 +

7750 +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53

7751 +msgid "exec"

7752 +msgstr "exécutable"

7753 +

7754 +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54

7755 +msgid "path of git-upload-pack on the remote host"

7756 +msgstr "chemin vers git-upload-pack sur le serveur distant"

7757 +

7758 +#: builtin/ls-remote.c:56

7759 +msgid "limit to tags"

7760 +msgstr "limiter aux étiquettes"

7761 +

7762 +#: builtin/ls-remote.c:57

7763 +msgid "limit to heads"

7764 +msgstr "limiter aux heads"

7765 +

7766 +#: builtin/ls-remote.c:58

7767 +msgid "do not show peeled tags"

7768 +msgstr "ne pas afficher les étiquettes pelées"

7769 +

7770 +#: builtin/ls-remote.c:60

7771 +msgid "take url.<base>.insteadOf into account"

7772 +msgstr "prendre en compte url.<base>.insteadOf"

7773 +

7774 +#: builtin/ls-remote.c:62

7775 +msgid "exit with exit code 2 if no matching refs are found"

7776 +msgstr "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est trouvée"

7777 +

7778 +#: builtin/ls-remote.c:64

7779 +msgid "show underlying ref in addition to the object pointed by it"

7780 +msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"

7781 +

l10n: fr.po v2.8.0 round 1 2509t