summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJean-Noël Avila <jn.avila@free.fr>2020-03-11 20:19:25 (GMT)
committerJean-Noël Avila <jn.avila@free.fr>2020-03-11 20:19:25 (GMT)
commitc9ef57cc3adfec22166e59ebde1bc4afb1af4bd8 (patch)
treebe03de50b8b44c92ef39108c173aa8aeb065d7da /po
parent051fae4d51be9bfe097b47d89e932901524e9c85 (diff)
downloadgit-c9ef57cc3adfec22166e59ebde1bc4afb1af4bd8.zip
git-c9ef57cc3adfec22166e59ebde1bc4afb1af4bd8.tar.gz
git-c9ef57cc3adfec22166e59ebde1bc4afb1af4bd8.tar.bz2
l10n: fr : v2.26.0 rnd 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Diffstat (limited to 'po')
-rw-r--r--po/fr.po661
1 files changed, 308 insertions, 353 deletions
diff --git a/po/fr.po b/po/fr.po
index b9250c5..314ff37 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -75,8 +75,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-06 14:25+0800\n"
-"PO-Revision-Date: 2020-03-08 23:25+0100\n"
+"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"PO-Revision-Date: 2020-03-11 21:03+0100\n"
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -281,8 +281,8 @@ msgstr "indexé"
msgid "unstaged"
msgstr "non-indexé"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
-#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
+#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
@@ -318,7 +318,9 @@ msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme indexée."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme indexée."
#: add-patch.c:40
msgid ""
@@ -353,7 +355,9 @@ msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme remisée."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme remisée."
#: add-patch.c:61
msgid ""
@@ -388,7 +392,9 @@ msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme desindexée."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme desindexée."
#: add-patch.c:84
msgid ""
@@ -423,7 +429,9 @@ msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme appliquée."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme appliquée."
#: add-patch.c:106
msgid ""
@@ -461,7 +469,9 @@ msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme éliminée."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme éliminée."
#: add-patch.c:128 add-patch.c:193
msgid ""
@@ -1380,7 +1390,7 @@ 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:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
@@ -1392,7 +1402,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é"
-#: apply.c:4973 builtin/am.c:2206
+#: apply.c:4973 builtin/am.c:2260
msgid "num"
msgstr "num"
@@ -1458,7 +1468,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"
-#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
msgid "action"
@@ -1506,7 +1516,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"
-#: apply.c:5032 builtin/am.c:2194
+#: apply.c:5032 builtin/am.c:2248
msgid "root"
msgstr "racine"
@@ -1533,7 +1543,7 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
+#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
@@ -2110,8 +2120,8 @@ msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
+#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -2240,7 +2250,7 @@ msgstr ""
msgid "could not find commit %s"
msgstr "impossible de trouver le commit %s"
-#: commit-graph.c:852 builtin/am.c:1287
+#: commit-graph.c:852 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
@@ -3269,7 +3279,7 @@ msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:199 parse-options.c:203
+#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s attend une valeur numérique"
@@ -4478,9 +4488,9 @@ msgstr "Impossible de créer '%s.lock' : %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
+#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:264
+#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -4671,33 +4681,33 @@ msgstr "renommage"
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
+#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Refus de perdre le fichier modifié %s"
-#: merge-recursive.c:1616
+#: merge-recursive.c:1587
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
-#: merge-recursive.c:1674
+#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1705
+#: merge-recursive.c:1676
#, 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:1710
+#: merge-recursive.c:1681
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1708
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4706,18 +4716,18 @@ msgstr ""
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1851
+#: merge-recursive.c:1793
#, 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:2114
+#: merge-recursive.c:2056
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4728,7 +4738,7 @@ msgstr ""
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:2146
+#: merge-recursive.c:2088
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4737,7 +4747,7 @@ msgstr ""
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-#: merge-recursive.c:2156
+#: merge-recursive.c:2098
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4746,7 +4756,7 @@ msgstr ""
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-#: merge-recursive.c:2248
+#: merge-recursive.c:2190
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4755,7 +4765,7 @@ msgstr ""
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:2493
+#: merge-recursive.c:2435
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4764,52 +4774,52 @@ msgstr ""
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
"renommé."
-#: merge-recursive.c:3019
+#: merge-recursive.c:2961
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:3022
+#: merge-recursive.c:2964
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3028
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3028
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:3098
+#: merge-recursive.c:3040
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:3102
+#: merge-recursive.c:3044
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:3125
+#: merge-recursive.c:3067
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3147 git-submodule.sh:1003
+#: merge-recursive.c:3089 git-submodule.sh:1003
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:3148
+#: merge-recursive.c:3090
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:3178
+#: merge-recursive.c:3120
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:3261
+#: merge-recursive.c:3203
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4818,7 +4828,7 @@ msgstr ""
"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
"en %s ; déplacé dans %s."
-#: merge-recursive.c:3264
+#: merge-recursive.c:3206
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4828,7 +4838,7 @@ msgstr ""
"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
"vers %s."
-#: merge-recursive.c:3268
+#: merge-recursive.c:3210
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4837,7 +4847,7 @@ msgstr ""
"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
"renommé en %s ; déplacé dans %s."
-#: merge-recursive.c:3271
+#: merge-recursive.c:3213
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4847,60 +4857,60 @@ msgstr ""
"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
"être déplacé vers %s."
-#: merge-recursive.c:3385
+#: merge-recursive.c:3327
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3408
+#: merge-recursive.c:3350
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3413
+#: merge-recursive.c:3355
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3362
#, 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:3429
+#: merge-recursive.c:3371
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3438
+#: merge-recursive.c:3380
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
-#: merge-recursive.c:3482
+#: merge-recursive.c:3424
msgid "Already up to date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:3491
+#: merge-recursive.c:3433
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:3595
+#: merge-recursive.c:3537
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3608
+#: merge-recursive.c:3550
#, 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:3658
+#: merge-recursive.c:3600
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3717
+#: merge-recursive.c:3659
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4910,12 +4920,12 @@ msgstr ""
"fusion :\n"
" %s"
-#: merge-recursive.c:3814
+#: merge-recursive.c:3756
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
@@ -5194,7 +5204,7 @@ msgstr "%s est incompatible avec %s"
msgid "%s : incompatible with something else"
msgstr "%s est incompatible avec toute autre option"
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
#, c-format
msgid "%s takes no value"
msgstr "%s n'accepte aucune valeur"
@@ -5204,41 +5214,41 @@ msgstr "%s n'accepte aucune valeur"
msgid "%s isn't available"
msgstr "%s n'est pas disponible"
-#: parse-options.c:219
+#: parse-options.c:217
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
-#: parse-options.c:388
+#: parse-options.c:386
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
-#: parse-options.c:422 parse-options.c:430
+#: parse-options.c:420 parse-options.c:428
#, c-format
msgid "did you mean `--%s` (with two dashes)?"
msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-#: parse-options.c:859
+#: parse-options.c:857
#, c-format
msgid "unknown option `%s'"
msgstr "option inconnue « %s »"
-#: parse-options.c:861
+#: parse-options.c:859
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:863
+#: parse-options.c:861
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "option non-ascii inconnue dans la chaîne : '%s'"
-#: parse-options.c:887
+#: parse-options.c:885
msgid "..."
msgstr "..."
-#: parse-options.c:906
+#: parse-options.c:904
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -5246,21 +5256,21 @@ msgstr "usage : %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:912
+#: parse-options.c:910
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:915
+#: parse-options.c:913
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:954
+#: parse-options.c:952
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:968
+#: parse-options.c:966
#, c-format
msgid "alias of --%s"
msgstr "alias pour --%s"
@@ -5591,7 +5601,7 @@ msgstr "entrées de préparation non ordonnées pour '%s'"
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
+#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
@@ -5872,7 +5882,7 @@ msgstr "id d'objet inattendu pendant l'écriture de '%s'"
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
+#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
#: builtin/rebase.c:1029
#, c-format
msgid "could not open '%s' for writing"
@@ -6669,7 +6679,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'"
msgid "could not delete '%s'"
msgstr "Impossible de supprimer '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
+#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
@@ -6726,7 +6736,7 @@ msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
+#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
#: builtin/rebase.c:593
#, c-format
msgid "could not read '%s'"
@@ -6777,8 +6787,8 @@ msgstr "aucune clé présente dans '%.*s'"
msgid "unable to dequote value of '%s'"
msgstr "Impossible de décoter la valeur de '%s'"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
@@ -6937,7 +6947,7 @@ msgstr "impossible d'analyser le commit HEAD"
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
+#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
@@ -6946,7 +6956,7 @@ msgstr "git write-tree a échoué à écrire un arbre"
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
+#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
#: builtin/merge.c:911
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
@@ -8040,7 +8050,9 @@ msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
#: sha1-name.c:1771
msgid "relative path syntax can't be used outside working tree"
-msgstr "la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de travail"
+msgstr ""
+"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
+"travail"
#: sha1-name.c:1909
#, c-format
@@ -8145,7 +8157,9 @@ msgstr "mauvais argument --ignore-submodules : %s"
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
-msgstr "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un sous-module du même nom. Ignoré."
+msgstr ""
+"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
+"sous-module du même nom. Ignoré."
#: submodule.c:910
#, c-format
@@ -8157,7 +8171,9 @@ msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
-msgstr "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n 1' dans le sous-module %s"
+msgstr ""
+"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
+"1' dans le sous-module %s"
#: submodule.c:1118
#, c-format
@@ -8940,7 +8956,11 @@ msgstr "numéro de port invalide"
msgid "invalid '..' path segment"
msgstr "segment de chemin '..' invalide"
-#: worktree.c:259 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Récupération des objets"
+
+#: worktree.c:259 builtin/am.c:2099
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
@@ -9584,7 +9604,7 @@ msgstr ""
#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "simuler l'action"
@@ -9725,12 +9745,12 @@ 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:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327
+#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333
+#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
@@ -9749,112 +9769,112 @@ msgstr ""
"Éliminez ce message en lançant\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:347
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "impossible d'analyser l'auteur du script"
-#: builtin/am.c:431
+#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:473
+#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:511
+#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:537
+#: builtin/am.c:542
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:725
+#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:790
+#: builtin/am.c:795
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:838
+#: builtin/am.c:843
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:850
+#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:943
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:948 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:409
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:953
+#: builtin/am.c:958
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1084
+#: builtin/am.c:1089
#, 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:1085
+#: builtin/am.c:1090
#, 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:1086
+#: builtin/am.c:1091
#, 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:1169
+#: builtin/am.c:1174
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr ""
"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
"être perdus."
-#: builtin/am.c:1197
+#: builtin/am.c:1202
msgid "Patch is empty."
msgstr "Le patch actuel est vide."
-#: builtin/am.c:1262
+#: builtin/am.c:1267
#, c-format
msgid "missing author line in commit %s"
msgstr "ligne d'auteur manquante dans le commit %s"
-#: builtin/am.c:1265
+#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1484
+#: builtin/am.c:1489
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:1486
+#: builtin/am.c:1491
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:1505
+#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -9862,24 +9882,24 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1511
+#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1537
+#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1569
+#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1621 builtin/am.c:1625
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1638
+#: builtin/am.c:1643
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -9887,40 +9907,39 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1648
+#: builtin/am.c:1653
#, c-format
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:1695 builtin/commit.c:398
+#: builtin/am.c:1700 builtin/commit.c:398
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1699
+#: builtin/am.c:1704
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1744 builtin/am.c:1812
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1756
+#: builtin/am.c:1761
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1762
+#: builtin/am.c:1767
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr ""
-"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"
+#: builtin/am.c:1771
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
-#: builtin/am.c:1810
+#: builtin/am.c:1815
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9931,7 +9950,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1817
+#: builtin/am.c:1822
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9944,17 +9963,17 @@ msgstr ""
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
+#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
#: builtin/reset.c:354
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:1976
+#: builtin/am.c:1981
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2020
+#: builtin/am.c:2025
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9962,76 +9981,86 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2117
+#: builtin/am.c:2132
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2153
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valeur invalide pour --show-current-patch : %s"
+
+#: builtin/am.c:2176
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+
+#: builtin/am.c:2207
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2154
+#: builtin/am.c:2208
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2160
+#: builtin/am.c:2214
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2162
+#: builtin/am.c:2216
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2164
+#: builtin/am.c:2218
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:811
+#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
+#: builtin/repack.c:304 builtin/stash.c:812
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2167
+#: builtin/am.c:2221
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:2170
+#: builtin/am.c:2224
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2172
+#: builtin/am.c:2226
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2174
+#: builtin/am.c:2228
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2176
+#: builtin/am.c:2230
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2178
+#: builtin/am.c:2232
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:2181
+#: builtin/am.c:2235
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:2184
+#: builtin/am.c:2238
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2240 builtin/am.c:2243 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:2267
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
+#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
@@ -10040,67 +10069,67 @@ msgstr "le passer jusqu'à git-apply"
msgid "n"
msgstr "n"
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
+#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2210
+#: builtin/am.c:2264
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2216
+#: builtin/am.c:2270
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:2218
+#: builtin/am.c:2272
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2221
+#: builtin/am.c:2275
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2224
+#: builtin/am.c:2278
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2227
+#: builtin/am.c:2281
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2230
+#: builtin/am.c:2284
msgid "abort the patching operation but keep HEAD where it is."
msgstr "abandonne l'opération de patch mais garde HEAD où il est."
-#: builtin/am.c:2233
-msgid "show the patch being applied."
-msgstr "afficher le patch en cours d'application."
+#: builtin/am.c:2288
+msgid "show the patch being applied"
+msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2237
+#: builtin/am.c:2293
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2239
+#: builtin/am.c:2295
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512
+#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2245
+#: builtin/am.c:2301
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2263
+#: builtin/am.c:2319
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."
@@ -10108,17 +10137,17 @@ msgstr ""
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2270
+#: builtin/am.c:2326
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2285
+#: builtin/am.c:2341
#, 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:2309
+#: builtin/am.c:2365
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10127,13 +10156,13 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2315
+#: builtin/am.c:2371
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 "
"reprise."
-#: builtin/am.c:2325
+#: builtin/am.c:2381
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
@@ -11797,7 +11826,7 @@ msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file est incompatible avec --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324
+#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file est incompatible avec --patch"
@@ -12487,7 +12516,7 @@ msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
#: builtin/tag.c:412
msgid "message"
msgstr "message"
@@ -13292,7 +13321,9 @@ msgstr ""
#: builtin/config.c:159
msgid "show scope of config (worktree, local, global, system, command)"
-msgstr "afficher la portée de configuration (arbre de travail, local, global, système, commande)"
+msgstr ""
+"afficher la portée de configuration (arbre de travail, local, global, "
+"système, commande)"
#: builtin/config.c:160 builtin/env--helper.c:40
msgid "value"
@@ -17309,7 +17340,7 @@ msgstr "références-notes"
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1610
+#: builtin/notes.c:1034 builtin/stash.c:1643
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
@@ -17679,7 +17710,9 @@ msgstr "Énumération des objets"
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
-msgstr "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), réutilisés du pack %<PRIu32>"
+msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "
+"réutilisés du pack %<PRIu32>"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
@@ -18607,7 +18640,9 @@ msgstr ""
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
-msgstr "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), \"keep\" (garder) et \"ask\" (demander)."
+msgstr ""
+"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
+"\"keep\" (garder) et \"ask\" (demander)."
#: builtin/rebase.c:1401
#, c-format
@@ -18725,10 +18760,6 @@ msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
-#: builtin/rebase.c:1546
-msgid "{drop,keep,ask}"
-msgstr "{drop,keep,ask}"
-
#: builtin/rebase.c:1547
msgid "how to handle commits that become empty"
msgstr "comment gérer les commits qui deviennent vides"
@@ -18868,7 +18899,8 @@ msgstr "--strategy requiert --merge ou --interactive"
#: builtin/rebase.c:1899
msgid "cannot combine apply options with merge options"
-msgstr "impossible de combiner les options d'application avec les options de fusion"
+msgstr ""
+"impossible de combiner les options d'application avec les options de fusion"
#: builtin/rebase.c:1912
#, c-format
@@ -20133,8 +20165,8 @@ msgstr "HEAD est maintenant à %s"
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:294 builtin/stash.c:519 builtin/stash.c:594
-#: builtin/stash.c:618
+#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
@@ -20401,38 +20433,42 @@ 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:242
+#: builtin/rm.c:243
msgid "do not list removed files"
msgstr "ne pas afficher les fichiers supprimés"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "only remove from the index"
msgstr "supprimer seulement de l'index"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr "outrepasser la vérification des fichiers à jour"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr "autoriser la suppression récursive"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
msgstr "sortir avec un état zéro même si rien ne correspondait"
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
+
+#: builtin/rm.c:305
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/rm.c:307
+#: builtin/rm.c:323
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:346
+#: builtin/rm.c:362
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
@@ -20703,7 +20739,8 @@ msgstr ""
#: builtin/sparse-checkout.c:225
msgid "failed to create directory for sparse-checkout file"
-msgstr "échec de la création du répertoire pour le fichier d'extraction partielle"
+msgstr ""
+"échec de la création du répertoire pour le fichier d'extraction partielle"
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
@@ -20760,15 +20797,15 @@ msgstr "désactiver d'extraction partielle"
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/stash.c:22 builtin/stash.c:38
msgid "git stash list [<options>]"
msgstr "git stash list [<options>]"
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<options>] [<remise>]"
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<remise>]"
@@ -20776,25 +20813,27 @@ msgstr "git stash drop [-q|--quiet] [<remise>]"
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <nom-de-branche> [<remise>]"
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
msgid "git stash clear"
msgstr "git stash clear"
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
" [--] [<pathspec>...]]"
msgstr ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
" [--] [<spécificateur-de-chemin>...]]"
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
@@ -20802,188 +20841,198 @@ msgstr ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
-#: builtin/stash.c:52
+#: builtin/stash.c:53
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
-#: builtin/stash.c:57
+#: builtin/stash.c:58
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
-#: builtin/stash.c:72
+#: builtin/stash.c:73
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+" [--] [<spécificateur-de-chemin>...]]"
+
+#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' n'est pas une validation de type remisage"
-#: builtin/stash.c:147
+#: builtin/stash.c:148
#, c-format
msgid "Too many revisions specified:%s"
msgstr "Trop de révisions spécifiées : %s"
-#: builtin/stash.c:161 git-legacy-stash.sh:549
+#: builtin/stash.c:162 git-legacy-stash.sh:549
msgid "No stash entries found."
msgstr "Aucune entrée de remisage trouvée."
-#: builtin/stash.c:175
+#: builtin/stash.c:176
#, c-format
msgid "%s is not a valid reference"
msgstr "%s n'est pas une référence valide"
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225 git-legacy-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: builtin/stash.c:403
+#: builtin/stash.c:404
msgid "cannot apply a stash in the middle of a merge"
msgstr "impossible d'appliquer un remisage en cours de fusion"
-#: builtin/stash.c:414
+#: builtin/stash.c:415
#, c-format
msgid "could not generate diff %s^!."
msgstr "impossible de générer %s^!."
-#: builtin/stash.c:421
+#: builtin/stash.c:422
msgid "conflicts in index.Try without --index."
msgstr "conflits dans l'index. Essayez sans --index."
-#: builtin/stash.c:427
+#: builtin/stash.c:428
msgid "could not save index tree"
msgstr "impossible de sauvegarder l'arbre d'index"
-#: builtin/stash.c:436
+#: builtin/stash.c:437
msgid "could not restore untracked files from stash"
msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-#: builtin/stash.c:450
+#: builtin/stash.c:451
#, c-format
msgid "Merging %s with %s"
msgstr "Fusion de %s avec %s"
-#: builtin/stash.c:460 git-legacy-stash.sh:681
+#: builtin/stash.c:461 git-legacy-stash.sh:681
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: builtin/stash.c:521 builtin/stash.c:620
+#: builtin/stash.c:522 builtin/stash.c:621
msgid "attempt to recreate the index"
msgstr "tentative de recréer l'index"
-#: builtin/stash.c:554
+#: builtin/stash.c:555
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s supprimé (%s)"
-#: builtin/stash.c:557
+#: builtin/stash.c:558
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s : Impossible de supprimer l'élément de stash"
-#: builtin/stash.c:582
+#: builtin/stash.c:583
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' n'est pas une référence de remisage"
-#: builtin/stash.c:632 git-legacy-stash.sh:695
+#: builtin/stash.c:633 git-legacy-stash.sh:695
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."
-#: builtin/stash.c:655 git-legacy-stash.sh:713
+#: builtin/stash.c:656 git-legacy-stash.sh:713
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:795 builtin/stash.c:832
+#: builtin/stash.c:796 builtin/stash.c:833
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509
+#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:823
+#: builtin/stash.c:824
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1048 git-legacy-stash.sh:218
+#: builtin/stash.c:1049 git-legacy-stash.sh:218
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1148 git-legacy-stash.sh:150
+#: builtin/stash.c:1149 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1175 git-legacy-stash.sh:165
+#: builtin/stash.c:1176 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1184 git-legacy-stash.sh:180
+#: builtin/stash.c:1185 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201
+#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
#: git-legacy-stash.sh:214
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1232 git-legacy-stash.sh:234
+#: builtin/stash.c:1233 git-legacy-stash.sh:234
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1281 git-legacy-stash.sh:338
+#: builtin/stash.c:1282 git-legacy-stash.sh:338
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"
-#: builtin/stash.c:1297
+#: builtin/stash.c:1298
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1312 git-legacy-stash.sh:346
+#: builtin/stash.c:1313 git-legacy-stash.sh:346
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1319 git-legacy-stash.sh:351
+#: builtin/stash.c:1320 git-legacy-stash.sh:351
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1334 git-legacy-stash.sh:355
+#: builtin/stash.c:1335 git-legacy-stash.sh:355
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1339
+#: builtin/stash.c:1340
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
-#: builtin/stash.c:1429 git-legacy-stash.sh:385
+#: builtin/stash.c:1430 git-legacy-stash.sh:385
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1472 builtin/stash.c:1537
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1469 builtin/stash.c:1505
+#: builtin/stash.c:1474 builtin/stash.c:1539
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1471 builtin/stash.c:1507
+#: builtin/stash.c:1476 builtin/stash.c:1541
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1567
+#: builtin/stash.c:1600
#, c-format
msgid "could not exec %s"
msgstr "impossible d'exécuter %s"
@@ -21300,7 +21349,10 @@ msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
"<url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> --path <chemin>"
+msgstr ""
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
+"--path <chemin>"
#: builtin/submodule--helper.c:1449
#, c-format
@@ -22697,41 +22749,41 @@ msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
msgid "dumb http transport does not support shallow capabilities"
msgstr "le protocole http idiot ne supporte la capacité superficielle"
-#: remote-curl.c:1037
+#: remote-curl.c:1038
msgid "fetch failed."
msgstr "échec du récupération."
-#: remote-curl.c:1085
+#: remote-curl.c:1086
msgid "cannot fetch by sha1 over smart http"
msgstr "impossible de récupérer par sha1 sur http intelligent"
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1130 remote-curl.c:1136
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
-#: remote-curl.c:1147 remote-curl.c:1262
+#: remote-curl.c:1148 remote-curl.c:1263
#, c-format
msgid "http transport does not support %s"
msgstr "le transport http ne supporte pas %s"
-#: remote-curl.c:1183
+#: remote-curl.c:1184
msgid "git-http-push failed"
msgstr "échec de git-http-push"
-#: remote-curl.c:1368
+#: remote-curl.c:1369
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
-#: remote-curl.c:1400
+#: remote-curl.c:1401
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
-#: remote-curl.c:1407
+#: remote-curl.c:1408
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl : récupération tentée sans dépôt local"
-#: remote-curl.c:1447
+#: remote-curl.c:1448
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
@@ -24962,100 +25014,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
-
-#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
-#~ msgstr "Indexer le changement de mode [y,n,a,q,d%s,?] ? "
-
-#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
-#~ msgstr "Indexer la suppression [y,n,a,q,d%s,?] ? "
-
-#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-#~ msgstr "Indexer cette section [y,n,a,q,d%s,?] ? "
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for staging.\n"
-#~ msgstr ""
-#~ "Si le patch s'applique proprement, la section éditée sera\n"
-#~ "immédiatement marquée comme indexée.\n"
-
-#~ 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 and all the remaining hunks\n"
-#~ "d - do not stage this hunk nor any of the remaining hunks\n"
-#~ 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\n"
-#~ "d - ne pas indexer cette section ni les suivantes\n"
-
-#~ msgid "could not copy '%s' to '%s'."
-#~ msgstr "impossible de copier '%s' vers '%s'."
-
-#~ msgid "malformed ident line"
-#~ msgstr "ligne d'identification malformée"
-
-#~ msgid "corrupted author without date information"
-#~ msgstr "ligne author corrompue sans information de date"
-
-#~ msgid "could not parse '%.*s'"
-#~ msgstr "impossible d'analyser '%.*s'"
-
-#~ msgid "could not checkout %s"
-#~ msgstr "extraction de %s impossible"
-
-#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr ""
-#~ "le nom du fichier dans l'entrée de l'arbre contient une barre oblique "
-#~ "inversée : '%s'"
-
-#~ msgid "Use -f if you really want to add them.\n"
-#~ msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
-
-#~ msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-
-#~ msgid "packfile is invalid: %s"
-#~ msgstr "le fichier packet est invalide : %s"
-
-#~ msgid "unable to open packfile for reuse: %s"
-#~ msgstr "ouverture du fichier paquet pour réutilisation impossible : %s"
-
-#~ msgid "unable to seek in reused packfile"
-#~ msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé"
-
-#~ msgid "unable to read from reused packfile"
-#~ msgstr "lecture du fichier de paquet réutilisé impossible"
-
-#~ msgid "no HEAD?"
-#~ msgstr "pas de HEAD ?"
-
-#~ msgid "make committer date match author date"
-#~ msgstr "aligner la date de validateur sur la date d'auteur"
-
-#~ msgid "ignore author date and use current date"
-#~ msgstr "ignorer la date d'auteur et utiliser la date actuelle"
-
-#~ msgid "synonym of --reset-author-date"
-#~ msgstr "synonyme pour --reset-author-date"
-
-#~ msgid "ignore changes in whitespace"
-#~ msgstr "ignorer des modifications d'espace"
-
-#~ msgid "preserve empty commits during rebase"
-#~ msgstr "préserver les validations vides pendant le rebasage"
-
-#~ msgid "cannot combine --use-bitmap-index with object filtering"
-#~ msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
-
-#~ msgid ""
-#~ "The following path is ignored by one of your .gitignore files:\n"
-#~ "$sm_path\n"
-#~ "Use -f if you really want to add it."
-#~ msgstr ""
-#~ "Le chemin suivant est ignoré par un de vos fichiers .gitignore :\n"
-#~ "$sm_path\n"
-#~ "Utilisez -f si vous voulez vraiment l'ajouter."