7a43c952de · matheusbsbs/matheus-bagliano

@@ -1,7 +1,7 @@

1 # French translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Jean-Noël Avila <jn.avila@free.fr>, 2013.

4 +# Jean-Noël Avila <jn.avila@free.fr>, 2015.

5 # Sébastien Helleu <flashcode@flashtux.org>, 2013.

6 #

7 # French translations of common Git words used in this file:

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

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2015-07-14 07:19+0800\n"

77 -"PO-Revision-Date: 2015-07-14 23:02+0200\n"

76 +"POT-Creation-Date: 2015-09-05 09:16+0800\n"

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

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

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

80 "Language: fr\n"

@@ -96,95 +96,107 @@ msgstr ""

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

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

98

99 -#: archive.c:11

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

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

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

102 +

103 +#: advice.c:103

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

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

106 +

107 +#: advice.c:104

108 +msgid "Exiting because of unfinished merge."

109 +msgstr "Abandon à cause d'une fusion non terminée."

110 +

111 +#: archive.c:12

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

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

114

103 -#: archive.c:12

115 +#: archive.c:13

116 msgid "git archive --list"

117 msgstr "git archive --list"

118

107 -#: archive.c:13

119 +#: archive.c:14

120 msgid ""

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

122 msgstr ""

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

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

125

114 -#: archive.c:14

126 +#: archive.c:15

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

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

129

118 -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

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

131 #, c-format

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

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

134

123 -#: archive.c:427

135 +#: archive.c:428

136 msgid "fmt"

137 msgstr "fmt"

138

127 -#: archive.c:427

139 +#: archive.c:428

140 msgid "archive format"

141 msgstr "format d'archive"

142

131 -#: archive.c:428 builtin/log.c:1204

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

144 msgid "prefix"

145 msgstr "préfixe"

146

135 -#: archive.c:429

147 +#: archive.c:430

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

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

150

139 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

140 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

141 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

142 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

143 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

151 +#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

152 +#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987

153 +#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99

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

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

156 msgid "file"

157 msgstr "fichier"

158

147 -#: archive.c:431 builtin/archive.c:89

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

160 msgid "write the archive to this file"

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

162

151 -#: archive.c:433

163 +#: archive.c:434

164 msgid "read .gitattributes in working directory"

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

166

155 -#: archive.c:434

167 +#: archive.c:435

168 msgid "report archived files on stderr"

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

170

159 -#: archive.c:435

171 +#: archive.c:436

172 msgid "store only"

173 msgstr "stockage seulement"

174

163 -#: archive.c:436

175 +#: archive.c:437

176 msgid "compress faster"

177 msgstr "compression rapide"

178

167 -#: archive.c:444

179 +#: archive.c:445

180 msgid "compress better"

181 msgstr "compression efficace"

182

171 -#: archive.c:447

183 +#: archive.c:448

184 msgid "list supported archive formats"

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

186

175 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

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

188 msgid "repo"

189 msgstr "dépôt"

190

179 -#: archive.c:450 builtin/archive.c:91

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

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

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

194

183 -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

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

196 msgid "command"

197 msgstr "commande"

198

187 -#: archive.c:452 builtin/archive.c:93

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

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

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

202

@@ -314,6 +326,11 @@ msgstr "Nom d'objet ambigu : '%s'."

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

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

328

329 +#: branch.c:399

330 +#, c-format

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

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

333 +

334 #: bundle.c:34

335 #, c-format

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

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

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

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

343

327 -#: bundle.c:87 builtin/commit.c:766

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

345 #, c-format

346 msgid "could not open '%s'"

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

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

350 msgid "Repository lacks these prerequisite commits:"

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

352

336 -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

337 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

338 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

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

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

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

356 #: builtin/shortlog.c:158

357 msgid "revision walk setup failed"

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

@@ -358,38 +375,38 @@ msgid_plural "The bundle requires these %d refs:"

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

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

377

361 -#: bundle.c:251

378 +#: bundle.c:253

379 msgid "Could not spawn pack-objects"

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

381

365 -#: bundle.c:269

382 +#: bundle.c:264

383 msgid "pack-objects died"

384 msgstr "les objets groupés ont disparu"

385

369 -#: bundle.c:309

386 +#: bundle.c:304

387 msgid "rev-list died"

388 msgstr "rev-list a disparu"

389

373 -#: bundle.c:358

390 +#: bundle.c:353

391 #, c-format

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

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

394

378 -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

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

396 #, c-format

397 msgid "unrecognized argument: %s"

398 msgstr "argument non reconnu : %s"

399

383 -#: bundle.c:443

400 +#: bundle.c:449

401 msgid "Refusing to create empty bundle."

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

403

387 -#: bundle.c:453

404 +#: bundle.c:459

405 #, c-format

406 msgid "cannot create '%s'"

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

408

392 -#: bundle.c:474

409 +#: bundle.c:480

410 msgid "index-pack died"

411 msgstr "l'index de groupe a disparu"

412

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

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

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

417

401 -#: commit.c:40

418 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

419 +#: builtin/am.c:2101

420 #, c-format

421 msgid "could not parse %s"

422 msgstr "impossible d'analyser %s"

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

577 msgid "Performing inexact rename detection"

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

579

562 -#: diff.c:114

580 +#: diff.c:116

581 #, c-format

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

583 msgstr ""

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

585

568 -#: diff.c:119

586 +#: diff.c:121

587 #, c-format

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

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

590

573 -#: diff.c:214

591 +#: diff.c:216

592 #, c-format

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

594 msgstr ""

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

596

579 -#: diff.c:266

597 +#: diff.c:268

598 #, c-format

599 msgid ""

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

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

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

604 "%s"

605

588 -#: diff.c:2997

606 +#: diff.c:2998

607 #, c-format

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

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

610

593 -#: diff.c:3393

611 +#: diff.c:3394

612 msgid "--follow requires exactly one pathspec"

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

614

597 -#: diff.c:3556

615 +#: diff.c:3557

616 #, c-format

617 msgid ""

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

@@ -603,37 +621,37 @@ msgstr ""

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

622 "%s"

623

606 -#: diff.c:3570

624 +#: diff.c:3571

625 #, c-format

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

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

628

611 -#: dir.c:1852

629 +#: dir.c:1853

630 msgid "failed to get kernel name and information"

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

632

615 -#: dir.c:1945

633 +#: dir.c:1936

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

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

636

619 -#: gpg-interface.c:129 gpg-interface.c:200

637 +#: gpg-interface.c:166 gpg-interface.c:237

638 msgid "could not run gpg."

639 msgstr "impossible de lancer gpg."

640

623 -#: gpg-interface.c:141

641 +#: gpg-interface.c:178

642 msgid "gpg did not accept the data"

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

644

627 -#: gpg-interface.c:152

645 +#: gpg-interface.c:189

646 msgid "gpg failed to sign the data"

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

648

631 -#: gpg-interface.c:185

649 +#: gpg-interface.c:222

650 #, c-format

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

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

653

636 -#: gpg-interface.c:188

654 +#: gpg-interface.c:225

655 #, c-format

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

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

@@ -718,20 +736,12 @@ msgstr[1] ""

736 msgid "%s: %s - %s"

737 msgstr "%s: %s - %s"

738

721 -#: lockfile.c:345

722 -msgid "BUG: reopen a lockfile that is still open"

723 -msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"

724 -

725 -#: lockfile.c:347

726 -msgid "BUG: reopen a lockfile that has been committed"

727 -msgstr "BUG: réouverture d'un fichier verrou validé"

728 -

739 #: merge.c:41

740 msgid "failed to read the cache"

741 msgstr "impossible de lire le cache"

742

733 -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

734 -#: builtin/clone.c:647

743 +#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

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

745 msgid "unable to write new index file"

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

747

@@ -778,7 +788,7 @@ msgstr "impossible de lire l'objet %s '%s'"

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

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

790

781 -#: merge-recursive.c:788 builtin/clone.c:306

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

792 #, c-format

793 msgid "failed to open '%s'"

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

@@ -993,19 +1003,19 @@ msgstr "Impossible d'écrire l'index."

1003 msgid "Cannot commit uninitialized/unreferenced notes tree"

1004 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"

1005

996 -#: notes-utils.c:82

1006 +#: notes-utils.c:100

1007 #, c-format

1008 msgid "Bad notes.rewriteMode value: '%s'"

1009 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"

1010

1001 -#: notes-utils.c:92

1011 +#: notes-utils.c:110

1012 #, c-format

1013 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

1014 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

1015

1016 #. TRANSLATORS: The first %s is the name of the

1017 #. environment variable, the second %s is its value

1008 -#: notes-utils.c:119

1018 +#: notes-utils.c:137

1019 #, c-format

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

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

@@ -1015,28 +1025,28 @@ msgstr "Mauvaise valeur de %s : '%s'"

1025 msgid "unable to parse object: %s"

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

1027

1018 -#: parse-options.c:546

1028 +#: parse-options.c:563

1029 msgid "..."

1030 msgstr "..."

1031

1022 -#: parse-options.c:564

1032 +#: parse-options.c:581

1033 #, c-format

1034 msgid "usage: %s"

1035 msgstr "usage : %s"

1036

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

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

1029 -#: parse-options.c:568

1039 +#: parse-options.c:585

1040 #, c-format

1041 msgid " or: %s"

1042 msgstr " ou : %s"

1043

1034 -#: parse-options.c:571

1044 +#: parse-options.c:588

1045 #, c-format

1046 msgid " %s"

1047 msgstr " %s"

1048

1039 -#: parse-options.c:605

1049 +#: parse-options.c:622

1050 msgid "-NUM"

1051 msgstr "-NUM"

1052

@@ -1108,7 +1118,7 @@ msgstr ""

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

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

1120

1111 -#: pretty.c:968

1121 +#: pretty.c:969

1122 msgid "unable to parse --pretty format"

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

1124

@@ -1116,7 +1126,7 @@ msgstr "impossible d'analyser le format --pretty"

1126 msgid "done"

1127 msgstr "fait"

1128

1119 -#: read-cache.c:1295

1129 +#: read-cache.c:1296

1130 #, c-format

1131 msgid ""

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

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

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

1136 "Utilisation de la version %i"

1137

1128 -#: read-cache.c:1305

1138 +#: read-cache.c:1306

1139 #, c-format

1140 msgid ""

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

@@ -1134,6 +1144,31 @@ msgstr ""

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

1145 "Utilisation de la version %i"

1146

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

1148 +#: builtin/merge.c:983

1149 +#, c-format

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

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

1152 +

1153 +#: refs.c:3001

1154 +#, c-format

1155 +msgid "could not delete reference %s: %s"

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

1157 +

1158 +#: refs.c:3004

1159 +#, c-format

1160 +msgid "could not delete references: %s"

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

1162 +

1163 +#: refs.c:3013

1164 +#, c-format

1165 +msgid "could not remove reference %s"

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

1167 +

1168 +#: ref-filter.c:660

1169 +msgid "unable to parse format"

1170 +msgstr "impossible d'analyser le format"

1171 +

1172 #: remote.c:792

1173 #, c-format

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

@@ -1259,7 +1294,16 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1294 msgstr ""

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

1296

1262 -#: revision.c:2366

1297 +#: revision.c:2198

1298 +msgid "your current branch appears to be broken"

1299 +msgstr "votre branche actuelle semble cassée"

1300 +

1301 +#: revision.c:2201

1302 +#, c-format

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

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

1305 +

1306 +#: revision.c:2395

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

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

1309

@@ -1272,31 +1316,25 @@ msgstr "échec de l'ouverture de /dev/null"

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

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

1318

1275 -#: send-pack.c:272

1319 +#: send-pack.c:295

1320 msgid "failed to sign the push certificate"

1321 msgstr "impossible de signer le certificat de poussée"

1322

1279 -#: send-pack.c:378

1323 +#: send-pack.c:404

1324 msgid "the receiving end does not support --signed push"

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

1326

1283 -#: send-pack.c:389

1327 +#: send-pack.c:406

1328 +msgid ""

1329 +"not sending a push certificate since the receiving end does not support --"

1330 +"signed push"

1331 +msgstr "pas d'envoi de certificat de poussée car le receveur ne gère pas les poussées avec --signed"

1332 +

1333 +#: send-pack.c:418

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

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

1336

1287 -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1288 -#: builtin/merge.c:983

1289 -#, c-format

1290 -msgid "Could not open '%s' for writing"

1291 -msgstr "Impossible d'ouvrir '%s' en écriture"

1292 -

1293 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1294 -#: builtin/merge.c:988

1295 -#, c-format

1296 -msgid "Could not write to '%s'"

1297 -msgstr "Impossible d'écrire dans '%s'"

1298 -

1299 -#: sequencer.c:195

1337 +#: sequencer.c:183

1338 msgid ""

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

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

@@ -1304,7 +1342,7 @@ msgstr ""

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

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

1344

1307 -#: sequencer.c:198

1345 +#: sequencer.c:186

1346 msgid ""

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

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

@@ -1314,67 +1352,67 @@ msgstr ""

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

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

1354

1317 -#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1355 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1356 #, c-format

1357 msgid "Could not write to %s"

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

1359

1322 -#: sequencer.c:214

1360 +#: sequencer.c:202

1361 #, c-format

1362 msgid "Error wrapping up %s"

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

1364

1327 -#: sequencer.c:229

1365 +#: sequencer.c:217

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

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

1368

1331 -#: sequencer.c:231

1369 +#: sequencer.c:219

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

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

1372

1335 -#: sequencer.c:234

1373 +#: sequencer.c:222

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

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

1376

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

1340 -#: sequencer.c:321

1378 +#: sequencer.c:309

1379 #, c-format

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

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

1382

1345 -#: sequencer.c:339

1383 +#: sequencer.c:327

1384 msgid "Could not resolve HEAD commit\n"

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

1386

1349 -#: sequencer.c:359

1387 +#: sequencer.c:347

1388 msgid "Unable to update cache tree\n"

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

1390

1353 -#: sequencer.c:411

1391 +#: sequencer.c:399

1392 #, c-format

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

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

1395

1358 -#: sequencer.c:416

1396 +#: sequencer.c:404

1397 #, c-format

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

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

1400

1363 -#: sequencer.c:482

1401 +#: sequencer.c:469

1402 msgid "Your index file is unmerged."

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

1404

1367 -#: sequencer.c:501

1405 +#: sequencer.c:488

1406 #, c-format

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

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

1409

1372 -#: sequencer.c:509

1410 +#: sequencer.c:496

1411 #, c-format

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

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

1414

1377 -#: sequencer.c:513

1415 +#: sequencer.c:500

1416 #, c-format

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

1418 msgstr ""

@@ -1383,153 +1421,153 @@ msgstr ""

1421

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

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

1386 -#: sequencer.c:526

1424 +#: sequencer.c:513

1425 #, c-format

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

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

1428

1391 -#: sequencer.c:530

1429 +#: sequencer.c:517

1430 #, c-format

1431 msgid "Cannot get commit message for %s"

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

1433

1396 -#: sequencer.c:616

1434 +#: sequencer.c:603

1435 #, c-format

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

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

1438

1401 -#: sequencer.c:617

1439 +#: sequencer.c:604

1440 #, c-format

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

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

1443

1406 -#: sequencer.c:653

1444 +#: sequencer.c:639

1445 msgid "empty commit set passed"

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

1447

1410 -#: sequencer.c:661

1448 +#: sequencer.c:647

1449 #, c-format

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

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

1452

1415 -#: sequencer.c:665

1453 +#: sequencer.c:651

1454 #, c-format

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

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

1457

1420 -#: sequencer.c:725

1458 +#: sequencer.c:711

1459 #, c-format

1460 msgid "Cannot %s during a %s"

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

1462

1425 -#: sequencer.c:747

1463 +#: sequencer.c:733

1464 #, c-format

1465 msgid "Could not parse line %d."

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

1467

1430 -#: sequencer.c:752

1468 +#: sequencer.c:738

1469 msgid "No commits parsed."

1470 msgstr "Aucun commit analysé."

1471

1434 -#: sequencer.c:765

1472 +#: sequencer.c:750

1473 #, c-format

1474 msgid "Could not open %s"

1475 msgstr "Impossible d'ouvrir %s"

1476

1439 -#: sequencer.c:769

1477 +#: sequencer.c:754

1478 #, c-format

1479 msgid "Could not read %s."

1480 msgstr "Impossible de lire %s."

1481

1444 -#: sequencer.c:776

1482 +#: sequencer.c:761

1483 #, c-format

1484 msgid "Unusable instruction sheet: %s"

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

1486

1449 -#: sequencer.c:806

1487 +#: sequencer.c:791

1488 #, c-format

1489 msgid "Invalid key: %s"

1490 msgstr "Clé invalide: %s"

1491

1454 -#: sequencer.c:809

1492 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1493 #, c-format

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

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

1496

1459 -#: sequencer.c:821

1497 +#: sequencer.c:804

1498 #, c-format

1499 msgid "Malformed options sheet: %s"

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

1501

1464 -#: sequencer.c:842

1502 +#: sequencer.c:823

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

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

1505

1468 -#: sequencer.c:843

1506 +#: sequencer.c:824

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

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

1509

1472 -#: sequencer.c:847

1510 +#: sequencer.c:828

1511 #, c-format

1512 msgid "Could not create sequencer directory %s"

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

1514

1477 -#: sequencer.c:863 sequencer.c:948

1515 +#: sequencer.c:844 sequencer.c:926

1516 #, c-format

1517 msgid "Error wrapping up %s."

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

1519

1482 -#: sequencer.c:882 sequencer.c:1018

1520 +#: sequencer.c:863 sequencer.c:996

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

1522 msgstr "aucun picorage ou retour en cours"

1523

1486 -#: sequencer.c:884

1524 +#: sequencer.c:865

1525 msgid "cannot resolve HEAD"

1526 msgstr "impossible de résoudre HEAD"

1527

1490 -#: sequencer.c:886

1528 +#: sequencer.c:867

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

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

1531

1494 -#: sequencer.c:908 builtin/apply.c:4291

1532 +#: sequencer.c:887 builtin/apply.c:4291

1533 #, c-format

1534 msgid "cannot open %s: %s"

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

1536

1499 -#: sequencer.c:911

1537 +#: sequencer.c:890

1538 #, c-format

1539 msgid "cannot read %s: %s"

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

1541

1504 -#: sequencer.c:912

1542 +#: sequencer.c:891

1543 msgid "unexpected end of file"

1544 msgstr "fin de fichier inattendue"

1545

1508 -#: sequencer.c:918

1546 +#: sequencer.c:897

1547 #, c-format

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

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

1550

1513 -#: sequencer.c:941

1551 +#: sequencer.c:919

1552 #, c-format

1553 msgid "Could not format %s."

1554 msgstr "Impossible de formater %s."

1555

1518 -#: sequencer.c:1086

1556 +#: sequencer.c:1064

1557 #, c-format

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

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

1560

1523 -#: sequencer.c:1089

1561 +#: sequencer.c:1067

1562 #, c-format

1563 msgid "%s: bad revision"

1564 msgstr "%s : mauvaise révision"

1565

1528 -#: sequencer.c:1123

1566 +#: sequencer.c:1101

1567 msgid "Can't revert as initial commit"

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

1569

1532 -#: sequencer.c:1124

1570 +#: sequencer.c:1102

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

1572 msgstr "Impossible de picorer vers une HEAD vide"

1573

@@ -1563,33 +1601,33 @@ msgstr ""

1601 "message\n"

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

1603

1566 -#: submodule.c:64 submodule.c:98

1604 +#: submodule.c:61 submodule.c:95

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

1606 msgstr ""

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

1608 "d'abord"

1609

1572 -#: submodule.c:68 submodule.c:102

1610 +#: submodule.c:65 submodule.c:99

1611 #, c-format

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

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

1614

1577 -#: submodule.c:76

1615 +#: submodule.c:73

1616 #, c-format

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

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

1619

1620 # ici %s est un chemin

1583 -#: submodule.c:109

1621 +#: submodule.c:106

1622 #, c-format

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

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

1625

1588 -#: submodule.c:120

1626 +#: submodule.c:117

1627 msgid "staging updated .gitmodules failed"

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

1629

1592 -#: submodule.c:1115

1630 +#: submodule.c:1045

1631 #, c-format

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

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

@@ -1619,6 +1657,11 @@ msgstr "impossible de lire le fichier d'entrée '%s'"

1657 msgid "could not read from stdin"

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

1659

1660 +#: transport-helper.c:1025

1661 +#, c-format

1662 +msgid "Could not read ref %s"

1663 +msgstr "impossible de lire la réf %s"

1664 +

1665 #: unpack-trees.c:203

1666 msgid "Checking out files"

1667 msgstr "Extraction des fichiers"

@@ -1652,201 +1695,217 @@ msgstr "numéro de port invalide"

1695 msgid "invalid '..' path segment"

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

1697

1655 -#: wrapper.c:523

1698 +#: wrapper.c:219 wrapper.c:362

1699 +#, c-format

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

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

1702 +

1703 +#: wrapper.c:221 wrapper.c:364

1704 +#, c-format

1705 +msgid "could not open '%s' for writing"

1706 +msgstr "impossible d'ouvrir '%s' en écriture"

1707 +

1708 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1709 +#: builtin/merge.c:1076 builtin/pull.c:380

1710 +#, c-format

1711 +msgid "could not open '%s' for reading"

1712 +msgstr "impossible d'ouvrir '%s' en lecture"

1713 +

1714 +#: wrapper.c:579

1715 #, c-format

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

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

1718

1660 -#: wrapper.c:544

1719 +#: wrapper.c:600

1720 #, c-format

1721 msgid "unable to access '%s'"

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

1723

1665 -#: wrapper.c:555

1724 +#: wrapper.c:611

1725 #, c-format

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

1727 msgstr ""

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

1729 "passe : %s"

1730

1672 -#: wrapper.c:556

1731 +#: wrapper.c:612

1732 msgid "no such user"

1733 msgstr "utilisateur inconnu"

1734

1676 -#: wrapper.c:564

1735 +#: wrapper.c:620

1736 msgid "unable to get current working directory"

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

1738

1680 -#: wrapper.c:575

1739 +#: wrapper.c:631

1740 #, c-format

1741 msgid "could not open %s for writing"

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

1743

1685 -#: wrapper.c:587

1744 +#: wrapper.c:642 builtin/am.c:424

1745 #, c-format

1746 msgid "could not write to %s"

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

1748

1690 -#: wrapper.c:593

1749 +#: wrapper.c:648

1750 #, c-format

1751 msgid "could not close %s"

1752 msgstr "impossible de fermer %s"

1753

1695 -#: wt-status.c:150

1754 +#: wt-status.c:149

1755 msgid "Unmerged paths:"

1756 msgstr "Chemins non fusionnés :"

1757

1699 -#: wt-status.c:177 wt-status.c:204

1758 +#: wt-status.c:176 wt-status.c:203

1759 #, c-format

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

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

1762

1704 -#: wt-status.c:179 wt-status.c:206

1763 +#: wt-status.c:178 wt-status.c:205

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

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

1766

1708 -#: wt-status.c:183

1767 +#: wt-status.c:182

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

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

1770

1712 -#: wt-status.c:185 wt-status.c:189

1771 +#: wt-status.c:184 wt-status.c:188

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

1773 msgstr ""

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

1775 "résolu)"

1776

1718 -#: wt-status.c:187

1777 +#: wt-status.c:186

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

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

1780

1722 -#: wt-status.c:198 wt-status.c:881

1781 +#: wt-status.c:197 wt-status.c:880

1782 msgid "Changes to be committed:"

1783 msgstr "Modifications qui seront validées :"

1784

1726 -#: wt-status.c:216 wt-status.c:890

1785 +#: wt-status.c:215 wt-status.c:889

1786 msgid "Changes not staged for commit:"

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

1788

1730 -#: wt-status.c:220

1789 +#: wt-status.c:219

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

1791 msgstr ""

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

1793

1735 -#: wt-status.c:222

1794 +#: wt-status.c:221

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

1796 msgstr ""

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

1798 "validé)"

1799

1741 -#: wt-status.c:223

1800 +#: wt-status.c:222

1801 msgid ""

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

1803 msgstr ""

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

1805 "dans la copie de travail)"

1806

1748 -#: wt-status.c:225

1807 +#: wt-status.c:224

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

1809 msgstr ""

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

1811

1753 -#: wt-status.c:237

1812 +#: wt-status.c:236

1813 #, c-format

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

1815 msgstr ""

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

1817

1759 -#: wt-status.c:252

1818 +#: wt-status.c:251

1819 msgid "both deleted:"

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

1821

1763 -#: wt-status.c:254

1822 +#: wt-status.c:253

1823 msgid "added by us:"

1824 msgstr "ajouté par nous :"

1825

1767 -#: wt-status.c:256

1826 +#: wt-status.c:255

1827 msgid "deleted by them:"

1828 msgstr "supprimé par eux :"

1829

1771 -#: wt-status.c:258

1830 +#: wt-status.c:257

1831 msgid "added by them:"

1832 msgstr "ajouté par eux :"

1833

1775 -#: wt-status.c:260

1834 +#: wt-status.c:259

1835 msgid "deleted by us:"

1836 msgstr "supprimé par nous :"

1837

1779 -#: wt-status.c:262

1838 +#: wt-status.c:261

1839 msgid "both added:"

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

1841

1783 -#: wt-status.c:264

1842 +#: wt-status.c:263

1843 msgid "both modified:"

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

1845

1787 -#: wt-status.c:266

1846 +#: wt-status.c:265

1847 #, c-format

1848 msgid "bug: unhandled unmerged status %x"

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

1850

1792 -#: wt-status.c:274

1851 +#: wt-status.c:273

1852 msgid "new file:"

1853 msgstr "nouveau fichier :"

1854

1796 -#: wt-status.c:276

1855 +#: wt-status.c:275

1856 msgid "copied:"

1857 msgstr "copié :"

1858

1800 -#: wt-status.c:278

1859 +#: wt-status.c:277

1860 msgid "deleted:"

1861 msgstr "supprimé :"

1862

1804 -#: wt-status.c:280

1863 +#: wt-status.c:279

1864 msgid "modified:"

1865 msgstr "modifié :"

1866

1808 -#: wt-status.c:282

1867 +#: wt-status.c:281

1868 msgid "renamed:"

1869 msgstr "renommé :"

1870

1812 -#: wt-status.c:284

1871 +#: wt-status.c:283

1872 msgid "typechange:"

1873 msgstr "modif. type :"

1874

1816 -#: wt-status.c:286

1875 +#: wt-status.c:285

1876 msgid "unknown:"

1877 msgstr "inconnu :"

1878

1820 -#: wt-status.c:288

1879 +#: wt-status.c:287

1880 msgid "unmerged:"

1881 msgstr "non fusionné :"

1882

1824 -#: wt-status.c:370

1883 +#: wt-status.c:369

1884 msgid "new commits, "

1885 msgstr "nouveaux commits, "

1886

1828 -#: wt-status.c:372

1887 +#: wt-status.c:371

1888 msgid "modified content, "

1889 msgstr "contenu modifié, "

1890

1832 -#: wt-status.c:374

1891 +#: wt-status.c:373

1892 msgid "untracked content, "

1893 msgstr "contenu non suivi, "

1894

1836 -#: wt-status.c:391

1895 +#: wt-status.c:390

1896 #, c-format

1897 msgid "bug: unhandled diff status %c"

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

1899

1841 -#: wt-status.c:755

1900 +#: wt-status.c:754

1901 msgid "Submodules changed but not updated:"

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

1903

1845 -#: wt-status.c:757

1904 +#: wt-status.c:756

1905 msgid "Submodule changes to be committed:"

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

1907

1849 -#: wt-status.c:838

1908 +#: wt-status.c:837

1909 msgid ""

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

1911 "Everything below will be removed."

@@ -1854,68 +1913,99 @@ msgstr ""

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

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

1915

1857 -#: wt-status.c:949

1916 +#: wt-status.c:948

1917 msgid "You have unmerged paths."

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

1919

1861 -#: wt-status.c:952

1920 +#: wt-status.c:951

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

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

1923

1865 -#: wt-status.c:955

1924 +#: wt-status.c:954

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

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

1927

1869 -#: wt-status.c:958

1928 +#: wt-status.c:957

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

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

1931

1873 -#: wt-status.c:968

1932 +#: wt-status.c:967

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

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

1935

1877 -#: wt-status.c:971

1936 +#: wt-status.c:970

1937 msgid "The current patch is empty."

1938 msgstr "Le patch actuel est vide."

1939

1881 -#: wt-status.c:975

1940 +#: wt-status.c:974

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

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

1943

1885 -#: wt-status.c:977

1944 +#: wt-status.c:976

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

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

1947

1889 -#: wt-status.c:979

1948 +#: wt-status.c:978

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

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

1951

1893 -#: wt-status.c:1039 wt-status.c:1056

1952 +#: wt-status.c:1105

1953 +msgid "No commands done."

1954 +msgstr "Aucune commande réalisée."

1955 +

1956 +#: wt-status.c:1108

1957 +#, c-format

1958 +msgid "Last command done (%d command done):"

1959 +msgid_plural "Last commands done (%d commands done):"

1960 +msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

1961 +msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

1962 +

1963 +#: wt-status.c:1119

1964 +#, c-format

1965 +msgid " (see more in file %s)"

1966 +msgstr " (voir plus dans le fichier %s)"

1967 +

1968 +#: wt-status.c:1124

1969 +msgid "No commands remaining."

1970 +msgstr "Aucune commande restante."

1971 +

1972 +#: wt-status.c:1127

1973 +#, c-format

1974 +msgid "Next command to do (%d remaining command):"

1975 +msgid_plural "Next commands to do (%d remaining commands):"

1976 +msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

1977 +msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

1978 +

1979 +#: wt-status.c:1135

1980 +msgid " (use \"git rebase --edit-todo\" to view and edit)"

1981 +msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

1982 +

1983 +#: wt-status.c:1148

1984 #, c-format

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

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

1987

1898 -#: wt-status.c:1044 wt-status.c:1061

1988 +#: wt-status.c:1153

1989 msgid "You are currently rebasing."

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

1991

1902 -#: wt-status.c:1047

1992 +#: wt-status.c:1167

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

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

1995

1906 -#: wt-status.c:1049

1996 +#: wt-status.c:1169

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

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

1999

1910 -#: wt-status.c:1051

2000 +#: wt-status.c:1171

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

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

2003

1914 -#: wt-status.c:1064

2004 +#: wt-status.c:1177

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

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

2007

1918 -#: wt-status.c:1068

2008 +#: wt-status.c:1181

2009 #, c-format

2010 msgid ""

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

@@ -1923,120 +2013,124 @@ msgstr ""

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

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

2015

1926 -#: wt-status.c:1073

2016 +#: wt-status.c:1186

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

2018 msgstr ""

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

2020

1931 -#: wt-status.c:1076

2021 +#: wt-status.c:1189

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

2023 msgstr ""

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

2025

1936 -#: wt-status.c:1080

2026 +#: wt-status.c:1193

2027 #, c-format

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

2029 msgstr ""

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

2031 "branche '%s' sur '%s'."

2032

1943 -#: wt-status.c:1085

2033 +#: wt-status.c:1198

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

2035 msgstr ""

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

2037

1948 -#: wt-status.c:1088

2038 +#: wt-status.c:1201

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

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

2041

1952 -#: wt-status.c:1090

2042 +#: wt-status.c:1203

2043 msgid ""

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

2045 msgstr ""

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

2047 "modifications)"

2048

1959 -#: wt-status.c:1100

2049 +#: wt-status.c:1213

2050 #, c-format

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

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

2053

1964 -#: wt-status.c:1105

2054 +#: wt-status.c:1218

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

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

2057

1968 -#: wt-status.c:1108

2058 +#: wt-status.c:1221

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

2060 msgstr ""

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

2062

1973 -#: wt-status.c:1110

2063 +#: wt-status.c:1223

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

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

2066

1977 -#: wt-status.c:1119

2067 +#: wt-status.c:1232

2068 #, c-format

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

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

2071

1982 -#: wt-status.c:1124

2072 +#: wt-status.c:1237

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

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

2075

1986 -#: wt-status.c:1127

2076 +#: wt-status.c:1240

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

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

2079

1990 -#: wt-status.c:1129

2080 +#: wt-status.c:1242

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

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

2083

1994 -#: wt-status.c:1140

2084 +#: wt-status.c:1253

2085 #, c-format

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

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

2088

1999 -#: wt-status.c:1144

2089 +#: wt-status.c:1257

2090 msgid "You are currently bisecting."

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

2092

2003 -#: wt-status.c:1147

2093 +#: wt-status.c:1260

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

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

2096

2007 -#: wt-status.c:1324

2097 +#: wt-status.c:1437

2098 msgid "On branch "

2099 msgstr "Sur la branche "

2100

2011 -#: wt-status.c:1331

2101 +#: wt-status.c:1445

2102 +msgid "interactive rebase in progress; onto "

2103 +msgstr "rebasage interactif en cours ; sur "

2104 +

2105 +#: wt-status.c:1447

2106 msgid "rebase in progress; onto "

2107 msgstr "rebasage en cours ; sur "

2108

2015 -#: wt-status.c:1336

2109 +#: wt-status.c:1452

2110 msgid "HEAD detached at "

2111 msgstr "HEAD détachée sur "

2112

2019 -#: wt-status.c:1338

2113 +#: wt-status.c:1454

2114 msgid "HEAD detached from "

2115 msgstr "HEAD détachée depuis "

2116

2023 -#: wt-status.c:1341

2117 +#: wt-status.c:1457

2118 msgid "Not currently on any branch."

2119 msgstr "Actuellement sur aucun branche."

2120

2027 -#: wt-status.c:1358

2121 +#: wt-status.c:1474

2122 msgid "Initial commit"

2123 msgstr "Validation initiale"

2124

2031 -#: wt-status.c:1372

2125 +#: wt-status.c:1488

2126 msgid "Untracked files"

2127 msgstr "Fichiers non suivis"

2128

2035 -#: wt-status.c:1374

2129 +#: wt-status.c:1490

2130 msgid "Ignored files"

2131 msgstr "Fichiers ignorés"

2132

2039 -#: wt-status.c:1378

2133 +#: wt-status.c:1494

2134 #, c-format

2135 msgid ""

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

@@ -2048,32 +2142,32 @@ msgstr ""

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

2143 "status')."

2144

2051 -#: wt-status.c:1384

2145 +#: wt-status.c:1500

2146 #, c-format

2147 msgid "Untracked files not listed%s"

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

2149

2056 -#: wt-status.c:1386

2150 +#: wt-status.c:1502

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

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

2153

2060 -#: wt-status.c:1392

2154 +#: wt-status.c:1508

2155 msgid "No changes"

2156 msgstr "Aucune modification"

2157

2064 -#: wt-status.c:1397

2158 +#: wt-status.c:1513

2159 #, c-format

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

2161 msgstr ""

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

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

2164

2071 -#: wt-status.c:1400

2165 +#: wt-status.c:1516

2166 #, c-format

2167 msgid "no changes added to commit\n"

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

2169

2076 -#: wt-status.c:1403

2170 +#: wt-status.c:1519

2171 #, c-format

2172 msgid ""

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

@@ -2082,53 +2176,53 @@ msgstr ""

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

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

2178

2085 -#: wt-status.c:1406

2179 +#: wt-status.c:1522

2180 #, c-format

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

2182 msgstr ""

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

2184 "sont présents\n"

2185

2092 -#: wt-status.c:1409

2186 +#: wt-status.c:1525

2187 #, c-format

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

2189 msgstr ""

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

2191 "suivre)\n"

2192

2099 -#: wt-status.c:1412 wt-status.c:1417

2193 +#: wt-status.c:1528 wt-status.c:1533

2194 #, c-format

2195 msgid "nothing to commit\n"

2196 msgstr "rien à valider\n"

2197

2104 -#: wt-status.c:1415

2198 +#: wt-status.c:1531

2199 #, c-format

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

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

2202

2109 -#: wt-status.c:1419

2203 +#: wt-status.c:1535

2204 #, c-format

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

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

2207

2114 -#: wt-status.c:1528

2208 +#: wt-status.c:1644

2209 msgid "HEAD (no branch)"

2210 msgstr "HEAD (aucune branche)"

2211

2118 -#: wt-status.c:1534

2212 +#: wt-status.c:1650

2213 msgid "Initial commit on "

2214 msgstr "Validation initiale sur "

2215

2216 # à priori on parle d'une branche ici

2123 -#: wt-status.c:1561

2217 +#: wt-status.c:1677

2218 msgid "gone"

2219 msgstr "disparue"

2220

2127 -#: wt-status.c:1563 wt-status.c:1571

2221 +#: wt-status.c:1679 wt-status.c:1687

2222 msgid "behind "

2223 msgstr "derrière "

2224

2131 -#: compat/precompose_utf8.c:55 builtin/clone.c:345

2225 +#: compat/precompose_utf8.c:55 builtin/clone.c:403

2226 #, c-format

2227 msgid "failed to unlink '%s'"

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

@@ -2155,7 +2249,7 @@ msgstr "suppression de '%s'\n"

2249 msgid "Unstaged changes after refreshing the index:"

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

2251

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

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

2253 msgid "Could not read the index"

2254 msgstr "Impossible de lire l'index"

2255

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

2285 msgstr ""

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

2287

2194 -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2195 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2196 -#: builtin/rm.c:268

2288 +#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

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

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

2291 msgid "dry run"

2292 msgstr "simuler l'action"

2293

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

2201 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

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

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

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

2297 msgid "be verbose"

2298 msgstr "mode verbeux"

2299

@@ -2207,7 +2301,7 @@ msgstr "mode verbeux"

2301 msgid "interactive picking"

2302 msgstr "sélection interactive"

2303

2210 -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2304 +#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2305 msgid "select hunks interactively"

2306 msgstr "sélection interactive des sections"

2307

@@ -2278,15 +2372,424 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"

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

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

2374

2281 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2282 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

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

2376 +#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2377 msgid "index file corrupt"

2378 msgstr "fichier d'index corrompu"

2379

2286 -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2380 +#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2381 msgid "Unable to write new index file"

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

2383

2384 +#: builtin/am.c:41

2385 +#, c-format

2386 +msgid "could not stat %s"

2387 +msgstr "stat impossible de %s"

2388 +

2389 +#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2390 +#: builtin/merge.c:1079

2391 +#, c-format

2392 +msgid "could not read '%s'"

2393 +msgstr "impossible de lire '%s'"

2394 +

2395 +#: builtin/am.c:444

2396 +msgid "could not parse author script"

2397 +msgstr "impossible d'analyser le script author"

2398 +

2399 +#: builtin/am.c:521

2400 +#, c-format

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

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

2403 +

2404 +#: builtin/am.c:562 builtin/notes.c:300

2405 +#, c-format

2406 +msgid "Malformed input line: '%s'."

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

2408 +

2409 +#: builtin/am.c:599 builtin/notes.c:315

2410 +#, c-format

2411 +msgid "Failed to copy notes from '%s' to '%s'"

2412 +msgstr "Impossible de copier les notes de '%s' vers '%s'"

2413 +

2414 +#: builtin/am.c:625

2415 +msgid "fseek failed"

2416 +msgstr "échec de fseek"

2417 +

2418 +#: builtin/am.c:786 builtin/am.c:874

2419 +#, c-format

2420 +msgid "could not open '%s' for reading: %s"

2421 +msgstr "impossible d'ouvrir '%s' en lecture : %s"

2422 +

2423 +#: builtin/am.c:793

2424 +#, c-format

2425 +msgid "could not open '%s' for writing: %s"

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

2427 +

2428 +#: builtin/am.c:802

2429 +#, c-format

2430 +msgid "could not parse patch '%s'"

2431 +msgstr "impossible d'analyser le patch '%s'"

2432 +

2433 +#: builtin/am.c:867

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

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

2436 +

2437 +#: builtin/am.c:915

2438 +msgid "invalid timestamp"

2439 +msgstr "horodatage invalide"

2440 +

2441 +#: builtin/am.c:918 builtin/am.c:926

2442 +msgid "invalid Date line"

2443 +msgstr "ligne de Date invalide"

2444 +

2445 +#: builtin/am.c:923

2446 +msgid "invalid timezone offset"

2447 +msgstr "décalage horaire invalide"

2448 +

2449 +#: builtin/am.c:1010

2450 +msgid "Patch format detection failed."

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

2452 +

2453 +#: builtin/am.c:1015 builtin/clone.c:368

2454 +#, c-format

2455 +msgid "failed to create directory '%s'"

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

2457 +

2458 +#: builtin/am.c:1019

2459 +msgid "Failed to split patches."

2460 +msgstr "Échec de découpage des patchs."

2461 +

2462 +#: builtin/am.c:1151 builtin/commit.c:362

2463 +msgid "unable to write index file"

2464 +msgstr "impossible d'écrire le fichier d'index"

2465 +

2466 +#: builtin/am.c:1202

2467 +#, c-format

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

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

2470 +

2471 +#: builtin/am.c:1203

2472 +#, c-format

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

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

2475 +

2476 +#: builtin/am.c:1204

2477 +#, c-format

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

2479 +msgstr "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --abort\"."

2480 +

2481 +#: builtin/am.c:1312

2482 +msgid "Patch is empty. Was it split wrong?"

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

2484 +

2485 +#: builtin/am.c:1386 builtin/log.c:1345

2486 +#, c-format

2487 +msgid "invalid ident line: %s"

2488 +msgstr "ligne d'identification invalide : %s"

2489 +

2490 +#: builtin/am.c:1413

2491 +#, c-format

2492 +msgid "unable to parse commit %s"

2493 +msgstr "impossible d'analyser le commit %s"

2494 +

2495 +#: builtin/am.c:1587

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

2497 +msgstr ""

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

2499 +"points."

2500 +

2501 +#: builtin/am.c:1589

2502 +msgid "Using index info to reconstruct a base tree..."

2503 +msgstr ""

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

2505 +

2506 +#: builtin/am.c:1608

2507 +msgid ""

2508 +"Did you hand edit your patch?\n"

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

2510 +msgstr ""

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

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

2513 +

2514 +#: builtin/am.c:1614

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

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

2517 +

2518 +#: builtin/am.c:1639

2519 +msgid "Failed to merge in the changes."

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

2521 +

2522 +#: builtin/am.c:1664 builtin/merge.c:632

2523 +msgid "git write-tree failed to write a tree"

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

2525 +

2526 +#: builtin/am.c:1671

2527 +msgid "applying to an empty history"

2528 +msgstr "application à un historique vide"

2529 +

2530 +#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2531 +#: builtin/merge.c:854

2532 +msgid "failed to write commit object"

2533 +msgstr "échec de l'écriture de l'objet commit"

2534 +

2535 +#: builtin/am.c:1716 builtin/am.c:1720

2536 +#, c-format

2537 +msgid "cannot resume: %s does not exist."

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

2539 +

2540 +#: builtin/am.c:1736

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

2542 +msgstr ""

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

2544 +

2545 +#: builtin/am.c:1741

2546 +msgid "Commit Body is:"

2547 +msgstr "Le corps de la validation est :"

2548 +

2549 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

2550 +#. in your translation. The program will only accept English

2551 +#. input at this point.

2552 +#.

2553 +#: builtin/am.c:1751

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

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

2556 +

2557 +#: builtin/am.c:1801

2558 +#, c-format

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

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

2561 +

2562 +#: builtin/am.c:1836 builtin/am.c:1907

2563 +#, c-format

2564 +msgid "Applying: %.*s"

2565 +msgstr "Application de %.*s"

2566 +

2567 +#: builtin/am.c:1852

2568 +msgid "No changes -- Patch already applied."

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

2570 +

2571 +#: builtin/am.c:1860

2572 +#, c-format

2573 +msgid "Patch failed at %s %.*s"

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

2575 +

2576 +#: builtin/am.c:1866

2577 +#, c-format

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

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

2580 +

2581 +#: builtin/am.c:1910

2582 +msgid ""

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

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

2585 +"already introduced the same changes; you might want to skip this patch."

2586 +msgstr ""

2587 +"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n"

2588 +"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n"

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

2590 +"patch."

2591 +

2592 +#: builtin/am.c:1917

2593 +msgid ""

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

2595 +"Did you forget to use 'git add'?"

2596 +msgstr ""

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

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

2599 +

2600 +#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2601 +#: builtin/reset.c:316

2602 +#, c-format

2603 +msgid "Could not parse object '%s'."

2604 +msgstr "Impossible d'analyser l'objet '%s'."

2605 +

2606 +#: builtin/am.c:2077

2607 +msgid "failed to clean index"

2608 +msgstr "échec du nettoyage de l'index"

2609 +

2610 +#: builtin/am.c:2111

2611 +msgid ""

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

2613 +"Not rewinding to ORIG_HEAD"

2614 +msgstr ""

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

2616 +"Pas de retour à ORIG_HEAD"

2617 +

2618 +#: builtin/am.c:2172

2619 +#, c-format

2620 +msgid "Invalid value for --patch-format: %s"

2621 +msgstr "Valeur invalide pour --patch-format : %s"

2622 +

2623 +#: builtin/am.c:2194

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

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

2626 +

2627 +#: builtin/am.c:2195

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

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

2630 +

2631 +#: builtin/am.c:2201

2632 +msgid "run interactively"

2633 +msgstr "exécution interactive"

2634 +

2635 +#: builtin/am.c:2203

2636 +msgid "historical option -- no-op"

2637 +msgstr "option historique -- no-op"

2638 +

2639 +#: builtin/am.c:2205

2640 +msgid "allow fall back on 3way merging if needed"

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

2642 +

2643 +#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2644 +#: builtin/repack.c:171

2645 +msgid "be quiet"

2646 +msgstr "être silencieux"

2647 +

2648 +#: builtin/am.c:2208

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

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

2651 +

2652 +#: builtin/am.c:2211

2653 +msgid "recode into utf8 (default)"

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

2655 +

2656 +#: builtin/am.c:2213

2657 +msgid "pass -k flag to git-mailinfo"

2658 +msgstr "passer l'option -k à git-mailinfo"

2659 +

2660 +#: builtin/am.c:2215

2661 +msgid "pass -b flag to git-mailinfo"

2662 +msgstr "passer l'option -b à git-mailinfo"

2663 +

2664 +#: builtin/am.c:2217

2665 +msgid "pass -m flag to git-mailinfo"

2666 +msgstr "passer l'option -m à git-mailinfo"

2667 +

2668 +#: builtin/am.c:2219

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

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

2671 +

2672 +#: builtin/am.c:2222

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

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

2675 +

2676 +#: builtin/am.c:2225

2677 +msgid "strip everything before a scissors line"

2678 +msgstr "retirer tout le contenu avant la ligne des ciseaux"

2679 +

2680 +#: builtin/am.c:2226 builtin/apply.c:4563

2681 +msgid "action"

2682 +msgstr "action"

2683 +

2684 +#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2685 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2686 +#: builtin/am.c:2254

2687 +msgid "pass it through git-apply"

2688 +msgstr "le passer jusqu'à git-apply"

2689 +

2690 +#: builtin/am.c:2235 builtin/apply.c:4587

2691 +msgid "root"

2692 +msgstr "racine"

2693 +

2694 +#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2695 +#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2696 +#: builtin/pull.c:167

2697 +msgid "path"

2698 +msgstr "chemin"

2699 +

2700 +#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2701 +#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

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

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

2704 +#: parse-options.h:134 parse-options.h:243

2705 +msgid "n"

2706 +msgstr "n"

2707 +

2708 +#: builtin/am.c:2247 builtin/apply.c:4531

2709 +msgid "num"

2710 +msgstr "num"

2711 +

2712 +#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2713 +msgid "format"

2714 +msgstr "format"

2715 +

2716 +#: builtin/am.c:2251

2717 +msgid "format the patch(es) are in"

2718 +msgstr "format de présentation des patchs"

2719 +

2720 +#: builtin/am.c:2257

2721 +msgid "override error message when patch failure occurs"

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

2723 +

2724 +#: builtin/am.c:2259

2725 +msgid "continue applying patches after resolving a conflict"

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

2727 +

2728 +#: builtin/am.c:2262

2729 +msgid "synonyms for --continue"

2730 +msgstr "synonymes de --continue"

2731 +

2732 +#: builtin/am.c:2265

2733 +msgid "skip the current patch"

2734 +msgstr "sauter le patch courant"

2735 +

2736 +#: builtin/am.c:2268

2737 +msgid "restore the original branch and abort the patching operation."

2738 +msgstr "restaurer la branche originale et abandonner les applications de patch."

2739 +

2740 +#: builtin/am.c:2272

2741 +msgid "lie about committer date"

2742 +msgstr "mentir sur la date de validation"

2743 +

2744 +#: builtin/am.c:2274

2745 +msgid "use current timestamp for author date"

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

2747 +

2748 +#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2749 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2750 +msgid "key-id"

2751 +msgstr "id de clé"

2752 +

2753 +#: builtin/am.c:2277

2754 +msgid "GPG-sign commits"

2755 +msgstr "signer les commits avec GPG"

2756 +

2757 +#: builtin/am.c:2280

2758 +msgid "(internal use for git-rebase)"

2759 +msgstr "(utilisation interne pour git-rebase)"

2760 +

2761 +#: builtin/am.c:2295

2762 +msgid ""

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

2764 +"it will be removed. Please do not use it anymore."

2765 +msgstr ""

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

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

2768 +

2769 +#: builtin/am.c:2302

2770 +msgid "failed to read the index"

2771 +msgstr "échec à la lecture de l'index"

2772 +

2773 +#: builtin/am.c:2317

2774 +#, c-format

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

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

2777 +

2778 +#: builtin/am.c:2341

2779 +#, c-format

2780 +msgid ""

2781 +"Stray %s directory found.\n"

2782 +"Use \"git am --abort\" to remove it."

2783 +msgstr ""

2784 +"Répertoire abandonné %s trouvé.\n"

2785 +"Utilisez \"git am --abort\" pour le supprimer."

2786 +

2787 +#: builtin/am.c:2347

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

2789 +msgstr ""

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

2791 +"reprise."

2792 +

2793 #: builtin/apply.c:59

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

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

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

3062 msgid "Checking patch %s..."

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

3064

2562 -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

3065 +#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3066 #, c-format

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

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

@@ -2640,11 +3143,6 @@ msgstr "entrée non reconnue"

3143 msgid "unable to read index file"

3144 msgstr "lecture du fichier d'index impossible"

3145

2643 -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2644 -#: builtin/fetch.c:92

2645 -msgid "path"

2646 -msgstr "chemin"

2647 -

3146 #: builtin/apply.c:4526

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

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

@@ -2653,10 +3151,6 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

3151 msgid "apply changes matching the given path"

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

3153

2656 -#: builtin/apply.c:4531

2657 -msgid "num"

2658 -msgstr "num"

2659 -

3154 #: builtin/apply.c:4532

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

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

@@ -2715,10 +3209,6 @@ msgstr "les chemins sont séparés par un caractère NUL"

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

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

3211

2718 -#: builtin/apply.c:4563

2719 -msgid "action"

2720 -msgstr "action"

2721 -

3212 #: builtin/apply.c:4564

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

3214 msgstr ""

@@ -2755,10 +3245,6 @@ msgstr ""

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

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

3247

2758 -#: builtin/apply.c:4587

2759 -msgid "root"

2760 -msgstr "racine"

2761 -

3248 #: builtin/apply.c:4588

3249 msgid "prepend <root> to all filenames"

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

@@ -2841,11 +3327,11 @@ msgstr "effectuer 'git bisect next'"

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

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

3329

2844 -#: builtin/blame.c:31

3330 +#: builtin/blame.c:32

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

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

3333

2848 -#: builtin/blame.c:36

3334 +#: builtin/blame.c:37

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

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

3337

@@ -3033,282 +3519,282 @@ msgstr "branche de suivi '%s' non trouvée."

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

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

3521

3036 -#: builtin/branch.c:258

3522 +#: builtin/branch.c:259

3523 #, c-format

3524 msgid "Error deleting remote-tracking branch '%s'"

3525 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"

3526

3041 -#: builtin/branch.c:259

3527 +#: builtin/branch.c:260

3528 #, c-format

3529 msgid "Error deleting branch '%s'"

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

3531

3046 -#: builtin/branch.c:266

3532 +#: builtin/branch.c:267

3533 #, c-format

3534 msgid "Deleted remote-tracking branch %s (was %s).\n"

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

3536

3051 -#: builtin/branch.c:267

3537 +#: builtin/branch.c:268

3538 #, c-format

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

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

3541

3056 -#: builtin/branch.c:368

3542 +#: builtin/branch.c:369

3543 #, c-format

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

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

3546

3547 # féminin pour une branche

3062 -#: builtin/branch.c:451

3548 +#: builtin/branch.c:452

3549 #, c-format

3550 msgid "[%s: gone]"

3551 msgstr "[%s: disparue]"

3552

3067 -#: builtin/branch.c:456

3553 +#: builtin/branch.c:457

3554 #, c-format

3555 msgid "[%s]"

3556 msgstr "[%s]"

3557

3072 -#: builtin/branch.c:461

3558 +#: builtin/branch.c:462

3559 #, c-format

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

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

3562

3077 -#: builtin/branch.c:463

3563 +#: builtin/branch.c:464

3564 #, c-format

3565 msgid "[behind %d]"

3566 msgstr "[en retard de %d]"

3567

3082 -#: builtin/branch.c:467

3568 +#: builtin/branch.c:468

3569 #, c-format

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

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

3572

3087 -#: builtin/branch.c:469

3573 +#: builtin/branch.c:470

3574 #, c-format

3575 msgid "[ahead %d]"

3576 msgstr "[en avance de %d]"

3577

3092 -#: builtin/branch.c:472

3578 +#: builtin/branch.c:473

3579 #, c-format

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

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

3582

3097 -#: builtin/branch.c:475

3583 +#: builtin/branch.c:476

3584 #, c-format

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

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

3587

3102 -#: builtin/branch.c:488

3588 +#: builtin/branch.c:489

3589 msgid " **** invalid ref ****"

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

3591

3106 -#: builtin/branch.c:579

3592 +#: builtin/branch.c:580

3593 #, c-format

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

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

3596

3111 -#: builtin/branch.c:582

3597 +#: builtin/branch.c:583

3598 #, c-format

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

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

3601

3116 -#: builtin/branch.c:588

3602 +#: builtin/branch.c:589

3603 #, c-format

3604 msgid "(HEAD detached at %s)"

3605 msgstr "(HEAD détachée sur %s)"

3606

3121 -#: builtin/branch.c:591

3607 +#: builtin/branch.c:592

3608 #, c-format

3609 msgid "(HEAD detached from %s)"

3610 msgstr "(HEAD détachée depuis %s)"

3611

3126 -#: builtin/branch.c:595

3612 +#: builtin/branch.c:596

3613 msgid "(no branch)"

3614 msgstr "(aucune branche)"

3615

3130 -#: builtin/branch.c:642

3616 +#: builtin/branch.c:643

3617 #, c-format

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

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

3620

3135 -#: builtin/branch.c:690

3621 +#: builtin/branch.c:691

3622 msgid "some refs could not be read"

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

3624

3139 -#: builtin/branch.c:703

3625 +#: builtin/branch.c:704

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

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

3628

3143 -#: builtin/branch.c:713

3629 +#: builtin/branch.c:714

3630 #, c-format

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

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

3633

3148 -#: builtin/branch.c:728

3634 +#: builtin/branch.c:729

3635 msgid "Branch rename failed"

3636 msgstr "Échec de renommage de la branche"

3637

3152 -#: builtin/branch.c:732

3638 +#: builtin/branch.c:733

3639 #, c-format

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

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

3642

3157 -#: builtin/branch.c:736

3643 +#: builtin/branch.c:737

3644 #, c-format

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

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

3647

3162 -#: builtin/branch.c:743

3648 +#: builtin/branch.c:744

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

3650 msgstr ""

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

3652 "échoué"

3653

3168 -#: builtin/branch.c:758

3654 +#: builtin/branch.c:759

3655 #, c-format

3656 msgid "malformed object name %s"

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

3658

3173 -#: builtin/branch.c:780

3659 +#: builtin/branch.c:781

3660 #, c-format

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

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

3663

3178 -#: builtin/branch.c:810

3664 +#: builtin/branch.c:811

3665 msgid "Generic options"

3666 msgstr "Options génériques"

3667

3182 -#: builtin/branch.c:812

3668 +#: builtin/branch.c:813

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

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

3671

3186 -#: builtin/branch.c:813

3672 +#: builtin/branch.c:814

3673 msgid "suppress informational messages"

3674 msgstr "supprimer les messages d'information"

3675

3190 -#: builtin/branch.c:814

3676 +#: builtin/branch.c:815

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

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

3679

3194 -#: builtin/branch.c:816

3680 +#: builtin/branch.c:817

3681 msgid "change upstream info"

3682 msgstr "modifier l'information amont"

3683

3198 -#: builtin/branch.c:820

3684 +#: builtin/branch.c:821

3685 msgid "use colored output"

3686 msgstr "utiliser la coloration dans la sortie"

3687

3202 -#: builtin/branch.c:821

3688 +#: builtin/branch.c:822

3689 msgid "act on remote-tracking branches"

3690 msgstr "agir sur les branches de suivi distantes"

3691

3206 -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3207 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3208 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3209 -#: builtin/tag.c:622

3692 +#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3693 +#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3694 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3695 +#: builtin/tag.c:624

3696 msgid "commit"

3697 msgstr "commit"

3698

3213 -#: builtin/branch.c:825 builtin/branch.c:831

3699 +#: builtin/branch.c:826 builtin/branch.c:832

3700 msgid "print only branches that contain the commit"

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

3702

3217 -#: builtin/branch.c:837

3703 +#: builtin/branch.c:838

3704 msgid "Specific git-branch actions:"

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

3706

3221 -#: builtin/branch.c:838

3707 +#: builtin/branch.c:839

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

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

3710

3225 -#: builtin/branch.c:840

3711 +#: builtin/branch.c:841

3712 msgid "delete fully merged branch"

3713 msgstr "supprimer une branche totalement fusionnée"

3714

3229 -#: builtin/branch.c:841

3715 +#: builtin/branch.c:842

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

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

3718

3233 -#: builtin/branch.c:842

3719 +#: builtin/branch.c:843

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

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

3722

3237 -#: builtin/branch.c:843

3723 +#: builtin/branch.c:844

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

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

3726

3241 -#: builtin/branch.c:844

3727 +#: builtin/branch.c:845

3728 msgid "list branch names"

3729 msgstr "afficher les noms des branches"

3730

3245 -#: builtin/branch.c:845

3731 +#: builtin/branch.c:846

3732 msgid "create the branch's reflog"

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

3734

3249 -#: builtin/branch.c:847

3735 +#: builtin/branch.c:848

3736 msgid "edit the description for the branch"

3737 msgstr "éditer la description de la branche"

3738

3253 -#: builtin/branch.c:848

3739 +#: builtin/branch.c:849

3740 msgid "force creation, move/rename, deletion"

3741 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

3742

3257 -#: builtin/branch.c:851

3743 +#: builtin/branch.c:852

3744 msgid "print only not merged branches"

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

3746

3261 -#: builtin/branch.c:857

3747 +#: builtin/branch.c:858

3748 msgid "print only merged branches"

3749 msgstr "afficher seulement les branches fusionnées"

3750

3265 -#: builtin/branch.c:861

3751 +#: builtin/branch.c:862

3752 msgid "list branches in columns"

3753 msgstr "afficher les branches en colonnes"

3754

3269 -#: builtin/branch.c:874

3755 +#: builtin/branch.c:875

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

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

3758

3273 -#: builtin/branch.c:878 builtin/clone.c:622

3759 +#: builtin/branch.c:879 builtin/clone.c:690

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

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

3762

3277 -#: builtin/branch.c:900

3763 +#: builtin/branch.c:901

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

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

3766

3281 -#: builtin/branch.c:911 builtin/branch.c:950

3767 +#: builtin/branch.c:912 builtin/branch.c:951

3768 msgid "branch name required"

3769 msgstr "le nom de branche est requis"

3770

3285 -#: builtin/branch.c:926

3771 +#: builtin/branch.c:927

3772 msgid "Cannot give description to detached HEAD"

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

3774

3289 -#: builtin/branch.c:931

3775 +#: builtin/branch.c:932

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

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

3778

3293 -#: builtin/branch.c:938

3779 +#: builtin/branch.c:939

3780 #, c-format

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

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

3783

3298 -#: builtin/branch.c:941

3784 +#: builtin/branch.c:942

3785 #, c-format

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

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

3788

3303 -#: builtin/branch.c:956

3789 +#: builtin/branch.c:957

3790 msgid "too many branches for a rename operation"

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

3792

3307 -#: builtin/branch.c:961

3793 +#: builtin/branch.c:962

3794 msgid "too many branches to set new upstream"

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

3796

3311 -#: builtin/branch.c:965

3797 +#: builtin/branch.c:966

3798 #, c-format

3799 msgid ""

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

@@ -3316,41 +3802,41 @@ msgstr ""

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

3803 "aucune branche."

3804

3319 -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3805 +#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3806 #, c-format

3807 msgid "no such branch '%s'"

3808 msgstr "pas de branche '%s'"

3809

3324 -#: builtin/branch.c:972

3810 +#: builtin/branch.c:973

3811 #, c-format

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

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

3814

3329 -#: builtin/branch.c:984

3815 +#: builtin/branch.c:985

3816 msgid "too many branches to unset upstream"

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

3818

3333 -#: builtin/branch.c:988

3819 +#: builtin/branch.c:989

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

3821 msgstr ""

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

3823 "aucune branche."

3824

3339 -#: builtin/branch.c:994

3825 +#: builtin/branch.c:995

3826 #, c-format

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

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

3829

3344 -#: builtin/branch.c:1008

3830 +#: builtin/branch.c:1009

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

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

3833

3348 -#: builtin/branch.c:1014

3834 +#: builtin/branch.c:1015

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

3836 msgstr ""

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

3838

3353 -#: builtin/branch.c:1017

3839 +#: builtin/branch.c:1018

3840 #, c-format

3841 msgid ""

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

@@ -3359,7 +3845,7 @@ msgstr ""

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

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

3847

3362 -#: builtin/branch.c:1034

3848 +#: builtin/branch.c:1035

3849 #, c-format

3850 msgid ""

3851 "\n"

@@ -3370,12 +3856,12 @@ msgstr ""

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

3857 "\n"

3858

3373 -#: builtin/branch.c:1035

3859 +#: builtin/branch.c:1036

3860 #, c-format

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

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

3863

3378 -#: builtin/branch.c:1036

3864 +#: builtin/branch.c:1037

3865 #, c-format

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

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

@@ -3393,7 +3879,7 @@ msgstr "La création d'un colis requiert un dépôt."

3879 msgid "Need a repository to unbundle."

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

3881

3396 -#: builtin/cat-file.c:369

3882 +#: builtin/cat-file.c:428

3883 msgid ""

3884 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3885 "<type>|--textconv) <object>"

@@ -3401,56 +3887,64 @@ msgstr ""

3887 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "

3888 "| <type> | --textconv) <objet>"

3889

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

3890 +#: builtin/cat-file.c:429

3891 msgid ""

3892 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3893 "objects>"

3894 msgstr ""

3895 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"

3896

3411 -#: builtin/cat-file.c:407

3897 +#: builtin/cat-file.c:466

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

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

3900

3415 -#: builtin/cat-file.c:408

3901 +#: builtin/cat-file.c:467

3902 msgid "show object type"

3903 msgstr "afficher le type de l'objet"

3904

3419 -#: builtin/cat-file.c:409

3905 +#: builtin/cat-file.c:468

3906 msgid "show object size"

3907 msgstr "afficher la taille de l'objet"

3908

3423 -#: builtin/cat-file.c:411

3909 +#: builtin/cat-file.c:470

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

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

3912

3427 -#: builtin/cat-file.c:412

3913 +#: builtin/cat-file.c:471

3914 msgid "pretty-print object's content"

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

3916

3431 -#: builtin/cat-file.c:414

3917 +#: builtin/cat-file.c:473

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

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

3920

3435 -#: builtin/cat-file.c:416

3921 +#: builtin/cat-file.c:475

3922 msgid "allow -s and -t to work with broken/corrupt objects"

3923 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"

3924

3439 -#: builtin/cat-file.c:418

3925 +#: builtin/cat-file.c:476

3926 +msgid "buffer --batch output"

3927 +msgstr "bufferiser la sortie de --batch"

3928 +

3929 +#: builtin/cat-file.c:478

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

3931 msgstr ""

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

3933

3444 -#: builtin/cat-file.c:421

3934 +#: builtin/cat-file.c:481

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

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

3937

3448 -#: builtin/cat-file.c:424

3938 +#: builtin/cat-file.c:484

3939 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3940 msgstr ""

3941 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"

3942 "batch ou --batch-check)"

3943

3944 +#: builtin/cat-file.c:486

3945 +msgid "show all objects with --batch or --batch-check"

3946 +msgstr "montrer tous les objets avec --batch ou --batch-check"

3947 +

3948 #: builtin/check-attr.c:11

3949 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3950 msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."

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

3971 msgstr ""

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

3973

3480 -#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3974 +#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3975 msgid "suppress progress reporting"

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

3977

@@ -3576,115 +4070,115 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>"

4070 msgid "copy out the files from named stage"

4071 msgstr "copier les fichiers depuis l'index nommé"

4072

3579 -#: builtin/checkout.c:24

4073 +#: builtin/checkout.c:25

4074 msgid "git checkout [<options>] <branch>"

4075 msgstr "git checkout [<options>] <branche>"

4076

3583 -#: builtin/checkout.c:25

4077 +#: builtin/checkout.c:26

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

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

4080

3587 -#: builtin/checkout.c:134 builtin/checkout.c:167

4081 +#: builtin/checkout.c:133 builtin/checkout.c:166

4082 #, c-format

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

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

4085

3592 -#: builtin/checkout.c:136 builtin/checkout.c:169

4086 +#: builtin/checkout.c:135 builtin/checkout.c:168

4087 #, c-format

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

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

4090

3597 -#: builtin/checkout.c:152

4091 +#: builtin/checkout.c:151

4092 #, c-format

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

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

4095

3602 -#: builtin/checkout.c:196

4096 +#: builtin/checkout.c:195

4097 #, c-format

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

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

4100

3607 -#: builtin/checkout.c:213

4101 +#: builtin/checkout.c:212

4102 #, c-format

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

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

4105

3612 -#: builtin/checkout.c:230

4106 +#: builtin/checkout.c:229

4107 #, c-format

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

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

4110

3617 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3618 -#: builtin/checkout.c:260

4111 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4112 +#: builtin/checkout.c:259

4113 #, c-format

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

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

4116

3623 -#: builtin/checkout.c:263 builtin/checkout.c:266

4117 +#: builtin/checkout.c:262 builtin/checkout.c:265

4118 #, c-format

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

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

4121

3628 -#: builtin/checkout.c:269

4122 +#: builtin/checkout.c:268

4123 #, c-format

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

4125 msgstr ""

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

4127 "même temps."

4128

3635 -#: builtin/checkout.c:280 builtin/checkout.c:474

4129 +#: builtin/checkout.c:279 builtin/checkout.c:473

4130 msgid "corrupt index file"

4131 msgstr "fichier d'index corrompu"

4132

3639 -#: builtin/checkout.c:340 builtin/checkout.c:347

4133 +#: builtin/checkout.c:339 builtin/checkout.c:346

4134 #, c-format

4135 msgid "path '%s' is unmerged"

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

4137

3644 -#: builtin/checkout.c:496

4138 +#: builtin/checkout.c:495

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

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

4141

3648 -#: builtin/checkout.c:627

4142 +#: builtin/checkout.c:622

4143 #, c-format

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

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

4144 +msgid "Can not do reflog for '%s': %s\n"

4145 +msgstr "Impossible de faire un reflog pour '%s' : %s\n"

4146

3653 -#: builtin/checkout.c:663

4147 +#: builtin/checkout.c:660

4148 msgid "HEAD is now at"

4149 msgstr "HEAD est maintenant sur"

4150

3657 -#: builtin/checkout.c:670

4151 +#: builtin/checkout.c:667

4152 #, c-format

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

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

4155

3662 -#: builtin/checkout.c:673

4156 +#: builtin/checkout.c:670

4157 #, c-format

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

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

4160

3667 -#: builtin/checkout.c:677

4161 +#: builtin/checkout.c:674

4162 #, c-format

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

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

4165

3672 -#: builtin/checkout.c:679 builtin/checkout.c:1134

4166 +#: builtin/checkout.c:676 builtin/checkout.c:1065

4167 #, c-format

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

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

4170

3677 -#: builtin/checkout.c:681

4171 +#: builtin/checkout.c:678

4172 #, c-format

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

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

4175

3682 -#: builtin/checkout.c:733

4176 +#: builtin/checkout.c:730

4177 #, c-format

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

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

4180

3687 -#: builtin/checkout.c:739

4181 +#: builtin/checkout.c:736

4182 #, c-format

4183 msgid ""

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

@@ -3707,7 +4201,7 @@ msgstr[1] ""

4201 "\n"

4202 "%s\n"

4203

3710 -#: builtin/checkout.c:758

4204 +#: builtin/checkout.c:755

4205 #, c-format

4206 msgid ""

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

@@ -3736,150 +4230,145 @@ msgstr[1] ""

4230 "git branch <nouvelle-branche> %s\n"

4231 "\n"

4232

3739 -#: builtin/checkout.c:794

4233 +#: builtin/checkout.c:791

4234 msgid "internal error in revision walk"

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

4236

3743 -#: builtin/checkout.c:798

4237 +#: builtin/checkout.c:795

4238 msgid "Previous HEAD position was"

4239 msgstr "La position précédente de HEAD était sur"

4240

3747 -#: builtin/checkout.c:825 builtin/checkout.c:1129

4241 +#: builtin/checkout.c:822 builtin/checkout.c:1060

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

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

4244

3751 -#: builtin/checkout.c:931

3752 -#, c-format

3753 -msgid "'%s' is already checked out at '%s'"

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

3755 -

3756 -#: builtin/checkout.c:1036

4245 +#: builtin/checkout.c:967

4246 #, c-format

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

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

4249

3761 -#: builtin/checkout.c:1075

4250 +#: builtin/checkout.c:1006 builtin/worktree.c:210

4251 #, c-format

4252 msgid "invalid reference: %s"

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

4254

3766 -#: builtin/checkout.c:1104

4255 +#: builtin/checkout.c:1035

4256 #, c-format

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

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

4259

3771 -#: builtin/checkout.c:1143

4260 +#: builtin/checkout.c:1074

4261 msgid "paths cannot be used with switching branches"

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

4263

3775 -#: builtin/checkout.c:1146 builtin/checkout.c:1150

4264 +#: builtin/checkout.c:1077 builtin/checkout.c:1081

4265 #, c-format

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

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

4268

3780 -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3781 -#: builtin/checkout.c:1165

4269 +#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4270 +#: builtin/checkout.c:1096

4271 #, c-format

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

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

4274

3786 -#: builtin/checkout.c:1170

4275 +#: builtin/checkout.c:1101

4276 #, c-format

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

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

4279

3791 -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3792 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3793 -#: builtin/worktree.c:284

4280 +#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4281 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4282 +#: builtin/worktree.c:319

4283 msgid "branch"

4284 msgstr "branche"

4285

3797 -#: builtin/checkout.c:1204

4286 +#: builtin/checkout.c:1135

4287 msgid "create and checkout a new branch"

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

4289

3801 -#: builtin/checkout.c:1206

4290 +#: builtin/checkout.c:1137

4291 msgid "create/reset and checkout a branch"

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

4293

3805 -#: builtin/checkout.c:1207

4294 +#: builtin/checkout.c:1138

4295 msgid "create reflog for new branch"

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

4297

3809 -#: builtin/checkout.c:1208

4298 +#: builtin/checkout.c:1139

4299 msgid "detach the HEAD at named commit"

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

4301

3813 -#: builtin/checkout.c:1209

4302 +#: builtin/checkout.c:1140

4303 msgid "set upstream info for new branch"

4304 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

4305

3817 -#: builtin/checkout.c:1211

4306 +#: builtin/checkout.c:1142

4307 msgid "new-branch"

4308 msgstr "nouvelle branche"

4309

3821 -#: builtin/checkout.c:1211

4310 +#: builtin/checkout.c:1142

4311 msgid "new unparented branch"

4312 msgstr "nouvelle branche sans parent"

4313

3825 -#: builtin/checkout.c:1212

4314 +#: builtin/checkout.c:1143

4315 msgid "checkout our version for unmerged files"

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

4317

3829 -#: builtin/checkout.c:1214

4318 +#: builtin/checkout.c:1145

4319 msgid "checkout their version for unmerged files"

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

4321

3833 -#: builtin/checkout.c:1216

4322 +#: builtin/checkout.c:1147

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

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

4325

3837 -#: builtin/checkout.c:1217

4326 +#: builtin/checkout.c:1148

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

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

4329

3841 -#: builtin/checkout.c:1218 builtin/merge.c:227

4330 +#: builtin/checkout.c:1149 builtin/merge.c:227

4331 msgid "update ignored files (default)"

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

4333

3845 -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

4334 +#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4335 msgid "style"

4336 msgstr "style"

4337

3849 -#: builtin/checkout.c:1220

4338 +#: builtin/checkout.c:1151

4339 msgid "conflict style (merge or diff3)"

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

4341

3853 -#: builtin/checkout.c:1223

4342 +#: builtin/checkout.c:1154

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

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

4345

3857 -#: builtin/checkout.c:1225

4346 +#: builtin/checkout.c:1156

4347 msgid "second guess 'git checkout <no-such-branch>'"

4348 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

4349

3861 -#: builtin/checkout.c:1227

4350 +#: builtin/checkout.c:1158

4351 msgid "do not check if another worktree is holding the given ref"

4352 msgstr ""

4353 "ne pas vérifier si une autre copie de travail contient le référence fournie"

4354

3866 -#: builtin/checkout.c:1252

4355 +#: builtin/checkout.c:1181

4356 msgid "-b, -B and --orphan are mutually exclusive"

4357 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

4358

3870 -#: builtin/checkout.c:1269

4359 +#: builtin/checkout.c:1198

4360 msgid "--track needs a branch name"

4361 msgstr "--track requiert un nom de branche"

4362

3874 -#: builtin/checkout.c:1274

4363 +#: builtin/checkout.c:1203

4364 msgid "Missing branch name; try -b"

4365 msgstr "Nom de branche manquant ; essayez -b"

4366

3878 -#: builtin/checkout.c:1310

4367 +#: builtin/checkout.c:1239

4368 msgid "invalid path specification"

4369 msgstr "spécification de chemin invalide"

4370

3882 -#: builtin/checkout.c:1317

4371 +#: builtin/checkout.c:1246

4372 #, c-format

4373 msgid ""

4374 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3889,12 +4378,12 @@ msgstr ""

4378 "en même temps.\n"

4379 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

4380

3892 -#: builtin/checkout.c:1322

4381 +#: builtin/checkout.c:1251

4382 #, c-format

4383 msgid "git checkout: --detach does not take a path argument '%s'"

4384 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

4385

3897 -#: builtin/checkout.c:1326

4386 +#: builtin/checkout.c:1255

4387 msgid ""

4388 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4389 "checking out of the index."

@@ -3902,38 +4391,38 @@ msgstr ""

4391 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"

4392 "de l'extraction de l'index."

4393

3905 -#: builtin/clean.c:26

4394 +#: builtin/clean.c:25

4395 msgid ""

4396 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

4397 msgstr ""

4398 "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."

4399

3911 -#: builtin/clean.c:30

4400 +#: builtin/clean.c:29

4401 #, c-format

4402 msgid "Removing %s\n"

4403 msgstr "Suppression de %s\n"

4404

3916 -#: builtin/clean.c:31

4405 +#: builtin/clean.c:30

4406 #, c-format

4407 msgid "Would remove %s\n"

4408 msgstr "Supprimerait %s\n"

4409

3921 -#: builtin/clean.c:32

4410 +#: builtin/clean.c:31

4411 #, c-format

4412 msgid "Skipping repository %s\n"

4413 msgstr "Ignore le dépôt %s\n"

4414

3926 -#: builtin/clean.c:33

4415 +#: builtin/clean.c:32

4416 #, c-format

4417 msgid "Would skip repository %s\n"

4418 msgstr "Ignorerait le dépôt %s\n"

4419

3931 -#: builtin/clean.c:34

4420 +#: builtin/clean.c:33

4421 #, c-format

4422 msgid "failed to remove %s"

4423 msgstr "échec de la suppression de %s"

4424

3936 -#: builtin/clean.c:295

4425 +#: builtin/clean.c:317

4426 msgid ""

4427 "Prompt help:\n"

4428 "1 - select a numbered item\n"

@@ -3945,7 +4434,7 @@ msgstr ""

4434 "foo - sélectionner un élément par un préfixe unique\n"

4435 " - (vide) ne rien sélectionner"

4436

3948 -#: builtin/clean.c:299

4437 +#: builtin/clean.c:321

4438 msgid ""

4439 "Prompt help:\n"

4440 "1 - select a single item\n"

@@ -3965,36 +4454,36 @@ msgstr ""

4454 "* - choisir tous les éléments\n"

4455 " - (vide) terminer la sélection"

4456

3968 -#: builtin/clean.c:515

4457 +#: builtin/clean.c:537

4458 #, c-format

4459 msgid "Huh (%s)?"

4460 msgstr "Hein (%s) ?"

4461

3973 -#: builtin/clean.c:657

4462 +#: builtin/clean.c:679

4463 #, c-format

4464 msgid "Input ignore patterns>> "

4465 msgstr "Entrez les motifs à ignorer>> "

4466

3978 -#: builtin/clean.c:694

4467 +#: builtin/clean.c:716

4468 #, c-format

4469 msgid "WARNING: Cannot find items matched by: %s"

4470 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

4471

3983 -#: builtin/clean.c:715

4472 +#: builtin/clean.c:737

4473 msgid "Select items to delete"

4474 msgstr "Sélectionner les éléments à supprimer"

4475

4476 #. TRANSLATORS: Make sure to keep [y/N] as is

3988 -#: builtin/clean.c:756

4477 +#: builtin/clean.c:778

4478 #, c-format

4479 msgid "Remove %s [y/N]? "

4480 msgstr "Supprimer %s [y/N] ? "

4481

3993 -#: builtin/clean.c:781

4482 +#: builtin/clean.c:803

4483 msgid "Bye."

4484 msgstr "Au revoir."

4485

3997 -#: builtin/clean.c:789

4486 +#: builtin/clean.c:811

4487 msgid ""

4488 "clean - start cleaning\n"

4489 "filter by pattern - exclude items from deletion\n"

@@ -4012,62 +4501,62 @@ msgstr ""

4501 "help - cet écran\n"

4502 "? - aide pour la sélection en ligne"

4503

4015 -#: builtin/clean.c:816

4504 +#: builtin/clean.c:838

4505 msgid "*** Commands ***"

4506 msgstr "*** Commandes ***"

4507

4019 -#: builtin/clean.c:817

4508 +#: builtin/clean.c:839

4509 msgid "What now"

4510 msgstr "Et maintenant ?"

4511

4023 -#: builtin/clean.c:825

4512 +#: builtin/clean.c:847

4513 msgid "Would remove the following item:"

4514 msgid_plural "Would remove the following items:"

4515 msgstr[0] "Supprimerait l'élément suivant :"

4516 msgstr[1] "Supprimerait les éléments suivants :"

4517

4029 -#: builtin/clean.c:842

4518 +#: builtin/clean.c:864

4519 msgid "No more files to clean, exiting."

4520 msgstr "Plus de fichier à nettoyer, sortie."

4521

4033 -#: builtin/clean.c:873

4522 +#: builtin/clean.c:895

4523 msgid "do not print names of files removed"

4524 msgstr "ne pas afficher les noms des fichiers supprimés"

4525

4037 -#: builtin/clean.c:875

4526 +#: builtin/clean.c:897

4527 msgid "force"

4528 msgstr "forcer"

4529

4041 -#: builtin/clean.c:876

4530 +#: builtin/clean.c:898

4531 msgid "interactive cleaning"

4532 msgstr "nettoyage interactif"

4533

4045 -#: builtin/clean.c:878

4534 +#: builtin/clean.c:900

4535 msgid "remove whole directories"

4536 msgstr "supprimer les répertoires entiers"

4537

4049 -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

4538 +#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4539 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4540 msgid "pattern"

4541 msgstr "motif"

4542

4054 -#: builtin/clean.c:880

4543 +#: builtin/clean.c:902

4544 msgid "add <pattern> to ignore rules"

4545 msgstr "ajouter <motif> aux règles ignore"

4546

4058 -#: builtin/clean.c:881

4547 +#: builtin/clean.c:903

4548 msgid "remove ignored files, too"

4549 msgstr "supprimer les fichiers ignorés, aussi"

4550

4062 -#: builtin/clean.c:883

4551 +#: builtin/clean.c:905

4552 msgid "remove only ignored files"

4553 msgstr "supprimer seulement les fichiers ignorés"

4554

4066 -#: builtin/clean.c:901

4555 +#: builtin/clean.c:923

4556 msgid "-x and -X cannot be used together"

4557 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

4558

4070 -#: builtin/clean.c:905

4559 +#: builtin/clean.c:927

4560 msgid ""

4561 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4562 "clean"

@@ -4075,7 +4564,7 @@ msgstr ""

4564 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

4565 "nettoyer"

4566

4078 -#: builtin/clean.c:908

4567 +#: builtin/clean.c:930

4568 msgid ""

4569 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4570 "refusing to clean"

@@ -4087,8 +4576,8 @@ msgstr ""

4576 msgid "git clone [<options>] [--] <repo> [<dir>]"

4577 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

4578

4090 -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

4091 -#: builtin/push.c:523

4579 +#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4580 +#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4581 msgid "force progress reporting"

4582 msgstr "forcer l'affichage de l'état d'avancement"

4583

@@ -4096,7 +4585,7 @@ msgstr "forcer l'affichage de l'état d'avancement"

4585 msgid "don't create a checkout"

4586 msgstr "ne pas créer d'extraction"

4587

4099 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4588 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4589 msgid "create a bare repository"

4590 msgstr "créer un dépôt nu"

4591

@@ -4120,11 +4609,11 @@ msgstr "régler comme dépôt partagé"

4609 msgid "initialize submodules in the clone"

4610 msgstr "initialiser les sous-modules dans le clone"

4611

4123 -#: builtin/clone.c:75 builtin/init-db.c:500

4612 +#: builtin/clone.c:75 builtin/init-db.c:501

4613 msgid "template-directory"

4614 msgstr "répertoire-modèle"

4615

4127 -#: builtin/clone.c:76 builtin/init-db.c:501

4616 +#: builtin/clone.c:76 builtin/init-db.c:502

4617 msgid "directory from which templates will be used"

4618 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4619

@@ -4152,7 +4641,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4641 msgid "path to git-upload-pack on the remote"

4642 msgstr "chemin vers git-upload-pack sur le serveur distant"

4643

4155 -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4644 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4645 +#: builtin/pull.c:186

4646 msgid "depth"

4647 msgstr "profondeur"

4648

@@ -4164,11 +4654,11 @@ msgstr "créer un clone superficiel de cette profondeur"

4654 msgid "clone only one branch, HEAD or --branch"

4655 msgstr "cloner seulement une branche, HEAD ou --branch"

4656

4167 -#: builtin/clone.c:91 builtin/init-db.c:509

4657 +#: builtin/clone.c:91 builtin/init-db.c:510

4658 msgid "gitdir"

4659 msgstr "gitdir"

4660

4171 -#: builtin/clone.c:92 builtin/init-db.c:510

4661 +#: builtin/clone.c:92 builtin/init-db.c:511

4662 msgid "separate git dir from working tree"

4663 msgstr "séparer le répertoire git de la copie de travail"

4664

@@ -4180,57 +4670,52 @@ msgstr "clé=valeur"

4670 msgid "set config inside the new repository"

4671 msgstr "régler la configuration dans le nouveau dépôt"

4672

4183 -#: builtin/clone.c:240

4673 +#: builtin/clone.c:298

4674 #, c-format

4675 msgid "reference repository '%s' is not a local repository."

4676 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

4677

4188 -#: builtin/clone.c:244

4678 +#: builtin/clone.c:302

4679 #, c-format

4680 msgid "reference repository '%s' is shallow"

4681 msgstr "le dépôt de référence '%s' est superficiel"

4682

4193 -#: builtin/clone.c:247

4683 +#: builtin/clone.c:305

4684 #, c-format

4685 msgid "reference repository '%s' is grafted"

4686 msgstr "le dépôt de référence '%s' est greffé"

4687

4198 -#: builtin/clone.c:310

4199 -#, c-format

4200 -msgid "failed to create directory '%s'"

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

4202 -

4203 -#: builtin/clone.c:312 builtin/diff.c:84

4688 +#: builtin/clone.c:370 builtin/diff.c:84

4689 #, c-format

4690 msgid "failed to stat '%s'"

4691 msgstr "échec du stat de '%s'"

4692

4208 -#: builtin/clone.c:314

4693 +#: builtin/clone.c:372

4694 #, c-format

4695 msgid "%s exists and is not a directory"

4696 msgstr "%s existe et n'est pas un répertoire"

4697

4213 -#: builtin/clone.c:328

4698 +#: builtin/clone.c:386

4699 #, c-format

4700 msgid "failed to stat %s\n"

4701 msgstr "échec du stat de %s\n"

4702

4218 -#: builtin/clone.c:350

4703 +#: builtin/clone.c:408

4704 #, c-format

4705 msgid "failed to create link '%s'"

4706 msgstr "échec de la création du lien '%s'"

4707

4223 -#: builtin/clone.c:354

4708 +#: builtin/clone.c:412

4709 #, c-format

4710 msgid "failed to copy file to '%s'"

4711 msgstr "échec de la copie vers '%s'"

4712

4228 -#: builtin/clone.c:377 builtin/clone.c:551

4713 +#: builtin/clone.c:435 builtin/clone.c:619

4714 #, c-format

4715 msgid "done.\n"

4716 msgstr "fait.\n"

4717

4233 -#: builtin/clone.c:389

4718 +#: builtin/clone.c:447

4719 msgid ""

4720 "Clone succeeded, but checkout failed.\n"

4721 "You can inspect what was checked out with 'git status'\n"

@@ -4240,125 +4725,125 @@ msgstr ""

4725 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4726 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4727

4243 -#: builtin/clone.c:466

4728 +#: builtin/clone.c:524

4729 #, c-format

4730 msgid "Could not find remote branch %s to clone."

4731 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4732

4248 -#: builtin/clone.c:546

4733 +#: builtin/clone.c:614

4734 #, c-format

4735 msgid "Checking connectivity... "

4736 msgstr "Vérification de la connectivité... "

4737

4253 -#: builtin/clone.c:549

4738 +#: builtin/clone.c:617

4739 msgid "remote did not send all necessary objects"

4740 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4741

4257 -#: builtin/clone.c:613

4742 +#: builtin/clone.c:681

4743 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4744 msgstr ""

4745 "la HEAD distante réfère à une référence non existante, impossible de "

4746 "l'extraire.\n"

4747

4263 -#: builtin/clone.c:644

4748 +#: builtin/clone.c:712

4749 msgid "unable to checkout working tree"

4750 msgstr "impossible d'extraire la copie de travail"

4751

4267 -#: builtin/clone.c:731

4752 +#: builtin/clone.c:799

4753 msgid "cannot repack to clean up"

4754 msgstr "impossible de remballer pour nettoyer"

4755

4271 -#: builtin/clone.c:733

4756 +#: builtin/clone.c:801

4757 msgid "cannot unlink temporary alternates file"

4758 msgstr "impossible de unlinker le fichier temporaire alternates"

4759

4275 -#: builtin/clone.c:763

4760 +#: builtin/clone.c:831

4761 msgid "Too many arguments."

4762 msgstr "Trop d'arguments."

4763

4279 -#: builtin/clone.c:767

4764 +#: builtin/clone.c:835

4765 msgid "You must specify a repository to clone."

4766 msgstr "Vous devez spécifier un dépôt à cloner."

4767

4283 -#: builtin/clone.c:778

4768 +#: builtin/clone.c:846

4769 #, c-format

4770 msgid "--bare and --origin %s options are incompatible."

4771 msgstr "les options --bare et --origin %s sont incompatibles."

4772

4288 -#: builtin/clone.c:781

4773 +#: builtin/clone.c:849

4774 msgid "--bare and --separate-git-dir are incompatible."

4775 msgstr "--bare et --separate-git-dir sont incompatibles."

4776

4292 -#: builtin/clone.c:794

4777 +#: builtin/clone.c:862

4778 #, c-format

4779 msgid "repository '%s' does not exist"

4780 msgstr "le dépôt '%s' n'existe pas"

4781

4297 -#: builtin/clone.c:800 builtin/fetch.c:1160

4782 +#: builtin/clone.c:868 builtin/fetch.c:1168

4783 #, c-format

4784 msgid "depth %s is not a positive number"

4785 msgstr "la profondeur %s n'est pas un entier positif"

4786

4302 -#: builtin/clone.c:810

4787 +#: builtin/clone.c:878

4788 #, c-format

4789 msgid "destination path '%s' already exists and is not an empty directory."

4790 msgstr ""

4791 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4792

4308 -#: builtin/clone.c:820

4793 +#: builtin/clone.c:888

4794 #, c-format

4795 msgid "working tree '%s' already exists."

4796 msgstr "la copie de travail '%s' existe déjà."

4797

4313 -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4314 -#: builtin/worktree.c:220

4798 +#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4799 +#: builtin/worktree.c:245

4800 #, c-format

4801 msgid "could not create leading directories of '%s'"

4802 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4803

4319 -#: builtin/clone.c:838

4804 +#: builtin/clone.c:906

4805 #, c-format

4806 msgid "could not create work tree dir '%s'"

4807 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

4808

4324 -#: builtin/clone.c:856

4809 +#: builtin/clone.c:924

4810 #, c-format

4811 msgid "Cloning into bare repository '%s'...\n"

4812 msgstr "Clonage dans le dépôt nu '%s'\n"

4813

4329 -#: builtin/clone.c:858

4814 +#: builtin/clone.c:926

4815 #, c-format

4816 msgid "Cloning into '%s'...\n"

4817 msgstr "Clonage dans '%s'...\n"

4818

4334 -#: builtin/clone.c:883

4819 +#: builtin/clone.c:951

4820 msgid "--dissociate given, but there is no --reference"

4821 msgstr "--dissociate est spécifié, mais --reference est absent"

4822

4338 -#: builtin/clone.c:900

4823 +#: builtin/clone.c:968

4824 msgid "--depth is ignored in local clones; use file:// instead."

4825 msgstr ""

4826 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4827

4343 -#: builtin/clone.c:903

4828 +#: builtin/clone.c:971

4829 msgid "source repository is shallow, ignoring --local"

4830 msgstr "le dépôt source est superficiel, option --local ignorée"

4831

4347 -#: builtin/clone.c:908

4832 +#: builtin/clone.c:976

4833 msgid "--local is ignored"

4834 msgstr "--local est ignoré"

4835

4351 -#: builtin/clone.c:912

4836 +#: builtin/clone.c:980

4837 #, c-format

4838 msgid "Don't know how to clone %s"

4839 msgstr "Je ne sais pas cloner %s"

4840

4356 -#: builtin/clone.c:961 builtin/clone.c:969

4841 +#: builtin/clone.c:1029 builtin/clone.c:1037

4842 #, c-format

4843 msgid "Remote branch %s not found in upstream %s"

4844 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4845

4361 -#: builtin/clone.c:972

4846 +#: builtin/clone.c:1040

4847 msgid "You appear to have cloned an empty repository."

4848 msgstr "Vous semblez avoir cloné un dépôt vide."

4849

@@ -4505,66 +4990,62 @@ msgstr ""

4990 msgid "failed to unpack HEAD tree object"

4991 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4992

4508 -#: builtin/commit.c:344

4993 +#: builtin/commit.c:345

4994 msgid "unable to create temporary index"

4995 msgstr "impossible de créer l'index temporaire"

4996

4512 -#: builtin/commit.c:350

4997 +#: builtin/commit.c:351

4998 msgid "interactive add failed"

4999 msgstr "échec de l'ajout interactif"

5000

4516 -#: builtin/commit.c:361

4517 -msgid "unable to write index file"

4518 -msgstr "impossible d'écrire le fichier d'index"

4519 -

4520 -#: builtin/commit.c:363

5001 +#: builtin/commit.c:364

5002 msgid "unable to update temporary index"

5003 msgstr "impossible de mettre à jour l'index temporaire"

5004

4524 -#: builtin/commit.c:365

5005 +#: builtin/commit.c:366

5006 msgid "Failed to update main cache tree"

5007 msgstr "Impossible de mettre à jour l'arbre de cache principal"

5008

4528 -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463

5009 +#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

5010 msgid "unable to write new_index file"

5011 msgstr "impossible d'écrire le fichier new_index"

5012

4532 -#: builtin/commit.c:445

5013 +#: builtin/commit.c:444

5014 msgid "cannot do a partial commit during a merge."

5015 msgstr "impossible de faire une validation partielle pendant une fusion."

5016

4536 -#: builtin/commit.c:447

5017 +#: builtin/commit.c:446

5018 msgid "cannot do a partial commit during a cherry-pick."

5019 msgstr "impossible de faire une validation partielle pendant un picorage."

5020

4540 -#: builtin/commit.c:456

5021 +#: builtin/commit.c:455

5022 msgid "cannot read the index"

5023 msgstr "impossible de lire l'index"

5024

4544 -#: builtin/commit.c:475

5025 +#: builtin/commit.c:474

5026 msgid "unable to write temporary index file"

5027 msgstr "impossible d'écrire le fichier d'index temporaire"

5028

4548 -#: builtin/commit.c:580

5029 +#: builtin/commit.c:579

5030 #, c-format

5031 msgid "commit '%s' lacks author header"

5032 msgstr "entête d'auteur manquant dans le commit '%s'"

5033

4553 -#: builtin/commit.c:582

5034 +#: builtin/commit.c:581

5035 #, c-format

5036 msgid "commit '%s' has malformed author line"

5037 msgstr "le commit '%s' a une ligne d'auteur malformée"

5038

4558 -#: builtin/commit.c:601

5039 +#: builtin/commit.c:600

5040 msgid "malformed --author parameter"

5041 msgstr "paramètre --author mal formé"

5042

4562 -#: builtin/commit.c:609

5043 +#: builtin/commit.c:608

5044 #, c-format

5045 msgid "invalid date format: %s"

5046 msgstr "format de date invalide : %s"

5047

4567 -#: builtin/commit.c:653

5048 +#: builtin/commit.c:652

5049 msgid ""

5050 "unable to select a comment character that is not used\n"

5051 "in the current commit message"

@@ -4572,43 +5053,38 @@ msgstr ""

5053 "impossible de sélectionner un caractère de commentaire\n"

5054 "qui n'est pas utilisé dans le message de validation actuel"

5055

4575 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5056 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

5057 #, c-format

5058 msgid "could not lookup commit %s"

5059 msgstr "impossible de rechercher le commit %s"

5060

4580 -#: builtin/commit.c:702 builtin/shortlog.c:273

5061 +#: builtin/commit.c:701 builtin/shortlog.c:273

5062 #, c-format

5063 msgid "(reading log message from standard input)\n"

5064 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

5065

4585 -#: builtin/commit.c:704

5066 +#: builtin/commit.c:703

5067 msgid "could not read log from standard input"

5068 msgstr "impossible de lire le journal depuis l'entrée standard"

5069

4589 -#: builtin/commit.c:708

5070 +#: builtin/commit.c:707

5071 #, c-format

5072 msgid "could not read log file '%s'"

5073 msgstr "impossible de lire le fichier de journal '%s'"

5074

4594 -#: builtin/commit.c:730

5075 +#: builtin/commit.c:729

5076 msgid "could not read MERGE_MSG"

5077 msgstr "impossible de lire MERGE_MSG"

5078

4598 -#: builtin/commit.c:734

5079 +#: builtin/commit.c:733

5080 msgid "could not read SQUASH_MSG"

5081 msgstr "impossible de lire SQUASH_MSG"

5082

4602 -#: builtin/commit.c:738 builtin/merge.c:1079

4603 -#, c-format

4604 -msgid "could not read '%s'"

4605 -msgstr "impossible de lire '%s'"

4606 -

4607 -#: builtin/commit.c:785

5083 +#: builtin/commit.c:784

5084 msgid "could not write commit template"

5085 msgstr "impossible d'écrire le modèle de commit"

5086

4611 -#: builtin/commit.c:803

5087 +#: builtin/commit.c:802

5088 #, c-format

5089 msgid ""

5090 "\n"

@@ -4623,7 +5099,7 @@ msgstr ""

5099 "\t%s\n"

5100 "et essayez à nouveau.\n"

5101

4626 -#: builtin/commit.c:808

5102 +#: builtin/commit.c:807

5103 #, c-format

5104 msgid ""

5105 "\n"

@@ -4638,7 +5114,7 @@ msgstr ""

5114 "\t%s\n"

5115 "et essayez à nouveau.\n"

5116

4641 -#: builtin/commit.c:821

5117 +#: builtin/commit.c:820

5118 #, c-format

5119 msgid ""

5120 "Please enter the commit message for your changes. Lines starting\n"

@@ -4648,7 +5124,7 @@ msgstr ""

5124 "commençant par '%c' seront ignorées, et un message vide abandonne la "

5125 "validation.\n"

5126

4651 -#: builtin/commit.c:828

5127 +#: builtin/commit.c:827

5128 #, c-format

5129 msgid ""

5130 "Please enter the commit message for your changes. Lines starting\n"

@@ -4659,149 +5135,149 @@ msgstr ""

5135 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

5136 "si vous le souhaitez. Un message vide abandonne la validation.\n"

5137

4662 -#: builtin/commit.c:848

5138 +#: builtin/commit.c:847

5139 #, c-format

5140 msgid "%sAuthor: %.*s <%.*s>"

5141 msgstr "%sAuteur : %.*s <%.*s>"

5142

4667 -#: builtin/commit.c:856

5143 +#: builtin/commit.c:855

5144 #, c-format

5145 msgid "%sDate: %s"

5146 msgstr "%sDate : %s"

5147

4672 -#: builtin/commit.c:863

5148 +#: builtin/commit.c:862

5149 #, c-format

5150 msgid "%sCommitter: %.*s <%.*s>"

5151 msgstr "%sValidateur : %.*s <%.*s>"

5152

4677 -#: builtin/commit.c:881

5153 +#: builtin/commit.c:880

5154 msgid "Cannot read index"

5155 msgstr "Impossible de lire l'index"

5156

4681 -#: builtin/commit.c:938

5157 +#: builtin/commit.c:937

5158 msgid "Error building trees"

5159 msgstr "Erreur lors de la construction des arbres"

5160

4685 -#: builtin/commit.c:953 builtin/tag.c:495

5161 +#: builtin/commit.c:952 builtin/tag.c:495

5162 #, c-format

5163 msgid "Please supply the message using either -m or -F option.\n"

5164 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

5165

4690 -#: builtin/commit.c:1055

5166 +#: builtin/commit.c:1054

5167 #, c-format

5168 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5169 msgstr ""

5170 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

5171 "auteur existant"

5172

4697 -#: builtin/commit.c:1070 builtin/commit.c:1310

5173 +#: builtin/commit.c:1069 builtin/commit.c:1309

5174 #, c-format

5175 msgid "Invalid untracked files mode '%s'"

5176 msgstr "Mode de fichier non suivi invalide '%s'"

5177

4702 -#: builtin/commit.c:1107

5178 +#: builtin/commit.c:1106

5179 msgid "--long and -z are incompatible"

5180 msgstr "--long et -z sont incompatibles"

5181

4706 -#: builtin/commit.c:1137

5182 +#: builtin/commit.c:1136

5183 msgid "Using both --reset-author and --author does not make sense"

5184 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

5185

4710 -#: builtin/commit.c:1146

5186 +#: builtin/commit.c:1145

5187 msgid "You have nothing to amend."

5188 msgstr "Il n'y a rien à corriger."

5189

4714 -#: builtin/commit.c:1149

5190 +#: builtin/commit.c:1148

5191 msgid "You are in the middle of a merge -- cannot amend."

5192 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

5193

4718 -#: builtin/commit.c:1151

5194 +#: builtin/commit.c:1150

5195 msgid "You are in the middle of a cherry-pick -- cannot amend."

5196 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

5197

4722 -#: builtin/commit.c:1154

5198 +#: builtin/commit.c:1153

5199 msgid "Options --squash and --fixup cannot be used together"

5200 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

5201

4726 -#: builtin/commit.c:1164

5202 +#: builtin/commit.c:1163

5203 msgid "Only one of -c/-C/-F/--fixup can be used."

5204 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

5205

4730 -#: builtin/commit.c:1166

5206 +#: builtin/commit.c:1165

5207 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5208 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

5209

4734 -#: builtin/commit.c:1174

5210 +#: builtin/commit.c:1173

5211 msgid "--reset-author can be used only with -C, -c or --amend."

5212 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

5213

4738 -#: builtin/commit.c:1191

5214 +#: builtin/commit.c:1190

5215 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5216 msgstr ""

5217 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

5218 "être utilisée."

5219

4744 -#: builtin/commit.c:1193

5220 +#: builtin/commit.c:1192

5221 msgid "No paths with --include/--only does not make sense."

5222 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

5223

4748 -#: builtin/commit.c:1195

5224 +#: builtin/commit.c:1194

5225 msgid "Clever... amending the last one with dirty index."

5226 msgstr "Malin... correction du dernier avec un index sale."

5227

4752 -#: builtin/commit.c:1197

5228 +#: builtin/commit.c:1196

5229 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5230 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

5231

4756 -#: builtin/commit.c:1209 builtin/tag.c:728

5232 +#: builtin/commit.c:1208 builtin/tag.c:730

5233 #, c-format

5234 msgid "Invalid cleanup mode %s"

5235 msgstr "Mode de nettoyage invalide %s"

5236

4761 -#: builtin/commit.c:1214

5237 +#: builtin/commit.c:1213

5238 msgid "Paths with -a does not make sense."

5239 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

5240

4765 -#: builtin/commit.c:1324 builtin/commit.c:1603

5241 +#: builtin/commit.c:1323 builtin/commit.c:1602

5242 msgid "show status concisely"

5243 msgstr "afficher le statut avec concision"

5244

4769 -#: builtin/commit.c:1326 builtin/commit.c:1605

5245 +#: builtin/commit.c:1325 builtin/commit.c:1604

5246 msgid "show branch information"

5247 msgstr "afficher l'information de branche"

5248

4773 -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

5249 +#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5250 msgid "machine-readable output"

5251 msgstr "sortie pour traitement automatique"

5252

4777 -#: builtin/commit.c:1331 builtin/commit.c:1609

5253 +#: builtin/commit.c:1330 builtin/commit.c:1608

5254 msgid "show status in long format (default)"

5255 msgstr "afficher le statut en format long (par défaut)"

5256

4781 -#: builtin/commit.c:1334 builtin/commit.c:1612

5257 +#: builtin/commit.c:1333 builtin/commit.c:1611

5258 msgid "terminate entries with NUL"

5259 msgstr "terminer les éléments par NUL"

5260

4785 -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4786 -#: builtin/fast-export.c:983 builtin/tag.c:603

5261 +#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5262 +#: builtin/fast-export.c:984 builtin/tag.c:604

5263 msgid "mode"

5264 msgstr "mode"

5265

4790 -#: builtin/commit.c:1337 builtin/commit.c:1615

5266 +#: builtin/commit.c:1336 builtin/commit.c:1614

5267 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5268 msgstr ""

5269 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

5270 "no. (Défaut : all)"

5271

4796 -#: builtin/commit.c:1340

5272 +#: builtin/commit.c:1339

5273 msgid "show ignored files"

5274 msgstr "afficher les fichiers ignorés"

5275

4800 -#: builtin/commit.c:1341 parse-options.h:152

5276 +#: builtin/commit.c:1340 parse-options.h:155

5277 msgid "when"

5278 msgstr "quand"

5279

4804 -#: builtin/commit.c:1342

5280 +#: builtin/commit.c:1341

5281 msgid ""

5282 "ignore changes to submodules, optional when: all, dirty, untracked. "

5283 "(Default: all)"

@@ -4809,209 +5285,196 @@ msgstr ""

5285 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

5286 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

5287

4812 -#: builtin/commit.c:1344

5288 +#: builtin/commit.c:1343

5289 msgid "list untracked files in columns"

5290 msgstr "afficher les fichiers non suivis en colonnes"

5291

4816 -#: builtin/commit.c:1430

5292 +#: builtin/commit.c:1429

5293 msgid "couldn't look up newly created commit"

5294 msgstr "impossible de retrouver le commit nouvellement créé"

5295

4820 -#: builtin/commit.c:1432

5296 +#: builtin/commit.c:1431

5297 msgid "could not parse newly created commit"

5298 msgstr "impossible d'analyser le commit nouvellement créé"

5299

4824 -#: builtin/commit.c:1477

5300 +#: builtin/commit.c:1476

5301 msgid "detached HEAD"

5302 msgstr "HEAD détachée"

5303

4828 -#: builtin/commit.c:1480

5304 +#: builtin/commit.c:1479

5305 msgid " (root-commit)"

5306 msgstr " (commit racine)"

5307

4832 -#: builtin/commit.c:1573

5308 +#: builtin/commit.c:1572

5309 msgid "suppress summary after successful commit"

5310 msgstr "supprimer le résumé après une validation réussie"

5311

4836 -#: builtin/commit.c:1574

5312 +#: builtin/commit.c:1573

5313 msgid "show diff in commit message template"

5314 msgstr "afficher les diff dans le modèle de message de validation"

5315

4840 -#: builtin/commit.c:1576

5316 +#: builtin/commit.c:1575

5317 msgid "Commit message options"

5318 msgstr "Options du message de validation"

5319

4844 -#: builtin/commit.c:1577 builtin/tag.c:601

5320 +#: builtin/commit.c:1576 builtin/tag.c:602

5321 msgid "read message from file"

5322 msgstr "lire le message depuis un fichier"

5323

4848 -#: builtin/commit.c:1578

5324 +#: builtin/commit.c:1577

5325 msgid "author"

5326 msgstr "auteur"

5327

4852 -#: builtin/commit.c:1578

5328 +#: builtin/commit.c:1577

5329 msgid "override author for commit"

5330 msgstr "remplacer l'auteur pour la validation"

5331

4856 -#: builtin/commit.c:1579 builtin/gc.c:280

5332 +#: builtin/commit.c:1578 builtin/gc.c:268

5333 msgid "date"

5334 msgstr "date"

5335

4860 -#: builtin/commit.c:1579

5336 +#: builtin/commit.c:1578

5337 msgid "override date for commit"

5338 msgstr "remplacer la date pour la validation"

5339

4864 -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4865 -#: builtin/notes.c:554 builtin/tag.c:599

5340 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5341 +#: builtin/notes.c:555 builtin/tag.c:600

5342 msgid "message"

5343 msgstr "message"

5344

4869 -#: builtin/commit.c:1580

5345 +#: builtin/commit.c:1579

5346 msgid "commit message"

5347 msgstr "message de validation"

5348

4873 -#: builtin/commit.c:1581

5349 +#: builtin/commit.c:1580

5350 msgid "reuse and edit message from specified commit"

5351 msgstr "réutiliser et éditer le message du commit spécifié"

5352

4877 -#: builtin/commit.c:1582

5353 +#: builtin/commit.c:1581

5354 msgid "reuse message from specified commit"

5355 msgstr "réutiliser le message du commit spécifié"

5356

4881 -#: builtin/commit.c:1583

5357 +#: builtin/commit.c:1582

5358 msgid "use autosquash formatted message to fixup specified commit"

5359 msgstr ""

5360 "utiliser un message au format autosquash pour corriger le commit spécifié"

5361

4886 -#: builtin/commit.c:1584

5362 +#: builtin/commit.c:1583

5363 msgid "use autosquash formatted message to squash specified commit"

5364 msgstr ""

5365 "utiliser un message au format autosquash pour compresser le commit spécifié"

5366

4891 -#: builtin/commit.c:1585

5367 +#: builtin/commit.c:1584

5368 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5369 msgstr ""

5370 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

5371

4896 -#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

5372 +#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5373 msgid "add Signed-off-by:"

5374 msgstr "ajouter une entrée Signed-off-by :"

5375

4900 -#: builtin/commit.c:1587

5376 +#: builtin/commit.c:1586

5377 msgid "use specified template file"

5378 msgstr "utiliser le fichier de modèle spécifié"

5379

4904 -#: builtin/commit.c:1588

5380 +#: builtin/commit.c:1587

5381 msgid "force edit of commit"

5382 msgstr "forcer l'édition du commit"

5383

4908 -#: builtin/commit.c:1589

5384 +#: builtin/commit.c:1588

5385 msgid "default"

5386 msgstr "défaut"

5387

4912 -#: builtin/commit.c:1589 builtin/tag.c:604

5388 +#: builtin/commit.c:1588 builtin/tag.c:605

5389 msgid "how to strip spaces and #comments from message"

5390 msgstr "comment éliminer les espaces et les commentaires # du message"

5391

4916 -#: builtin/commit.c:1590

5392 +#: builtin/commit.c:1589

5393 msgid "include status in commit message template"

5394 msgstr "inclure le statut dans le modèle de message de validation"

5395

4920 -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4921 -#: builtin/tag.c:605

4922 -msgid "key-id"

4923 -msgstr "id de clé"

4924 -

4925 -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

5396 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5397 +#: builtin/revert.c:93

5398 msgid "GPG sign commit"

5399 msgstr "signer la validation avec GPG"

5400

4929 -#: builtin/commit.c:1595

5401 +#: builtin/commit.c:1594

5402 msgid "Commit contents options"

5403 msgstr "Valider les options des contenus"

5404

4933 -#: builtin/commit.c:1596

5405 +#: builtin/commit.c:1595

5406 msgid "commit all changed files"

5407 msgstr "valider tous les fichiers modifiés"

5408

4937 -#: builtin/commit.c:1597

5409 +#: builtin/commit.c:1596

5410 msgid "add specified files to index for commit"

5411 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

5412

4941 -#: builtin/commit.c:1598

5413 +#: builtin/commit.c:1597

5414 msgid "interactively add files"

5415 msgstr "ajouter des fichiers en mode interactif"

5416

4945 -#: builtin/commit.c:1599

5417 +#: builtin/commit.c:1598

5418 msgid "interactively add changes"

5419 msgstr "ajouter les modifications en mode interactif"

5420

4949 -#: builtin/commit.c:1600

5421 +#: builtin/commit.c:1599

5422 msgid "commit only specified files"

5423 msgstr "valider seulement les fichiers spécifiés"

5424

4953 -#: builtin/commit.c:1601

5425 +#: builtin/commit.c:1600

5426 msgid "bypass pre-commit hook"

5427 msgstr "éviter d'utiliser le crochet pre-commit"

5428

4957 -#: builtin/commit.c:1602

5429 +#: builtin/commit.c:1601

5430 msgid "show what would be committed"

5431 msgstr "afficher ce qui serait validé"

5432

4961 -#: builtin/commit.c:1613

5433 +#: builtin/commit.c:1612

5434 msgid "amend previous commit"

5435 msgstr "corriger la validation précédente"

5436

4965 -#: builtin/commit.c:1614

5437 +#: builtin/commit.c:1613

5438 msgid "bypass post-rewrite hook"

5439 msgstr "éviter d'utiliser le crochet post-rewrite"

5440

4969 -#: builtin/commit.c:1619

5441 +#: builtin/commit.c:1618

5442 msgid "ok to record an empty change"

5443 msgstr "accepter d'enregistrer une modification vide"

5444

4973 -#: builtin/commit.c:1621

5445 +#: builtin/commit.c:1620

5446 msgid "ok to record a change with an empty message"

5447 msgstr "accepter d'enregistrer une modification avec un message vide"

5448

4977 -#: builtin/commit.c:1650

5449 +#: builtin/commit.c:1649

5450 msgid "could not parse HEAD commit"

5451 msgstr "impossible d'analyser le commit HEAD"

5452

4981 -#: builtin/commit.c:1689 builtin/merge.c:1076

4982 -#, c-format

4983 -msgid "could not open '%s' for reading"

4984 -msgstr "impossible d'ouvrir '%s' en lecture"

4985 -

4986 -#: builtin/commit.c:1696

5453 +#: builtin/commit.c:1695

5454 #, c-format

5455 msgid "Corrupt MERGE_HEAD file (%s)"

5456 msgstr "Fichier MERGE_HEAD corrompu (%s)"

5457

4991 -#: builtin/commit.c:1703

5458 +#: builtin/commit.c:1702

5459 msgid "could not read MERGE_MODE"

5460 msgstr "impossible de lire MERGE_MODE"

5461

4995 -#: builtin/commit.c:1722

5462 +#: builtin/commit.c:1721

5463 #, c-format

5464 msgid "could not read commit message: %s"

5465 msgstr "impossible de lire le message de validation : %s"

5466

5000 -#: builtin/commit.c:1733

5467 +#: builtin/commit.c:1732

5468 #, c-format

5469 msgid "Aborting commit; you did not edit the message.\n"

5470 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

5471

5005 -#: builtin/commit.c:1738

5472 +#: builtin/commit.c:1737

5473 #, c-format

5474 msgid "Aborting commit due to empty commit message.\n"

5475 msgstr "Abandon de la validation du à un message de validation vide\n"

5476

5010 -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

5011 -msgid "failed to write commit object"

5012 -msgstr "échec de l'écriture de l'objet commit"

5013 -

5014 -#: builtin/commit.c:1786

5477 +#: builtin/commit.c:1785

5478 msgid ""

5479 "Repository has been updated, but unable to write\n"

5480 "new_index file. Check that disk is not full and quota is\n"

@@ -5025,132 +5488,136 @@ msgstr ""

5488 msgid "git config [<options>]"

5489 msgstr "git config [<options>]"

5490

5028 -#: builtin/config.c:53

5491 +#: builtin/config.c:54

5492 msgid "Config file location"

5493 msgstr "Emplacement du fichier de configuration"

5494

5032 -#: builtin/config.c:54

5495 +#: builtin/config.c:55

5496 msgid "use global config file"

5497 msgstr "utiliser les fichier de configuration global"

5498

5036 -#: builtin/config.c:55

5499 +#: builtin/config.c:56

5500 msgid "use system config file"

5501 msgstr "utiliser le fichier de configuration du système"

5502

5040 -#: builtin/config.c:56

5503 +#: builtin/config.c:57

5504 msgid "use repository config file"

5505 msgstr "utiliser le fichier de configuration du dépôt"

5506

5044 -#: builtin/config.c:57

5507 +#: builtin/config.c:58

5508 msgid "use given config file"

5509 msgstr "utiliser le fichier de configuration spécifié"

5510

5048 -#: builtin/config.c:58

5511 +#: builtin/config.c:59

5512 msgid "blob-id"

5513 msgstr "blob-id"

5514

5052 -#: builtin/config.c:58

5515 +#: builtin/config.c:59

5516 msgid "read config from given blob object"

5517 msgstr "lire la configuration depuis l'objet blob fourni"

5518

5056 -#: builtin/config.c:59

5519 +#: builtin/config.c:60

5520 msgid "Action"

5521 msgstr "Action"

5522

5060 -#: builtin/config.c:60

5523 +#: builtin/config.c:61

5524 msgid "get value: name [value-regex]"

5525 msgstr "obtenir la valeur : nom [regex-de-valeur]"

5526

5064 -#: builtin/config.c:61

5527 +#: builtin/config.c:62

5528 msgid "get all values: key [value-regex]"

5529 msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"

5530

5068 -#: builtin/config.c:62

5531 +#: builtin/config.c:63

5532 msgid "get values for regexp: name-regex [value-regex]"

5533 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"

5534

5072 -#: builtin/config.c:63

5535 +#: builtin/config.c:64

5536 msgid "get value specific for the URL: section[.var] URL"

5537 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"

5538

5076 -#: builtin/config.c:64

5539 +#: builtin/config.c:65

5540 msgid "replace all matching variables: name value [value_regex]"

5541 msgstr ""

5542 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"

5543

5081 -#: builtin/config.c:65

5544 +#: builtin/config.c:66

5545 msgid "add a new variable: name value"

5546 msgstr "ajouter une nouvelle variable : nom valeur"

5547

5085 -#: builtin/config.c:66

5548 +#: builtin/config.c:67

5549 msgid "remove a variable: name [value-regex]"

5550 msgstr "supprimer une variable : nom [regex-de-valeur]"

5551

5089 -#: builtin/config.c:67

5552 +#: builtin/config.c:68

5553 msgid "remove all matches: name [value-regex]"

5554 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"

5555

5093 -#: builtin/config.c:68

5556 +#: builtin/config.c:69

5557 msgid "rename section: old-name new-name"

5558 msgstr "renommer une section : ancien-nom nouveau-nom"

5559

5097 -#: builtin/config.c:69

5560 +#: builtin/config.c:70

5561 msgid "remove a section: name"

5562 msgstr "supprimer une section : nom"

5563

5101 -#: builtin/config.c:70

5564 +#: builtin/config.c:71

5565 msgid "list all"

5566 msgstr "afficher tout"

5567

5105 -#: builtin/config.c:71

5568 +#: builtin/config.c:72

5569 msgid "open an editor"

5570 msgstr "ouvrir un éditeur"

5571

5109 -#: builtin/config.c:72

5572 +#: builtin/config.c:73

5573 msgid "find the color configured: slot [default]"

5574 msgstr "trouver la couleur configurée : slot [par défaut]"

5575

5113 -#: builtin/config.c:73

5576 +#: builtin/config.c:74

5577 msgid "find the color setting: slot [stdout-is-tty]"

5578 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"

5579

5117 -#: builtin/config.c:74

5580 +#: builtin/config.c:75

5581 msgid "Type"

5582 msgstr "Type"

5583

5121 -#: builtin/config.c:75

5584 +#: builtin/config.c:76

5585 msgid "value is \"true\" or \"false\""

5586 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"

5587

5125 -#: builtin/config.c:76

5588 +#: builtin/config.c:77

5589 msgid "value is decimal number"

5590 msgstr "la valeur est un nombre décimal"

5591

5129 -#: builtin/config.c:77

5592 +#: builtin/config.c:78

5593 msgid "value is --bool or --int"

5594 msgstr "la valeur est --bool ou --int"

5595

5133 -#: builtin/config.c:78

5596 +#: builtin/config.c:79

5597 msgid "value is a path (file or directory name)"

5598 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"

5599

5137 -#: builtin/config.c:79

5600 +#: builtin/config.c:80

5601 msgid "Other"

5602 msgstr "Autre"

5603

5141 -#: builtin/config.c:80

5604 +#: builtin/config.c:81

5605 msgid "terminate values with NUL byte"

5606 msgstr "terminer les valeurs avec un caractère NUL"

5607

5145 -#: builtin/config.c:81

5608 +#: builtin/config.c:82

5609 +msgid "show variable names only"

5610 +msgstr "n'afficher que les noms de variable"

5611 +

5612 +#: builtin/config.c:83

5613 msgid "respect include directives on lookup"

5614 msgstr "respecter les directives d'inclusion lors de la recherche"

5615

5149 -#: builtin/config.c:316

5616 +#: builtin/config.c:311

5617 msgid "unable to parse default color value"

5618 msgstr "impossible de lire la valeur de couleur par défaut"

5619

5153 -#: builtin/config.c:457

5620 +#: builtin/config.c:449

5621 #, c-format

5622 msgid ""

5623 "# This is Git's per-user configuration file.\n"

@@ -5165,7 +5632,7 @@ msgstr ""

5632 "#\tname = %s\n"

5633 "#\temail = %s\n"

5634

5168 -#: builtin/config.c:587

5635 +#: builtin/config.c:583

5636 #, c-format

5637 msgid "cannot create configuration file %s"

5638 msgstr "création impossible du fichier de configuration '%s'"

@@ -5201,7 +5668,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"

5668 msgid "tag '%s' is really '%s' here"

5669 msgstr "l'étiquette '%s' est en fait '%s'"

5670

5204 -#: builtin/describe.c:250 builtin/log.c:452

5671 +#: builtin/describe.c:250 builtin/log.c:459

5672 #, c-format

5673 msgid "Not a valid object name %s"

5674 msgstr "%s n'est pas un nom d'objet valide"

@@ -5349,233 +5816,233 @@ msgstr "plus de deux blobs spécifiés : '%s'"

5816 msgid "unhandled object '%s' given."

5817 msgstr "objet non géré '%s' spécifié."

5818

5352 -#: builtin/fast-export.c:24

5819 +#: builtin/fast-export.c:25

5820 msgid "git fast-export [rev-list-opts]"

5821 msgstr "git fast-export [options-de-liste-de-révisions]"

5822

5356 -#: builtin/fast-export.c:979

5823 +#: builtin/fast-export.c:980

5824 msgid "show progress after <n> objects"

5825 msgstr "afficher la progression après <n> objets"

5826

5360 -#: builtin/fast-export.c:981

5827 +#: builtin/fast-export.c:982

5828 msgid "select handling of signed tags"

5829 msgstr "sélectionner la gestion des étiquettes signées"

5830

5364 -#: builtin/fast-export.c:984

5831 +#: builtin/fast-export.c:985

5832 msgid "select handling of tags that tag filtered objects"

5833 msgstr ""

5834 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"

5835

5369 -#: builtin/fast-export.c:987

5836 +#: builtin/fast-export.c:988

5837 msgid "Dump marks to this file"

5838 msgstr "Enregistrer les marques dans ce fichier"

5839

5373 -#: builtin/fast-export.c:989

5840 +#: builtin/fast-export.c:990

5841 msgid "Import marks from this file"

5842 msgstr "importer les marques depuis ce fichier"

5843

5377 -#: builtin/fast-export.c:991

5844 +#: builtin/fast-export.c:992

5845 msgid "Fake a tagger when tags lack one"

5846 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"

5847

5381 -#: builtin/fast-export.c:993

5848 +#: builtin/fast-export.c:994

5849 msgid "Output full tree for each commit"

5850 msgstr "Afficher l'arbre complet pour chaque commit"

5851

5385 -#: builtin/fast-export.c:995

5852 +#: builtin/fast-export.c:996

5853 msgid "Use the done feature to terminate the stream"

5854 msgstr "Utiliser la fonction \"done\" pour terminer le flux"

5855

5389 -#: builtin/fast-export.c:996

5856 +#: builtin/fast-export.c:997

5857 msgid "Skip output of blob data"

5858 msgstr "Sauter l'affichage de données de blob"

5859

5393 -#: builtin/fast-export.c:997

5860 +#: builtin/fast-export.c:998

5861 msgid "refspec"

5862 msgstr "spécificateur de référence"

5863

5397 -#: builtin/fast-export.c:998

5864 +#: builtin/fast-export.c:999

5865 msgid "Apply refspec to exported refs"

5866 msgstr "Appliquer le spécificateur de référence aux références exportées"

5867

5401 -#: builtin/fast-export.c:999

5868 +#: builtin/fast-export.c:1000

5869 msgid "anonymize output"

5870 msgstr "anonymise la sortie"

5871

5405 -#: builtin/fetch.c:19

5872 +#: builtin/fetch.c:20

5873 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5874 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"

5875

5409 -#: builtin/fetch.c:20

5876 +#: builtin/fetch.c:21

5877 msgid "git fetch [<options>] <group>"

5878 msgstr "git fetch [<options>] <groupe>"

5879

5413 -#: builtin/fetch.c:21

5880 +#: builtin/fetch.c:22

5881 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

5882 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

5883

5417 -#: builtin/fetch.c:22

5884 +#: builtin/fetch.c:23

5885 msgid "git fetch --all [<options>]"

5886 msgstr "git fetch --all [<options>]"

5887

5421 -#: builtin/fetch.c:89

5888 +#: builtin/fetch.c:90 builtin/pull.c:162

5889 msgid "fetch from all remotes"

5890 msgstr "récupérer depuis tous le dépôts distants"

5891

5425 -#: builtin/fetch.c:91

5892 +#: builtin/fetch.c:92 builtin/pull.c:165

5893 msgid "append to .git/FETCH_HEAD instead of overwriting"

5894 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

5895

5429 -#: builtin/fetch.c:93

5896 +#: builtin/fetch.c:94 builtin/pull.c:168

5897 msgid "path to upload pack on remote end"

5898 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

5899

5433 -#: builtin/fetch.c:94

5900 +#: builtin/fetch.c:95 builtin/pull.c:170

5901 msgid "force overwrite of local branch"

5902 msgstr "forcer l'écrasement de la branche locale"

5903

5437 -#: builtin/fetch.c:96

5904 +#: builtin/fetch.c:97

5905 msgid "fetch from multiple remotes"

5906 msgstr "récupérer depuis plusieurs dépôts distants"

5907

5441 -#: builtin/fetch.c:98

5908 +#: builtin/fetch.c:99 builtin/pull.c:172

5909 msgid "fetch all tags and associated objects"

5910 msgstr "récupérer toutes les étiquettes et leurs objets associés"

5911

5445 -#: builtin/fetch.c:100

5912 +#: builtin/fetch.c:101

5913 msgid "do not fetch all tags (--no-tags)"

5914 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

5915

5449 -#: builtin/fetch.c:102

5916 +#: builtin/fetch.c:103 builtin/pull.c:175

5917 msgid "prune remote-tracking branches no longer on remote"

5918 msgstr ""

5919 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

5920 "dépôt distant"

5921

5455 -#: builtin/fetch.c:103

5922 +#: builtin/fetch.c:104 builtin/pull.c:178

5923 msgid "on-demand"

5924 msgstr "à la demande"

5925

5459 -#: builtin/fetch.c:104

5926 +#: builtin/fetch.c:105 builtin/pull.c:179

5927 msgid "control recursive fetching of submodules"

5928 msgstr "contrôler la récupération récursive dans les sous-modules"

5929

5463 -#: builtin/fetch.c:108

5930 +#: builtin/fetch.c:109 builtin/pull.c:184

5931 msgid "keep downloaded pack"

5932 msgstr "conserver le paquet téléchargé"

5933

5467 -#: builtin/fetch.c:110

5934 +#: builtin/fetch.c:111

5935 msgid "allow updating of HEAD ref"

5936 msgstr "permettre la mise à jour de la référence HEAD"

5937

5471 -#: builtin/fetch.c:113

5938 +#: builtin/fetch.c:114 builtin/pull.c:187

5939 msgid "deepen history of shallow clone"

5940 msgstr "approfondir l'historique d'un clone superficiel"

5941

5475 -#: builtin/fetch.c:115

5942 +#: builtin/fetch.c:116 builtin/pull.c:190

5943 msgid "convert to a complete repository"

5944 msgstr "convertir en un dépôt complet"

5945

5479 -#: builtin/fetch.c:117 builtin/log.c:1208

5946 +#: builtin/fetch.c:118 builtin/log.c:1233

5947 msgid "dir"

5948 msgstr "dir"

5949

5483 -#: builtin/fetch.c:118

5950 +#: builtin/fetch.c:119

5951 msgid "prepend this to submodule path output"

5952 msgstr "préfixer ceci à la sortie du chemin du sous-module"

5953

5487 -#: builtin/fetch.c:121

5954 +#: builtin/fetch.c:122

5955 msgid "default mode for recursion"

5956 msgstr "mode par défaut pour la récursion"

5957

5491 -#: builtin/fetch.c:123

5958 +#: builtin/fetch.c:124 builtin/pull.c:193

5959 msgid "accept refs that update .git/shallow"

5960 msgstr "accepter les références qui mettent à jour .git/shallow"

5961

5495 -#: builtin/fetch.c:124

5962 +#: builtin/fetch.c:125 builtin/pull.c:195

5963 msgid "refmap"

5964 msgstr "correspondance de référence"

5965

5499 -#: builtin/fetch.c:125

5966 +#: builtin/fetch.c:126 builtin/pull.c:196

5967 msgid "specify fetch refmap"

5968 msgstr "spécifier une correspondance de référence pour la récupération"

5969

5503 -#: builtin/fetch.c:377

5970 +#: builtin/fetch.c:378

5971 msgid "Couldn't find remote ref HEAD"

5972 msgstr "impossible de trouver la référence HEAD distante"

5973

5507 -#: builtin/fetch.c:457

5974 +#: builtin/fetch.c:458

5975 #, c-format

5976 msgid "object %s not found"

5977 msgstr "objet %s non trouvé"

5978

5512 -#: builtin/fetch.c:462

5979 +#: builtin/fetch.c:463

5980 msgid "[up to date]"

5981 msgstr "[à jour]"

5982

5516 -#: builtin/fetch.c:476

5983 +#: builtin/fetch.c:477

5984 #, c-format

5985 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5986 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5987

5521 -#: builtin/fetch.c:477 builtin/fetch.c:563

5988 +#: builtin/fetch.c:478 builtin/fetch.c:564

5989 msgid "[rejected]"

5990 msgstr "[rejeté]"

5991

5525 -#: builtin/fetch.c:488

5992 +#: builtin/fetch.c:489

5993 msgid "[tag update]"

5994 msgstr "[mise à jour de l'étiquette]"

5995

5529 -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5996 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5997 msgid " (unable to update local ref)"

5998 msgstr " (impossible de mettre à jour la référence locale)"

5999

5533 -#: builtin/fetch.c:508

6000 +#: builtin/fetch.c:509

6001 msgid "[new tag]"

6002 msgstr "[nouvelle étiquette]"

6003

5537 -#: builtin/fetch.c:511

6004 +#: builtin/fetch.c:512

6005 msgid "[new branch]"

6006 msgstr "[nouvelle branche]"

6007

5541 -#: builtin/fetch.c:514

6008 +#: builtin/fetch.c:515

6009 msgid "[new ref]"

6010 msgstr "[nouvelle référence]"

6011

5545 -#: builtin/fetch.c:559

6012 +#: builtin/fetch.c:560

6013 msgid "unable to update local ref"

6014 msgstr "impossible de mettre à jour la référence locale"

6015

5549 -#: builtin/fetch.c:559

6016 +#: builtin/fetch.c:560

6017 msgid "forced update"

6018 msgstr "mise à jour forcée"

6019

5553 -#: builtin/fetch.c:565

6020 +#: builtin/fetch.c:566

6021 msgid "(non-fast-forward)"

6022 msgstr "(pas d'avance rapide)"

6023

5557 -#: builtin/fetch.c:599 builtin/fetch.c:832

6024 +#: builtin/fetch.c:600 builtin/fetch.c:842

6025 #, c-format

6026 msgid "cannot open %s: %s\n"

6027 msgstr "impossible d'ouvrir %s : %s\n"

6028

5562 -#: builtin/fetch.c:608

6029 +#: builtin/fetch.c:609

6030 #, c-format

6031 msgid "%s did not send all necessary objects\n"

6032 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

6033

5567 -#: builtin/fetch.c:626

6034 +#: builtin/fetch.c:627

6035 #, c-format

6036 msgid "reject %s because shallow roots are not allowed to be updated"

6037 msgstr ""

6038 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

6039

5573 -#: builtin/fetch.c:714 builtin/fetch.c:797

6040 +#: builtin/fetch.c:715 builtin/fetch.c:807

6041 #, c-format

6042 msgid "From %.*s\n"

6043 msgstr "Depuis %.*s\n"

6044

5578 -#: builtin/fetch.c:725

6045 +#: builtin/fetch.c:726

6046 #, c-format

6047 msgid ""

6048 "some local refs could not be updated; try running\n"

@@ -5584,55 +6051,55 @@ msgstr ""

6051 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

6052 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

6053

5587 -#: builtin/fetch.c:777

6054 +#: builtin/fetch.c:778

6055 #, c-format

6056 msgid " (%s will become dangling)"

6057 msgstr " (%s sera en suspens)"

6058

5592 -#: builtin/fetch.c:778

6059 +#: builtin/fetch.c:779

6060 #, c-format

6061 msgid " (%s has become dangling)"

6062 msgstr " (%s est devenu en suspens)"

6063

5597 -#: builtin/fetch.c:802

6064 +#: builtin/fetch.c:811

6065 msgid "[deleted]"

6066 msgstr "[supprimé]"

6067

5601 -#: builtin/fetch.c:803 builtin/remote.c:1057

6068 +#: builtin/fetch.c:812 builtin/remote.c:1034

6069 msgid "(none)"

6070 msgstr "(aucun(e))"

6071

5605 -#: builtin/fetch.c:822

6072 +#: builtin/fetch.c:832

6073 #, c-format

6074 msgid "Refusing to fetch into current branch %s of non-bare repository"

6075 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

6076

5610 -#: builtin/fetch.c:841

6077 +#: builtin/fetch.c:851

6078 #, c-format

6079 msgid "Option \"%s\" value \"%s\" is not valid for %s"

6080 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

6081

5615 -#: builtin/fetch.c:844

6082 +#: builtin/fetch.c:854

6083 #, c-format

6084 msgid "Option \"%s\" is ignored for %s\n"

6085 msgstr "L'option \"%s\" est ignorée pour %s\n"

6086

5620 -#: builtin/fetch.c:900

6087 +#: builtin/fetch.c:910

6088 #, c-format

6089 msgid "Don't know how to fetch from %s"

6090 msgstr "Je ne sais pas récupérer depuis %s"

6091

5625 -#: builtin/fetch.c:1063

6092 +#: builtin/fetch.c:1071

6093 #, c-format

6094 msgid "Fetching %s\n"

6095 msgstr "Récupération de %s\n"

6096

5630 -#: builtin/fetch.c:1065 builtin/remote.c:90

6097 +#: builtin/fetch.c:1073 builtin/remote.c:90

6098 #, c-format

6099 msgid "Could not fetch %s"

6100 msgstr "Impossible de récupérer %s"

6101

5635 -#: builtin/fetch.c:1083

6102 +#: builtin/fetch.c:1091

6103 msgid ""

6104 "No remote repository specified. Please, specify either a URL or a\n"

6105 "remote name from which new revisions should be fetched."

@@ -5640,221 +6107,210 @@ msgstr ""

6107 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

6108 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

6109

5643 -#: builtin/fetch.c:1106

6110 +#: builtin/fetch.c:1114

6111 msgid "You need to specify a tag name."

6112 msgstr "Vous devez spécifier un nom d'étiquette."

6113

5647 -#: builtin/fetch.c:1148

6114 +#: builtin/fetch.c:1156

6115 msgid "--depth and --unshallow cannot be used together"

6116 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

6117

5651 -#: builtin/fetch.c:1150

6118 +#: builtin/fetch.c:1158

6119 msgid "--unshallow on a complete repository does not make sense"

6120 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

6121

5655 -#: builtin/fetch.c:1173

6122 +#: builtin/fetch.c:1181

6123 msgid "fetch --all does not take a repository argument"

6124 msgstr "fetch --all n'accepte pas d'argument de dépôt"

6125

5659 -#: builtin/fetch.c:1175

6126 +#: builtin/fetch.c:1183

6127 msgid "fetch --all does not make sense with refspecs"

6128 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

6129

5663 -#: builtin/fetch.c:1186

6130 +#: builtin/fetch.c:1194

6131 #, c-format

6132 msgid "No such remote or remote group: %s"

6133 msgstr "distant ou groupe distant inexistant : %s"

6134

5668 -#: builtin/fetch.c:1194

6135 +#: builtin/fetch.c:1202

6136 msgid "Fetching a group and specifying refspecs does not make sense"

6137 msgstr ""

6138 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

6139 "sens"

6140

5674 -#: builtin/fmt-merge-msg.c:13

6141 +#: builtin/fmt-merge-msg.c:14

6142 msgid ""

6143 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

6144 msgstr ""

6145 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"

6146

5680 -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5681 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5682 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5683 -#: parse-options.h:131 parse-options.h:238

5684 -msgid "n"

5685 -msgstr "n"

5686 -

5687 -#: builtin/fmt-merge-msg.c:669

6147 +#: builtin/fmt-merge-msg.c:670

6148 msgid "populate log with at most <n> entries from shortlog"

6149 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"

6150

5691 -#: builtin/fmt-merge-msg.c:672

6151 +#: builtin/fmt-merge-msg.c:673

6152 msgid "alias for --log (deprecated)"

6153 msgstr "alias pour --log (obsolète)"

6154

5695 -#: builtin/fmt-merge-msg.c:675

6155 +#: builtin/fmt-merge-msg.c:676

6156 msgid "text"

6157 msgstr "texte"

6158

5699 -#: builtin/fmt-merge-msg.c:676

6159 +#: builtin/fmt-merge-msg.c:677

6160 msgid "use <text> as start of message"

6161 msgstr "utiliser <texte> comme début de message"

6162

5703 -#: builtin/fmt-merge-msg.c:677

6163 +#: builtin/fmt-merge-msg.c:678

6164 msgid "file to read from"

6165 msgstr "fichier d'où lire"

6166

5707 -#: builtin/for-each-ref.c:687

5708 -msgid "unable to parse format"

5709 -msgstr "impossible d'analyser le format"

5710 -

5711 -#: builtin/for-each-ref.c:1083

6167 +#: builtin/for-each-ref.c:9

6168 msgid "git for-each-ref [<options>] [<pattern>]"

6169 msgstr "git for-each-ref [<options>] [<motif>]"

6170

5715 -#: builtin/for-each-ref.c:1098

6171 +#: builtin/for-each-ref.c:24

6172 msgid "quote placeholders suitably for shells"

6173 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

6174

5719 -#: builtin/for-each-ref.c:1100

6175 +#: builtin/for-each-ref.c:26

6176 msgid "quote placeholders suitably for perl"

6177 msgstr "échapper les champs réservés pour perl"

6178

5723 -#: builtin/for-each-ref.c:1102

6179 +#: builtin/for-each-ref.c:28

6180 msgid "quote placeholders suitably for python"

6181 msgstr "échapper les champs réservés pour python"

6182

5727 -#: builtin/for-each-ref.c:1104

6183 +#: builtin/for-each-ref.c:30

6184 msgid "quote placeholders suitably for Tcl"

6185 msgstr "échapper les champs réservés pour compatibilité avec Tcl"

6186

5731 -#: builtin/for-each-ref.c:1107

6187 +#: builtin/for-each-ref.c:33

6188 msgid "show only <n> matched refs"

6189 msgstr "n'afficher que <n> références correspondant"

6190

5735 -#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5736 -msgid "format"

5737 -msgstr "format"

5738 -

5739 -#: builtin/for-each-ref.c:1108

6191 +#: builtin/for-each-ref.c:34

6192 msgid "format to use for the output"

6193 msgstr "format à utiliser pour la sortie"

6194

5743 -#: builtin/for-each-ref.c:1109

6195 +#: builtin/for-each-ref.c:35

6196 msgid "key"

6197 msgstr "clé"

6198

5747 -#: builtin/for-each-ref.c:1110

6199 +#: builtin/for-each-ref.c:36

6200 msgid "field name to sort on"

6201 msgstr "nom du champ servant à trier"

6202

5751 -#: builtin/fsck.c:147 builtin/prune.c:137

6203 +#: builtin/fsck.c:163 builtin/prune.c:137

6204 msgid "Checking connectivity"

6205 msgstr "Vérification de la connectivité"

6206

5755 -#: builtin/fsck.c:548

6207 +#: builtin/fsck.c:568

6208 msgid "Checking object directories"

6209 msgstr "Vérification des répertoires d'objet"

6210

5759 -#: builtin/fsck.c:611

6211 +#: builtin/fsck.c:631

6212 msgid "git fsck [<options>] [<object>...]"

6213 msgstr "git fsck [<options>] [<objet>...]"

6214

5763 -#: builtin/fsck.c:617

6215 +#: builtin/fsck.c:637

6216 msgid "show unreachable objects"

6217 msgstr "afficher les objets inaccessibles"

6218

5767 -#: builtin/fsck.c:618

6219 +#: builtin/fsck.c:638

6220 msgid "show dangling objects"

6221 msgstr "afficher les objets en suspens"

6222

5771 -#: builtin/fsck.c:619

6223 +#: builtin/fsck.c:639

6224 msgid "report tags"

6225 msgstr "afficher les étiquettes"

6226

5775 -#: builtin/fsck.c:620

6227 +#: builtin/fsck.c:640

6228 msgid "report root nodes"

6229 msgstr "signaler les nœuds racines"

6230

5779 -#: builtin/fsck.c:621

6231 +#: builtin/fsck.c:641

6232 msgid "make index objects head nodes"

6233 msgstr "considérer les objets de l'index comme nœuds tête"

6234

6235 # translated from man page

5784 -#: builtin/fsck.c:622

6236 +#: builtin/fsck.c:642

6237 msgid "make reflogs head nodes (default)"

6238 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

6239

5788 -#: builtin/fsck.c:623

6240 +#: builtin/fsck.c:643

6241 msgid "also consider packs and alternate objects"

6242 msgstr "inspecter aussi les objets pack et alternatifs"

6243

5792 -#: builtin/fsck.c:624

6244 +#: builtin/fsck.c:644

6245 +msgid "check only connectivity"

6246 +msgstr "ne vérifier que la connectivité"

6247 +

6248 +#: builtin/fsck.c:645

6249 msgid "enable more strict checking"

6250 msgstr "activer une vérification plus strict"

6251

5796 -#: builtin/fsck.c:626

6252 +#: builtin/fsck.c:647

6253 msgid "write dangling objects in .git/lost-found"

6254 msgstr "écrire les objets en suspens dans .git/lost-found"

6255

5800 -#: builtin/fsck.c:627 builtin/prune.c:107

6256 +#: builtin/fsck.c:648 builtin/prune.c:107

6257 msgid "show progress"

6258 msgstr "afficher la progression"

6259

5804 -#: builtin/fsck.c:677

6260 +#: builtin/fsck.c:707

6261 msgid "Checking objects"

6262 msgstr "Vérification des objets"

6263

5808 -#: builtin/gc.c:24

6264 +#: builtin/gc.c:25

6265 msgid "git gc [<options>]"

6266 msgstr "git gc [<options>]"

6267

5812 -#: builtin/gc.c:67

6268 +#: builtin/gc.c:55

6269 #, c-format

6270 msgid "Invalid %s: '%s'"

6271 msgstr "%s invalide : '%s'"

6272

5817 -#: builtin/gc.c:112

6273 +#: builtin/gc.c:100

6274 #, c-format

6275 msgid "insanely long object directory %.*s"

6276 msgstr "objet répertoire démentiellement long %.*s"

6277

5822 -#: builtin/gc.c:281

6278 +#: builtin/gc.c:269

6279 msgid "prune unreferenced objects"

6280 msgstr "éliminer les objets non référencés"

6281

5826 -#: builtin/gc.c:283

6282 +#: builtin/gc.c:271

6283 msgid "be more thorough (increased runtime)"

6284 msgstr "être plus consciencieux (durée de traitement allongée)"

6285

5830 -#: builtin/gc.c:284

6286 +#: builtin/gc.c:272

6287 msgid "enable auto-gc mode"

6288 msgstr "activer le mode auto-gc"

6289

5834 -#: builtin/gc.c:285

6290 +#: builtin/gc.c:273

6291 msgid "force running gc even if there may be another gc running"

6292 msgstr ""

6293 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

6294 "tourne déjà"

6295

5840 -#: builtin/gc.c:327

6296 +#: builtin/gc.c:315

6297 #, c-format

6298 msgid "Auto packing the repository in background for optimum performance.\n"

6299 msgstr ""

6300 "Compression automatique du dépôt en tâche de fond pour optimiser les "

6301 "performances.\n"

6302

5847 -#: builtin/gc.c:329

6303 +#: builtin/gc.c:317

6304 #, c-format

6305 msgid "Auto packing the repository for optimum performance.\n"

6306 msgstr "Compression du dépôt pour optimiser les performances.\n"

6307

5852 -#: builtin/gc.c:330

6308 +#: builtin/gc.c:318

6309 #, c-format

6310 msgid "See \"git help gc\" for manual housekeeping.\n"

6311 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

6312

5857 -#: builtin/gc.c:348

6313 +#: builtin/gc.c:336

6314 #, c-format

6315 msgid ""

6316 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5862,7 +6318,7 @@ msgstr ""

6318 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

6319 "(utilisez --force si ce n'est pas le cas)"

6320

5865 -#: builtin/gc.c:376

6321 +#: builtin/gc.c:364

6322 msgid ""

6323 "There are too many unreachable loose objects; run 'git prune' to remove them."

6324 msgstr ""

@@ -6115,7 +6571,7 @@ msgstr ""

6571 msgid "git hash-object --stdin-paths < <list-of-paths>"

6572 msgstr "git hash-object --stdin-paths < <liste-de-chemins>"

6573

6118 -#: builtin/hash-object.c:92 builtin/tag.c:612

6574 +#: builtin/hash-object.c:92 builtin/tag.c:614

6575 msgid "type"

6576 msgstr "type"

6577

@@ -6271,129 +6727,129 @@ msgstr "usage : %s%s"

6727 msgid "`git %s' is aliased to `%s'"

6728 msgstr "`git %s\" est un alias de `%s'"

6729

6274 -#: builtin/index-pack.c:151

6730 +#: builtin/index-pack.c:152

6731 #, c-format

6732 msgid "unable to open %s"

6733 msgstr "impossible d'ouvrir %s"

6734

6279 -#: builtin/index-pack.c:201

6735 +#: builtin/index-pack.c:202

6736 #, c-format

6737 msgid "object type mismatch at %s"

6738 msgstr "type d'objet non correspondant à %s"

6739

6284 -#: builtin/index-pack.c:221

6740 +#: builtin/index-pack.c:222

6741 #, c-format

6742 msgid "did not receive expected object %s"

6743 msgstr "objet attendu non reçu %s"

6744

6289 -#: builtin/index-pack.c:224

6745 +#: builtin/index-pack.c:225

6746 #, c-format

6747 msgid "object %s: expected type %s, found %s"

6748 msgstr "objet %s : type attendu %s, reçu %s"

6749

6294 -#: builtin/index-pack.c:266

6750 +#: builtin/index-pack.c:267

6751 #, c-format

6752 msgid "cannot fill %d byte"

6753 msgid_plural "cannot fill %d bytes"

6754 msgstr[0] "impossible de remplir %d octet"

6755 msgstr[1] "impossible de remplir %d octets"

6756

6301 -#: builtin/index-pack.c:276

6757 +#: builtin/index-pack.c:277

6758 msgid "early EOF"

6759 msgstr "fin de fichier prématurée"

6760

6305 -#: builtin/index-pack.c:277

6761 +#: builtin/index-pack.c:278

6762 msgid "read error on input"

6763 msgstr "erreur de lecture sur l'entrée"

6764

6309 -#: builtin/index-pack.c:289

6765 +#: builtin/index-pack.c:290

6766 msgid "used more bytes than were available"

6767 msgstr "plus d'octets utilisés que disponibles"

6768

6313 -#: builtin/index-pack.c:296

6769 +#: builtin/index-pack.c:297

6770 msgid "pack too large for current definition of off_t"

6771 msgstr "le paquet est trop grand pour la définition actuelle de off_t"

6772

6317 -#: builtin/index-pack.c:312

6773 +#: builtin/index-pack.c:313

6774 #, c-format

6775 msgid "unable to create '%s'"

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

6777

6322 -#: builtin/index-pack.c:317

6778 +#: builtin/index-pack.c:318

6779 #, c-format

6780 msgid "cannot open packfile '%s'"

6781 msgstr "impossible d'ouvrir le fichier paquet '%s'"

6782

6327 -#: builtin/index-pack.c:331

6783 +#: builtin/index-pack.c:332

6784 msgid "pack signature mismatch"

6785 msgstr "la signature du paquet ne correspond pas"

6786

6331 -#: builtin/index-pack.c:333

6787 +#: builtin/index-pack.c:334

6788 #, c-format

6789 msgid "pack version %<PRIu32> unsupported"

6790 msgstr "la version de paquet %<PRIu32> non supportée"

6791

6336 -#: builtin/index-pack.c:351

6792 +#: builtin/index-pack.c:352

6793 #, c-format

6794 msgid "pack has bad object at offset %lu: %s"

6795 msgstr "le paquet a un mauvais objet à l'offset %lu: %s"

6796

6341 -#: builtin/index-pack.c:472

6797 +#: builtin/index-pack.c:473

6798 #, c-format

6799 msgid "inflate returned %d"

6800 msgstr "la décompression (inflate) a retourné %d"

6801

6346 -#: builtin/index-pack.c:521

6802 +#: builtin/index-pack.c:522

6803 msgid "offset value overflow for delta base object"

6804 msgstr "dépassement de la valeur d'offset pour l'objet delta de base"

6805

6350 -#: builtin/index-pack.c:529

6806 +#: builtin/index-pack.c:530

6807 msgid "delta base offset is out of bound"

6808 msgstr "l'objet delta de base est hors limite"

6809

6354 -#: builtin/index-pack.c:537

6810 +#: builtin/index-pack.c:538

6811 #, c-format

6812 msgid "unknown object type %d"

6813 msgstr "type d'objet inconnu %d"

6814

6359 -#: builtin/index-pack.c:568

6815 +#: builtin/index-pack.c:569

6816 msgid "cannot pread pack file"

6817 msgstr "impossible de lire (pread) le fichier paquet"

6818

6363 -#: builtin/index-pack.c:570

6819 +#: builtin/index-pack.c:571

6820 #, c-format

6821 msgid "premature end of pack file, %lu byte missing"

6822 msgid_plural "premature end of pack file, %lu bytes missing"

6823 msgstr[0] "fin prématurée du fichier paquet, %lu octet lu"

6824 msgstr[1] "fin prématurée du fichier paquet, %lu octets lus"

6825

6370 -#: builtin/index-pack.c:596

6826 +#: builtin/index-pack.c:597

6827 msgid "serious inflate inconsistency"

6828 msgstr "grave incohérence dans la décompression (inflate)"

6829

6374 -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6375 -#: builtin/index-pack.c:805 builtin/index-pack.c:814

6830 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772

6831 +#: builtin/index-pack.c:806 builtin/index-pack.c:815

6832 #, c-format

6833 msgid "SHA1 COLLISION FOUND WITH %s !"

6834 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6835

6380 -#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6836 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162

6837 #: builtin/pack-objects.c:254

6838 #, c-format

6839 msgid "unable to read %s"

6840 msgstr "impossible de lire %s"

6841

6386 -#: builtin/index-pack.c:811

6842 +#: builtin/index-pack.c:812

6843 #, c-format

6844 msgid "cannot read existing object %s"

6845 msgstr "impossible de lire l'objet existant %s"

6846

6391 -#: builtin/index-pack.c:825

6847 +#: builtin/index-pack.c:826

6848 #, c-format

6849 msgid "invalid blob object %s"

6850 msgstr "objet blob invalide %s"

6851

6396 -#: builtin/index-pack.c:839

6852 +#: builtin/index-pack.c:840

6853 #, c-format

6854 msgid "invalid %s"

6855 msgstr "%s invalide"

@@ -6508,7 +6964,7 @@ msgstr "mauvais pack.indexversion=%<PRIu32>"

6964 msgid "invalid number of threads specified (%d)"

6965 msgstr "nombre de fils spécifié invalide (%d)"

6966

6511 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6967 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6968 #, c-format

6969 msgid "no threads support, ignoring %s"

6970 msgstr "pas de support des fils, ignore %s"

@@ -6537,111 +6993,111 @@ msgid_plural "chain length = %d: %lu objects"

6993 msgstr[0] "longueur chaînée = %d : %lu objet"

6994 msgstr[1] "longueur chaînée = %d : %lu objets"

6995

6540 -#: builtin/index-pack.c:1622

6996 +#: builtin/index-pack.c:1623

6997 msgid "Cannot come back to cwd"

6998 msgstr "Impossible de revenir au répertoire de travail courant"

6999

6544 -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6545 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

7000 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678

7001 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694

7002 #, c-format

7003 msgid "bad %s"

7004 msgstr "mauvais %s"

7005

6550 -#: builtin/index-pack.c:1703

7006 +#: builtin/index-pack.c:1708

7007 msgid "--fix-thin cannot be used without --stdin"

7008 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

7009

l10n: fr.po v2.6.0 round 1 (2441t)