# to debug | déboguer
# debugging | débogage
# to deflate | compresser
-# email | e-mail
+# email | courriel
# entry | élément
# fast-forward | avance rapide
# fast-forwarded | mis à jour en avance rapide
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-11-25 22:50+0800\n"
-"PO-Revision-Date: 2016-11-25 22:55+0800\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-07-23 04:35+0200\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
-#: advice.c:55
+#: advice.c:58
#, c-format
msgid "hint: %.*s\n"
msgstr "astuce: %.*s\n"
-#: advice.c:83
+#: advice.c:86
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
-#: advice.c:85
+#: advice.c:88
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:87
+#: advice.c:90
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:89
+#: advice.c:92
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:91
+#: advice.c:94
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:93
+#: advice.c:96
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
-#: advice.c:101
+#: advice.c:104
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:109
+#: advice.c:112
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:114 builtin/merge.c:1181
+#: advice.c:117 builtin/merge.c:1184
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:116
+#: advice.c:119
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:117
+#: advice.c:120
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:123
+#: advice.c:126
#, c-format
msgid ""
"Note: checking out '%s'.\n"
" git checkout -b <nom-de-la-nouvelle-branche>\n"
"\n"
-#: apply.c:57
+#: apply.c:58
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "option d'espace non reconnue '%s'"
-#: apply.c:73
+#: apply.c:74
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:125
+#: apply.c:126
msgid "--reject and --3way cannot be used together."
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:127
+#: apply.c:128
msgid "--cached and --3way cannot be used together."
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:130
+#: apply.c:131
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: apply.c:141
+#: apply.c:142
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: apply.c:144
+#: apply.c:145
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: apply.c:845
+#: apply.c:836
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:854
+#: apply.c:845
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:938
+#: apply.c:929
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:977
+#: apply.c:967
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
"ligne %d"
-#: apply.c:983
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:984
+#: apply.c:974
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
"à la ligne %d"
-#: apply.c:990
+#: apply.c:979
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "mode invalide dans la ligne %d : %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "lignes d'entête inconsistantes %d et %d"
+
+#: apply.c:1498
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1557
+#: apply.c:1567
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
-#: apply.c:1577
+#: apply.c:1587
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"information de nom de fichier manquante dans l'en-tête de git diff lors de "
"la suppression de %d composants de préfixe de chemin (ligne %d)"
-#: apply.c:1589
+#: apply.c:1600
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
-#: apply.c:1759
+#: apply.c:1770
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1761
+#: apply.c:1772
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1795
+#: apply.c:1806
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1832
+#: apply.c:1843
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1834
+#: apply.c:1845
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1837
+#: apply.c:1848
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
-#: apply.c:1984
+#: apply.c:1995
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2021
+#: apply.c:2032
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2182
+#: apply.c:2193
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2274
+#: apply.c:2276
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2278
+#: apply.c:2280
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2931
+#: apply.c:2933
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3050
+#: apply.c:3052
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
-#: apply.c:3062
+#: apply.c:3064
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
-#: apply.c:3068
+#: apply.c:3070
#, c-format
msgid ""
"while searching for:\n"
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3090
+#: apply.c:3092
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3098
+#: apply.c:3100
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
"inverse"
-#: apply.c:3144
+#: apply.c:3146
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
-#: apply.c:3154
+#: apply.c:3156
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
-#: apply.c:3162
+#: apply.c:3164
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
-#: apply.c:3180
+#: apply.c:3182
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
-#: apply.c:3193
+#: apply.c:3195
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3199
+#: apply.c:3201
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
"trouvé)"
-#: apply.c:3220
+#: apply.c:3222
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3342
+#: apply.c:3344
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3398
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3427 apply.c:3667
+#: apply.c:3429 apply.c:3669
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3510 apply.c:3681
+#: apply.c:3512 apply.c:3683
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3519 apply.c:3689
+#: apply.c:3521 apply.c:3691
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3554
+#: apply.c:3556
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: apply.c:3557
+#: apply.c:3559
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retour à une fusion à 3 points…\n"
-#: apply.c:3573 apply.c:3577
+#: apply.c:3575 apply.c:3579
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3589
+#: apply.c:3591
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Echec du retour à une fusion à 3 points…\n"
-#: apply.c:3603
+#: apply.c:3605
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3608
+#: apply.c:3610
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3634
+#: apply.c:3636
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3706
+#: apply.c:3708
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3708
+#: apply.c:3710
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3859 apply.c:3861
+#: apply.c:3860 apply.c:3862
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3917
+#: apply.c:3918
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3920
+#: apply.c:3921
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3940
+#: apply.c:3941
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:3945
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:3965
+#: apply.c:3966
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:3969
+#: apply.c:3970
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:3984
+#: apply.c:3985
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4075
+#: apply.c:4076
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4082
+#: apply.c:4083
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4085
+#: apply.c:4086
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: apply.c:4094
+#: apply.c:4095
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4104
+#: apply.c:4105
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4242
+#: apply.c:4243
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4277
+#: apply.c:4278
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4283
+#: apply.c:4284
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4291
+#: apply.c:4292
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4297 apply.c:4441
+#: apply.c:4298 apply.c:4442
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4338
+#: apply.c:4339
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4342
+#: apply.c:4343
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4412
+#: apply.c:4413
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4510
+#: apply.c:4511
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4518
+#: apply.c:4519
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4521
+#: apply.c:4522
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4532
+#: apply.c:4533
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4554
+#: apply.c:4555
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4558
+#: apply.c:4559
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4668
+#: apply.c:4669
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4676
+#: apply.c:4677
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4695
+#: apply.c:4696
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4858
+#: apply.c:4860
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4864 apply.c:4879
+#: apply.c:4866 apply.c:4881
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4872
+#: apply.c:4874
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
-#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
+#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: git-add--interactive.perl:197
msgid "path"
msgstr "chemin"
-#: apply.c:4920
+#: apply.c:4922
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4923
+#: apply.c:4925
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4925 builtin/am.c:2286
+#: apply.c:4927 builtin/am.c:2266
msgid "num"
msgstr "num"
-#: apply.c:4926
+#: apply.c:4928
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4929
+#: apply.c:4931
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4931
+#: apply.c:4933
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:4935
+#: apply.c:4937
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:4937
+#: apply.c:4939
msgid "instead of applying the patch, output a summary for the input"
-msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
+msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:4939
+#: apply.c:4941
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:4941
+#: apply.c:4943
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:4943
+#: apply.c:4945
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4945
+#: apply.c:4947
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4947
+#: apply.c:4949
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
-#: apply.c:4949
+#: apply.c:4951
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: apply.c:4951
+#: apply.c:4953
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:4956
+#: apply.c:4958
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:4957 builtin/am.c:2265
+#: apply.c:4959 builtin/am.c:2245
msgid "action"
msgstr "action"
-#: apply.c:4958
+#: apply.c:4960
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:4961 apply.c:4964
+#: apply.c:4963 apply.c:4966
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:4967
+#: apply.c:4969
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:4969
+#: apply.c:4971
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:4971
+#: apply.c:4973
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:4973
+#: apply.c:4975
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
-#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:4976
+#: apply.c:4978
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:4979
+#: apply.c:4981
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:4981 builtin/am.c:2274
+#: apply.c:4983 builtin/am.c:2254
msgid "root"
msgstr "racine"
-#: apply.c:4982
+#: apply.c:4984
msgid "prepend <root> to all filenames"
msgstr "préfixer tous les noms de fichier avec <root>"
-#: archive.c:12
+#: archive.c:13
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
-#: archive.c:13
+#: archive.c:14
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:14
+#: archive.c:15
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
"apparenté> [<chemin>...]"
-#: archive.c:15
+#: archive.c:16
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:429
+#: archive.c:418
msgid "fmt"
msgstr "fmt"
-#: archive.c:429
+#: archive.c:418
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:419 builtin/log.c:1446
msgid "prefix"
msgstr "préfixe"
-#: archive.c:431
+#: archive.c:420
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
-#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
-#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
-#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: parse-options.h:153
msgid "file"
msgstr "fichier"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:435
+#: archive.c:424
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:436
+#: archive.c:425
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:437
+#: archive.c:426
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:438
+#: archive.c:427
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:446
+#: archive.c:435
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:449
+#: archive.c:438
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "dépôt"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
msgid "command"
msgstr "commande"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:461
+#: archive.c:450
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:463
+#: archive.c:452
msgid "Option --exec can only be used together with --remote"
msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
-#: archive.c:465
+#: archive.c:454
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:487
+#: archive.c:476
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:494
+#: archive.c:483
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
-#: attr.c:263
+#: attr.c:214
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s n'est pas un nom valide d'attribut"
+
+#: attr.c:410
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:441
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "impossible d'ouvrir le fichier '%s'"
-
-#: bisect.c:446
+#: bisect.c:447
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
#: bisect.c:750
#, c-format
msgid ""
-"Some %s revs are not ancestor of the %s rev.\n"
+"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"Certaines révision %s ne sont pas ancêtres de la révision %s.\n"
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
-"Peut-être avez-vous inversé les révisions %s et %s ?\n"
+"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
#: bisect.c:763
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
msgstr[0] "(à peu près %d étape)"
msgstr[1] "(à peu près %d étapes)"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bissection : %d révision à tester après cette %s\n"
msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents et --reverse ne font pas bon ménage."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse et --first-parent ensemble nécessitent la spécification d'un "
+"dernier commit"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "échec de la préparation du parcours des révisions"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
+"premier parent"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "pas de chemin %s dans %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "impossible de lire le blob %s pour le chemin %s"
+
#: branch.c:53
#, c-format
msgid ""
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:363
+#: branch.c:366
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' ne semble pas être un fichier bundle v2"
-#: bundle.c:61
+#: bundle.c:62
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: bundle.c:139
+#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
-#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:356 builtin/shortlog.c:170
-msgid "revision walk setup failed"
-msgstr "échec de la préparation du parcours des révisions"
-
-#: bundle.c:185
+#: bundle.c:186
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Le colis contient cette référence :"
msgstr[1] "Le colis contient ces %d références :"
-#: bundle.c:192
+#: bundle.c:193
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:194
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :"
-#: bundle.c:253
+#: bundle.c:254
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:264
+#: bundle.c:265
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:304
+#: bundle.c:307
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:353
+#: bundle.c:356
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:451
+#: bundle.c:454
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:463
+#: bundle.c:466
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:491
+#: bundle.c:494
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
-#: color.c:290
+#: color.c:301
#, c-format
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
-#: builtin/am.c:2127
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
-#: commit.c:42
+#: commit.c:43
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:516
+#: config.c:186
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"les conditions d'inclusion de configuration relative doivent venir de "
+"fichiers"
+
+#: config.c:720
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:520
+#: config.c:724
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:524
+#: config.c:728
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:528
+#: config.c:732
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:532
+#: config.c:736
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:536
+#: config.c:740
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:655
+#: config.c:868
msgid "out of range"
msgstr "hors plage"
-#: config.c:655
+#: config.c:868
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:661
+#: config.c:874
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:666
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:669
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:672
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:675
+#: config.c:888
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:678
+#: config.c:891
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:681
+#: config.c:894
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:768
+#: config.c:989
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:852 config.c:863
+#: config.c:1084 config.c:1095
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:978
+#: config.c:1212
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1312
+#: config.c:1368
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "niveau de compression du paquet %d"
+
+#: config.c:1564
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1362
+#: config.c:1894
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:1716
+#: config.c:2064
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s invalide : '%s'"
+
+#: config.c:2085
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
+"défaut"
+
+#: config.c:2111
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
+"100"
+
+#: config.c:2122
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:1718
+#: config.c:2124
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:1777
+#: config.c:2183
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2311
+#: config.c:2517 config.c:2745
+#, c-format
+msgid "fstat on %s failed"
+msgstr "échec de fstat sur %s"
+
+#: config.c:2635
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2313
+#: config.c:2637 builtin/remote.c:775
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: connect.c:49
+#: connect.c:50
msgid "The remote end hung up upon initial contact"
msgstr "L'hôte distant a fermé la connexion lors du contact initial"
-#: connect.c:51
+#: connect.c:52
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
-"Impossilble de lire le dépôt distant.\n"
+"Impossible de lire le dépôt distant.\n"
"\n"
"Veuillez vérifier que vous avez les droits d'accès\n"
"et que le dépôt existe."
-#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
-#: convert.c:201
+#: convert.c:205
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
"travail."
-#: convert.c:205
+#: convert.c:209
#, c-format
msgid "CRLF would be replaced by LF in %s."
msgstr "Les CRLF seraient remplacés par des LF dans %s."
-#: convert.c:211
+#: convert.c:215
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"Le fichier conservera ses fins de ligne d'origine dans votre copie de "
"travail."
-#: convert.c:215
+#: convert.c:219
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "Les LF seraient remplacés par des CRLF dans %s"
-#: date.c:97
+#: date.c:116
msgid "in the future"
msgstr "dans le futur"
-#: date.c:103
+#: date.c:122
#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "il y a %lu seconde"
-msgstr[1] "il y a %lu secondes"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "il y a %<PRIuMAX> seconde"
+msgstr[1] "il y a %<PRIuMAX> secondes"
-#: date.c:110
+#: date.c:129
#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "il y a %lu minute"
-msgstr[1] "il y a %lu minutes"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "il y a %<PRIuMAX> minute"
+msgstr[1] "il y a %<PRIuMAX> minutes"
-#: date.c:117
+#: date.c:136
#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "il y a %lu heure"
-msgstr[1] "il y a %lu heures"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "il y a %<PRIuMAX> heure"
+msgstr[1] "il y a %<PRIuMAX> heures"
-#: date.c:124
+#: date.c:143
#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "il y a %lu jour"
-msgstr[1] "il y a %lu jours"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "il y a %<PRIuMAX> jour"
+msgstr[1] "il y a %<PRIuMAX> jours"
-#: date.c:130
+#: date.c:149
#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "il y a %lu semaine"
-msgstr[1] "il y a %lu semaines"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "il y a %<PRIuMAX> semaine"
+msgstr[1] "il y a %<PRIuMAX> semaines"
-#: date.c:137
+#: date.c:156
#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "il y a %lu mois"
-msgstr[1] "il y a %lu mois"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "il y a %<PRIuMAX> mois"
+msgstr[1] "il y a %<PRIuMAX> mois"
-#: date.c:148
+#: date.c:167
#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu an"
-msgstr[1] "%lu ans"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> an"
+msgstr[1] "%<PRIuMAX> ans"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "il y a %s et %lu mois"
-msgstr[1] "il y a %s et %lu mois"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "il y a %s et %<PRIuMAX> mois"
+msgstr[1] "il y a %s et %<PRIuMAX> mois"
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "il y a %lu an"
-msgstr[1] "il y a %lu ans"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "il y a %<PRIuMAX> an"
+msgstr[1] "il y a %<PRIuMAX> ans"
#: diffcore-order.c:24
#, c-format
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:62
+#: diff.c:63
#, c-format
msgid "option '%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: diff.c:124
+#: diff.c:125
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
-#: diff.c:129
+#: diff.c:130
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:283
+#: diff.c:282
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:346
+#: diff.c:342
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3087
+#: diff.c:3101
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3412
+#: diff.c:3427
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:3502
+#: diff.c:3517
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3665
+#: diff.c:3680
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3679
+#: diff.c:3694
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: diff.c:4700
+#: diff.c:4716
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:4703
+#: diff.c:4719
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:4706
+#: diff.c:4722
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:1866
+#: dir.c:1948
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:1985
+#: dir.c:2067
msgid "Untracked cache is disabled on this system or location."
msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
-#: fetch-pack.c:213
+#: dir.c:2846 dir.c:2851
+#, c-format
+msgid "could not create directories for %s"
+msgstr "impossible de créer les répertoires pour %s"
+
+#: dir.c:2876
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
+
+#: entry.c:281
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "impossible de stat le fichier '%s'"
+
+#: fetch-pack.c:251
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : list courte attendue"
-#: fetch-pack.c:225
+#: fetch-pack.c:263
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: fetch-pack.c:243
+#: fetch-pack.c:282 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "erreur distante : %s"
+
+#: fetch-pack.c:283
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:295
+#: fetch-pack.c:335
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:381
+#: fetch-pack.c:421
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:427
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:429
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:432
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:434
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:437
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:436
+#: fetch-pack.c:476
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:490
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:523
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:533 progress.c:237
msgid "done"
msgstr "fait"
-#: fetch-pack.c:505
+#: fetch-pack.c:545
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:591
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:697
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:813
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:743
+#: fetch-pack.c:821
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:799
+#: fetch-pack.c:877
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:893
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:817
+#: fetch-pack.c:895
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:844
+#: fetch-pack.c:922
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:848
+#: fetch-pack.c:926
msgid "Server supports multi_ack_detailed"
msgstr "Le serveur supporte multi_ack_detailed"
-#: fetch-pack.c:851
+#: fetch-pack.c:929
msgid "Server supports no-done"
msgstr "Le serveur support no-done"
-#: fetch-pack.c:857
+#: fetch-pack.c:935
msgid "Server supports multi_ack"
msgstr "Le serveur supporte multi_ack"
-#: fetch-pack.c:861
+#: fetch-pack.c:939
msgid "Server supports side-band-64k"
msgstr "Le serveur supporte side-band-64k"
-#: fetch-pack.c:865
+#: fetch-pack.c:943
msgid "Server supports side-band"
msgstr "Le serveru supporte side-band"
-#: fetch-pack.c:869
+#: fetch-pack.c:947
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: fetch-pack.c:873
+#: fetch-pack.c:951
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: fetch-pack.c:883
+#: fetch-pack.c:961
msgid "Server supports ofs-delta"
msgstr "Le serveur support ofs-delta"
-#: fetch-pack.c:890
+#: fetch-pack.c:968
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:974
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:978
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:980
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:991
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:925
+#: fetch-pack.c:1003
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1165
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: gpg-interface.c:185
+#: fetch-pack.c:1187
+#, c-format
+msgid "no such remote ref %s"
+msgstr "référence distante inconnue %s"
+
+#: fetch-pack.c:1190
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
+
+#: gpg-interface.c:181
msgid "gpg failed to sign the data"
msgstr "gpg n'a pas pu signer les données"
-#: gpg-interface.c:215
+#: gpg-interface.c:211
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:217
+#: gpg-interface.c:213
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
-#: grep.c:1782
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
+
+#: grep.c:1981
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:1810
+#: grep.c:2009
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
-#: help.c:203
+#: help.c:179
#, c-format
msgid "available git commands in '%s'"
msgstr "commandes git disponibles dans '%s'"
-#: help.c:210
+#: help.c:186
msgid "git commands available from elsewhere on your $PATH"
msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
-#: help.c:241
+#: help.c:217
msgid "These are common Git commands used in various situations:"
msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
-#: help.c:306
+#: help.c:281
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"'%s' semble être une commande git, mais elle n'a pas pu\n"
"être exécutée. Peut-être git-%s est-elle cassée ?"
-#: help.c:361
+#: help.c:336
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Ahem. Votre système n'indique aucune commande Git."
-#: help.c:383
+#: help.c:358
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
-"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "
-"pas.\n"
-"Continuons en supposant que vous avez voulu dire '%s'"
+"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
-#: help.c:388
+#: help.c:363
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "dans %0.1f secondes automatiquement..."
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuons en supposant que vous avez voulu dire '%s'<"
-#: help.c:395
+#: help.c:368
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<"
+
+#: help.c:376
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
-#: help.c:399 help.c:465
+#: help.c:380
msgid ""
"\n"
-"Did you mean this?"
+"The most similar command is"
msgid_plural ""
"\n"
-"Did you mean one of these?"
+"The most similar commands are"
msgstr[0] ""
"\n"
-"Vouliez-vous dire cela ?"
+"La commande la plus ressemblante est"
msgstr[1] ""
"\n"
-"Vouliez-vous dire un de ceux-là ?"
+"Les commandes les plus ressemblantes sont"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
-#: help.c:461
+#: help.c:456
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: help.c:460
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Vouliez-vous dire cela ?"
+msgstr[1] ""
+"\n"
+"Vouliez-vous dire un de ceux-là ?"
+
+#: ident.c:342
msgid ""
"\n"
"*** Please tell me who you are.\n"
"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
"\n"
+#: ident.c:366
+msgid "no email was given and auto-detection is disabled"
+msgstr "aucun courriel fourni et l'auto-détection est désactivée"
+
+#: ident.c:371
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
+
+#: ident.c:381
+msgid "no name was given and auto-detection is disabled"
+msgstr "aucun nom fourni et l'auto-détection est désactivée"
+
+#: ident.c:387
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
+
+#: ident.c:395
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "nom d'identifiant vide (pour <%s>) non permis"
+
+#: ident.c:401
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "le nom n'est constitué que de caractères interdits : %s"
+
+#: ident.c:416 builtin/commit.c:612
+#, c-format
+msgid "invalid date format: %s"
+msgstr "format de date invalide : %s"
+
#: lockfile.c:152
#, c-format
msgid ""
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: merge-recursive.c:209
+#: merge-recursive.c:210
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:231
+#: merge-recursive.c:232 merge-recursive.c:240
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "échec de addinfo_cache pour le chemin '%s'"
-#: merge-recursive.c:301
+#: merge-recursive.c:304
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:720
+#: merge-recursive.c:728
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:731
+#: merge-recursive.c:739
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
-#: merge-recursive.c:745 merge-recursive.c:764
+#: merge-recursive.c:753 merge-recursive.c:772
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:754
+#: merge-recursive.c:762
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:796 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:798
+#: merge-recursive.c:806
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:822
+#: merge-recursive.c:830
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:833
+#: merge-recursive.c:841
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:838
+#: merge-recursive.c:846
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:978
+#: merge-recursive.c:986
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:982
+#: merge-recursive.c:990
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1081 merge-recursive.c:1095
+#: merge-recursive.c:1093
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1087 merge-recursive.c:1100
+#: merge-recursive.c:1098
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre."
+
+#: merge-recursive.c:1105
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre dans le fichier %s."
-#: merge-recursive.c:1143
+#: merge-recursive.c:1110
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre dans le fichier %s."
+
+#: merge-recursive.c:1144
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
">'%s' dans %s"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: merge-recursive.c:1531
+#: merge-recursive.c:1529
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1546
+#: merge-recursive.c:1544
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1553 merge-recursive.c:1766
+#: merge-recursive.c:1551 merge-recursive.c:1781
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1610
+#: merge-recursive.c:1608
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1613
+#: merge-recursive.c:1611
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1666
+#: merge-recursive.c:1680
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1666
+#: merge-recursive.c:1680
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1676
+#: merge-recursive.c:1690
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1683
+#: merge-recursive.c:1697
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1718
+#: merge-recursive.c:1733
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1732
+#: merge-recursive.c:1747
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1736 git-submodule.sh:924
+#: merge-recursive.c:1751 git-submodule.sh:945
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1752
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1831
+#: merge-recursive.c:1846
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1857
+#: merge-recursive.c:1872
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1863
+#: merge-recursive.c:1878
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1884
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
-#: merge-recursive.c:1877
+#: merge-recursive.c:1893
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1914
+#: merge-recursive.c:1930
msgid "Already up-to-date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1923
+#: merge-recursive.c:1939
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:2006
+#: merge-recursive.c:2022
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:2019
+#: merge-recursive.c:2035
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:2058
+#: merge-recursive.c:2074
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2121
+#: merge-recursive.c:2137
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
-#: notes-utils.c:41
+#: notes-utils.c:42
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
-#: notes-utils.c:100
+#: notes-utils.c:101
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
-#: notes-utils.c:110
+#: notes-utils.c:111
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object.c:242
+#: object.c:240
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
-#: parse-options.c:572
+#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:590
+#: parse-options.c:591
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:597
+#: parse-options.c:600
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:631
+#: parse-options.c:634
msgid "-NUM"
msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:826
+#: path.c:890
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
-#: pathspec.c:133
+#: pathspec.c:129
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
+"valeur d'attribut"
+
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Une seule spécification 'attr:' est autorisée."
+
+#: pathspec.c:150
+msgid "attr spec must not be empty"
+msgstr "un spécificateur d'attribut ne peut pas être vide"
+
+#: pathspec.c:193
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nom d'attribut invalide %s"
+
+#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
"incompatibles"
-#: pathspec.c:143
+#: pathspec.c:265
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
"tous les autres réglages globaux de spécificateur de chemin"
-#: pathspec.c:177
+#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
-#: pathspec.c:183
+#: pathspec.c:326
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
-#: pathspec.c:187
+#: pathspec.c:331
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
-#: pathspec.c:205
+#: pathspec.c:369
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
-#: pathspec.c:230
+#: pathspec.c:428
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:241
+#: pathspec.c:441
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s : '%s' est hors du dépôt"
-#: pathspec.c:291
+#: pathspec.c:515
#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:353
+#: pathspec.c:525
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:408
+#: pathspec.c:575
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
"correspondre à tous le chemins"
-#: pathspec.c:440
+#: pathspec.c:599
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pathspec.c:449
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
-"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
-
-#: pretty.c:971
+#: pretty.c:963
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: read-cache.c:1315
+#: read-cache.c:1443
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1325
+#: read-cache.c:1453
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: refs.c:576 builtin/merge.c:840
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "impossible de fermer '%s'"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#, c-format
+msgid "could not stat '%s'"
+msgstr "stat impossible de '%s'"
+
+#: read-cache.c:2396
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "impossible d'ouvrir le répertoire git : %s"
+
+#: read-cache.c:2408
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "échec lors de l'unlink : %s"
+
+#: refs.c:622
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2481
+#: refs.c:1769
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs/files-backend.c:1664
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1667
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1676
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
-#: ref-filter.c:55
+# à priori on parle d'une branche ici
+#: ref-filter.c:35 wt-status.c:1811
+msgid "gone"
+msgstr "disparue"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "en avance de %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "en retard de %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "en avance de %d, en retard de %d"
+
+#: ref-filter.c:105
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:57
+#: ref-filter.c:107
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:71
+#: ref-filter.c:121
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Valeur entière attendue refname:lstrip=%s"
+
+#: ref-filter.c:125
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "format non reconnu %%(%s)"
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:77
+#: ref-filter.c:127
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argument %%(%s) non reconnu : %s"
+
+#: ref-filter.c:167
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:84
+#: ref-filter.c:174
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:101
+#: ref-filter.c:181
+#, c-format
+msgid "%%(trailers) does not take arguments"
+msgstr "%%(trailers) n'accepte pas d'argument"
+
+#: ref-filter.c:200
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:103
+#: ref-filter.c:202
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:113
+#: ref-filter.c:215
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valeur positive attendue objectname:short=%s"
+
+#: ref-filter.c:219
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:135
+#: ref-filter.c:246
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:147
+#: ref-filter.c:258
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:151
+#: ref-filter.c:262
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:157
+#: ref-filter.c:268
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:161
+#: ref-filter.c:272
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:244
+#: ref-filter.c:287
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argument %%(if) non reconnu : %s"
+
+#: ref-filter.c:378
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:270
+#: ref-filter.c:404
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:372
+#: ref-filter.c:508
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+
+#: ref-filter.c:568
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+
+#: ref-filter.c:570
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format : atome %%(then) utilisé plus d'une fois"
+
+#: ref-filter.c:572
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atome %%(then) utilisé après %%(else)"
+
+#: ref-filter.c:598
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
+
+#: ref-filter.c:600
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
+
+#: ref-filter.c:602
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format : atome %%(else) utilisé plus d'une fois"
+
+#: ref-filter.c:615
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:424
+#: ref-filter.c:670
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:878
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= requiert un argument entier positif"
+#: ref-filter.c:1254
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(aucune branche, rebasage de %s)"
+
+#: ref-filter.c:1257
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(aucune branche, bisect a démarré sur %s)"
-#: ref-filter.c:883
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "la réf '%s' n'a pas %ld composants à :strip"
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD détachée sur %s)"
-#: ref-filter.c:1046
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "format de %.*s inconnu %s"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD détachée depuis %s)"
+
+#: ref-filter.c:1276
+msgid "(no branch)"
+msgstr "(aucune branche)"
-#: ref-filter.c:1066 ref-filter.c:1097
+#: ref-filter.c:1426 ref-filter.c:1457
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1069 ref-filter.c:1100
+#: ref-filter.c:1429 ref-filter.c:1460
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "echec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1311
+#: ref-filter.c:1760
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1373
+#: ref-filter.c:1827
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:1378
+#: ref-filter.c:1832
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:1633
+#: ref-filter.c:2095
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:1687
+#: ref-filter.c:2176
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: remote.c:746
+#: remote.c:747
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Impossible de récupérer à la fois %s et %s pour %s"
-#: remote.c:750
+#: remote.c:751
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:754
+#: remote.c:755
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:762
+#: remote.c:763
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1677 remote.c:1720
+#: remote.c:1680 remote.c:1782
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1686
+#: remote.c:1689
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1689
+#: remote.c:1692
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1695
+#: remote.c:1698
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1710
+#: remote.c:1713
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:2073
+#: remote.c:2076
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:2077
+#: remote.c:2080
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2080
+#: remote.c:2083
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2084
+#: remote.c:2087
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:2090
+#: remote.c:2093
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2093
+#: remote.c:2096
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2101
+#: remote.c:2104
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2104
+#: remote.c:2107
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2114
+#: remote.c:2117
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2158
+#: revision.c:2187
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2161
+#: revision.c:2190
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2355
+#: revision.c:2384
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: run-command.c:106
+#: run-command.c:644
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: run-command.c:108
+#: send-pack.c:151
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
+
+#: send-pack.c:153
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "échec de dup2(%d,%d)"
+msgid "remote unpack failed: %s"
+msgstr "le dépaquetage a échoué : %s"
-#: send-pack.c:297
+#: send-pack.c:316
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:410
+#: send-pack.c:429
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:412
+#: send-pack.c:431
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:424
+#: send-pack.c:443
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:429
+#: send-pack.c:448
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:171
+#: sequencer.c:216
msgid "revert"
msgstr "revert"
-#: sequencer.c:171
+#: sequencer.c:218
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:228
+#: sequencer.c:220
+msgid "rebase -i"
+msgstr "rebase -i"
+
+#: sequencer.c:222
+#, c-format
+msgid "Unknown action: %d"
+msgstr "Action inconnue : %d"
+
+#: sequencer.c:279
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:231
+#: sequencer.c:282
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:244 sequencer.c:1209
+#: sequencer.c:295 sequencer.c:1685
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:251
+#: sequencer.c:302
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
#, c-format
msgid "failed to finalize '%s'."
msgstr "échec lors de la finalisation de '%s'."
-#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:305
+#: sequencer.c:356
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:309
+#: sequencer.c:360
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:324
+#: sequencer.c:389
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:399
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:472
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:418
+#: sequencer.c:491
msgid "could not resolve HEAD commit\n"
msgstr "impossible de résoudre le commit HEAD\n"
-#: sequencer.c:438
+#: sequencer.c:511
msgid "unable to update cache tree\n"
msgstr "impossible de mettre à jour l'arbre de cache\n"
-#: sequencer.c:483
+#: sequencer.c:595
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:567
+#: sequencer.c:697
#, c-format
msgid "could not parse commit %s\n"
msgstr "impossible d'analyser le commit %s\n"
-#: sequencer.c:572
+#: sequencer.c:702
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "impossible d'analyser le commit parent %s\n"
-#: sequencer.c:656
-msgid "your index file is unmerged."
-msgstr "votre fichier d'index n'est pas fusionné."
+#: sequencer.c:824
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"première ligne de message de compression inattendue :\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:830
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"première ligne de message de compression invalide :\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:836 sequencer.c:861
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Ceci est la combinaison de %d commits."
+
+#: sequencer.c:845
+msgid "need a HEAD to fixup"
+msgstr "une HEAD est nécessaire à la correction"
+
+#: sequencer.c:847
+msgid "could not read HEAD"
+msgstr "Impossible de lire HEAD"
+
+#: sequencer.c:849
+msgid "could not read HEAD's commit message"
+msgstr "impossible de lire le message de validation de HEAD"
+
+#: sequencer.c:855
+#, c-format
+msgid "cannot write '%s'"
+msgstr "impossible d'écrire '%s'"
-#: sequencer.c:675
+#: sequencer.c:864 git-rebase--interactive.sh:445
+msgid "This is the 1st commit message:"
+msgstr "Ceci est le premier message de validation :"
+
+#: sequencer.c:872
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "impossible de lire le message de validation de %s"
+
+#: sequencer.c:879
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Ceci est le message de validation numéro %d :"
+
+#: sequencer.c:884
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Le message de validation %d sera ignoré :"
+
+#: sequencer.c:889
+#, c-format
+msgid "unknown command: %d"
+msgstr "commande inconnue : %d"
+
+#: sequencer.c:955
+msgid "your index file is unmerged."
+msgstr "votre fichier d'index n'est pas fusionné."
+
+#: sequencer.c:973
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:683
+#: sequencer.c:981
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:687
+#: sequencer.c:985
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"une branche principale a été spécifiée mais le commit %s n'est pas une "
"fusion."
+#: sequencer.c:991
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "impossible d'obtenir un message de validation pour %s"
+
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:700
+#: sequencer.c:1012
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:705
+#: sequencer.c:1075 sequencer.c:1830
#, c-format
-msgid "cannot get commit message for %s"
-msgstr "impossible d'obtenir un message de validation pour %s"
+msgid "could not rename '%s' to '%s'"
+msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:797
+#: sequencer.c:1126
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:798
+#: sequencer.c:1127
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:833
+#: sequencer.c:1169
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:843
+#: sequencer.c:1179
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:850
+#: sequencer.c:1186
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:944
+#: sequencer.c:1306
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:950
-msgid "no commits parsed."
-msgstr "aucun commit analysé."
+#: sequencer.c:1314
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:966
+#: sequencer.c:1347
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:972
+#: sequencer.c:1359
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
+
+#: sequencer.c:1361
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:983
+#: sequencer.c:1366
+msgid "no commits parsed."
+msgstr "aucun commit analysé."
+
+#: sequencer.c:1377
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:985
+#: sequencer.c:1379
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:1028
+#: sequencer.c:1442
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: sequencer.c:1031
+#: sequencer.c:1445
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:1063
+#: sequencer.c:1502
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:1101
+#: sequencer.c:1540
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:1102
+#: sequencer.c:1541
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:1106
+#: sequencer.c:1544
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:1120
+#: sequencer.c:1558
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:1151 sequencer.c:1289
+#: sequencer.c:1614 sequencer.c:2188
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:1153
+#: sequencer.c:1616
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:1155 sequencer.c:1189
+#: sequencer.c:1618 sequencer.c:1652
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:1175 builtin/grep.c:578
+#: sequencer.c:1638 builtin/grep.c:929
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:1177
+#: sequencer.c:1640
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:1178
+#: sequencer.c:1641
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:1184
+#: sequencer.c:1647
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:1354
+#: sequencer.c:1658
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
+
+#: sequencer.c:1795 sequencer.c:2086
+msgid "cannot read HEAD"
+msgstr "impossible de lire HEAD"
+
+#: sequencer.c:1835 builtin/difftool.c:633
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "impossible de copier '%s' vers '%s'"
+
+#: sequencer.c:1851
+msgid "could not read index"
+msgstr "impossible de lire l'index"
+
+#: sequencer.c:1856
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"échec d'exécution : %s\n"
+"%sVous pouvez corriger le problème, puis lancer\n"
+"\n"
+"git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1862
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "et a mis à jour l'index ou l'arbre de travail\n"
+
+#: sequencer.c:1868
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"L'exécution a réussi : %s\n"
+"mais a laissé des modifications dans l'index ou la copie de travail\n"
+"Validez ou remisez vos modification, puis lancez\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1925
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autoremisage appliqué.\n"
+
+#: sequencer.c:1937
+#, c-format
+msgid "cannot store %s"
+msgstr "impossible de stocker %s"
+
+#: sequencer.c:1940 git-rebase.sh:173
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"L'application de l'autoremisage a provoqué des conflits\n"
+"Vos modifications sont à l'abri dans la remise.\n"
+"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
+
+#: sequencer.c:2022
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "arrêt à %s... %.*s\n"
+
+#: sequencer.c:2064
+#, c-format
+msgid "unknown command %d"
+msgstr "commande inconnue %d"
+
+#: sequencer.c:2094
+msgid "could not read orig-head"
+msgstr "impossible de lire orig-head"
+
+#: sequencer.c:2099
+msgid "could not read 'onto'"
+msgstr "impossible de lire 'onto'"
+
+#: sequencer.c:2106
+#, c-format
+msgid "could not update %s"
+msgstr "impossible de mettre à jour %s"
+
+#: sequencer.c:2113
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "impossible de mettre à jour HEAD sur %s"
+
+#: sequencer.c:2197
+msgid "cannot rebase: You have unstaged changes."
+msgstr "impossible de rebaser : vous avez des modifications non indexées."
+
+#: sequencer.c:2202
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "impossible de supprimer CHERRY_PICK_HEAD"
+
+#: sequencer.c:2211
+msgid "cannot amend non-existing commit"
+msgstr "impossible de corriger un commit non-existant"
+
+#: sequencer.c:2213
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "fichier invalide : '%s'"
+
+#: sequencer.c:2215
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenu invalide : '%s'"
+
+#: sequencer.c:2218
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Vous avez des modifications non validées dans votre copie de travail.\n"
+"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
+
+#: sequencer.c:2228
+msgid "could not commit staged changes."
+msgstr "impossible de valider les modifications indexées."
+
+#: sequencer.c:2308
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:1358
+#: sequencer.c:2312
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:1391
+#: sequencer.c:2345
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: setup.c:160
+#: setup.c:171
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:173
+#: setup.c:184
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:223
+#: setup.c:252
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:468
+#: setup.c:504
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:476
+#: setup.c:512
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:762
+#: setup.c:810
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
-#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
+#: setup.c:812 builtin/index-pack.c:1652
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: setup.c:845
+#: setup.c:1050
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:920
+#: setup.c:1062 setup.c:1068
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Impossible de modifié en '%s'"
+
+#: setup.c:1081
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas activé)."
-#: setup.c:927
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "Impossible de se déplacer vers le répertoire '%s/..'"
-
-#: setup.c:989
+#: setup.c:1173
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: sha1_file.c:473
+#: sha1_file.c:560
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1_file.c:499
+#: sha1_file.c:586
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: sha1_file.c:505
+#: sha1_file.c:592
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: sha1_file.c:511
+#: sha1_file.c:598
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1_file.c:519
+#: sha1_file.c:606
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1_file.c:1159
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: sha1_file.c:2592
+#: sha1_file.c:2729
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
-#: sha1_file.c:2596
+#: sha1_file.c:2733
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
-#: sha1_name.c:407
+#: sha1_name.c:419
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "le SHA1 court %s est ambigu"
-#: sha1_name.c:418
+#: sha1_name.c:430
msgid "The candidates are:"
msgstr "Les candidats sont :"
-#: sha1_name.c:578
+#: sha1_name.c:589
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Git ne créé normalement jamais de référence qui se termine par 40 caractères "
+"Git ne crée normalement jamais de référence qui se termine par 40 caractères "
"hexa\n"
"car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
"peuvent être créées par erreur. Par exemple,\n"
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:64 submodule.c:98
+#: submodule.c:70 submodule.c:104
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:68 submodule.c:102
+#: submodule.c:74 submodule.c:108
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
-#: submodule.c:76
+#: submodule.c:82
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
# ici %s est un chemin
-#: submodule.c:109
+#: submodule.c:115
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:120
+#: submodule.c:126
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:158
+#: submodule.c:165
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-#: submodule-config.c:358
+#: submodule.c:376
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "dans le sous-module '%s' non populé"
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
+
+#: submodule.c:1337
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' n'est pas reconnu comme dépôt git"
+
+#: submodule.c:1475
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
+
+#: submodule.c:1488
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
+
+#: submodule.c:1581
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "le sous-module '%s' a un index sale"
+
+#: submodule.c:1845
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
+"n'est pas supporté"
+
+#: submodule.c:1857 submodule.c:1913
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "impossible de trouve le nom pour le sous-module '%s'"
+
+#: submodule.c:1861 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "impossible de créer le répertoire '%s'"
+
+#: submodule.c:1864
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migration du répertoire git de '%s%s' depuis\n"
+"'%s' sur\n"
+"'%s'\n"
+
+#: submodule.c:1948
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "récursion impossible dans le sous-module '%s'"
+
+#: submodule.c:1992
+msgid "could not start ls-files in .."
+msgstr "impossible de démarrer ls-files dans .."
+
+#: submodule.c:2012
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
+
+#: submodule.c:2031
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree a renvoyé un code de retour inattendu %d"
+
+#: submodule-config.c:420
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
-#: trailer.c:238
+#: trailer.c:241
#, c-format
msgid "running trailer command '%s' failed"
msgstr "échec de la commande trailer '%s'"
-#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
-#: trailer.c:541
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:523 trailer.c:528 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
-#: trailer.c:672
+#: trailer.c:703
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "symbole vide dans la ligne de fin '%.*s'"
-#: trailer.c:695
+#: trailer.c:723
#, c-format
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:698
+#: trailer.c:726
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:929 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
-#: trailer.c:931
+#: trailer.c:952
#, c-format
msgid "file %s is not a regular file"
msgstr "%s n'est pas un fichier régulier"
-#: trailer.c:933
+#: trailer.c:954
#, c-format
msgid "file %s is not writable by user"
msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-#: trailer.c:945
+#: trailer.c:966
msgid "could not open temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: trailer.c:983
+#: trailer.c:1002
#, c-format
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
-#: transport.c:62
+#: transport.c:63
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-#: transport.c:151
+#: transport.c:152
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:817
+#: transport.c:890
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"Les chemins suivant de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:821
+#: transport.c:894
#, c-format
msgid ""
"\n"
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:829
+#: transport.c:902
msgid "Aborting."
msgstr "Abandon."
-#: transport-helper.c:1075
+#: transport-helper.c:1071
#, c-format
msgid "Could not read ref %s"
msgstr "impossible de lire la réf %s"
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:64
+#: unpack-trees.c:105
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:66
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:69
+#: unpack-trees.c:110
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:71
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"fusion :\n"
"%%s"
-#: unpack-trees.c:74
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:76
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:81
+#: unpack-trees.c:122
#, c-format
msgid ""
-"Updating the following directories would lose untracked files in it:\n"
+"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
"contenus :\n"
"%s"
-#: unpack-trees.c:85
+#: unpack-trees.c:126
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:87
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:90
+#: unpack-trees.c:131
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:92
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:95
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:97
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:102
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:104
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:107
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:109
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:112
+#: unpack-trees.c:153
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:114
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:121
+#: unpack-trees.c:162
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:124
+#: unpack-trees.c:165
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
"pas à jour :\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"jour par l'extraction creuse :\n"
"%s"
-#: unpack-trees.c:128
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"à jour par extraction creuse :\n"
"%s"
-#: unpack-trees.c:205
+#: unpack-trees.c:171
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Mise à jour impossible pour le sous-module :\n"
+"%s"
+
+#: unpack-trees.c:248
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:237
+#: unpack-trees.c:277
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr ""
+"stratégie de mise à jour de sous-module non supportée pour le sous-module "
+"'%s'"
+
+#: unpack-trees.c:346
msgid "Checking out files"
msgstr "Extraction des fichiers"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "séquence d'échappement %XX invalide"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "hôte manquant et le schéma n'est pas 'file:'"
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "une URL 'file:' ne peut pas contenir de numéro de port"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "caractères invalides dans le nom d'hôte"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "numéro de port invalide"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: worktree.c:282
+#: worktree.c:245
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
#, c-format
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:634
+#: wrapper.c:632
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:658
+#: wrapper.c:656
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:660
+#: wrapper.c:658
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
-#: wt-status.c:151
+#: wt-status.c:152
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:184
+#: wt-status.c:185
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:188
+#: wt-status.c:189
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:200 wt-status.c:981
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:218 wt-status.c:990
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:223
+#: wt-status.c:224
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
"dans la copie de travail)"
-#: wt-status.c:226
+#: wt-status.c:227
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:238
+#: wt-status.c:239
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:265
+#: wt-status.c:266
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:289
+#: wt-status.c:290
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:371
+#: wt-status.c:372
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:375
+#: wt-status.c:376
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:818
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Votre remisage contient actuellement %d entrée"
+msgstr[1] "Votre remisage contient actuellement %d entrées"
+
+#: wt-status.c:853
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:820
+#: wt-status.c:855
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:901
+#: wt-status.c:937
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
"Ne touchez pas à la ligne ci-dessus\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1013
+#: wt-status.c:1049
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1016
+#: wt-status.c:1052
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1054
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1023
+#: wt-status.c:1059
msgid "All conflicts fixed but you are still merging."
msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
-#: wt-status.c:1026
+#: wt-status.c:1062
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1036
+#: wt-status.c:1072
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1039
+#: wt-status.c:1075
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1043
+#: wt-status.c:1079
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1081
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1047
+#: wt-status.c:1083
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1172
+#: wt-status.c:1214
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo est manquant."
+
+#: wt-status.c:1216
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1175
+#: wt-status.c:1219
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1186
+#: wt-status.c:1230
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1191
+#: wt-status.c:1235
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1194
+#: wt-status.c:1238
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1202
+#: wt-status.c:1246
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1215
+#: wt-status.c:1259
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
-#: wt-status.c:1220
+#: wt-status.c:1264
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1234
+#: wt-status.c:1278
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1236
+#: wt-status.c:1280
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1238
+#: wt-status.c:1282
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
-#: wt-status.c:1244
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1248
+#: wt-status.c:1292
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1253
+#: wt-status.c:1297
msgid "You are currently splitting a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
-#: wt-status.c:1256
+#: wt-status.c:1300
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
-#: wt-status.c:1260
+#: wt-status.c:1304
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
"branche '%s' sur '%s'."
-#: wt-status.c:1265
+#: wt-status.c:1309
msgid "You are currently editing a commit during a rebase."
msgstr ""
"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
-#: wt-status.c:1268
+#: wt-status.c:1312
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1270
+#: wt-status.c:1314
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "
+" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
"modifications)"
-#: wt-status.c:1280
+#: wt-status.c:1324
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1285
+#: wt-status.c:1329
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1288
+#: wt-status.c:1332
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1290
+#: wt-status.c:1334
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1299
+#: wt-status.c:1343
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1304
+#: wt-status.c:1348
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1307
+#: wt-status.c:1351
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1309
+#: wt-status.c:1353
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1320
+#: wt-status.c:1364
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1324
+#: wt-status.c:1368
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1327
+#: wt-status.c:1371
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1524
+#: wt-status.c:1568
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1530
+#: wt-status.c:1574
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1532
+#: wt-status.c:1576
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1537
+#: wt-status.c:1581
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1539
+#: wt-status.c:1583
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1542
+#: wt-status.c:1586
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1560
+#: wt-status.c:1606
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1574
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "Aucun commit"
+
+#: wt-status.c:1621
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1576
+#: wt-status.c:1623
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1580
+#: wt-status.c:1627
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1586
+#: wt-status.c:1633
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1588
+#: wt-status.c:1635
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1594
+#: wt-status.c:1641
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1599
+#: wt-status.c:1646
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1602
+#: wt-status.c:1649
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1605
+#: wt-status.c:1652
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1608
+#: wt-status.c:1655
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1611
+#: wt-status.c:1658
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1614 wt-status.c:1619
+#: wt-status.c:1661 wt-status.c:1666
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1617
+#: wt-status.c:1664
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1621
+#: wt-status.c:1668
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1728
-msgid "Initial commit on "
-msgstr "Validation initiale sur "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "Encore aucun commit sur "
-#: wt-status.c:1732
+#: wt-status.c:1784
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-# à priori on parle d'une branche ici
-#: wt-status.c:1761
-msgid "gone"
-msgstr "disparue"
-
-#: wt-status.c:1763 wt-status.c:1771
+#: wt-status.c:1813 wt-status.c:1821
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1766 wt-status.c:1769
+#: wt-status.c:1816 wt-status.c:1819
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2270
+#: wt-status.c:2311
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2276
+#: wt-status.c:2317
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2278
+#: wt-status.c:2319
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
-#: builtin/add.c:22
+#: builtin/add.c:24
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:80
+#: builtin/add.c:82
#, c-format
msgid "unexpected diff status %c"
-msgstr "status de diff inattendu %c"
+msgstr "état de diff inattendu %c"
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:95
+#: builtin/add.c:97
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:149
+#: builtin/add.c:151
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:209 builtin/rev-parse.c:840
+#: builtin/add.c:211 builtin/rev-parse.c:873
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:220
+#: builtin/add.c:222
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:224
+#: builtin/add.c:226
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:227
+#: builtin/add.c:229
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:230
+#: builtin/add.c:232
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:237
+#: builtin/add.c:239
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:247
+#: builtin/add.c:249
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
-#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:269
+#: builtin/add.c:272
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:271
+#: builtin/add.c:274
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:272
+#: builtin/add.c:275
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:273
+#: builtin/add.c:276
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:274
+#: builtin/add.c:277
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:275
+#: builtin/add.c:278
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:278
+#: builtin/add.c:281
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:280
+#: builtin/add.c:283
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:281
+#: builtin/add.c:284
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:282
+#: builtin/add.c:285
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:286 builtin/update-index.c:952
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:286 builtin/update-index.c:953
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "avertir lors de l'ajout d'un dépôt embarqué"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Vous avez ajouté un autre dépôt git dans votre dépôt actuel.\n"
+"Les clones du dépôt conteneur ne contiendrons pas le contenu\n"
+"du dépôt embarqué et ne sauront pas comment l'obtenir.\n"
+"Si vous vouliez ajouter un sous-module, utilisez :\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Si vous avez ajouté ce chemin par erreur, vous pouvez le\n"
+"supprimer de l'index avec :\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Référez-vous à \"git help submodule\" pour plus d'information."
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "dépôt git embarqué ajouté : %s"
+
+#: builtin/add.c:349
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
-#: builtin/add.c:312
+#: builtin/add.c:357
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:348
+#: builtin/add.c:394
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:355
+#: builtin/add.c:401
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:359
+#: builtin/add.c:405
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:374
+#: builtin/add.c:420
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:375
+#: builtin/add.c:421
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
-#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/am.c:414
+#: builtin/am.c:413
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:401
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1176
+#: builtin/am.c:1171
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1177
+#: builtin/am.c:1172
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1178
+#: builtin/am.c:1173
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1316
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Le patch est vide. Le découpage était-il bon ?"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "Le patch actuel est vide."
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1370
#, c-format
-msgid "invalid ident line: %s"
-msgstr "ligne d'identification invalide : %s"
+msgid "invalid ident line: %.*s"
+msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1417
+#: builtin/am.c:1392
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1586
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1612
+#: builtin/am.c:1588
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1631
+#: builtin/am.c:1607
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1637
+#: builtin/am.c:1613
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1662
+#: builtin/am.c:1638
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1686 builtin/merge.c:628
+#: builtin/am.c:1662 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1693
+#: builtin/am.c:1669
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
-#: builtin/merge.c:823
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1715 builtin/am.c:1719
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1759
+#: builtin/am.c:1735
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1764
+#: builtin/am.c:1740
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1750
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1824
+#: builtin/am.c:1800
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1840 builtin/am.c:1912
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1856
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1885
+#: builtin/am.c:1864
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1870
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1936
+#: builtin/am.c:1915
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1943
+#: builtin/am.c:1922
msgid ""
"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-"Vous avez toujours des chemins non fusionnés dans votre index\n"
-"Auriez-vous oublié de faire 'git add' ?"
+"Vous avez encore des chemin non-fusionnés dans votre index.\n"
+"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer "
+"comme tel.\n"
+"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
+"accepter son état."
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2103
+#: builtin/am.c:2083
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2137
+#: builtin/am.c:2117
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2180
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2242
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:172
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2247
+#: builtin/am.c:2227
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2250
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2252
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2261
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2264
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
-#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:372
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2296
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2298
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2301
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2307
+#: builtin/am.c:2287
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2311
+#: builtin/am.c:2291
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2313
+#: builtin/am.c:2293
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2316
+#: builtin/am.c:2296
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2299
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2317
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2341
+#: builtin/am.c:2324
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2356
+#: builtin/am.c:2339
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2380
+#: builtin/am.c:2363
#, c-format
msgid ""
"Stray %s directory found.\n"
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2386
+#: builtin/am.c:2369
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "erreur distante : %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
-#: builtin/blame.c:33
+#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
-#: builtin/blame.c:38
+#: builtin/blame.c:32
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:1781
-msgid "Blaming lines"
-msgstr "Assignation de blâme au lignes"
-
-#: builtin/blame.c:2577
+#: builtin/blame.c:668
msgid "Show blame entries as we find them, incrementally"
msgstr ""
"Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:2578
+#: builtin/blame.c:669
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-#: builtin/blame.c:2579
+#: builtin/blame.c:670
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
-#: builtin/blame.c:2580
+#: builtin/blame.c:671
msgid "Show work cost statistics"
msgstr "Montrer les statistiques de coût d'activité"
-#: builtin/blame.c:2581
+#: builtin/blame.c:672
msgid "Force progress reporting"
msgstr "Forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:2582
+#: builtin/blame.c:673
msgid "Show output score for blame entries"
msgstr "Montrer le score de sortie pour les éléments de blâme"
-#: builtin/blame.c:2583
+#: builtin/blame.c:674
msgid "Show original filename (Default: auto)"
msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:675
msgid "Show original linenumber (Default: off)"
msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:676
msgid "Show in a format designed for machine consumption"
msgstr "Afficher dans un format propice à la consommation par machine"
-#: builtin/blame.c:2586
+#: builtin/blame.c:677
msgid "Show porcelain format with per-line commit information"
msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
-#: builtin/blame.c:2587
+#: builtin/blame.c:678
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
-#: builtin/blame.c:2588
+#: builtin/blame.c:679
msgid "Show raw timestamp (Default: off)"
msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:680
msgid "Show long commit SHA1 (Default: off)"
msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:681
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
-#: builtin/blame.c:2591
+#: builtin/blame.c:682
msgid "Show author email instead of name (Default: off)"
-msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
+msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)"
-#: builtin/blame.c:2592
+#: builtin/blame.c:683
msgid "Ignore whitespace differences"
msgstr "Ignorer les différences d'espace"
-#: builtin/blame.c:2599
-msgid "Use an experimental indent-based heuristic to improve diffs"
-msgstr ""
-"Utiliser une heuristique expérimentale reposant sur l'indentation pour "
-"améliorer les diffs"
-
-#: builtin/blame.c:2600
-msgid "Use an experimental blank-line-based heuristic to improve diffs"
-msgstr ""
-"Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
-"améliorer le diffs"
+#: builtin/blame.c:690
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
-#: builtin/blame.c:2602
+#: builtin/blame.c:692
msgid "Spend extra cycles to find better match"
msgstr ""
"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:2603
+#: builtin/blame.c:693
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr ""
"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:2604
+#: builtin/blame.c:694
msgid "Use <file>'s contents as the final image"
msgstr "Utiliser le contenu de <fichier> comme image finale"
-#: builtin/blame.c:2605 builtin/blame.c:2606
+#: builtin/blame.c:695 builtin/blame.c:696
msgid "score"
msgstr "score"
-#: builtin/blame.c:2605
+#: builtin/blame.c:695
msgid "Find line copies within and across files"
msgstr "Trouver les copies de ligne dans et entre les fichiers"
-#: builtin/blame.c:2606
+#: builtin/blame.c:696
msgid "Find line movements within and across files"
msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
-#: builtin/blame.c:2607
+#: builtin/blame.c:697
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2607
+#: builtin/blame.c:697
msgid "Process only line range n,m, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
-#: builtin/blame.c:2654
+#: builtin/blame.c:744
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
"porcelaine"
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output. For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2700
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:2780
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents et --reverse ne font pas bon ménage."
-
-#: builtin/blame.c:2800
-msgid "cannot use --contents with final commit object name"
-msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
-
-#: builtin/blame.c:2805
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse et --first-parent ensemble nécessitent la spécification d'un "
-"dernier commit"
-
-#: builtin/blame.c:2832
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
-"premier parent"
-
-#: builtin/blame.c:2843
-#, c-format
-msgid "no such path %s in %s"
-msgstr "pas de chemin %s dans %s"
-
-#: builtin/blame.c:2854
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "impossible de lire le blob %s pour le chemin %s"
-
-#: builtin/blame.c:2873
+#: builtin/blame.c:882
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "Assignation de blâme au lignes"
+
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr ""
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
-#: builtin/branch.c:30
+#: builtin/branch.c:31
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<options>] [-r | -a] [--format]"
+
+#: builtin/branch.c:145
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:149
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
" '%s', même si elle est fusionnée dans HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:163
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:165
+#: builtin/branch.c:167
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
"La branche '%s' n'est pas totalement fusionnée.\n"
-"Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."
+"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
-#: builtin/branch.c:178
+#: builtin/branch.c:180
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:206
+#: builtin/branch.c:211
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:217
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:231
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:241
+#: builtin/branch.c:246
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:242
+#: builtin/branch.c:247
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:257
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:258
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:265
+#: builtin/branch.c:270
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:271
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-# féminin pour une branche
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: disparue]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: en retard de %d]"
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[en retard de %d]"
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s : en avance de %d]"
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[en avance de %d]"
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s : en avance de %d, en retard de %d]"
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[en avance de %d, en retard de %d]"
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** référence invalide ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(aucune branche, rebasage de %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(aucune branche, bisect a démarré sur %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD détachée sur %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD détachée depuis %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(aucune branche)"
-
-#: builtin/branch.c:544
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:548
+#: builtin/branch.c:449
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:563
+#: builtin/branch.c:464
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:573
+#: builtin/branch.c:474
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:590
+#: builtin/branch.c:491
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:594
+#: builtin/branch.c:494
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'un branche mal nommée '%s'"
-#: builtin/branch.c:597
+#: builtin/branch.c:497
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:604
+#: builtin/branch.c:506
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:620
+#: builtin/branch.c:522
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:651
+#: builtin/branch.c:555
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:653
+#: builtin/branch.c:557
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:654
+#: builtin/branch.c:558
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:655
+#: builtin/branch.c:559
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:657
+#: builtin/branch.c:561
msgid "change upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:659
+#: builtin/branch.c:563
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:659
+#: builtin/branch.c:563
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:660
+#: builtin/branch.c:564
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:661
+#: builtin/branch.c:565
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:662
+#: builtin/branch.c:566
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:664 builtin/branch.c:665
+#: builtin/branch.c:568 builtin/branch.c:570
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:668
+#: builtin/branch.c:569 builtin/branch.c:571
+msgid "print only branches that don't contain the commit"
+msgstr "afficher seulement les branches qui ne contiennent pas le commit"
+
+#: builtin/branch.c:574
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:669
+#: builtin/branch.c:575
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:671
+#: builtin/branch.c:577
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:672
+#: builtin/branch.c:578
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:673
+#: builtin/branch.c:579
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:674
+#: builtin/branch.c:580
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:675
+#: builtin/branch.c:581
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:676
+#: builtin/branch.c:582
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:678
+#: builtin/branch.c:584
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:679
+#: builtin/branch.c:585
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:680
+#: builtin/branch.c:586
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:681
+#: builtin/branch.c:587
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:682
+#: builtin/branch.c:588
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "key"
msgstr "clé"
-#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:369
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
msgid "object"
msgstr "objet"
-#: builtin/branch.c:687
+#: builtin/branch.c:593
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:705
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+msgid "sorting and filtering are case insensitive"
+msgstr "le tri et le filtrage sont non-sensibles à la casse"
+
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "format à utiliser pour la sortie"
+
+#: builtin/branch.c:615
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Échec de résolution de HEAD comme référence valide."
-#: builtin/branch.c:709 builtin/clone.c:706
+#: builtin/branch.c:619 builtin/clone.c:728
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:729
+#: builtin/branch.c:642
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:740 builtin/branch.c:782
+#: builtin/branch.c:653 builtin/branch.c:705
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:758
+#: builtin/branch.c:681
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:763
+#: builtin/branch.c:686
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:770
+#: builtin/branch.c:693
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:773
+#: builtin/branch.c:696
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:788
+#: builtin/branch.c:711
msgid "too many branches for a rename operation"
msgstr "trop de branches pour une opération de renommage"
-#: builtin/branch.c:793
+#: builtin/branch.c:716
msgid "too many branches to set new upstream"
msgstr "trop de branches pour spécifier une branche amont"
-#: builtin/branch.c:797
+#: builtin/branch.c:720
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:804
+#: builtin/branch.c:727
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:816
+#: builtin/branch.c:739
msgid "too many branches to unset upstream"
msgstr "trop de branches pour désactiver un amont"
-#: builtin/branch.c:820
+#: builtin/branch.c:743
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
"aucune branche."
-#: builtin/branch.c:826
+#: builtin/branch.c:749
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:840
+#: builtin/branch.c:763
msgid "it does not make sense to create 'HEAD' manually"
msgstr "créer manuellement 'HEAD' n'a pas de sens"
-#: builtin/branch.c:846
+#: builtin/branch.c:769
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:849
+#: builtin/branch.c:772
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
"track ou --set-upstream-to\n"
-#: builtin/branch.c:866
+#: builtin/branch.c:789
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
"\n"
-"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"
+"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s est correct\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "La création d'un colis requiert un dépôt."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
msgid "exit with zero when there's no error"
msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
msgid "for blob objects, run textconv on object's content"
msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
msgid "for blob objects, run filters on object's content"
msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
-#: builtin/cat-file.c:561 git-submodule.sh:923
+#: builtin/cat-file.c:567 git-submodule.sh:944
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
msgid "show info about objects fed from the standard input"
msgstr "afficher l'information des objets passés en entrée standard"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
msgid "report all attributes set on file"
msgstr "afficher tous les attributs associés au fichier"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "use .gitattributes only from the index"
msgstr "utiliser .gitattributes seulement depuis l'index"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
msgid "read file names from stdin"
msgstr "lire les noms de fichier depuis l'entrée standard"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
msgid "show non-matching input paths"
msgstr "afficher les chemins en entrée qui ne correspondent pas"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
msgid "ignore index when checking"
msgstr "ignorer l'index pendant la vérification"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
msgid "cannot specify pathnames with --stdin"
msgstr "impossible de spécifier les chemins avec --stdin"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
msgid "-z only makes sense with --stdin"
msgstr "-z n'a de sens qu'avec l'option --stdin"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
msgid "no path specified"
msgstr "aucun chemin spécifié"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet n'est valide qu'avec un seul chemin"
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
msgid "cannot have both --quiet and --verbose"
msgstr "impossible d'avoir --quiet et --verbose"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching n'est valide qu'avec --verbose"
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr "git check-mailmap [<options>] <contact>..."
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr "lire aussi les contacts depuis l'entrée standard"
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr "impossible d'analyser le contact : %s"
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr "aucun contact spécifié"
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
msgid "stage should be between 1 and 3 or all"
msgstr "stage doit valoir entre 1 et 3, ou all"
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
msgid "no warning for existing files and files not in index"
msgstr ""
"pas d'avertissement pour les fichiers existants et les fichiers absents de "
"l'index"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
-#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
-#: builtin/worktree.c:469
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:478
msgid "string"
msgstr "chaîne"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:26
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<options>] <branche>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:135 builtin/checkout.c:168
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:137 builtin/checkout.c:170
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:153
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "le chemin '%s' n'a aucune des versions nécessaires"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:197
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:214
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:231
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:265 builtin/checkout.c:268
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:271
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
"même temps."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:342 builtin/checkout.c:349
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:497
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:624
+#: builtin/checkout.c:628
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:663
+#: builtin/checkout.c:669
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:667 builtin/clone.c:660
+#: builtin/checkout.c:673 builtin/clone.c:682
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:677
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:680
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:678
+#: builtin/checkout.c:684
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:680 builtin/checkout.c:1069
+#: builtin/checkout.c:686 builtin/checkout.c:1075
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:682
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:733
+#: builtin/checkout.c:739
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:745
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:758
+#: builtin/checkout.c:764
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:794
+#: builtin/checkout.c:800
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:798
+#: builtin/checkout.c:804
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:825 builtin/checkout.c:1064
+#: builtin/checkout.c:832 builtin/checkout.c:1070
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:970
+#: builtin/checkout.c:976
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1010 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1039
+#: builtin/checkout.c:1045
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1078
+#: builtin/checkout.c:1084
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1081 builtin/checkout.c:1085
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
-#: builtin/checkout.c:1100
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1105
+#: builtin/checkout.c:1111
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1139
+#: builtin/checkout.c:1145
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1141
+#: builtin/checkout.c:1147
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1148
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1143 builtin/worktree.c:328
+#: builtin/checkout.c:1149 builtin/worktree.c:332
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1150
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1152
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1146
+#: builtin/checkout.c:1152
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1153
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1155
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1151
+#: builtin/checkout.c:1157
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1158
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1153 builtin/merge.c:231
+#: builtin/checkout.c:1159 builtin/merge.c:235
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1161
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1164
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1166
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1168
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
-#: builtin/send-pack.c:168
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1203
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1220
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1216
+#: builtin/checkout.c:1225
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1261
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1259
+#: builtin/checkout.c:1268
#, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' "
-"en même temps.\n"
-"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
+"'%s' n'est pas un commit et une branche '%s' ne peut pas être créée depuis."
-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1272
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1276
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Suppression de %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Supprimerait %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Ignore le dépôt %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Ignorerait le dépôt %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:291
+#: builtin/clean.c:298 git-add--interactive.perl:572
+#, c-format
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - select item based on unique prefix\n"
-" - (empty) select nothing"
+" - (empty) select nothing\n"
msgstr ""
"Aide en ligne :\n"
"1 - sélectionner un élément numéroté\n"
"foo - sélectionner un élément par un préfixe unique\n"
-" - (vide) ne rien sélectionner"
+" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:295
+#: builtin/clean.c:302 git-add--interactive.perl:581
+#, c-format
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
"foo - select item based on unique prefix\n"
"-... - unselect specified items\n"
"* - choose all items\n"
-" - (empty) finish selecting"
+" - (empty) finish selecting\n"
msgstr ""
"Aide en ligne :\n"
"1 - sélectionner un seul élément\n"
"foo - sélectionner un élément par un préfixe unique\n"
"-... - désélectionner les éléments spécifiés\n"
"* - choisir tous les éléments\n"
-" - (vide) terminer la sélection"
+" - (vide) terminer la sélection\n"
-#: builtin/clean.c:511
-#, c-format
-msgid "Huh (%s)?"
-msgstr "Hein (%s) ?"
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:660
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:690
+#: builtin/clean.c:697
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:718
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:759
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:777
-msgid "Bye."
-msgstr "Au revoir."
+#: builtin/clean.c:784 git-add--interactive.perl:1616
+#, c-format
+msgid "Bye.\n"
+msgstr "Au revoir.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:792
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:812
+#: builtin/clean.c:819 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:813
+#: builtin/clean.c:820 git-add--interactive.perl:1689
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:821
+#: builtin/clean.c:828
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Supprimerait l'élément suivant :"
msgstr[1] "Supprimerait les éléments suivants :"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:869
+#: builtin/clean.c:906
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:871
+#: builtin/clean.c:908
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:872
+#: builtin/clean.c:909
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:874
+#: builtin/clean.c:911
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
-#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:876
+#: builtin/clean.c:913
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:877
+#: builtin/clean.c:914
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:879
+#: builtin/clean.c:916
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:897
+#: builtin/clean.c:934
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:901
+#: builtin/clean.c:938
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:904
+#: builtin/clean.c:941
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clone.c:37
+#: builtin/clone.c:38
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:82
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:70
+#: builtin/clone.c:87
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:72
+#: builtin/clone.c:89
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:74
+#: builtin/clone.c:91
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:76
+#: builtin/clone.c:93
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:95 builtin/clone.c:99
+msgid "pathspec"
+msgstr "spécificateur de chemin"
+
+#: builtin/clone.c:95 builtin/clone.c:99
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:82
+#: builtin/clone.c:102
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
-#: builtin/submodule--helper.c:954
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:90
+#: builtin/clone.c:110
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:92
+#: builtin/clone.c:112
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:94
+#: builtin/clone.c:114
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:96
+#: builtin/clone.c:116
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:98
+#: builtin/clone.c:118
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
#: parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/clone.c:100
+#: builtin/clone.c:120
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:102 builtin/fetch.c:125
-msgid "deepen history of shallow clone by excluding rev"
+#: builtin/clone.c:122 builtin/fetch.c:120
+msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:104
+#: builtin/clone.c:124
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+"ne pas cloner les tags et indiquer au récupérations futures de ne pas le "
+"faire"
+
+#: builtin/clone.c:128
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:109
+#: builtin/clone.c:131
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:110
+#: builtin/clone.c:132
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:250
+#: builtin/clone.c:272
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:303
+#: builtin/clone.c:325
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:397
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:383
+#: builtin/clone.c:405
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:397
+#: builtin/clone.c:419
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:441
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:423
+#: builtin/clone.c:445
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:448
+#: builtin/clone.c:470
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:482
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:559
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:632
+#: builtin/clone.c:654
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:648
+#: builtin/clone.c:670
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:719
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:728
+#: builtin/clone.c:750
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:768
+#: builtin/clone.c:792
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:831
+#: builtin/clone.c:855
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:833
+#: builtin/clone.c:857
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:870
+#: builtin/clone.c:894
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:883
+#: builtin/clone.c:907
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:886
+#: builtin/clone.c:910
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:899
+#: builtin/clone.c:923
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:905 builtin/fetch.c:1338
+#: builtin/clone.c:929 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:915
+#: builtin/clone.c:939
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:925
+#: builtin/clone.c:949
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:943
+#: builtin/clone.c:967
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:955
+#: builtin/clone.c:979
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:981
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:1005
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1067
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:1021
+#: builtin/clone.c:1069
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
"\"."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1071
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
"\"file://\"."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1074
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1079
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1083
#, c-format
msgid "Don't know how to clone %s"
msgstr "Je ne sais pas cloner %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1138 builtin/clone.c:1146
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1149
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
-#: builtin/column.c:9
+#: builtin/column.c:10
msgid "git column [<options>]"
msgstr "git column [<options>]"
-#: builtin/column.c:26
+#: builtin/column.c:27
msgid "lookup config vars"
msgstr "rechercher les variables de configuration"
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "mise en page à utiliser"
-#: builtin/column.c:29
+#: builtin/column.c:30
msgid "Maximum width"
msgstr "Largeur maximale"
-#: builtin/column.c:30
+#: builtin/column.c:31
msgid "Padding space on left border"
msgstr "Remplissage d'espace sur la bordure gauche"
-#: builtin/column.c:31
+#: builtin/column.c:32
msgid "Padding space on right border"
msgstr "Remplissage d'espace sur le côté droit"
-#: builtin/column.c:32
+#: builtin/column.c:33
msgid "Padding space between columns"
msgstr "Remplissage d'espace entre les colonnes"
-#: builtin/column.c:51
+#: builtin/column.c:52
msgid "--command must be the first argument"
msgstr "--command doit être le premier argument"
-#: builtin/commit.c:38
+#: builtin/commit.c:39
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:43
+#: builtin/commit.c:44
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<options>] [--] <spécification-de-chemin>..."
-#: builtin/commit.c:48
+#: builtin/commit.c:49
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n"
+"Votre nom et votre adresse courriel ont été configurés automatiquement en "
+"se\n"
"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:61
+#: builtin/commit.c:62
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"Votre nom et votre adresse e-mail ont été configurés automatiquement en se "
+"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
"fondant\n"
"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
"qu'ils sont corrects.\n"
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:73
+#: builtin/commit.c:74
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
"supprimer complètement le commit avec \"git reset HEAD^\".\n"
-#: builtin/commit.c:78
+#: builtin/commit.c:79
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:85
+#: builtin/commit.c:86
msgid "Otherwise, please use 'git reset'\n"
msgstr "Sinon, veuillez utiliser 'git reset'\n"
-#: builtin/commit.c:88
+#: builtin/commit.c:89
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:318
+#: builtin/commit.c:319
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:359
+#: builtin/commit.c:360
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:365
+#: builtin/commit.c:366
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:378
+#: builtin/commit.c:379
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:380
+#: builtin/commit.c:381
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:460
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:469
+#: builtin/commit.c:470
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:488
+#: builtin/commit.c:489
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "format de date invalide : %s"
-
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:704 builtin/shortlog.c:286
+#: builtin/commit.c:705 builtin/shortlog.c:295
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:857
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:865
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:872
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:889
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:954
+#: builtin/commit.c:951
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:969 builtin/tag.c:266
+#: builtin/commit.c:965 builtin/tag.c:274
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
"auteur existant"
-#: builtin/commit.c:1086 builtin/commit.c:1327
+#: builtin/commit.c:1083 builtin/commit.c:1328
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
msgid "Using both --reset-author and --author does not make sense"
msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
"être utilisée."
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
msgid "No paths with --include/--only does not make sense."
msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
-#: builtin/commit.c:1212
-msgid "Clever... amending the last one with dirty index."
-msgstr "Malin... correction du dernier avec un index sale."
-
-#: builtin/commit.c:1214
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-
-#: builtin/commit.c:1226 builtin/tag.c:474
+#: builtin/commit.c:1219 builtin/tag.c:552
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1224
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1341 builtin/commit.c:1617
+#: builtin/commit.c:1342 builtin/commit.c:1617
msgid "show status concisely"
-msgstr "afficher le statut avec concision"
+msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1343 builtin/commit.c:1619
+#: builtin/commit.c:1344 builtin/commit.c:1619
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "afficher l'information de remisage"
+
+#: builtin/commit.c:1348
msgid "version"
msgstr "version"
-#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
-#: builtin/worktree.c:440
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1348 builtin/commit.c:1623
+#: builtin/commit.c:1351 builtin/commit.c:1623
msgid "show status in long format (default)"
-msgstr "afficher le statut en format long (par défaut)"
+msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1351 builtin/commit.c:1626
+#: builtin/commit.c:1354 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:353
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1354 builtin/commit.c:1629
+#: builtin/commit.c:1357 builtin/commit.c:1629
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1357
+#: builtin/commit.c:1360
msgid "show ignored files"
msgstr "afficher les fichiers ignorés"
-#: builtin/commit.c:1358 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1359
+#: builtin/commit.c:1362
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1361
+#: builtin/commit.c:1364
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1440
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1439
+#: builtin/commit.c:1442
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1487
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1490
msgid " (root-commit)"
msgstr " (commit racine)"
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1591 builtin/tag.c:351
+#: builtin/commit.c:1591 builtin/tag.c:410
msgid "read message from file"
msgstr "lire le message depuis un fichier"
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1593 builtin/gc.c:326
+#: builtin/commit.c:1593 builtin/gc.c:358
msgid "date"
msgstr "date"
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:349
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
msgid "message"
msgstr "message"
msgstr "message de validation"
#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "commit"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1603 builtin/tag.c:354
+#: builtin/commit.c:1603 builtin/tag.c:413
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
#: builtin/commit.c:1604
msgid "include status in commit message template"
-msgstr "inclure le statut dans le modèle de message de validation"
+msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1664
+#: builtin/commit.c:1665
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1712
+#: builtin/commit.c:1710
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1719
+#: builtin/commit.c:1717
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1738
+#: builtin/commit.c:1736
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1749
+#: builtin/commit.c:1747
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
-#: builtin/commit.c:1754
-#, fuzzy, c-format
+#: builtin/commit.c:1752
+#, c-format
msgid "Aborting commit due to empty commit message.\n"
-msgstr "Abandon de la validation dû à un message de validation vide\n"
+msgstr "Abandon de la validation dû à un message de validation vide.\n"
-#: builtin/commit.c:1802
+#: builtin/commit.c:1800
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
"n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."
-#: builtin/config.c:9
+#: builtin/config.c:10
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "Action"
msgstr "Action"
-#: builtin/config.c:62
+#: builtin/config.c:64
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:63
+#: builtin/config.c:65
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:64
+#: builtin/config.c:66
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
-#: builtin/config.c:65
+#: builtin/config.c:67
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:68
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:67
+#: builtin/config.c:69
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:68
+#: builtin/config.c:70
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:69
+#: builtin/config.c:71
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:70
+#: builtin/config.c:72
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:71
+#: builtin/config.c:73
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:72
+#: builtin/config.c:74
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:73
+#: builtin/config.c:75
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:74
+#: builtin/config.c:76
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:75
+#: builtin/config.c:77
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:78
msgid "Type"
msgstr "Type"
-#: builtin/config.c:77
+#: builtin/config.c:79
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:78
+#: builtin/config.c:80
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:79
+#: builtin/config.c:81
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:80
+#: builtin/config.c:82
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:81
+#: builtin/config.c:83
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:82
+#: builtin/config.c:84
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:83
+#: builtin/config.c:85
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
+
+#: builtin/config.c:621
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:625
+#: builtin/config.c:633
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
-#: builtin/describe.c:17
+#: builtin/describe.c:19
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<options>] <commit ou apparenté>*"
-#: builtin/describe.c:18
+#: builtin/describe.c:20
msgid "git describe [<options>] --dirty"
msgstr "git describe [<options>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:54
+msgid "head"
+msgstr "tête"
+
+#: builtin/describe.c:54
+msgid "lightweight"
+msgstr "léger"
+
+#: builtin/describe.c:54
+msgid "annotated"
+msgstr "annoté"
+
+#: builtin/describe.c:253
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:221
+#: builtin/describe.c:257
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-#: builtin/describe.c:223
+#: builtin/describe.c:259
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:286 builtin/log.c:489
#, c-format
msgid "Not a valid object name %s"
msgstr "%s n'est pas un nom d'objet valide"
-#: builtin/describe.c:253
+#: builtin/describe.c:289
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s n'est pas un objet '%s' valide"
-#: builtin/describe.c:270
+#: builtin/describe.c:306
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:272
+#: builtin/describe.c:308
#, c-format
msgid "searching to describe %s\n"
msgstr "recherche de la description de %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:355
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:382
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:386
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:371
+#: builtin/describe.c:416
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:419
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:441
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:397
+#: builtin/describe.c:442
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:398
+#: builtin/describe.c:443
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:399
+#: builtin/describe.c:444
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:400
+#: builtin/describe.c:445
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:401
+#: builtin/describe.c:446
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:404
+#: builtin/describe.c:449
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:406
+#: builtin/describe.c:451
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:453
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:455
+msgid "do not consider tags matching <pattern>"
+msgstr "ne pas considérer les étiquettes correspondant à <motif>"
+
+#: builtin/describe.c:457 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:411
+#: builtin/describe.c:458 builtin/describe.c:461
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:412
+#: builtin/describe.c:459
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:462
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
+
+#: builtin/describe.c:480
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:456
+#: builtin/describe.c:509
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:476
+#: builtin/describe.c:552
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-#: builtin/diff.c:86
+#: builtin/describe.c:554
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken est incompatible avec les commits ou assimilés"
+
+#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
-#: builtin/diff.c:237
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:361
+#: builtin/diff.c:359
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:404
+#: builtin/diff.c:402
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:413
+#: builtin/diff.c:411
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:420
+#: builtin/diff.c:416
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
-#: builtin/fast-export.c:25
+#: builtin/difftool.c:29
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
+
+#: builtin/difftool.c:249
+#, c-format
+msgid "failed: %d"
+msgstr "échec : %d"
+
+#: builtin/difftool.c:291
+#, c-format
+msgid "could not read symlink %s"
+msgstr "lecture du lien symbolique %s impossible"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "impossible de lire le fichier symlink %s"
+
+#: builtin/difftool.c:301
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "Impossible de lire l'objet %s pour le symlink %s"
+
+#: builtin/difftool.c:403
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
+"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
+
+#: builtin/difftool.c:626
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
+
+#: builtin/difftool.c:628
+msgid "working tree file has been left."
+msgstr "le fichier dans l'arbre de travail a été laissé."
+
+#: builtin/difftool.c:639
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "des fichiers temporaires existent dans '%s'."
+
+#: builtin/difftool.c:640
+msgid "you may want to cleanup or recover these."
+msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
+
+#: builtin/difftool.c:689
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
+
+#: builtin/difftool.c:691
+msgid "perform a full-directory diff"
+msgstr "réalise un diff de répertoire complet"
+
+#: builtin/difftool.c:693
+msgid "do not prompt before launching a diff tool"
+msgstr "ne pas confirmer avant de lancer l'outil de diff"
+
+#: builtin/difftool.c:699
+msgid "use symlinks in dir-diff mode"
+msgstr "utiliser les liens symboliques en mode de diff de répertoire"
+
+#: builtin/difftool.c:700
+msgid "<tool>"
+msgstr "<outil>"
+
+#: builtin/difftool.c:701
+msgid "use the specified diff tool"
+msgstr "utiliser l'outil de diff spécifié"
+
+#: builtin/difftool.c:703
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
+
+#: builtin/difftool.c:706
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
+"non-nul"
+
+#: builtin/difftool.c:708
+msgid "<command>"
+msgstr "<commande>"
+
+#: builtin/difftool.c:709
+msgid "specify a custom command for viewing diffs"
+msgstr "spécifier une commande personnalisée pour visualiser les différences"
+
+#: builtin/difftool.c:733
+msgid "no <tool> given for --tool=<tool>"
+msgstr "pas d'<outil> spécifié pour --tool=<outil>"
+
+#: builtin/difftool.c:740
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
+
+#: builtin/fast-export.c:26
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
msgid "Fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
msgid "Apply refspec to exported refs"
msgstr "Appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
"éliminer les branches de suivi distant si la branche n'existe plus dans le "
"dépôt distant"
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
msgid "deepen history of shallow repository based on time"
msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:126 builtin/log.c:1450
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "mode par défaut pour la récursion"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"par défaut pour la récupération récursive de sous-modules (priorité plus "
+"basse que les fichiers de config)"
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:398
+#: builtin/fetch.c:394
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:514
+#: builtin/fetch.c:512
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:607
+#: builtin/fetch.c:605
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:611
+#: builtin/fetch.c:609
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:624 builtin/fetch.c:704
+#: builtin/fetch.c:622 builtin/fetch.c:702
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:625
+#: builtin/fetch.c:623
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:634
+#: builtin/fetch.c:632
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
-#: builtin/fetch.c:699
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:652
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:655
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:660
+#: builtin/fetch.c:658
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:699
+#: builtin/fetch.c:697
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:704
+#: builtin/fetch.c:702
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:749
+#: builtin/fetch.c:747
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:767
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:856 builtin/fetch.c:952
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:867
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:955
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:956 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1023
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:979
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1001
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1077
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Je ne sais pas récupérer depuis %s"
-#: builtin/fetch.c:1237
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1239 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1257
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1280
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1322
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1329
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1331
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1353
+#: builtin/fetch.c:1349
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1355
+#: builtin/fetch.c:1351
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1366
+#: builtin/fetch.c:1362
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1370
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
"sens"
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
msgid "populate log with at most <n> entries from shortlog"
msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "file to read from"
msgstr "fichier d'où lire"
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<options>] [<motif>]"
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--point-at <objet>]"
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]"
-
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objet>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr "échapper les champs réservés pour les interpréteurs de commandes"
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr "échapper les champs réservés pour perl"
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr "échapper les champs réservés pour python"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr "échapper les champs réservés pour compatibilité avec Tcl"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:37 builtin/tag.c:372
-msgid "format to use for the output"
-msgstr "format à utiliser pour la sortie"
-
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "afficher seulement les références pointant sur l'objet"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "afficher seulement les références qui ne sont pas fusionnées"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/fsck.c:519
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "afficher seulement les références qui ne contiennent pas le commit"
+
+#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:588
+#: builtin/fsck.c:646
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:594
+#: builtin/fsck.c:652
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:595
+#: builtin/fsck.c:653
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:596
+#: builtin/fsck.c:654
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:597
+#: builtin/fsck.c:655
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:598
+#: builtin/fsck.c:656
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:599
+#: builtin/fsck.c:657
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:600
+#: builtin/fsck.c:658
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:601
+#: builtin/fsck.c:659
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:602
+#: builtin/fsck.c:660
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:604
+#: builtin/fsck.c:662
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:605 builtin/prune.c:107
+#: builtin/fsck.c:663 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:606
+#: builtin/fsck.c:664
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:665
+#: builtin/fsck.c:725
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/gc.c:25
+#: builtin/gc.c:26
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:79
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "%s invalide : '%s'"
+msgid "Failed to fstat %s: %s"
+msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:311
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "objet répertoire démentiellement long %.*s"
+msgid "Can't stat %s"
+msgstr "impossible de faire un stat de %s"
-#: builtin/gc.c:290
+#: builtin/gc.c:320
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"\n"
"%s"
msgstr ""
-"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"
+"Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n"
"la cause et supprimer %s.\n"
"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
"supprimé.\n"
"\n"
"%s"
-#: builtin/gc.c:327
+#: builtin/gc.c:359
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:329
+#: builtin/gc.c:361
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:330
+#: builtin/gc.c:362
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:331
+#: builtin/gc.c:363
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:373
+#: builtin/gc.c:380
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "impossible de lire la valeur de gc.logexpiry %s"
+
+#: builtin/gc.c:408
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:375
+#: builtin/gc.c:410
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:376
+#: builtin/gc.c:411
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:397
+#: builtin/gc.c:436
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:441
+#: builtin/gc.c:480
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
-#: builtin/grep.c:23
+#: builtin/grep.c:27
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:219
+#: builtin/grep.c:235
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:277
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
-#: builtin/grep.c:453 builtin/grep.c:488
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "pas de support des fils, ignore %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:503
+#: builtin/grep.c:848
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:561
+#: builtin/grep.c:912
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:647
+#: builtin/grep.c:999
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:649
+#: builtin/grep.c:1001
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:651
+#: builtin/grep.c:1003
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:653
+#: builtin/grep.c:1005
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:656
+#: builtin/grep.c:1007
+msgid "recursively search in each submodule"
+msgstr "rechercher récursivement dans chaque sous-module"
+
+#: builtin/grep.c:1009
+msgid "basename"
+msgstr "nom de base"
+
+#: builtin/grep.c:1010
+msgid "prepend parent project's basename to output"
+msgstr "préfixer le nom de base du projet parent à la sortie"
+
+#: builtin/grep.c:1013
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:658
+#: builtin/grep.c:1015
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:660
+#: builtin/grep.c:1017
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:662
+#: builtin/grep.c:1019
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:664
+#: builtin/grep.c:1021
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:667
+#: builtin/grep.c:1024
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:669
+#: builtin/grep.c:1026
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:673
+#: builtin/grep.c:1030
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:676
+#: builtin/grep.c:1033
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:679
+#: builtin/grep.c:1036
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:682
+#: builtin/grep.c:1039
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:685
+#: builtin/grep.c:1042
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:686
+#: builtin/grep.c:1043
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:687
+#: builtin/grep.c:1044
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:689
+#: builtin/grep.c:1046
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:691
+#: builtin/grep.c:1048
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:693
+#: builtin/grep.c:1050
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:696
+#: builtin/grep.c:1053
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:698
+#: builtin/grep.c:1055
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:700
+#: builtin/grep.c:1057
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:701
+#: builtin/grep.c:1058
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:703
+#: builtin/grep.c:1060
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:705
+#: builtin/grep.c:1062
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:708
+#: builtin/grep.c:1065
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:711
+#: builtin/grep.c:1068
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:713
+#: builtin/grep.c:1070
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:715
+#: builtin/grep.c:1072
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:716
+#: builtin/grep.c:1073
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:719
+#: builtin/grep.c:1076
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:721
+#: builtin/grep.c:1078
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:724
+#: builtin/grep.c:1081
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:726
+#: builtin/grep.c:1083
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:728
+#: builtin/grep.c:1085
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:740
+#: builtin/grep.c:1097
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:742
+#: builtin/grep.c:1099
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:744
+#: builtin/grep.c:1101
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:748
+#: builtin/grep.c:1105
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:748
+#: builtin/grep.c:1105
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:751
+#: builtin/grep.c:1108
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:814
+#: builtin/grep.c:1172
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:846 builtin/index-pack.c:1480
+#: builtin/grep.c:1204
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
+
+#: builtin/grep.c:1211
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "impossible de résoudre la révision : %s"
+
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:876
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "pas de support des fils, ignore --threads"
+
+#: builtin/grep.c:1281
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:902
+#: builtin/grep.c:1304
+msgid "option not supported with --recurse-submodules."
+msgstr "option non supportée avec --recurse-submodules."
+
+#: builtin/grep.c:1310
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
-#: builtin/grep.c:907
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr ""
-"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions."
-
-#: builtin/grep.c:910
+#: builtin/grep.c:1316
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
-#: builtin/grep.c:918
+#: builtin/grep.c:1324
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
"[--] <fichier>..."
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "type"
msgstr "type"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "object type"
msgstr "type d'objet"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
msgid "write the object into the object database"
msgstr "écrire l'objet dans la base de donnée d'objets"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "read the object from stdin"
msgstr "lire l'objet depuis l'entrée standard"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "store file as is without filters"
msgstr "stocker le fichier tel quel sans filtrage"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
"debugger Git"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid "process file as it were from this path"
msgstr "traiter le fichier comme s'il venait de ce chemin"
-#: builtin/help.c:42
+#: builtin/help.c:43
msgid "print all available commands"
msgstr "afficher toutes les commandes disponibles"
-#: builtin/help.c:43
+#: builtin/help.c:44
msgid "exclude guides"
msgstr "exclure les guides"
-#: builtin/help.c:44
+#: builtin/help.c:45
msgid "print list of useful guides"
msgstr "afficher une liste de guides utiles"
-#: builtin/help.c:45
+#: builtin/help.c:46
msgid "show man page"
msgstr "afficher la page de manuel"
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "show manual in web browser"
msgstr "afficher le manuel dans un navigateur web"
-#: builtin/help.c:48
+#: builtin/help.c:49
msgid "show info page"
msgstr "afficher la page info"
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
-#: builtin/help.c:66
+#: builtin/help.c:67
#, c-format
msgid "unrecognized help format '%s'"
msgstr "format d'aide non reconnu '%s'"
-#: builtin/help.c:93
+#: builtin/help.c:94
msgid "Failed to start emacsclient."
msgstr "échec de démarrage d'emacsclient."
-#: builtin/help.c:106
+#: builtin/help.c:107
msgid "Failed to parse emacsclient version."
msgstr "échec d'analyse de la version d'emacsclient."
-#: builtin/help.c:114
+#: builtin/help.c:115
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:207
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:219
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:336
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:353
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:361
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:403
+#: builtin/help.c:404
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:404
+#: builtin/help.c:405
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:405
+#: builtin/help.c:406
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:406
+#: builtin/help.c:407
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:407
+#: builtin/help.c:408
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:408
+#: builtin/help.c:409
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:409
+#: builtin/help.c:410
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:410
+#: builtin/help.c:411
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:422
+#: builtin/help.c:423
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:440
+#: builtin/help.c:441
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "`git %s\" est un alias de `%s'"
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "impossible de remplir %d octet"
msgstr[1] "impossible de remplir %d octets"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:324
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:338
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:340
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:358
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:811 builtin/index-pack.c:820
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:166
-#: builtin/pack-objects.c:258
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:817
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "impossible de lire l'information existante de l'objet %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:831
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:845
+#: builtin/index-pack.c:851
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:854
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:856
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Tous les objets enfants de %s ne sont pas accessibles"
-#: builtin/index-pack.c:922 builtin/index-pack.c:953
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1130
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1130
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1164
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1169
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1172
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1174
+#: builtin/index-pack.c:1184
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1197
+#: builtin/index-pack.c:1207
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1208
+#: builtin/index-pack.c:1218
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1250
+#: builtin/index-pack.c:1260
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1256
+#: builtin/index-pack.c:1266
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "complété avec %d objet local"
msgstr[1] "complété avec %d objets locaux"
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1278
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
-#: builtin/index-pack.c:1272
+#: builtin/index-pack.c:1282
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "le paquet a %d delta non résolu"
msgstr[1] "le paquet a %d deltas non résolus"
-#: builtin/index-pack.c:1296
+#: builtin/index-pack.c:1306
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1372
+#: builtin/index-pack.c:1382
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1396
+#: builtin/index-pack.c:1408
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1409
+#: builtin/index-pack.c:1420
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1417
+#: builtin/index-pack.c:1428
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1430
+#: builtin/index-pack.c:1438
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1474
+#: builtin/index-pack.c:1484
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "pas de support des fils, ignore %s"
-
-#: builtin/index-pack.c:1542
+#: builtin/index-pack.c:1552
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1554
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1591
+#: builtin/index-pack.c:1602
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1598
+#: builtin/index-pack.c:1609
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1611
+#: builtin/index-pack.c:1622
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
-#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1732
+#: builtin/index-pack.c:1743
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1740
+#: builtin/index-pack.c:1745
+msgid "--stdin requires a git repository"
+msgstr "--stdin requiert un dépôt git"
+
+#: builtin/index-pack.c:1753
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "impossible de faire un stat du modèle '%s'"
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "impossible d'ouvrir (opendir) '%s'"
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "impossible de readlink '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "impossible de créer un lien symbolique de '%s' '%s'"
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "modèle %s ignoré"
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "modèles non trouvés %s"
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "pas de copie des modèles depuis '%s' : %s"
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
#, c-format
msgid "unable to handle file type %d"
msgstr "impossible de traiter le fichier de type %d"
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
#, c-format
msgid "unable to move %s to %s"
msgstr "impossible de déplacer %s vers %s"
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Dépôt Git vide initialisé dans %s%s\n"
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
msgid "specify that the git repository is to be shared amongst several users"
msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
#, c-format
msgid "cannot mkdir %s"
msgstr "impossible de créer le répertoire (mkdir) %s"
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
#, c-format
msgid "cannot chdir to %s"
msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
"git-dir=<répertoire>)"
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:84
+#: builtin/log.c:90
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:139
+#: builtin/log.c:147
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:140
+#: builtin/log.c:148
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:141
+#: builtin/log.c:149
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:142
+#: builtin/log.c:150
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:145
+#: builtin/log.c:153
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:241
+#: builtin/log.c:249
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:497
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:512 builtin/log.c:606
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:618
+#: builtin/log.c:630
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:739
+#: builtin/log.c:751
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:839
+#: builtin/log.c:852
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:854
+#: builtin/log.c:868
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:868
+#: builtin/log.c:885
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:878
+#: builtin/log.c:895
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:984
+#: builtin/log.c:1001
msgid "Cover letter needs email format"
-msgstr "La lettre de motivation doit être au format e-mail"
+msgstr "La lettre de motivation doit être au format courriel"
-#: builtin/log.c:1063
+#: builtin/log.c:1081
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1108
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1158
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1263
+#: builtin/log.c:1280
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1267
+#: builtin/log.c:1284
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1287
+#: builtin/log.c:1304
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1298
+#: builtin/log.c:1315
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1302
+#: builtin/log.c:1319
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1351
+#: builtin/log.c:1368
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1408
+#: builtin/log.c:1425
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1411
+#: builtin/log.c:1428
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1415
+#: builtin/log.c:1432
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1417
+#: builtin/log.c:1434
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1419
+#: builtin/log.c:1436
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1420
+#: builtin/log.c:1437
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1438
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1423
+#: builtin/log.c:1440
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1442
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1427
+#: builtin/log.c:1444
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1447
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1450
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1436
+#: builtin/log.c:1453
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1456
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1441
+#: builtin/log.c:1458
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1443
+#: builtin/log.c:1460
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1445
+#: builtin/log.c:1462
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1447
+#: builtin/log.c:1464
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1448
+#: builtin/log.c:1465
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1449
+#: builtin/log.c:1466
msgid "add email header"
-msgstr "ajouter l'en-tête d'e-mail"
+msgstr "ajouter l'en-tête d'courriel"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1467 builtin/log.c:1469
msgid "email"
-msgstr "e-mail"
+msgstr "courriel"
-#: builtin/log.c:1450
+#: builtin/log.c:1467
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1452
+#: builtin/log.c:1469
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1454
+#: builtin/log.c:1471
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1455
+#: builtin/log.c:1472
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1457
+#: builtin/log.c:1474
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1458
+#: builtin/log.c:1475
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1476 builtin/log.c:1479
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1460
+#: builtin/log.c:1477
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1463
+#: builtin/log.c:1480
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1467
+#: builtin/log.c:1484
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1469
+#: builtin/log.c:1486
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1470
+#: builtin/log.c:1487
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1471
+#: builtin/log.c:1488
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1472
+#: builtin/log.c:1489
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1474
+#: builtin/log.c:1491
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1475
+#: builtin/log.c:1492
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1565
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ligne d'identification invalide : %s"
+
+#: builtin/log.c:1582
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1567
+#: builtin/log.c:1584
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1575
+#: builtin/log.c:1592
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1577
+#: builtin/log.c:1594
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1579
+#: builtin/log.c:1596
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1609
+#: builtin/log.c:1626
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1611
+#: builtin/log.c:1628
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1705
+#: builtin/log.c:1722
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1777
+#: builtin/log.c:1794
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1826
+#: builtin/log.c:1843
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1897
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:507
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
-msgstr "identifier le statut de fichier avec les étiquettes"
+msgstr "identifier l'état de fichier avec les étiquettes"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "afficher les données de débogage"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<dépôt> [<références>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exécutable"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "limiter aux étiquettes"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "limiter aux heads"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "ne pas afficher les étiquettes pelées"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "prendre en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
"trouvée"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:127
msgid "only show trees"
msgstr "afficher seulement les arbres"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:129
msgid "recurse into subtrees"
msgstr "parcourir les sous-arbres"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:131
msgid "show trees when recursing"
msgstr "afficher les arbres en les parcourant"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:134
msgid "terminate entries with NUL byte"
msgstr "terminer les éléments avec un octet NUL"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:135
msgid "include object size"
msgstr "inclure la taille d'objet"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
msgid "list only filenames"
msgstr "afficher seulement les noms de fichiers"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:142
msgid "use full path names"
msgstr "utiliser les noms de chemins complets"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:144
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr ""
"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
"full-name)"
-#: builtin/merge.c:46
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<options>] [<commit>...]"
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "mbox vide : '%s'"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<options>] <message> HEAD <commit>"
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<options>] [<commit>...]"
#: builtin/merge.c:48
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:102
+#: builtin/merge.c:49
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:104
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:139
+#: builtin/merge.c:141
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:140
+#: builtin/merge.c:142
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:145
+#: builtin/merge.c:147
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:195 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "ne pas afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:198 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:199 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:201 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"ajouter (au plus <n>) éléments du journal court au message de validation de "
"la fusion"
-#: builtin/merge.c:204 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "créer une validation unique au lieu de faire une fusion"
-#: builtin/merge.c:206 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:208 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:209
+#: builtin/merge.c:211
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:211 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:215 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "vérifier que le commit nommé a une signature GPG valide"
-#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:217 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:218 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:219 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:221
+#: builtin/merge.c:223
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
"message de validation de la fusion (pour une fusion sans avance rapide)"
-#: builtin/merge.c:225
+#: builtin/merge.c:227
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:227 builtin/pull.c:170
+#: builtin/merge.c:229
+msgid "continue the current in-progress merge"
+msgstr "continuer la fusion en cours"
+
+#: builtin/merge.c:231 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:255
+#: builtin/merge.c:259
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:260
+#: builtin/merge.c:264
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:265
+#: builtin/merge.c:269
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:284 builtin/merge.c:301
+#: builtin/merge.c:288 builtin/merge.c:305
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:331
+#: builtin/merge.c:335
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:342
+#: builtin/merge.c:346
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:392
+#: builtin/merge.c:396
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-#: builtin/merge.c:443
+#: builtin/merge.c:447
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:533
+#: builtin/merge.c:537
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:652
+#: builtin/merge.c:657
msgid "Not handling anything other than two heads merge."
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
-#: builtin/merge.c:666
+#: builtin/merge.c:671
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:681
+#: builtin/merge.c:686
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:733
+#: builtin/merge.c:738
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:742
+#: builtin/merge.c:747
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
"fusion.\n"
-#: builtin/merge.c:748
+#: builtin/merge.c:753
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:772
+#: builtin/merge.c:777
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:792
+#: builtin/merge.c:797
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:847
+#: builtin/merge.c:850
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"La fusion automatique a échoué ; réglez les conflits et validez le "
"résultat.\n"
-#: builtin/merge.c:863
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "'%s' n'est pas une validation"
-
-#: builtin/merge.c:904
+#: builtin/merge.c:889
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:906
+#: builtin/merge.c:891
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:908
+#: builtin/merge.c:893
msgid "No default upstream defined for the current branch."
msgstr "Pas de branche amont par défaut définie pour la branche courante."
-#: builtin/merge.c:913
+#: builtin/merge.c:898
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:960
+#: builtin/merge.c:945
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1034
-#, c-format
-msgid "could not close '%s'"
-msgstr "impossible de fermer '%s'"
-
-#: builtin/merge.c:1061
+#: builtin/merge.c:1046
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1095
+#: builtin/merge.c:1080
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1162
+#: builtin/merge.c:1145
+msgid "--abort expects no arguments"
+msgstr "--abort n'accepte pas d'argument"
+
+#: builtin/merge.c:1149
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-#: builtin/merge.c:1178
+#: builtin/merge.c:1161
+msgid "--continue expects no arguments"
+msgstr "--continue ne supporte aucun argument"
+
+#: builtin/merge.c:1165
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
+
+#: builtin/merge.c:1181
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1185
+#: builtin/merge.c:1188
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1191
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-#: builtin/merge.c:1197
+#: builtin/merge.c:1200
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1205
+#: builtin/merge.c:1208
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1225
msgid "Squash commit into empty head not supported yet"
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-#: builtin/merge.c:1224
+#: builtin/merge.c:1227
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-#: builtin/merge.c:1229
+#: builtin/merge.c:1232
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1231
+#: builtin/merge.c:1234
msgid "Can merge only exactly one commit into empty head"
msgstr ""
"Possible de fusionner exactement une seule validation dans une tête vide"
-#: builtin/merge.c:1287
+#: builtin/merge.c:1268
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: builtin/merge.c:1290
+#: builtin/merge.c:1271
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: builtin/merge.c:1293
+#: builtin/merge.c:1274
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1296
+#: builtin/merge.c:1277
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: builtin/merge.c:1358
+#: builtin/merge.c:1339
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1367
+#: builtin/merge.c:1348
msgid "Already up-to-date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1377
+#: builtin/merge.c:1358
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1418
+#: builtin/merge.c:1399
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1425
+#: builtin/merge.c:1406
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1431
msgid "Already up-to-date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1456
+#: builtin/merge.c:1437
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1479 builtin/merge.c:1558
+#: builtin/merge.c:1460 builtin/merge.c:1539
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1483
+#: builtin/merge.c:1464
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1549
+#: builtin/merge.c:1530
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-#: builtin/merge.c:1551
+#: builtin/merge.c:1532
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1560
+#: builtin/merge.c:1541
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1572
+#: builtin/merge.c:1553
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <commit> <commit>..."
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <commit>..."
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <validation>..."
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <validation> <validation>"
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
msgid "find ancestors for a single n-way merge"
msgstr "trouver les ancêtres pour une fusion simple à n points"
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
msgid "list revs not reachable from others"
msgstr "afficher les révisions inaccessibles depuis les autres"
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
msgid "is the first one ancestor of the other?"
msgstr "est le premier ancêtre de l'autre ?"
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
msgid "find where <commit> forked from reflog of <ref>"
msgstr "trouver où <validation> a divergé du reflog de <référence>"
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
msgid "input is NUL terminated"
msgstr "l'entrée se termine par NUL"
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
msgid "allow missing objects"
msgstr "autoriser les objets manquants"
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
msgid "allow creation of more than one tree"
msgstr "autoriser la création de plus d'un arbre"
-#: builtin/mv.c:15
+#: builtin/mv.c:17
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<options>] <source>... <destination>"
-#: builtin/mv.c:70
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
-#: builtin/mv.c:72 builtin/rm.c:317
+#: builtin/mv.c:85 builtin/rm.c:290
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
"continuer"
-#: builtin/mv.c:90
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s est dans l'index"
-#: builtin/mv.c:112
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "forcer le déplacement/renommage même si la cible existe"
-#: builtin/mv.c:113
+#: builtin/mv.c:126
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:155
+#: builtin/mv.c:168
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:166
+#: builtin/mv.c:179
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:170
+#: builtin/mv.c:183
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:173
+#: builtin/mv.c:186
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:176
+#: builtin/mv.c:189
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:185
+#: builtin/mv.c:198
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:210
+#: builtin/mv.c:223
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:213
+#: builtin/mv.c:226
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:221
+#: builtin/mv.c:234
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:224
+#: builtin/mv.c:237
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:227
+#: builtin/mv.c:240
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:229
+#: builtin/mv.c:242
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:236
+#: builtin/mv.c:249
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:257
+#: builtin/mv.c:270
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:338
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<options>] <validation>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:339
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<options>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:340
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<options>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:395
msgid "print only names (no SHA-1)"
msgstr "afficher seulement les noms (pas de SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:396
msgid "only use tags to name the commits"
msgstr "utiliser seulement les étiquettes pour nommer les validations"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:398
msgid "only use refs matching <pattern>"
msgstr "utiliser seulement les références correspondant à <motif>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:400
+msgid "ignore refs matching <pattern>"
+msgstr "ignorer les références correspondant à <motif>"
+
+#: builtin/name-rev.c:402
msgid "list all commits reachable from all refs"
msgstr ""
"afficher toutes les validations accessibles depuis toutes les références"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:403
msgid "read from stdin"
msgstr "lire depuis l'entrée standard"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:404
msgid "allow to print `undefined` names (default)"
msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:410
msgid "dereference tags in the input (internal use)"
msgstr "déréférencer les étiquettes en entrée (usage interne)"
-#: builtin/notes.c:25
+#: builtin/notes.c:26
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <références-notes>] [list [<object>]]"
-#: builtin/notes.c:26
+#: builtin/notes.c:27
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
"| -F <fichier> | (-c | -C) <objet>] [<objet>]"
-#: builtin/notes.c:27
+#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
-#: builtin/notes.c:28
+#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
"F <fichier> | (-c | -C) <objet>] [<objet>]"
-#: builtin/notes.c:29
+#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"
-#: builtin/notes.c:30
+#: builtin/notes.c:31
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <références-notes>] show [<objet>]"
-#: builtin/notes.c:31
+#: builtin/notes.c:32
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
"<références-notes>"
-#: builtin/notes.c:32
+#: builtin/notes.c:33
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
-#: builtin/notes.c:33
+#: builtin/notes.c:34
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
-#: builtin/notes.c:34
+#: builtin/notes.c:35
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
-#: builtin/notes.c:35
+#: builtin/notes.c:36
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr "git notes [--ref <références-notes>] prune [-n | -v]"
-#: builtin/notes.c:36
+#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <références-notes>] get-ref"
-#: builtin/notes.c:41
+#: builtin/notes.c:42
msgid "git notes [list [<object>]]"
msgstr "git notes [list [<objet>]]"
-#: builtin/notes.c:46
+#: builtin/notes.c:47
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<options>] [<objet>]"
-#: builtin/notes.c:51
+#: builtin/notes.c:52
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>"
-#: builtin/notes.c:52
+#: builtin/notes.c:53
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..."
-#: builtin/notes.c:57
+#: builtin/notes.c:58
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<options>] [<objet>]"
-#: builtin/notes.c:62
+#: builtin/notes.c:63
msgid "git notes edit [<object>]"
msgstr "git notes edit [<objet>]"
-#: builtin/notes.c:67
+#: builtin/notes.c:68
msgid "git notes show [<object>]"
msgstr "git notes show [<objet>]"
-#: builtin/notes.c:72
+#: builtin/notes.c:73
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<options>] <références-notes>"
-#: builtin/notes.c:73
+#: builtin/notes.c:74
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<options>]"
-#: builtin/notes.c:74
+#: builtin/notes.c:75
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<options>]"
-#: builtin/notes.c:79
+#: builtin/notes.c:80
msgid "git notes remove [<object>]"
msgstr "git notes remove [<objet>]"
-#: builtin/notes.c:84
+#: builtin/notes.c:85
msgid "git notes prune [<options>]"
msgstr "git notes prune [<options>]"
-#: builtin/notes.c:89
+#: builtin/notes.c:90
msgid "git notes get-ref"
msgstr "git notes get-ref"
-#: builtin/notes.c:94
+#: builtin/notes.c:95
msgid "Write/edit the notes for the following object:"
msgstr "Écrire/éditer les notes pour l'objet suivant :"
-#: builtin/notes.c:147
+#: builtin/notes.c:148
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "impossible de démarrer 'show' pour l'objet '%s'"
-#: builtin/notes.c:151
+#: builtin/notes.c:152
msgid "could not read 'show' output"
msgstr "impossible de lire la sortie de 'show'"
-#: builtin/notes.c:159
+#: builtin/notes.c:160
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "impossible de finir 'show' pour l'objet '%s'"
-#: builtin/notes.c:194
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
-#: builtin/notes.c:203
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "impossible d'écrire l'objet note"
-#: builtin/notes.c:205
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:233 builtin/tag.c:439
+#: builtin/notes.c:234 builtin/tag.c:517
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:235 builtin/tag.c:442
+#: builtin/notes.c:236 builtin/tag.c:520
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
-#: builtin/notes.c:257
+#: builtin/notes.c:258
#, c-format
msgid "failed to read object '%s'."
msgstr "impossible de lire l'objet '%s'."
-#: builtin/notes.c:261
+#: builtin/notes.c:262
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
-#: builtin/notes.c:301
+#: builtin/notes.c:302
#, c-format
msgid "malformed input line: '%s'."
msgstr "ligne en entrée malformée : '%s'."
-#: builtin/notes.c:316
+#: builtin/notes.c:317
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "impossible de copier les notes de '%s' vers '%s'"
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:381 builtin/notes.c:667
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:437
+#: builtin/notes.c:440
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:484
+#: builtin/notes.c:487
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:486
+#: builtin/notes.c:489
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:504
+#: builtin/notes.c:507
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:525
+#: builtin/notes.c:528
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
"Utilisez '-f' pour écraser les notes existantes"
-#: builtin/notes.c:537
+#: builtin/notes.c:540
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
-#: builtin/notes.c:589
+#: builtin/notes.c:592
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
"Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:687
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:689
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:691
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:709
+#: builtin/notes.c:711
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:713
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:715
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:728
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:731
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:755
+#: builtin/notes.c:757
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:783
+#: builtin/notes.c:785
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:794
+#: builtin/notes.c:796
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:799
+#: builtin/notes.c:801
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:823
+#: builtin/notes.c:825
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:862
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "une fusion de notes dans %s est déjà en cours avec %s"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:867
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:889
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:901
msgid "attempt to remove non-existent note is not an error"
msgstr ""
"la tentative de suppression d'une note non existante n'est pas une erreur"
-#: builtin/notes.c:902
+#: builtin/notes.c:904
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:941
+#: builtin/notes.c:943
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:983
+#: builtin/notes.c:985
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:984
+#: builtin/notes.c:986
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1021
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:768
+#: builtin/pack-objects.c:776
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:789
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1070
+#: builtin/pack-objects.c:1069
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:2346
+#: builtin/pack-objects.c:2434
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2843
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2763
+#: builtin/pack-objects.c:2847
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2877
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2879
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2881
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2800
+#: builtin/pack-objects.c:2884
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2885
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2802
+#: builtin/pack-objects.c:2886
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2889
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2891
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2893
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2895
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2897
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2899
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2901
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2819
+#: builtin/pack-objects.c:2903
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2821
+#: builtin/pack-objects.c:2905
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2907
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2825
+#: builtin/pack-objects.c:2909
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2827
+#: builtin/pack-objects.c:2911
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2913
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:2832
+#: builtin/pack-objects.c:2916
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2919
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:2838
+#: builtin/pack-objects.c:2922
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2841
+#: builtin/pack-objects.c:2925
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2927
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:2845
+#: builtin/pack-objects.c:2929
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2931
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2849
+#: builtin/pack-objects.c:2933
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2936
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2854
+#: builtin/pack-objects.c:2938
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2856
+#: builtin/pack-objects.c:2940
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:2942
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:2944
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2862
+#: builtin/pack-objects.c:2946
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:2864
+#: builtin/pack-objects.c:2948
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3075
msgid "Counting objects"
msgstr "Décompte des objets"
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
-#: builtin/prune.c:106 builtin/worktree.c:128
+#: builtin/prune.c:106
msgid "report pruned objects"
msgstr "afficher les objets éliminés"
-#: builtin/prune.c:109 builtin/worktree.c:130
+#: builtin/prune.c:109
msgid "expire objects older than <time>"
msgstr "faire expirer les objets plus vieux que <heure>"
msgid "cannot prune in a precious-objects repo"
msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Valeur invalide pour %s : %s"
-#: builtin/pull.c:73
+#: builtin/pull.c:76
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "contrôler la récupération récursive dans les sous-modules"
+
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:124
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:157
+#: builtin/pull.c:164
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:173
+#: builtin/pull.c:180
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:195
+#: builtin/pull.c:198
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:284
+#: builtin/pull.c:287
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:397
+#: builtin/pull.c:399
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
"venez de récupérer."
-#: builtin/pull.c:399
+#: builtin/pull.c:401
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
"vous venez de récupérer."
-#: builtin/pull.c:400
+#: builtin/pull.c:402
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
-#: builtin/pull.c:403
+#: builtin/pull.c:405
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:437
+#: builtin/pull.c:439
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:754
+#: builtin/pull.c:792
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:801
+#: builtin/pull.c:840
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:809
+#: builtin/pull.c:848
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:812
+#: builtin/pull.c:851
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:813
+#: builtin/pull.c:852
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:838
+#: builtin/pull.c:877
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:843
+#: builtin/pull.c:882
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"to recover."
msgstr ""
"Avance rapide de votre arbre de travail impossible.\n"
-"Après vous être assuré que toute modification précieuse a été sauvegardée "
-"avec\n"
+"Après avoir vérifié que toute modification précieuse a été sauvegardée avec\n"
"$ git diff %s\n"
"lancez\n"
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:858
+#: builtin/pull.c:897
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:862
+#: builtin/pull.c:901
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"impossible de rebaser avec des modifications de sous-modules enregistrées "
+"localement"
+
+#: builtin/push.c:17
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:89
+#: builtin/push.c:90
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:99
+#: builtin/push.c:100
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:143
+#: builtin/push.c:144
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:146
+#: builtin/push.c:147
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
" git push %s %s\n"
"%s"
-#: builtin/push.c:161
+#: builtin/push.c:162
#, c-format
msgid ""
"You are not currently on a branch.\n"
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:175
+#: builtin/push.c:176
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:183
+#: builtin/push.c:184
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:186
+#: builtin/push.c:187
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:242
+#: builtin/push.c:246
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:249
+#: builtin/push.c:253
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:255
+#: builtin/push.c:259
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:261
+#: builtin/push.c:265
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:268
+#: builtin/push.c:272
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:271
+#: builtin/push.c:275
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:331
+#: builtin/push.c:335
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:335
+#: builtin/push.c:339
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:366
+#: builtin/push.c:370
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:367
+#: builtin/push.c:371
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <nom>\n"
-#: builtin/push.c:385
+#: builtin/push.c:389
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:386
+#: builtin/push.c:390
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:391
+#: builtin/push.c:395
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:392
+#: builtin/push.c:396
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:397
+#: builtin/push.c:401
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:515
+#: builtin/push.c:523
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:516 builtin/send-pack.c:161
+#: builtin/push.c:524 builtin/send-pack.c:163
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:517 builtin/send-pack.c:163
+#: builtin/push.c:525 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:519
+#: builtin/push.c:527
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:520
+#: builtin/push.c:528
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:523 builtin/send-pack.c:164
+#: builtin/push.c:531 builtin/send-pack.c:166
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:525 builtin/send-pack.c:175
+#: builtin/push.c:533 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:526 builtin/send-pack.c:176
+#: builtin/push.c:534 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:529
+#: builtin/push.c:537
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:531 builtin/send-pack.c:169
+#: builtin/push.c:539 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:534
+#: builtin/push.c:542
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:537
+#: builtin/push.c:545
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:539
+#: builtin/push.c:547
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:540
+#: builtin/push.c:548
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:551 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:545 builtin/send-pack.c:170
+#: builtin/push.c:553 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:546
+#: builtin/push.c:554 builtin/send-pack.c:171
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/push.c:546
+#: builtin/push.c:554 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/push.c:560
+#: builtin/push.c:568
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:562
+#: builtin/push.c:570
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
-#: builtin/push.c:579
+#: builtin/push.c:589
msgid "push options must not have new line characters"
msgstr ""
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
"ligne"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté "
"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:121
msgid "write resulting index to <file>"
msgstr "écrire l'index résultant dans <fichier>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:124
msgid "only empty the index"
msgstr "juste vider l'index"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:126
msgid "Merging"
msgstr "Fusion"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:128
msgid "perform a merge in addition to a read"
msgstr "effectuer une fusion en plus d'une lecture"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:130
msgid "3-way merge if no file level merging required"
msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:132
msgid "3-way merge in presence of adds and removes"
msgstr "fusion à 3 points en présence d'ajouts et suppressions"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:134
msgid "same as -m, but discard unmerged entries"
msgstr "comme -m, mais annule les éléments non fusionnés"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:135
msgid "<subdirectory>/"
msgstr "<sous-répertoire>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:136
msgid "read the tree into the index under <subdirectory>/"
msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:139
msgid "update working tree with merge result"
msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:141
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:142
msgid "allow explicitly ignored files to be overwritten"
msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:145
msgid "don't check the working tree after merging"
msgstr "ne pas vérifier la copie de travail après la fusion"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:146
msgid "don't update the index or the work tree"
msgstr "ne pas mettre à jour l'index ou la copie de travail"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:148
msgid "skip applying sparse checkout filter"
msgstr "sauter l'application du filtre d'extraction creuse"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:150
msgid "debug unpack-trees"
msgstr "déboguer unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:8
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase-helper [<options>]"
+
+#: builtin/rebase--helper.c:20
+msgid "continue rebase"
+msgstr "continuer le rebasage"
+
+#: builtin/rebase--helper.c:22
+msgid "abort rebase"
+msgstr "abandonner le rebasage"
+
+#: builtin/receive-pack.c:28
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:838
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"with what you pushed, and will require 'git reset --hard' to match\n"
"the work tree to HEAD.\n"
"\n"
-"You can set 'receive.denyCurrentBranch' configuration variable to\n"
-"'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
"its current branch; however, this is not recommended unless you\n"
"arranged to update its work tree to match what you pushed in some\n"
"other way.\n"
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:858
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1933
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1947
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
-#: builtin/remote.c:12
+#: builtin/remote.c:13
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:13
+#: builtin/remote.c:14
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <nom> <url>"
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
msgid "git remote rename <old> <new>"
msgstr "git remote rename <ancienne> <nouvelle>"
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
msgid "git remote remove <name>"
msgstr "git remote remove <nom>"
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
-#: builtin/remote.c:17
+#: builtin/remote.c:18
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <nom>"
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <nom>"
-#: builtin/remote.c:19
+#: builtin/remote.c:20
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
"<distante>)...]"
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <nom> <branche>..."
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <nom>"
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <nom> <nouvelle-URL>"
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <nom> <URL>"
-#: builtin/remote.c:29
+#: builtin/remote.c:30
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<options>] <nom> <URL>"
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <nom> <branche>..."
-#: builtin/remote.c:50
+#: builtin/remote.c:51
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <nom> <branche>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<options>] <nom>"
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<options>] <nom>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<options>] [<groupe> | <distante>]..."
-#: builtin/remote.c:94
+#: builtin/remote.c:95
#, c-format
msgid "Updating %s"
msgstr "Mise à jour de %s"
-#: builtin/remote.c:126
+#: builtin/remote.c:127
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
"--mirror est dangereux et obsolète ; merci\n"
"\t d'utiliser --mirror=fetch ou --mirror=push à la place"
-#: builtin/remote.c:143
+#: builtin/remote.c:144
#, c-format
msgid "unknown mirror argument: %s"
msgstr "argument miroir inconnu : %s"
-#: builtin/remote.c:159
+#: builtin/remote.c:160
msgid "fetch the remote branches"
msgstr "rapatrier les branches distantes"
-#: builtin/remote.c:161
+#: builtin/remote.c:162
msgid "import all tags and associated objects when fetching"
msgstr ""
"importer toutes les étiquettes et les objets associés lors du rapatriement"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "branch(es) to track"
msgstr "branche(s) à suivre"
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "master branch"
msgstr "branche maîtresse"
-#: builtin/remote.c:168
+#: builtin/remote.c:169
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "set up remote as a mirror to push to or fetch from"
msgstr ""
"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
-#: builtin/remote.c:181
+#: builtin/remote.c:182
msgid "specifying a master branch makes no sense with --mirror"
msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
-#: builtin/remote.c:183
+#: builtin/remote.c:184
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
-#: builtin/remote.c:234
+#: builtin/remote.c:235
#, c-format
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:336
+#: builtin/remote.c:337
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"Impossible d'obtenir une correspondance distante pour la spécification de "
"référence %s"
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:449
+#: builtin/remote.c:450
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:639
+#: builtin/remote.c:640
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:659
+#: builtin/remote.c:660
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:695
+#: builtin/remote.c:696
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:729
+#: builtin/remote.c:730
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:792
+#: builtin/remote.c:795
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:806
+#: builtin/remote.c:809
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:907
+#: builtin/remote.c:910
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:913
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:912
+#: builtin/remote.c:915
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:914
+#: builtin/remote.c:917
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:958
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:963
+#: builtin/remote.c:966
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:967
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:970
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:973
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:976
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1019
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1022
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1026
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1029
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1032
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1042
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1049
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1117
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1144
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1145
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(pas d'URL)"
-#. TRANSLATORS: the colon ':' should align with
-#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1164
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1166
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1170
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1185 builtin/remote.c:1211
msgid " (status not queried)"
-msgstr " (statut non demandé)"
+msgstr " (état non demandé)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1202
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1208
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1435
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1515
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
-#: builtin/repack.c:17
+#: builtin/repack.c:18
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: builtin/repack.c:160
+#: builtin/repack.c:23
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. "
+"Utilisez\n"
+"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
+
+#: builtin/repack.c:168
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:162
+#: builtin/repack.c:170
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:165
+#: builtin/repack.c:173
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:167
+#: builtin/repack.c:175
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:169
+#: builtin/repack.c:177
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:171
+#: builtin/repack.c:179
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:174
+#: builtin/repack.c:182
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:176
+#: builtin/repack.c:184
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:177
+#: builtin/repack.c:185
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:178
+#: builtin/repack.c:186
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:180
+#: builtin/repack.c:188
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:182
+#: builtin/repack.c:190
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:183 builtin/repack.c:187
+#: builtin/repack.c:191 builtin/repack.c:197
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:184
+#: builtin/repack.c:192
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:186
+#: builtin/repack.c:194
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:188
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "limite le nombre maximal de fils"
+
+#: builtin/repack.c:198
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:190
+#: builtin/repack.c:200
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:200
+#: builtin/repack.c:210
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
-#: builtin/repack.c:204
+#: builtin/repack.c:214
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:391 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
-#: builtin/replace.c:19
+#: builtin/replace.c:20
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objet> <remplacement>"
-#: builtin/replace.c:20
+#: builtin/replace.c:21
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <objet>"
-#: builtin/replace.c:21
+#: builtin/replace.c:22
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <commit> [<parent>...]"
-#: builtin/replace.c:22
+#: builtin/replace.c:23
msgid "git replace -d <object>..."
msgstr "git replace -d <objet>..."
-#: builtin/replace.c:23
+#: builtin/replace.c:24
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<motif>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Nom d'objet invalide : '%s'"
-#: builtin/replace.c:355
+#: builtin/replace.c:361
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:357
+#: builtin/replace.c:363
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:368
+#: builtin/replace.c:374
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:407
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "le commit original '%s' contient une signature GPG."
-#: builtin/replace.c:402
+#: builtin/replace.c:408
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:408
+#: builtin/replace.c:414
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:432
+#: builtin/replace.c:438
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:433
+#: builtin/replace.c:439
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:434
+#: builtin/replace.c:440
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:435
+#: builtin/replace.c:441
msgid "change a commit's parents"
msgstr "Modifier les parents d'un commit"
-#: builtin/replace.c:436
+#: builtin/replace.c:442
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:437
+#: builtin/replace.c:443
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:444
msgid "use this format"
msgstr "utiliser ce format"
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr ""
"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
msgid "register clean resolutions in index"
msgstr "enregistrer des résolutions propres dans l'index"
-#: builtin/reset.c:26
+#: builtin/reset.c:29
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-#: builtin/reset.c:27
+#: builtin/reset.c:30
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
-#: builtin/reset.c:28
+#: builtin/reset.c:31
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "mixed"
msgstr "mixed"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "soft"
msgstr "soft"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "hard"
msgstr "hard"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "merge"
msgstr "merge"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:74
+#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:76
+#: builtin/reset.c:79
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:82
+#: builtin/reset.c:85
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:100
+#: builtin/reset.c:103
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:183
+#: builtin/reset.c:186
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
-#: builtin/reset.c:276
+#: builtin/reset.c:286
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:278
+#: builtin/reset.c:288
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:279
+#: builtin/reset.c:289
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:285
+#: builtin/reset.c:295
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:288
+#: builtin/reset.c:301
msgid "record only the fact that removed paths will be added later"
msgstr ""
"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
"tard"
-#: builtin/reset.c:305
+#: builtin/reset.c:320
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Échec de résolution de '%s' comme une révision valide."
-#: builtin/reset.c:313
+#: builtin/reset.c:328
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Échec de résolution de '%s' comme un arbre valide."
-#: builtin/reset.c:322
+#: builtin/reset.c:337
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:331
+#: builtin/reset.c:346
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
"place."
-#: builtin/reset.c:333
+#: builtin/reset.c:348
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:343
+#: builtin/reset.c:358
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
-#: builtin/reset.c:347
+#: builtin/reset.c:362
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:364
+#: builtin/reset.c:379
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:370
+#: builtin/reset.c:385
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
-#: builtin/reset.c:374
+#: builtin/reset.c:389
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:386
+#: builtin/rev-parse.c:394
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:399
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:401
msgid "stop parsing after the first non-option argument"
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:404
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:527
+#: builtin/rev-parse.c:535
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
"l'utilisation principale."
-#: builtin/revert.c:22
+#: builtin/revert.c:23
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<options>] <commit ou apparenté>..."
-#: builtin/revert.c:23
+#: builtin/revert.c:24
msgid "git revert <subcommand>"
msgstr "git revert <sous-commande>"
-#: builtin/revert.c:28
+#: builtin/revert.c:29
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<options>] <commit ou apparenté>..."
-#: builtin/revert.c:29
+#: builtin/revert.c:30
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <sous-commande>"
-#: builtin/revert.c:71
+#: builtin/revert.c:90
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s : %s ne peut pas être utilisé avec %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:99
msgid "end revert or cherry-pick sequence"
msgstr "mettre fin au retour ou picorage"
-#: builtin/revert.c:81
+#: builtin/revert.c:100
msgid "resume revert or cherry-pick sequence"
msgstr "reprendre le retour ou picorage"
-#: builtin/revert.c:82
+#: builtin/revert.c:101
msgid "cancel revert or cherry-pick sequence"
msgstr "annuler le retour ou picorage"
-#: builtin/revert.c:83
+#: builtin/revert.c:102
msgid "don't automatically commit"
msgstr "ne pas valider automatiquement"
-#: builtin/revert.c:84
+#: builtin/revert.c:103
msgid "edit the commit message"
msgstr "éditer le message de validation"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "numéro de parent"
+#: builtin/revert.c:106
+msgid "parent-number"
+msgstr "numéro-de-parent"
-#: builtin/revert.c:89
+#: builtin/revert.c:107
+msgid "select mainline parent"
+msgstr "sélectionner le parent principal"
+
+#: builtin/revert.c:109
msgid "merge strategy"
msgstr "stratégie de fusion"
-#: builtin/revert.c:90
+#: builtin/revert.c:110
msgid "option"
msgstr "option"
-#: builtin/revert.c:91
+#: builtin/revert.c:111
msgid "option for merge strategy"
msgstr "option pour la stratégie de fusion"
-#: builtin/revert.c:100
+#: builtin/revert.c:120
msgid "append commit name"
msgstr "ajouter le nom de validation"
-#: builtin/revert.c:102
+#: builtin/revert.c:122
msgid "preserve initially empty commits"
msgstr "préserver les validations vides initialement"
-#: builtin/revert.c:103
+#: builtin/revert.c:123
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
-#: builtin/revert.c:104
+#: builtin/revert.c:124
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:192
+#: builtin/revert.c:212
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:205
+#: builtin/revert.c:225
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
-#: builtin/rm.c:17
+#: builtin/rm.c:18
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<options>] [--] <fichier>..."
-#: builtin/rm.c:65
-msgid ""
-"the following submodule (or one of its nested submodules)\n"
-"uses a .git directory:"
-msgid_plural ""
-"the following submodules (or one of their nested submodules)\n"
-"use a .git directory:"
-msgstr[0] ""
-"le sous-module suivant (ou un de ses sous-modules imbriqués)\n"
-"utilise un répertoire .git :"
-msgstr[1] ""
-"les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n"
-"utilisent un répertoire .git :"
-
-#: builtin/rm.c:71
-msgid ""
-"\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
-msgstr ""
-"\n"
-"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
-"historique)"
-
-#: builtin/rm.c:230
+#: builtin/rm.c:206
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
"les fichiers suivants ont du contenu indexé différent\n"
"du fichier et de HEAD :"
-#: builtin/rm.c:235
+#: builtin/rm.c:211
msgid ""
"\n"
"(use -f to force removal)"
"\n"
"(utilisez -f pour forcer la suppression)"
-#: builtin/rm.c:239
+#: builtin/rm.c:215
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "le fichier suivant a des changements indexés :"
msgstr[1] "les fichiers suivants ont des changements indexés :"
-#: builtin/rm.c:243 builtin/rm.c:254
+#: builtin/rm.c:219 builtin/rm.c:228
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
"\n"
"(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
-#: builtin/rm.c:251
+#: builtin/rm.c:225
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "le fichier suivant a des modifications locales :"
msgstr[1] "les fichiers suivants ont des modifications locales :"
-#: builtin/rm.c:269
+#: builtin/rm.c:243
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:270
+#: builtin/rm.c:244
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:271
+#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:272
+#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:274
+#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
-msgstr "sortir avec un statut zéro même si rien ne correspondait"
+msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:335
+#: builtin/rm.c:308
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:374
+#: builtin/rm.c:347
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
-#: builtin/send-pack.c:18
+#: builtin/rm.c:370
+#, c-format
+msgid "could not remove '%s'"
+msgstr "impossible de supprimer '%s'"
+
+#: builtin/send-pack.c:19
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
" --all et la spécification explicite de <référence> sont mutuellement "
"exclusifs."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:162
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "lire les références depuis l'entrée standard"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
-#: builtin/shortlog.c:242
+#: builtin/shortlog.c:249
+msgid "Group by committer rather than author"
+msgstr "Grouper par validateur plutôt que par auteur"
+
+#: builtin/shortlog.c:251
msgid "sort output according to the number of commits per author"
msgstr "trier la sortie sur le nombre de validations par auteur"
-#: builtin/shortlog.c:244
+#: builtin/shortlog.c:253
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:246
+#: builtin/shortlog.c:255
msgid "Show the email address of each author"
-msgstr "Afficher l'adresse e-mail de chaque auteur"
+msgstr "Afficher l'adresse courriel de chaque auteur"
-#: builtin/shortlog.c:247
+#: builtin/shortlog.c:256
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:257
msgid "Linewrap output"
msgstr "Couper les lignes"
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:376
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:530
#, c-format
msgid "no matching refs with %s"
msgstr "aucune référence correspond à %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:626
msgid "show remote-tracking and local branches"
msgstr "afficher les branches de suivi distantes et les branches locales"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:628
msgid "show remote-tracking branches"
msgstr "afficher les branches de suivi distantes"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:630
msgid "color '*!+-' corresponding to the branch"
msgstr "couleur '*!+-' correspondant à la branche"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:632
msgid "show <n> more commits after the common ancestor"
msgstr "afficher <n> validations de plus après l'ancêtre commun"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:634
msgid "synonym to more=-1"
msgstr "synonyme de more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:635
msgid "suppress naming strings"
msgstr "supprimer les chaînes de nommage"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:637
msgid "include the current branch"
msgstr "inclure la branche courante"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:639
msgid "name commits with their object names"
msgstr "nommer les validations avec leurs noms d'objet"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:641
msgid "show possible merge bases"
msgstr "afficher les bases possibles de fusion"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:643
msgid "show refs unreachable from any other ref"
msgstr "afficher les références inaccessibles depuis toute autre référence"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:645
msgid "show commits in topological order"
msgstr "afficher les validations dans l'ordre topologique"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:648
msgid "show only commits not on the first branch"
msgstr ""
"afficher seulement les validations qui ne sont pas sur la première branche"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:650
msgid "show merges reachable from only one tip"
msgstr "afficher les fusions accessibles depuis une seule pointe"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:652
msgid "topologically sort, maintaining date order where possible"
msgstr "tri topologique, maintenant l'ordre par date si possible"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:655
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:656
msgid "show <n> most recent ref-log entries starting at base"
msgstr ""
"afficher les <n> plus récents éléments de ref-log en commençant à la base"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:690
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
"base"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:714
msgid "no branches given, and HEAD is not valid"
msgstr "aucune branche spécifiée, et HEAD est invalide"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:717
msgid "--reflog option needs one branch name"
msgstr "--reflog requiert un nom de branche"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:720
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:724
#, c-format
msgid "no such ref %s"
msgstr "référence inexistante %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:808
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "impossible de gérer plus de %d révision."
msgstr[1] "impossible de gérer plus de %d révisions."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:812
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' n'est pas une référence valide."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:815
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "impossible de trouver le commit %s (%s)"
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<motif>]"
-#: builtin/show-ref.c:165
+#: builtin/show-ref.c:159
msgid "only show tags (can be combined with heads)"
msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
-#: builtin/show-ref.c:166
+#: builtin/show-ref.c:160
msgid "only show heads (can be combined with tags)"
msgstr "afficher seulement les têtes (peut être combiné avec tags)"
-#: builtin/show-ref.c:167
+#: builtin/show-ref.c:161
msgid "stricter reference checking, requires exact ref path"
msgstr ""
"vérification de référence plus stricte, nécessite un chemin de référence "
"exact"
-#: builtin/show-ref.c:170 builtin/show-ref.c:172
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "afficher la référence HEAD, même si elle serait filtrée"
-#: builtin/show-ref.c:174
+#: builtin/show-ref.c:168
msgid "dereference tags into object IDs"
msgstr "déréférencer les étiquettes en IDs d'objet"
-#: builtin/show-ref.c:176
+#: builtin/show-ref.c:170
msgid "only show SHA1 hash using <n> digits"
msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
-#: builtin/show-ref.c:180
+#: builtin/show-ref.c:174
msgid "do not print results to stdout (useful with --verify)"
msgstr ""
"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
-#: builtin/show-ref.c:182
+#: builtin/show-ref.c:176
msgid "show refs from stdin that aren't in local repository"
msgstr ""
"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
"local"
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
msgid "skip and remove all lines starting with comment character"
msgstr ""
"sauter et supprimer toutes les lignes commençant par le caractère de "
"commentaire"
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
-#: builtin/submodule--helper.c:590
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
-#: builtin/submodule--helper.c:369
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
+"son propre amont d'autorité."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
-#: builtin/submodule--helper.c:383
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
"jour pour le sous-module '%s'\n"
-#: builtin/submodule--helper.c:390
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
"'%s'"
-#: builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:435
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:441
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
"chemin '%s'"
-#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
-#: builtin/submodule--helper.c:593
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:613
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
-#, c-format
-msgid "could not create directory '%s'"
-msgstr "impossible de créer le répertoire '%s'"
-
-#: builtin/submodule--helper.c:644
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
-#: builtin/submodule--helper.c:660
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "impossible d'ouvrir le fichier '%s'"
-
-#: builtin/submodule--helper.c:665
-#, c-format
-msgid "could not close file %s"
-msgstr "impossible de fermer le fichier %s"
-
-#: builtin/submodule--helper.c:672
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "impossible de créer le répertoire de sous-module pour '%s'"
-#: builtin/submodule--helper.c:726
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:730
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:756
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:777
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:913
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
-#: builtin/submodule--helper.c:945
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:948
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"chemin dans la copie de travail, traversant les frontières de sous-modules"
-#: builtin/submodule--helper.c:952
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:956
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié"
-#: builtin/submodule--helper.c:959
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:961
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "spécifie si le clonage initial doit être aussi superficiel"
-#: builtin/submodule--helper.c:962
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:979
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:1100
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"la sous-commande submodule--helper doit être appelée avec une sous-commande"
+#: builtin/submodule--helper.c:1163
+msgid "recurse into submodules"
+msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1169
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr "git submodule--helper embed-git-dir [<chemin>...]"
+
+#: builtin/submodule--helper.c:1232
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s ne gère pas --super-prefix"
+
+#: builtin/submodule--helper.c:1238
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<options>] nom [<référence>]"
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"supprimer le message d'erreur pour une référence non symbolique (détachée)"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
msgid "delete symbolic ref"
msgstr "supprimer la référence symbolique"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
msgid "reason of the update"
msgstr "raison de la mise à jour"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
"étiquette> [<head>]"
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nométiquette>..."
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objet>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
-#: builtin/tag.c:27
-msgid "git tag -v <tagname>..."
-msgstr "git tag -v <nométiquette>..."
-
-#: builtin/tag.c:81
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "nom d'étiquette trop long : %.*s..."
+#: builtin/tag.c:28
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:86
+#: builtin/tag.c:84
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:101
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:117
+#: builtin/tag.c:129
#, c-format
msgid ""
"\n"
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:121
+#: builtin/tag.c:133
#, c-format
msgid ""
"\n"
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:199
+#: builtin/tag.c:211
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:201
+#: builtin/tag.c:213
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:226
+#: builtin/tag.c:237
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:239
-msgid "tag header too big."
-msgstr "en-tête d'étiquette trop gros."
-
-#: builtin/tag.c:275
+#: builtin/tag.c:283
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:281
+#: builtin/tag.c:290
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:339
+#: builtin/tag.c:398
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:341
+#: builtin/tag.c:400
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:343
+#: builtin/tag.c:402
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:344
+#: builtin/tag.c:403
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:346
+#: builtin/tag.c:405
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:348
+#: builtin/tag.c:407
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:350
+#: builtin/tag.c:409
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:352
+#: builtin/tag.c:411
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:356
+#: builtin/tag.c:415
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:357
+#: builtin/tag.c:416
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:358 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:360
+#: builtin/tag.c:419
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:361
+#: builtin/tag.c:420
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:362 builtin/tag.c:363
+#: builtin/tag.c:421 builtin/tag.c:423
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:364
+#: builtin/tag.c:422 builtin/tag.c:424
+msgid "print only tags that don't contain the commit"
+msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
+
+#: builtin/tag.c:425
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:365
+#: builtin/tag.c:426
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:370
+#: builtin/tag.c:431
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:399
+#: builtin/tag.c:470
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:419
-msgid "-n option is only allowed with -l."
-msgstr "l'option -n est autorisée seulement avec -l."
+#: builtin/tag.c:492
+msgid "-n option is only allowed in list mode"
+msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:421
-msgid "--contains option is only allowed with -l."
-msgstr "l'option --contains est autorisée seulement avec -l."
+#: builtin/tag.c:494
+msgid "--contains option is only allowed in list mode"
+msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:423
-msgid "--points-at option is only allowed with -l."
-msgstr "l'option --points-at est autorisée seulement avec -l."
+#: builtin/tag.c:496
+msgid "--no-contains option is only allowed in list mode"
+msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:425
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l"
+#: builtin/tag.c:498
+msgid "--points-at option is only allowed in list mode"
+msgstr "l'option --points-at est autorisée seulement en mode liste"
+
+#: builtin/tag.c:500
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
-#: builtin/tag.c:433
+#: builtin/tag.c:511
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:452
+#: builtin/tag.c:530
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:458
+#: builtin/tag.c:536
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:463
+#: builtin/tag.c:541
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:491
+#: builtin/tag.c:571
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
#, c-format
msgid "failed to create directory %s"
msgstr "échec de la création du répertoire %s"
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
#, c-format
msgid "failed to create file %s"
msgstr "échec de la création du fichier %s"
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
#, c-format
msgid "failed to delete file %s"
msgstr "échec de la suppression du fichier %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:111 builtin/update-index.c:217
#, c-format
msgid "failed to delete directory %s"
msgstr "échec de la suppression du répertoire %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:136
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:150
msgid "directory stat info does not change after adding a new file"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un fichier"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:163
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:176
msgid "directory stat info changes after updating a file"
msgstr ""
"l'information de stat du répertoire change après mise à jour d'un fichier"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:187
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"l'information de stat du répertoire change après l'ajout d'un fichier dans "
"un sous-répertoire"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:198
msgid "directory stat info does not change after deleting a file"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"fichier<"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:211
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"l'information de stat du répertoire ne change pas après la suppression d'un "
"répertoire"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:218
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:569
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:924
msgid "continue refresh even when index needs update"
msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:927
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:930
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:932
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:934
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:936
msgid "refresh even if index contains unmerged entries"
msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:939
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:943
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:947
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:948
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:957
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:960
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:963
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:966
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:969
msgid "add to index only; do not add content to object database"
msgstr ""
"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
"données des objets"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:971
msgid "remove named paths even if present in worktree"
msgstr ""
"supprimer les chemins nommés même s'ils sont présents dans la copie de "
"travail"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:973
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:975
msgid "read list of paths to be updated from standard input"
msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:979
msgid "add entries from standard input to the index"
msgstr "ajouter les éléments depuis l'entrée standard à l'index"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:983
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:987
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:991
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:994
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:996
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1000
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1002
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1004
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1006
msgid "test if the filesystem supports untracked cache"
msgstr "tester si le système de fichier supporte le cache de non-suivis"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1008
msgid "enable untracked cache without testing the filesystem"
msgstr "activer le cache de non-suivis sans tester le système de fichier"
-#: builtin/update-index.c:1119
+#: builtin/update-index.c:1108
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment activer l'index coupé"
+
+#: builtin/update-index.c:1117
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver l'index coupé"
+
+#: builtin/update-index.c:1128
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver le cache des fichiers non-suivis"
-#: builtin/update-index.c:1123
+#: builtin/update-index.c:1132
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1140
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer le cache des fichiers non-suivis"
-#: builtin/update-index.c:1135
+#: builtin/update-index.c:1144
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-"
"valeur>]"
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "mettre à jour les fichiers d'information à partir de zéro"
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <commit>..."
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
msgid "print commit contents"
msgstr "afficher le contenu du commit"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "afficher les messages bruts de gpg"
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
msgid "verbose"
msgstr "verbeux"
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr "afficher seulement les statistiques"
-#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v | --verbose] <tag>..."
-msgstr "git verify-tag [-v | --verbose] <étiquette>..."
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
-#: builtin/verify-tag.c:34
+#: builtin/verify-tag.c:37
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<options>] <chemin> [<branche>]"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree list [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:44
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:55
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:82
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:204
+#: builtin/worktree.c:129
+msgid "report pruned working trees"
+msgstr "afficher les arbres de travail éliminés"
+
+#: builtin/worktree.c:131
+msgid "expire working trees older than <time>"
+msgstr "faire expirer les arbres de travail plus vieux que <temps>"
+
+#: builtin/worktree.c:205
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:275
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:327
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:329
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:331
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:333
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:334
+msgid "keep the new working tree locked"
+msgstr "conserver le verrou sur le nouvel arbre de travail"
+
+#: builtin/worktree.c:342
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:470
+#: builtin/worktree.c:479
msgid "reason for locking"
-msgstr "raison du vérouillage"
+msgstr "raison du verrouillage"
-#: builtin/worktree.c:482 builtin/worktree.c:515
+#: builtin/worktree.c:491 builtin/worktree.c:524
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:493 builtin/worktree.c:526
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-"La copie de travail principale ne peut pas être vérouillée ou dévérouillée"
+"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:498
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:500
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:519
+#: builtin/worktree.c:528
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
msgid "<prefix>/"
msgstr "<préfixe>/"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "write tree object for a subdirectory <prefix>"
msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: upload-pack.c:22
+#: upload-pack.c:23
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
-#: upload-pack.c:1028
+#: upload-pack.c:1041
msgid "quit after a single request/response exchange"
msgstr "quitter après un unique échange requête/réponse"
-#: upload-pack.c:1030
+#: upload-pack.c:1043
msgid "exit immediately after initial ref advertisement"
msgstr "Sortir immédiatement après l'annonce initiale des références"
-#: upload-pack.c:1032
+#: upload-pack.c:1045
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr ""
"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
"Git"
-#: upload-pack.c:1034
+#: upload-pack.c:1047
msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "interrompre le transfer après <n> secondes d'inactivité"
+msgstr "interrompre le transfert après <n> secondes d'inactivité"
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
-#: git.c:14
+#: git.c:15
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:342
+#: http.c:337
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr ""
+"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
+
+#: http.c:358
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
-#: http.c:351
+#: http.c:367
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
+#: http.c:1764
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"impossible de mettre à jour la base de l'url depuis la redirection :\n"
+" demandé : %s\n"
+" redirection : %s"
+
+#: remote-curl.c:324
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirection vers %s"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
#: common-cmds.h:36
msgid "Show the working tree status"
-msgstr "Afficher le statut de la copie de travail"
+msgstr "Afficher l'état de la copie de travail"
#: common-cmds.h:37
msgid "Create, list, delete or verify a tag object signed with GPG"
#. at this point.
#: git-bisect.sh:328
msgid "Are you sure [Y/n]? "
-msgstr "Êtes-vous sûr [Y/n] ? "
+msgstr "Confirmez-vous [Y/n] ? "
#: git-bisect.sh:340
#, sh-format
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-rebase.sh:56
+#: git-rebase.sh:58
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:156 git-rebase.sh:395
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:167
+#: git-rebase.sh:169
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:170
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:171
-msgid ""
-"Applying autostash resulted in conflicts.\n"
-"Your changes are safe in the stash.\n"
-"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr ""
-"L'application de l'autoremisage a provoqué des conflits\n"
-"Vos modifications sont à l'abri dans la remise.\n"
-"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-
-#: git-rebase.sh:210
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:215
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:356
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:367
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:374
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:377
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:414
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"chose\n"
"d'important ici."
-#: git-rebase.sh:465
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:489
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:492 git-rebase.sh:496
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:501
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:524
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:557
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:562
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:566
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:586
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:590
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:601
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:610
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:620
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:54
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: git-stash.sh:73
+#: git-stash.sh:95
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: git-stash.sh:88
+#: git-stash.sh:110
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:103
+#: git-stash.sh:125
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:145 git-stash.sh:158
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:140
+#: git-stash.sh:162
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:143
+#: git-stash.sh:165
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:156
+#: git-stash.sh:178
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:188
+#: git-stash.sh:210
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:238
+#: git-stash.sh:266
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"erreur: option inconnue pour 'stash save': $option\n"
" Pour fournir un message, utilisez git stash save -- '$option'"
-#: git-stash.sh:251
+#: git-stash.sh:281
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-#: git-stash.sh:259
+#: git-stash.sh:289
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:263
+#: git-stash.sh:294
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:267
+#: git-stash.sh:298
msgid "Cannot save the current status"
-msgstr "Impossible de sauver le statut courant"
+msgstr "Impossible de sauver l'état courant"
-#: git-stash.sh:268
+#: git-stash.sh:299
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:326
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:403
+#: git-stash.sh:474
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:416
-msgid "No stash found."
-msgstr "Pas de remisage trouvé."
+#: git-stash.sh:487
+msgid "No stash entries found."
+msgstr "Aucune entrée de remisage trouvée."
-#: git-stash.sh:423
+#: git-stash.sh:494
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:438
+#: git-stash.sh:509
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:466
+#: git-stash.sh:537
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:477
+#: git-stash.sh:548
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:485
+#: git-stash.sh:556
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:489
+#: git-stash.sh:560
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:497
+#: git-stash.sh:568
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:499
+#: git-stash.sh:570
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:508
-msgid "Could not restore untracked files from stash"
-msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr ""
+"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-#: git-stash.sh:533
+#: git-stash.sh:604
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:548
+#: git-stash.sh:619
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:562
-msgid "The stash is kept in case you need it again."
-msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: git-stash.sh:571
+#: git-stash.sh:642
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:643
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:580
+#: git-stash.sh:651
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:652
+#: git-stash.sh:730
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
-#: git-submodule.sh:184
+#: git-submodule.sh:181
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:194
+#: git-submodule.sh:191
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:211
+#: git-submodule.sh:210
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:215
+#: git-submodule.sh:213
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
+
+#: git-submodule.sh:219
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Utilisez -f si vous voulez vraiment l'ajouter."
-#: git-submodule.sh:233
+#: git-submodule.sh:237
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:235
+#: git-submodule.sh:239
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:243
+#: git-submodule.sh:247
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:245
+#: git-submodule.sh:249
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:251
+#: git-submodule.sh:255
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:263
+#: git-submodule.sh:267
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:268
+#: git-submodule.sh:272
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:277
+#: git-submodule.sh:281
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:324
+#: git-submodule.sh:342
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Entrée dans '$displaypath'"
-#: git-submodule.sh:344
+#: git-submodule.sh:362
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
+msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
-#: git-submodule.sh:415
+#: git-submodule.sh:433
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "un spécificateur de chemin et --all sont incompatibles"
-#: git-submodule.sh:420
+#: git-submodule.sh:438
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
-#: git-submodule.sh:440
+#: git-submodule.sh:458
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: git-submodule.sh:448
+#: git-submodule.sh:466
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"La copie de travail du sous-module '$displaypath' contient des modifications "
"locales ; utilisez '-f' pour les annuler"
-#: git-submodule.sh:451
+#: git-submodule.sh:469
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Répertoire '$displaypath' nettoyé"
-#: git-submodule.sh:452
+#: git-submodule.sh:470
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr ""
"Impossible de supprimer la copie de travail du sous-module '$displaypath'"
-#: git-submodule.sh:455
+#: git-submodule.sh:473
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
-#: git-submodule.sh:464
+#: git-submodule.sh:482
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:617
+#: git-submodule.sh:638
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:627
+#: git-submodule.sh:648
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:632
+#: git-submodule.sh:653
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:650
+#: git-submodule.sh:671
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:656
+#: git-submodule.sh:677
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
"$sha1. La récupération directe de ce commit a échoué."
-#: git-submodule.sh:663
+#: git-submodule.sh:684
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:664
+#: git-submodule.sh:685
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:668
+#: git-submodule.sh:689
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:669
+#: git-submodule.sh:690
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:674
+#: git-submodule.sh:695
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:675
+#: git-submodule.sh:696
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:680
+#: git-submodule.sh:701
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:681
+#: git-submodule.sh:702
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:712
+#: git-submodule.sh:733
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:820
+#: git-submodule.sh:841
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:872
+#: git-submodule.sh:893
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:892
+#: git-submodule.sh:913
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:895
+#: git-submodule.sh:916
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:919
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1045
+#: git-submodule.sh:1065
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-#: git-submodule.sh:1112
+#: git-submodule.sh:1137
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
msgid "See git-${cmd}(1) for details."
msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
-#: git-rebase--interactive.sh:131
+#: git-rebase--interactive.sh:140
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Rebasage ($new_count/$total)"
-#: git-rebase--interactive.sh:147
+#: git-rebase--interactive.sh:156
msgid ""
"\n"
"Commands:\n"
"\n"
"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-#: git-rebase--interactive.sh:162
+#: git-rebase--interactive.sh:171
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: git-rebase--interactive.sh:166
+#: git-rebase--interactive.sh:175
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: git-rebase--interactive.sh:202
+#: git-rebase--interactive.sh:211
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:227
+#: git-rebase--interactive.sh:236
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1 n'est pas un commit qui peut être picorer"
-#: git-rebase--interactive.sh:266
+#: git-rebase--interactive.sh:275
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nom de commit invalide : $sha1"
-#: git-rebase--interactive.sh:308
+#: git-rebase--interactive.sh:317
msgid "Cannot write current commit's replacement sha1"
msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-#: git-rebase--interactive.sh:360
+#: git-rebase--interactive.sh:369
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rapide sur $sha1"
-#: git-rebase--interactive.sh:362
+#: git-rebase--interactive.sh:371
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Avance rapide impossible sur $sha1"
-#: git-rebase--interactive.sh:371
+#: git-rebase--interactive.sh:380
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Impossible de déplacer HEAD sur $first_parent"
-#: git-rebase--interactive.sh:376
+#: git-rebase--interactive.sh:385
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Refus d'écraser un commit de fusion: $sha1"
-#: git-rebase--interactive.sh:390
+#: git-rebase--interactive.sh:399
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Erreur lors de la réapplication de la fusion $sha1"
-#: git-rebase--interactive.sh:398
+#: git-rebase--interactive.sh:407
#, sh-format
msgid "Could not pick $sha1"
msgstr "Impossible de picorer $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:416
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Ceci est le ${n}ième message de validation :"
-#: git-rebase--interactive.sh:412
+#: git-rebase--interactive.sh:421
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Le message de validation ${n} sera ignoré :"
-#: git-rebase--interactive.sh:423
+#: git-rebase--interactive.sh:432
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Ceci est la combinaison de $count commit."
msgstr[1] "Ceci est la combinaison de $count commits."
-#: git-rebase--interactive.sh:431
+#: git-rebase--interactive.sh:441
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Impossible d'écrire $fixup_msg"
-#: git-rebase--interactive.sh:434
+#: git-rebase--interactive.sh:444
msgid "This is a combination of 2 commits."
msgstr "Ceci est la combinaison de 2 commits."
-#: git-rebase--interactive.sh:435
-msgid "This is the 1st commit message:"
-msgstr "Ceci est le premier message de validation :"
-
-#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
-#: git-rebase--interactive.sh:521
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Impossible d'appliquer $sha1... $rest"
-#: git-rebase--interactive.sh:549
+#: git-rebase--interactive.sh:559
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"le\n"
"problème avant de pouvoir reformuler le message du commit."
-#: git-rebase--interactive.sh:564
+#: git-rebase--interactive.sh:574
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Arrêté à $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:579
+#: git-rebase--interactive.sh:589
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "'$squash_style' impossible avec le commit précédent"
-#: git-rebase--interactive.sh:621
+#: git-rebase--interactive.sh:631
#, sh-format
msgid "Executing: $rest"
msgstr "Exécution : $rest"
-#: git-rebase--interactive.sh:629
+#: git-rebase--interactive.sh:639
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'exécution a échoué : $rest"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:641
msgid "and made changes to the index and/or the working tree"
msgstr "et a mis à jour l'index ou la copie de travail"
-#: git-rebase--interactive.sh:633
+#: git-rebase--interactive.sh:643
msgid ""
"You can fix the problem, and then run\n"
"\n"
"git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:646
+#: git-rebase--interactive.sh:656
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:657
+#: git-rebase--interactive.sh:667
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Commande inconnue : $command $sha1 $rest"
-#: git-rebase--interactive.sh:658
+#: git-rebase--interactive.sh:668
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:693
+#: git-rebase--interactive.sh:703
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Rebasage et mise à jour de $head_name avec succès."
-#: git-rebase--interactive.sh:740
+#: git-rebase--interactive.sh:750
msgid "Could not skip unnecessary pick commands"
msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
-#: git-rebase--interactive.sh:898
+#: git-rebase--interactive.sh:908
#, sh-format
msgid ""
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
" - $line"
-#: git-rebase--interactive.sh:931
+#: git-rebase--interactive.sh:941
#, sh-format
msgid ""
"Warning: the command isn't recognized in the following line:\n"
"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
" - $line"
-#: git-rebase--interactive.sh:970
+#: git-rebase--interactive.sh:980
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: git-rebase--interactive.sh:1008
+#: git-rebase--interactive.sh:1018
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):"
"Attention : certains commits ont pu être accidentellement supprimés.\n"
"Commits supprimés (du plus jeune au plus vieux) :"
-#: git-rebase--interactive.sh:1016
+#: git-rebase--interactive.sh:1026
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"d'avertissements.\n"
"Les comportements disponibles sont : ignore, warn, error."
-#: git-rebase--interactive.sh:1027
+#: git-rebase--interactive.sh:1037
#, sh-format
msgid ""
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
"Ignoré."
-#: git-rebase--interactive.sh:1044
+#: git-rebase--interactive.sh:1054
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'."
"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
"rebase --continue'."
-#: git-rebase--interactive.sh:1045
+#: git-rebase--interactive.sh:1055
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-#: git-rebase--interactive.sh:1069
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1074
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1091
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr ""
"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-#: git-rebase--interactive.sh:1096
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--interactive.sh:1129
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1150
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1155
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1156
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1158
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1273
+#: git-rebase--interactive.sh:1291
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-#: git-rebase--interactive.sh:1278
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1285
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
msgid "Unable to determine absolute path of git directory"
msgstr "Impossible de déterminer le chemin absolu du répertoire git"
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:196
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %s12s %s"
+
+#: git-add--interactive.perl:197
+msgid "staged"
+msgstr "indexé"
+
+#: git-add--interactive.perl:197
+msgid "unstaged"
+msgstr "non-indexé"
+
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
+msgid "binary"
+msgstr "binaire"
+
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
+msgid "nothing"
+msgstr "rien"
+
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
+msgid "unchanged"
+msgstr "inchangé"
+
+#: git-add--interactive.perl:602
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "%d chemin ajouté\n"
+msgstr[1] "%d chemins ajoutés\n"
+
+#: git-add--interactive.perl:605
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "%d chemin mis à jour\n"
+msgstr[1] "%d chemins mis à jour\n"
+
+#: git-add--interactive.perl:608
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "%d chemin inversé\n"
+msgstr[1] "%d chemins inversés\n"
+
+#: git-add--interactive.perl:611
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "%d chemin touché\n"
+msgstr[1] "%d chemins touchés\n"
+
+#: git-add--interactive.perl:620
+msgid "Update"
+msgstr "Mise à jour"
+
+#: git-add--interactive.perl:632
+msgid "Revert"
+msgstr "Inverser"
+
+#: git-add--interactive.perl:655
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "note : %s n'est plus suivi à présent.\n"
+
+#: git-add--interactive.perl:666
+msgid "Add untracked"
+msgstr "Ajouter un fichier non-suivi"
+
+#: git-add--interactive.perl:672
+msgid "No untracked files.\n"
+msgstr "Aucun Fichier non suivi.\n"
+
+#: git-add--interactive.perl:985
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera\n"
+"immédiatement marquée comme indexée."
+
+#: git-add--interactive.perl:988
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera\n"
+"immédiatement marquée comme remisée."
+
+#: git-add--interactive.perl:991
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera\n"
+"immédiatement marquée comme desindexée."
+
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera\n"
+"immédiatement marquée comme appliquée."
+
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera\n"
+"immédiatement marquée comme éliminée."
+
+#: git-add--interactive.perl:1013
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
+
+#: git-add--interactive.perl:1014
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
+
+#: git-add--interactive.perl:1020
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Pour éliminer les lignes '%s', rendez-les ' ' (contexte).\n"
+"Pour éliminer les lignes '%s', effacez-les.\n"
+"Les lignes commençant par %s seront éliminées.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1028
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n"
+"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
+"alors l'édition sera abandonnée et la section conservée.\n"
+
+#: git-add--interactive.perl:1042
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1134
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
+"l'élimine !) [y|n] ? "
+
+#: git-add--interactive.perl:1143
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - indexer cette section\n"
+"n - ne pas indexer cette section\n"
+"q - quitter ; ne pas indexer cette section ni les autres restantes\n"
+"a - indexer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas indexer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1149
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - remiser cette section\n"
+"n - ne pas remiser cette section\n"
+"q - quitter ; ne pas remiser cette section ni les autres restantes\n"
+"a - remiser cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas remiser cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1155
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - désindexer cette section\n"
+"n - ne pas désindexer cette section\n"
+"q - quitter ; ne pas désindexer cette section ni les autres restantes\n"
+"a - désindexer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas désindexer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1161
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - appliquer cette section\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1167
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - supprimer cette section\n"
+"n - ne pas supprimer cette section\n"
+"q - quitter ; ne pas supprimer cette section ni les autres restantes\n"
+"a - supprimer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas supprimer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1173
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - éliminer cette section de l'index et de l'arbre de travail\n"
+"n - ne pas éliminer cette section\n"
+"q - quitter ; ne pas éliminer cette section ni les autres restantes\n"
+"a - éliminer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas éliminer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - appliquer cette section à l'index et à l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"a - appliquer cette section et toutes les suivantes de ce fichier\n"
+"d - ne pas appliquer cette section ni les suivantes de ce fichier"
+
+#: git-add--interactive.perl:1188
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - selectionner une section et s'y rendre\n"
+"/ - rechercher une section correspondant à une regex donnée\n"
+"j - laisser cette section non décidée et aller à la suivante non-décidée\n"
+"J - laisser cette section non décidée et aller à la suivante\n"
+"k - laisser cette section non décidée et aller à la précédente non-décidée\n"
+"K - laisser cette section non décidée et aller à la précédente\n"
+"s - découper la section en sections plus petites\n"
+"e - éditer manuellement la section actuelle\n"
+"? - afficher l'aide\n"
+
+#: git-add--interactive.perl:1219
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
+
+#: git-add--interactive.perl:1220
+msgid "Apply them to the worktree anyway? "
+msgstr "Les appliquer quand même à l'arbre de travail ? "
+
+#: git-add--interactive.perl:1223
+msgid "Nothing was applied.\n"
+msgstr "Rien n'a été appliqué.\n"
+
+#: git-add--interactive.perl:1234
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "fichier non-fusionné ignoré : %s\n"
+
+#: git-add--interactive.perl:1243
+msgid "Only binary files changed.\n"
+msgstr "Seuls des fichiers binaires ont changé.\n"
+
+#: git-add--interactive.perl:1245
+msgid "No changes.\n"
+msgstr "Aucune modification.\n"
+
+#: git-add--interactive.perl:1253
+msgid "Patch update"
+msgstr "Mise à jour par patch"
+
+#: git-add--interactive.perl:1305
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1306
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1307
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1310
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1311
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1312
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1315
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1316
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1317
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1320
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1321
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1322
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1325
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1326
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1327
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1330
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1331
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1332
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1335
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
+"d,/%s,?] ? "
+
+#: git-add--interactive.perl:1336
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/"
+"%s,?] ? "
+
+#: git-add--interactive.perl:1337
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
+
+#: git-add--interactive.perl:1440
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "aller à quelle section (<ret> pour voir plus) ? "
+
+#: git-add--interactive.perl:1442
+msgid "go to which hunk? "
+msgstr "aller à quelle section ? "
+
+#: git-add--interactive.perl:1451
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Nombre invalide : '%s'\n"
+
+#: git-add--interactive.perl:1456
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Désolé, %d seule section disponible.\n"
+msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
+
+#: git-add--interactive.perl:1482
+msgid "search for regex? "
+msgstr "rechercher la regex ? "
+
+#: git-add--interactive.perl:1495
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Regex de recherche malformée %s : %s\n"
+
+#: git-add--interactive.perl:1505
+msgid "No hunk matches the given pattern\n"
+msgstr "Aucune section ne correspond au motif donné\n"
+
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+msgid "No previous hunk\n"
+msgstr "Pas de section précédente\n"
+
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+msgid "No next hunk\n"
+msgstr "Pas de section suivante\n"
+
+#: git-add--interactive.perl:1553
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Découpée en %d section.\n"
+msgstr[1] "Découpée en %d sections.\n"
+
+#: git-add--interactive.perl:1605
+msgid "Review diff"
+msgstr "Réviser la différence"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1624
+msgid ""
+"status - show paths with changes\n"
+"update - add working tree state to the staged set of changes\n"
+"revert - revert staged set of changes back to the HEAD version\n"
+"patch - pick hunks and update selectively\n"
+"diff - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status - montrer les chemins modifiés\n"
+"update - ajouter l'état de l'arbre de travail aux modifications à "
+"indexer\n"
+"revert - faire revenir les modifications à indexer à la version HEAD\n"
+"patch - sélectionner les sections et mettre à jour sélectivement\n"
+"diff - visualiser les diff entre HEAD et l'index\n"
+"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
+
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+msgid "missing --"
+msgstr "-- manquant"
+
+#: git-add--interactive.perl:1662
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "mode de --patch inconnu : %s"
+
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "argument invalide %s, -- attendu"
+
+#: git-send-email.perl:126
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+"la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
+
+#: git-send-email.perl:133 git-send-email.perl:139
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
+
+#: git-send-email.perl:208 git-send-email.perl:214
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "l'éditeur est sorti en erreur, abandon total"
+
+#: git-send-email.perl:291
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contient une version intermédiaire du courriel que vous composiez.\n"
+
+#: git-send-email.perl:296
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' contient le courriel composé.\n"
+
+#: git-send-email.perl:314
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases est incompatible avec d'autres options\n"
+
+#: git-send-email.perl:379 git-send-email.perl:634
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
+
+#: git-send-email.perl:448
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Champ de --suppress-cc inconnu : '%s'\n"
+
+#: git-send-email.perl:477
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Paramètre de --confirm inconnu : '%s'\n"
+
+#: git-send-email.perl:509
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
+
+#: git-send-email.perl:511
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "attention : `:include:` n'est pas supporté : %s\n"
+
+#: git-send-email.perl:513
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
+
+#: git-send-email.perl:518
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "attention : ligne sendmail non reconnue : %s\n"
+
+#: git-send-email.perl:600
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for. Please disambiguate by...\n"
+"\n"
+" * Saying \"./%s\" if you mean a file; or\n"
+" * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n"
+"pour lequel les patches sont à produire. Veuillez préciser...\n"
+"\n"
+" * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
+" * en fournissant l'option --format-patch pour une plage.\n"
+
+#: git-send-email.perl:621
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Échec à l'ouverture du répertoire %s : %s"
+
+#: git-send-email.perl:645
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal : %s : %s\n"
+"attention : aucun patch envoyé\n"
+
+#: git-send-email.perl:656
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Aucun fichier patch spécifié !\n"
+"\n"
+
+#: git-send-email.perl:669
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "Ligne de sujet non trouvée dans %s ?"
+
+#: git-send-email.perl:679
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Impossible d'ouvrir %s en écriture : %s"
+
+#: git-send-email.perl:689
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"Les lignes commençant par \"GIT:\" seront supprimées.\n"
+"Envisagez d'inclure un diffstat global ou une table des matières\n"
+"pour le patch que vous êtes en train d'écrire.\n"
+"\n"
+"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
+
+#: git-send-email.perl:712
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Échec à l'ouverture de %s.final : %s"
+
+#: git-send-email.perl:715
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Échec à l'ouverture de %s : %s"
+
+#: git-send-email.perl:750
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+msgstr ""
+"Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
+
+#: git-send-email.perl:759
+msgid "Summary email is empty, skipping it\n"
+msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:791
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
+
+#: git-send-email.perl:820
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
+"Transfer-Encoding.\n"
+
+#: git-send-email.perl:825
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
+
+#: git-send-email.perl:833
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Envoi refusé parce que le patch\n"
+"\t%s\n"
+"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
+"vraiment envoyer.\n"
+
+#: git-send-email.perl:852
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
+
+#: git-send-email.perl:870
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "fatal : l'alias '%s' se développe en lui-même\n"
+
+#: git-send-email.perl:882
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
+"a) ? "
+
+#: git-send-email.perl:932 git-send-email.perl:940
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:944
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
+
+#: git-send-email.perl:1245
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "le chemin vers la CA \"%s\" n'existe pas"
+
+#: git-send-email.perl:1320
+msgid ""
+" The Cc list above has been expanded by additional\n"
+" addresses found in the patch commit message. By default\n"
+" send-email prompts before sending whenever this occurs.\n"
+" This behavior is controlled by the sendemail.confirm\n"
+" configuration setting.\n"
+"\n"
+" For additional information, run 'git send-email --help'.\n"
+" To retain the current behavior, but squelch this message,\n"
+" run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+" La liste CC ci-dessus a été étendue avec des adresses\n"
+" supplémentaires trouvées dans le message de validation.\n"
+" Par défaut dans ce cas, send-email demande confirmation avant envoi.\n"
+" Ce comportement est géré par le paramètre de configuration\n"
+" sendemail.confirm.\n"
+"\n"
+" Pour tout information complémentaire, lancez 'git send-email --help'.\n"
+" Pour conserver le comportement actuel, mais éliminer ce message,\n"
+" lancez 'git config --global sendemail.confirm auto'.\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1335
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
+
+#: git-send-email.perl:1338
+msgid "Send this email reply required"
+msgstr "Une réponse est nécessaire"
+
+#: git-send-email.perl:1364
+msgid "The required SMTP server is not properly defined."
+msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
+
+#: git-send-email.perl:1411
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Le serveur ne supporte pas STARTTLS ! %s"
+
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "echec de STARTTLS ! %s"
+
+#: git-send-email.perl:1430
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
+"debug."
+
+#: git-send-email.perl:1448
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "échec de l'envoi de %s\n"
+
+#: git-send-email.perl:1451
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Envoi simulé de %s\n"
+
+#: git-send-email.perl:1451
+#, perl-format
+msgid "Sent %s\n"
+msgstr "%s envoyé\n"
+
+#: git-send-email.perl:1453
+msgid "Dry-OK. Log says:\n"
+msgstr "Simulation OK. Le journal indique :\n"
+
+#: git-send-email.perl:1453
+msgid "OK. Log says:\n"
+msgstr "OK. Le journal indique :\n"
+
+#: git-send-email.perl:1465
+msgid "Result: "
+msgstr "Résultat : "
+
+#: git-send-email.perl:1468
+msgid "Result: OK\n"
+msgstr "Résultat : OK\n"
+
+#: git-send-email.perl:1481
+#, perl-format
+msgid "can't open file %s"
+msgstr "impossible d'ouvrir le fichier %s"
+
+#: git-send-email.perl:1528 git-send-email.perl:1548
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
+
+#: git-send-email.perl:1534
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
+
+#: git-send-email.perl:1582
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
+
+#: git-send-email.perl:1605
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
+
+#: git-send-email.perl:1711
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Impossible d'exécuter '%s'"
+
+#: git-send-email.perl:1718
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
+
+#: git-send-email.perl:1722
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) échec de la fermeture du pipe vers '%s'"
+
+#: git-send-email.perl:1749
+msgid "cannot send message as 7bit"
+msgstr "impossible d'envoyer un message comme 7bit"
+
+#: git-send-email.perl:1757
+msgid "invalid transfer encoding"
+msgstr "codage de transfert invalide"
+
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "impossible d'ouvrir %s :%s\n"
+
+#: git-send-email.perl:1798
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
+
+#: git-send-email.perl:1814
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:1818
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+
+#~ msgid "Could not open file '%s'"
+#~ msgstr "impossible d'ouvrir le fichier '%s'"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "dans %0.1f secondes automatiquement..."
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "échec de dup2(%d,%d)"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Validation initiale sur "
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "Le patch est vide. Le découpage était-il bon ?"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Vous avez toujours des chemins non fusionnés dans votre index\n"
+#~ "Auriez-vous oublié de faire 'git add' ?"
+
+#~ msgid ""
+#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
+#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
+#~ msgstr ""
+#~ "Impossible de mettre à jour les chemins et de basculer sur la branche "
+#~ "'%s' en même temps.\n"
+#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
+
+#~ msgid "default mode for recursion"
+#~ msgstr "mode par défaut pour la récursion"
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr ""
+#~ "la sous-commande submodule--helper doit être appelée avec une sous-"
+#~ "commande"
+
+#~ msgid "could not stat '%s"
+#~ msgstr "stat impossible de '%s'"
+
+#~ msgid "tag: tagging "
+#~ msgstr "étiquette: étiquetage de "
+
+#~ msgid "object of unknown type"
+#~ msgstr "objet de type inconnu"
+
+#~ msgid "commit object"
+#~ msgstr "objet commit"
+
+#~ msgid "tree object"
+#~ msgstr "objet arbre"
+
+#~ msgid "blob object"
+#~ msgstr "objet blob"
+
+#~ msgid "other tag object"
+#~ msgstr "objet étiquette autre"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"
+#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "format non reconnu %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= requiert un argument entier positif"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "la réf '%s' n'a pas %ld composants à :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "format de %.*s inconnu %s"
+
+# féminin pour une branche
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: disparue]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: en retard de %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s : en avance de %d]"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s : en avance de %d, en retard de %d]"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** référence invalide ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "objet répertoire démentiellement long %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<options>] <message> HEAD <commit>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "'%s' n'est pas une validation"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "impossible d'ouvrir le fichier '%s'"
+
+#~ msgid "could not close file %s"
+#~ msgstr "impossible de fermer le fichier %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "nom d'étiquette trop long : %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "en-tête d'étiquette trop gros."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Si le patch s'applique proprement, la section éditée sera\n"
+#~ "immediatement marquée comme éliminée"
+
+#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
+#~ msgstr ""
+#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour "
+#~ "améliorer le diffs"
+
+#~ msgid "Clever... amending the last one with dirty index."
+#~ msgstr "Malin... correction du dernier avec un index sale."
+
+#~ msgid ""
+#~ "the following submodule (or one of its nested submodules)\n"
+#~ "uses a .git directory:"
+#~ msgid_plural ""
+#~ "the following submodules (or one of their nested submodules)\n"
+#~ "use a .git directory:"
+#~ msgstr[0] ""
+#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n"
+#~ "utilise un répertoire .git :"
+#~ msgstr[1] ""
+#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n"
+#~ "utilisent un répertoire .git :"
+
+#~ msgid ""
+#~ "\n"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "\n"
+#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
+#~ "son historique)"
+
#~ msgid "Could not write to %s"
#~ msgstr "Impossible d'écrire dans %s"
#~ msgid "bug: unhandled diff status %c"
#~ msgstr "bogue : état de diff non géré %c"
-#~ msgid "read of %s failed"
-#~ msgstr "échec de la lecture de %s"
-
#~ msgid "could not write branch description template"
#~ msgstr "impossible d'écrire le modèle de description de branche"
#~ "or you are unsure what this means choose another name with the '--name' "
#~ "option."
#~ msgstr ""
-#~ "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec "
-#~ "l'option '--name'."
+#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom "
+#~ "avec l'option '--name'."
#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
#~ msgstr ""
#~ msgid "unable to access '%s': %s"
#~ msgstr "impossible d'accéder à '%s' : %s"
-#~ msgid "could not open '%s' for reading: %s"
-#~ msgstr "impossible d'ouvrir '%s' en lecture : %s"
-
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "impossible d'ouvrir '%s' en écriture : %s"
-
#~ msgid " git branch -d %s\n"
#~ msgstr " git branch -d %s\n"
#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
#~ "\"$cmdline --abort\"."
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Le patch n'a pas d'adresse e-mail valide."
+#~ msgid "Patch does not have a valid courriel address."
+#~ msgstr "Le patch n'a pas d'adresse courriel valide."
#~ msgid "Applying: $FIRSTLINE"
#~ msgstr "Application : $FIRSTLINE"
#~ msgid "cannot update HEAD ref"
#~ msgstr "impossible de mettre à jour la référence HEAD"
-#~ msgid "cannot tell cwd"
-#~ msgstr "impossible de déterminer le répertoire de travail courant"
-
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s : impossible de verrouiller la référence"