eadd122b5e · matheusbsbs/matheus-bagliano

@@ -72,8 +72,8 @@ msgid ""

72 msgstr ""

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

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

75 -"POT-Creation-Date: 2013-08-06 14:10+0800\n"

76 -"PO-Revision-Date: 2013-10-05 21:17+0200\n"

75 +"POT-Creation-Date: 2013-11-02 08:06+0800\n"

76 +"PO-Revision-Date: 2013-11-07 21:41+0100\n"

77 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"

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

79 "Language: fr\n"

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

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

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

125

126 -#: archive.c:323

126 +#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

127 +#, c-format

128 +msgid "pathspec '%s' did not match any files"

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

130 +

131 +#: archive.c:327

132 msgid "fmt"

133 msgstr "fmt"

134

130 -#: archive.c:323

135 +#: archive.c:327

136 msgid "archive format"

137 msgstr "format d'archive"

138

134 -#: archive.c:324 builtin/log.c:1173

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

140 msgid "prefix"

141 msgstr "préfixe"

142

138 -#: archive.c:325

143 +#: archive.c:329

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

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

146

142 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

143 -#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

144 -#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

145 -#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

146 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

147 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

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

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

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

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

152 msgid "file"

153 msgstr "fichier"

154

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

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

156 msgid "write the archive to this file"

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

158

154 -#: archive.c:329

159 +#: archive.c:333

160 msgid "read .gitattributes in working directory"

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

162

158 -#: archive.c:330

163 +#: archive.c:334

164 msgid "report archived files on stderr"

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

166

162 -#: archive.c:331

167 +#: archive.c:335

168 msgid "store only"

169 msgstr "stockage seulement"

170

166 -#: archive.c:332

171 +#: archive.c:336

172 msgid "compress faster"

173 msgstr "compression rapide"

174

170 -#: archive.c:340

175 +#: archive.c:344

176 msgid "compress better"

177 msgstr "compression efficace"

178

174 -#: archive.c:343

179 +#: archive.c:347

180 msgid "list supported archive formats"

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

182

178 -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85

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

184 msgid "repo"

185 msgstr "dépôt"

186

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

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

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

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

190

186 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

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

192 msgid "command"

193 msgstr "commande"

194

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

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

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

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

198

@@ -275,19 +280,19 @@ msgstr "Une branche nommée '%s' existe déjà."

280 msgid "Cannot force update the current branch."

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

282

278 -#: branch.c:216

283 +#: branch.c:215

284 #, c-format

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

286 msgstr ""

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

288 "pas une branche."

289

285 -#: branch.c:218

290 +#: branch.c:217

291 #, c-format

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

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

294

290 -#: branch.c:220

295 +#: branch.c:219

296 msgid ""

297 "\n"

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

@@ -307,26 +312,26 @@ msgstr ""

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

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

314

310 -#: branch.c:265

315 +#: branch.c:264

316 #, c-format

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

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

319

315 -#: branch.c:285

320 +#: branch.c:284

321 #, c-format

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

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

324

320 -#: branch.c:290

325 +#: branch.c:289

326 #, c-format

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

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

329

325 -#: branch.c:296

330 +#: branch.c:295

331 msgid "Failed to lock ref for update"

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

333

329 -#: branch.c:314

334 +#: branch.c:313

335 msgid "Failed to write ref"

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

337

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

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

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

347

343 -#: bundle.c:89 builtin/commit.c:697

348 +#: bundle.c:89 builtin/commit.c:706

349 #, c-format

350 msgid "could not open '%s'"

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

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

354 msgid "Repository lacks these prerequisite commits:"

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

356

352 -#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

353 -#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

354 -#: builtin/shortlog.c:156

357 +#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

358 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

359 +#: builtin/shortlog.c:158

360 msgid "revision walk setup failed"

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

362

@@ -377,7 +382,7 @@ msgstr[1] "Le colis exige ces %d références :"

382 msgid "rev-list died"

383 msgstr "rev-list a disparu"

384

380 -#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

385 +#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

386 #, c-format

387 msgid "unrecognized argument: %s"

388 msgstr "argument non reconnu : %s"

@@ -529,7 +534,7 @@ msgstr ""

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

535 "%s"

536

532 -#: diff.c:3487

537 +#: diff.c:3490

538 #, c-format

539 msgid ""

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

@@ -538,7 +543,7 @@ msgstr ""

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

544 "%s"

545

541 -#: diff.c:3501

546 +#: diff.c:3504

547 #, c-format

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

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

@@ -565,17 +570,17 @@ msgstr "impossible de créer un fichier temporaire '%s' : %s"

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

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

572

568 -#: grep.c:1623

573 +#: grep.c:1695

574 #, c-format

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

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

577

573 -#: grep.c:1640

578 +#: grep.c:1712

579 #, c-format

580 msgid "'%s': %s"

581 msgstr "'%s' : %s"

582

578 -#: grep.c:1651

583 +#: grep.c:1723

584 #, c-format

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

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

@@ -649,8 +654,8 @@ msgstr "%s: %s - %s"

654 msgid "failed to read the cache"

655 msgstr "impossible de lire le cache"

656

652 -#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

653 -#: builtin/clone.c:656

657 +#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

658 +#: builtin/clone.c:655

659 msgid "unable to write new index file"

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

661

@@ -699,7 +704,7 @@ msgstr "impossible de lire l'objet %s '%s'"

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

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

706

702 -#: merge-recursive.c:774 builtin/clone.c:312

707 +#: merge-recursive.c:774 builtin/clone.c:311

708 #, c-format

709 msgid "failed to open '%s'"

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

@@ -835,7 +840,7 @@ msgstr "%s sauté (fusion identique à l'existant)"

840 msgid "Auto-merging %s"

841 msgstr "Fusion automatique de %s"

842

838 -#: merge-recursive.c:1634 git-submodule.sh:1118

843 +#: merge-recursive.c:1634 git-submodule.sh:1125

844 msgid "submodule"

845 msgstr "sous-module"

846

@@ -931,58 +936,121 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

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

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

938

934 -#: object.c:204

939 +#: object.c:202

940 #, c-format

941 msgid "unable to parse object: %s"

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

943

939 -#: parse-options.c:489

944 +#: parse-options.c:537

945 msgid "..."

946 msgstr "..."

947

943 -#: parse-options.c:507

948 +#: parse-options.c:555

949 #, c-format

950 msgid "usage: %s"

951 msgstr "usage : %s"

952

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

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

950 -#: parse-options.c:511

955 +#: parse-options.c:559

956 #, c-format

957 msgid " or: %s"

958 msgstr " ou : %s"

959

955 -#: parse-options.c:514

960 +#: parse-options.c:562

961 #, c-format

962 msgid " %s"

963 msgstr " %s"

964

960 -#: parse-options.c:548

965 +#: parse-options.c:596

966 msgid "-NUM"

967 msgstr "-NUM"

968

964 -#: pathspec.c:83

969 +#: pathspec.c:118

970 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

971 +msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles"

972 +

973 +#: pathspec.c:128

974 +msgid ""

975 +"global 'literal' pathspec setting is incompatible with all other global "

976 +"pathspec settings"

977 +msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin"

978 +

979 +#: pathspec.c:158

980 +msgid "invalid parameter for pathspec magic 'prefix'"

981 +msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"

982 +

983 +#: pathspec.c:164

984 +#, c-format

985 +msgid "Invalid pathspec magic '%.*s' in '%s'"

986 +msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"

987 +

988 +#: pathspec.c:168

989 +#, c-format

990 +msgid "Missing ')' at the end of pathspec magic in '%s'"

991 +msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"

992 +

993 +#: pathspec.c:186

994 +#, c-format

995 +msgid "Unimplemented pathspec magic '%c' in '%s'"

996 +msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

997 +

998 +#: pathspec.c:211

999 +#, c-format

1000 +msgid "%s: 'literal' and 'glob' are incompatible"

1001 +msgstr "%s : 'literal' et 'glob' sont incompatibles"

1002 +

1003 +#: pathspec.c:222

1004 +#, c-format

1005 +msgid "%s: '%s' is outside repository"

1006 +msgstr "%s : '%s' est hors du dépôt"

1007 +

1008 +#: pathspec.c:278

1009 #, c-format

966 -msgid "Path '%s' is in submodule '%.*s'"

1010 +msgid "Pathspec '%s' is in submodule '%.*s'"

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

1012

969 -#: pathspec.c:99

1013 +#.

1014 +#. * We may want to substitute "this command" with a command

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

1016 +#. * "checkout -p"

1017 +#.

1018 +#: pathspec.c:340

1019 #, c-format

971 -msgid "'%s' is beyond a symbolic link"

972 -msgstr "'%s' est au delà d'un lien symbolique"

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

1021 +msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s"

1022

974 -#: remote.c:1788

1023 +#: pathspec.c:415

1024 +#, c-format

1025 +msgid "pathspec '%s' is beyond a symbolic link"

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

1027 +

1028 +#: remote.c:1833

1029 +#, c-format

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

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

1032 +

1033 +#: remote.c:1837

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

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

1036 +

1037 +#: remote.c:1840

1038 +#, c-format

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

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

1041 +

1042 +#: remote.c:1844

1043 #, c-format

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

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

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

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

1048

981 -#: remote.c:1794

1049 +#: remote.c:1850

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

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

1052

985 -#: remote.c:1797

1053 +#: remote.c:1853

1054 #, c-format

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

1056 msgid_plural ""

@@ -994,11 +1062,11 @@ msgstr[1] ""

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

1063 "en avance rapide.\n"

1064

997 -#: remote.c:1805

1065 +#: remote.c:1861

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

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

1068

1001 -#: remote.c:1808

1069 +#: remote.c:1864

1070 #, c-format

1071 msgid ""

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

@@ -1013,7 +1081,7 @@ msgstr[1] ""

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

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

1083

1016 -#: remote.c:1818

1084 +#: remote.c:1874

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

1086 msgstr ""

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

@@ -1057,7 +1125,7 @@ msgstr ""

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

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

1127

1060 -#: sequencer.c:245 sequencer.c:869 sequencer.c:952

1128 +#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1129 #, c-format

1130 msgid "Could not write to %s"

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

@@ -1077,47 +1145,47 @@ msgstr "Vos modifications locales seraient écrasées par revert."

1145

1146 #: sequencer.c:268

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

1080 -msgstr "Validez vos modifications ou remisez-les pour continuer."

1148 +msgstr "Validez vos modifications ou les remiser pour continuer."

1149

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

1083 -#: sequencer.c:324

1151 +#: sequencer.c:325

1152 #, c-format

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

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

1155

1088 -#: sequencer.c:355

1156 +#: sequencer.c:356

1157 msgid "Could not resolve HEAD commit\n"

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

1159

1092 -#: sequencer.c:377

1160 +#: sequencer.c:378

1161 msgid "Unable to update cache tree\n"

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

1163

1096 -#: sequencer.c:422

1164 +#: sequencer.c:423

1165 #, c-format

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

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

1168

1101 -#: sequencer.c:427

1169 +#: sequencer.c:428

1170 #, c-format

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

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

1173

1106 -#: sequencer.c:493

1174 +#: sequencer.c:494

1175 msgid "Your index file is unmerged."

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

1177

1110 -#: sequencer.c:512

1178 +#: sequencer.c:513

1179 #, c-format

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

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

1182

1115 -#: sequencer.c:520

1183 +#: sequencer.c:521

1184 #, c-format

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

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

1187

1120 -#: sequencer.c:524

1188 +#: sequencer.c:525

1189 #, c-format

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

1191 msgstr ""

@@ -1126,153 +1194,153 @@ msgstr ""

1194

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

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

1129 -#: sequencer.c:537

1197 +#: sequencer.c:538

1198 #, c-format

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

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

1201

1134 -#: sequencer.c:541

1202 +#: sequencer.c:542

1203 #, c-format

1204 msgid "Cannot get commit message for %s"

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

1206

1139 -#: sequencer.c:627

1207 +#: sequencer.c:628

1208 #, c-format

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

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

1211

1144 -#: sequencer.c:628

1212 +#: sequencer.c:629

1213 #, c-format

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

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

1216

1149 -#: sequencer.c:664

1217 +#: sequencer.c:665

1218 msgid "empty commit set passed"

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

1220

1153 -#: sequencer.c:672

1221 +#: sequencer.c:673

1222 #, c-format

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

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

1225

1158 -#: sequencer.c:677

1226 +#: sequencer.c:678

1227 #, c-format

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

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

1230

1163 -#: sequencer.c:735

1231 +#: sequencer.c:736

1232 #, c-format

1233 msgid "Cannot %s during a %s"

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

1235

1168 -#: sequencer.c:757

1236 +#: sequencer.c:758

1237 #, c-format

1238 msgid "Could not parse line %d."

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

1240

1173 -#: sequencer.c:762

1241 +#: sequencer.c:763

1242 msgid "No commits parsed."

1243 msgstr "Aucun commit analysé."

1244

1177 -#: sequencer.c:775

1245 +#: sequencer.c:776

1246 #, c-format

1247 msgid "Could not open %s"

1248 msgstr "Impossible d'ouvrir %s"

1249

1182 -#: sequencer.c:779

1250 +#: sequencer.c:780

1251 #, c-format

1252 msgid "Could not read %s."

1253 msgstr "Impossible de lire %s."

1254

1187 -#: sequencer.c:786

1255 +#: sequencer.c:787

1256 #, c-format

1257 msgid "Unusable instruction sheet: %s"

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

1259

1192 -#: sequencer.c:814

1260 +#: sequencer.c:815

1261 #, c-format

1262 msgid "Invalid key: %s"

1263 msgstr "Clé invalide: %s"

1264

1197 -#: sequencer.c:817

1265 +#: sequencer.c:818

1266 #, c-format

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

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

1269

1202 -#: sequencer.c:829

1270 +#: sequencer.c:830

1271 #, c-format

1272 msgid "Malformed options sheet: %s"

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

1274

1207 -#: sequencer.c:850

1275 +#: sequencer.c:851

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

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

1278

1211 -#: sequencer.c:851

1279 +#: sequencer.c:852

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

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

1282

1215 -#: sequencer.c:855

1283 +#: sequencer.c:856

1284 #, c-format

1285 msgid "Could not create sequencer directory %s"

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

1287

1220 -#: sequencer.c:871 sequencer.c:956

1288 +#: sequencer.c:872 sequencer.c:957

1289 #, c-format

1290 msgid "Error wrapping up %s."

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

1292

1225 -#: sequencer.c:890 sequencer.c:1024

1293 +#: sequencer.c:891 sequencer.c:1025

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

1295 msgstr "aucun picorage ou retour en cours"

1296

1229 -#: sequencer.c:892

1297 +#: sequencer.c:893

1298 msgid "cannot resolve HEAD"

1299 msgstr "impossible de résoudre HEAD"

1300

1233 -#: sequencer.c:894

1301 +#: sequencer.c:895

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

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

1304

1237 -#: sequencer.c:916 builtin/apply.c:4061

1305 +#: sequencer.c:917 builtin/apply.c:4061

1306 #, c-format

1307 msgid "cannot open %s: %s"

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

1309

1242 -#: sequencer.c:919

1310 +#: sequencer.c:920

1311 #, c-format

1312 msgid "cannot read %s: %s"

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

1314

1247 -#: sequencer.c:920

1315 +#: sequencer.c:921

1316 msgid "unexpected end of file"

1317 msgstr "fin de fichier inattendue"

1318

1251 -#: sequencer.c:926

1319 +#: sequencer.c:927

1320 #, c-format

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

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

1323

1256 -#: sequencer.c:949

1324 +#: sequencer.c:950

1325 #, c-format

1326 msgid "Could not format %s."

1327 msgstr "Impossible de formater %s."

1328

1261 -#: sequencer.c:1092

1329 +#: sequencer.c:1093

1330 #, c-format

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

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

1333

1266 -#: sequencer.c:1095

1334 +#: sequencer.c:1096

1335 #, c-format

1336 msgid "%s: bad revision"

1337 msgstr "%s : mauvaise révision"

1338

1271 -#: sequencer.c:1129

1339 +#: sequencer.c:1130

1340 msgid "Can't revert as initial commit"

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

1342

1275 -#: sequencer.c:1130

1343 +#: sequencer.c:1131

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

1345 msgstr "Impossible de picorer vers une HEAD vide"

1346

@@ -1301,261 +1369,354 @@ msgstr ""

1369 "message\n"

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

1371

1304 -#: sha1_name.c:1097

1372 +#: sha1_name.c:1112

1373 msgid "HEAD does not point to a branch"

1374 msgstr "HEAD ne pointe pas sur une branche"

1375

1308 -#: sha1_name.c:1100

1376 +#: sha1_name.c:1115

1377 #, c-format

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

1379 msgstr "Branche inconnue : '%s'"

1380

1313 -#: sha1_name.c:1102

1381 +#: sha1_name.c:1117

1382 #, c-format

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

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

1385

1318 -#: sha1_name.c:1106

1386 +#: sha1_name.c:1121

1387 #, c-format

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

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

1390

1323 -#: wrapper.c:408

1391 +#: submodule.c:64 submodule.c:98

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

1393 +msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord"

1394 +

1395 +#: submodule.c:68 submodule.c:102

1396 +#, c-format

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

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

1399 +

1400 +#. Maybe the user already did that, don't error out here

1401 +#: submodule.c:76

1402 +#, c-format

1403 +msgid "Could not update .gitmodules entry %s"

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

1405 +

1406 +# ici %s est un chemin

1407 +#. Maybe the user already did that, don't error out here

1408 +#: submodule.c:109

1409 +#, c-format

1410 +msgid "Could not remove .gitmodules entry for %s"

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

1412 +

1413 +#: submodule.c:127

1414 +msgid "could not find .gitmodules in index"

1415 +msgstr "impossible de trouver .gitmodules dans l'index"

1416 +

1417 +#: submodule.c:133

1418 +msgid "reading updated .gitmodules failed"

1419 +msgstr "échec de la lecture du .gitmodules mis à jour"

1420 +

1421 +#: submodule.c:135

1422 +msgid "unable to stat updated .gitmodules"

1423 +msgstr "échec de stat du .gitmodules mis à jour"

1424 +

1425 +#: submodule.c:139

1426 +msgid "unable to remove .gitmodules from index"

1427 +msgstr "suppression du .gitmodules dans l'index impossible"

1428 +

1429 +#: submodule.c:141

1430 +msgid "adding updated .gitmodules failed"

1431 +msgstr "échec de l'ajout du .gitmodules mis à jour"

1432 +

1433 +#: submodule.c:143

1434 +msgid "staging updated .gitmodules failed"

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

1436 +

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

1438 +#, c-format

1439 +msgid "Could not create git link %s"

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

1441 +

1442 +#: submodule.c:1155

1443 +#, c-format

1444 +msgid "Could not set core.worktree in %s"

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

1446 +

1447 +#: urlmatch.c:120

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

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

1450 +

1451 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

1452 +#, c-format

1453 +msgid "invalid %XX escape sequence"

1454 +msgstr "séquence d'échappement %XX invalide"

1455 +

1456 +#: urlmatch.c:172

1457 +msgid "missing host and scheme is not 'file:'"

1458 +msgstr "hôte manquant et le schéma n'est pas 'file:'"

1459 +

1460 +#: urlmatch.c:189

1461 +msgid "a 'file:' URL may not have a port number"

1462 +msgstr "une URL 'file:' ne peut pas contenir de numéro de port"

1463 +

1464 +#: urlmatch.c:199

1465 +msgid "invalid characters in host name"

1466 +msgstr "caractères invalides dans le nom d'hôte"

1467 +

1468 +#: urlmatch.c:244 urlmatch.c:255

1469 +msgid "invalid port number"

1470 +msgstr "numéro de port invalide"

1471 +

1472 +#: urlmatch.c:322

1473 +msgid "invalid '..' path segment"

1474 +msgstr "segment de chemin '..' invalide"

1475 +

1476 +#: wrapper.c:422

1477 #, c-format

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

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

1480

1328 -#: wrapper.c:429

1481 +#: wrapper.c:443

1482 #, c-format

1483 msgid "unable to access '%s'"

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

1485

1333 -#: wrapper.c:440

1486 +#: wrapper.c:454

1487 #, c-format

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

1489 msgstr ""

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

1491 "passe : %s"

1492

1340 -#: wrapper.c:441

1493 +#: wrapper.c:455

1494 msgid "no such user"

1495 msgstr "utilisateur inconnu"

1496

1344 -#: wt-status.c:141

1497 +#: wt-status.c:146

1498 msgid "Unmerged paths:"

1499 msgstr "Chemins non fusionnés :"

1500

1348 -#: wt-status.c:168 wt-status.c:195

1501 +#: wt-status.c:173 wt-status.c:200

1502 #, c-format

1503 msgid " (use \"git reset %s <file>...\" to unstage)"

1504 msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"

1505

1353 -#: wt-status.c:170 wt-status.c:197

1506 +#: wt-status.c:175 wt-status.c:202

1507 msgid " (use \"git rm --cached <file>...\" to unstage)"

1508 msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"

1509

1357 -#: wt-status.c:174

1510 +#: wt-status.c:179

1511 msgid " (use \"git add <file>...\" to mark resolution)"

1512 msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"

1513

1361 -#: wt-status.c:176 wt-status.c:180

1514 +#: wt-status.c:181 wt-status.c:185

1515 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1516 msgstr ""

1517 " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "

1518 "résolu)"

1519

1367 -#: wt-status.c:178

1520 +#: wt-status.c:183

1521 msgid " (use \"git rm <file>...\" to mark resolution)"

1522 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

1523

1371 -#: wt-status.c:189

1524 +#: wt-status.c:194

1525 msgid "Changes to be committed:"

1526 msgstr "Modifications qui seront validées :"

1527

1375 -#: wt-status.c:207

1528 +#: wt-status.c:212

1529 msgid "Changes not staged for commit:"

1530 msgstr "Modifications qui ne seront pas validées :"

1531

1379 -#: wt-status.c:211

1532 +#: wt-status.c:216

1533 msgid " (use \"git add <file>...\" to update what will be committed)"

1534 msgstr ""

1535 " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"

1536

1384 -#: wt-status.c:213

1537 +#: wt-status.c:218

1538 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1539 msgstr ""

1540 " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "

1541 "validé)"

1542

1390 -#: wt-status.c:214

1543 +#: wt-status.c:219

1544 msgid ""

1545 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1546 msgstr ""

1547 " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "

1548 "dans la copie de travail)"

1549

1397 -#: wt-status.c:216

1550 +#: wt-status.c:221

1551 msgid " (commit or discard the untracked or modified content in submodules)"

1552 msgstr ""

1553 " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"

1554

1402 -#: wt-status.c:228

1555 +#: wt-status.c:233

1556 #, c-format

1557 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1558 msgstr ""

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

1560

1408 -#: wt-status.c:245

1561 +#: wt-status.c:250

1562 msgid "bug"

1563 msgstr "bogue"

1564

1412 -#: wt-status.c:250

1565 +#: wt-status.c:255

1566 msgid "both deleted:"

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

1568

1416 -#: wt-status.c:251

1569 +#: wt-status.c:256

1570 msgid "added by us:"

1571 msgstr "ajouté par nous :"

1572

1420 -#: wt-status.c:252

1573 +#: wt-status.c:257

1574 msgid "deleted by them:"

1575 msgstr "supprimé par eux :"

1576

1424 -#: wt-status.c:253

1577 +#: wt-status.c:258

1578 msgid "added by them:"

1579 msgstr "ajouté par eux :"

1580

1428 -#: wt-status.c:254

1581 +#: wt-status.c:259

1582 msgid "deleted by us:"

1583 msgstr "supprimé par nous :"

1584

1432 -#: wt-status.c:255

1585 +#: wt-status.c:260

1586 msgid "both added:"

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

1588

1436 -#: wt-status.c:256

1589 +#: wt-status.c:261

1590 msgid "both modified:"

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

1592

1440 -#: wt-status.c:286

1593 +#: wt-status.c:291

1594 msgid "new commits, "

1595 msgstr "nouveaux commits, "

1596

1444 -#: wt-status.c:288

1597 +#: wt-status.c:293

1598 msgid "modified content, "

1599 msgstr "contenu modifié, "

1600

1448 -#: wt-status.c:290

1601 +#: wt-status.c:295

1602 msgid "untracked content, "

1603 msgstr "contenu non suivi, "

1604

1452 -#: wt-status.c:307

1605 +#: wt-status.c:312

1606 #, c-format

1607 msgid "new file: %s"

1608 msgstr "nouveau : %s"

1609

1457 -#: wt-status.c:310

1610 +#: wt-status.c:315

1611 #, c-format

1612 msgid "copied: %s -> %s"

1613 msgstr "copié : %s -> %s"

1614

1462 -#: wt-status.c:313

1615 +#: wt-status.c:318

1616 #, c-format

1617 msgid "deleted: %s"

1618 msgstr "supprimé : %s"

1619

1467 -#: wt-status.c:316

1620 +#: wt-status.c:321

1621 #, c-format

1622 msgid "modified: %s"

1623 msgstr "modifié : %s"

1624

1472 -#: wt-status.c:319

1625 +#: wt-status.c:324

1626 #, c-format

1627 msgid "renamed: %s -> %s"

1628 msgstr "renommé : %s -> %s"

1629

1477 -#: wt-status.c:322

1630 +#: wt-status.c:327

1631 #, c-format

1632 msgid "typechange: %s"

1633 msgstr "nv type : %s"

1634

1482 -#: wt-status.c:325

1635 +#: wt-status.c:330

1636 #, c-format

1637 msgid "unknown: %s"

1638 msgstr "inconnu : %s"

1639

1487 -#: wt-status.c:328

1640 +#: wt-status.c:333

1641 #, c-format

1642 msgid "unmerged: %s"

1643 msgstr "non fus. : %s"

1644

1492 -#: wt-status.c:331

1645 +#: wt-status.c:336

1646 #, c-format

1647 msgid "bug: unhandled diff status %c"

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

1649

1497 -#: wt-status.c:803

1650 +#: wt-status.c:703

1651 +msgid "Submodules changed but not updated:"

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

1653 +

1654 +#: wt-status.c:705

1655 +msgid "Submodule changes to be committed:"

1656 +msgstr "Changements du sous-module à valider :"

1657 +

1658 +#: wt-status.c:848

1659 msgid "You have unmerged paths."

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

1661

1501 -#: wt-status.c:806

1662 +#: wt-status.c:851

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

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

1665

1505 -#: wt-status.c:809

1666 +#: wt-status.c:854

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

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

1669

1509 -#: wt-status.c:812

1670 +#: wt-status.c:857

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

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

1673

1513 -#: wt-status.c:822

1674 +#: wt-status.c:867

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

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

1677

1517 -#: wt-status.c:825

1678 +#: wt-status.c:870

1679 msgid "The current patch is empty."

1680 msgstr "Le patch actuel est vide."

1681

1521 -#: wt-status.c:829

1682 +#: wt-status.c:874

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

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

1685

1525 -#: wt-status.c:831

1686 +#: wt-status.c:876

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

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

1689

1529 -#: wt-status.c:833

1690 +#: wt-status.c:878

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

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

1693

1533 -#: wt-status.c:893 wt-status.c:910

1694 +#: wt-status.c:938 wt-status.c:955

1695 #, c-format

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

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

1698

1538 -#: wt-status.c:898 wt-status.c:915

1699 +#: wt-status.c:943 wt-status.c:960

1700 msgid "You are currently rebasing."

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

1702

1542 -#: wt-status.c:901

1703 +#: wt-status.c:946

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

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

1706

1546 -#: wt-status.c:903

1707 +#: wt-status.c:948

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

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

1710

1550 -#: wt-status.c:905

1711 +#: wt-status.c:950

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

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

1714

1554 -#: wt-status.c:918

1715 +#: wt-status.c:963

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

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

1718

1558 -#: wt-status.c:922

1719 +#: wt-status.c:967

1720 #, c-format

1721 msgid ""

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

@@ -1563,119 +1724,120 @@ msgstr ""

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

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

1726

1566 -#: wt-status.c:927

1727 +#: wt-status.c:972

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

1729 msgstr ""

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

1731

1571 -#: wt-status.c:930

1732 +#: wt-status.c:975

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

1734 msgstr ""

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

1736

1576 -#: wt-status.c:934

1737 +#: wt-status.c:979

1738 #, c-format

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

1740 msgstr ""

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

1742 "branche '%s' sur '%s'."

1743

1583 -#: wt-status.c:939

1744 +#: wt-status.c:984

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

1746 msgstr ""

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

1748

1588 -#: wt-status.c:942

1749 +#: wt-status.c:987

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

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

1752

1592 -#: wt-status.c:944

1753 +#: wt-status.c:989

1754 msgid ""

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

1756 msgstr ""

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

1758 "modifications)"

1759

1599 -#: wt-status.c:954

1600 -msgid "You are currently cherry-picking."

1601 -msgstr "Vous êtes actuellement en train de picorer."

1760 +#: wt-status.c:999

1761 +#, c-format

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

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

1764

1603 -#: wt-status.c:958

1765 +#: wt-status.c:1004

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

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

1768

1607 -#: wt-status.c:961

1769 +#: wt-status.c:1007

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

1771 msgstr ""

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

1773

1612 -#: wt-status.c:963

1774 +#: wt-status.c:1009

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

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

1777

1616 -#: wt-status.c:972

1778 +#: wt-status.c:1018

1779 #, c-format

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

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

1782

1621 -#: wt-status.c:977

1783 +#: wt-status.c:1023

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

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

1786

1625 -#: wt-status.c:980

1787 +#: wt-status.c:1026

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

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

1790

1629 -#: wt-status.c:982

1791 +#: wt-status.c:1028

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

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

1794

1633 -#: wt-status.c:993

1795 +#: wt-status.c:1039

1796 #, c-format

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

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

1799

1638 -#: wt-status.c:997

1800 +#: wt-status.c:1043

1801 msgid "You are currently bisecting."

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

1803

1642 -#: wt-status.c:1000

1804 +#: wt-status.c:1046

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

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

1807

1646 -#: wt-status.c:1173

1808 +#: wt-status.c:1221

1809 msgid "On branch "

1810 msgstr "Sur la branche "

1811

1650 -#: wt-status.c:1180

1812 +#: wt-status.c:1228

1813 msgid "rebase in progress; onto "

1814 msgstr "rebasage en cours ; sur "

1815

1654 -#: wt-status.c:1187

1816 +#: wt-status.c:1235

1817 msgid "HEAD detached at "

1818 msgstr "HEAD détachée sur "

1819

1658 -#: wt-status.c:1189

1820 +#: wt-status.c:1237

1821 msgid "HEAD detached from "

1822 msgstr "HEAD détachée depuis "

1823

1662 -#: wt-status.c:1192

1824 +#: wt-status.c:1240

1825 msgid "Not currently on any branch."

1826 msgstr "Actuellement sur aucun branche."

1827

1666 -#: wt-status.c:1209

1828 +#: wt-status.c:1257

1829 msgid "Initial commit"

1830 msgstr "Validation initiale"

1831

1670 -#: wt-status.c:1223

1832 +#: wt-status.c:1271

1833 msgid "Untracked files"

1834 msgstr "Fichiers non suivis"

1835

1674 -#: wt-status.c:1225

1836 +#: wt-status.c:1273

1837 msgid "Ignored files"

1838 msgstr "Fichiers ignorés"

1839

1678 -#: wt-status.c:1229

1840 +#: wt-status.c:1277

1841 #, c-format

1842 msgid ""

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

@@ -1687,32 +1849,32 @@ msgstr ""

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

1850 "status')."

1851

1690 -#: wt-status.c:1235

1852 +#: wt-status.c:1283

1853 #, c-format

1854 msgid "Untracked files not listed%s"

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

1856

1695 -#: wt-status.c:1237

1857 +#: wt-status.c:1285

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

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

1860

1699 -#: wt-status.c:1243

1861 +#: wt-status.c:1291

1862 msgid "No changes"

1863 msgstr "Aucune modification"

1864

1703 -#: wt-status.c:1248

1865 +#: wt-status.c:1296

1866 #, c-format

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

1868 msgstr ""

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

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

1871

1710 -#: wt-status.c:1251

1872 +#: wt-status.c:1299

1873 #, c-format

1874 msgid "no changes added to commit\n"

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

1876

1715 -#: wt-status.c:1254

1877 +#: wt-status.c:1302

1878 #, c-format

1879 msgid ""

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

@@ -1721,56 +1883,61 @@ msgstr ""

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

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

1885

1724 -#: wt-status.c:1257

1886 +#: wt-status.c:1305

1887 #, c-format

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

1889 msgstr ""

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

1891 "sont présents\n"

1892

1731 -#: wt-status.c:1260

1893 +#: wt-status.c:1308

1894 #, c-format

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

1896 msgstr ""

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

1898 "suivre)\n"

1899

1738 -#: wt-status.c:1263 wt-status.c:1268

1900 +#: wt-status.c:1311 wt-status.c:1316

1901 #, c-format

1902 msgid "nothing to commit\n"

1903 msgstr "rien à valider\n"

1904

1743 -#: wt-status.c:1266

1905 +#: wt-status.c:1314

1906 #, c-format

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

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

1909

1748 -#: wt-status.c:1270

1910 +#: wt-status.c:1318

1911 #, c-format

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

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

1914

1753 -#: wt-status.c:1378

1915 +#: wt-status.c:1427

1916 msgid "HEAD (no branch)"

1917 msgstr "HEAD (aucune branche)"

1918

1757 -#: wt-status.c:1384

1919 +#: wt-status.c:1433

1920 msgid "Initial commit on "

1921 msgstr "Validation initiale sur "

1922

1761 -#: wt-status.c:1399

1923 +# à priori on parle d'une branche ici

1924 +#: wt-status.c:1463

1925 +msgid "gone"

1926 +msgstr "disparue"

1927 +

1928 +#: wt-status.c:1465

1929 msgid "behind "

1930 msgstr "derrière "

1931

1765 -#: wt-status.c:1402 wt-status.c:1405

1932 +#: wt-status.c:1468 wt-status.c:1471

1933 msgid "ahead "

1934 msgstr "devant "

1935

1769 -#: wt-status.c:1407

1936 +#: wt-status.c:1473

1937 msgid ", behind "

1938 msgstr ", derrière "

1939

1773 -#: compat/precompose_utf8.c:58 builtin/clone.c:351

1940 +#: compat/precompose_utf8.c:55 builtin/clone.c:350

1941 #, c-format

1942 msgid "failed to unlink '%s'"

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

@@ -1859,7 +2026,7 @@ msgstr ""

2026 msgid "unexpected diff status %c"

2027 msgstr "status de diff inattendu %c"

2028

1862 -#: builtin/add.c:149 builtin/commit.c:252

2029 +#: builtin/add.c:149 builtin/commit.c:260

2030 msgid "updating files failed"

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

2032

@@ -1868,145 +2035,140 @@ msgstr "échec de la mise à jour des fichiers"

2035 msgid "remove '%s'\n"

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

2037

1871 -#: builtin/add.c:253

2038 +#: builtin/add.c:237

2039 msgid "Unstaged changes after refreshing the index:"

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

2041

1875 -#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1876 -#, c-format

1877 -msgid "pathspec '%s' did not match any files"

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

1879 -

1880 -#: builtin/add.c:339

2042 +#: builtin/add.c:299

2043 msgid "Could not read the index"

2044 msgstr "Impossible de lire l'index"

2045

1884 -#: builtin/add.c:350

2046 +#: builtin/add.c:310

2047 #, c-format

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

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

2050

1889 -#: builtin/add.c:354

2051 +#: builtin/add.c:314

2052 msgid "Could not write patch"

2053 msgstr "Impossible d'écrire le patch"

2054

1893 -#: builtin/add.c:359

2055 +#: builtin/add.c:319

2056 #, c-format

2057 msgid "Could not stat '%s'"

2058 msgstr "Stat de '%s' impossible"

2059

1898 -#: builtin/add.c:361

2060 +#: builtin/add.c:321

2061 msgid "Empty patch. Aborted."

2062 msgstr "Patch vide. Abandon."

2063

1902 -#: builtin/add.c:367

2064 +#: builtin/add.c:327

2065 #, c-format

2066 msgid "Could not apply '%s'"

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

2068

1907 -#: builtin/add.c:377

2069 +#: builtin/add.c:337

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

2071 msgstr ""

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

2073

1912 -#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63

1913 -#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1914 -#: builtin/rm.c:268

2074 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

2075 +#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

2076 +#: builtin/rm.c:269

2077 msgid "dry run"

2078 msgstr "simuler l'action"

2079

1918 -#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1919 -#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613

1920 -#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

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

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

2082 +#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

2083 msgid "be verbose"

2084 msgstr "mode verbeux"

2085

1924 -#: builtin/add.c:397

2086 +#: builtin/add.c:357

2087 msgid "interactive picking"

2088 msgstr "sélection interactive"

2089

1928 -#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

2090 +#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

2091 msgid "select hunks interactively"

2092 msgstr "sélection interactive des sections"

2093

1932 -#: builtin/add.c:399

2094 +#: builtin/add.c:359

2095 msgid "edit current diff and apply"

2096 msgstr "édition du diff actuel et application"

2097

1936 -#: builtin/add.c:400

2098 +#: builtin/add.c:360

2099 msgid "allow adding otherwise ignored files"

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

2101

1940 -#: builtin/add.c:401

2102 +#: builtin/add.c:361

2103 msgid "update tracked files"

2104 msgstr "mettre à jour les fichiers suivis"

2105

1944 -#: builtin/add.c:402

2106 +#: builtin/add.c:362

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

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

2109

1948 -#: builtin/add.c:403

2110 +#: builtin/add.c:363

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

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

2113

2114 #. takes no arguments

1953 -#: builtin/add.c:406

2115 +#: builtin/add.c:366

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

2117 msgstr ""

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

2119

1958 -#: builtin/add.c:408

2120 +#: builtin/add.c:368

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

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

2123

1962 -#: builtin/add.c:409

2124 +#: builtin/add.c:369

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

2126 msgstr ""

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

2128 "d'erreurs"

2129

1968 -#: builtin/add.c:410

2130 +#: builtin/add.c:370

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

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

2133

1972 -#: builtin/add.c:432

2134 +#: builtin/add.c:392

2135 #, c-format

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

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

2138

1977 -#: builtin/add.c:433

2139 +#: builtin/add.c:393

2140 msgid "no files added"

2141 msgstr "aucun fichier ajouté"

2142

1981 -#: builtin/add.c:439

2143 +#: builtin/add.c:399

2144 msgid "adding files failed"

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

2146

1985 -#: builtin/add.c:478

2147 +#: builtin/add.c:438

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

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

2150

1989 -#: builtin/add.c:496

2151 +#: builtin/add.c:456

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

2153 msgstr ""

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

2155

1994 -#: builtin/add.c:526

2156 +#: builtin/add.c:486

2157 #, c-format

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

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

2160

1999 -#: builtin/add.c:527

2161 +#: builtin/add.c:487

2162 #, c-format

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

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

2165

2004 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919

2005 -#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297

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

2167 +#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

2168 msgid "index file corrupt"

2169 msgstr "fichier d'index corrompu"

2170

2009 -#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

2171 +#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

2172 msgid "Unable to write new index file"

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

2174

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

2430 msgid "Checking patch %s..."

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

2432

2271 -#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2433 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2434 #, c-format

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

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

@@ -2350,8 +2512,8 @@ msgstr "entrée non reconnue"

2512 msgid "unable to read index file"

2513 msgstr "lecture du fichier d'index impossible"

2514

2353 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2354 -#: builtin/fetch.c:63

2515 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2516 +#: builtin/fetch.c:77

2517 msgid "path"

2518 msgstr "chemin"

2519

@@ -2413,7 +2575,7 @@ msgid "build a temporary index based on embedded index information"

2575 msgstr ""

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

2577

2416 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

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

2579 msgid "paths are separated with NUL character"

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

2581

@@ -2547,108 +2709,108 @@ msgstr "effectuer 'git bisect next'"

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

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

2711

2550 -#: builtin/blame.c:26

2712 +#: builtin/blame.c:27

2713 msgid "git blame [options] [rev-opts] [rev] [--] file"

2714 msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"

2715

2554 -#: builtin/blame.c:31

2716 +#: builtin/blame.c:32

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

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

2719

2558 -#: builtin/blame.c:2276

2720 +#: builtin/blame.c:2248

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

2722 msgstr ""

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

2724 "manière incrémentale"

2725

2564 -#: builtin/blame.c:2277

2726 +#: builtin/blame.c:2249

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

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

2729

2568 -#: builtin/blame.c:2278

2730 +#: builtin/blame.c:2250

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

2732 msgstr ""

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

2734

2573 -#: builtin/blame.c:2279

2735 +#: builtin/blame.c:2251

2736 msgid "Show work cost statistics"

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

2738

2577 -#: builtin/blame.c:2280

2739 +#: builtin/blame.c:2252

2740 msgid "Show output score for blame entries"

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

2742

2581 -#: builtin/blame.c:2281

2743 +#: builtin/blame.c:2253

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

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

2746

2585 -#: builtin/blame.c:2282

2747 +#: builtin/blame.c:2254

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

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

2750

2589 -#: builtin/blame.c:2283

2751 +#: builtin/blame.c:2255

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

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

2754

2593 -#: builtin/blame.c:2284

2755 +#: builtin/blame.c:2256

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

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

2758

2597 -#: builtin/blame.c:2285

2759 +#: builtin/blame.c:2257

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

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

2762

2601 -#: builtin/blame.c:2286

2763 +#: builtin/blame.c:2258

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

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

2766

2605 -#: builtin/blame.c:2287

2767 +#: builtin/blame.c:2259

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

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

2770

2609 -#: builtin/blame.c:2288

2771 +#: builtin/blame.c:2260

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

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

2774

2613 -#: builtin/blame.c:2289

2775 +#: builtin/blame.c:2261

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

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

2778

2617 -#: builtin/blame.c:2290

2779 +#: builtin/blame.c:2262

2780 msgid "Ignore whitespace differences"

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

2782

2621 -#: builtin/blame.c:2291

2783 +#: builtin/blame.c:2263

2784 msgid "Spend extra cycles to find better match"

2785 msgstr ""

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

2787

2626 -#: builtin/blame.c:2292

2788 +#: builtin/blame.c:2264

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

2790 msgstr ""

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

2792

2631 -#: builtin/blame.c:2293

2793 +#: builtin/blame.c:2265

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

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

2796

2635 -#: builtin/blame.c:2294 builtin/blame.c:2295

2797 +#: builtin/blame.c:2266 builtin/blame.c:2267

2798 msgid "score"

2799 msgstr "score"

2800

2639 -#: builtin/blame.c:2294

2801 +#: builtin/blame.c:2266

2802 msgid "Find line copies within and across files"

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

2804

2643 -#: builtin/blame.c:2295

2805 +#: builtin/blame.c:2267

2806 msgid "Find line movements within and across files"

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

2808

2647 -#: builtin/blame.c:2296

2809 +#: builtin/blame.c:2268

2810 msgid "n,m"

2811 msgstr "n,m"

2812

2651 -#: builtin/blame.c:2296

2813 +#: builtin/blame.c:2268

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

2815 msgstr ""

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

@@ -2753,240 +2915,251 @@ msgstr "Branche %s supprimée (précédemment %s).\n"

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

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

2917

2918 +# féminin pour une branche

2919 #: builtin/branch.c:453

2920 #, c-format

2921 +msgid "[%s: gone]"

2922 +msgstr "[%s: disparue]"

2923 +

2924 +#: builtin/branch.c:456

2925 +#, c-format

2926 +msgid "[%s]"

2927 +msgstr "[%s]"

2928 +

2929 +#: builtin/branch.c:459

2930 +#, c-format

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

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

2933

2761 -#: builtin/branch.c:455

2934 +#: builtin/branch.c:461

2935 #, c-format

2936 msgid "[behind %d]"

2937 msgstr "[en retard de %d]"

2938

2766 -#: builtin/branch.c:459

2939 +#: builtin/branch.c:465

2940 #, c-format

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

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

2943

2771 -#: builtin/branch.c:461

2944 +#: builtin/branch.c:467

2945 #, c-format

2946 msgid "[ahead %d]"

2947 msgstr "[en avance de %d]"

2948

2776 -#: builtin/branch.c:464

2949 +#: builtin/branch.c:470

2950 #, c-format

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

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

2953

2781 -#: builtin/branch.c:467

2954 +#: builtin/branch.c:473

2955 #, c-format

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

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

2958

2786 -#: builtin/branch.c:490

2959 +#: builtin/branch.c:496

2960 msgid " **** invalid ref ****"

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

2962

2790 -#: builtin/branch.c:582

2963 +#: builtin/branch.c:588

2964 #, c-format

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

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

2967

2795 -#: builtin/branch.c:585

2968 +#: builtin/branch.c:591

2969 #, c-format

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

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

2972

2800 -#: builtin/branch.c:588

2973 +#: builtin/branch.c:594

2974 #, c-format

2975 msgid "(detached from %s)"

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

2977

2805 -#: builtin/branch.c:591

2978 +#: builtin/branch.c:597

2979 msgid "(no branch)"

2980 msgstr "(aucune branche)"

2981

2809 -#: builtin/branch.c:637

2982 +#: builtin/branch.c:643

2983 #, c-format

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

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

2986

2814 -#: builtin/branch.c:669

2987 +#: builtin/branch.c:675

2988 msgid "some refs could not be read"

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

2990

2818 -#: builtin/branch.c:682

2991 +#: builtin/branch.c:688

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

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

2994

2822 -#: builtin/branch.c:692

2995 +#: builtin/branch.c:698

2996 #, c-format

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

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

2999

2827 -#: builtin/branch.c:707

3000 +#: builtin/branch.c:713

3001 msgid "Branch rename failed"

3002 msgstr "Échec de renommage de la branche"

3003

2831 -#: builtin/branch.c:711

3004 +#: builtin/branch.c:717

3005 #, c-format

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

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

3008

2836 -#: builtin/branch.c:715

3009 +#: builtin/branch.c:721

3010 #, c-format

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

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

3013

2841 -#: builtin/branch.c:722

3014 +#: builtin/branch.c:728

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

3016 msgstr ""

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

3018 "échoué"

3019

2847 -#: builtin/branch.c:737

3020 +#: builtin/branch.c:743

3021 #, c-format

3022 msgid "malformed object name %s"

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

3024

2852 -#: builtin/branch.c:761

3025 +#: builtin/branch.c:767

3026 #, c-format

3027 msgid "could not write branch description template: %s"

3028 msgstr "impossible d'écrire le modèle de description de branche : %s"

3029

2857 -#: builtin/branch.c:791

3030 +#: builtin/branch.c:797

3031 msgid "Generic options"

3032 msgstr "Options génériques"

3033

2861 -#: builtin/branch.c:793

3034 +#: builtin/branch.c:799

3035 msgid "show hash and subject, give twice for upstream branch"

3036 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

3037

2865 -#: builtin/branch.c:794

3038 +#: builtin/branch.c:800

3039 msgid "suppress informational messages"

3040 msgstr "supprimer les messages d'information"

3041

2869 -#: builtin/branch.c:795

3042 +#: builtin/branch.c:801

3043 msgid "set up tracking mode (see git-pull(1))"

3044 msgstr "régler le mode de suivi (voir git-pull(1))"

3045

2873 -#: builtin/branch.c:797

3046 +#: builtin/branch.c:803

3047 msgid "change upstream info"

3048 msgstr "modifier l'information amont"

3049

2877 -#: builtin/branch.c:801

3050 +#: builtin/branch.c:807

3051 msgid "use colored output"

3052 msgstr "utiliser la coloration dans la sortie"

3053

2881 -#: builtin/branch.c:802

3054 +#: builtin/branch.c:808

3055 msgid "act on remote-tracking branches"

3056 msgstr "agir sur les branches de suivi distantes"

3057

2885 -#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2886 -#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434

2887 -#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468

3058 +#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

3059 +#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

3060 +#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

3061 msgid "commit"

3062 msgstr "commit"

3063

2891 -#: builtin/branch.c:806 builtin/branch.c:812

3064 +#: builtin/branch.c:812 builtin/branch.c:818

3065 msgid "print only branches that contain the commit"

3066 msgstr "afficher seulement les branches qui contiennent le commit"

3067

2895 -#: builtin/branch.c:818

3068 +#: builtin/branch.c:824

3069 msgid "Specific git-branch actions:"

3070 msgstr "Actions spécifiques à git-branch :"

3071

2899 -#: builtin/branch.c:819

3072 +#: builtin/branch.c:825

3073 msgid "list both remote-tracking and local branches"

3074 msgstr "afficher à la fois les branches de suivi et les branches locales"

3075

2903 -#: builtin/branch.c:821

3076 +#: builtin/branch.c:827

3077 msgid "delete fully merged branch"

3078 msgstr "supprimer une branche totalement fusionnée"

3079

2907 -#: builtin/branch.c:822

3080 +#: builtin/branch.c:828

3081 msgid "delete branch (even if not merged)"

3082 msgstr "supprimer une branche (même non fusionnée)"

3083

2911 -#: builtin/branch.c:823

3084 +#: builtin/branch.c:829

3085 msgid "move/rename a branch and its reflog"

3086 msgstr "déplacer/renommer une branche et son reflog"

3087

2915 -#: builtin/branch.c:824

3088 +#: builtin/branch.c:830

3089 msgid "move/rename a branch, even if target exists"

3090 msgstr "déplacer/renommer une branche, même si la cible existe"

3091

2919 -#: builtin/branch.c:825

3092 +#: builtin/branch.c:831

3093 msgid "list branch names"

3094 msgstr "afficher les noms des branches"

3095

2923 -#: builtin/branch.c:826

3096 +#: builtin/branch.c:832

3097 msgid "create the branch's reflog"

3098 msgstr "créer le reflog de la branche"

3099

2927 -#: builtin/branch.c:828

3100 +#: builtin/branch.c:834

3101 msgid "edit the description for the branch"

3102 msgstr "éditer la description de la branche"

3103

2931 -#: builtin/branch.c:829

3104 +#: builtin/branch.c:835

3105 msgid "force creation (when already exists)"

3106 msgstr "forcer la création (même si la cible existe)"

3107

2935 -#: builtin/branch.c:832

3108 +#: builtin/branch.c:838

3109 msgid "print only not merged branches"

3110 msgstr "afficher seulement les branches non fusionnées"

3111

2939 -#: builtin/branch.c:838

3112 +#: builtin/branch.c:844

3113 msgid "print only merged branches"

3114 msgstr "afficher seulement les branches fusionnées"

3115

2943 -#: builtin/branch.c:842

3116 +#: builtin/branch.c:848

3117 msgid "list branches in columns"

3118 msgstr "afficher les branches en colonnes"

3119

2947 -#: builtin/branch.c:855

3120 +#: builtin/branch.c:861

3121 msgid "Failed to resolve HEAD as a valid ref."

3122 msgstr "Échec de résolution de HEAD comme référence valide."

3123

2951 -#: builtin/branch.c:860 builtin/clone.c:630

3124 +#: builtin/branch.c:866 builtin/clone.c:629

3125 msgid "HEAD not found below refs/heads!"

3126 msgstr "HEAD non trouvée sous refs/heads !"

3127

2955 -#: builtin/branch.c:883

3128 +#: builtin/branch.c:890

3129 msgid "--column and --verbose are incompatible"

3130 msgstr "--column et --verbose sont incompatibles"

3131

2959 -#: builtin/branch.c:889 builtin/branch.c:928

3132 +#: builtin/branch.c:896 builtin/branch.c:935

3133 msgid "branch name required"

3134 msgstr "le nom de branche est requis"

3135

2963 -#: builtin/branch.c:904

3136 +#: builtin/branch.c:911

3137 msgid "Cannot give description to detached HEAD"

3138 msgstr "Impossible de décrire une HEAD détachée"

3139

2967 -#: builtin/branch.c:909

3140 +#: builtin/branch.c:916

3141 msgid "cannot edit description of more than one branch"

3142 msgstr "impossible d'éditer la description de plus d'une branche"

3143

2971 -#: builtin/branch.c:916

3144 +#: builtin/branch.c:923

3145 #, c-format

3146 msgid "No commit on branch '%s' yet."

3147 msgstr "Aucun commit sur la branche '%s'."

3148

2976 -#: builtin/branch.c:919

3149 +#: builtin/branch.c:926

3150 #, c-format

3151 msgid "No branch named '%s'."

3152 msgstr "Aucune branche nommée '%s'."

3153

2981 -#: builtin/branch.c:934

3154 +#: builtin/branch.c:941

3155 msgid "too many branches for a rename operation"

3156 msgstr "trop de branches pour une opération de renommage"

3157

2985 -#: builtin/branch.c:939

3158 +#: builtin/branch.c:946

3159 msgid "too many branches to set new upstream"

3160 msgstr "trop de branches pour spécifier une branche amont"

3161

2989 -#: builtin/branch.c:943

3162 +#: builtin/branch.c:950

3163 #, c-format

3164 msgid ""

3165 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -2994,41 +3167,41 @@ msgstr ""

3167 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

3168 "aucune branche."

3169

2997 -#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

3170 +#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

3171 #, c-format

3172 msgid "no such branch '%s'"

3173 msgstr "pas de branche '%s'"

3174

3002 -#: builtin/branch.c:950

3175 +#: builtin/branch.c:957

3176 #, c-format

3177 msgid "branch '%s' does not exist"

3178 msgstr "la branche '%s' n'existe pas"

3179

3007 -#: builtin/branch.c:962

3180 +#: builtin/branch.c:969

3181 msgid "too many branches to unset upstream"

3182 msgstr "trop de branches pour désactiver un amont"

3183

3011 -#: builtin/branch.c:966

3184 +#: builtin/branch.c:973

3185 msgid "could not unset upstream of HEAD when it does not point to any branch."

3186 msgstr ""

3187 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

3188 "aucune branche."

3189

3017 -#: builtin/branch.c:972

3190 +#: builtin/branch.c:979

3191 #, c-format

3192 msgid "Branch '%s' has no upstream information"

3193 msgstr "La branche '%s' n'a aucune information de branche amont"

3194

3022 -#: builtin/branch.c:987

3195 +#: builtin/branch.c:994

3196 msgid "it does not make sense to create 'HEAD' manually"

3197 msgstr "créer manuellement 'HEAD' n'a pas de sens"

3198

3026 -#: builtin/branch.c:993

3199 +#: builtin/branch.c:1000

3200 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3201 msgstr ""

3202 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

3203

3031 -#: builtin/branch.c:996

3204 +#: builtin/branch.c:1003

3205 #, c-format

3206 msgid ""

3207 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3037,7 +3210,7 @@ msgstr ""

3210 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

3211 "track ou --set-upstream-to\n"

3212

3040 -#: builtin/branch.c:1013

3213 +#: builtin/branch.c:1020

3214 #, c-format

3215 msgid ""

3216 "\n"

@@ -3048,12 +3221,12 @@ msgstr ""

3221 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

3222 "\n"

3223

3051 -#: builtin/branch.c:1014

3224 +#: builtin/branch.c:1021

3225 #, c-format

3226 msgid " git branch -d %s\n"

3227 msgstr " git branch -d %s\n"

3228

3056 -#: builtin/branch.c:1015

3229 +#: builtin/branch.c:1022

3230 #, c-format

3231 msgid " git branch --set-upstream-to %s\n"

3232 msgstr " git branch -set-upstream-to %s\n"

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

3244 msgid "Need a repository to unbundle."

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

3246

3074 -#: builtin/cat-file.c:285

3247 +#: builtin/cat-file.c:312

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

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

3250

3078 -#: builtin/cat-file.c:286

3251 +#: builtin/cat-file.c:313

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

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

3254

3082 -#: builtin/cat-file.c:323

3255 +#: builtin/cat-file.c:350

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

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

3258

3086 -#: builtin/cat-file.c:324

3259 +#: builtin/cat-file.c:351

3260 msgid "show object type"

3261 msgstr "afficher le type de l'objet"

3262

3090 -#: builtin/cat-file.c:325

3263 +#: builtin/cat-file.c:352

3264 msgid "show object size"

3265 msgstr "afficher la taille de l'objet"

3266

3094 -#: builtin/cat-file.c:327

3267 +#: builtin/cat-file.c:354

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

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

3270

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

3271 +#: builtin/cat-file.c:355

3272 msgid "pretty-print object's content"

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

3274

3102 -#: builtin/cat-file.c:330

3275 +#: builtin/cat-file.c:357

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

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

3278

3106 -#: builtin/cat-file.c:332

3279 +#: builtin/cat-file.c:359

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

3281 msgstr ""

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

3283

3111 -#: builtin/cat-file.c:335

3284 +#: builtin/cat-file.c:362

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

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

3287

@@ -3134,10 +3307,10 @@ msgid "read file names from stdin"

3307 msgstr "lire les noms de fichier depuis l'entrée standard"

3308

3309 #: builtin/check-attr.c:23 builtin/check-ignore.c:24

3137 -msgid "input paths are terminated by a null character"

3138 -msgstr "les chemins en entrée sont terminés par le caractère nul"

3310 +msgid "terminate input and output records by a NUL character"

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

3312

3140 -#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

3313 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3314 msgid "suppress progress reporting"

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

3316

@@ -3145,27 +3318,31 @@ msgstr "supprimer l'état d'avancement"

3318 msgid "show non-matching input paths"

3319 msgstr "afficher les chemins en entrée qui ne correspondent pas"

3320

3148 -#: builtin/check-ignore.c:143

3321 +#: builtin/check-ignore.c:28

3322 +msgid "ignore index when checking"

3323 +msgstr "ignorer l'index pendant la vérification"

3324 +

3325 +#: builtin/check-ignore.c:154

3326 msgid "cannot specify pathnames with --stdin"

3327 msgstr "impossible de spécifier les chemins avec --stdin"

3328

3152 -#: builtin/check-ignore.c:146

3329 +#: builtin/check-ignore.c:157

3330 msgid "-z only makes sense with --stdin"

3331 msgstr "-z n'a de sens qu'avec l'option --stdin"

3332

3156 -#: builtin/check-ignore.c:148

3333 +#: builtin/check-ignore.c:159

3334 msgid "no path specified"

3335 msgstr "aucun chemin spécifié"

3336

3160 -#: builtin/check-ignore.c:152

3337 +#: builtin/check-ignore.c:163

3338 msgid "--quiet is only valid with a single pathname"

3339 msgstr "--quiet n'est valide qu'avec un seul chemin"

3340

3164 -#: builtin/check-ignore.c:154

3341 +#: builtin/check-ignore.c:165

3342 msgid "cannot have both --quiet and --verbose"

3343 msgstr "impossible d'avoir --quiet et --verbose"

3344

3168 -#: builtin/check-ignore.c:157

3345 +#: builtin/check-ignore.c:168

3346 msgid "--non-matching is only valid with --verbose"

3347 msgstr "--non-matching n'est valide qu'avec --verbose"

3348

@@ -3240,108 +3417,108 @@ msgstr "git checkout [options] <branche>"

3417 msgid "git checkout [options] [<branch>] -- <file>..."

3418 msgstr "git checkout [options] [<branche>] -- <fichier>..."

3419

3243 -#: builtin/checkout.c:117 builtin/checkout.c:150

3420 +#: builtin/checkout.c:114 builtin/checkout.c:147

3421 #, c-format

3422 msgid "path '%s' does not have our version"

3423 msgstr "le chemin '%s' n'a pas notre version"

3424

3248 -#: builtin/checkout.c:119 builtin/checkout.c:152

3425 +#: builtin/checkout.c:116 builtin/checkout.c:149

3426 #, c-format

3427 msgid "path '%s' does not have their version"

3428 msgstr "le chemin '%s' n'a pas leur version"

3429

3253 -#: builtin/checkout.c:135

3430 +#: builtin/checkout.c:132

3431 #, c-format

3432 msgid "path '%s' does not have all necessary versions"

3433 msgstr "le chemin '%s' n'a aucune des versions nécessaires"

3434

3258 -#: builtin/checkout.c:179

3435 +#: builtin/checkout.c:176

3436 #, c-format

3437 msgid "path '%s' does not have necessary versions"

3438 msgstr "le chemin '%s' n'a pas les versions nécessaires"

3439

3263 -#: builtin/checkout.c:196

3440 +#: builtin/checkout.c:193

3441 #, c-format

3442 msgid "path '%s': cannot merge"

3443 msgstr "chemin '%s' : impossible de fusionner"

3444

3268 -#: builtin/checkout.c:213

3445 +#: builtin/checkout.c:210

3446 #, c-format

3447 msgid "Unable to add merge result for '%s'"

3448 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

3449

3273 -#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3274 -#: builtin/checkout.c:246

3450 +#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3451 +#: builtin/checkout.c:241

3452 #, c-format

3453 msgid "'%s' cannot be used with updating paths"

3454 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

3455

3279 -#: builtin/checkout.c:249 builtin/checkout.c:252

3456 +#: builtin/checkout.c:244 builtin/checkout.c:247

3457 #, c-format

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

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

3460

3284 -#: builtin/checkout.c:255

3461 +#: builtin/checkout.c:250

3462 #, c-format

3463 msgid "Cannot update paths and switch to branch '%s' at the same time."

3464 msgstr ""

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

3466 "même temps."

3467

3291 -#: builtin/checkout.c:266 builtin/checkout.c:458

3468 +#: builtin/checkout.c:261 builtin/checkout.c:451

3469 msgid "corrupt index file"

3470 msgstr "fichier d'index corrompu"

3471

3295 -#: builtin/checkout.c:329 builtin/checkout.c:336

3472 +#: builtin/checkout.c:322 builtin/checkout.c:329

3473 #, c-format

3474 msgid "path '%s' is unmerged"

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

3476

3300 -#: builtin/checkout.c:480

3477 +#: builtin/checkout.c:473

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

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

3480

3304 -#: builtin/checkout.c:601

3481 +#: builtin/checkout.c:594

3482 #, c-format

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

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

3485

3309 -#: builtin/checkout.c:639

3486 +#: builtin/checkout.c:632

3487 msgid "HEAD is now at"

3488 msgstr "HEAD est maintenant sur"

3489

3313 -#: builtin/checkout.c:646

3490 +#: builtin/checkout.c:639

3491 #, c-format

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

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

3494

3318 -#: builtin/checkout.c:649

3495 +#: builtin/checkout.c:642

3496 #, c-format

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

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

3499

3323 -#: builtin/checkout.c:653

3500 +#: builtin/checkout.c:646

3501 #, c-format

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

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

3504

3328 -#: builtin/checkout.c:655 builtin/checkout.c:997

3505 +#: builtin/checkout.c:648 builtin/checkout.c:1033

3506 #, c-format

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

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

3509

3333 -#: builtin/checkout.c:657

3510 +#: builtin/checkout.c:650

3511 #, c-format

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

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

3514

3338 -#: builtin/checkout.c:713

3515 +#: builtin/checkout.c:706

3516 #, c-format

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

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

3519

3520 #. The singular version

3344 -#: builtin/checkout.c:719

3521 +#: builtin/checkout.c:712

3522 #, c-format

3523 msgid ""

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

@@ -3364,7 +3541,7 @@ msgstr[1] ""

3541 "\n"

3542 "%s\n"

3543

3367 -#: builtin/checkout.c:737

3544 +#: builtin/checkout.c:730

3545 #, c-format

3546 msgid ""

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

@@ -3380,136 +3557,140 @@ msgstr ""

3557 "git branche nouvelle_branche %s\n"

3558 "\n"

3559

3383 -#: builtin/checkout.c:767

3560 +#: builtin/checkout.c:760

3561 msgid "internal error in revision walk"

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

3563

3387 -#: builtin/checkout.c:771

3564 +#: builtin/checkout.c:764

3565 msgid "Previous HEAD position was"

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

3567

3391 -#: builtin/checkout.c:798 builtin/checkout.c:992

3568 +#: builtin/checkout.c:791 builtin/checkout.c:1028

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

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

3571

3395 -#. case (1)

3396 -#: builtin/checkout.c:928

3572 +#: builtin/checkout.c:935

3573 +#, c-format

3574 +msgid "only one reference expected, %d given."

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

3576 +

3577 +#: builtin/checkout.c:974

3578 #, c-format

3579 msgid "invalid reference: %s"

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

3581

3582 #. case (1): want a tree

3402 -#: builtin/checkout.c:967

3583 +#: builtin/checkout.c:1003

3584 #, c-format

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

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

3587

3407 -#: builtin/checkout.c:1006

3588 +#: builtin/checkout.c:1042

3589 msgid "paths cannot be used with switching branches"

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

3591

3411 -#: builtin/checkout.c:1009 builtin/checkout.c:1013

3592 +#: builtin/checkout.c:1045 builtin/checkout.c:1049

3593 #, c-format

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

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

3596

3416 -#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3417 -#: builtin/checkout.c:1028

3597 +#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3598 +#: builtin/checkout.c:1064

3599 #, c-format

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

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

3602

3422 -#: builtin/checkout.c:1033

3603 +#: builtin/checkout.c:1069

3604 #, c-format

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

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

3607

3427 -#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3608 +#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3609 #: builtin/remote.c:169 builtin/remote.c:171

3610 msgid "branch"

3611 msgstr "branche"

3612

3432 -#: builtin/checkout.c:1056

3613 +#: builtin/checkout.c:1092

3614 msgid "create and checkout a new branch"

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

3616

3436 -#: builtin/checkout.c:1058

3617 +#: builtin/checkout.c:1094

3618 msgid "create/reset and checkout a branch"

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

3620

3440 -#: builtin/checkout.c:1059

3621 +#: builtin/checkout.c:1095

3622 msgid "create reflog for new branch"

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

3624

3444 -#: builtin/checkout.c:1060

3625 +#: builtin/checkout.c:1096

3626 msgid "detach the HEAD at named commit"

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

3628

3448 -#: builtin/checkout.c:1061

3629 +#: builtin/checkout.c:1097

3630 msgid "set upstream info for new branch"

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

3632

3452 -#: builtin/checkout.c:1063

3633 +#: builtin/checkout.c:1099

3634 msgid "new branch"

3635 msgstr "nouvelle branche"

3636

3456 -#: builtin/checkout.c:1063

3637 +#: builtin/checkout.c:1099

3638 msgid "new unparented branch"

3639 msgstr "nouvelle branche sans parent"

3640

3460 -#: builtin/checkout.c:1064

3641 +#: builtin/checkout.c:1100

3642 msgid "checkout our version for unmerged files"

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

3644

3464 -#: builtin/checkout.c:1066

3645 +#: builtin/checkout.c:1102

3646 msgid "checkout their version for unmerged files"

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

3648

3468 -#: builtin/checkout.c:1068

3649 +#: builtin/checkout.c:1104

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

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

3652

3472 -#: builtin/checkout.c:1069

3653 +#: builtin/checkout.c:1105

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

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

3656

3476 -#: builtin/checkout.c:1070 builtin/merge.c:232

3657 +#: builtin/checkout.c:1106 builtin/merge.c:232

3658 msgid "update ignored files (default)"

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

3660

3480 -#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3661 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3662 msgid "style"

3663 msgstr "style"

3664

3484 -#: builtin/checkout.c:1072

3665 +#: builtin/checkout.c:1108

3666 msgid "conflict style (merge or diff3)"

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

3668

3488 -#: builtin/checkout.c:1075

3669 +#: builtin/checkout.c:1111

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

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

3672

3492 -#: builtin/checkout.c:1077

3673 +#: builtin/checkout.c:1113

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

3675 msgstr "deuxième chance 'git checkout branche-inexistante'"

3676

3496 -#: builtin/checkout.c:1101

3677 +#: builtin/checkout.c:1136

3678 msgid "-b, -B and --orphan are mutually exclusive"

3679 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3680

3500 -#: builtin/checkout.c:1118

3681 +#: builtin/checkout.c:1153

3682 msgid "--track needs a branch name"

3683 msgstr "--track requiert un nom de branche"

3684

3504 -#: builtin/checkout.c:1125

3685 +#: builtin/checkout.c:1160

3686 msgid "Missing branch name; try -b"

3687 msgstr "Nom de branche manquant ; essayez -b"

3688

3508 -#: builtin/checkout.c:1160

3689 +#: builtin/checkout.c:1197

3690 msgid "invalid path specification"

3691 msgstr "spécification de chemin invalide"

3692

3512 -#: builtin/checkout.c:1167

3693 +#: builtin/checkout.c:1204

3694 #, c-format

3695 msgid ""

3696 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3519,12 +3700,12 @@ msgstr ""

3700 "en même temps.\n"

3701 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3702

3522 -#: builtin/checkout.c:1172

3703 +#: builtin/checkout.c:1209

3704 #, c-format

3705 msgid "git checkout: --detach does not take a path argument '%s'"

3706 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3707

3527 -#: builtin/checkout.c:1176

3708 +#: builtin/checkout.c:1213

3709 msgid ""

3710 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3711 "checking out of the index."

@@ -3532,38 +3713,38 @@ msgstr ""

3713 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"

3714 "de l'extraction de l'index."

3715

3535 -#: builtin/clean.c:25

3716 +#: builtin/clean.c:26

3717 msgid ""

3718 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3719 msgstr ""

3720 "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."

3721

3541 -#: builtin/clean.c:29

3722 +#: builtin/clean.c:30

3723 #, c-format

3724 msgid "Removing %s\n"

3725 msgstr "Suppression de %s\n"

3726

3546 -#: builtin/clean.c:30

3727 +#: builtin/clean.c:31

3728 #, c-format

3729 msgid "Would remove %s\n"

3730 msgstr "Supprimerait %s\n"

3731

3551 -#: builtin/clean.c:31

3732 +#: builtin/clean.c:32

3733 #, c-format

3734 msgid "Skipping repository %s\n"

3735 msgstr "Ignore le dépôt %s\n"

3736

3556 -#: builtin/clean.c:32

3737 +#: builtin/clean.c:33

3738 #, c-format

3739 msgid "Would skip repository %s\n"

3740 msgstr "Ignorerait le dépôt %s\n"

3741

3561 -#: builtin/clean.c:33

3742 +#: builtin/clean.c:34

3743 #, c-format

3744 msgid "failed to remove %s"

3745 msgstr "échec de la suppression de %s"

3746

3566 -#: builtin/clean.c:293

3747 +#: builtin/clean.c:294

3748 msgid ""

3749 "Prompt help:\n"

3750 "1 - select a numbered item\n"

@@ -3575,7 +3756,7 @@ msgstr ""

3756 "foo - sélectionner un élément par un préfixe unique\n"

3757 " - (vide) ne rien sélectionner"

3758

3578 -#: builtin/clean.c:297

3759 +#: builtin/clean.c:298

3760 msgid ""

3761 "Prompt help:\n"

3762 "1 - select a single item\n"

@@ -3595,35 +3776,35 @@ msgstr ""

3776 "* - choisir tous les éléments\n"

3777 " - (vide) terminer la sélection"

3778

3598 -#: builtin/clean.c:515

3779 +#: builtin/clean.c:516

3780 #, c-format

3781 msgid "Huh (%s)?"

3782 msgstr "Hein (%s) ?"

3783

3603 -#: builtin/clean.c:658

3784 +#: builtin/clean.c:659

3785 #, c-format

3786 msgid "Input ignore patterns>> "

3787 msgstr "Entrez les motifs à ignorer>> "

3788

3608 -#: builtin/clean.c:695

3789 +#: builtin/clean.c:696

3790 #, c-format

3791 msgid "WARNING: Cannot find items matched by: %s"

3792 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

3793

3613 -#: builtin/clean.c:716

3794 +#: builtin/clean.c:717

3795 msgid "Select items to delete"

3796 msgstr "Sélectionner les éléments à supprimer"

3797

3617 -#: builtin/clean.c:756

3798 +#: builtin/clean.c:757

3799 #, c-format

3800 msgid "remove %s? "

3801 msgstr "supprimer %s ? "

3802

3622 -#: builtin/clean.c:781

3803 +#: builtin/clean.c:782

3804 msgid "Bye."

3805 msgstr "Au revoir."

3806

3626 -#: builtin/clean.c:789

3807 +#: builtin/clean.c:790

3808 msgid ""

3809 "clean - start cleaning\n"

3810 "filter by pattern - exclude items from deletion\n"

@@ -3641,21 +3822,21 @@ msgstr ""

3822 "help - cet écran\n"

3823 "? - aide pour la sélection en ligne"

3824

3644 -#: builtin/clean.c:816

3825 +#: builtin/clean.c:817

3826 msgid "*** Commands ***"

3827 msgstr "*** Commandes ***"

3828

3648 -#: builtin/clean.c:817

3829 +#: builtin/clean.c:818

3830 msgid "What now"

3831 msgstr "Et maintenant ?"

3832

3652 -#: builtin/clean.c:825

3833 +#: builtin/clean.c:826

3834 msgid "Would remove the following item:"

3835 msgid_plural "Would remove the following items:"

3836 msgstr[0] "Supprimerait l'élément suivant :"

3837 msgstr[1] "Supprimerait les éléments suivants :"

3838

3658 -#: builtin/clean.c:842

3839 +#: builtin/clean.c:843

3840 msgid "No more files to clean, exiting."

3841 msgstr "Plus de fichier à nettoyer, sortie."

3842

@@ -3675,8 +3856,8 @@ msgstr "nettoyage interactif"

3856 msgid "remove whole directories"

3857 msgstr "supprimer les répertoires entiers"

3858

3678 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716

3679 -#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3859 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3860 +#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3861 msgid "pattern"

3862 msgstr "motif"

3863

@@ -3716,8 +3897,8 @@ msgstr ""

3897 msgid "git clone [options] [--] <repo> [<dir>]"

3898 msgstr "git clone [options] [--] <dépôt> [<répertoire>]"

3899

3719 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3720 -#: builtin/push.c:462

3900 +#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3901 +#: builtin/push.c:474

3902 msgid "force progress reporting"

3903 msgstr "forcer l'état d'avancement"

3904

@@ -3729,123 +3910,123 @@ msgstr "ne pas créer d'extraction"

3910 msgid "create a bare repository"

3911 msgstr "créer un dépôt nu"

3912

3732 -#: builtin/clone.c:72

3913 +#: builtin/clone.c:71

3914 msgid "create a mirror repository (implies bare)"

3915 msgstr "créer un dépôt miroir (implique dépôt nu)"

3916

3736 -#: builtin/clone.c:74

3917 +#: builtin/clone.c:73

3918 msgid "to clone from a local repository"

3919 msgstr "pour cloner depuis un dépôt local"

3920

3740 -#: builtin/clone.c:76

3921 +#: builtin/clone.c:75

3922 msgid "don't use local hardlinks, always copy"

3923 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

3924

3744 -#: builtin/clone.c:78

3925 +#: builtin/clone.c:77

3926 msgid "setup as shared repository"

3927 msgstr "régler comme dépôt partagé"

3928

3748 -#: builtin/clone.c:80 builtin/clone.c:82

3929 +#: builtin/clone.c:79 builtin/clone.c:81

3930 msgid "initialize submodules in the clone"

3931 msgstr "initialiser les sous-modules dans le clone"

3932

3752 -#: builtin/clone.c:83 builtin/init-db.c:485

3933 +#: builtin/clone.c:82 builtin/init-db.c:485

3934 msgid "template-directory"

3935 msgstr "répertoire-modèle"

3936

3756 -#: builtin/clone.c:84 builtin/init-db.c:486

3937 +#: builtin/clone.c:83 builtin/init-db.c:486

3938 msgid "directory from which templates will be used"

3939 msgstr "répertoire depuis lequel les modèles vont être utilisés"

3940

3760 -#: builtin/clone.c:86

3941 +#: builtin/clone.c:85

3942 msgid "reference repository"

3943 msgstr "dépôt de référence"

3944

3764 -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3945 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3946 msgid "name"

3947 msgstr "nom"

3948

3768 -#: builtin/clone.c:88

3949 +#: builtin/clone.c:87

3950 msgid "use <name> instead of 'origin' to track upstream"

3951 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

3952

3772 -#: builtin/clone.c:90

3953 +#: builtin/clone.c:89

3954 msgid "checkout <branch> instead of the remote's HEAD"

3955 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

3956

3776 -#: builtin/clone.c:92

3957 +#: builtin/clone.c:91

3958 msgid "path to git-upload-pack on the remote"

3959 msgstr "chemin vers git-upload-pack sur le serveur distant"

3960

3780 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3961 +#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3962 msgid "depth"

3963 msgstr "profondeur"

3964

3784 -#: builtin/clone.c:94

3965 +#: builtin/clone.c:93

3966 msgid "create a shallow clone of that depth"

3967 msgstr "créer un clone superficiel de cette profondeur"

3968

3788 -#: builtin/clone.c:96

3969 +#: builtin/clone.c:95

3970 msgid "clone only one branch, HEAD or --branch"

3971 msgstr "cloner seulement une branche, HEAD ou --branch"

3972

3792 -#: builtin/clone.c:97 builtin/init-db.c:494

3973 +#: builtin/clone.c:96 builtin/init-db.c:494

3974 msgid "gitdir"

3975 msgstr "gitdir"

3976

3796 -#: builtin/clone.c:98 builtin/init-db.c:495

3977 +#: builtin/clone.c:97 builtin/init-db.c:495

3978 msgid "separate git dir from working tree"

3979 msgstr "séparer le répertoire git de la copie de travail"

3980

3800 -#: builtin/clone.c:99

3981 +#: builtin/clone.c:98

3982 msgid "key=value"

3983 msgstr "clé=valeur"

3984

3804 -#: builtin/clone.c:100

3985 +#: builtin/clone.c:99

3986 msgid "set config inside the new repository"

3987 msgstr "régler la configuration dans le nouveau dépôt"

3988

3808 -#: builtin/clone.c:253

3989 +#: builtin/clone.c:252

3990 #, c-format

3991 msgid "reference repository '%s' is not a local repository."

3992 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

3993

3813 -#: builtin/clone.c:316

3994 +#: builtin/clone.c:315

3995 #, c-format

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

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

3998

3818 -#: builtin/clone.c:318 builtin/diff.c:77

3999 +#: builtin/clone.c:317 builtin/diff.c:77

4000 #, c-format

4001 msgid "failed to stat '%s'"

4002 msgstr "échec du stat de '%s'"

4003

3823 -#: builtin/clone.c:320

4004 +#: builtin/clone.c:319

4005 #, c-format

4006 msgid "%s exists and is not a directory"

4007 msgstr "%s existe et n'est pas un répertoire"

4008

3828 -#: builtin/clone.c:334

4009 +#: builtin/clone.c:333

4010 #, c-format

4011 msgid "failed to stat %s\n"

4012 msgstr "échec du stat de %s\n"

4013

3833 -#: builtin/clone.c:356

4014 +#: builtin/clone.c:355

4015 #, c-format

4016 msgid "failed to create link '%s'"

4017 msgstr "échec de la création du lien '%s'"

4018

3838 -#: builtin/clone.c:360

4019 +#: builtin/clone.c:359

4020 #, c-format

4021 msgid "failed to copy file to '%s'"

4022 msgstr "échec de la copie vers '%s'"

4023

3843 -#: builtin/clone.c:383

4024 +#: builtin/clone.c:382 builtin/clone.c:559

4025 #, c-format

4026 msgid "done.\n"

4027 msgstr "fait.\n"

4028

3848 -#: builtin/clone.c:396

4029 +#: builtin/clone.c:395

4030 msgid ""

4031 "Clone succeeded, but checkout failed.\n"

4032 "You can inspect what was checked out with 'git status'\n"

@@ -3855,108 +4036,103 @@ msgstr ""

4036 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4037 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4038

3858 -#: builtin/clone.c:475

4039 +#: builtin/clone.c:474

4040 #, c-format

4041 msgid "Could not find remote branch %s to clone."

4042 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4043

3863 -#: builtin/clone.c:555

4044 +#: builtin/clone.c:554

4045 #, c-format

4046 msgid "Checking connectivity... "

4047 msgstr "Vérification de la connectivité... "

4048

3868 -#: builtin/clone.c:558

4049 +#: builtin/clone.c:557

4050 msgid "remote did not send all necessary objects"

4051 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4052

3872 -#: builtin/clone.c:560

3873 -#, c-format

3874 -msgid "done\n"

3875 -msgstr "fait\n"

3876 -

3877 -#: builtin/clone.c:621

4053 +#: builtin/clone.c:620

4054 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4055 msgstr ""

4056 "la HEAD distante réfère à une référence non existante, impossible de "

4057 "l'extraire.\n"

4058

3883 -#: builtin/clone.c:652

4059 +#: builtin/clone.c:651

4060 msgid "unable to checkout working tree"

4061 msgstr "impossible d'extraire la copie de travail"

4062

3887 -#: builtin/clone.c:760

4063 +#: builtin/clone.c:759

4064 msgid "Too many arguments."

4065 msgstr "Trop d'arguments."

4066

3891 -#: builtin/clone.c:764

4067 +#: builtin/clone.c:763

4068 msgid "You must specify a repository to clone."

4069 msgstr "Vous devez spécifier un dépôt à cloner."

4070

3895 -#: builtin/clone.c:775

4071 +#: builtin/clone.c:774

4072 #, c-format

4073 msgid "--bare and --origin %s options are incompatible."

4074 msgstr "les options --bare et --origin %s sont incompatibles."

4075

3900 -#: builtin/clone.c:778

4076 +#: builtin/clone.c:777

4077 msgid "--bare and --separate-git-dir are incompatible."

4078 msgstr "--bare et --separate-git-dir sont incompatibles."

4079

3904 -#: builtin/clone.c:791

4080 +#: builtin/clone.c:790

4081 #, c-format

4082 msgid "repository '%s' does not exist"

4083 msgstr "le dépôt '%s' n'existe pas"

4084

3909 -#: builtin/clone.c:796

4085 +#: builtin/clone.c:795

4086 msgid "--depth is ignored in local clones; use file:// instead."

4087 msgstr ""

4088 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4089

3914 -#: builtin/clone.c:798

4090 +#: builtin/clone.c:797

4091 msgid "--local is ignored"

4092 msgstr "--local est ignoré"

4093

3918 -#: builtin/clone.c:808

4094 +#: builtin/clone.c:807

4095 #, c-format

4096 msgid "destination path '%s' already exists and is not an empty directory."

4097 msgstr ""

4098 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4099

3924 -#: builtin/clone.c:818

4100 +#: builtin/clone.c:817

4101 #, c-format

4102 msgid "working tree '%s' already exists."

4103 msgstr "la copie de travail '%s' existe déjà."

4104

3929 -#: builtin/clone.c:831 builtin/clone.c:843

4105 +#: builtin/clone.c:830 builtin/clone.c:842

4106 #, c-format

4107 msgid "could not create leading directories of '%s'"

4108 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4109

3934 -#: builtin/clone.c:834

4110 +#: builtin/clone.c:833

4111 #, c-format

4112 msgid "could not create work tree dir '%s'."

4113 msgstr "impossible de créer le répertoire de la copie de travail '%s'."

4114

3939 -#: builtin/clone.c:853

4115 +#: builtin/clone.c:852

4116 #, c-format

4117 msgid "Cloning into bare repository '%s'...\n"

4118 msgstr "Clonage dans le dépôt nu '%s'\n"

4119

3944 -#: builtin/clone.c:855

4120 +#: builtin/clone.c:854

4121 #, c-format

4122 msgid "Cloning into '%s'...\n"

4123 msgstr "Clonage dans '%s'...\n"

4124

3949 -#: builtin/clone.c:890

4125 +#: builtin/clone.c:888

4126 #, c-format

4127 msgid "Don't know how to clone %s"

4128 msgstr "Je ne sais pas cloner %s"

4129

3954 -#: builtin/clone.c:942

4130 +#: builtin/clone.c:939 builtin/clone.c:947

4131 #, c-format

4132 msgid "Remote branch %s not found in upstream %s"

4133 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4134

3959 -#: builtin/clone.c:949

4135 +#: builtin/clone.c:950

4136 msgid "You appear to have cloned an empty repository."

4137 msgstr "Vous semblez avoir cloné un dépôt vide."

4138

@@ -3992,15 +4168,15 @@ msgstr "Remplissage d'espace entre les colonnes"

4168 msgid "--command must be the first argument"

4169 msgstr "--command doit être le premier argument"

4170

3995 -#: builtin/commit.c:35

4171 +#: builtin/commit.c:36

4172 msgid "git commit [options] [--] <pathspec>..."

4173 msgstr "git commit [options] [--] <spécification-de-chemin>..."

4174

3999 -#: builtin/commit.c:40

4175 +#: builtin/commit.c:41

4176 msgid "git status [options] [--] <pathspec>..."

4177 msgstr "git status [options] [--] <spécification-de-chemin>..."

4178

4003 -#: builtin/commit.c:45

4179 +#: builtin/commit.c:46

4180 msgid ""

4181 "Your name and email address were configured automatically based\n"

4182 "on your username and hostname. Please check that they are accurate.\n"

@@ -4026,7 +4202,7 @@ msgstr ""

4202 "\n"

4203 " git commit --amend --reset-author\n"

4204

4029 -#: builtin/commit.c:57

4205 +#: builtin/commit.c:58

4206 msgid ""

4207 "You asked to amend the most recent commit, but doing so would make\n"

4208 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4037,7 +4213,7 @@ msgstr ""

4213 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"

4214 "supprimer complètement le commit avec \"git reset HEAD^\".\n"

4215

4040 -#: builtin/commit.c:62

4216 +#: builtin/commit.c:63

4217 msgid ""

4218 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4219 "If you wish to commit it anyway, use:\n"

@@ -4052,11 +4228,11 @@ msgstr ""

4228 " git commit --allow-empty\n"

4229 "\n"

4230

4055 -#: builtin/commit.c:69

4231 +#: builtin/commit.c:70

4232 msgid "Otherwise, please use 'git reset'\n"

4233 msgstr "Sinon, veuillez utiliser 'git reset'\n"

4234

4059 -#: builtin/commit.c:72

4235 +#: builtin/commit.c:73

4236 msgid ""

4237 "If you wish to skip this commit, use:\n"

4238 "\n"

@@ -4072,93 +4248,93 @@ msgstr ""

4248 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

4249 "des commits restants.\n"

4250

4075 -#: builtin/commit.c:279

4251 +#: builtin/commit.c:287

4252 msgid "failed to unpack HEAD tree object"

4253 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4254

4079 -#: builtin/commit.c:321

4255 +#: builtin/commit.c:329

4256 msgid "unable to create temporary index"

4257 msgstr "impossible de créer l'index temporaire"

4258

4083 -#: builtin/commit.c:327

4259 +#: builtin/commit.c:335

4260 msgid "interactive add failed"

4261 msgstr "échec de l'ajout interactif"

4262

4087 -#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431

4263 +#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4264 msgid "unable to write new_index file"

4265 msgstr "impossible d'écrire le fichier new_index"

4266

4091 -#: builtin/commit.c:412

4267 +#: builtin/commit.c:420

4268 msgid "cannot do a partial commit during a merge."

4269 msgstr "impossible de faire une validation partielle pendant une fusion."

4270

4095 -#: builtin/commit.c:414

4271 +#: builtin/commit.c:422

4272 msgid "cannot do a partial commit during a cherry-pick."

4273 msgstr "impossible de faire une validation partielle pendant un picorage."

4274

4099 -#: builtin/commit.c:424

4275 +#: builtin/commit.c:432

4276 msgid "cannot read the index"

4277 msgstr "impossible de lire l'index"

4278

4103 -#: builtin/commit.c:444

4279 +#: builtin/commit.c:452

4280 msgid "unable to write temporary index file"

4281 msgstr "impossible d'écrire le fichier d'index temporaire"

4282

4107 -#: builtin/commit.c:535 builtin/commit.c:541

4283 +#: builtin/commit.c:543 builtin/commit.c:549

4284 #, c-format

4285 msgid "invalid commit: %s"

4286 msgstr "commit invalide : %s"

4287

4112 -#: builtin/commit.c:563

4288 +#: builtin/commit.c:571

4289 msgid "malformed --author parameter"

4290 msgstr "paramètre --author mal formé"

4291

4116 -#: builtin/commit.c:583

4292 +#: builtin/commit.c:591

4293 #, c-format

4294 msgid "Malformed ident string: '%s'"

4295 msgstr "Chaîne ident mal formée : '%s'"

4296

4121 -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982

4297 +#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4298 #, c-format

4299 msgid "could not lookup commit %s"

4300 msgstr "impossible de rechercher le commit %s"

4301

4126 -#: builtin/commit.c:633 builtin/shortlog.c:271

4302 +#: builtin/commit.c:642 builtin/shortlog.c:273

4303 #, c-format

4304 msgid "(reading log message from standard input)\n"

4305 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4306

4131 -#: builtin/commit.c:635

4307 +#: builtin/commit.c:644

4308 msgid "could not read log from standard input"

4309 msgstr "impossible de lire le journal depuis l'entrée standard"

4310

4135 -#: builtin/commit.c:639

4311 +#: builtin/commit.c:648

4312 #, c-format

4313 msgid "could not read log file '%s'"

4314 msgstr "impossible de lire le fichier de journal '%s'"

4315

4140 -#: builtin/commit.c:645

4316 +#: builtin/commit.c:654

4317 msgid "commit has empty message"

4318 msgstr "le commit a un message vide"

4319

4144 -#: builtin/commit.c:661

4320 +#: builtin/commit.c:670

4321 msgid "could not read MERGE_MSG"

4322 msgstr "impossible de lire MERGE_MSG"

4323

4148 -#: builtin/commit.c:665

4324 +#: builtin/commit.c:674

4325 msgid "could not read SQUASH_MSG"

4326 msgstr "impossible de lire SQUASH_MSG"

4327

4152 -#: builtin/commit.c:669

4328 +#: builtin/commit.c:678

4329 #, c-format

4330 msgid "could not read '%s'"

4331 msgstr "impossible de lire '%s'"

4332

4157 -#: builtin/commit.c:730

4333 +#: builtin/commit.c:749

4334 msgid "could not write commit template"

4335 msgstr "impossible d'écrire le modèle de commit"

4336

4161 -#: builtin/commit.c:741

4337 +#: builtin/commit.c:760

4338 #, c-format

4339 msgid ""

4340 "\n"

@@ -4173,7 +4349,7 @@ msgstr ""

4349 "\t%s\n"

4350 "et essayez à nouveau.\n"

4351

4176 -#: builtin/commit.c:746

4352 +#: builtin/commit.c:765

4353 #, c-format

4354 msgid ""

4355 "\n"

@@ -4188,7 +4364,7 @@ msgstr ""

4364 "\t%s\n"

4365 "et essayez à nouveau.\n"

4366

4191 -#: builtin/commit.c:758

4367 +#: builtin/commit.c:777

4368 #, c-format

4369 msgid ""

4370 "Please enter the commit message for your changes. Lines starting\n"

@@ -4198,7 +4374,7 @@ msgstr ""

4374 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4375 "validation.\n"

4376

4201 -#: builtin/commit.c:763

4377 +#: builtin/commit.c:782

4378 #, c-format

4379 msgid ""

4380 "Please enter the commit message for your changes. Lines starting\n"

@@ -4209,142 +4385,142 @@ msgstr ""

4385 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4386 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4387

4212 -#: builtin/commit.c:776

4388 +#: builtin/commit.c:795

4389 #, c-format

4390 msgid "%sAuthor: %s"

4391 msgstr "%sAuteur : %s"

4392

4217 -#: builtin/commit.c:783

4393 +#: builtin/commit.c:802

4394 #, c-format

4395 msgid "%sCommitter: %s"

4396 msgstr "%sValidateur : %s"

4397

4222 -#: builtin/commit.c:803

4398 +#: builtin/commit.c:822

4399 msgid "Cannot read index"

4400 msgstr "Impossible de lire l'index"

4401

4226 -#: builtin/commit.c:845

4402 +#: builtin/commit.c:865

4403 msgid "Error building trees"

4404 msgstr "Erreur lors de la construction des arbres"

4405

4230 -#: builtin/commit.c:860 builtin/tag.c:359

4406 +#: builtin/commit.c:880 builtin/tag.c:359

4407 #, c-format

4408 msgid "Please supply the message using either -m or -F option.\n"

4409 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4410

4235 -#: builtin/commit.c:957

4411 +#: builtin/commit.c:982

4412 #, c-format

4413 msgid "No existing author found with '%s'"

4414 msgstr "Aucun auteur existant trouvé avec '%s'"

4415

4240 -#: builtin/commit.c:972 builtin/commit.c:1208

4416 +#: builtin/commit.c:997 builtin/commit.c:1237

4417 #, c-format

4418 msgid "Invalid untracked files mode '%s'"

4419 msgstr "Mode de fichier non suivi invalide '%s'"

4420

4245 -#: builtin/commit.c:1009

4421 +#: builtin/commit.c:1034

4422 msgid "--long and -z are incompatible"

4423 msgstr "--long et -z sont incompatibles"

4424

4249 -#: builtin/commit.c:1039

4425 +#: builtin/commit.c:1064

4426 msgid "Using both --reset-author and --author does not make sense"

4427 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4428

4253 -#: builtin/commit.c:1050

4429 +#: builtin/commit.c:1075

4430 msgid "You have nothing to amend."

4431 msgstr "Il n'y a rien à corriger."

4432

4257 -#: builtin/commit.c:1053

4433 +#: builtin/commit.c:1078

4434 msgid "You are in the middle of a merge -- cannot amend."

4435 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4436

4261 -#: builtin/commit.c:1055

4437 +#: builtin/commit.c:1080

4438 msgid "You are in the middle of a cherry-pick -- cannot amend."

4439 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4440

4265 -#: builtin/commit.c:1058

4441 +#: builtin/commit.c:1083

4442 msgid "Options --squash and --fixup cannot be used together"

4443 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4444

4269 -#: builtin/commit.c:1068

4445 +#: builtin/commit.c:1093

4446 msgid "Only one of -c/-C/-F/--fixup can be used."

4447 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4448

4273 -#: builtin/commit.c:1070

4449 +#: builtin/commit.c:1095

4450 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4451 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4452

4277 -#: builtin/commit.c:1078

4453 +#: builtin/commit.c:1103

4454 msgid "--reset-author can be used only with -C, -c or --amend."

4455 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4456

4281 -#: builtin/commit.c:1095

4457 +#: builtin/commit.c:1120

4458 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4459 msgstr ""

4460 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4461 "être utilisée."

4462

4287 -#: builtin/commit.c:1097

4463 +#: builtin/commit.c:1122

4464 msgid "No paths with --include/--only does not make sense."

4465 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4466

4291 -#: builtin/commit.c:1099

4467 +#: builtin/commit.c:1124

4468 msgid "Clever... amending the last one with dirty index."

4469 msgstr "Malin... correction du dernier avec un index sale."

4470

4295 -#: builtin/commit.c:1101

4471 +#: builtin/commit.c:1126

4472 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4473 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4474

4299 -#: builtin/commit.c:1111 builtin/tag.c:575

4475 +#: builtin/commit.c:1136 builtin/tag.c:572

4476 #, c-format

4477 msgid "Invalid cleanup mode %s"

4478 msgstr "Mode de nettoyage invalide %s"

4479

4304 -#: builtin/commit.c:1116

4480 +#: builtin/commit.c:1141

4481 msgid "Paths with -a does not make sense."

4482 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4483

4308 -#: builtin/commit.c:1222 builtin/commit.c:1455

4484 +#: builtin/commit.c:1251 builtin/commit.c:1482

4485 msgid "show status concisely"

4486 msgstr "afficher le statut avec concision"

4487

4312 -#: builtin/commit.c:1224 builtin/commit.c:1457

4488 +#: builtin/commit.c:1253 builtin/commit.c:1484

4489 msgid "show branch information"

4490 msgstr "afficher l'information de branche"

4491

4316 -#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452

4492 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4493 msgid "machine-readable output"

4494 msgstr "sortie pour traitement automatique"

4495

4320 -#: builtin/commit.c:1229 builtin/commit.c:1461

4496 +#: builtin/commit.c:1258 builtin/commit.c:1488

4497 msgid "show status in long format (default)"

4498 msgstr "afficher le statut en format long (par défaut)"

4499

4324 -#: builtin/commit.c:1232 builtin/commit.c:1464

4500 +#: builtin/commit.c:1261 builtin/commit.c:1491

4501 msgid "terminate entries with NUL"

4502 msgstr "terminer les éléments par NUL"

4503

4328 -#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667

4329 -#: builtin/fast-export.c:670 builtin/tag.c:459

4504 +#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4505 +#: builtin/fast-export.c:677 builtin/tag.c:459

4506 msgid "mode"

4507 msgstr "mode"

4508

4333 -#: builtin/commit.c:1235 builtin/commit.c:1467

4509 +#: builtin/commit.c:1264 builtin/commit.c:1494

4510 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4511 msgstr ""

4512 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4513 "no. (Défaut : all)"

4514

4339 -#: builtin/commit.c:1238

4515 +#: builtin/commit.c:1267

4516 msgid "show ignored files"

4517 msgstr "afficher les fichiers ignorés"

4518

4343 -#: builtin/commit.c:1239 parse-options.h:154

4519 +#: builtin/commit.c:1268 parse-options.h:156

4520 msgid "when"

4521 msgstr "quand"

4522

4347 -#: builtin/commit.c:1240

4523 +#: builtin/commit.c:1269

4524 msgid ""

4525 "ignore changes to submodules, optional when: all, dirty, untracked. "

4526 "(Default: all)"

@@ -4352,217 +4528,217 @@ msgstr ""

4528 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4529 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4530

4355 -#: builtin/commit.c:1242

4531 +#: builtin/commit.c:1271

4532 msgid "list untracked files in columns"

4533 msgstr "afficher les fichiers non suivis en colonnes"

4534

4359 -#: builtin/commit.c:1313

4535 +#: builtin/commit.c:1340

4536 msgid "couldn't look up newly created commit"

4537 msgstr "impossible de retrouver le commit nouvellement créé"

4538

4363 -#: builtin/commit.c:1315

4539 +#: builtin/commit.c:1342

4540 msgid "could not parse newly created commit"

4541 msgstr "impossible d'analyser le commit nouvellement créé"

4542

4367 -#: builtin/commit.c:1356

4543 +#: builtin/commit.c:1383

4544 msgid "detached HEAD"

4545 msgstr "HEAD détachée"

4546

4371 -#: builtin/commit.c:1358

4547 +#: builtin/commit.c:1385

4548 msgid " (root-commit)"

4549 msgstr " (commit racine)"

4550

4375 -#: builtin/commit.c:1425

4551 +#: builtin/commit.c:1452

4552 msgid "suppress summary after successful commit"

4553 msgstr "supprimer le résumé après une validation réussie"

4554

4379 -#: builtin/commit.c:1426

4555 +#: builtin/commit.c:1453

4556 msgid "show diff in commit message template"

4557 msgstr "afficher les diff dans le modèle de message de validation"

4558

4383 -#: builtin/commit.c:1428

4559 +#: builtin/commit.c:1455

4560 msgid "Commit message options"

4561 msgstr "Options du message de validation"

4562

4387 -#: builtin/commit.c:1429 builtin/tag.c:457

4563 +#: builtin/commit.c:1456 builtin/tag.c:457

4564 msgid "read message from file"

4565 msgstr "lire le message depuis un fichier"

4566

4391 -#: builtin/commit.c:1430

4567 +#: builtin/commit.c:1457

4568 msgid "author"

4569 msgstr "auteur"

4570

4395 -#: builtin/commit.c:1430

4571 +#: builtin/commit.c:1457

4572 msgid "override author for commit"

4573 msgstr "remplacer l'auteur pour la validation"

4574

4399 -#: builtin/commit.c:1431 builtin/gc.c:178

4575 +#: builtin/commit.c:1458 builtin/gc.c:260

4576 msgid "date"

4577 msgstr "date"

4578

4403 -#: builtin/commit.c:1431

4579 +#: builtin/commit.c:1458

4580 msgid "override date for commit"

4581 msgstr "remplacer la date pour la validation"

4582

4407 -#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405

4583 +#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4584 #: builtin/notes.c:562 builtin/tag.c:455

4585 msgid "message"

4586 msgstr "message"

4587

4412 -#: builtin/commit.c:1432

4588 +#: builtin/commit.c:1459

4589 msgid "commit message"

4590 msgstr "message de validation"

4591

4416 -#: builtin/commit.c:1433

4592 +#: builtin/commit.c:1460

4593 msgid "reuse and edit message from specified commit"

4594 msgstr "réutiliser et éditer le message du commit spécifié"

4595

4420 -#: builtin/commit.c:1434

4596 +#: builtin/commit.c:1461

4597 msgid "reuse message from specified commit"

4598 msgstr "réutiliser le message du commit spécifié"

4599

4424 -#: builtin/commit.c:1435

4600 +#: builtin/commit.c:1462

4601 msgid "use autosquash formatted message to fixup specified commit"

4602 msgstr ""

4603 "utiliser un message formaté par autosquash pour corriger le commit spécifié"

4604

4429 -#: builtin/commit.c:1436

4605 +#: builtin/commit.c:1463

4606 msgid "use autosquash formatted message to squash specified commit"

4607 msgstr ""

4608 "utiliser un message formaté par autosquash pour compresser le commit spécifié"

4609

4434 -#: builtin/commit.c:1437

4610 +#: builtin/commit.c:1464

4611 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4612 msgstr ""

4613 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4614

4439 -#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111

4615 +#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4616 msgid "add Signed-off-by:"

4617 msgstr "ajouter une entrée Signed-off-by :"

4618

4443 -#: builtin/commit.c:1439

4619 +#: builtin/commit.c:1466

4620 msgid "use specified template file"

4621 msgstr "utiliser le fichier de modèle spécifié"

4622

4447 -#: builtin/commit.c:1440

4623 +#: builtin/commit.c:1467

4624 msgid "force edit of commit"

4625 msgstr "forcer l'édition du commit"

4626

4451 -#: builtin/commit.c:1441

4627 +#: builtin/commit.c:1468

4628 msgid "default"

4629 msgstr "défaut"

4630

4455 -#: builtin/commit.c:1441 builtin/tag.c:460

4631 +#: builtin/commit.c:1468 builtin/tag.c:460

4632 msgid "how to strip spaces and #comments from message"

4633 msgstr "comment éliminer les espaces et les commentaires # du message"

4634

4459 -#: builtin/commit.c:1442

4635 +#: builtin/commit.c:1469

4636 msgid "include status in commit message template"

4637 msgstr "inclure le statut dans le modèle de message de validation"

4638

4463 -#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461

4639 +#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4640 msgid "key id"

4641 msgstr "identifiant de clé"

4642

4467 -#: builtin/commit.c:1444 builtin/merge.c:231

4643 +#: builtin/commit.c:1471 builtin/merge.c:231

4644 msgid "GPG sign commit"

4645 msgstr "signer la validation avec GPG"

4646

4647 #. end commit message options

4472 -#: builtin/commit.c:1447

4648 +#: builtin/commit.c:1474

4649 msgid "Commit contents options"

4650 msgstr "Valider les options des contenus"

4651

4476 -#: builtin/commit.c:1448

4652 +#: builtin/commit.c:1475

4653 msgid "commit all changed files"

4654 msgstr "valider tous les fichiers modifiés"

4655

4480 -#: builtin/commit.c:1449

4656 +#: builtin/commit.c:1476

4657 msgid "add specified files to index for commit"

4658 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4659

4484 -#: builtin/commit.c:1450

4660 +#: builtin/commit.c:1477

4661 msgid "interactively add files"

4662 msgstr "ajouter des fichiers en mode interactif"

4663

4488 -#: builtin/commit.c:1451

4664 +#: builtin/commit.c:1478

4665 msgid "interactively add changes"

4666 msgstr "ajouter les modifications en mode interactif"

4667

4492 -#: builtin/commit.c:1452

4668 +#: builtin/commit.c:1479

4669 msgid "commit only specified files"

4670 msgstr "valider seulement les fichiers spécifiés"

4671

4496 -#: builtin/commit.c:1453

4672 +#: builtin/commit.c:1480

4673 msgid "bypass pre-commit hook"

4674 msgstr "éviter d'utiliser le crochet pre-commit"

4675

4500 -#: builtin/commit.c:1454

4676 +#: builtin/commit.c:1481

4677 msgid "show what would be committed"

4678 msgstr "afficher ce qui serait validé"

4679

4504 -#: builtin/commit.c:1465

4680 +#: builtin/commit.c:1492

4681 msgid "amend previous commit"

4682 msgstr "corriger la validation précédente"

4683

4508 -#: builtin/commit.c:1466

4684 +#: builtin/commit.c:1493

4685 msgid "bypass post-rewrite hook"

4686 msgstr "éviter d'utiliser le crochet post-rewrite"

4687

4512 -#: builtin/commit.c:1471

4688 +#: builtin/commit.c:1498

4689 msgid "ok to record an empty change"

4690 msgstr "accepter d'enregistrer une modification vide"

4691

4516 -#: builtin/commit.c:1474

4692 +#: builtin/commit.c:1500

4693 msgid "ok to record a change with an empty message"

4694 msgstr "accepter d'enregistrer une modification avec un message vide"

4695

4520 -#: builtin/commit.c:1507

4696 +#: builtin/commit.c:1529

4697 msgid "could not parse HEAD commit"

4698 msgstr "impossible d'analyser le commit HEAD"

4699

4524 -#: builtin/commit.c:1545 builtin/merge.c:525

4700 +#: builtin/commit.c:1567 builtin/merge.c:525

4701 #, c-format

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

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

4704

4529 -#: builtin/commit.c:1552

4705 +#: builtin/commit.c:1574

4706 #, c-format

4707 msgid "Corrupt MERGE_HEAD file (%s)"

4708 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4709

4534 -#: builtin/commit.c:1559

4710 +#: builtin/commit.c:1581

4711 msgid "could not read MERGE_MODE"

4712 msgstr "impossible de lire MERGE_MODE"

4713

4538 -#: builtin/commit.c:1578

4714 +#: builtin/commit.c:1600

4715 #, c-format

4716 msgid "could not read commit message: %s"

4717 msgstr "impossible de lire le message de validation : %s"

4718

4543 -#: builtin/commit.c:1592

4719 +#: builtin/commit.c:1614

4720 #, c-format

4721 msgid "Aborting commit; you did not edit the message.\n"

4722 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4723

4548 -#: builtin/commit.c:1597

4724 +#: builtin/commit.c:1619

4725 #, c-format

4726 msgid "Aborting commit due to empty commit message.\n"

4727 msgstr "Abandon de la validation du à un message de validation vide\n"

4728

4553 -#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886

4729 +#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4730 msgid "failed to write commit object"

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

4732

4557 -#: builtin/commit.c:1633

4733 +#: builtin/commit.c:1655

4734 msgid "cannot lock HEAD ref"

4735 msgstr "impossible de verrouiller la référence HEAD"

4736

4561 -#: builtin/commit.c:1637

4737 +#: builtin/commit.c:1659

4738 msgid "cannot update HEAD ref"

4739 msgstr "impossible de mettre à jour la référence HEAD"

4740

4565 -#: builtin/commit.c:1648

4741 +#: builtin/commit.c:1670

4742 msgid ""

4743 "Repository has been updated, but unable to write\n"

4744 "new_index file. Check that disk is not full or quota is\n"

@@ -4572,128 +4748,132 @@ msgstr ""

4748 "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"

4749 "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."

4750

4575 -#: builtin/config.c:7

4751 +#: builtin/config.c:8

4752 msgid "git config [options]"

4753 msgstr "git config [options]"

4754

4579 -#: builtin/config.c:52

4755 +#: builtin/config.c:54

4756 msgid "Config file location"

4757 msgstr "Emplacement du fichier de configuration"

4758

4583 -#: builtin/config.c:53

4759 +#: builtin/config.c:55

4760 msgid "use global config file"

4761 msgstr "utiliser les fichier de configuration global"

4762

4587 -#: builtin/config.c:54

4763 +#: builtin/config.c:56

4764 msgid "use system config file"

4765 msgstr "utiliser le fichier de configuration du système"

4766

4591 -#: builtin/config.c:55

4767 +#: builtin/config.c:57

4768 msgid "use repository config file"

4769 msgstr "utiliser le fichier de configuration du dépôt"

4770

4595 -#: builtin/config.c:56

4771 +#: builtin/config.c:58

4772 msgid "use given config file"

4773 msgstr "utiliser le fichier de configuration spécifié"

4774

4599 -#: builtin/config.c:57

4775 +#: builtin/config.c:59

4776 msgid "blob-id"

4777 msgstr "blob-id"

4778

4603 -#: builtin/config.c:57

4779 +#: builtin/config.c:59

4780 msgid "read config from given blob object"

4781 msgstr "lire la configuration depuis l'objet blob fourni"

4782

4607 -#: builtin/config.c:58

4783 +#: builtin/config.c:60

4784 msgid "Action"

4785 msgstr "Action"

4786

4611 -#: builtin/config.c:59

4787 +#: builtin/config.c:61

4788 msgid "get value: name [value-regex]"

4789 msgstr "obtenir la valeur : nom [regex-de-valeur]"

4790

4615 -#: builtin/config.c:60

4791 +#: builtin/config.c:62

4792 msgid "get all values: key [value-regex]"

4793 msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]"

4794

4619 -#: builtin/config.c:61

4795 +#: builtin/config.c:63

4796 msgid "get values for regexp: name-regex [value-regex]"

4797 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"

4798

4623 -#: builtin/config.c:62

4799 +#: builtin/config.c:64

4800 +msgid "get value specific for the URL: section[.var] URL"

4801 +msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"

4802 +

4803 +#: builtin/config.c:65

4804 msgid "replace all matching variables: name value [value_regex]"

4805 msgstr ""

4806 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"

4807

4628 -#: builtin/config.c:63

4808 +#: builtin/config.c:66

4809 msgid "add a new variable: name value"

4810 msgstr "ajouter une nouvelle variable : nom valeur"

4811

4632 -#: builtin/config.c:64

4812 +#: builtin/config.c:67

4813 msgid "remove a variable: name [value-regex]"

4814 msgstr "supprimer une variable : nom [regex-de-valeur]"

4815

4636 -#: builtin/config.c:65

4816 +#: builtin/config.c:68

4817 msgid "remove all matches: name [value-regex]"

4818 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"

4819

4640 -#: builtin/config.c:66

4820 +#: builtin/config.c:69

4821 msgid "rename section: old-name new-name"

4822 msgstr "renommer une section : ancien-nom nouveau-nom"

4823

4644 -#: builtin/config.c:67

4824 +#: builtin/config.c:70

4825 msgid "remove a section: name"

4826 msgstr "supprimer une section : nom"

4827

4648 -#: builtin/config.c:68

4828 +#: builtin/config.c:71

4829 msgid "list all"

4830 msgstr "afficher tout"

4831

4652 -#: builtin/config.c:69

4832 +#: builtin/config.c:72

4833 msgid "open an editor"

4834 msgstr "ouvrir un éditeur"

4835

4656 -#: builtin/config.c:70 builtin/config.c:71

4836 +#: builtin/config.c:73 builtin/config.c:74

4837 msgid "slot"

4838 msgstr "emplacement"

4839

4660 -#: builtin/config.c:70

4840 +#: builtin/config.c:73

4841 msgid "find the color configured: [default]"

4842 msgstr "trouver la couleur configurée : [par défaut]"

4843

4664 -#: builtin/config.c:71

4844 +#: builtin/config.c:74

4845 msgid "find the color setting: [stdout-is-tty]"

4846 msgstr "trouver le réglage de la couleur : [stdout-est-tty]"

4847

4668 -#: builtin/config.c:72

4848 +#: builtin/config.c:75

4849 msgid "Type"

4850 msgstr "Type"

4851

4672 -#: builtin/config.c:73

4852 +#: builtin/config.c:76

4853 msgid "value is \"true\" or \"false\""

4854 msgstr "la valeur est \"true\" (vrai) our \"false\" (faux)"

4855

4676 -#: builtin/config.c:74

4856 +#: builtin/config.c:77

4857 msgid "value is decimal number"

4858 msgstr "la valeur est un nombre décimal"

4859

4680 -#: builtin/config.c:75

4860 +#: builtin/config.c:78

4861 msgid "value is --bool or --int"

4862 msgstr "la valeur est --bool ou --int"

4863

4684 -#: builtin/config.c:76

4864 +#: builtin/config.c:79

4865 msgid "value is a path (file or directory name)"

4866 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"

4867

4688 -#: builtin/config.c:77

4868 +#: builtin/config.c:80

4869 msgid "Other"

4870 msgstr "Autre"

4871

4692 -#: builtin/config.c:78

4872 +#: builtin/config.c:81

4873 msgid "terminate values with NUL byte"

4874 msgstr "terminer les valeurs avec un caractère NUL"

4875

4696 -#: builtin/config.c:79

4876 +#: builtin/config.c:82

4877 msgid "respect include directives on lookup"

4878 msgstr "respecter les directives d'inclusion lors de la recherche"

4879

@@ -4705,7 +4885,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]"

4885 msgid "print sizes in human readable format"

4886 msgstr "affiche les tailles dans un format humainement lisible"

4887

4708 -#: builtin/describe.c:15

4888 +#: builtin/describe.c:16

4889 msgid "git describe [options] <commit-ish>*"

4890 msgstr "git describe [options] <commit ou apparenté>*"

4891

@@ -4843,7 +5023,7 @@ msgstr "--long et --abbrev=0 sont incompatibles"

5023 msgid "No names found, cannot describe anything."

5024 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."

5025

4846 -#: builtin/describe.c:481

5026 +#: builtin/describe.c:489

5027 msgid "--dirty is incompatible with commit-ishes"

5028 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"

5029

@@ -4880,40 +5060,40 @@ msgstr "objet non géré '%s' spécifié."

5060 msgid "git fast-export [rev-list-opts]"

5061 msgstr "git fast-export [options-de-liste-de-révisions]"

5062

4883 -#: builtin/fast-export.c:666

5063 +#: builtin/fast-export.c:673

5064 msgid "show progress after <n> objects"

5065 msgstr "afficher la progression après <n> objets"

5066

4887 -#: builtin/fast-export.c:668

5067 +#: builtin/fast-export.c:675

5068 msgid "select handling of signed tags"

5069 msgstr "sélectionner la gestion des étiquettes signées"

5070

4891 -#: builtin/fast-export.c:671

5071 +#: builtin/fast-export.c:678

5072 msgid "select handling of tags that tag filtered objects"

5073 msgstr ""

5074 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"

5075

4896 -#: builtin/fast-export.c:674

5076 +#: builtin/fast-export.c:681

5077 msgid "Dump marks to this file"

5078 msgstr "Enregistrer les marques dans ce fichier"

5079

4900 -#: builtin/fast-export.c:676

5080 +#: builtin/fast-export.c:683

5081 msgid "Import marks from this file"

5082 msgstr "importer les marques depuis ce fichier"

5083

4904 -#: builtin/fast-export.c:678

5084 +#: builtin/fast-export.c:685

5085 msgid "Fake a tagger when tags lack one"

5086 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"

5087

4908 -#: builtin/fast-export.c:680

5088 +#: builtin/fast-export.c:687

5089 msgid "Output full tree for each commit"

5090 msgstr "Afficher l'arbre complet pour chaque commit"

5091

4912 -#: builtin/fast-export.c:682

5092 +#: builtin/fast-export.c:689

5093 msgid "Use the done feature to terminate the stream"

5094 msgstr "Utiliser la fonction \"done\" pour terminer le flux"

5095

4916 -#: builtin/fast-export.c:683

5096 +#: builtin/fast-export.c:690

5097 msgid "Skip output of blob data"

5098 msgstr "Sauter l'affichage de données de blob"

5099

@@ -4933,146 +5113,146 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

5113 msgid "git fetch --all [<options>]"

5114 msgstr "git fetch --all [<options>]"

5115

4936 -#: builtin/fetch.c:60

5116 +#: builtin/fetch.c:74

5117 msgid "fetch from all remotes"

5118 msgstr "récupérer depuis tous le dépôts distants"

5119

4940 -#: builtin/fetch.c:62

5120 +#: builtin/fetch.c:76

5121 msgid "append to .git/FETCH_HEAD instead of overwriting"

5122 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

5123

4944 -#: builtin/fetch.c:64

5124 +#: builtin/fetch.c:78

5125 msgid "path to upload pack on remote end"

5126 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

5127

4948 -#: builtin/fetch.c:65

5128 +#: builtin/fetch.c:79

5129 msgid "force overwrite of local branch"

5130 msgstr "forcer l'écrasement de la branche locale"

5131

4952 -#: builtin/fetch.c:67

5132 +#: builtin/fetch.c:81

5133 msgid "fetch from multiple remotes"

5134 msgstr "récupérer depuis plusieurs dépôts distants"

5135

4956 -#: builtin/fetch.c:69

5136 +#: builtin/fetch.c:83

5137 msgid "fetch all tags and associated objects"

5138 msgstr "récupérer toutes les étiquettes et leurs objets associés"

5139

4960 -#: builtin/fetch.c:71

5140 +#: builtin/fetch.c:85

5141 msgid "do not fetch all tags (--no-tags)"

5142 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

5143

4964 -#: builtin/fetch.c:73

5144 +#: builtin/fetch.c:87

5145 msgid "prune remote-tracking branches no longer on remote"

5146 msgstr ""

5147 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

5148 "dépôt distant"

5149

4970 -#: builtin/fetch.c:74

5150 +#: builtin/fetch.c:88

5151 msgid "on-demand"

5152 msgstr "à la demande"

5153

4974 -#: builtin/fetch.c:75

5154 +#: builtin/fetch.c:89

5155 msgid "control recursive fetching of submodules"

5156 msgstr "contrôler la récupération récursive dans les sous-modules"

5157

4978 -#: builtin/fetch.c:79

5158 +#: builtin/fetch.c:93

5159 msgid "keep downloaded pack"

5160 msgstr "conserver le paquet téléchargé"

5161

4982 -#: builtin/fetch.c:81

5162 +#: builtin/fetch.c:95

5163 msgid "allow updating of HEAD ref"

5164 msgstr "permettre la mise à jour de la référence HEAD"

5165

4986 -#: builtin/fetch.c:84

5166 +#: builtin/fetch.c:98

5167 msgid "deepen history of shallow clone"

5168 msgstr "approfondir l'historique d'un clone superficiel"

5169

4990 -#: builtin/fetch.c:86

5170 +#: builtin/fetch.c:100

5171 msgid "convert to a complete repository"

5172 msgstr "convertir en un dépôt complet"

5173

4994 -#: builtin/fetch.c:88 builtin/log.c:1177

5174 +#: builtin/fetch.c:102 builtin/log.c:1197

5175 msgid "dir"

5176 msgstr "dir"

5177

4998 -#: builtin/fetch.c:89

5178 +#: builtin/fetch.c:103

5179 msgid "prepend this to submodule path output"

5180 msgstr "préfixer ceci à la sortie du chemin du sous-module"

5181

5002 -#: builtin/fetch.c:92

5182 +#: builtin/fetch.c:106

5183 msgid "default mode for recursion"

5184 msgstr "mode par défaut pour la récursion"

5185

5006 -#: builtin/fetch.c:220

5186 +#: builtin/fetch.c:236

5187 msgid "Couldn't find remote ref HEAD"

5188 msgstr "impossible de trouver la référence HEAD distante"

5189

5010 -#: builtin/fetch.c:273

5190 +#: builtin/fetch.c:290

5191 #, c-format

5192 msgid "object %s not found"

5193 msgstr "objet %s non trouvé"

5194

5015 -#: builtin/fetch.c:278

5195 +#: builtin/fetch.c:295

5196 msgid "[up to date]"

5197 msgstr "[à jour]"

5198

5019 -#: builtin/fetch.c:292

5199 +#: builtin/fetch.c:309

5200 #, c-format

5201 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5202 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5203

5024 -#: builtin/fetch.c:293 builtin/fetch.c:379

5204 +#: builtin/fetch.c:310 builtin/fetch.c:396

5205 msgid "[rejected]"

5206 msgstr "[rejeté]"

5207

5028 -#: builtin/fetch.c:304

5208 +#: builtin/fetch.c:321

5209 msgid "[tag update]"

5210 msgstr "[mise à jour de l'étiquette]"

5211

5032 -#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

5212 +#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

5213 msgid " (unable to update local ref)"

5214 msgstr " (impossible de mettre à jour la référence locale)"

5215

5036 -#: builtin/fetch.c:324

5216 +#: builtin/fetch.c:341

5217 msgid "[new tag]"

5218 msgstr "[nouvelle étiquette]"

5219

5040 -#: builtin/fetch.c:327

5220 +#: builtin/fetch.c:344

5221 msgid "[new branch]"

5222 msgstr "[nouvelle branche]"

5223

5044 -#: builtin/fetch.c:330

5224 +#: builtin/fetch.c:347

5225 msgid "[new ref]"

5226 msgstr "[nouvelle référence]"

5227

5048 -#: builtin/fetch.c:375

5228 +#: builtin/fetch.c:392

5229 msgid "unable to update local ref"

5230 msgstr "impossible de mettre à jour la référence locale"

5231

5052 -#: builtin/fetch.c:375

5232 +#: builtin/fetch.c:392

5233 msgid "forced update"

5234 msgstr "mise à jour forcée"

5235

5056 -#: builtin/fetch.c:381

5236 +#: builtin/fetch.c:398

5237 msgid "(non-fast-forward)"

5238 msgstr "(pas d'avance rapide)"

5239

5060 -#: builtin/fetch.c:412 builtin/fetch.c:718

5240 +#: builtin/fetch.c:429 builtin/fetch.c:735

5241 #, c-format

5242 msgid "cannot open %s: %s\n"

5243 msgstr "impossible d'ouvrir %s : %s\n"

5244

5065 -#: builtin/fetch.c:421

5245 +#: builtin/fetch.c:438

5246 #, c-format

5247 msgid "%s did not send all necessary objects\n"

5248 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

5249

5070 -#: builtin/fetch.c:520

5250 +#: builtin/fetch.c:537

5251 #, c-format

5252 msgid "From %.*s\n"

5253 msgstr "Depuis %.*s\n"

5254

5075 -#: builtin/fetch.c:531

5255 +#: builtin/fetch.c:548

5256 #, c-format

5257 msgid ""

5258 "some local refs could not be updated; try running\n"

@@ -5081,55 +5261,55 @@ msgstr ""

5261 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

5262 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

5263

5084 -#: builtin/fetch.c:581

5264 +#: builtin/fetch.c:598

5265 #, c-format

5266 msgid " (%s will become dangling)"

5267 msgstr " (%s sera en suspens)"

5268

5089 -#: builtin/fetch.c:582

5269 +#: builtin/fetch.c:599

5270 #, c-format

5271 msgid " (%s has become dangling)"

5272 msgstr " (%s est devenu en suspens)"

5273

5094 -#: builtin/fetch.c:589

5274 +#: builtin/fetch.c:606

5275 msgid "[deleted]"

5276 msgstr "[supprimé]"

5277

5098 -#: builtin/fetch.c:590 builtin/remote.c:1055

5278 +#: builtin/fetch.c:607 builtin/remote.c:1055

5279 msgid "(none)"

5280 msgstr "(aucun(e))"

5281

5102 -#: builtin/fetch.c:708

5282 +#: builtin/fetch.c:725

5283 #, c-format

5284 msgid "Refusing to fetch into current branch %s of non-bare repository"

5285 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

5286

5107 -#: builtin/fetch.c:742

5108 -#, c-format

5109 -msgid "Don't know how to fetch from %s"

5110 -msgstr "Je ne sais pas récupérer depuis %s"

5111 -

5112 -#: builtin/fetch.c:823

5287 +#: builtin/fetch.c:744

5288 #, c-format

5289 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5290 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

5291

5117 -#: builtin/fetch.c:826

5292 +#: builtin/fetch.c:747

5293 #, c-format

5294 msgid "Option \"%s\" is ignored for %s\n"

5295 msgstr "L'option \"%s\" est ignorée pour %s\n"

5296

5122 -#: builtin/fetch.c:928

5297 +#: builtin/fetch.c:801

5298 +#, c-format

5299 +msgid "Don't know how to fetch from %s"

5300 +msgstr "Je ne sais pas récupérer depuis %s"

5301 +

5302 +#: builtin/fetch.c:976

5303 #, c-format

5304 msgid "Fetching %s\n"

5305 msgstr "Récupération de %s\n"

5306

5127 -#: builtin/fetch.c:930 builtin/remote.c:100

5307 +#: builtin/fetch.c:978 builtin/remote.c:100

5308 #, c-format

5309 msgid "Could not fetch %s"

5310 msgstr "Impossible de récupérer %s"

5311

5132 -#: builtin/fetch.c:949

5312 +#: builtin/fetch.c:997

5313 msgid ""

5314 "No remote repository specified. Please, specify either a URL or a\n"

5315 "remote name from which new revisions should be fetched."

@@ -5137,32 +5317,32 @@ msgstr ""

5317 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

5318 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

5319

5140 -#: builtin/fetch.c:969

5320 +#: builtin/fetch.c:1020

5321 msgid "You need to specify a tag name."

5322 msgstr "Vous devez spécifier un nom d'étiquette."

5323

5144 -#: builtin/fetch.c:1015

5324 +#: builtin/fetch.c:1068

5325 msgid "--depth and --unshallow cannot be used together"

5326 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

5327

5148 -#: builtin/fetch.c:1017

5328 +#: builtin/fetch.c:1070

5329 msgid "--unshallow on a complete repository does not make sense"

5330 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

5331

5152 -#: builtin/fetch.c:1036

5332 +#: builtin/fetch.c:1089

5333 msgid "fetch --all does not take a repository argument"

5334 msgstr "fetch --all n'accepte pas d'argument de dépôt"

5335

5156 -#: builtin/fetch.c:1038

5336 +#: builtin/fetch.c:1091

5337 msgid "fetch --all does not make sense with refspecs"

5338 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

5339

5160 -#: builtin/fetch.c:1049

5340 +#: builtin/fetch.c:1102

5341 #, c-format

5342 msgid "No such remote or remote group: %s"

5343 msgstr "distant ou groupe distant inexistant : %s"

5344

5165 -#: builtin/fetch.c:1057

5345 +#: builtin/fetch.c:1110

5346 msgid "Fetching a group and specifying refspecs does not make sense"

5347 msgstr ""

5348 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -5173,9 +5353,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5353 msgstr ""

5354 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"

5355

5176 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5177 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

5178 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

5356 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5357 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

5358 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5359 msgid "n"

5360 msgstr "n"

5361

@@ -5199,118 +5379,122 @@ msgstr "utiliser <texte> comme début de message"

5379 msgid "file to read from"

5380 msgstr "fichier d'où lire"

5381

5202 -#: builtin/for-each-ref.c:979

5382 +#: builtin/for-each-ref.c:995

5383 msgid "git for-each-ref [options] [<pattern>]"

5384 msgstr "git for-each-ref [options] [<motif>]"

5385

5206 -#: builtin/for-each-ref.c:994

5386 +#: builtin/for-each-ref.c:1010

5387 msgid "quote placeholders suitably for shells"

5388 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

5389

5210 -#: builtin/for-each-ref.c:996

5390 +#: builtin/for-each-ref.c:1012

5391 msgid "quote placeholders suitably for perl"

5392 msgstr "échapper les champs réservés pour perl"

5393

5214 -#: builtin/for-each-ref.c:998

5394 +#: builtin/for-each-ref.c:1014

5395 msgid "quote placeholders suitably for python"

5396 msgstr "échapper les champs réservés pour python"

5397

5218 -#: builtin/for-each-ref.c:1000

5398 +#: builtin/for-each-ref.c:1016

5399 msgid "quote placeholders suitably for tcl"

5400 msgstr "échapper les champs réservés pour tcl"

5401

5222 -#: builtin/for-each-ref.c:1003

5402 +#: builtin/for-each-ref.c:1019

5403 msgid "show only <n> matched refs"

5404 msgstr "n'afficher que <n> références correspondant"

5405

5226 -#: builtin/for-each-ref.c:1004

5406 +#: builtin/for-each-ref.c:1020

5407 msgid "format"

5408 msgstr "format"

5409

5230 -#: builtin/for-each-ref.c:1004

5410 +#: builtin/for-each-ref.c:1020

5411 msgid "format to use for the output"

5412 msgstr "format à utiliser pour la sortie"

5413

5234 -#: builtin/for-each-ref.c:1005

5414 +#: builtin/for-each-ref.c:1021

5415 msgid "key"

5416 msgstr "clé"

5417

5238 -#: builtin/for-each-ref.c:1006

5418 +#: builtin/for-each-ref.c:1022

5419 msgid "field name to sort on"

5420 msgstr "nom du champ servant à trier"

5421

5242 -#: builtin/fsck.c:608

5422 +#: builtin/fsck.c:607

5423 msgid "git fsck [options] [<object>...]"

5424 msgstr "git fsck [options] [<objet>...]"

5425

5246 -#: builtin/fsck.c:614

5426 +#: builtin/fsck.c:613

5427 msgid "show unreachable objects"

5428 msgstr "afficher les objets inaccessibles"

5429

5250 -#: builtin/fsck.c:615

5430 +#: builtin/fsck.c:614

5431 msgid "show dangling objects"

5432 msgstr "afficher les objets en suspens"

5433

5254 -#: builtin/fsck.c:616

5434 +#: builtin/fsck.c:615

5435 msgid "report tags"

5436 msgstr "afficher les étiquettes"

5437

5258 -#: builtin/fsck.c:617

5438 +#: builtin/fsck.c:616

5439 msgid "report root nodes"

5440 msgstr "signaler les nœuds racines"

5441

5262 -#: builtin/fsck.c:618

5442 +#: builtin/fsck.c:617

5443 msgid "make index objects head nodes"

5444 msgstr "considérer les objets de l'index comme nœuds tête"

5445

5446 # translated from man page

5267 -#: builtin/fsck.c:619

5447 +#: builtin/fsck.c:618

5448 msgid "make reflogs head nodes (default)"

5449 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

5450

5271 -#: builtin/fsck.c:620

5451 +#: builtin/fsck.c:619

5452 msgid "also consider packs and alternate objects"

5453 msgstr "inspecter aussi les objets pack et alternatifs"

5454

5275 -#: builtin/fsck.c:621

5455 +#: builtin/fsck.c:620

5456 msgid "enable more strict checking"

5457 msgstr "activer une vérification plus strict"

5458

5279 -#: builtin/fsck.c:623

5459 +#: builtin/fsck.c:622

5460 msgid "write dangling objects in .git/lost-found"

5461 msgstr "écrire les objets en suspens dans .git/lost-found"

5462

5283 -#: builtin/fsck.c:624 builtin/prune.c:134

5463 +#: builtin/fsck.c:623 builtin/prune.c:134

5464 msgid "show progress"

5465 msgstr "afficher la progression"

5466

5287 -#: builtin/gc.c:22

5467 +#: builtin/gc.c:23

5468 msgid "git gc [options]"

5469 msgstr "git gc [options]"

5470

5291 -#: builtin/gc.c:63

5471 +#: builtin/gc.c:79

5472 #, c-format

5473 msgid "Invalid %s: '%s'"

5474 msgstr "%s invalide : '%s'"

5475

5296 -#: builtin/gc.c:90

5476 +#: builtin/gc.c:106

5477 #, c-format

5478 msgid "insanely long object directory %.*s"

5479 msgstr "objet répertoire démentiellement long %.*s"

5480

5301 -#: builtin/gc.c:179

5481 +#: builtin/gc.c:261

5482 msgid "prune unreferenced objects"

5483 msgstr "éliminer les objets non référencés"

5484

5305 -#: builtin/gc.c:181

5485 +#: builtin/gc.c:263

5486 msgid "be more thorough (increased runtime)"

5487 msgstr "être plus consciencieux (durée de traitement allongée)"

5488

5309 -#: builtin/gc.c:182

5489 +#: builtin/gc.c:264

5490 msgid "enable auto-gc mode"

5491 msgstr "activer le mode auto-gc"

5492

5313 -#: builtin/gc.c:222

5493 +#: builtin/gc.c:265

5494 +msgid "force running gc even if there may be another gc running"

5495 +msgstr "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes tourne déjà"

5496 +

5497 +#: builtin/gc.c:305

5498 #, c-format

5499 msgid ""

5500 "Auto packing the repository for optimum performance. You may also\n"

@@ -5321,43 +5505,50 @@ msgstr ""

5505 "lancer \"git gc\" manuellement. Voir \"git help gc\" pour plus "

5506 "d'information.\n"

5507

5324 -#: builtin/gc.c:249

5508 +#. be quiet on --auto

5509 +#: builtin/gc.c:315

5510 +#, c-format

5511 +msgid ""

5512 +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5513 +msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)"

5514 +

5515 +#: builtin/gc.c:340

5516 msgid ""

5517 "There are too many unreachable loose objects; run 'git prune' to remove them."

5518 msgstr ""

5519 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "

5520 "supprimer."

5521

5331 -#: builtin/grep.c:22

5522 +#: builtin/grep.c:23

5523 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5524 msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]"

5525

5335 -#: builtin/grep.c:217

5526 +#: builtin/grep.c:218

5527 #, c-format

5528 msgid "grep: failed to create thread: %s"

5529 msgstr "grep : échec de création du fil: %s"

5530

5340 -#: builtin/grep.c:364

5531 +#: builtin/grep.c:365

5532 #, c-format

5533 msgid "Failed to chdir: %s"

5534 msgstr "Échec de chdir: %s"

5535

5345 -#: builtin/grep.c:442 builtin/grep.c:477

5536 +#: builtin/grep.c:443 builtin/grep.c:478

5537 #, c-format

5538 msgid "unable to read tree (%s)"

5539 msgstr "impossible de lire l'arbre (%s)"

5540

5350 -#: builtin/grep.c:492

5541 +#: builtin/grep.c:493

5542 #, c-format

5543 msgid "unable to grep from object of type %s"

5544 msgstr "impossible de faire un grep sur un objet de type %s"

5545

5355 -#: builtin/grep.c:550

5546 +#: builtin/grep.c:551

5547 #, c-format

5548 msgid "switch `%c' expects a numerical value"

5549 msgstr "l'option '%c' attend un valeur numérique"

5550

5360 -#: builtin/grep.c:567

5551 +#: builtin/grep.c:568

5552 #, c-format

5553 msgid "cannot open '%s'"

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

@@ -5399,167 +5590,171 @@ msgid "don't match patterns in binary files"

5590 msgstr "ne pas chercher les motifs dans les fichiers binaires"

5591

5592 #: builtin/grep.c:662

5593 +msgid "process binary files with textconv filters"

5594 +msgstr "traiter les fichiers binaires avec les filtres textconv"

5595 +

5596 +#: builtin/grep.c:664

5597 msgid "descend at most <depth> levels"

5598 msgstr "descendre au plus de <profondeur> dans l'arborescence"

5599

5405 -#: builtin/grep.c:666

5600 +#: builtin/grep.c:668

5601 msgid "use extended POSIX regular expressions"

5602 msgstr "utiliser des expressions régulières étendues POSIX"

5603

5409 -#: builtin/grep.c:669

5604 +#: builtin/grep.c:671

5605 msgid "use basic POSIX regular expressions (default)"

5606 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

5607

5413 -#: builtin/grep.c:672

5608 +#: builtin/grep.c:674

5609 msgid "interpret patterns as fixed strings"

5610 msgstr "interpréter les motifs comme de chaînes fixes"

5611

5417 -#: builtin/grep.c:675

5612 +#: builtin/grep.c:677

5613 msgid "use Perl-compatible regular expressions"

5614 msgstr "utiliser des expressions régulières compatibles avec Perl"

5615

5421 -#: builtin/grep.c:678

5616 +#: builtin/grep.c:680

5617 msgid "show line numbers"

5618 msgstr "afficher les numéros de ligne"

5619

5425 -#: builtin/grep.c:679

5620 +#: builtin/grep.c:681

5621 msgid "don't show filenames"

5622 msgstr "ne pas pas afficher les noms de fichier"

5623

5429 -#: builtin/grep.c:680

5624 +#: builtin/grep.c:682

5625 msgid "show filenames"

5626 msgstr "afficher les noms de fichier"

5627

5433 -#: builtin/grep.c:682

5628 +#: builtin/grep.c:684

5629 msgid "show filenames relative to top directory"

5630 msgstr "afficher les noms de fichiers relativement au répertoire de base"

5631

5437 -#: builtin/grep.c:684

5632 +#: builtin/grep.c:686

5633 msgid "show only filenames instead of matching lines"

5634 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

5635

5441 -#: builtin/grep.c:686

5636 +#: builtin/grep.c:688

5637 msgid "synonym for --files-with-matches"

5638 msgstr "synonyme pour --files-with-matches"

5639

5445 -#: builtin/grep.c:689

5640 +#: builtin/grep.c:691

5641 msgid "show only the names of files without match"

5642 msgstr "n'afficher que les noms des fichiers sans correspondance"

5643

5449 -#: builtin/grep.c:691

5644 +#: builtin/grep.c:693

5645 msgid "print NUL after filenames"

5646 msgstr "imprimer une caractère NUL après le noms de fichier"

5647

5453 -#: builtin/grep.c:693

5648 +#: builtin/grep.c:695

5649 msgid "show the number of matches instead of matching lines"

5650 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

5651

5457 -#: builtin/grep.c:694

5652 +#: builtin/grep.c:696

5653 msgid "highlight matches"

5654 msgstr "mettre en évidence les correspondances"

5655

5461 -#: builtin/grep.c:696

5656 +#: builtin/grep.c:698

5657 msgid "print empty line between matches from different files"

5658 msgstr ""

5659 "imprimer une ligne vide entre les correspondances de fichiers différents"

5660

5466 -#: builtin/grep.c:698

5661 +#: builtin/grep.c:700

5662 msgid "show filename only once above matches from same file"

5663 msgstr ""

5664 "afficher le nom de fichier une fois au dessus des correspondances du même "

5665 "fichier"

5666

5472 -#: builtin/grep.c:701

5667 +#: builtin/grep.c:703

5668 msgid "show <n> context lines before and after matches"

5669 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

5670

5476 -#: builtin/grep.c:704

5671 +#: builtin/grep.c:706

5672 msgid "show <n> context lines before matches"

5673 msgstr "afficher <n> lignes de contexte avant les correspondances"

5674

5480 -#: builtin/grep.c:706

5675 +#: builtin/grep.c:708

5676 msgid "show <n> context lines after matches"

5677 msgstr "afficher <n> lignes de contexte après les correspondances"

5678

5484 -#: builtin/grep.c:707

5679 +#: builtin/grep.c:709

5680 msgid "shortcut for -C NUM"

5681 msgstr "raccourci pour -C NUM"

5682

5488 -#: builtin/grep.c:710

5683 +#: builtin/grep.c:712

5684 msgid "show a line with the function name before matches"

5685 msgstr ""

5686 "afficher une ligne avec le nom de la fonction avant les correspondances"

5687

5493 -#: builtin/grep.c:712

5688 +#: builtin/grep.c:714

5689 msgid "show the surrounding function"

5690 msgstr "afficher la fonction contenante"

5691

5497 -#: builtin/grep.c:715

5692 +#: builtin/grep.c:717

5693 msgid "read patterns from file"

5694 msgstr "lire les motifs depuis fichier"

5695

5501 -#: builtin/grep.c:717

5696 +#: builtin/grep.c:719

5697 msgid "match <pattern>"

5698 msgstr "rechercher <motif>"

5699

5505 -#: builtin/grep.c:719

5700 +#: builtin/grep.c:721

5701 msgid "combine patterns specified with -e"

5702 msgstr "combiner les motifs spécifiés par -e"

5703

5509 -#: builtin/grep.c:731

5704 +#: builtin/grep.c:733

5705 msgid "indicate hit with exit status without output"

5706 msgstr ""

5707 "indiquer des correspondances avec le code de sortie mais sans rien afficher"

5708

5514 -#: builtin/grep.c:733

5709 +#: builtin/grep.c:735

5710 msgid "show only matches from files that match all patterns"

5711 msgstr ""

5712 "n'afficher que les correspondances de fichiers qui correspondent à tous les "

5713 "motifs"

5714

5520 -#: builtin/grep.c:735

5715 +#: builtin/grep.c:737

5716 msgid "show parse tree for grep expression"

5717 msgstr "afficher l'arbre d'analyse pour le motif grep"

5718

5524 -#: builtin/grep.c:739

5719 +#: builtin/grep.c:741

5720 msgid "pager"

5721 msgstr "pagineur"

5722

5528 -#: builtin/grep.c:739

5723 +#: builtin/grep.c:741

5724 msgid "show matching files in the pager"

5725 msgstr "afficher les fichiers correspondant dans le pagineur"

5726

5532 -#: builtin/grep.c:742

5727 +#: builtin/grep.c:744

5728 msgid "allow calling of grep(1) (ignored by this build)"

5729 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

5730

5536 -#: builtin/grep.c:743 builtin/show-ref.c:188

5731 +#: builtin/grep.c:745 builtin/show-ref.c:187

5732 msgid "show usage"

5733 msgstr "afficher l'usage"

5734

5540 -#: builtin/grep.c:810

5735 +#: builtin/grep.c:812

5736 msgid "no pattern given."

5737 msgstr "aucun motif fourni."

5738

5544 -#: builtin/grep.c:865

5739 +#: builtin/grep.c:870

5740 msgid "--open-files-in-pager only works on the worktree"

5741 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"

5742

5548 -#: builtin/grep.c:888

5743 +#: builtin/grep.c:893

5744 msgid "--cached or --untracked cannot be used with --no-index."

5745 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."

5746

5552 -#: builtin/grep.c:893

5747 +#: builtin/grep.c:898

5748 msgid "--no-index or --untracked cannot be used with revs."

5749 msgstr ""

5750 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."

5751

5557 -#: builtin/grep.c:896

5752 +#: builtin/grep.c:901

5753 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5754 msgstr ""

5755 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."

5756

5562 -#: builtin/grep.c:904

5757 +#: builtin/grep.c:909

5758 msgid "both --cached and trees are given."

5759 msgstr "--cached et des arbres sont fournis en même temps."

5760

@@ -5815,8 +6010,8 @@ msgstr "grave incohérence dans la décompression (inflate)"

6010 msgid "SHA1 COLLISION FOUND WITH %s !"

6011 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6012

5818 -#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5819 -#: builtin/pack-objects.c:262

6013 +#: builtin/index-pack.c:669 builtin/pack-objects.c:171

6014 +#: builtin/pack-objects.c:263

6015 #, c-format

6016 msgid "unable to read %s"

6017 msgstr "impossible de lire %s"

@@ -5845,156 +6040,156 @@ msgstr "Erreur dans l'objet"

6040 msgid "Not all child objects of %s are reachable"

6041 msgstr "Tous les objets enfants de %s ne sont pas accessibles"

6042

5848 -#: builtin/index-pack.c:838 builtin/index-pack.c:868

6043 +#: builtin/index-pack.c:839 builtin/index-pack.c:869

6044 msgid "failed to apply delta"

6045 msgstr "échec d'application du delta"

6046

5852 -#: builtin/index-pack.c:1009

6047 +#: builtin/index-pack.c:1010

6048 msgid "Receiving objects"

6049 msgstr "Réception d'objets"

6050

5856 -#: builtin/index-pack.c:1009

6051 +#: builtin/index-pack.c:1010

6052 msgid "Indexing objects"

6053 msgstr "Indexation d'objets"

6054

5860 -#: builtin/index-pack.c:1035

6055 +#: builtin/index-pack.c:1036

6056 msgid "pack is corrupted (SHA1 mismatch)"

6057 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"

6058

5864 -#: builtin/index-pack.c:1040

6059 +#: builtin/index-pack.c:1041

6060 msgid "cannot fstat packfile"

6061 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"

6062

5868 -#: builtin/index-pack.c:1043

6063 +#: builtin/index-pack.c:1044

6064 msgid "pack has junk at the end"

6065 msgstr "le paquet est invalide à la fin"

6066

5872 -#: builtin/index-pack.c:1054

6067 +#: builtin/index-pack.c:1055

6068 msgid "confusion beyond insanity in parse_pack_objects()"

6069 msgstr "confusion extrême dans parse_pack_objects()"

6070

5876 -#: builtin/index-pack.c:1077

6071 +#: builtin/index-pack.c:1078

6072 msgid "Resolving deltas"

6073 msgstr "Résolution des deltas"

6074

5880 -#: builtin/index-pack.c:1087

6075 +#: builtin/index-pack.c:1088

6076 #, c-format

6077 msgid "unable to create thread: %s"

6078 msgstr "impossible de créer le fil : %s"

6079

5885 -#: builtin/index-pack.c:1129

6080 +#: builtin/index-pack.c:1130

6081 msgid "confusion beyond insanity"

6082 msgstr "confusion extrême"

6083

5889 -#: builtin/index-pack.c:1137

6084 +#: builtin/index-pack.c:1138

6085 #, c-format

6086 msgid "completed with %d local objects"

6087 msgstr "complété avec %d objets locaux"

6088

5894 -#: builtin/index-pack.c:1147

6089 +#: builtin/index-pack.c:1148

6090 #, c-format

6091 msgid "Unexpected tail checksum for %s (disk corruption?)"

6092 msgstr ""

6093 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"

6094

5900 -#: builtin/index-pack.c:1151

6095 +#: builtin/index-pack.c:1152

6096 #, c-format

6097 msgid "pack has %d unresolved delta"

6098 msgid_plural "pack has %d unresolved deltas"

6099 msgstr[0] "le paquet a %d delta non résolu"

6100 msgstr[1] "le paquet a %d deltas non résolus"

6101

5907 -#: builtin/index-pack.c:1176

6102 +#: builtin/index-pack.c:1177

6103 #, c-format

6104 msgid "unable to deflate appended object (%d)"

6105 msgstr "impossible de compresser l'objet ajouté (%d)"

6106

5912 -#: builtin/index-pack.c:1255

6107 +#: builtin/index-pack.c:1256

6108 #, c-format

6109 msgid "local object %s is corrupt"

6110 msgstr "l'objet local %s est corrompu"

6111

5917 -#: builtin/index-pack.c:1279

6112 +#: builtin/index-pack.c:1280

6113 msgid "error while closing pack file"

6114 msgstr "erreur en fermeture du fichier paquet"

6115

5921 -#: builtin/index-pack.c:1292

6116 +#: builtin/index-pack.c:1293

6117 #, c-format

6118 msgid "cannot write keep file '%s'"

6119 msgstr "impossible d'écrire le fichier \"keep\" '%s'"

6120

5926 -#: builtin/index-pack.c:1300

6121 +#: builtin/index-pack.c:1301

6122 #, c-format

6123 msgid "cannot close written keep file '%s'"

6124 msgstr "impossible de fermer le fichier \"keep\" '%s'"

6125

5931 -#: builtin/index-pack.c:1313

6126 +#: builtin/index-pack.c:1314

6127 msgid "cannot store pack file"

6128 msgstr "impossible de stocker le fichier paquet"

6129

5935 -#: builtin/index-pack.c:1324

6130 +#: builtin/index-pack.c:1325

6131 msgid "cannot store index file"

6132 msgstr "impossible de stocker le fichier d'index"

6133

5939 -#: builtin/index-pack.c:1357

6134 +#: builtin/index-pack.c:1358

6135 #, c-format

6136 msgid "bad pack.indexversion=%<PRIu32>"

6137 msgstr "mauvais pack.indexversion=%<PRIu32>"

6138

5944 -#: builtin/index-pack.c:1363

6139 +#: builtin/index-pack.c:1364

6140 #, c-format

6141 msgid "invalid number of threads specified (%d)"

6142 msgstr "nombre de fils spécifié invalide (%d)"

6143

5949 -#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

6144 +#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

6145 #, c-format

6146 msgid "no threads support, ignoring %s"

6147 msgstr "pas de support des fils, ignore %s"

6148

5954 -#: builtin/index-pack.c:1425

6149 +#: builtin/index-pack.c:1426

6150 #, c-format

6151 msgid "Cannot open existing pack file '%s'"

6152 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"

6153

5959 -#: builtin/index-pack.c:1427

6154 +#: builtin/index-pack.c:1428

6155 #, c-format

6156 msgid "Cannot open existing pack idx file for '%s'"

6157 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"

6158

5964 -#: builtin/index-pack.c:1474

6159 +#: builtin/index-pack.c:1475

6160 #, c-format

6161 msgid "non delta: %d object"

6162 msgid_plural "non delta: %d objects"

6163 msgstr[0] "pas un delta : %d objet"

6164 msgstr[1] "pas un delta : %d objets"

6165

5971 -#: builtin/index-pack.c:1481

6166 +#: builtin/index-pack.c:1482

6167 #, c-format

6168 msgid "chain length = %d: %lu object"

6169 msgid_plural "chain length = %d: %lu objects"

6170 msgstr[0] "longueur chaînée = %d : %lu objet"

6171 msgstr[1] "longueur chaînée = %d : %lu objets"

6172

5978 -#: builtin/index-pack.c:1509

6173 +#: builtin/index-pack.c:1510

6174 msgid "Cannot come back to cwd"

6175 msgstr "Impossible de revenir au répertoire de travail courant"

6176

5982 -#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5983 -#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

6177 +#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6178 +#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6179 #, c-format

6180 msgid "bad %s"

6181 msgstr "mauvais %s"

6182

5988 -#: builtin/index-pack.c:1590

6183 +#: builtin/index-pack.c:1591

6184 msgid "--fix-thin cannot be used without --stdin"

6185 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

6186

5992 -#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

6187 +#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6188 #, c-format

6189 msgid "packfile name '%s' does not end with '.pack'"

6190 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"

6191

5997 -#: builtin/index-pack.c:1613

6192 +#: builtin/index-pack.c:1614

6193 msgid "--verify with no packfile name given"

6194 msgstr "--verify sans nom de fichier paquet donné"

6195

@@ -6084,11 +6279,6 @@ msgstr "impossible de traiter le fichier de type %d"

6279 msgid "unable to move %s to %s"

6280 msgstr "impossible de déplacer %s vers %s"

6281

6087 -#: builtin/init-db.c:363

6088 -#, c-format

6089 -msgid "Could not create git link %s"

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

6091 -

6282 #.

6283 #. * TRANSLATORS: The first '%s' is either "Reinitialized

6284 #. * existing" or "Initialized empty", the second " shared" or

@@ -6131,7 +6321,7 @@ msgstr "permissions"

6321 msgid "specify that the git repository is to be shared amongst several users"

6322 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"

6323

6134 -#: builtin/init-db.c:493 builtin/prune-packed.c:75

6324 +#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

6325 msgid "be quiet"

6326 msgstr "être silencieux"

6327

@@ -6171,248 +6361,248 @@ msgstr "git log [<options>] [<page de révisions>] [[--] <chemin>...]\n"

6361 msgid " or: git show [options] <object>..."

6362 msgstr " ou : git show [options] <objet>..."

6363

6174 -#: builtin/log.c:124

6364 +#: builtin/log.c:125

6365 msgid "suppress diff output"

6366 msgstr "supprimer la sortie des différences"

6367

6178 -#: builtin/log.c:125

6368 +#: builtin/log.c:126

6369 msgid "show source"

6370 msgstr "afficher la source"

6371

6182 -#: builtin/log.c:126

6372 +#: builtin/log.c:127

6373 msgid "Use mail map file"

6374 msgstr "Utiliser le fichier de correspondance de mail"

6375

6186 -#: builtin/log.c:127

6376 +#: builtin/log.c:128

6377 msgid "decorate options"

6378 msgstr "décorer les options"

6379

6190 -#: builtin/log.c:230

6380 +#: builtin/log.c:231

6381 #, c-format

6382 msgid "Final output: %d %s\n"

6383 msgstr "Sortie finale : %d %s\n"

6384

6195 -#: builtin/log.c:453 builtin/log.c:545

6385 +#: builtin/log.c:473 builtin/log.c:565

6386 #, c-format

6387 msgid "Could not read object %s"

6388 msgstr "Impossible de lire l'objet %s"

6389

6200 -#: builtin/log.c:569

6390 +#: builtin/log.c:589

6391 #, c-format

6392 msgid "Unknown type: %d"

6393 msgstr "Type inconnu : %d"

6394

6205 -#: builtin/log.c:669

6395 +#: builtin/log.c:689

6396 msgid "format.headers without value"

6397 msgstr "format.headers sans valeur"

6398

6209 -#: builtin/log.c:751

6399 +#: builtin/log.c:771

6400 msgid "name of output directory is too long"

6401 msgstr "le nom du répertoire de sortie est trop long"

6402

6213 -#: builtin/log.c:767

6403 +#: builtin/log.c:787

6404 #, c-format

6405 msgid "Cannot open patch file %s"

6406 msgstr "Impossible d'ouvrir le fichier correctif %s"

6407

6218 -#: builtin/log.c:781

6408 +#: builtin/log.c:801

6409 msgid "Need exactly one range."

6410 msgstr "Exactement une plage nécessaire."

6411

6222 -#: builtin/log.c:789

6412 +#: builtin/log.c:809

6413 msgid "Not a range."

6414 msgstr "Pas une plage."

6415

6226 -#: builtin/log.c:891

6416 +#: builtin/log.c:911

6417 msgid "Cover letter needs email format"

6418 msgstr "La lettre de motivation doit être au format e-mail"

6419

6230 -#: builtin/log.c:967

6420 +#: builtin/log.c:987

6421 #, c-format

6422 msgid "insane in-reply-to: %s"

6423 msgstr "in-reply-to aberrant : %s"

6424

6235 -#: builtin/log.c:995

6425 +#: builtin/log.c:1015

6426 msgid "git format-patch [options] [<since> | <revision range>]"

6427 msgstr "git format-patch [options] [<depuis> | <plage de révisions>]"

6428

6239 -#: builtin/log.c:1040

6429 +#: builtin/log.c:1060

6430 msgid "Two output directories?"

6431 msgstr "Deux répertoires de sortie ?"

6432

6243 -#: builtin/log.c:1155

6433 +#: builtin/log.c:1175

6434 msgid "use [PATCH n/m] even with a single patch"

6435 msgstr "utiliser [PATCH n/m] même avec un patch unique"

6436

6247 -#: builtin/log.c:1158

6437 +#: builtin/log.c:1178

6438 msgid "use [PATCH] even with multiple patches"

6439 msgstr "utiliser [PATCH] même avec des patchs multiples"

6440

6251 -#: builtin/log.c:1162

6441 +#: builtin/log.c:1182

6442 msgid "print patches to standard out"

6443 msgstr "afficher les patchs sur la sortie standard"

6444

6255 -#: builtin/log.c:1164

6445 +#: builtin/log.c:1184

6446 msgid "generate a cover letter"

6447 msgstr "générer une lettre de motivation"

6448

6259 -#: builtin/log.c:1166

6449 +#: builtin/log.c:1186

6450 msgid "use simple number sequence for output file names"

6451 msgstr ""

6452 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"

6453

6264 -#: builtin/log.c:1167

6454 +#: builtin/log.c:1187

6455 msgid "sfx"

6456 msgstr "sfx"

6457

6268 -#: builtin/log.c:1168

6458 +#: builtin/log.c:1188

6459 msgid "use <sfx> instead of '.patch'"

6460 msgstr "utiliser <sfx> au lieu de '.patch'"

6461

6272 -#: builtin/log.c:1170

6462 +#: builtin/log.c:1190

6463 msgid "start numbering patches at <n> instead of 1"

6464 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"

6465

6276 -#: builtin/log.c:1172

6466 +#: builtin/log.c:1192

6467 msgid "mark the series as Nth re-roll"

6468 msgstr "marquer la série comme une Nième réédition"

6469

6280 -#: builtin/log.c:1174

6470 +#: builtin/log.c:1194

6471 msgid "Use [<prefix>] instead of [PATCH]"

6472 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"

6473

6284 -#: builtin/log.c:1177

6474 +#: builtin/log.c:1197

6475 msgid "store resulting files in <dir>"

6476 msgstr "stocker les fichiers résultats dans <répertoire>"

6477

6288 -#: builtin/log.c:1180

6478 +#: builtin/log.c:1200

6479 msgid "don't strip/add [PATCH]"

6480 msgstr "ne pas retirer/ajouter [PATCH]"

6481

6292 -#: builtin/log.c:1183

6482 +#: builtin/log.c:1203

6483 msgid "don't output binary diffs"

6484 msgstr "ne pas imprimer les diffs binaires"

6485

6296 -#: builtin/log.c:1185

6486 +#: builtin/log.c:1205

6487 msgid "don't include a patch matching a commit upstream"

6488 msgstr "ne pas inclure un patch correspondant à un commit amont"

6489

6300 -#: builtin/log.c:1187

6490 +#: builtin/log.c:1207

6491 msgid "show patch format instead of default (patch + stat)"

6492 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"

6493

6304 -#: builtin/log.c:1189

6494 +#: builtin/log.c:1209

6495 msgid "Messaging"

6496 msgstr "Communication"

6497

6308 -#: builtin/log.c:1190

6498 +#: builtin/log.c:1210

6499 msgid "header"

6500 msgstr "en-tête"

6501

6312 -#: builtin/log.c:1191

6502 +#: builtin/log.c:1211

6503 msgid "add email header"

6504 msgstr "ajouter l'en-tête d'e-mail"

6505

6316 -#: builtin/log.c:1192 builtin/log.c:1194

6506 +#: builtin/log.c:1212 builtin/log.c:1214

6507 msgid "email"

6508 msgstr "e-mail"

6509

6320 -#: builtin/log.c:1192

6510 +#: builtin/log.c:1212

6511 msgid "add To: header"

6512 msgstr "ajouter l'en-tête \"To:\""

6513

6324 -#: builtin/log.c:1194

6514 +#: builtin/log.c:1214

6515 msgid "add Cc: header"

6516 msgstr "ajouter l'en-tête \"Cc:\""

6517

6328 -#: builtin/log.c:1196

6518 +#: builtin/log.c:1216

6519 msgid "ident"

6520 msgstr "ident"

6521

6332 -#: builtin/log.c:1197

6522 +#: builtin/log.c:1217

6523 msgid "set From address to <ident> (or committer ident if absent)"

6334 -msgstr "Renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"

6524 +msgstr "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"

6525

6336 -#: builtin/log.c:1199

6526 +#: builtin/log.c:1219

6527 msgid "message-id"

6528 msgstr "id-message"

6529

6340 -#: builtin/log.c:1200

6530 +#: builtin/log.c:1220

6531 msgid "make first mail a reply to <message-id>"

6532 msgstr "répondre dans le premier message à <id-message>"

6533

6344 -#: builtin/log.c:1201 builtin/log.c:1204

6534 +#: builtin/log.c:1221 builtin/log.c:1224

6535 msgid "boundary"

6536 msgstr "frontière"

6537

6348 -#: builtin/log.c:1202

6538 +#: builtin/log.c:1222

6539 msgid "attach the patch"

6540 msgstr "attacher le patch"

6541

6352 -#: builtin/log.c:1205

6542 +#: builtin/log.c:1225

6543 msgid "inline the patch"

6544 msgstr "patch à l'intérieur"

6545

6356 -#: builtin/log.c:1209

6546 +#: builtin/log.c:1229

6547 msgid "enable message threading, styles: shallow, deep"

6548 msgstr ""

6549 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"

6550

6361 -#: builtin/log.c:1211

l10n: fr.po 2194/1294 messages translated