ffd5159bcc · 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-09-15 06:45+0800\n"

77 -"PO-Revision-Date: 2015-09-15 20:20+0200\n"

76 +"POT-Creation-Date: 2015-12-11 23:36+0800\n"

77 +"PO-Revision-Date: 2015-12-18 21:55+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,13 +96,13 @@ 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:1227

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

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

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

102

103 #: advice.c:103

104 -msgid "Please, commit your changes before you can merge."

105 -msgstr "Veuillez valider vos changements avant de pouvoir fusionner."

104 +msgid "Please, commit your changes before merging."

105 +msgstr "Veuillez valider vos changements avant de fusionner."

106

107 #: advice.c:104

108 msgid "Exiting because of unfinished merge."

@@ -127,76 +127,76 @@ msgstr ""

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

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

129

130 -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

130 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

131 #, c-format

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

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

134

135 -#: archive.c:428

135 +#: archive.c:429

136 msgid "fmt"

137 msgstr "fmt"

138

139 -#: archive.c:428

139 +#: archive.c:429

140 msgid "archive format"

141 msgstr "format d'archive"

142

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

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

144 msgid "prefix"

145 msgstr "préfixe"

146

147 -#: archive.c:430

147 +#: archive.c:431

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:431 builtin/archive.c:88 builtin/blame.c:2516 builtin/blame.c:2517

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:712 builtin/hash-object.c:99 builtin/ls-files.c:446

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

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

156 msgid "file"

157 msgstr "fichier"

158

159 -#: archive.c:432 builtin/archive.c:89

159 +#: archive.c:433 builtin/archive.c:89

160 msgid "write the archive to this file"

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

162

163 -#: archive.c:434

163 +#: archive.c:435

164 msgid "read .gitattributes in working directory"

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

166

167 -#: archive.c:435

167 +#: archive.c:436

168 msgid "report archived files on stderr"

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

170

171 -#: archive.c:436

171 +#: archive.c:437

172 msgid "store only"

173 msgstr "stockage seulement"

174

175 -#: archive.c:437

175 +#: archive.c:438

176 msgid "compress faster"

177 msgstr "compression rapide"

178

179 -#: archive.c:445

179 +#: archive.c:446

180 msgid "compress better"

181 msgstr "compression efficace"

182

183 -#: archive.c:448

183 +#: archive.c:449

184 msgid "list supported archive formats"

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

186

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

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

188 msgid "repo"

189 msgstr "dépôt"

190

191 -#: archive.c:451 builtin/archive.c:91

191 +#: archive.c:452 builtin/archive.c:91

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:452 builtin/archive.c:92 builtin/notes.c:479

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

196 msgid "command"

197 msgstr "commande"

198

199 -#: archive.c:453 builtin/archive.c:93

199 +#: archive.c:454 builtin/archive.c:93

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

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

202

@@ -208,90 +208,90 @@ 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:60

211 +#: branch.c:61

212 #, c-format

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

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

215

216 -#: branch.c:83

216 +#: branch.c:84

217 #, c-format

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

219 msgstr ""

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

221 "rebasant."

222

223 -#: branch.c:84

223 +#: branch.c:85

224 #, c-format

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

226 msgstr ""

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

228

229 -#: branch.c:88

229 +#: branch.c:89

230 #, c-format

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

232 msgstr ""

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

234

235 -#: branch.c:89

235 +#: branch.c:90

236 #, c-format

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

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

239

240 -#: branch.c:94

240 +#: branch.c:95

241 #, c-format

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

243 msgstr ""

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

245 "rebasant."

246

247 -#: branch.c:95

247 +#: branch.c:96

248 #, c-format

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

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

251

252 -#: branch.c:99

252 +#: branch.c:100

253 #, c-format

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

255 msgstr ""

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

257

258 -#: branch.c:100

258 +#: branch.c:101

259 #, c-format

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

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

262

263 -#: branch.c:133

263 +#: branch.c:134

264 #, c-format

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

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

267

268 -#: branch.c:162

268 +#: branch.c:163

269 #, c-format

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

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

272

273 -#: branch.c:167

273 +#: branch.c:168

274 #, c-format

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

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

277

278 -#: branch.c:175

278 +#: branch.c:176

279 msgid "Cannot force update the current branch."

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

281

282 -#: branch.c:195

282 +#: branch.c:196

283 #, c-format

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

285 msgstr ""

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

287 "pas une branche."

288

289 -#: branch.c:197

289 +#: branch.c:198

290 #, c-format

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

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

293

294 -#: branch.c:199

294 +#: branch.c:200

295 msgid ""

296 "\n"

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

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

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

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

313

314 -#: branch.c:243

314 +#: branch.c:244

315 #, c-format

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

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

318

319 -#: branch.c:263

319 +#: branch.c:264

320 #, c-format

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

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

323

324 -#: branch.c:268

324 +#: branch.c:269

325 #, c-format

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

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

328

329 -#: branch.c:399

329 +#: branch.c:322

330 #, c-format

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

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

@@ -341,7 +341,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

343

344 -#: bundle.c:87 builtin/commit.c:765

344 +#: bundle.c:87 builtin/commit.c:766

345 #, c-format

346 msgid "could not open '%s'"

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

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

350 msgid "Repository lacks these prerequisite commits:"

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

352

353 -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

354 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

355 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

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:1456 builtin/log.c:1689 builtin/merge.c:358

356 #: builtin/shortlog.c:158

357 msgid "revision walk setup failed"

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

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

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

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

394

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

395 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

396 #, c-format

397 msgid "unrecognized argument: %s"

398 msgstr "argument non reconnu : %s"

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

410 msgid "index-pack died"

411 msgstr "l'index de groupe a disparu"

412

413 -#: color.c:260

413 +#: color.c:275

414 #, c-format

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

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

417

418 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

419 -#: builtin/am.c:2128

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

419 +#: builtin/am.c:2149

420 #, c-format

421 msgid "could not parse %s"

422 msgstr "impossible d'analyser %s"

@@ -577,24 +577,24 @@ msgstr "impossible de lire le fichier de commande '%s'"

577 msgid "Performing inexact rename detection"

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

579

580 -#: diff.c:116

580 +#: diff.c:115

581 #, c-format

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

583 msgstr ""

584 " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"

585

586 -#: diff.c:121

586 +#: diff.c:120

587 #, c-format

588 msgid " Unknown dirstat parameter '%s'\n"

589 msgstr " Paramètre dirstat inconnu '%s'\n"

590

591 -#: diff.c:216

591 +#: diff.c:215

592 #, c-format

593 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

594 msgstr ""

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

596

597 -#: diff.c:268

597 +#: diff.c:267

598 #, c-format

599 msgid ""

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

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

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

604 "%s"

605

606 -#: diff.c:2998

606 +#: diff.c:3000

607 #, c-format

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

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

610

611 -#: diff.c:3394

611 +#: diff.c:3396

612 msgid "--follow requires exactly one pathspec"

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

614

615 -#: diff.c:3557

615 +#: diff.c:3559

616 #, c-format

617 msgid ""

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

@@ -621,16 +621,16 @@ msgstr ""

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

622 "%s"

623

624 -#: diff.c:3571

624 +#: diff.c:3573

625 #, c-format

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

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

628

629 -#: dir.c:1853

629 +#: dir.c:1915

630 msgid "failed to get kernel name and information"

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

632

633 -#: dir.c:1936

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."

636

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

740 msgid "failed to read the cache"

741 msgstr "impossible de lire le cache"

742

743 -#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

744 -#: builtin/checkout.c:586 builtin/clone.c:715

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

745 msgid "unable to write new index file"

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

747

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

759 msgid "error building trees"

760 msgstr "erreur de construction des arbres"

761

762 -#: merge-recursive.c:687

762 +#: merge-recursive.c:686

763 #, c-format

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

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

766

767 -#: merge-recursive.c:698

767 +#: merge-recursive.c:697

768 #, c-format

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

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

771

772 -#: merge-recursive.c:712 merge-recursive.c:733

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

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

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

775

776 -#: merge-recursive.c:723

776 +#: merge-recursive.c:722

777 #, c-format

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

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

780

781 -#: merge-recursive.c:763

781 +#: merge-recursive.c:762

782 #, c-format

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

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

785

786 -#: merge-recursive.c:765

786 +#: merge-recursive.c:764

787 #, c-format

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

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

790

791 -#: merge-recursive.c:788 builtin/clone.c:364

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

792 #, c-format

793 msgid "failed to open '%s'"

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

795

796 -#: merge-recursive.c:796

796 +#: merge-recursive.c:795

797 #, c-format

798 msgid "failed to symlink '%s'"

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

800

801 -#: merge-recursive.c:799

801 +#: merge-recursive.c:798

802 #, c-format

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

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

805

806 -#: merge-recursive.c:937

806 +#: merge-recursive.c:936

807 msgid "Failed to execute internal merge"

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

809

810 -#: merge-recursive.c:941

810 +#: merge-recursive.c:940

811 #, c-format

812 msgid "Unable to add %s to database"

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

814

815 -#: merge-recursive.c:957

815 +#: merge-recursive.c:956

816 msgid "unsupported object type in the tree"

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

818

819 -#: merge-recursive.c:1032 merge-recursive.c:1046

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

820 #, c-format

821 msgid ""

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

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

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

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

827

828 -#: merge-recursive.c:1038 merge-recursive.c:1051

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

829 #, c-format

830 msgid ""

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

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

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

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

836

837 -#: merge-recursive.c:1092

837 +#: merge-recursive.c:1091

838 msgid "rename"

839 msgstr "renommage"

840

841 -#: merge-recursive.c:1092

841 +#: merge-recursive.c:1091

842 msgid "renamed"

843 msgstr "renommé"

844

845 -#: merge-recursive.c:1148

845 +#: merge-recursive.c:1147

846 #, c-format

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

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

849

850 -#: merge-recursive.c:1170

850 +#: merge-recursive.c:1169

851 #, c-format

852 msgid ""

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

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

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

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

858

859 -#: merge-recursive.c:1175

859 +#: merge-recursive.c:1174

860 msgid " (left unresolved)"

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

862

863 -#: merge-recursive.c:1229

863 +#: merge-recursive.c:1228

864 #, c-format

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

866 msgstr ""

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

868 ">'%s' dans %s"

869

870 -#: merge-recursive.c:1259

870 +#: merge-recursive.c:1258

871 #, c-format

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

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

874

875 -#: merge-recursive.c:1458

875 +#: merge-recursive.c:1457

876 #, c-format

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

878 msgstr ""

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

880

881 -#: merge-recursive.c:1468

881 +#: merge-recursive.c:1467

882 #, c-format

883 msgid "Adding merged %s"

884 msgstr "Ajout de %s fusionné"

885

886 -#: merge-recursive.c:1473 merge-recursive.c:1671

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

887 #, c-format

888 msgid "Adding as %s instead"

889 msgstr "Ajout plutôt comme %s"

890

891 -#: merge-recursive.c:1524

891 +#: merge-recursive.c:1523

892 #, c-format

893 msgid "cannot read object %s"

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

895

896 -#: merge-recursive.c:1527

896 +#: merge-recursive.c:1526

897 #, c-format

898 msgid "object %s is not a blob"

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

900

901 -#: merge-recursive.c:1575

901 +#: merge-recursive.c:1578

902 msgid "modify"

903 msgstr "modification"

904

905 -#: merge-recursive.c:1575

905 +#: merge-recursive.c:1578

906 msgid "modified"

907 msgstr "modifié"

908

909 -#: merge-recursive.c:1585

909 +#: merge-recursive.c:1588

910 msgid "content"

911 msgstr "contenu"

912

913 -#: merge-recursive.c:1592

913 +#: merge-recursive.c:1595

914 msgid "add/add"

915 msgstr "ajout/ajout"

916

917 -#: merge-recursive.c:1626

917 +#: merge-recursive.c:1629

918 #, c-format

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

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

921

922 -#: merge-recursive.c:1640

922 +#: merge-recursive.c:1643

923 #, c-format

924 msgid "Auto-merging %s"

925 msgstr "Fusion automatique de %s"

926

927 -#: merge-recursive.c:1644 git-submodule.sh:1150

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

928 msgid "submodule"

929 msgstr "sous-module"

930

931 -#: merge-recursive.c:1645

931 +#: merge-recursive.c:1648

932 #, c-format

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

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

935

936 -#: merge-recursive.c:1731

936 +#: merge-recursive.c:1734

937 #, c-format

938 msgid "Removing %s"

939 msgstr "Suppression de %s"

940

941 -#: merge-recursive.c:1756

941 +#: merge-recursive.c:1759

942 msgid "file/directory"

943 msgstr "fichier/répertoire"

944

945 -#: merge-recursive.c:1762

945 +#: merge-recursive.c:1765

946 msgid "directory/file"

947 msgstr "répertoire/fichier"

948

949 -#: merge-recursive.c:1767

949 +#: merge-recursive.c:1770

950 #, c-format

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

952 msgstr ""

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

954

955 -#: merge-recursive.c:1777

955 +#: merge-recursive.c:1780

956 #, c-format

957 msgid "Adding %s"

958 msgstr "Ajout de %s"

959

960 -#: merge-recursive.c:1794

960 +#: merge-recursive.c:1797

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

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

963

964 -#: merge-recursive.c:1813

964 +#: merge-recursive.c:1816

965 msgid "Already up-to-date!"

966 msgstr "Déjà à jour !"

967

968 -#: merge-recursive.c:1822

968 +#: merge-recursive.c:1825

969 #, c-format

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

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

972

973 -#: merge-recursive.c:1852

973 +#: merge-recursive.c:1855

974 #, c-format

975 msgid "Unprocessed path??? %s"

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

977

978 -#: merge-recursive.c:1900

978 +#: merge-recursive.c:1903

979 msgid "Merging:"

980 msgstr "Fusion :"

981

982 -#: merge-recursive.c:1913

982 +#: merge-recursive.c:1916

983 #, c-format

984 msgid "found %u common ancestor:"

985 msgid_plural "found %u common ancestors:"

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

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

988

989 -#: merge-recursive.c:1950

989 +#: merge-recursive.c:1953

990 msgid "merge returned no commit"

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

992

993 -#: merge-recursive.c:2007

993 +#: merge-recursive.c:2010

994 #, c-format

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

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

997

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

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

999 msgid "Unable to write index."

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

1001

@@ -1025,31 +1025,41 @@ msgstr "Mauvaise valeur de %s : '%s'"

1025 msgid "unable to parse object: %s"

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

1027

1028 -#: parse-options.c:563

1028 +#: parse-options.c:570

1029 msgid "..."

1030 msgstr "..."

1031

1032 -#: parse-options.c:581

1032 +#: parse-options.c:588

1033 #, c-format

1034 msgid "usage: %s"

1035 msgstr "usage : %s"

1036

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

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

1039 -#: parse-options.c:585

1039 +#: parse-options.c:592

1040 #, c-format

1041 msgid " or: %s"

1042 msgstr " ou : %s"

1043

1044 -#: parse-options.c:588

1044 +#: parse-options.c:595

1045 #, c-format

1046 msgid " %s"

1047 msgstr " %s"

1048

1049 -#: parse-options.c:622

1049 +#: parse-options.c:629

1050 msgid "-NUM"

1051 msgstr "-NUM"

1052

1053 +#: parse-options-cb.c:108

1054 +#, c-format

1055 +msgid "malformed object name '%s'"

1056 +msgstr "nom d'objet malformé '%s'"

1057 +

1058 +#: path.c:752

1059 +#, c-format

1060 +msgid "Could not make %s writable by group"

1061 +msgstr "Impossible de rendre %s inscriptible pour le groupe"

1062 +

1063 #: pathspec.c:133

1064 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

1065 msgstr ""

@@ -1122,11 +1132,11 @@ msgstr ""

1132 msgid "unable to parse --pretty format"

1133 msgstr "impossible d'analyser le format --pretty"

1134

1125 -#: progress.c:236

1135 +#: progress.c:235

1136 msgid "done"

1137 msgstr "fait"

1138

1129 -#: read-cache.c:1296

1139 +#: read-cache.c:1281

1140 #, c-format

1141 msgid ""

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

@@ -1135,7 +1145,7 @@ msgstr ""

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

1146 "Utilisation de la version %i"

1147

1138 -#: read-cache.c:1306

1148 +#: read-cache.c:1291

1149 #, c-format

1150 msgid ""

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

@@ -1144,121 +1154,166 @@ msgstr ""

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

1155 "Utilisation de la version %i"

1156

1147 -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

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

1158 #: builtin/merge.c:983

1159 #, c-format

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

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

1162

1153 -#: refs.c:3001

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

1164 #, c-format

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

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

1167

1158 -#: refs.c:3004

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

1169 #, c-format

1170 msgid "could not delete references: %s"

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

1172

1163 -#: refs.c:3013

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

1174 #, c-format

1175 msgid "could not remove reference %s"

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

1177

1168 -#: ref-filter.c:660

1178 +#: ref-filter.c:245

1179 +#, c-format

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

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

1182 +

1183 +#: ref-filter.c:704

1184 +#, c-format

1185 +msgid "positive value expected contents:lines=%s"

1186 +msgstr "valeur positive attendue contents:lines=%s"

1187 +

1188 +#: ref-filter.c:833

1189 +#, c-format

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

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

1192 +

1193 +#: ref-filter.c:835

1194 msgid "unable to parse format"

1195 msgstr "impossible d'analyser le format"

1196

1172 -#: remote.c:792

1197 +#: ref-filter.c:870

1198 +#, c-format

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

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

1201 +

1202 +#: ref-filter.c:893

1203 +#, c-format

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

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

1206 +

1207 +#: ref-filter.c:898

1208 +#, c-format

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

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

1211 +

1212 +#: ref-filter.c:1219

1213 +#, c-format

1214 +msgid "malformed object at '%s'"

1215 +msgstr "objet malformé à '%s'"

1216 +

1217 +#: ref-filter.c:1561

1218 +#, c-format

1219 +msgid "format: %%(end) atom missing"

1220 +msgstr "format: atome %%(end) manquant"

1221 +

1222 +#: ref-filter.c:1615

1223 +#, c-format

1224 +msgid "malformed object name %s"

1225 +msgstr "nom d'objet malformé %s"

1226 +

1227 +#: remote.c:756

1228 #, c-format

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

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

1231

1177 -#: remote.c:796

1232 +#: remote.c:760

1233 #, c-format

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

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

1236

1182 -#: remote.c:800

1237 +#: remote.c:764

1238 #, c-format

1239 msgid "%s tracks both %s and %s"

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

1241

1187 -#: remote.c:808

1242 +#: remote.c:772

1243 msgid "Internal error"

1244 msgstr "Erreur interne"

1245

1191 -#: remote.c:1723 remote.c:1766

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

1247 msgid "HEAD does not point to a branch"

1248 msgstr "HEAD ne pointe pas sur une branche"

1249

1195 -#: remote.c:1732

1250 +#: remote.c:1696

1251 #, c-format

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

1253 msgstr "pas de branche '%s'"

1254

1200 -#: remote.c:1735

1255 +#: remote.c:1699

1256 #, c-format

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

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

1259

1205 -#: remote.c:1741

1260 +#: remote.c:1705

1261 #, c-format

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

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

1264

1210 -#: remote.c:1756

1265 +#: remote.c:1720

1266 #, c-format

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

1268 msgstr ""

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

1270 "branche locale de suivi"

1271

1217 -#: remote.c:1771

1272 +#: remote.c:1735

1273 #, c-format

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

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

1276

1222 -#: remote.c:1782

1277 +#: remote.c:1746

1278 #, c-format

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

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

1281

1227 -#: remote.c:1795

1282 +#: remote.c:1759

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

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

1285

1231 -#: remote.c:1817

1286 +#: remote.c:1781

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

1288 msgstr ""

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

1290

1236 -#: remote.c:2124

1291 +#: remote.c:2083

1292 #, c-format

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

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

1295

1241 -#: remote.c:2128

1296 +#: remote.c:2087

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

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

1299

1245 -#: remote.c:2131

1300 +#: remote.c:2090

1301 #, c-format

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

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

1304

1250 -#: remote.c:2135

1305 +#: remote.c:2094

1306 #, c-format

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

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

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

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

1311

1257 -#: remote.c:2141

1312 +#: remote.c:2100

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

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

1315

1261 -#: remote.c:2144

1316 +#: remote.c:2103

1317 #, c-format

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

1319 msgid_plural ""

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

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

1326 "en avance rapide.\n"

1327

1273 -#: remote.c:2152

1328 +#: remote.c:2111

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

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

1331

1277 -#: remote.c:2155

1332 +#: remote.c:2114

1333 #, c-format

1334 msgid ""

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

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

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

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

1346

1292 -#: remote.c:2165

1347 +#: remote.c:2124

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

1349 msgstr ""

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

1351

1297 -#: revision.c:2198

1352 +#: revision.c:2191

1353 msgid "your current branch appears to be broken"

1354 msgstr "votre branche actuelle semble cassée"

1355

1301 -#: revision.c:2201

1356 +#: revision.c:2194

1357 #, c-format

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

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

1360

1306 -#: revision.c:2395

1361 +#: revision.c:2388

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

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

1364

1310 -#: run-command.c:83

1365 +#: run-command.c:90

1366 msgid "open /dev/null failed"

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

1368

1314 -#: run-command.c:85

1369 +#: run-command.c:92

1370 #, c-format

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

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

@@ -1531,7 +1586,7 @@ msgstr "impossible de résoudre HEAD"

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

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

1588

1534 -#: sequencer.c:887 builtin/apply.c:4291

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

1590 #, c-format

1591 msgid "cannot open %s: %s"

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

@@ -1573,12 +1628,12 @@ msgstr "Impossible d'annuler en tant que commit initial"

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

1629 msgstr "Impossible de picorer vers une HEAD vide"

1630

1576 -#: setup.c:243

1631 +#: setup.c:248

1632 #, c-format

1633 msgid "failed to read %s"

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

1635

1581 -#: sha1_name.c:453

1636 +#: sha1_name.c:463

1637 msgid ""

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

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

@@ -1629,7 +1684,7 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1684 msgid "staging updated .gitmodules failed"

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

1686

1632 -#: submodule.c:1045

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"

@@ -1640,7 +1695,7 @@ msgstr "Impossible de paramétrer core.worktree dans %s"

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

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

1697

1643 -#: trailer.c:543 trailer.c:548 builtin/remote.c:290

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

1699 #, c-format

1700 msgid "more than one %s"

1701 msgstr "plus d'un %s"

@@ -1707,8 +1762,8 @@ msgstr "impossible d'ouvrir '%s' en lecture/écriture"

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

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

1764

1710 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1711 -#: builtin/merge.c:1076 builtin/pull.c:380

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

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

1767 #, c-format

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

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

@@ -1738,17 +1793,17 @@ msgstr "utilisateur inconnu"

1793 msgid "unable to get current working directory"

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

1795

1741 -#: wrapper.c:631

1796 +#: wrapper.c:647

1797 #, c-format

1798 msgid "could not open %s for writing"

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

1800

1746 -#: wrapper.c:642 builtin/am.c:424

1801 +#: wrapper.c:658 builtin/am.c:425

1802 #, c-format

1803 msgid "could not write to %s"

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

1805

1751 -#: wrapper.c:648

1806 +#: wrapper.c:664

1807 #, c-format

1808 msgid "could not close %s"

1809 msgstr "impossible de fermer %s"

@@ -2096,27 +2151,27 @@ msgstr "Vous êtes en cours de bissection."

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

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

2153

2099 -#: wt-status.c:1437

2154 +#: wt-status.c:1438

2155 msgid "On branch "

2156 msgstr "Sur la branche "

2157

2103 -#: wt-status.c:1445

2158 +#: wt-status.c:1444

2159 msgid "interactive rebase in progress; onto "

2160 msgstr "rebasage interactif en cours ; sur "

2161

2107 -#: wt-status.c:1447

2162 +#: wt-status.c:1446

2163 msgid "rebase in progress; onto "

2164 msgstr "rebasage en cours ; sur "

2165

2111 -#: wt-status.c:1452

2166 +#: wt-status.c:1451

2167 msgid "HEAD detached at "

2168 msgstr "HEAD détachée sur "

2169

2115 -#: wt-status.c:1454

2170 +#: wt-status.c:1453

2171 msgid "HEAD detached from "

2172 msgstr "HEAD détachée depuis "

2173

2119 -#: wt-status.c:1457

2174 +#: wt-status.c:1456

2175 msgid "Not currently on any branch."

2176 msgstr "Actuellement sur aucun branche."

2177

@@ -2207,24 +2262,24 @@ msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

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

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

2264

2210 -#: wt-status.c:1644

2211 -msgid "HEAD (no branch)"

2212 -msgstr "HEAD (aucune branche)"

2213 -

2214 -#: wt-status.c:1650

2265 +#: wt-status.c:1642

2266 msgid "Initial commit on "

2267 msgstr "Validation initiale sur "

2268

2269 +#: wt-status.c:1646

2270 +msgid "HEAD (no branch)"

2271 +msgstr "HEAD (aucune branche)"

2272 +

2273 # à priori on parle d'une branche ici

2219 -#: wt-status.c:1677

2274 +#: wt-status.c:1675

2275 msgid "gone"

2276 msgstr "disparue"

2277

2223 -#: wt-status.c:1679 wt-status.c:1687

2278 +#: wt-status.c:1677 wt-status.c:1685

2279 msgid "behind "

2280 msgstr "derrière "

2281

2227 -#: compat/precompose_utf8.c:55 builtin/clone.c:403

2282 +#: compat/precompose_utf8.c:56 builtin/clone.c:408

2283 #, c-format

2284 msgid "failed to unlink '%s'"

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

@@ -2238,7 +2293,7 @@ msgstr "git add [<options>] [--] <chemin>..."

2293 msgid "unexpected diff status %c"

2294 msgstr "status de diff inattendu %c"

2295

2241 -#: builtin/add.c:70 builtin/commit.c:277

2296 +#: builtin/add.c:70 builtin/commit.c:278

2297 msgid "updating files failed"

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

2299

@@ -2251,7 +2306,7 @@ msgstr "suppression de '%s'\n"

2306 msgid "Unstaged changes after refreshing the index:"

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

2308

2254 -#: builtin/add.c:194 builtin/rev-parse.c:799

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

2310 msgid "Could not read the index"

2311 msgstr "Impossible de lire l'index"

2312

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

2342 msgstr ""

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

2344

2290 -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2345 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2346 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2292 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

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

2348 msgid "dry run"

2349 msgstr "simuler l'action"

2350

2296 -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2297 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2298 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

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

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

2353 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2354 msgid "be verbose"

2355 msgstr "mode verbeux"

2356

@@ -2303,7 +2358,7 @@ msgstr "mode verbeux"

2358 msgid "interactive picking"

2359 msgstr "sélection interactive"

2360

2306 -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2361 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2362 msgid "select hunks interactively"

2363 msgstr "sélection interactive des sections"

2364

@@ -2364,149 +2419,150 @@ msgid "Option --ignore-missing can only be used together with --dry-run"

2419 msgstr ""

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

2421

2367 -#: builtin/add.c:358

2422 +#: builtin/add.c:352

2423 #, c-format

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

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

2426

2372 -#: builtin/add.c:359

2427 +#: builtin/add.c:353

2428 #, c-format

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

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

2431

2377 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2378 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

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

2433 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2434 +#: builtin/submodule--helper.c:40

2435 msgid "index file corrupt"

2436 msgstr "fichier d'index corrompu"

2437

2382 -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2438 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2439 msgid "Unable to write new index file"

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

2441

2386 -#: builtin/am.c:41

2442 +#: builtin/am.c:42

2443 #, c-format

2444 msgid "could not stat %s"

2445 msgstr "stat impossible de %s"

2446

2391 -#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 builtin/merge.c:1079

2447 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2448 #, c-format

2449 msgid "could not read '%s'"

2450 msgstr "impossible de lire '%s'"

2451

2396 -#: builtin/am.c:444

2452 +#: builtin/am.c:445

2453 msgid "could not parse author script"

2454 msgstr "impossible d'analyser le script author"

2455

2400 -#: builtin/am.c:521

2456 +#: builtin/am.c:522

2457 #, c-format

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

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

2460

2405 -#: builtin/am.c:562 builtin/notes.c:300

2461 +#: builtin/am.c:563 builtin/notes.c:300

2462 #, c-format

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

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

2465

2410 -#: builtin/am.c:599 builtin/notes.c:315

2466 +#: builtin/am.c:600 builtin/notes.c:315

2467 #, c-format

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

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

2470

2415 -#: builtin/am.c:625

2471 +#: builtin/am.c:626

2472 msgid "fseek failed"

2473 msgstr "échec de fseek"

2474

2419 -#: builtin/am.c:786 builtin/am.c:874

2475 +#: builtin/am.c:787 builtin/am.c:875

2476 #, c-format

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

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

2479

2424 -#: builtin/am.c:793

2480 +#: builtin/am.c:794

2481 #, c-format

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

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

2484

2429 -#: builtin/am.c:802

2485 +#: builtin/am.c:803

2486 #, c-format

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

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

2489

2434 -#: builtin/am.c:867

2490 +#: builtin/am.c:868

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

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

2493

2438 -#: builtin/am.c:915

2494 +#: builtin/am.c:916

2495 msgid "invalid timestamp"

2496 msgstr "horodatage invalide"

2497

2442 -#: builtin/am.c:918 builtin/am.c:926

2498 +#: builtin/am.c:919 builtin/am.c:927

2499 msgid "invalid Date line"

2500 msgstr "ligne de Date invalide"

2501

2446 -#: builtin/am.c:923

2502 +#: builtin/am.c:924

2503 msgid "invalid timezone offset"

2504 msgstr "décalage horaire invalide"

2505

2450 -#: builtin/am.c:1010

2506 +#: builtin/am.c:1011

2507 msgid "Patch format detection failed."

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

2509

2454 -#: builtin/am.c:1015 builtin/clone.c:368

2510 +#: builtin/am.c:1016 builtin/clone.c:373

2511 #, c-format

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

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

2514

2459 -#: builtin/am.c:1019

2515 +#: builtin/am.c:1020

2516 msgid "Failed to split patches."

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

2518

2463 -#: builtin/am.c:1151 builtin/commit.c:362

2519 +#: builtin/am.c:1152 builtin/commit.c:363

2520 msgid "unable to write index file"

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

2522

2467 -#: builtin/am.c:1202

2523 +#: builtin/am.c:1203

2524 #, c-format

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

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

2527

2472 -#: builtin/am.c:1203

2528 +#: builtin/am.c:1204

2529 #, c-format

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

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

2532

2477 -#: builtin/am.c:1204

2533 +#: builtin/am.c:1205

2534 #, c-format

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

2536 msgstr ""

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

2538 "abort\"."

2539

2484 -#: builtin/am.c:1339

2540 +#: builtin/am.c:1343

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

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

2543

2488 -#: builtin/am.c:1413 builtin/log.c:1345

2544 +#: builtin/am.c:1417 builtin/log.c:1344

2545 #, c-format

2546 msgid "invalid ident line: %s"

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

2548

2493 -#: builtin/am.c:1440

2549 +#: builtin/am.c:1444

2550 #, c-format

2551 msgid "unable to parse commit %s"

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

2553

2498 -#: builtin/am.c:1614

2554 +#: builtin/am.c:1646

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

2556 msgstr ""

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

2558 "points."

2559

2504 -#: builtin/am.c:1616

2560 +#: builtin/am.c:1648

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

2562 msgstr ""

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

2564

2509 -#: builtin/am.c:1635

2565 +#: builtin/am.c:1667

2566 msgid ""

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

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

@@ -2514,38 +2570,38 @@ msgstr ""

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

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

2572

2517 -#: builtin/am.c:1641

2573 +#: builtin/am.c:1673

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

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

2576

2521 -#: builtin/am.c:1666

2577 +#: builtin/am.c:1688

2578 msgid "Failed to merge in the changes."

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

2580

2525 -#: builtin/am.c:1691 builtin/merge.c:632

2581 +#: builtin/am.c:1712 builtin/merge.c:632

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

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

2584

2529 -#: builtin/am.c:1698

2585 +#: builtin/am.c:1719

2586 msgid "applying to an empty history"

2587 msgstr "application à un historique vide"

2588

2533 -#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2589 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2590 #: builtin/merge.c:854

2591 msgid "failed to write commit object"

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

2593

2538 -#: builtin/am.c:1743 builtin/am.c:1747

2594 +#: builtin/am.c:1764 builtin/am.c:1768

2595 #, c-format

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

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

2598

2543 -#: builtin/am.c:1763

2599 +#: builtin/am.c:1784

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

2601 msgstr ""

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

2603

2548 -#: builtin/am.c:1768

2604 +#: builtin/am.c:1789

2605 msgid "Commit Body is:"

2606 msgstr "Le corps de la validation est :"

2607

@@ -2553,35 +2609,35 @@ msgstr "Le corps de la validation est :"

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

2610 #. input at this point.

2611 #.

2556 -#: builtin/am.c:1778

2612 +#: builtin/am.c:1799

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

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

2615

2560 -#: builtin/am.c:1828

2616 +#: builtin/am.c:1849

2617 #, c-format

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

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

2620

2565 -#: builtin/am.c:1863 builtin/am.c:1934

2621 +#: builtin/am.c:1884 builtin/am.c:1955

2622 #, c-format

2623 msgid "Applying: %.*s"

2624 msgstr "Application de %.*s"

2625

2570 -#: builtin/am.c:1879

2626 +#: builtin/am.c:1900

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

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

2629

2574 -#: builtin/am.c:1887

2630 +#: builtin/am.c:1908

2631 #, c-format

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

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

2634

2579 -#: builtin/am.c:1893

2635 +#: builtin/am.c:1914

2636 #, c-format

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

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

2639

2584 -#: builtin/am.c:1937

2640 +#: builtin/am.c:1958

2641 msgid ""

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

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

@@ -2592,7 +2648,7 @@ msgstr ""

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

2649 "patch."

2650

2595 -#: builtin/am.c:1944

2651 +#: builtin/am.c:1965

2652 msgid ""

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

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

@@ -2600,17 +2656,17 @@ msgstr ""

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

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

2658

2603 -#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2659 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2660 #: builtin/reset.c:316

2661 #, c-format

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

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

2664

2609 -#: builtin/am.c:2104

2665 +#: builtin/am.c:2125

2666 msgid "failed to clean index"

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

2668

2613 -#: builtin/am.c:2138

2669 +#: builtin/am.c:2159

2670 msgid ""

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

2672 "Not rewinding to ORIG_HEAD"

@@ -2618,152 +2674,154 @@ msgstr ""

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

2675 "Pas de retour à ORIG_HEAD"

2676

2621 -#: builtin/am.c:2199

2677 +#: builtin/am.c:2220

2678 #, c-format

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

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

2681

2626 -#: builtin/am.c:2221

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

2682 +#: builtin/am.c:2253

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

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

2685

2630 -#: builtin/am.c:2222

2631 -msgid "git am [options] (--continue | --skip | --abort)"

2632 -msgstr "git am [options] (--continue | --quit | -- abort)\""

2686 +#: builtin/am.c:2254

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

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

2689

2634 -#: builtin/am.c:2228

2690 +#: builtin/am.c:2260

2691 msgid "run interactively"

2692 msgstr "exécution interactive"

2693

2638 -#: builtin/am.c:2230

2694 +#: builtin/am.c:2262

2695 msgid "historical option -- no-op"

2696 msgstr "option historique -- no-op"

2697

2642 -#: builtin/am.c:2232

2698 +#: builtin/am.c:2264

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

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

2701

2646 -#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

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

2703 #: builtin/repack.c:171

2704 msgid "be quiet"

2705 msgstr "être silencieux"

2706

2651 -#: builtin/am.c:2235

2707 +#: builtin/am.c:2267

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

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

2710

2655 -#: builtin/am.c:2238

2711 +#: builtin/am.c:2270

2712 msgid "recode into utf8 (default)"

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

2714

2659 -#: builtin/am.c:2240

2715 +#: builtin/am.c:2272

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

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

2718

2663 -#: builtin/am.c:2242

2719 +#: builtin/am.c:2274

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

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

2722

2667 -#: builtin/am.c:2244

2723 +#: builtin/am.c:2276

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

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

2726

2671 -#: builtin/am.c:2246

2727 +#: builtin/am.c:2278

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

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

2730

2675 -#: builtin/am.c:2249

2731 +#: builtin/am.c:2281

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

2733 msgstr ""

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

2735

2680 -#: builtin/am.c:2252

2736 +#: builtin/am.c:2284

2737 msgid "strip everything before a scissors line"

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

2739

2684 -#: builtin/am.c:2253 builtin/apply.c:4563

2740 +#: builtin/am.c:2285 builtin/apply.c:4554

2741 msgid "action"

2742 msgstr "action"

2743

2688 -#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2689 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2690 -#: builtin/am.c:2281

2744 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2745 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2746 +#: builtin/am.c:2313

2747 msgid "pass it through git-apply"

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

2749

2694 -#: builtin/am.c:2262 builtin/apply.c:4587

2750 +#: builtin/am.c:2294 builtin/apply.c:4578

2751 msgid "root"

2752 msgstr "racine"

2753

2698 -#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2699 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2700 -#: builtin/pull.c:167

2754 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2755 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

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

2757 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2758 msgid "path"

2759 msgstr "chemin"

2760

2704 -#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2705 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2706 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2707 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2708 -#: parse-options.h:134 parse-options.h:243

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

2762 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

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

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

2765 +#: parse-options.h:134 parse-options.h:244

2766 msgid "n"

2767 msgstr "n"

2768

2712 -#: builtin/am.c:2274 builtin/apply.c:4531

2769 +#: builtin/am.c:2306 builtin/apply.c:4522

2770 msgid "num"

2771 msgstr "num"

2772

2716 -#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

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

2774 +#: builtin/tag.c:372

2775 msgid "format"

2776 msgstr "format"

2777

2720 -#: builtin/am.c:2278

2778 +#: builtin/am.c:2310

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

2780 msgstr "format de présentation des patchs"

2781

2724 -#: builtin/am.c:2284

2782 +#: builtin/am.c:2316

2783 msgid "override error message when patch failure occurs"

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

2785

2728 -#: builtin/am.c:2286

2786 +#: builtin/am.c:2318

2787 msgid "continue applying patches after resolving a conflict"

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

2789

2732 -#: builtin/am.c:2289

2790 +#: builtin/am.c:2321

2791 msgid "synonyms for --continue"

2792 msgstr "synonymes de --continue"

2793

2736 -#: builtin/am.c:2292

2794 +#: builtin/am.c:2324

2795 msgid "skip the current patch"

2796 msgstr "sauter le patch courant"

2797

2740 -#: builtin/am.c:2295

2798 +#: builtin/am.c:2327

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

2800 msgstr ""

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

2802

2745 -#: builtin/am.c:2299

2803 +#: builtin/am.c:2331

2804 msgid "lie about committer date"

2805 msgstr "mentir sur la date de validation"

2806

2749 -#: builtin/am.c:2301

2807 +#: builtin/am.c:2333

2808 msgid "use current timestamp for author date"

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

2810

2753 -#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2754 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2811 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2812 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2813 msgid "key-id"

2814 msgstr "id de clé"

2815

2758 -#: builtin/am.c:2304

2816 +#: builtin/am.c:2336

2817 msgid "GPG-sign commits"

2818 msgstr "signer les commits avec GPG"

2819

2762 -#: builtin/am.c:2307

2820 +#: builtin/am.c:2339

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

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

2823

2766 -#: builtin/am.c:2322

2824 +#: builtin/am.c:2354

2825 msgid ""

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

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

@@ -2771,17 +2829,17 @@ msgstr ""

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

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

2831

2774 -#: builtin/am.c:2329

2832 +#: builtin/am.c:2361

2833 msgid "failed to read the index"

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

2835

2778 -#: builtin/am.c:2344

2836 +#: builtin/am.c:2376

2837 #, c-format

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

2839 msgstr ""

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

2841

2784 -#: builtin/am.c:2368

2842 +#: builtin/am.c:2400

2843 #, c-format

2844 msgid ""

2845 "Stray %s directory found.\n"

@@ -2790,7 +2848,7 @@ msgstr ""

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

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

2850

2793 -#: builtin/am.c:2374

2851 +#: builtin/am.c:2406

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

2853 msgstr ""

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

@@ -2800,69 +2858,69 @@ msgstr ""

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

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

2860

2803 -#: builtin/apply.c:112

2861 +#: builtin/apply.c:111

2862 #, c-format

2863 msgid "unrecognized whitespace option '%s'"

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

2865

2808 -#: builtin/apply.c:127

2866 +#: builtin/apply.c:126

2867 #, c-format

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

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

2870

2813 -#: builtin/apply.c:822

2871 +#: builtin/apply.c:818

2872 #, c-format

2873 msgid "Cannot prepare timestamp regexp %s"

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

2875

2818 -#: builtin/apply.c:831

2876 +#: builtin/apply.c:827

2877 #, c-format

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

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

2880

2823 -#: builtin/apply.c:912

2881 +#: builtin/apply.c:908

2882 #, c-format

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

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

2885

2828 -#: builtin/apply.c:944

2886 +#: builtin/apply.c:940

2887 #, c-format

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

2889 msgstr ""

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

2891 "ligne %d"

2892

2835 -#: builtin/apply.c:948

2893 +#: builtin/apply.c:944

2894 #, c-format

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

2896 msgstr ""

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

2898 "à la ligne %d"

2899

2842 -#: builtin/apply.c:949

2900 +#: builtin/apply.c:945

2901 #, c-format

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

2903 msgstr ""

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

2905 "à la ligne %d"

2906

2849 -#: builtin/apply.c:956

2907 +#: builtin/apply.c:952

2908 #, c-format

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

2910 msgstr ""

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

2912

2855 -#: builtin/apply.c:1419

2913 +#: builtin/apply.c:1415

2914 #, c-format

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

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

2917

2860 -#: builtin/apply.c:1476

2918 +#: builtin/apply.c:1472

2919 #, c-format

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

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

2922

2865 -#: builtin/apply.c:1493

2923 +#: builtin/apply.c:1489

2924 #, c-format

2925 msgid ""

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

@@ -2877,77 +2935,77 @@ msgstr[1] ""

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

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

2937

2880 -#: builtin/apply.c:1659

2938 +#: builtin/apply.c:1655

2939 msgid "new file depends on old contents"

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

2941

2884 -#: builtin/apply.c:1661

2942 +#: builtin/apply.c:1657

2943 msgid "deleted file still has contents"

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

2945

2888 -#: builtin/apply.c:1687

2946 +#: builtin/apply.c:1683

2947 #, c-format

2948 msgid "corrupt patch at line %d"

2949 msgstr "patch corrompu à la ligne %d"

2950

2893 -#: builtin/apply.c:1723

2951 +#: builtin/apply.c:1719

2952 #, c-format

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

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

2955

2898 -#: builtin/apply.c:1725

2956 +#: builtin/apply.c:1721

2957 #, c-format

2958 msgid "deleted file %s still has contents"

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

2960

2903 -#: builtin/apply.c:1728

2961 +#: builtin/apply.c:1724

2962 #, c-format

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

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

2965

2908 -#: builtin/apply.c:1874

2966 +#: builtin/apply.c:1870

2967 #, c-format

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

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

2970

2913 -#: builtin/apply.c:1903

2971 +#: builtin/apply.c:1899

2972 #, c-format

2973 msgid "unrecognized binary patch at line %d"

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

2975

2918 -#: builtin/apply.c:2054

2976 +#: builtin/apply.c:2050

2977 #, c-format

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

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

2980

2923 -#: builtin/apply.c:2144

2981 +#: builtin/apply.c:2140

2982 #, c-format

2983 msgid "unable to read symlink %s"

2984 msgstr "lecture du lien symbolique %s impossible"

2985

2928 -#: builtin/apply.c:2148

2986 +#: builtin/apply.c:2144

2987 #, c-format

2988 msgid "unable to open or read %s"

2989 msgstr "ouverture ou lecture de %s impossible"

2990

2933 -#: builtin/apply.c:2781

2991 +#: builtin/apply.c:2777

2992 #, c-format

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

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

2995

2938 -#: builtin/apply.c:2900

2996 +#: builtin/apply.c:2896

2997 #, c-format

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

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

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

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

3002

2945 -#: builtin/apply.c:2912

3003 +#: builtin/apply.c:2908

3004 #, c-format

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

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

3007

2950 -#: builtin/apply.c:2918

3008 +#: builtin/apply.c:2914

3009 #, c-format

3010 msgid ""

3011 "while searching for:\n"

@@ -2956,330 +3014,330 @@ msgstr ""

3014 "pendant la recherche de :\n"

3015 "%.*s"

3016

2959 -#: builtin/apply.c:2938

3017 +#: builtin/apply.c:2934

3018 #, c-format

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

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

3021

2964 -#: builtin/apply.c:3039

3022 +#: builtin/apply.c:3035

3023 #, c-format

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

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

3026

2969 -#: builtin/apply.c:3045

3027 +#: builtin/apply.c:3041

3028 #, c-format

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

3030 msgstr ""

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

3032 "trouvé)"

3033

2976 -#: builtin/apply.c:3066

3034 +#: builtin/apply.c:3062

3035 #, c-format

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

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

3038

2981 -#: builtin/apply.c:3190

3039 +#: builtin/apply.c:3186

3040 #, c-format

3041 msgid "cannot checkout %s"

3042 msgstr "extraction de %s impossible"

3043

2986 -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

3044 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3045 #, c-format

3046 msgid "read of %s failed"

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

3048

2991 -#: builtin/apply.c:3243

3049 +#: builtin/apply.c:3239

3050 #, c-format

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

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

3053

2996 -#: builtin/apply.c:3271 builtin/apply.c:3493

3054 +#: builtin/apply.c:3267 builtin/apply.c:3489

3055 #, c-format

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

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

3058

3001 -#: builtin/apply.c:3352 builtin/apply.c:3507

3059 +#: builtin/apply.c:3348 builtin/apply.c:3503

3060 #, c-format

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

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

3063

3006 -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

3064 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3065 #, c-format

3066 msgid "%s: %s"

3067 msgstr "%s : %s"

3068

3011 -#: builtin/apply.c:3361 builtin/apply.c:3515

3069 +#: builtin/apply.c:3357 builtin/apply.c:3511

3070 #, c-format

3071 msgid "%s: does not match index"

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

3073

3016 -#: builtin/apply.c:3463

3074 +#: builtin/apply.c:3459

3075 msgid "removal patch leaves file contents"

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

3077

3020 -#: builtin/apply.c:3532

3078 +#: builtin/apply.c:3528

3079 #, c-format

3080 msgid "%s: wrong type"

3081 msgstr "%s : type erroné"

3082

3025 -#: builtin/apply.c:3534

3083 +#: builtin/apply.c:3530

3084 #, c-format

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

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

3087

3030 -#: builtin/apply.c:3693 builtin/apply.c:3695

3088 +#: builtin/apply.c:3689 builtin/apply.c:3691

3089 #, c-format

3090 msgid "invalid path '%s'"

3091 msgstr "chemin invalide '%s'"

3092

3035 -#: builtin/apply.c:3750

3093 +#: builtin/apply.c:3746

3094 #, c-format

3095 msgid "%s: already exists in index"

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

3097

3040 -#: builtin/apply.c:3753

3098 +#: builtin/apply.c:3749

3099 #, c-format

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

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

3102

3045 -#: builtin/apply.c:3773

3103 +#: builtin/apply.c:3769

3104 #, c-format

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

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

3107

3050 -#: builtin/apply.c:3778

3108 +#: builtin/apply.c:3774

3109 #, c-format

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

3111 msgstr ""

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

3113

3056 -#: builtin/apply.c:3798

3114 +#: builtin/apply.c:3794

3115 #, c-format

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

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

3118

3061 -#: builtin/apply.c:3802

3119 +#: builtin/apply.c:3798

3120 #, c-format

3121 msgid "%s: patch does not apply"

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

3123

3066 -#: builtin/apply.c:3816

3124 +#: builtin/apply.c:3812

3125 #, c-format

3126 msgid "Checking patch %s..."

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

3128

3071 -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3129 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3130 #, c-format

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

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

3133

3076 -#: builtin/apply.c:4052

3134 +#: builtin/apply.c:4048

3135 #, c-format

3136 msgid "unable to remove %s from index"

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

3138

3081 -#: builtin/apply.c:4081

3139 +#: builtin/apply.c:4077

3140 #, c-format

3141 msgid "corrupt patch for submodule %s"

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

3143

3086 -#: builtin/apply.c:4085

3144 +#: builtin/apply.c:4081

3145 #, c-format

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

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

3148

3091 -#: builtin/apply.c:4090

3149 +#: builtin/apply.c:4086

3150 #, c-format

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

3152 msgstr ""

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

3154 "impossible"

3155

3098 -#: builtin/apply.c:4093 builtin/apply.c:4201

3156 +#: builtin/apply.c:4089 builtin/apply.c:4197

3157 #, c-format

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

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

3160

3103 -#: builtin/apply.c:4126

3161 +#: builtin/apply.c:4122

3162 #, c-format

3163 msgid "closing file '%s'"

3164 msgstr "fermeture du fichier '%s'"

3165

3108 -#: builtin/apply.c:4175

3166 +#: builtin/apply.c:4171

3167 #, c-format

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

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

3170

3113 -#: builtin/apply.c:4262

3171 +#: builtin/apply.c:4258

3172 #, c-format

3173 msgid "Applied patch %s cleanly."

3174 msgstr "Patch %s appliqué proprement."

3175

3118 -#: builtin/apply.c:4270

3176 +#: builtin/apply.c:4266

3177 msgid "internal error"

3178 msgstr "erreur interne"

3179

3122 -#: builtin/apply.c:4273

3180 +#: builtin/apply.c:4269

3181 #, c-format

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

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

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

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

3186

3129 -#: builtin/apply.c:4283

3187 +#: builtin/apply.c:4279

3188 #, c-format

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

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

3191

3134 -#: builtin/apply.c:4304

3192 +#: builtin/apply.c:4300

3193 #, c-format

3194 msgid "Hunk #%d applied cleanly."

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

3196

3139 -#: builtin/apply.c:4307

3197 +#: builtin/apply.c:4303

3198 #, c-format

3199 msgid "Rejected hunk #%d."

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

3201

3144 -#: builtin/apply.c:4397

3202 +#: builtin/apply.c:4393

3203 msgid "unrecognized input"

3204 msgstr "entrée non reconnue"

3205

3148 -#: builtin/apply.c:4408

3206 +#: builtin/apply.c:4404

3207 msgid "unable to read index file"

3208 msgstr "lecture du fichier d'index impossible"

3209

3152 -#: builtin/apply.c:4526

3210 +#: builtin/apply.c:4517

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

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

3213

3156 -#: builtin/apply.c:4529

3214 +#: builtin/apply.c:4520

3215 msgid "apply changes matching the given path"

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

3217

3160 -#: builtin/apply.c:4532

3218 +#: builtin/apply.c:4523

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

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

3221

3164 -#: builtin/apply.c:4535

3222 +#: builtin/apply.c:4526

3223 msgid "ignore additions made by the patch"

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

3225

3168 -#: builtin/apply.c:4537

3226 +#: builtin/apply.c:4528

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

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

3229

3172 -#: builtin/apply.c:4541

3230 +#: builtin/apply.c:4532

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

3232 msgstr ""

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

3234

3177 -#: builtin/apply.c:4543

3235 +#: builtin/apply.c:4534

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

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

3238

3181 -#: builtin/apply.c:4545

3239 +#: builtin/apply.c:4536

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

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

3242

3185 -#: builtin/apply.c:4547

3243 +#: builtin/apply.c:4538

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

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

3246

3189 -#: builtin/apply.c:4549

3247 +#: builtin/apply.c:4540

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

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

3250

3193 -#: builtin/apply.c:4551

3251 +#: builtin/apply.c:4542

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

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

3254

3197 -#: builtin/apply.c:4553

3255 +#: builtin/apply.c:4544

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

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

3258

3201 -#: builtin/apply.c:4555

3259 +#: builtin/apply.c:4546

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

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

3262

3205 -#: builtin/apply.c:4557

3263 +#: builtin/apply.c:4548

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

3265 msgstr ""

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

3267

3210 -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

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

3269 msgid "paths are separated with NUL character"

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

3271

3214 -#: builtin/apply.c:4562

3272 +#: builtin/apply.c:4553

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

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

3275

3218 -#: builtin/apply.c:4564

3276 +#: builtin/apply.c:4555

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

3278 msgstr ""

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

3280 "d'espace"

3281

3224 -#: builtin/apply.c:4567 builtin/apply.c:4570

3282 +#: builtin/apply.c:4558 builtin/apply.c:4561

3283 msgid "ignore changes in whitespace when finding context"

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

3285

3228 -#: builtin/apply.c:4573

3286 +#: builtin/apply.c:4564

3287 msgid "apply the patch in reverse"

3288 msgstr "appliquer le patch en sens inverse"

3289

3232 -#: builtin/apply.c:4575

3290 +#: builtin/apply.c:4566

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

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

3293

3236 -#: builtin/apply.c:4577

3294 +#: builtin/apply.c:4568

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

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

3297

3240 -#: builtin/apply.c:4579

3298 +#: builtin/apply.c:4570

3299 msgid "allow overlapping hunks"

3300 msgstr "accepter les recouvrements de sections"

3301

3244 -#: builtin/apply.c:4582

3302 +#: builtin/apply.c:4573

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

3304 msgstr ""

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

3306 "fichier"

3307

3250 -#: builtin/apply.c:4585

3308 +#: builtin/apply.c:4576

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

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

3311

3254 -#: builtin/apply.c:4588

3312 +#: builtin/apply.c:4579

3313 msgid "prepend <root> to all filenames"

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

3315

3258 -#: builtin/apply.c:4610

3316 +#: builtin/apply.c:4601

3317 msgid "--3way outside a repository"

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

3319

3262 -#: builtin/apply.c:4618

3320 +#: builtin/apply.c:4609

3321 msgid "--index outside a repository"

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

3323

3266 -#: builtin/apply.c:4621

3324 +#: builtin/apply.c:4612

3325 msgid "--cached outside a repository"

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

3327

3270 -#: builtin/apply.c:4640

3328 +#: builtin/apply.c:4631

3329 #, c-format

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

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

3332

3275 -#: builtin/apply.c:4654

3333 +#: builtin/apply.c:4645

3334 #, c-format

3335 msgid "squelched %d whitespace error"

3336 msgid_plural "squelched %d whitespace errors"

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

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

3339

3282 -#: builtin/apply.c:4660 builtin/apply.c:4670

3340 +#: builtin/apply.c:4651 builtin/apply.c:4661

3341 #, c-format

3342 msgid "%d line adds whitespace errors."

3343 msgid_plural "%d lines add whitespace errors."

@@ -3341,100 +3399,100 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

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

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

3401

3344 -#: builtin/blame.c:2500

3402 +#: builtin/blame.c:2519

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

3404 msgstr ""

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

3406 "manière incrémentale"

3407

3350 -#: builtin/blame.c:2501

3408 +#: builtin/blame.c:2520

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

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

3411

3354 -#: builtin/blame.c:2502

3412 +#: builtin/blame.c:2521

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

3414 msgstr ""

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

3416

3359 -#: builtin/blame.c:2503

3417 +#: builtin/blame.c:2522

3418 msgid "Show work cost statistics"

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

3420

3363 -#: builtin/blame.c:2504

3421 +#: builtin/blame.c:2523

3422 msgid "Show output score for blame entries"

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

3424

3367 -#: builtin/blame.c:2505

3425 +#: builtin/blame.c:2524

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

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

3428

3371 -#: builtin/blame.c:2506

3429 +#: builtin/blame.c:2525

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

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

3432

3375 -#: builtin/blame.c:2507

3433 +#: builtin/blame.c:2526

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

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

3436

3379 -#: builtin/blame.c:2508

3437 +#: builtin/blame.c:2527

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

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

3440

3383 -#: builtin/blame.c:2509

3441 +#: builtin/blame.c:2528

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

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

3444

3387 -#: builtin/blame.c:2510

3445 +#: builtin/blame.c:2529

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

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

3448

3391 -#: builtin/blame.c:2511

3449 +#: builtin/blame.c:2530

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

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

3452

3395 -#: builtin/blame.c:2512

3453 +#: builtin/blame.c:2531

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

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

3456

3399 -#: builtin/blame.c:2513

3457 +#: builtin/blame.c:2532

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

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

3460

3403 -#: builtin/blame.c:2514

3461 +#: builtin/blame.c:2533

3462 msgid "Ignore whitespace differences"

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

3464

3407 -#: builtin/blame.c:2515

3465 +#: builtin/blame.c:2534

3466 msgid "Spend extra cycles to find better match"

3467 msgstr ""

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

3469

3412 -#: builtin/blame.c:2516

3470 +#: builtin/blame.c:2535

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

3472 msgstr ""

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

3474

3417 -#: builtin/blame.c:2517

3475 +#: builtin/blame.c:2536

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

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

3478

3421 -#: builtin/blame.c:2518 builtin/blame.c:2519

3479 +#: builtin/blame.c:2537 builtin/blame.c:2538

3480 msgid "score"

3481 msgstr "score"

3482

3425 -#: builtin/blame.c:2518

3483 +#: builtin/blame.c:2537

3484 msgid "Find line copies within and across files"

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

3486

3429 -#: builtin/blame.c:2519

3487 +#: builtin/blame.c:2538

3488 msgid "Find line movements within and across files"

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

3490

3433 -#: builtin/blame.c:2520

3491 +#: builtin/blame.c:2539

3492 msgid "n,m"

3493 msgstr "n,m"

3494

3437 -#: builtin/blame.c:2520

3495 +#: builtin/blame.c:2539

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

3497 msgstr ""

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

@@ -3445,28 +3503,32 @@ msgstr ""

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

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

3505 #. fewer display columns.

3448 -#: builtin/blame.c:2601

3506 +#: builtin/blame.c:2620

3507 msgid "4 years, 11 months ago"

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

3509

3452 -#: builtin/branch.c:24

3510 +#: builtin/branch.c:25

3511 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3512 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3513

3456 -#: builtin/branch.c:25

3514 +#: builtin/branch.c:26

3515 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3516 msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"

3517

3460 -#: builtin/branch.c:26

3518 +#: builtin/branch.c:27

3519 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3520 msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."

3521

3464 -#: builtin/branch.c:27

3522 +#: builtin/branch.c:28

3523 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3524 msgstr ""

3525 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"

3526

3469 -#: builtin/branch.c:150

3527 +#: builtin/branch.c:29

3528 +msgid "git branch [<options>] [-r | -a] [--points-at]"

3529 +msgstr "git branch [<options>] [-r | -a] [--points-at]"

3530 +

3531 +#: builtin/branch.c:142

3532 #, c-format

3533 msgid ""

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

@@ -3475,7 +3537,7 @@ msgstr ""

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

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

3539

3478 -#: builtin/branch.c:154

3540 +#: builtin/branch.c:146

3541 #, c-format

3542 msgid ""

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

@@ -3484,12 +3546,12 @@ msgstr ""

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

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

3548

3487 -#: builtin/branch.c:168

3549 +#: builtin/branch.c:160

3550 #, c-format

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

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

3553

3492 -#: builtin/branch.c:172

3554 +#: builtin/branch.c:164

3555 #, c-format

3556 msgid ""

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

@@ -3498,309 +3560,301 @@ msgstr ""

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

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

3562

3501 -#: builtin/branch.c:185

3563 +#: builtin/branch.c:177

3564 msgid "Update of config-file failed"

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

3566

3505 -#: builtin/branch.c:213

3567 +#: builtin/branch.c:205

3568 msgid "cannot use -a with -d"

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

3570

3509 -#: builtin/branch.c:219

3571 +#: builtin/branch.c:211

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

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

3574

3513 -#: builtin/branch.c:227

3575 +#: builtin/branch.c:219

3576 #, c-format

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

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

3579

3518 -#: builtin/branch.c:243

3580 +#: builtin/branch.c:235

3581 #, c-format

3582 msgid "remote-tracking branch '%s' not found."

3583 msgstr "branche de suivi '%s' non trouvée."

3584

3523 -#: builtin/branch.c:244

3585 +#: builtin/branch.c:236

3586 #, c-format

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

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

3589

3528 -#: builtin/branch.c:259

3590 +#: builtin/branch.c:251

3591 #, c-format

3592 msgid "Error deleting remote-tracking branch '%s'"

3593 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"

3594

3533 -#: builtin/branch.c:260

3595 +#: builtin/branch.c:252

3596 #, c-format

3597 msgid "Error deleting branch '%s'"

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

3599

3538 -#: builtin/branch.c:267

3600 +#: builtin/branch.c:259

3601 #, c-format

3602 msgid "Deleted remote-tracking branch %s (was %s).\n"

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

3604

3543 -#: builtin/branch.c:268

3605 +#: builtin/branch.c:260

3606 #, c-format

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

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

3609

3548 -#: builtin/branch.c:369

3549 -#, c-format

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

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

3552 -

3610 # féminin pour une branche

3554 -#: builtin/branch.c:452

3611 +#: builtin/branch.c:303

3612 #, c-format

3613 msgid "[%s: gone]"

3614 msgstr "[%s: disparue]"

3615

3559 -#: builtin/branch.c:457

3616 +#: builtin/branch.c:308

3617 #, c-format

3618 msgid "[%s]"

3619 msgstr "[%s]"

3620

3564 -#: builtin/branch.c:462

3621 +#: builtin/branch.c:313

3622 #, c-format

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

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

3625

3569 -#: builtin/branch.c:464

3626 +#: builtin/branch.c:315

3627 #, c-format

3628 msgid "[behind %d]"

3629 msgstr "[en retard de %d]"

3630

3574 -#: builtin/branch.c:468

3631 +#: builtin/branch.c:319

3632 #, c-format

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

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

3635

3579 -#: builtin/branch.c:470

3636 +#: builtin/branch.c:321

3637 #, c-format

3638 msgid "[ahead %d]"

3639 msgstr "[en avance de %d]"

3640

3584 -#: builtin/branch.c:473

3641 +#: builtin/branch.c:324

3642 #, c-format

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

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

3645

3589 -#: builtin/branch.c:476

3646 +#: builtin/branch.c:327

3647 #, c-format

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

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

3650

3594 -#: builtin/branch.c:489

3651 +#: builtin/branch.c:340

3652 msgid " **** invalid ref ****"

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

3654

3598 -#: builtin/branch.c:580

3655 +#: builtin/branch.c:366

3656 #, c-format

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

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

3659

3603 -#: builtin/branch.c:583

3660 +#: builtin/branch.c:369

3661 #, c-format

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

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

3664

3608 -#: builtin/branch.c:589

3665 +#: builtin/branch.c:375

3666 #, c-format

3667 msgid "(HEAD detached at %s)"

3668 msgstr "(HEAD détachée sur %s)"

3669

3613 -#: builtin/branch.c:592

3670 +#: builtin/branch.c:378

3671 #, c-format

3672 msgid "(HEAD detached from %s)"

3673 msgstr "(HEAD détachée depuis %s)"

3674

3618 -#: builtin/branch.c:596

3675 +#: builtin/branch.c:382

3676 msgid "(no branch)"

3677 msgstr "(aucune branche)"

3678

3622 -#: builtin/branch.c:643

3623 -#, c-format

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

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

3626 -

3627 -#: builtin/branch.c:691

3628 -msgid "some refs could not be read"

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

3630 -

3631 -#: builtin/branch.c:704

3679 +#: builtin/branch.c:524

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

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

3682

3635 -#: builtin/branch.c:714

3683 +#: builtin/branch.c:534

3684 #, c-format

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

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

3687

3640 -#: builtin/branch.c:729

3688 +#: builtin/branch.c:549

3689 msgid "Branch rename failed"

3690 msgstr "Échec de renommage de la branche"

3691

3644 -#: builtin/branch.c:733

3692 +#: builtin/branch.c:553

3693 #, c-format

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

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

3696

3649 -#: builtin/branch.c:737

3697 +#: builtin/branch.c:557

3698 #, c-format

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

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

3701

3654 -#: builtin/branch.c:744

3702 +#: builtin/branch.c:564

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

3704 msgstr ""

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

3706 "échoué"

3707

3660 -#: builtin/branch.c:759

3661 -#, c-format

3662 -msgid "malformed object name %s"

3663 -msgstr "nom d'objet malformé %s"

3664 -

3665 -#: builtin/branch.c:781

3708 +#: builtin/branch.c:587

3709 #, c-format

3710 msgid "could not write branch description template: %s"

3711 msgstr "impossible d'écrire le modèle de description de branche : %s"

3712

3670 -#: builtin/branch.c:811

3713 +#: builtin/branch.c:616

3714 msgid "Generic options"

3715 msgstr "Options génériques"

3716

3674 -#: builtin/branch.c:813

3717 +#: builtin/branch.c:618

3718 msgid "show hash and subject, give twice for upstream branch"

3719 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

3720

3678 -#: builtin/branch.c:814

3721 +#: builtin/branch.c:619

3722 msgid "suppress informational messages"

3723 msgstr "supprimer les messages d'information"

3724

3682 -#: builtin/branch.c:815

3725 +#: builtin/branch.c:620

3726 msgid "set up tracking mode (see git-pull(1))"

3727 msgstr "régler le mode de suivi (voir git-pull(1))"

3728

3686 -#: builtin/branch.c:817

3729 +#: builtin/branch.c:622

3730 msgid "change upstream info"

3731 msgstr "modifier l'information amont"

3732

3690 -#: builtin/branch.c:821

3733 +#: builtin/branch.c:626

3734 msgid "use colored output"

3735 msgstr "utiliser la coloration dans la sortie"

3736

3694 -#: builtin/branch.c:822

3737 +#: builtin/branch.c:627

3738 msgid "act on remote-tracking branches"

3739 msgstr "agir sur les branches de suivi distantes"

3740

3698 -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3699 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3700 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3701 -#: builtin/tag.c:624

3702 -msgid "commit"

3703 -msgstr "commit"

3704 -

3705 -#: builtin/branch.c:826 builtin/branch.c:832

3741 +#: builtin/branch.c:629 builtin/branch.c:630

3742 msgid "print only branches that contain the commit"

3743 msgstr "afficher seulement les branches qui contiennent le commit"

3744

3709 -#: builtin/branch.c:838

3745 +#: builtin/branch.c:633

3746 msgid "Specific git-branch actions:"

3747 msgstr "Actions spécifiques à git-branch :"

3748

3713 -#: builtin/branch.c:839

3749 +#: builtin/branch.c:634

3750 msgid "list both remote-tracking and local branches"

3751 msgstr "afficher à la fois les branches de suivi et les branches locales"

3752

3717 -#: builtin/branch.c:841

3753 +#: builtin/branch.c:636

3754 msgid "delete fully merged branch"

3755 msgstr "supprimer une branche totalement fusionnée"

3756

3721 -#: builtin/branch.c:842

3757 +#: builtin/branch.c:637

3758 msgid "delete branch (even if not merged)"

3759 msgstr "supprimer une branche (même non fusionnée)"

3760

3725 -#: builtin/branch.c:843

3761 +#: builtin/branch.c:638

3762 msgid "move/rename a branch and its reflog"

3763 msgstr "déplacer/renommer une branche et son reflog"

3764

3729 -#: builtin/branch.c:844

3765 +#: builtin/branch.c:639

3766 msgid "move/rename a branch, even if target exists"

3767 msgstr "déplacer/renommer une branche, même si la cible existe"

3768

3733 -#: builtin/branch.c:845

3769 +#: builtin/branch.c:640

3770 msgid "list branch names"

3771 msgstr "afficher les noms des branches"

3772

3737 -#: builtin/branch.c:846

3773 +#: builtin/branch.c:641

3774 msgid "create the branch's reflog"

3775 msgstr "créer le reflog de la branche"

3776

3741 -#: builtin/branch.c:848

3777 +#: builtin/branch.c:643

3778 msgid "edit the description for the branch"

3779 msgstr "éditer la description de la branche"

3780

3745 -#: builtin/branch.c:849

3781 +#: builtin/branch.c:644

3782 msgid "force creation, move/rename, deletion"

3783 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

3784

3749 -#: builtin/branch.c:852

3750 -msgid "print only not merged branches"

3751 -msgstr "afficher seulement les branches non fusionnées"

3785 +#: builtin/branch.c:645

3786 +msgid "print only branches that are merged"

3787 +msgstr "afficher seulement les branches qui sont fusionnées"

3788

3753 -#: builtin/branch.c:858

3754 -msgid "print only merged branches"

3755 -msgstr "afficher seulement les branches fusionnées"

3789 +#: builtin/branch.c:646

3790 +msgid "print only branches that are not merged"

3791 +msgstr "afficher seulement les branches qui ne sont pas fusionnées"

3792

3757 -#: builtin/branch.c:862

3793 +#: builtin/branch.c:647

3794 msgid "list branches in columns"

3795 msgstr "afficher les branches en colonnes"

3796

3761 -#: builtin/branch.c:875

3797 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3798 +msgid "key"

3799 +msgstr "clé"

3800 +

3801 +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3802 +msgid "field name to sort on"

3803 +msgstr "nom du champ servant à trier"

3804 +

3805 +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3806 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3807 +#: builtin/tag.c:369

3808 +msgid "object"

3809 +msgstr "objet"

3810 +

3811 +#: builtin/branch.c:652

3812 +msgid "print only branches of the object"

3813 +msgstr "afficher seulement les branches de l'objet"

3814 +

3815 +#: builtin/branch.c:670

3816 msgid "Failed to resolve HEAD as a valid ref."

3817 msgstr "Échec de résolution de HEAD comme référence valide."

3818

3765 -#: builtin/branch.c:879 builtin/clone.c:690

3819 +#: builtin/branch.c:674 builtin/clone.c:697

3820 msgid "HEAD not found below refs/heads!"

3821 msgstr "HEAD non trouvée sous refs/heads !"

3822

3769 -#: builtin/branch.c:901

3823 +#: builtin/branch.c:694

3824 msgid "--column and --verbose are incompatible"

3825 msgstr "--column et --verbose sont incompatibles"

3826

3773 -#: builtin/branch.c:912 builtin/branch.c:951

3827 +#: builtin/branch.c:705 builtin/branch.c:747

3828 msgid "branch name required"

3829 msgstr "le nom de branche est requis"

3830

3777 -#: builtin/branch.c:927

3831 +#: builtin/branch.c:723

3832 msgid "Cannot give description to detached HEAD"

3833 msgstr "Impossible de décrire une HEAD détachée"

3834

3781 -#: builtin/branch.c:932

3835 +#: builtin/branch.c:728

3836 msgid "cannot edit description of more than one branch"

3837 msgstr "impossible d'éditer la description de plus d'une branche"

3838

3785 -#: builtin/branch.c:939

3839 +#: builtin/branch.c:735

3840 #, c-format

3841 msgid "No commit on branch '%s' yet."

3842 msgstr "Aucun commit sur la branche '%s'."

3843

3790 -#: builtin/branch.c:942

3844 +#: builtin/branch.c:738

3845 #, c-format

3846 msgid "No branch named '%s'."

3847 msgstr "Aucune branche nommée '%s'."

3848

3795 -#: builtin/branch.c:957

3849 +#: builtin/branch.c:753

3850 msgid "too many branches for a rename operation"

3851 msgstr "trop de branches pour une opération de renommage"

3852

3799 -#: builtin/branch.c:962

3853 +#: builtin/branch.c:758

3854 msgid "too many branches to set new upstream"

3855 msgstr "trop de branches pour spécifier une branche amont"

3856

3803 -#: builtin/branch.c:966

3857 +#: builtin/branch.c:762

3858 #, c-format

3859 msgid ""

3860 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -3808,41 +3862,41 @@ msgstr ""

3862 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

3863 "aucune branche."

3864

3811 -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3865 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3866 #, c-format

3867 msgid "no such branch '%s'"

3868 msgstr "pas de branche '%s'"

3869

3816 -#: builtin/branch.c:973

3870 +#: builtin/branch.c:769

3871 #, c-format

3872 msgid "branch '%s' does not exist"

3873 msgstr "la branche '%s' n'existe pas"

3874

3821 -#: builtin/branch.c:985

3875 +#: builtin/branch.c:781

3876 msgid "too many branches to unset upstream"

3877 msgstr "trop de branches pour désactiver un amont"

3878

3825 -#: builtin/branch.c:989

3879 +#: builtin/branch.c:785

3880 msgid "could not unset upstream of HEAD when it does not point to any branch."

3881 msgstr ""

3882 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

3883 "aucune branche."

3884

3831 -#: builtin/branch.c:995

3885 +#: builtin/branch.c:791

3886 #, c-format

3887 msgid "Branch '%s' has no upstream information"

3888 msgstr "La branche '%s' n'a aucune information de branche amont"

3889

3836 -#: builtin/branch.c:1009

3890 +#: builtin/branch.c:805

3891 msgid "it does not make sense to create 'HEAD' manually"

3892 msgstr "créer manuellement 'HEAD' n'a pas de sens"

3893

3840 -#: builtin/branch.c:1015

3894 +#: builtin/branch.c:811

3895 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3896 msgstr ""

3897 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

3898

3845 -#: builtin/branch.c:1018

3899 +#: builtin/branch.c:814

3900 #, c-format

3901 msgid ""

3902 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3851,7 +3905,7 @@ msgstr ""

3905 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

3906 "track ou --set-upstream-to\n"

3907

3854 -#: builtin/branch.c:1035

3908 +#: builtin/branch.c:831

3909 #, c-format

3910 msgid ""

3911 "\n"

@@ -3862,12 +3916,12 @@ msgstr ""

3916 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

3917 "\n"

3918

3865 -#: builtin/branch.c:1036

3919 +#: builtin/branch.c:832

3920 #, c-format

3921 msgid " git branch -d %s\n"

3922 msgstr " git branch -d %s\n"

3923

3870 -#: builtin/branch.c:1037

3924 +#: builtin/branch.c:833

3925 #, c-format

3926 msgid " git branch --set-upstream-to %s\n"

3927 msgstr " git branch --set-upstream-to %s\n"

@@ -3894,11 +3948,8 @@ msgstr ""

3948 "| <type> | --textconv) <objet>"

3949

3950 #: builtin/cat-file.c:429

3897 -msgid ""

3898 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3899 -"objects>"

3900 -msgstr ""

3901 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"

3951 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3952 +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3953

3954 #: builtin/cat-file.c:466

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

@@ -3956,9 +4007,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

4007 msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."

4008

4009 #: builtin/check-attr.c:12

3959 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3960 -msgstr ""

3961 -"git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>"

4010 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

4011 +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"

4012

4013 #: builtin/check-attr.c:19

4014 msgid "report all attributes set on file"

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

4027 msgstr ""

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

4029

3980 -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

4030 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

4031 msgid "suppress progress reporting"

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

4033

@@ -4065,6 +4115,8 @@ msgid "write the content to temporary files"

4115 msgstr "écrire le contenu dans des fichiers temporaires"

4116

4117 #: builtin/checkout-index.c:204 builtin/column.c:30

4118 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4119 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4120 msgid "string"

4121 msgstr "chaîne"

4122

@@ -4084,107 +4136,107 @@ msgstr "git checkout [<options>] <branche>"

4136 msgid "git checkout [<options>] [<branch>] -- <file>..."

4137 msgstr "git checkout [<options>] [<branche>] -- <fichier>..."

4138

4087 -#: builtin/checkout.c:133 builtin/checkout.c:166

4139 +#: builtin/checkout.c:134 builtin/checkout.c:167

4140 #, c-format

4141 msgid "path '%s' does not have our version"

4142 msgstr "le chemin '%s' n'a pas notre version"

4143

4092 -#: builtin/checkout.c:135 builtin/checkout.c:168

4144 +#: builtin/checkout.c:136 builtin/checkout.c:169

4145 #, c-format

4146 msgid "path '%s' does not have their version"

4147 msgstr "le chemin '%s' n'a pas leur version"

4148

4097 -#: builtin/checkout.c:151

4149 +#: builtin/checkout.c:152

4150 #, c-format

4151 msgid "path '%s' does not have all necessary versions"

4152 msgstr "le chemin '%s' n'a aucune des versions nécessaires"

4153

4102 -#: builtin/checkout.c:195

4154 +#: builtin/checkout.c:196

4155 #, c-format

4156 msgid "path '%s' does not have necessary versions"

4157 msgstr "le chemin '%s' n'a pas les versions nécessaires"

4158

4107 -#: builtin/checkout.c:212

4159 +#: builtin/checkout.c:213

4160 #, c-format

4161 msgid "path '%s': cannot merge"

4162 msgstr "chemin '%s' : impossible de fusionner"

4163

4112 -#: builtin/checkout.c:229

4164 +#: builtin/checkout.c:230

4165 #, c-format

4166 msgid "Unable to add merge result for '%s'"

4167 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

4168

4117 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4118 -#: builtin/checkout.c:259

4169 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4170 +#: builtin/checkout.c:260

4171 #, c-format

4172 msgid "'%s' cannot be used with updating paths"

4173 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

4174

4123 -#: builtin/checkout.c:262 builtin/checkout.c:265

4175 +#: builtin/checkout.c:263 builtin/checkout.c:266

4176 #, c-format

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

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

4179

4128 -#: builtin/checkout.c:268

4180 +#: builtin/checkout.c:269

4181 #, c-format

4182 msgid "Cannot update paths and switch to branch '%s' at the same time."

4183 msgstr ""

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

4185 "même temps."

4186

4135 -#: builtin/checkout.c:279 builtin/checkout.c:473

4187 +#: builtin/checkout.c:280 builtin/checkout.c:474

4188 msgid "corrupt index file"

4189 msgstr "fichier d'index corrompu"

4190

4139 -#: builtin/checkout.c:339 builtin/checkout.c:346

4191 +#: builtin/checkout.c:340 builtin/checkout.c:347

4192 #, c-format

4193 msgid "path '%s' is unmerged"

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

4195

4144 -#: builtin/checkout.c:495

4196 +#: builtin/checkout.c:496

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

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

4199

4148 -#: builtin/checkout.c:622

4200 +#: builtin/checkout.c:623

4201 #, c-format

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

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

4204

4153 -#: builtin/checkout.c:660

4205 +#: builtin/checkout.c:661

4206 msgid "HEAD is now at"

4207 msgstr "HEAD est maintenant sur"

4208

4157 -#: builtin/checkout.c:667

4209 +#: builtin/checkout.c:668

4210 #, c-format

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

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

4213

4162 -#: builtin/checkout.c:670

4214 +#: builtin/checkout.c:671

4215 #, c-format

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

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

4218

4167 -#: builtin/checkout.c:674

4219 +#: builtin/checkout.c:675

4220 #, c-format

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

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

4223

4172 -#: builtin/checkout.c:676 builtin/checkout.c:1065

4224 +#: builtin/checkout.c:677 builtin/checkout.c:1066

4225 #, c-format

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

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

4228

4177 -#: builtin/checkout.c:678

4229 +#: builtin/checkout.c:679

4230 #, c-format

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

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

4233

4182 -#: builtin/checkout.c:730

4234 +#: builtin/checkout.c:731

4235 #, c-format

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

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

4238

4187 -#: builtin/checkout.c:736

4239 +#: builtin/checkout.c:737

4240 #, c-format

4241 msgid ""

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

@@ -4207,7 +4259,7 @@ msgstr[1] ""

4259 "\n"

4260 "%s\n"

4261

4210 -#: builtin/checkout.c:755

4262 +#: builtin/checkout.c:756

4263 #, c-format

4264 msgid ""

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

@@ -4236,145 +4288,151 @@ msgstr[1] ""

4288 "git branch <nouvelle-branche> %s\n"

4289 "\n"

4290

4239 -#: builtin/checkout.c:791

4291 +#: builtin/checkout.c:792

4292 msgid "internal error in revision walk"

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

4294

4243 -#: builtin/checkout.c:795

4295 +#: builtin/checkout.c:796

4296 msgid "Previous HEAD position was"

4297 msgstr "La position précédente de HEAD était sur"

4298

4247 -#: builtin/checkout.c:822 builtin/checkout.c:1060

4299 +#: builtin/checkout.c:823 builtin/checkout.c:1061

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

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

4302

4251 -#: builtin/checkout.c:967

4303 +#: builtin/checkout.c:968

4304 #, c-format

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

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

4307

4256 -#: builtin/checkout.c:1006 builtin/worktree.c:210

4308 +#: builtin/checkout.c:1007 builtin/worktree.c:213

4309 #, c-format

4310 msgid "invalid reference: %s"

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

4312

4261 -#: builtin/checkout.c:1035

4313 +#: builtin/checkout.c:1036

4314 #, c-format

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

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

4317

4266 -#: builtin/checkout.c:1074

4318 +#: builtin/checkout.c:1075

4319 msgid "paths cannot be used with switching branches"

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

4321

4270 -#: builtin/checkout.c:1077 builtin/checkout.c:1081

4322 +#: builtin/checkout.c:1078 builtin/checkout.c:1082

4323 #, c-format

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

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

4326

4275 -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4276 -#: builtin/checkout.c:1096

4327 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4328 +#: builtin/checkout.c:1097

4329 #, c-format

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

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

4332

4281 -#: builtin/checkout.c:1101

4333 +#: builtin/checkout.c:1102

4334 #, c-format

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

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

4337

4286 -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4287 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4288 -#: builtin/worktree.c:319

4338 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4339 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4340 +#: builtin/worktree.c:322

4341 msgid "branch"

4342 msgstr "branche"

4343

4292 -#: builtin/checkout.c:1135

4344 +#: builtin/checkout.c:1136

4345 msgid "create and checkout a new branch"

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

4347

4296 -#: builtin/checkout.c:1137

4348 +#: builtin/checkout.c:1138

4349 msgid "create/reset and checkout a branch"

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

4351

4300 -#: builtin/checkout.c:1138

4352 +#: builtin/checkout.c:1139

4353 msgid "create reflog for new branch"

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

4355

4304 -#: builtin/checkout.c:1139

4356 +#: builtin/checkout.c:1140

4357 msgid "detach the HEAD at named commit"

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

4359

4308 -#: builtin/checkout.c:1140

4360 +#: builtin/checkout.c:1141

4361 msgid "set upstream info for new branch"

4362 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

4363

4312 -#: builtin/checkout.c:1142

4364 +#: builtin/checkout.c:1143

4365 msgid "new-branch"

4366 msgstr "nouvelle branche"

4367

4316 -#: builtin/checkout.c:1142

4368 +#: builtin/checkout.c:1143

4369 msgid "new unparented branch"

4370 msgstr "nouvelle branche sans parent"

4371

4320 -#: builtin/checkout.c:1143

4372 +#: builtin/checkout.c:1144

4373 msgid "checkout our version for unmerged files"

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

4375

4324 -#: builtin/checkout.c:1145

4376 +#: builtin/checkout.c:1146

4377 msgid "checkout their version for unmerged files"

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

4379

4328 -#: builtin/checkout.c:1147

4380 +#: builtin/checkout.c:1148

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

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

4383

4332 -#: builtin/checkout.c:1148

4384 +#: builtin/checkout.c:1149

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

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

4387

4336 -#: builtin/checkout.c:1149 builtin/merge.c:227

4388 +#: builtin/checkout.c:1150 builtin/merge.c:227

4389 msgid "update ignored files (default)"

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

4391

4340 -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4392 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4393 msgid "style"

4394 msgstr "style"

4395

4344 -#: builtin/checkout.c:1151

4396 +#: builtin/checkout.c:1152

4397 msgid "conflict style (merge or diff3)"

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

4399

4348 -#: builtin/checkout.c:1154

4400 +#: builtin/checkout.c:1155

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

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

4403

4352 -#: builtin/checkout.c:1156

4404 +#: builtin/checkout.c:1157

4405 msgid "second guess 'git checkout <no-such-branch>'"

4406 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

4407

4356 -#: builtin/checkout.c:1158

4408 +#: builtin/checkout.c:1159

4409 msgid "do not check if another worktree is holding the given ref"

4410 msgstr ""

4411 "ne pas vérifier si une autre copie de travail contient le référence fournie"

4412

4361 -#: builtin/checkout.c:1181

4413 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4414 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4415 +#: builtin/send-pack.c:168

4416 +msgid "force progress reporting"

4417 +msgstr "forcer l'affichage de l'état d'avancement"

4418 +

4419 +#: builtin/checkout.c:1191

4420 msgid "-b, -B and --orphan are mutually exclusive"

4421 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

4422

4365 -#: builtin/checkout.c:1198

4423 +#: builtin/checkout.c:1208

4424 msgid "--track needs a branch name"

4425 msgstr "--track requiert un nom de branche"

4426

4369 -#: builtin/checkout.c:1203

4427 +#: builtin/checkout.c:1213

4428 msgid "Missing branch name; try -b"

4429 msgstr "Nom de branche manquant ; essayez -b"

4430

4373 -#: builtin/checkout.c:1239

4431 +#: builtin/checkout.c:1249

4432 msgid "invalid path specification"

4433 msgstr "spécification de chemin invalide"

4434

4377 -#: builtin/checkout.c:1246

4435 +#: builtin/checkout.c:1256

4436 #, c-format

4437 msgid ""

4438 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4384,12 +4442,12 @@ msgstr ""

4442 "en même temps.\n"

4443 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

4444

4387 -#: builtin/checkout.c:1251

4445 +#: builtin/checkout.c:1261

4446 #, c-format

4447 msgid "git checkout: --detach does not take a path argument '%s'"

4448 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

4449

4392 -#: builtin/checkout.c:1255

4450 +#: builtin/checkout.c:1265

4451 msgid ""

4452 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4453 "checking out of the index."

@@ -4428,7 +4486,7 @@ msgstr "Ignorerait le dépôt %s\n"

4486 msgid "failed to remove %s"

4487 msgstr "échec de la suppression de %s"

4488

4431 -#: builtin/clean.c:317

4489 +#: builtin/clean.c:315

4490 msgid ""

4491 "Prompt help:\n"

4492 "1 - select a numbered item\n"

@@ -4440,7 +4498,7 @@ msgstr ""

4498 "foo - sélectionner un élément par un préfixe unique\n"

4499 " - (vide) ne rien sélectionner"

4500

4443 -#: builtin/clean.c:321

4501 +#: builtin/clean.c:319

4502 msgid ""

4503 "Prompt help:\n"

4504 "1 - select a single item\n"

@@ -4460,36 +4518,36 @@ msgstr ""

4518 "* - choisir tous les éléments\n"

4519 " - (vide) terminer la sélection"

4520

4463 -#: builtin/clean.c:537

4521 +#: builtin/clean.c:535

4522 #, c-format

4523 msgid "Huh (%s)?"

4524 msgstr "Hein (%s) ?"

4525

4468 -#: builtin/clean.c:679

4526 +#: builtin/clean.c:677

4527 #, c-format

4528 msgid "Input ignore patterns>> "

4529 msgstr "Entrez les motifs à ignorer>> "

4530

4473 -#: builtin/clean.c:716

4531 +#: builtin/clean.c:714

4532 #, c-format

4533 msgid "WARNING: Cannot find items matched by: %s"

4534 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

4535

4478 -#: builtin/clean.c:737

4536 +#: builtin/clean.c:735

4537 msgid "Select items to delete"

4538 msgstr "Sélectionner les éléments à supprimer"

4539

4540 #. TRANSLATORS: Make sure to keep [y/N] as is

4483 -#: builtin/clean.c:778

4541 +#: builtin/clean.c:776

4542 #, c-format

4543 msgid "Remove %s [y/N]? "

4544 msgstr "Supprimer %s [y/N] ? "

4545

4488 -#: builtin/clean.c:803

4546 +#: builtin/clean.c:801

4547 msgid "Bye."

4548 msgstr "Au revoir."

4549

4492 -#: builtin/clean.c:811

4550 +#: builtin/clean.c:809

4551 msgid ""

4552 "clean - start cleaning\n"

4553 "filter by pattern - exclude items from deletion\n"

@@ -4507,62 +4565,62 @@ msgstr ""

4565 "help - cet écran\n"

4566 "? - aide pour la sélection en ligne"

4567

4510 -#: builtin/clean.c:838

4568 +#: builtin/clean.c:836

4569 msgid "*** Commands ***"

4570 msgstr "*** Commandes ***"

4571

4514 -#: builtin/clean.c:839

4572 +#: builtin/clean.c:837

4573 msgid "What now"

4574 msgstr "Et maintenant ?"

4575

4518 -#: builtin/clean.c:847

4576 +#: builtin/clean.c:845

4577 msgid "Would remove the following item:"

4578 msgid_plural "Would remove the following items:"

4579 msgstr[0] "Supprimerait l'élément suivant :"

4580 msgstr[1] "Supprimerait les éléments suivants :"

4581

4524 -#: builtin/clean.c:864

4582 +#: builtin/clean.c:862

4583 msgid "No more files to clean, exiting."

4584 msgstr "Plus de fichier à nettoyer, sortie."

4585

4528 -#: builtin/clean.c:895

4586 +#: builtin/clean.c:893

4587 msgid "do not print names of files removed"

4588 msgstr "ne pas afficher les noms des fichiers supprimés"

4589

4532 -#: builtin/clean.c:897

4590 +#: builtin/clean.c:895

4591 msgid "force"

4592 msgstr "forcer"

4593

4536 -#: builtin/clean.c:898

4594 +#: builtin/clean.c:896

4595 msgid "interactive cleaning"

4596 msgstr "nettoyage interactif"

4597

4540 -#: builtin/clean.c:900

4598 +#: builtin/clean.c:898

4599 msgid "remove whole directories"

4600 msgstr "supprimer les répertoires entiers"

4601

4544 -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4545 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4602 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4603 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4604 msgid "pattern"

4605 msgstr "motif"

4606

4549 -#: builtin/clean.c:902

4607 +#: builtin/clean.c:900

4608 msgid "add <pattern> to ignore rules"

4609 msgstr "ajouter <motif> aux règles ignore"

4610

4553 -#: builtin/clean.c:903

4611 +#: builtin/clean.c:901

4612 msgid "remove ignored files, too"

4613 msgstr "supprimer les fichiers ignorés, aussi"

4614

4557 -#: builtin/clean.c:905

4615 +#: builtin/clean.c:903

4616 msgid "remove only ignored files"

4617 msgstr "supprimer seulement les fichiers ignorés"

4618

4561 -#: builtin/clean.c:923

4619 +#: builtin/clean.c:921

4620 msgid "-x and -X cannot be used together"

4621 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

4622

4565 -#: builtin/clean.c:927

4623 +#: builtin/clean.c:925

4624 msgid ""

4625 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4626 "clean"

@@ -4570,7 +4628,7 @@ msgstr ""

4628 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

4629 "nettoyer"

4630

4573 -#: builtin/clean.c:930

4631 +#: builtin/clean.c:928

4632 msgid ""

4633 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4634 "refusing to clean"

@@ -4582,16 +4640,11 @@ msgstr ""

4640 msgid "git clone [<options>] [--] <repo> [<dir>]"

4641 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

4642

4585 -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4586 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4587 -msgid "force progress reporting"

4588 -msgstr "forcer l'affichage de l'état d'avancement"

4589 -

4643 #: builtin/clone.c:59

4644 msgid "don't create a checkout"

4645 msgstr "ne pas créer d'extraction"

4646

4594 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4647 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4648 msgid "create a bare repository"

4649 msgstr "créer un dépôt nu"

4650

@@ -4615,15 +4668,15 @@ msgstr "régler comme dépôt partagé"

4668 msgid "initialize submodules in the clone"

4669 msgstr "initialiser les sous-modules dans le clone"

4670

4618 -#: builtin/clone.c:75 builtin/init-db.c:501

4671 +#: builtin/clone.c:75 builtin/init-db.c:466

4672 msgid "template-directory"

4673 msgstr "répertoire-modèle"

4674

4622 -#: builtin/clone.c:76 builtin/init-db.c:502

4675 +#: builtin/clone.c:76 builtin/init-db.c:467

4676 msgid "directory from which templates will be used"

4677 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4678

4626 -#: builtin/clone.c:78

4679 +#: builtin/clone.c:78 builtin/submodule--helper.c:179

4680 msgid "reference repository"

4681 msgstr "dépôt de référence"

4682

@@ -4647,7 +4700,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4700 msgid "path to git-upload-pack on the remote"

4701 msgstr "chemin vers git-upload-pack sur le serveur distant"

4702

4650 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 builtin/pull.c:186

4703 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 builtin/pull.c:186

4704 msgid "depth"

4705 msgstr "profondeur"

4706

@@ -4659,11 +4712,11 @@ msgstr "créer un clone superficiel de cette profondeur"

4712 msgid "clone only one branch, HEAD or --branch"

4713 msgstr "cloner seulement une branche, HEAD ou --branch"

4714

4662 -#: builtin/clone.c:91 builtin/init-db.c:510

4715 +#: builtin/clone.c:91 builtin/init-db.c:475

4716 msgid "gitdir"

4717 msgstr "gitdir"

4718

4666 -#: builtin/clone.c:92 builtin/init-db.c:511

4719 +#: builtin/clone.c:92 builtin/init-db.c:476

4720 msgid "separate git dir from working tree"

4721 msgstr "séparer le répertoire git de la copie de travail"

4722

@@ -4675,52 +4728,57 @@ msgstr "clé=valeur"

4728 msgid "set config inside the new repository"

4729 msgstr "régler la configuration dans le nouveau dépôt"

4730

4678 -#: builtin/clone.c:298

4731 +#: builtin/clone.c:300

4732 +#, c-format

4733 +msgid "reference repository '%s' as a linked checkout is not supported yet."

4734 +msgstr "extraire le dépôt de référence '%s' comme une extraction liée n'est pas encore supporté"

4735 +

4736 +#: builtin/clone.c:302

4737 #, c-format

4738 msgid "reference repository '%s' is not a local repository."

4739 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

4740

4683 -#: builtin/clone.c:302

4741 +#: builtin/clone.c:307

4742 #, c-format

4743 msgid "reference repository '%s' is shallow"

4744 msgstr "le dépôt de référence '%s' est superficiel"

4745

4688 -#: builtin/clone.c:305

4746 +#: builtin/clone.c:310

4747 #, c-format

4748 msgid "reference repository '%s' is grafted"

4749 msgstr "le dépôt de référence '%s' est greffé"

4750

4693 -#: builtin/clone.c:370 builtin/diff.c:84

4751 +#: builtin/clone.c:375 builtin/diff.c:84

4752 #, c-format

4753 msgid "failed to stat '%s'"

4754 msgstr "échec du stat de '%s'"

4755

4698 -#: builtin/clone.c:372

4756 +#: builtin/clone.c:377

4757 #, c-format

4758 msgid "%s exists and is not a directory"

4759 msgstr "%s existe et n'est pas un répertoire"

4760

4703 -#: builtin/clone.c:386

4761 +#: builtin/clone.c:391

4762 #, c-format

4763 msgid "failed to stat %s\n"

4764 msgstr "échec du stat de %s\n"

4765

4708 -#: builtin/clone.c:408

4766 +#: builtin/clone.c:413

4767 #, c-format

4768 msgid "failed to create link '%s'"

4769 msgstr "échec de la création du lien '%s'"

4770

4713 -#: builtin/clone.c:412

4771 +#: builtin/clone.c:417

4772 #, c-format

4773 msgid "failed to copy file to '%s'"

4774 msgstr "échec de la copie vers '%s'"

4775

4718 -#: builtin/clone.c:435 builtin/clone.c:619

4776 +#: builtin/clone.c:442 builtin/clone.c:626

4777 #, c-format

4778 msgid "done.\n"

4779 msgstr "fait.\n"

4780

4723 -#: builtin/clone.c:447

4781 +#: builtin/clone.c:454

4782 msgid ""

4783 "Clone succeeded, but checkout failed.\n"

4784 "You can inspect what was checked out with 'git status'\n"

@@ -4730,125 +4788,121 @@ msgstr ""

4788 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4789 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4790

4733 -#: builtin/clone.c:524

4791 +#: builtin/clone.c:531

4792 #, c-format

4793 msgid "Could not find remote branch %s to clone."

4794 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4795

4738 -#: builtin/clone.c:614

4796 +#: builtin/clone.c:621

4797 #, c-format

4798 msgid "Checking connectivity... "

4799 msgstr "Vérification de la connectivité... "

4800

4743 -#: builtin/clone.c:617

4801 +#: builtin/clone.c:624

4802 msgid "remote did not send all necessary objects"

4803 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4804

4747 -#: builtin/clone.c:681

4805 +#: builtin/clone.c:688

4806 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4807 msgstr ""

4808 "la HEAD distante réfère à une référence non existante, impossible de "

4809 "l'extraire.\n"

4810

4753 -#: builtin/clone.c:712

4811 +#: builtin/clone.c:719

4812 msgid "unable to checkout working tree"

4813 msgstr "impossible d'extraire la copie de travail"

4814

4757 -#: builtin/clone.c:799

4815 +#: builtin/clone.c:808

4816 msgid "cannot repack to clean up"

4817 msgstr "impossible de remballer pour nettoyer"

4818

4761 -#: builtin/clone.c:801

4819 +#: builtin/clone.c:810

4820 msgid "cannot unlink temporary alternates file"

4821 msgstr "impossible de unlinker le fichier temporaire alternates"

4822

4765 -#: builtin/clone.c:831

4823 +#: builtin/clone.c:842

4824 msgid "Too many arguments."

4825 msgstr "Trop d'arguments."

4826

4769 -#: builtin/clone.c:835

4827 +#: builtin/clone.c:846

4828 msgid "You must specify a repository to clone."

4829 msgstr "Vous devez spécifier un dépôt à cloner."

4830

4773 -#: builtin/clone.c:846

4831 +#: builtin/clone.c:857

4832 #, c-format

4833 msgid "--bare and --origin %s options are incompatible."

4834 msgstr "les options --bare et --origin %s sont incompatibles."

4835

4778 -#: builtin/clone.c:849

4836 +#: builtin/clone.c:860

4837 msgid "--bare and --separate-git-dir are incompatible."

4838 msgstr "--bare et --separate-git-dir sont incompatibles."

4839

4782 -#: builtin/clone.c:862

4840 +#: builtin/clone.c:873

4841 #, c-format

4842 msgid "repository '%s' does not exist"

4843 msgstr "le dépôt '%s' n'existe pas"

4844

4787 -#: builtin/clone.c:868 builtin/fetch.c:1168

4845 +#: builtin/clone.c:879 builtin/fetch.c:1166

4846 #, c-format

4847 msgid "depth %s is not a positive number"

4848 msgstr "la profondeur %s n'est pas un entier positif"

4849

4792 -#: builtin/clone.c:878

4850 +#: builtin/clone.c:889

4851 #, c-format

4852 msgid "destination path '%s' already exists and is not an empty directory."

4853 msgstr ""

4854 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4855

4798 -#: builtin/clone.c:888

4856 +#: builtin/clone.c:899

4857 #, c-format

4858 msgid "working tree '%s' already exists."

4859 msgstr "la copie de travail '%s' existe déjà."

4860

4803 -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4804 -#: builtin/worktree.c:245

4861 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4862 +#: builtin/worktree.c:221 builtin/worktree.c:248

4863 #, c-format

4864 msgid "could not create leading directories of '%s'"

4865 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4866

4809 -#: builtin/clone.c:906

4867 +#: builtin/clone.c:917

4868 #, c-format

4869 msgid "could not create work tree dir '%s'"

4870 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

4871

4814 -#: builtin/clone.c:924

4872 +#: builtin/clone.c:935

4873 #, c-format

4874 msgid "Cloning into bare repository '%s'...\n"

4875 msgstr "Clonage dans le dépôt nu '%s'\n"

4876

4819 -#: builtin/clone.c:926

4877 +#: builtin/clone.c:937

4878 #, c-format

4879 msgid "Cloning into '%s'...\n"

4880 msgstr "Clonage dans '%s'...\n"

4881

4824 -#: builtin/clone.c:951

4825 -msgid "--dissociate given, but there is no --reference"

4826 -msgstr "--dissociate est spécifié, mais --reference est absent"

4827 -

4828 -#: builtin/clone.c:968

4882 +#: builtin/clone.c:975

4883 msgid "--depth is ignored in local clones; use file:// instead."

4884 msgstr ""

4885 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4886

4833 -#: builtin/clone.c:971

4887 +#: builtin/clone.c:978

4888 msgid "source repository is shallow, ignoring --local"

4889 msgstr "le dépôt source est superficiel, option --local ignorée"

4890

4837 -#: builtin/clone.c:976

4891 +#: builtin/clone.c:983

4892 msgid "--local is ignored"

4893 msgstr "--local est ignoré"

4894

4841 -#: builtin/clone.c:980

4895 +#: builtin/clone.c:987

4896 #, c-format

4897 msgid "Don't know how to clone %s"

4898 msgstr "Je ne sais pas cloner %s"

4899

4846 -#: builtin/clone.c:1029 builtin/clone.c:1037

4900 +#: builtin/clone.c:1036 builtin/clone.c:1044

4901 #, c-format

4902 msgid "Remote branch %s not found in upstream %s"

4903 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4904

4851 -#: builtin/clone.c:1040

4905 +#: builtin/clone.c:1047

4906 msgid "You appear to have cloned an empty repository."

4907 msgstr "Vous semblez avoir cloné un dépôt vide."

4908

@@ -4884,15 +4938,15 @@ msgstr "Remplissage d'espace entre les colonnes"

4938 msgid "--command must be the first argument"

4939 msgstr "--command doit être le premier argument"

4940

4887 -#: builtin/commit.c:37

4941 +#: builtin/commit.c:38

4942 msgid "git commit [<options>] [--] <pathspec>..."

4943 msgstr "git commit [<options>] [--] <spécification-de-chemin>..."

4944

4891 -#: builtin/commit.c:42

4945 +#: builtin/commit.c:43

4946 msgid "git status [<options>] [--] <pathspec>..."

4947 msgstr "git status [<options>] [--] <spécification-de-chemin>..."

4948

4895 -#: builtin/commit.c:47

4949 +#: builtin/commit.c:48

4950 msgid ""

4951 "Your name and email address were configured automatically based\n"

4952 "on your username and hostname. Please check that they are accurate.\n"

@@ -4919,7 +4973,7 @@ msgstr ""

4973 "\n"

4974 " git commit --amend --reset-author\n"

4975

4922 -#: builtin/commit.c:60

4976 +#: builtin/commit.c:61

4977 msgid ""

4978 "Your name and email address were configured automatically based\n"

4979 "on your username and hostname. Please check that they are accurate.\n"

@@ -4945,7 +4999,7 @@ msgstr ""

4999 "\n"

5000 " git commit --amend --reset-author\n"

5001

4948 -#: builtin/commit.c:72

5002 +#: builtin/commit.c:73

5003 msgid ""

5004 "You asked to amend the most recent commit, but doing so would make\n"

5005 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4956,7 +5010,7 @@ msgstr ""

5010 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"

5011 "supprimer complètement le commit avec \"git reset HEAD^\".\n"

5012

4959 -#: builtin/commit.c:77

5013 +#: builtin/commit.c:78

5014 msgid ""

5015 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

5016 "If you wish to commit it anyway, use:\n"

@@ -4971,11 +5025,11 @@ msgstr ""

5025 " git commit --allow-empty\n"

5026 "\n"

5027

4974 -#: builtin/commit.c:84

5028 +#: builtin/commit.c:85

5029 msgid "Otherwise, please use 'git reset'\n"

5030 msgstr "Sinon, veuillez utiliser 'git reset'\n"

5031

4978 -#: builtin/commit.c:87

5032 +#: builtin/commit.c:88

5033 msgid ""

5034 "If you wish to skip this commit, use:\n"

5035 "\n"

@@ -4991,66 +5045,66 @@ msgstr ""

5045 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

5046 "des commits restants.\n"

5047

4994 -#: builtin/commit.c:304

5048 +#: builtin/commit.c:305

5049 msgid "failed to unpack HEAD tree object"

5050 msgstr "échec du dépaquetage de l'objet arbre HEAD"

5051

4998 -#: builtin/commit.c:345

5052 +#: builtin/commit.c:346

5053 msgid "unable to create temporary index"

5054 msgstr "impossible de créer l'index temporaire"

5055

5002 -#: builtin/commit.c:351

5056 +#: builtin/commit.c:352

5057 msgid "interactive add failed"

5058 msgstr "échec de l'ajout interactif"

5059

5006 -#: builtin/commit.c:364

5060 +#: builtin/commit.c:365

5061 msgid "unable to update temporary index"

5062 msgstr "impossible de mettre à jour l'index temporaire"

5063

5010 -#: builtin/commit.c:366

5064 +#: builtin/commit.c:367

5065 msgid "Failed to update main cache tree"

5066 msgstr "Impossible de mettre à jour l'arbre de cache principal"

5067

5014 -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

5068 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5069 msgid "unable to write new_index file"

5070 msgstr "impossible d'écrire le fichier new_index"

5071

5018 -#: builtin/commit.c:444

5072 +#: builtin/commit.c:445

5073 msgid "cannot do a partial commit during a merge."

5074 msgstr "impossible de faire une validation partielle pendant une fusion."

5075

5022 -#: builtin/commit.c:446

5076 +#: builtin/commit.c:447

5077 msgid "cannot do a partial commit during a cherry-pick."

5078 msgstr "impossible de faire une validation partielle pendant un picorage."

5079

5026 -#: builtin/commit.c:455

5080 +#: builtin/commit.c:456

5081 msgid "cannot read the index"

5082 msgstr "impossible de lire l'index"

5083

5030 -#: builtin/commit.c:474

5084 +#: builtin/commit.c:475

5085 msgid "unable to write temporary index file"

5086 msgstr "impossible d'écrire le fichier d'index temporaire"

5087

5034 -#: builtin/commit.c:579

5088 +#: builtin/commit.c:580

5089 #, c-format

5090 msgid "commit '%s' lacks author header"

5091 msgstr "entête d'auteur manquant dans le commit '%s'"

5092

5039 -#: builtin/commit.c:581

5093 +#: builtin/commit.c:582

5094 #, c-format

5095 msgid "commit '%s' has malformed author line"

5096 msgstr "le commit '%s' a une ligne d'auteur malformée"

5097

5044 -#: builtin/commit.c:600

5098 +#: builtin/commit.c:601

5099 msgid "malformed --author parameter"

5100 msgstr "paramètre --author mal formé"

5101

5048 -#: builtin/commit.c:608

5102 +#: builtin/commit.c:609

5103 #, c-format

5104 msgid "invalid date format: %s"

5105 msgstr "format de date invalide : %s"

5106

5053 -#: builtin/commit.c:652

5107 +#: builtin/commit.c:653

5108 msgid ""

5109 "unable to select a comment character that is not used\n"

5110 "in the current commit message"

@@ -5058,38 +5112,38 @@ msgstr ""

5112 "impossible de sélectionner un caractère de commentaire\n"

5113 "qui n'est pas utilisé dans le message de validation actuel"

5114

5061 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

5115 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5116 #, c-format

5117 msgid "could not lookup commit %s"

5118 msgstr "impossible de rechercher le commit %s"

5119

5066 -#: builtin/commit.c:701 builtin/shortlog.c:273

5120 +#: builtin/commit.c:702 builtin/shortlog.c:273

5121 #, c-format

5122 msgid "(reading log message from standard input)\n"

5123 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

5124

5071 -#: builtin/commit.c:703

5125 +#: builtin/commit.c:704

5126 msgid "could not read log from standard input"

5127 msgstr "impossible de lire le journal depuis l'entrée standard"

5128

5075 -#: builtin/commit.c:707

5129 +#: builtin/commit.c:708

5130 #, c-format

5131 msgid "could not read log file '%s'"

5132 msgstr "impossible de lire le fichier de journal '%s'"

5133

5080 -#: builtin/commit.c:729

5134 +#: builtin/commit.c:730

5135 msgid "could not read MERGE_MSG"

5136 msgstr "impossible de lire MERGE_MSG"

5137

5084 -#: builtin/commit.c:733

5138 +#: builtin/commit.c:734

5139 msgid "could not read SQUASH_MSG"

5140 msgstr "impossible de lire SQUASH_MSG"

5141

5088 -#: builtin/commit.c:784

5142 +#: builtin/commit.c:785

5143 msgid "could not write commit template"

5144 msgstr "impossible d'écrire le modèle de commit"

5145

5092 -#: builtin/commit.c:802

5146 +#: builtin/commit.c:803

5147 #, c-format

5148 msgid ""

5149 "\n"

@@ -5104,7 +5158,7 @@ msgstr ""

5158 "\t%s\n"

5159 "et essayez à nouveau.\n"

5160

5107 -#: builtin/commit.c:807

5161 +#: builtin/commit.c:808

5162 #, c-format

5163 msgid ""

5164 "\n"

@@ -5119,7 +5173,7 @@ msgstr ""

5173 "\t%s\n"

5174 "et essayez à nouveau.\n"

5175

5122 -#: builtin/commit.c:820

5176 +#: builtin/commit.c:821

5177 #, c-format

5178 msgid ""

5179 "Please enter the commit message for your changes. Lines starting\n"

@@ -5129,7 +5183,7 @@ msgstr ""

5183 "commençant par '%c' seront ignorées, et un message vide abandonne la "

5184 "validation.\n"

5185

5132 -#: builtin/commit.c:827

5186 +#: builtin/commit.c:828

5187 #, c-format

5188 msgid ""

5189 "Please enter the commit message for your changes. Lines starting\n"

@@ -5140,149 +5194,150 @@ msgstr ""

5194 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

5195 "si vous le souhaitez. Un message vide abandonne la validation.\n"

5196

5143 -#: builtin/commit.c:847

5197 +#: builtin/commit.c:848

5198 #, c-format

5199 msgid "%sAuthor: %.*s <%.*s>"

5200 msgstr "%sAuteur : %.*s <%.*s>"

5201

5148 -#: builtin/commit.c:855

5202 +#: builtin/commit.c:856

5203 #, c-format

5204 msgid "%sDate: %s"

5205 msgstr "%sDate : %s"

5206

5153 -#: builtin/commit.c:862

5207 +#: builtin/commit.c:863

5208 #, c-format

5209 msgid "%sCommitter: %.*s <%.*s>"

5210 msgstr "%sValidateur : %.*s <%.*s>"

5211

5158 -#: builtin/commit.c:880

5212 +#: builtin/commit.c:881

5213 msgid "Cannot read index"

5214 msgstr "Impossible de lire l'index"

5215

5162 -#: builtin/commit.c:937

5216 +#: builtin/commit.c:938

5217 msgid "Error building trees"

5218 msgstr "Erreur lors de la construction des arbres"

5219

5166 -#: builtin/commit.c:952 builtin/tag.c:495

5220 +#: builtin/commit.c:953 builtin/tag.c:266

5221 #, c-format

5222 msgid "Please supply the message using either -m or -F option.\n"

5223 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

5224

5171 -#: builtin/commit.c:1054

5225 +#: builtin/commit.c:1055

5226 #, c-format

5227 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5228 msgstr ""

5229 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

5230 "auteur existant"

5231

5178 -#: builtin/commit.c:1069 builtin/commit.c:1309

5232 +#: builtin/commit.c:1070 builtin/commit.c:1310

5233 #, c-format

5234 msgid "Invalid untracked files mode '%s'"

5235 msgstr "Mode de fichier non suivi invalide '%s'"

5236

5183 -#: builtin/commit.c:1106

5237 +#: builtin/commit.c:1107

5238 msgid "--long and -z are incompatible"

5239 msgstr "--long et -z sont incompatibles"

5240

5187 -#: builtin/commit.c:1136

5241 +#: builtin/commit.c:1137

5242 msgid "Using both --reset-author and --author does not make sense"

5243 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

5244

5191 -#: builtin/commit.c:1145

5245 +#: builtin/commit.c:1146

5246 msgid "You have nothing to amend."

5247 msgstr "Il n'y a rien à corriger."

5248

5195 -#: builtin/commit.c:1148

5249 +#: builtin/commit.c:1149

5250 msgid "You are in the middle of a merge -- cannot amend."

5251 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

5252

5199 -#: builtin/commit.c:1150

5253 +#: builtin/commit.c:1151

5254 msgid "You are in the middle of a cherry-pick -- cannot amend."

5255 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

5256

5203 -#: builtin/commit.c:1153

5257 +#: builtin/commit.c:1154

5258 msgid "Options --squash and --fixup cannot be used together"

5259 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

5260

5207 -#: builtin/commit.c:1163

5261 +#: builtin/commit.c:1164

5262 msgid "Only one of -c/-C/-F/--fixup can be used."

5263 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

5264

5211 -#: builtin/commit.c:1165

5265 +#: builtin/commit.c:1166

5266 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5267 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

5268

5215 -#: builtin/commit.c:1173

5269 +#: builtin/commit.c:1174

5270 msgid "--reset-author can be used only with -C, -c or --amend."

5271 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

5272

5219 -#: builtin/commit.c:1190

5273 +#: builtin/commit.c:1191

5274 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5275 msgstr ""

5276 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

5277 "être utilisée."

5278

5225 -#: builtin/commit.c:1192

5279 +#: builtin/commit.c:1193

5280 msgid "No paths with --include/--only does not make sense."

5281 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

5282

5229 -#: builtin/commit.c:1194

5283 +#: builtin/commit.c:1195

5284 msgid "Clever... amending the last one with dirty index."

5285 msgstr "Malin... correction du dernier avec un index sale."

5286

5233 -#: builtin/commit.c:1196

5287 +#: builtin/commit.c:1197

5288 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5289 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

5290

5237 -#: builtin/commit.c:1208 builtin/tag.c:730

5291 +#: builtin/commit.c:1209 builtin/tag.c:475

5292 #, c-format

5293 msgid "Invalid cleanup mode %s"

5294 msgstr "Mode de nettoyage invalide %s"

5295

5242 -#: builtin/commit.c:1213

5296 +#: builtin/commit.c:1214

5297 msgid "Paths with -a does not make sense."

5298 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

5299

5246 -#: builtin/commit.c:1323 builtin/commit.c:1602

5300 +#: builtin/commit.c:1324 builtin/commit.c:1605

5301 msgid "show status concisely"

5302 msgstr "afficher le statut avec concision"

5303

5250 -#: builtin/commit.c:1325 builtin/commit.c:1604

5304 +#: builtin/commit.c:1326 builtin/commit.c:1607

5305 msgid "show branch information"

5306 msgstr "afficher l'information de branche"

5307

5254 -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5308 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5309 +#: builtin/worktree.c:423

5310 msgid "machine-readable output"

5311 msgstr "sortie pour traitement automatique"

5312

5258 -#: builtin/commit.c:1330 builtin/commit.c:1608

5313 +#: builtin/commit.c:1331 builtin/commit.c:1611

5314 msgid "show status in long format (default)"

5315 msgstr "afficher le statut en format long (par défaut)"

5316

5262 -#: builtin/commit.c:1333 builtin/commit.c:1611

5317 +#: builtin/commit.c:1334 builtin/commit.c:1614

5318 msgid "terminate entries with NUL"

5319 msgstr "terminer les éléments par NUL"

5320

5266 -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5267 -#: builtin/fast-export.c:984 builtin/tag.c:604

5321 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5322 +#: builtin/fast-export.c:984 builtin/tag.c:353

5323 msgid "mode"

5324 msgstr "mode"

5325

5271 -#: builtin/commit.c:1336 builtin/commit.c:1614

5326 +#: builtin/commit.c:1337 builtin/commit.c:1617

5327 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5328 msgstr ""

5329 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

5330 "no. (Défaut : all)"

5331

5277 -#: builtin/commit.c:1339

5332 +#: builtin/commit.c:1340

5333 msgid "show ignored files"

5334 msgstr "afficher les fichiers ignorés"

5335

5281 -#: builtin/commit.c:1340 parse-options.h:155

5336 +#: builtin/commit.c:1341 parse-options.h:155

5337 msgid "when"

5338 msgstr "quand"

5339

5285 -#: builtin/commit.c:1341

5340 +#: builtin/commit.c:1342

5341 msgid ""

5342 "ignore changes to submodules, optional when: all, dirty, untracked. "

5343 "(Default: all)"

@@ -5290,196 +5345,201 @@ msgstr ""

5345 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

5346 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

5347

5293 -#: builtin/commit.c:1343

5348 +#: builtin/commit.c:1344

5349 msgid "list untracked files in columns"

5350 msgstr "afficher les fichiers non suivis en colonnes"

5351

5297 -#: builtin/commit.c:1429

5352 +#: builtin/commit.c:1430

5353 msgid "couldn't look up newly created commit"

5354 msgstr "impossible de retrouver le commit nouvellement créé"

5355

5301 -#: builtin/commit.c:1431

5356 +#: builtin/commit.c:1432

5357 msgid "could not parse newly created commit"

5358 msgstr "impossible d'analyser le commit nouvellement créé"

5359

5305 -#: builtin/commit.c:1476

5360 +#: builtin/commit.c:1477

5361 msgid "detached HEAD"

5362 msgstr "HEAD détachée"

5363

5309 -#: builtin/commit.c:1479

5364 +#: builtin/commit.c:1480

5365 msgid " (root-commit)"

5366 msgstr " (commit racine)"

5367

5313 -#: builtin/commit.c:1572

5368 +#: builtin/commit.c:1575

5369 msgid "suppress summary after successful commit"

5370 msgstr "supprimer le résumé après une validation réussie"

5371

5317 -#: builtin/commit.c:1573

5372 +#: builtin/commit.c:1576

5373 msgid "show diff in commit message template"

5374 msgstr "afficher les diff dans le modèle de message de validation"

5375

5321 -#: builtin/commit.c:1575

5376 +#: builtin/commit.c:1578

5377 msgid "Commit message options"

5378 msgstr "Options du message de validation"

5379

5325 -#: builtin/commit.c:1576 builtin/tag.c:602

5380 +#: builtin/commit.c:1579 builtin/tag.c:351

5381 msgid "read message from file"

5382 msgstr "lire le message depuis un fichier"

5383

5329 -#: builtin/commit.c:1577

5384 +#: builtin/commit.c:1580

5385 msgid "author"

5386 msgstr "auteur"

5387

5333 -#: builtin/commit.c:1577

5388 +#: builtin/commit.c:1580

5389 msgid "override author for commit"

5390 msgstr "remplacer l'auteur pour la validation"

5391

5337 -#: builtin/commit.c:1578 builtin/gc.c:268

5392 +#: builtin/commit.c:1581 builtin/gc.c:326

5393 msgid "date"

5394 msgstr "date"

5395

5341 -#: builtin/commit.c:1578

5396 +#: builtin/commit.c:1581

5397 msgid "override date for commit"

5398 msgstr "remplacer la date pour la validation"

5399

5345 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5346 -#: builtin/notes.c:555 builtin/tag.c:600

5400 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5401 +#: builtin/notes.c:555 builtin/tag.c:349

5402 msgid "message"

5403 msgstr "message"

5404

5350 -#: builtin/commit.c:1579

5405 +#: builtin/commit.c:1582

5406 msgid "commit message"

5407 msgstr "message de validation"

5408

5354 -#: builtin/commit.c:1580

5409 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5410 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5411 +msgid "commit"

5412 +msgstr "commit"

5413 +

5414 +#: builtin/commit.c:1583

5415 msgid "reuse and edit message from specified commit"

5416 msgstr "réutiliser et éditer le message du commit spécifié"

5417

5358 -#: builtin/commit.c:1581

5418 +#: builtin/commit.c:1584

5419 msgid "reuse message from specified commit"

5420 msgstr "réutiliser le message du commit spécifié"

5421

5362 -#: builtin/commit.c:1582

5422 +#: builtin/commit.c:1585

5423 msgid "use autosquash formatted message to fixup specified commit"

5424 msgstr ""

5425 "utiliser un message au format autosquash pour corriger le commit spécifié"

5426

5367 -#: builtin/commit.c:1583

5427 +#: builtin/commit.c:1586

5428 msgid "use autosquash formatted message to squash specified commit"

5429 msgstr ""

5430 "utiliser un message au format autosquash pour compresser le commit spécifié"

5431

5372 -#: builtin/commit.c:1584

5432 +#: builtin/commit.c:1587

5433 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5434 msgstr ""

5435 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

5436

5377 -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5437 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5438 msgid "add Signed-off-by:"

5439 msgstr "ajouter une entrée Signed-off-by :"

5440

5381 -#: builtin/commit.c:1586

5441 +#: builtin/commit.c:1589

5442 msgid "use specified template file"

5443 msgstr "utiliser le fichier de modèle spécifié"

5444

5385 -#: builtin/commit.c:1587

5445 +#: builtin/commit.c:1590

5446 msgid "force edit of commit"

5447 msgstr "forcer l'édition du commit"

5448

5389 -#: builtin/commit.c:1588

5449 +#: builtin/commit.c:1591

5450 msgid "default"

5451 msgstr "défaut"

5452

5393 -#: builtin/commit.c:1588 builtin/tag.c:605

5453 +#: builtin/commit.c:1591 builtin/tag.c:354

5454 msgid "how to strip spaces and #comments from message"

5455 msgstr "comment éliminer les espaces et les commentaires # du message"

5456

5397 -#: builtin/commit.c:1589

5457 +#: builtin/commit.c:1592

5458 msgid "include status in commit message template"

5459 msgstr "inclure le statut dans le modèle de message de validation"

5460

5401 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5461 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5462 #: builtin/revert.c:93

5463 msgid "GPG sign commit"

5464 msgstr "signer la validation avec GPG"

5465

5406 -#: builtin/commit.c:1594

5466 +#: builtin/commit.c:1597

5467 msgid "Commit contents options"

5468 msgstr "Valider les options des contenus"

5469

5410 -#: builtin/commit.c:1595

5470 +#: builtin/commit.c:1598

5471 msgid "commit all changed files"

5472 msgstr "valider tous les fichiers modifiés"

5473

5414 -#: builtin/commit.c:1596

5474 +#: builtin/commit.c:1599

5475 msgid "add specified files to index for commit"

5476 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

5477

5418 -#: builtin/commit.c:1597

5478 +#: builtin/commit.c:1600

5479 msgid "interactively add files"

5480 msgstr "ajouter des fichiers en mode interactif"

5481

5422 -#: builtin/commit.c:1598

5482 +#: builtin/commit.c:1601

5483 msgid "interactively add changes"

5484 msgstr "ajouter les modifications en mode interactif"

5485

5426 -#: builtin/commit.c:1599

5486 +#: builtin/commit.c:1602

5487 msgid "commit only specified files"

5488 msgstr "valider seulement les fichiers spécifiés"

5489

5430 -#: builtin/commit.c:1600

5490 +#: builtin/commit.c:1603

5491 msgid "bypass pre-commit hook"

5492 msgstr "éviter d'utiliser le crochet pre-commit"

5493

5434 -#: builtin/commit.c:1601

5494 +#: builtin/commit.c:1604

5495 msgid "show what would be committed"

5496 msgstr "afficher ce qui serait validé"

5497

5438 -#: builtin/commit.c:1612

5498 +#: builtin/commit.c:1615

5499 msgid "amend previous commit"

5500 msgstr "corriger la validation précédente"

5501

5442 -#: builtin/commit.c:1613

5502 +#: builtin/commit.c:1616

5503 msgid "bypass post-rewrite hook"

5504 msgstr "éviter d'utiliser le crochet post-rewrite"

5505

5446 -#: builtin/commit.c:1618

5506 +#: builtin/commit.c:1621

5507 msgid "ok to record an empty change"

5508 msgstr "accepter d'enregistrer une modification vide"

5509

5450 -#: builtin/commit.c:1620

5510 +#: builtin/commit.c:1623

5511 msgid "ok to record a change with an empty message"

5512 msgstr "accepter d'enregistrer une modification avec un message vide"

5513

5454 -#: builtin/commit.c:1649

5514 +#: builtin/commit.c:1652

5515 msgid "could not parse HEAD commit"

5516 msgstr "impossible d'analyser le commit HEAD"

5517

5458 -#: builtin/commit.c:1695

5518 +#: builtin/commit.c:1698

5519 #, c-format

5520 msgid "Corrupt MERGE_HEAD file (%s)"

5521 msgstr "Fichier MERGE_HEAD corrompu (%s)"

5522

5463 -#: builtin/commit.c:1702

5523 +#: builtin/commit.c:1705

5524 msgid "could not read MERGE_MODE"

5525 msgstr "impossible de lire MERGE_MODE"

5526

5467 -#: builtin/commit.c:1721

5527 +#: builtin/commit.c:1724

5528 #, c-format

5529 msgid "could not read commit message: %s"

5530 msgstr "impossible de lire le message de validation : %s"

5531

5472 -#: builtin/commit.c:1732

5532 +#: builtin/commit.c:1735

5533 #, c-format

5534 msgid "Aborting commit; you did not edit the message.\n"

5535 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

5536

5477 -#: builtin/commit.c:1737

5537 +#: builtin/commit.c:1740

5538 #, c-format

5539 msgid "Aborting commit due to empty commit message.\n"

5540 msgstr "Abandon de la validation du à un message de validation vide\n"

5541

5482 -#: builtin/commit.c:1785

5542 +#: builtin/commit.c:1788

5543 msgid ""

5544 "Repository has been updated, but unable to write\n"

5545 "new_index file. Check that disk is not full and quota is\n"

@@ -5618,11 +5678,11 @@ msgstr "n'afficher que les noms de variable"

5678 msgid "respect include directives on lookup"

5679 msgstr "respecter les directives d'inclusion lors de la recherche"

5680

5621 -#: builtin/config.c:311

5681 +#: builtin/config.c:303

5682 msgid "unable to parse default color value"

5683 msgstr "impossible de lire la valeur de couleur par défaut"

5684

5625 -#: builtin/config.c:449

5685 +#: builtin/config.c:441

5686 #, c-format

5687 msgid ""

5688 "# This is Git's per-user configuration file.\n"

@@ -5637,16 +5697,16 @@ msgstr ""

5697 "#\tname = %s\n"

5698 "#\temail = %s\n"

5699

5640 -#: builtin/config.c:583

5700 +#: builtin/config.c:575

5701 #, c-format

5702 msgid "cannot create configuration file %s"

5703 msgstr "création impossible du fichier de configuration '%s'"

5704

5645 -#: builtin/count-objects.c:55

5705 +#: builtin/count-objects.c:77

5706 msgid "git count-objects [-v] [-H | --human-readable]"

5707 msgstr "git count-objects [-v] [-H | --human-readable]"

5708

5649 -#: builtin/count-objects.c:65

5709 +#: builtin/count-objects.c:87

5710 msgid "print sizes in human readable format"

5711 msgstr "affiche les tailles dans un format humainement lisible"

5712

@@ -5768,7 +5828,7 @@ msgstr ""

5828 msgid "only consider tags matching <pattern>"

5829 msgstr "ne considérer que les étiquettes correspondant à <motif>"

5830

5771 -#: builtin/describe.c:410 builtin/name-rev.c:318

5831 +#: builtin/describe.c:410 builtin/name-rev.c:314

5832 msgid "show abbreviated commit object as fallback"

5833 msgstr "afficher les objets commits abrégés en dernier recours"

5834

@@ -5948,7 +6008,7 @@ msgstr "approfondir l'historique d'un clone superficiel"

6008 msgid "convert to a complete repository"

6009 msgstr "convertir en un dépôt complet"

6010

5951 -#: builtin/fetch.c:118 builtin/log.c:1233

6011 +#: builtin/fetch.c:118 builtin/log.c:1232

6012 msgid "dir"

6013 msgstr "dir"

6014

@@ -5990,7 +6050,7 @@ msgstr "[à jour]"

6050 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

6051 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

6052

5993 -#: builtin/fetch.c:478 builtin/fetch.c:564

6053 +#: builtin/fetch.c:478 builtin/fetch.c:566

6054 msgid "[rejected]"

6055 msgstr "[rejeté]"

6056

@@ -6014,40 +6074,40 @@ msgstr "[nouvelle branche]"

6074 msgid "[new ref]"

6075 msgstr "[nouvelle référence]"

6076

6017 -#: builtin/fetch.c:560

6077 +#: builtin/fetch.c:561

6078 msgid "unable to update local ref"

6079 msgstr "impossible de mettre à jour la référence locale"

6080

6021 -#: builtin/fetch.c:560

6081 +#: builtin/fetch.c:561

6082 msgid "forced update"

6083 msgstr "mise à jour forcée"

6084

6025 -#: builtin/fetch.c:566

6085 +#: builtin/fetch.c:568

6086 msgid "(non-fast-forward)"

6087 msgstr "(pas d'avance rapide)"

6088

6029 -#: builtin/fetch.c:600 builtin/fetch.c:842

6089 +#: builtin/fetch.c:602 builtin/fetch.c:843

6090 #, c-format

6091 msgid "cannot open %s: %s\n"

6092 msgstr "impossible d'ouvrir %s : %s\n"

6093

6034 -#: builtin/fetch.c:609

6094 +#: builtin/fetch.c:611

6095 #, c-format

6096 msgid "%s did not send all necessary objects\n"

6097 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

6098

6039 -#: builtin/fetch.c:627

6099 +#: builtin/fetch.c:629

6100 #, c-format

6101 msgid "reject %s because shallow roots are not allowed to be updated"

6102 msgstr ""

6103 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

6104

6045 -#: builtin/fetch.c:715 builtin/fetch.c:807

6105 +#: builtin/fetch.c:716 builtin/fetch.c:808

6106 #, c-format

6107 msgid "From %.*s\n"

6108 msgstr "Depuis %.*s\n"

6109

6050 -#: builtin/fetch.c:726

6110 +#: builtin/fetch.c:727

6111 #, c-format

6112 msgid ""

6113 "some local refs could not be updated; try running\n"

@@ -6056,55 +6116,55 @@ msgstr ""

6116 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

6117 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

6118

6059 -#: builtin/fetch.c:778

6119 +#: builtin/fetch.c:779

6120 #, c-format

6121 msgid " (%s will become dangling)"

6122 msgstr " (%s sera en suspens)"

6123

6064 -#: builtin/fetch.c:779

6124 +#: builtin/fetch.c:780

6125 #, c-format

6126 msgid " (%s has become dangling)"

6127 msgstr " (%s est devenu en suspens)"

6128

6069 -#: builtin/fetch.c:811

6129 +#: builtin/fetch.c:812

6130 msgid "[deleted]"

6131 msgstr "[supprimé]"

6132

6073 -#: builtin/fetch.c:812 builtin/remote.c:1034

6133 +#: builtin/fetch.c:813 builtin/remote.c:1040

6134 msgid "(none)"

6135 msgstr "(aucun(e))"

6136

6077 -#: builtin/fetch.c:832

6137 +#: builtin/fetch.c:833

6138 #, c-format

6139 msgid "Refusing to fetch into current branch %s of non-bare repository"

6140 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

6141

6082 -#: builtin/fetch.c:851

6142 +#: builtin/fetch.c:852

6143 #, c-format

6144 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6145 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

6146

6087 -#: builtin/fetch.c:854

6147 +#: builtin/fetch.c:855

6148 #, c-format

6149 msgid "Option \"%s\" is ignored for %s\n"

6150 msgstr "L'option \"%s\" est ignorée pour %s\n"

6151

6092 -#: builtin/fetch.c:910

6152 +#: builtin/fetch.c:911

6153 #, c-format

6154 msgid "Don't know how to fetch from %s"

6155 msgstr "Je ne sais pas récupérer depuis %s"

6156

6097 -#: builtin/fetch.c:1071

6157 +#: builtin/fetch.c:1072

6158 #, c-format

6159 msgid "Fetching %s\n"

6160 msgstr "Récupération de %s\n"

6161

6102 -#: builtin/fetch.c:1073 builtin/remote.c:90

6162 +#: builtin/fetch.c:1074 builtin/remote.c:96

6163 #, c-format

6164 msgid "Could not fetch %s"

6165 msgstr "Impossible de récupérer %s"

6166

6107 -#: builtin/fetch.c:1091

6167 +#: builtin/fetch.c:1092

6168 msgid ""

6169 "No remote repository specified. Please, specify either a URL or a\n"

6170 "remote name from which new revisions should be fetched."

@@ -6112,32 +6172,32 @@ msgstr ""

6172 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

6173 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

6174

6115 -#: builtin/fetch.c:1114

6175 +#: builtin/fetch.c:1115

6176 msgid "You need to specify a tag name."

6177 msgstr "Vous devez spécifier un nom d'étiquette."

6178

6119 -#: builtin/fetch.c:1156

6179 +#: builtin/fetch.c:1157

6180 msgid "--depth and --unshallow cannot be used together"

6181 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

6182

6123 -#: builtin/fetch.c:1158

6183 +#: builtin/fetch.c:1159

6184 msgid "--unshallow on a complete repository does not make sense"

6185 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

6186

6127 -#: builtin/fetch.c:1181

6187 +#: builtin/fetch.c:1179

6188 msgid "fetch --all does not take a repository argument"

6189 msgstr "fetch --all n'accepte pas d'argument de dépôt"

6190

6131 -#: builtin/fetch.c:1183

6191 +#: builtin/fetch.c:1181

6192 msgid "fetch --all does not make sense with refspecs"

6193 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

6194

6135 -#: builtin/fetch.c:1194

6195 +#: builtin/fetch.c:1192

6196 #, c-format

6197 msgid "No such remote or remote group: %s"

6198 msgstr "distant ou groupe distant inexistant : %s"

6199

6140 -#: builtin/fetch.c:1202

6200 +#: builtin/fetch.c:1200

6201 msgid "Fetching a group and specifying refspecs does not make sense"

6202 msgstr ""

6203 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -6149,23 +6209,23 @@ msgid ""

6209 msgstr ""

6210 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"

6211

6152 -#: builtin/fmt-merge-msg.c:670

6212 +#: builtin/fmt-merge-msg.c:667

6213 msgid "populate log with at most <n> entries from shortlog"

6214 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"

6215

6156 -#: builtin/fmt-merge-msg.c:673

6216 +#: builtin/fmt-merge-msg.c:670

6217 msgid "alias for --log (deprecated)"

6218 msgstr "alias pour --log (obsolète)"

6219

6160 -#: builtin/fmt-merge-msg.c:676

6220 +#: builtin/fmt-merge-msg.c:673

6221 msgid "text"

6222 msgstr "texte"

6223

6164 -#: builtin/fmt-merge-msg.c:677

6224 +#: builtin/fmt-merge-msg.c:674

6225 msgid "use <text> as start of message"

6226 msgstr "utiliser <texte> comme début de message"

6227

6168 -#: builtin/fmt-merge-msg.c:678

6228 +#: builtin/fmt-merge-msg.c:675

6229 msgid "file to read from"

6230 msgstr "fichier d'où lire"

6231

@@ -6173,96 +6233,116 @@ msgstr "fichier d'où lire"

6233 msgid "git for-each-ref [<options>] [<pattern>]"

6234 msgstr "git for-each-ref [<options>] [<motif>]"

6235

6176 -#: builtin/for-each-ref.c:24

6236 +#: builtin/for-each-ref.c:10

6237 +msgid "git for-each-ref [--points-at <object>]"

6238 +msgstr "git for-each-ref [--point-at <objet>]"

6239 +

6240 +#: builtin/for-each-ref.c:11

6241 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"

6242 +msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]"

6243 +

6244 +#: builtin/for-each-ref.c:12

6245 +msgid "git for-each-ref [--contains [<object>]]"

6246 +msgstr "git for-each-ref [--contains [<objet>]]"

6247 +

6248 +#: builtin/for-each-ref.c:27

6249 msgid "quote placeholders suitably for shells"

6250 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

6251

6180 -#: builtin/for-each-ref.c:26

6252 +#: builtin/for-each-ref.c:29

6253 msgid "quote placeholders suitably for perl"

6254 msgstr "échapper les champs réservés pour perl"

6255

6184 -#: builtin/for-each-ref.c:28

6256 +#: builtin/for-each-ref.c:31

6257 msgid "quote placeholders suitably for python"

6258 msgstr "échapper les champs réservés pour python"

6259

6188 -#: builtin/for-each-ref.c:30

6260 +#: builtin/for-each-ref.c:33

6261 msgid "quote placeholders suitably for Tcl"

6262 msgstr "échapper les champs réservés pour compatibilité avec Tcl"

6263

6192 -#: builtin/for-each-ref.c:33

6264 +#: builtin/for-each-ref.c:36

6265 msgid "show only <n> matched refs"

6266 msgstr "n'afficher que <n> références correspondant"

6267

6196 -#: builtin/for-each-ref.c:34

6268 +#: builtin/for-each-ref.c:37 builtin/tag.c:372

6269 msgid "format to use for the output"

6270 msgstr "format à utiliser pour la sortie"

6271

6200 -#: builtin/for-each-ref.c:35

6201 -msgid "key"

6202 -msgstr "clé"

6272 +#: builtin/for-each-ref.c:41

6273 +msgid "print only refs which points at the given object"

6274 +msgstr "afficher seulement les références pointant sur l'objet"

6275

6204 -#: builtin/for-each-ref.c:36

6205 -msgid "field name to sort on"

6206 -msgstr "nom du champ servant à trier"

6276 +#: builtin/for-each-ref.c:43

6277 +msgid "print only refs that are merged"

6278 +msgstr "afficher seulement les références qui sont fusionnées"

6279 +

6280 +#: builtin/for-each-ref.c:44

6281 +msgid "print only refs that are not merged"

6282 +msgstr "afficher seulement les références qui ne sont pas fusionnées"

6283

6208 -#: builtin/fsck.c:163 builtin/prune.c:137

6284 +#: builtin/for-each-ref.c:45

6285 +msgid "print only refs which contain the commit"

6286 +msgstr "afficher seulement les références qui contiennent le commit"

6287 +

6288 +#: builtin/fsck.c:156 builtin/prune.c:140

6289 msgid "Checking connectivity"

6290 msgstr "Vérification de la connectivité"

6291

6212 -#: builtin/fsck.c:568

6292 +#: builtin/fsck.c:486

6293 msgid "Checking object directories"

6294 msgstr "Vérification des répertoires d'objet"

6295

6216 -#: builtin/fsck.c:631

6296 +#: builtin/fsck.c:553

6297 msgid "git fsck [<options>] [<object>...]"

6298 msgstr "git fsck [<options>] [<objet>...]"

6299

6220 -#: builtin/fsck.c:637

6300 +#: builtin/fsck.c:559

6301 msgid "show unreachable objects"

6302 msgstr "afficher les objets inaccessibles"

6303

6224 -#: builtin/fsck.c:638

6304 +#: builtin/fsck.c:560

6305 msgid "show dangling objects"

6306 msgstr "afficher les objets en suspens"

6307

6228 -#: builtin/fsck.c:639

6308 +#: builtin/fsck.c:561

6309 msgid "report tags"

6310 msgstr "afficher les étiquettes"

6311

6232 -#: builtin/fsck.c:640

6312 +#: builtin/fsck.c:562

6313 msgid "report root nodes"

6314 msgstr "signaler les nœuds racines"

6315

6236 -#: builtin/fsck.c:641

6316 +#: builtin/fsck.c:563

6317 msgid "make index objects head nodes"

6318 msgstr "considérer les objets de l'index comme nœuds tête"

6319

6320 # translated from man page

6241 -#: builtin/fsck.c:642

6321 +#: builtin/fsck.c:564

6322 msgid "make reflogs head nodes (default)"

6323 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

6324

6245 -#: builtin/fsck.c:643

6325 +#: builtin/fsck.c:565

6326 msgid "also consider packs and alternate objects"

6327 msgstr "inspecter aussi les objets pack et alternatifs"

6328

6249 -#: builtin/fsck.c:644

6329 +#: builtin/fsck.c:566

6330 msgid "check only connectivity"

6331 msgstr "ne vérifier que la connectivité"

6332

6253 -#: builtin/fsck.c:645

6333 +#: builtin/fsck.c:567

6334 msgid "enable more strict checking"

6335 msgstr "activer une vérification plus strict"

6336

6257 -#: builtin/fsck.c:647

6337 +#: builtin/fsck.c:569

6338 msgid "write dangling objects in .git/lost-found"

6339 msgstr "écrire les objets en suspens dans .git/lost-found"

6340

6261 -#: builtin/fsck.c:648 builtin/prune.c:107

6341 +#: builtin/fsck.c:570 builtin/prune.c:107

6342 msgid "show progress"

6343 msgstr "afficher la progression"

6344

6265 -#: builtin/fsck.c:707

6345 +#: builtin/fsck.c:631

6346 msgid "Checking objects"

6347 msgstr "Vérification des objets"

6348

@@ -6270,52 +6350,67 @@ msgstr "Vérification des objets"

6350 msgid "git gc [<options>]"

6351 msgstr "git gc [<options>]"

6352

6273 -#: builtin/gc.c:55

6353 +#: builtin/gc.c:72

6354 #, c-format

6355 msgid "Invalid %s: '%s'"

6356 msgstr "%s invalide : '%s'"

6357

6278 -#: builtin/gc.c:100

6358 +#: builtin/gc.c:139

6359 #, c-format

6360 msgid "insanely long object directory %.*s"

6361 msgstr "objet répertoire démentiellement long %.*s"

6362

6283 -#: builtin/gc.c:269

6363 +#: builtin/gc.c:290

6364 +#, c-format

6365 +msgid ""

6366 +"The last gc run reported the following. Please correct the root cause\n"

6367 +"and remove %s.\n"

6368 +"Automatic cleanup will not be performed until the file is removed.\n"

6369 +"\n"

6370 +"%s"

6371 +msgstr ""

6372 +"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"

6373 +"la cause et supprimer %s.\n"

6374 +"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit supprimé.\n"

6375 +"\n"

6376 +"%s"

6377 +

6378 +#: builtin/gc.c:327

6379 msgid "prune unreferenced objects"

6380 msgstr "éliminer les objets non référencés"

6381

6287 -#: builtin/gc.c:271

6382 +#: builtin/gc.c:329

6383 msgid "be more thorough (increased runtime)"

6384 msgstr "être plus consciencieux (durée de traitement allongée)"

6385

6291 -#: builtin/gc.c:272

6386 +#: builtin/gc.c:330

6387 msgid "enable auto-gc mode"

6388 msgstr "activer le mode auto-gc"

6389

6295 -#: builtin/gc.c:273

6390 +#: builtin/gc.c:331

6391 msgid "force running gc even if there may be another gc running"

6392 msgstr ""

6393 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

6394 "tourne déjà"

6395

6301 -#: builtin/gc.c:315

6396 +#: builtin/gc.c:373

6397 #, c-format

6398 msgid "Auto packing the repository in background for optimum performance.\n"

6399 msgstr ""

6400 "Compression automatique du dépôt en tâche de fond pour optimiser les "

6401 "performances.\n"

6402

6308 -#: builtin/gc.c:317

6403 +#: builtin/gc.c:375

6404 #, c-format

6405 msgid "Auto packing the repository for optimum performance.\n"

6406 msgstr "Compression du dépôt pour optimiser les performances.\n"

6407

6313 -#: builtin/gc.c:318

6408 +#: builtin/gc.c:376

6409 #, c-format

6410 msgid "See \"git help gc\" for manual housekeeping.\n"

6411 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

6412

6318 -#: builtin/gc.c:336

6413 +#: builtin/gc.c:397

6414 #, c-format

6415 msgid ""

6416 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -6323,7 +6418,7 @@ msgstr ""

6418 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

6419 "(utilisez --force si ce n'est pas le cas)"

6420

6326 -#: builtin/gc.c:364

6421 +#: builtin/gc.c:441

6422 msgid ""

6423 "There are too many unreachable loose objects; run 'git prune' to remove them."

6424 msgstr ""

@@ -6359,208 +6454,204 @@ msgstr "l'option '%c' attend un valeur numérique"

6454 msgid "cannot open '%s'"

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

6456

6362 -#: builtin/grep.c:638

6457 +#: builtin/grep.c:633

6458 msgid "search in index instead of in the work tree"

6459 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

6460

6366 -#: builtin/grep.c:640

6461 +#: builtin/grep.c:635

6462 msgid "find in contents not managed by git"

6463 msgstr "rechercher dans les contenus non gérés par git"

6464

6370 -#: builtin/grep.c:642

6465 +#: builtin/grep.c:637

6466 msgid "search in both tracked and untracked files"

6467 msgstr "rechercher dans les fichiers suivis et non-suivis"

6468

6374 -#: builtin/grep.c:644

6469 +#: builtin/grep.c:639

6470 msgid "ignore files specified via '.gitignore'"

6471 msgstr "ignorer les fichiers spécifiés via '.gitignore'"

6472

6378 -#: builtin/grep.c:647

6473 +#: builtin/grep.c:642

6474 msgid "show non-matching lines"

6475 msgstr "afficher les lignes qui ne correspondent pas"

6476

6382 -#: builtin/grep.c:649

6477 +#: builtin/grep.c:644

6478 msgid "case insensitive matching"

6479 msgstr "correspondance insensible à la casse"

6480

6386 -#: builtin/grep.c:651

6481 +#: builtin/grep.c:646

6482 msgid "match patterns only at word boundaries"

6483 msgstr "rechercher les motifs aux séparateurs de mots"

6484

6390 -#: builtin/grep.c:653

6485 +#: builtin/grep.c:648

6486 msgid "process binary files as text"

6487 msgstr "traiter les fichiers binaires comme texte"

6488

6394 -#: builtin/grep.c:655

6489 +#: builtin/grep.c:650

6490 msgid "don't match patterns in binary files"

6491 msgstr "ne pas chercher les motifs dans les fichiers binaires"

6492

6398 -#: builtin/grep.c:658

6493 +#: builtin/grep.c:653

6494 msgid "process binary files with textconv filters"

6495 msgstr "traiter les fichiers binaires avec les filtres textconv"

6496

6402 -#: builtin/grep.c:660

6497 +#: builtin/grep.c:655

6498 msgid "descend at most <depth> levels"

6499 msgstr "descendre au plus de <profondeur> dans l'arborescence"

6500

6406 -#: builtin/grep.c:664

6501 +#: builtin/grep.c:659

6502 msgid "use extended POSIX regular expressions"

6503 msgstr "utiliser des expressions régulières étendues POSIX"

6504

6410 -#: builtin/grep.c:667

6505 +#: builtin/grep.c:662

6506 msgid "use basic POSIX regular expressions (default)"

6507 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

6508

6414 -#: builtin/grep.c:670

6509 +#: builtin/grep.c:665

6510 msgid "interpret patterns as fixed strings"

6511 msgstr "interpréter les motifs comme de chaînes fixes"

6512

6418 -#: builtin/grep.c:673

6513 +#: builtin/grep.c:668

6514 msgid "use Perl-compatible regular expressions"

6515 msgstr "utiliser des expressions régulières compatibles avec Perl"

6516

6422 -#: builtin/grep.c:676

6517 +#: builtin/grep.c:671

6518 msgid "show line numbers"

6519 msgstr "afficher les numéros de ligne"

6520

6426 -#: builtin/grep.c:677

6521 +#: builtin/grep.c:672

6522 msgid "don't show filenames"

6523 msgstr "ne pas pas afficher les noms de fichier"

6524

6430 -#: builtin/grep.c:678

6525 +#: builtin/grep.c:673

6526 msgid "show filenames"

6527 msgstr "afficher les noms de fichier"

6528

6434 -#: builtin/grep.c:680

6529 +#: builtin/grep.c:675

6530 msgid "show filenames relative to top directory"

6531 msgstr "afficher les noms de fichiers relativement au répertoire de base"

6532

6438 -#: builtin/grep.c:682

6533 +#: builtin/grep.c:677

6534 msgid "show only filenames instead of matching lines"

6535 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

6536

6442 -#: builtin/grep.c:684

6537 +#: builtin/grep.c:679

6538 msgid "synonym for --files-with-matches"

6539 msgstr "synonyme pour --files-with-matches"

6540

6446 -#: builtin/grep.c:687

6541 +#: builtin/grep.c:682

6542 msgid "show only the names of files without match"

6543 msgstr "n'afficher que les noms des fichiers sans correspondance"

6544

6450 -#: builtin/grep.c:689

6545 +#: builtin/grep.c:684

6546 msgid "print NUL after filenames"

6547 msgstr "imprimer une caractère NUL après le noms de fichier"

6548

l10n: fr v2.7.0 round 1 (2477t)