l10n: fr.po 2.16 round 2

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>

diff --git a/po/fr.po b/po/fr.po
index fa3445b372ca0a82e37a986d1b29755878b8214a..3aa1e3c0d88fc4d5997a8696fe4b4634cc5cb787 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -74,8 +74,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2017-12-31 10:45+0800\n"
-"PO-Revision-Date: 2018-01-02 22:06+0100\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-07 18:53+0100\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"
 "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"


@@ -682,7 +682,7 @@ msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 

-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

 #: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
 #: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
 #: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
 #: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
 #: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
 #: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230


@@ -699,7 +699,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 

-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 


@@ -761,7 +761,7 @@ msgstr "les chemins sont séparés par un caractère NUL"
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 

-#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 #: builtin/pack-objects.c:3009
 msgid "action"
 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
 #: builtin/pack-objects.c:3009
 msgid "action"


@@ -809,7 +809,7 @@ msgstr ""
 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"
 
 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:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217

 msgid "root"
 msgstr "racine"
 
 msgid "root"
 msgstr "racine"
 


@@ -1079,8 +1079,8 @@ msgstr ""
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 

-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179
-#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

 #: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"
 #: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
 #: builtin/shortlog.c:191
 msgid "revision walk setup failed"


@@ -1261,8 +1261,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 

-#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631
-#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"


@@ -1329,8 +1329,8 @@ msgstr "l'index de groupe a disparu"
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 

-#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1471 builtin/am.c:2106
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069

 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"


@@ -1776,7 +1776,9 @@ msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 #: editor.c:61
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 #: editor.c:61
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"

-msgstr "suggestion : en attente de la fermeture du fichier par votre éditeur de texte…%c"
+msgstr ""
+"suggestion : en attente de la fermeture du fichier par votre éditeur de "
+"texte…%c"

 
 #: entry.c:177
 msgid "Filtering content"
 
 #: entry.c:177
 msgid "Filtering content"


@@ -2179,11 +2181,11 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "Impossible de créer '%s.lock' : %s"
 
 msgid "Unable to create '%s.lock': %s"
 msgstr "Impossible de créer '%s.lock' : %s"
 

-#: merge.c:41
+#: merge.c:74

 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 

-#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

 #: builtin/checkout.c:600 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
 #: builtin/checkout.c:600 builtin/clone.c:754
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"


@@ -2413,36 +2415,41 @@ msgstr ""
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
 msgid "Adding %s"
 msgstr "Ajout de %s"
 

-#: merge-recursive.c:1955
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Index sale : fusion impossible (sales : %s)"
+
+#: merge-recursive.c:1962

 msgid "Already up to date!"
 msgstr "Déjà à jour !"
 
 msgid "Already up to date!"
 msgstr "Déjà à jour !"
 

-#: merge-recursive.c:1964
+#: merge-recursive.c:1971

 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 

-#: merge-recursive.c:2061
+#: merge-recursive.c:2068

 msgid "Merging:"
 msgstr "Fusion :"
 
 msgid "Merging:"
 msgstr "Fusion :"
 

-#: merge-recursive.c:2074
+#: merge-recursive.c:2081

 #, 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 :"
 
 #, 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:2113
+#: merge-recursive.c:2120

 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 

-#: merge-recursive.c:2176
+#: merge-recursive.c:2183

 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 

-#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 


@@ -2642,12 +2649,12 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 

-#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 

-#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"
 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"


@@ -3066,27 +3073,28 @@ msgid ""
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 "Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 "Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

-"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`."
+"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
+"false`."

 
 

-#: send-pack.c:151
+#: send-pack.c:141

 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
 
 #, 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
+#: send-pack.c:143

 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dépaquetage a échoué : %s"
 
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dépaquetage a échoué : %s"
 

-#: send-pack.c:316
+#: send-pack.c:306

 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 

-#: send-pack.c:429
+#: send-pack.c:419

 msgid "the receiving end does not support --signed push"
 msgstr "Le receveur ne gère pas les poussées avec --signed"
 
 msgid "the receiving end does not support --signed push"
 msgstr "Le receveur ne gère pas les poussées avec --signed"
 

-#: send-pack.c:431
+#: send-pack.c:421

 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"


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

-#: send-pack.c:443
+#: send-pack.c:433

 msgid "the receiving end does not support --atomic push"
 msgstr "Le receveur ne gère pas les poussées avec --atomic"
 
 msgid "the receiving end does not support --atomic push"
 msgstr "Le receveur ne gère pas les poussées avec --atomic"
 

-#: send-pack.c:448
+#: send-pack.c:438

 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gère pas les options de poussées"
 
 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gère pas les options de poussées"
 


@@ -3137,13 +3145,13 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 

-#: sequencer.c:297 sequencer.c:1715
+#: sequencer.c:297 sequencer.c:1718

 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 

-#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734
-#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"


@@ -3153,12 +3161,12 @@ msgstr "impossible d'écrire dans '%s'"
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 

-#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "échec lors de la finalisation de '%s'."
 
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "échec lors de la finalisation de '%s'."
 

-#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

 #: builtin/commit.c:754 builtin/merge.c:1046
 #, c-format
 msgid "could not read '%s'"
 #: builtin/commit.c:754 builtin/merge.c:1046
 #, c-format
 msgid "could not read '%s'"


@@ -3187,12 +3195,12 @@ msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
 #: sequencer.c:496
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
 #: sequencer.c:496

-msgid "could not resolve HEAD commit\n"
-msgstr "impossible de résoudre le commit HEAD\n"
+msgid "could not resolve HEAD commit"
+msgstr "impossible de résoudre le commit HEAD"

 
 #: sequencer.c:516
 
 #: sequencer.c:516

-msgid "unable to update cache tree\n"
-msgstr "impossible de mettre à jour l'arbre de cache\n"
+msgid "unable to update cache tree"
+msgstr "impossible de mettre à jour l'arbre de cache"

 
 #: sequencer.c:600
 #, c-format
 
 #: sequencer.c:600
 #, c-format


@@ -3225,13 +3233,13 @@ msgstr ""
 
 #: sequencer.c:702
 #, c-format
 
 #: sequencer.c:702
 #, c-format

-msgid "could not parse commit %s\n"
-msgstr "impossible d'analyser le commit %s\n"
+msgid "could not parse commit %s"
+msgstr "impossible d'analyser le commit %s"

 
 #: sequencer.c:707
 #, c-format
 
 #: sequencer.c:707
 #, c-format

-msgid "could not parse parent commit %s\n"
-msgstr "impossible d'analyser le commit parent %s\n"
+msgid "could not parse parent commit %s"
+msgstr "impossible d'analyser le commit parent %s"

 
 #: sequencer.c:836
 #, c-format
 
 #: sequencer.c:836
 #, c-format


@@ -3260,7 +3268,7 @@ msgstr ""
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 

-#: sequencer.c:857 sequencer.c:2742
+#: sequencer.c:857 sequencer.c:2748

 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 


@@ -3329,159 +3337,169 @@ 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.
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.

-#: sequencer.c:1025
+#: sequencer.c:1023

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 

-#: sequencer.c:1088 sequencer.c:1864
+#: sequencer.c:1086 sequencer.c:1867

 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 

-#: sequencer.c:1139
+#: sequencer.c:1137

 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 

-#: sequencer.c:1140
+#: sequencer.c:1138

 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 

-#: sequencer.c:1182
+#: sequencer.c:1180

 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 

-#: sequencer.c:1192
+#: sequencer.c:1190

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 

-#: sequencer.c:1198
+#: sequencer.c:1196

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 

-#: sequencer.c:1319
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s n'accepte pas d'argument : '%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument manquant pour %s"
+
+#: sequencer.c:1322

 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 

-#: sequencer.c:1327
+#: sequencer.c:1330

 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 

-#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636
-#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 
 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 

-#: sequencer.c:1372
+#: sequencer.c:1375

 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 

-#: sequencer.c:1374
+#: sequencer.c:1377

 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 

-#: sequencer.c:1379
+#: sequencer.c:1382

 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 

-#: sequencer.c:1390
+#: sequencer.c:1393

 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 

-#: sequencer.c:1392
+#: sequencer.c:1395

 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 

-#: sequencer.c:1459
+#: sequencer.c:1462

 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 

-#: sequencer.c:1462
+#: sequencer.c:1465

 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 

-#: sequencer.c:1528
+#: sequencer.c:1531

 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 

-#: sequencer.c:1566
+#: sequencer.c:1569

 msgid "a cherry-pick or revert is already in progress"
 msgstr "un picorage ou un retour est déjà en cours"
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un picorage ou un retour est déjà en cours"
 

-#: sequencer.c:1567
+#: sequencer.c:1570

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

-#: sequencer.c:1570
+#: sequencer.c:1573

 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 

-#: sequencer.c:1585
+#: sequencer.c:1588

 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 

-#: sequencer.c:1643 sequencer.c:2227
+#: sequencer.c:1646 sequencer.c:2230

 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 

-#: sequencer.c:1645
+#: sequencer.c:1648

 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 

-#: sequencer.c:1647 sequencer.c:1682
+#: sequencer.c:1650 sequencer.c:1685

 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 

-#: sequencer.c:1668 builtin/grep.c:713
+#: sequencer.c:1671 builtin/grep.c:713

 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 

-#: sequencer.c:1670
+#: sequencer.c:1673

 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 

-#: sequencer.c:1671
+#: sequencer.c:1674

 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 

-#: sequencer.c:1677
+#: sequencer.c:1680

 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
 
 #, 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:1688
+#: sequencer.c:1691

 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 !"
 
 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:1829 sequencer.c:2125
+#: sequencer.c:1832 sequencer.c:2128

 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 

-#: sequencer.c:1869 builtin/difftool.c:639
+#: sequencer.c:1872 builtin/difftool.c:639

 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 

-#: sequencer.c:1888
+#: sequencer.c:1891

 msgid "could not read index"
 msgstr "impossible de lire l'index"
 
 msgid "could not read index"
 msgstr "impossible de lire l'index"
 

-#: sequencer.c:1893
+#: sequencer.c:1896

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -3496,11 +3514,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
 "git rebase --continue\n"
 "\n"
 

-#: sequencer.c:1899
+#: sequencer.c:1902

 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"
 
 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:1905
+#: sequencer.c:1908

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -3517,17 +3535,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:1964
+#: sequencer.c:1967

 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 

-#: sequencer.c:1976
+#: sequencer.c:1979

 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 

-#: sequencer.c:1979 git-rebase.sh:175
+#: sequencer.c:1982 git-rebase.sh:175

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -3538,57 +3556,57 @@ msgstr ""
 "Vos  modifications sont à l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\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:2061
+#: sequencer.c:2064

 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrêt à %s... %.*s\n"
 
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrêt à %s... %.*s\n"
 

-#: sequencer.c:2103
+#: sequencer.c:2106

 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 

-#: sequencer.c:2133
+#: sequencer.c:2136

 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 

-#: sequencer.c:2138 sequencer.c:2739
+#: sequencer.c:2141 sequencer.c:2745

 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 

-#: sequencer.c:2145
+#: sequencer.c:2148

 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre à jour %s"
 
 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre à jour %s"
 

-#: sequencer.c:2152
+#: sequencer.c:2155

 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 

-#: sequencer.c:2236
+#: sequencer.c:2239

 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 

-#: sequencer.c:2241
+#: sequencer.c:2244

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 

-#: sequencer.c:2250
+#: sequencer.c:2253

 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 

-#: sequencer.c:2252
+#: sequencer.c:2255

 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 

-#: sequencer.c:2254
+#: sequencer.c:2257

 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 

-#: sequencer.c:2257
+#: sequencer.c:2260

 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"


@@ -3598,45 +3616,45 @@ msgstr ""
 "Vous avez des modifications non validées dans votre copie de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
 "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:2267
+#: sequencer.c:2270

 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 

-#: sequencer.c:2347
+#: sequencer.c:2350

 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 

-#: sequencer.c:2351
+#: sequencer.c:2354

 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 

-#: sequencer.c:2384
+#: sequencer.c:2387

 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 

-#: sequencer.c:2489
+#: sequencer.c:2492

 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 
 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 

-#: sequencer.c:2492
+#: sequencer.c:2495

 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 
 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 

-#: sequencer.c:2526 sequencer.c:2561
+#: sequencer.c:2529 sequencer.c:2564

 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "liste à faire inutilisable : '%s'"
 
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "liste à faire inutilisable : '%s'"
 

-#: sequencer.c:2609
+#: sequencer.c:2615

 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
 
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
 

-#: sequencer.c:2689
+#: sequencer.c:2695

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"


@@ -3645,7 +3663,7 @@ msgstr ""
 "Attention : certains commits ont pu être accidentellement supprimés.\n"
 "Commits supprimés (du plus jeune au plus vieux) :\n"
 
 "Attention : certains commits ont pu être accidentellement supprimés.\n"
 "Commits supprimés (du plus jeune au plus vieux) :\n"
 

-#: sequencer.c:2696
+#: sequencer.c:2702

 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"


@@ -3663,7 +3681,7 @@ msgstr ""
 "Les comportements disponibles sont : ignore, warn, error.\n"
 "\n"
 
 "Les comportements disponibles sont : ignore, warn, error.\n"
 "\n"
 

-#: sequencer.c:2708
+#: sequencer.c:2714

 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"


@@ -3674,18 +3692,18 @@ msgstr ""
 "rebase --continue'.\n"
 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
 
 "rebase --continue'.\n"
 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
 

-#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
 #: builtin/am.c:779
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 

-#: sequencer.c:2769
+#: sequencer.c:2775

 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 

-#: sequencer.c:2891
+#: sequencer.c:2897

 msgid "the script was already rearranged."
 msgstr "le script a déjà été réarrangé."
 
 msgid "the script was already rearranged."
 msgstr "le script a déjà été réarrangé."
 


@@ -4956,7 +4974,8 @@ msgstr "mettre à jour les fichiers suivis"
 
 #: builtin/add.c:299
 msgid "renormalize EOL of tracked files (implies -u)"
 
 #: builtin/add.c:299
 msgid "renormalize EOL of tracked files (implies -u)"

-msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
+msgstr ""
+"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"

 
 #: builtin/add.c:300
 msgid "record only the fact that the path will be added later"
 
 #: builtin/add.c:300
 msgid "record only the fact that the path will be added later"


@@ -5134,49 +5153,49 @@ msgstr "Échec de découpage des patchs."
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 

-#: builtin/am.c:1197
+#: builtin/am.c:1160

 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
 
 #, 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:1198
+#: builtin/am.c:1161

 #, 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\"."
 
 #, 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:1199
+#: builtin/am.c:1162

 #, 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\"."
 
 #, 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:1306
+#: builtin/am.c:1269

 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 

-#: builtin/am.c:1372
+#: builtin/am.c:1335

 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 

-#: builtin/am.c:1394
+#: builtin/am.c:1357

 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 

-#: builtin/am.c:1587
+#: builtin/am.c:1550

 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."
 
 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:1589
+#: builtin/am.c:1552

 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
 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:1608
+#: builtin/am.c:1571

 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."


@@ -5184,38 +5203,38 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 

-#: builtin/am.c:1614
+#: builtin/am.c:1577

 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 

-#: builtin/am.c:1639
+#: builtin/am.c:1602

 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 

-#: builtin/am.c:1663 builtin/merge.c:642
+#: builtin/am.c:1626 builtin/merge.c:642

 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 

-#: builtin/am.c:1670
+#: builtin/am.c:1633

 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 

-#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

 #: builtin/merge.c:850
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 
 #: builtin/merge.c:850
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 

-#: builtin/am.c:1716 builtin/am.c:1720
+#: builtin/am.c:1679 builtin/am.c:1683

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 

-#: builtin/am.c:1736
+#: builtin/am.c:1699

 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "impossible d'être interactif sans entrée standard connectée à un terminal."
 
 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:1741
+#: builtin/am.c:1704

 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 


@@ -5223,35 +5242,35 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
 #. in your translation. The program will only accept English
 #. input at this point.
 #.

-#: builtin/am.c:1751
+#: builtin/am.c:1714

 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 : "
 
 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:1801
+#: builtin/am.c:1764

 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 

-#: builtin/am.c:1841 builtin/am.c:1913
+#: builtin/am.c:1804 builtin/am.c:1876

 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 

-#: builtin/am.c:1857
+#: builtin/am.c:1820

 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 

-#: builtin/am.c:1865
+#: builtin/am.c:1828

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 

-#: builtin/am.c:1871
+#: builtin/am.c:1834

 #, 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"
 
 #, 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:1916
+#: builtin/am.c:1879

 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"


@@ -5262,7 +5281,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 

-#: builtin/am.c:1923
+#: builtin/am.c:1886

 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "


@@ -5275,17 +5294,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 

-#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

 #: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
 #: builtin/reset.c:340
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 

-#: builtin/am.c:2082
+#: builtin/am.c:2045

 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 

-#: builtin/am.c:2117
+#: builtin/am.c:2080

 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"


@@ -5293,76 +5312,76 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 

-#: builtin/am.c:2180
+#: builtin/am.c:2143

 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 

-#: builtin/am.c:2213
+#: builtin/am.c:2176

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

-#: builtin/am.c:2214
+#: builtin/am.c:2177

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

-#: builtin/am.c:2220
+#: builtin/am.c:2183

 msgid "run interactively"
 msgstr "exécution interactive"
 
 msgid "run interactively"
 msgstr "exécution interactive"
 

-#: builtin/am.c:2222
+#: builtin/am.c:2185

 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 

-#: builtin/am.c:2224
+#: builtin/am.c:2187

 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 

-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "être silencieux"
 
 #: builtin/repack.c:180
 msgid "be quiet"
 msgstr "être silencieux"
 

-#: builtin/am.c:2227
+#: builtin/am.c:2190

 msgid "add a Signed-off-by line to the commit message"
 msgstr "ajouter une ligne Signed-off-by au message de validation"
 
 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:2230
+#: builtin/am.c:2193

 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 

-#: builtin/am.c:2232
+#: builtin/am.c:2195

 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 

-#: builtin/am.c:2234
+#: builtin/am.c:2197

 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 

-#: builtin/am.c:2236
+#: builtin/am.c:2199

 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 

-#: builtin/am.c:2238
+#: builtin/am.c:2201

 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
 
 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:2241
+#: builtin/am.c:2204

 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"
 
 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:2244
+#: builtin/am.c:2207

 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 

-#: 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
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236

 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 

-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

 #: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
 #: 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:377
 #: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
 #: 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:377


@@ -5370,58 +5389,58 @@ msgstr "le passer jusqu'à git-apply"
 msgid "n"
 msgstr "n"
 
 msgid "n"
 msgstr "n"
 

-#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 

-#: builtin/am.c:2270
+#: builtin/am.c:2233

 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 

-#: builtin/am.c:2276
+#: builtin/am.c:2239

 msgid "override error message when patch failure occurs"
 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
 
 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:2278
+#: builtin/am.c:2241

 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 

-#: builtin/am.c:2281
+#: builtin/am.c:2244

 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 

-#: builtin/am.c:2284
+#: builtin/am.c:2247

 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 

-#: builtin/am.c:2287
+#: builtin/am.c:2250

 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 

-#: builtin/am.c:2291
+#: builtin/am.c:2254

 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 

-#: builtin/am.c:2293
+#: builtin/am.c:2256

 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 

-#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "id-clé"
 
 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
 msgid "key-id"
 msgstr "id-clé"
 

-#: builtin/am.c:2296
+#: builtin/am.c:2259

 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 

-#: builtin/am.c:2299
+#: builtin/am.c:2262

 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 

-#: builtin/am.c:2317
+#: builtin/am.c:2280

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


@@ -5429,17 +5448,17 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 

-#: builtin/am.c:2324
+#: builtin/am.c:2287

 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 

-#: builtin/am.c:2339
+#: builtin/am.c:2302

 #, 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."
 
 #, 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:2363
+#: builtin/am.c:2326

 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 #, c-format
 msgid ""
 "Stray %s directory found.\n"


@@ -5448,7 +5467,7 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 

-#: builtin/am.c:2369
+#: builtin/am.c:2332

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


@@ -7590,7 +7609,9 @@ msgstr ""
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"

-msgstr "afficher les fichiers ignorés, \"mode\" facultatif : traditional (traditionnel), matching (correspondant), no. (Défaut : traditional)"
+msgstr ""
+"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
+"(traditionnel), matching (correspondant), no. (Défaut : traditional)"

 
 #: builtin/commit.c:1384 parse-options.h:155
 msgid "when"
 
 #: builtin/commit.c:1384 parse-options.h:155
 msgid "when"


@@ -7610,7 +7631,8 @@ msgstr "afficher les fichiers non suivis en colonnes"
 
 #: builtin/commit.c:1406
 msgid "Unsupported combination of ignored and untracked-files arguments"
 
 #: builtin/commit.c:1406
 msgid "Unsupported combination of ignored and untracked-files arguments"

-msgstr "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
+msgstr ""
+"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"

 
 #: builtin/commit.c:1469
 msgid "couldn't look up newly created commit"
 
 #: builtin/commit.c:1469
 msgid "couldn't look up newly created commit"


@@ -8044,7 +8066,9 @@ msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 #: builtin/describe.c:316
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 #: builtin/describe.c:316
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"

-msgstr "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par describe\n"
+msgstr ""
+"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
+"describe\n"

 
 #: builtin/describe.c:363
 #, c-format
 
 #: builtin/describe.c:363
 #, c-format


@@ -13746,7 +13770,9 @@ msgstr "supprimer la sortie d'état du sous-module"
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"

-msgstr "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module"
+msgstr ""
+"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
+"du sous-module"

 
 #: builtin/submodule--helper.c:679
 msgid "recurse into nested submodules"
 
 #: builtin/submodule--helper.c:679
 msgid "recurse into nested submodules"


@@ -14342,7 +14368,8 @@ msgstr "écrire l'index même s'il n'est pas marqué comme modifié"
 
 #: builtin/update-index.c:1024
 msgid "enable or disable file system monitor"
 
 #: builtin/update-index.c:1024
 msgid "enable or disable file system monitor"

-msgstr "activer ou désactiver la surveillance du système de fichier (fsmonitor)"
+msgstr ""
+"activer ou désactiver la surveillance du système de fichier (fsmonitor)"

 
 #: builtin/update-index.c:1026
 msgid "mark files as fsmonitor valid"
 
 #: builtin/update-index.c:1026
 msgid "mark files as fsmonitor valid"


@@ -14395,7 +14422,9 @@ msgstr "Le cache non suivi est activé pour '%s'"
 
 #: builtin/update-index.c:1171
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 
 #: builtin/update-index.c:1171
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"

-msgstr "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment activer la surveillance du système de fichiers"
+msgstr ""
+"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "
+"activer la surveillance du système de fichiers"

 
 #: builtin/update-index.c:1175
 msgid "fsmonitor enabled"
 
 #: builtin/update-index.c:1175
 msgid "fsmonitor enabled"


@@ -14404,7 +14433,9 @@ msgstr "fsmonitor activé"
 #: builtin/update-index.c:1178
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 #: builtin/update-index.c:1178
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"

-msgstr "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver la surveillance du système de fichiers"
+msgstr ""
+"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver la surveillance du système de fichiers"

 
 #: builtin/update-index.c:1182
 msgid "fsmonitor disabled"
 
 #: builtin/update-index.c:1182
 msgid "fsmonitor disabled"


@@ -14596,7 +14627,8 @@ msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
 #: builtin/worktree.c:453
 msgid "--[no-]track can only be used if a new branch is created"
 
 #: builtin/worktree.c:453
 msgid "--[no-]track can only be used if a new branch is created"

-msgstr "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
+msgstr ""
+"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"

 
 #: builtin/worktree.c:553
 msgid "reason for locking"
 
 #: builtin/worktree.c:553
 msgid "reason for locking"


@@ -15961,7 +15993,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
 "    git rebase --continue\n"
 "\n"
 

-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995

 msgid "Could not execute editor"
 msgstr "Impossible de lancer l'éditeur"
 
 msgid "Could not execute editor"
 msgstr "Impossible de lancer l'éditeur"
 


@@ -15987,14 +16019,18 @@ msgstr "Impossible de marquer comme interactif"
 msgid "Could not init rewritten commits"
 msgstr "Impossible d'initialiser les commits réécrits"
 
 msgid "Could not init rewritten commits"
 msgstr "Impossible d'initialiser les commits réécrits"
 

-#: git-rebase--interactive.sh:972
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Impossible de générer la liste à-faire"
+
+#: git-rebase--interactive.sh:973

 #, 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)"
 
 #, 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:977
+#: git-rebase--interactive.sh:978

 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"


@@ -16004,7 +16040,7 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 

-#: git-rebase--interactive.sh:984
+#: git-rebase--interactive.sh:985

 msgid "Note that empty commits are commented out"
 msgstr "Veuillez noter que les commits vides sont en commentaire"
 
 msgid "Note that empty commits are commented out"
 msgstr "Veuillez noter que les commits vides sont en commentaire"
 


@@ -17211,9 +17247,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
 #~ "son historique)"
 
 #~ "(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 "Error wrapping up %s."
 #~ msgstr "Erreur lors de l'emballage de %s."
 
 #~ msgid "Error wrapping up %s."
 #~ msgstr "Erreur lors de l'emballage de %s."