summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJean-Noel Avila <jn.avila@free.fr>2017-05-05 11:55:14 +0200
committerJean-Noel Avila <jn.avila@free.fr>2017-05-06 12:12:54 +0200
commitf5be008399c2adfa37fbe390a086a5479e9b1630 (patch)
tree934baf455e6eafb08b03035553922370592a6178 /po
parent28e1aaa48544dc2aa89997448b1262485dc7f1bf (diff)
downloadgit-f5be008399c2adfa37fbe390a086a5479e9b1630.tar.gz
l10n: fr.po v2.13 rnd 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Diffstat (limited to 'po')
-rw-r--r--po/fr.po926
1 files changed, 478 insertions, 448 deletions
diff --git a/po/fr.po b/po/fr.po
index fb0e0de441..0dd068de03 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-04-23 09:54+0800\n"
-"PO-Revision-Date: 2017-05-02 22:20+0200\n"
+"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"PO-Revision-Date: 2017-05-05 12:02+0200\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -671,7 +671,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"
-#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
+#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
@@ -688,7 +688,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:4917 builtin/am.c:2286
+#: apply.c:4917 builtin/am.c:2285
msgid "num"
msgstr "num"
@@ -742,7 +742,7 @@ msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
@@ -750,7 +750,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:4949 builtin/am.c:2265
+#: apply.c:4949 builtin/am.c:2264
msgid "action"
msgstr "action"
@@ -796,7 +796,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:4973 builtin/am.c:2274
+#: apply.c:4973 builtin/am.c:2273
msgid "root"
msgstr "racine"
@@ -844,9 +844,9 @@ msgstr "préfixe"
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
+#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
+#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
@@ -932,27 +932,27 @@ msgstr ""
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:443
+#: bisect.c:444
#, c-format
msgid "Could not open file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: bisect.c:448
+#: bisect.c:449
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:656
+#: bisect.c:657
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:709
+#: bisect.c:710
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:733
+#: bisect.c:734
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -961,7 +961,7 @@ msgstr ""
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:738
+#: bisect.c:739
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -970,7 +970,7 @@ msgstr ""
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:743
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -979,7 +979,7 @@ msgstr ""
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:751
+#: bisect.c:752
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -990,7 +990,7 @@ msgstr ""
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
-#: bisect.c:764
+#: bisect.c:765
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1002,36 +1002,36 @@ msgstr ""
"et %s.\n"
"On continue tout de même."
-#: bisect.c:799
+#: bisect.c:800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:850
+#: bisect.c:851
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:918
+#: bisect.c:919
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:948
+#: bisect.c:949
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:968
+#: bisect.c:969
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:976
+#: bisect.c:977
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1040,7 +1040,7 @@ msgstr ""
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
-#: bisect.c:995
+#: bisect.c:996
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1049,7 +1049,7 @@ msgstr[1] "(à peu près %d étapes)"
#. TRANSLATORS: the last %s will be replaced with
#. "(roughly %d steps)" translation
-#: bisect.c:999
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1211,7 +1211,7 @@ 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)"
-#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
+#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -1220,7 +1220,7 @@ msgstr "impossible d'ouvrir '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
#: builtin/merge.c:359 builtin/shortlog.c:176
@@ -1285,8 +1285,8 @@ msgstr "l'index de groupe a disparu"
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:1489 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -1314,163 +1314,169 @@ msgstr "plus de mémoire"
#: config.c:191
msgid "relative config include conditionals must come from files"
-msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers"
+msgstr ""
+"les conditions d'inclusion de configuration relative doivent venir de "
+"fichiers"
-#: config.c:701
+#: config.c:711
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ligne %d de config incorrecte dans le blob %s"
-#: config.c:705
+#: config.c:715
#, c-format
msgid "bad config line %d in file %s"
msgstr "ligne %d de config incorrecte dans le fichier %s"
-#: config.c:709
+#: config.c:719
#, c-format
msgid "bad config line %d in standard input"
msgstr "ligne %d de config incorrecte dans l'entrée standard"
-#: config.c:713
+#: config.c:723
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
-#: config.c:717
+#: config.c:727
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
-#: config.c:721
+#: config.c:731
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:840
+#: config.c:859
msgid "out of range"
msgstr "hors plage"
-#: config.c:840
+#: config.c:859
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:846
+#: config.c:865
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
-#: config.c:851
+#: config.c:870
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
"%s : %s"
-#: config.c:854
+#: config.c:873
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
"%s : %s"
-#: config.c:857
+#: config.c:876
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
"standard : %s"
-#: config.c:860
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
"sous-module %s : %s"
-#: config.c:863
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
"commande %s : %s"
-#: config.c:866
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
-#: config.c:953
+#: config.c:980
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1048 config.c:1059
+#: config.c:1075 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1176
+#: config.c:1203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1332
+#: config.c:1359
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1522
+#: config.c:1557
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1572
+#: config.c:1611
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:1931
+#: config.c:1970
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:1952
+#: config.c:1991
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par défaut"
+msgstr ""
+"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
+"défaut"
-#: config.c:1978
+#: config.c:2017
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et 100"
+msgstr ""
+"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
+"100"
-#: config.c:1989
+#: config.c:2028
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:1991
+#: config.c:2030
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2050
+#: config.c:2089
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2384 config.c:2609
+#: config.c:2423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2502
+#: config.c:2541
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2504 builtin/remote.c:774
+#: config.c:2543 builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
@@ -1723,171 +1729,176 @@ msgstr "git fetch-pack : list courte attendue"
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: fetch-pack.c:279
+#: fetch-pack.c:280 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "erreur distante : %s"
+
+#: fetch-pack.c:281
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:331
+#: fetch-pack.c:333
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:417
+#: fetch-pack.c:419
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:423
+#: fetch-pack.c:425
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:425
+#: fetch-pack.c:427
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:428
+#: fetch-pack.c:430
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:430
+#: fetch-pack.c:432
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:433
+#: fetch-pack.c:435
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:472
+#: fetch-pack.c:474
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:486
+#: fetch-pack.c:488
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:519
+#: fetch-pack.c:521
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:529 progress.c:235
+#: fetch-pack.c:531 progress.c:235
msgid "done"
msgstr "fait"
-#: fetch-pack.c:541
+#: fetch-pack.c:543
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:587
+#: fetch-pack.c:589
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:735
+#: fetch-pack.c:737
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:773
+#: fetch-pack.c:775
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:781
+#: fetch-pack.c:783
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:837
+#: fetch-pack.c:839
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:853
+#: fetch-pack.c:855
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:855
+#: fetch-pack.c:857
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:882
+#: fetch-pack.c:884
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:886
+#: fetch-pack.c:888
msgid "Server supports multi_ack_detailed"
msgstr "Le serveur supporte multi_ack_detailed"
-#: fetch-pack.c:889
+#: fetch-pack.c:891
msgid "Server supports no-done"
msgstr "Le serveur support no-done"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "Server supports multi_ack"
msgstr "Le serveur supporte multi_ack"
-#: fetch-pack.c:899
+#: fetch-pack.c:901
msgid "Server supports side-band-64k"
msgstr "Le serveur supporte side-band-64k"
-#: fetch-pack.c:903
+#: fetch-pack.c:905
msgid "Server supports side-band"
msgstr "Le serveru supporte side-band"
-#: fetch-pack.c:907
+#: fetch-pack.c:909
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: fetch-pack.c:911
+#: fetch-pack.c:913
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: fetch-pack.c:921
+#: fetch-pack.c:923
msgid "Server supports ofs-delta"
msgstr "Le serveur support ofs-delta"
-#: fetch-pack.c:928
+#: fetch-pack.c:930
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:934
+#: fetch-pack.c:936
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:938
+#: fetch-pack.c:940
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:940
+#: fetch-pack.c:942
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:963
+#: fetch-pack.c:965
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1125
+#: fetch-pack.c:1127
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1147
+#: fetch-pack.c:1149
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1150
+#: fetch-pack.c:1152
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
@@ -2077,7 +2088,7 @@ msgstr "Impossible de créer '%s.lock' : %s"
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
+#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
#: builtin/checkout.c:607 builtin/clone.c:749
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -2162,7 +2173,9 @@ msgstr ""
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre."
#: merge-recursive.c:1104
#, c-format
@@ -2178,7 +2191,9 @@ msgstr ""
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre dans le fichier %s."
#: merge-recursive.c:1143
msgid "rename"
@@ -2408,14 +2423,16 @@ msgstr "-NUM"
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:805
+#: path.c:810
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
#: pathspec.c:125
msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une valeur d'attribut"
+msgstr ""
+"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
+"valeur d'attribut"
#: pathspec.c:143
msgid "Only one 'attr:' specification is allowed."
@@ -2508,7 +2525,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2517,7 +2534,7 @@ msgstr ""
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1317
+#: read-cache.c:1452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2526,42 +2543,41 @@ msgstr ""
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:2232
-#, c-format
-msgid "could not stat '%s"
-msgstr "stat impossible de '%s'"
-
-#: read-cache.c:2232
+#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
-#: read-cache.c:2245
+#: read-cache.c:2388
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:2257
+#: read-cache.c:2400
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: refs.c:619 builtin/merge.c:844
+#: refs.c:620 builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs/files-backend.c:2531
+#: refs.c:1667
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs/files-backend.c:1631
#, c-format
msgid "could not delete reference %s: %s"
msgstr "Impossible de supprimer la référence %s : %s"
-#: refs/files-backend.c:2534
+#: refs/files-backend.c:1634
#, c-format
msgid "could not delete references: %s"
msgstr "impossible de supprimer les références : %s"
-#: refs/files-backend.c:2543
+#: refs/files-backend.c:1643
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
@@ -3010,12 +3026,12 @@ msgstr ""
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:294 sequencer.c:1675
+#: sequencer.c:294 sequencer.c:1682
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
+#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
@@ -3025,12 +3041,12 @@ msgstr "impossible d'écrire dans '%s'"
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682
+#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "échec lors de la finalisation de '%s'."
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
+#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
@@ -3206,7 +3222,7 @@ msgstr "impossible d'obtenir un message de validation pour %s"
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1071 sequencer.c:1820
+#: sequencer.c:1071 sequencer.c:1827
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
@@ -3235,124 +3251,124 @@ msgstr "git %s : échec à la lecture de l'index"
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:1302
+#: sequencer.c:1303
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:1310
+#: sequencer.c:1311
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:1342
+#: sequencer.c:1344
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:1349
+#: sequencer.c:1356
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:1351
+#: sequencer.c:1358
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:1356
+#: sequencer.c:1363
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:1367
+#: sequencer.c:1374
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:1369
+#: sequencer.c:1376
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:1432
+#: sequencer.c:1439
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: sequencer.c:1435
+#: sequencer.c:1442
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:1492
+#: sequencer.c:1499
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:1530
+#: sequencer.c:1537
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:1531
+#: sequencer.c:1538
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:1534
+#: sequencer.c:1541
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:1548
+#: sequencer.c:1555
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:1604 sequencer.c:2159
+#: sequencer.c:1611 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:1606
+#: sequencer.c:1613
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:1608 sequencer.c:1642
+#: sequencer.c:1615 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:1628 builtin/grep.c:910
+#: sequencer.c:1635 builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:1630
+#: sequencer.c:1637
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:1631
+#: sequencer.c:1638
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:1637
+#: sequencer.c:1644
#, 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:1648
+#: sequencer.c:1655
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:1785 sequencer.c:2058
+#: sequencer.c:1792 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1825 builtin/difftool.c:616
+#: sequencer.c:1832 builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:1841
+#: sequencer.c:1848
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:1846
+#: sequencer.c:1853
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3367,11 +3383,11 @@ msgstr ""
"git rebase --continue\n"
"\n"
-#: sequencer.c:1852
+#: sequencer.c:1859
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:1858
+#: sequencer.c:1865
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3388,17 +3404,17 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:1913 git-rebase.sh:168
+#: sequencer.c:1920 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: sequencer.c:1925
+#: sequencer.c:1932
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:1927 git-rebase.sh:172
+#: sequencer.c:1934 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3409,57 +3425,57 @@ msgstr ""
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:2009
+#: sequencer.c:2016
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:2036
+#: sequencer.c:2058
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:2066
+#: sequencer.c:2088
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:2070
+#: sequencer.c:2092
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:2077
+#: sequencer.c:2099
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2084
+#: sequencer.c:2106
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:2168
+#: sequencer.c:2190
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:2173
+#: sequencer.c:2195
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:2182
+#: sequencer.c:2204
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:2184
+#: sequencer.c:2206
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:2186
+#: sequencer.c:2208
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:2189
+#: sequencer.c:2211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3469,21 +3485,21 @@ msgstr ""
"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:2199
+#: sequencer.c:2221
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:2279
+#: sequencer.c:2301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:2283
+#: sequencer.c:2305
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:2316
+#: sequencer.c:2338
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
@@ -3693,7 +3709,7 @@ msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1679
+#: submodule.c:1678
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3701,18 +3717,18 @@ msgstr ""
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:1691 submodule.c:1747
+#: submodule.c:1690 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:1695 builtin/submodule--helper.c:678
+#: submodule.c:1694 builtin/submodule--helper.c:678
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: submodule.c:1698
+#: submodule.c:1697
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3723,20 +3739,20 @@ msgstr ""
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:1782
+#: submodule.c:1781
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1826
+#: submodule.c:1825
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:1846
+#: submodule.c:1845
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
-#: submodule.c:1865
+#: submodule.c:1864
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -4110,7 +4126,9 @@ msgstr "Abandon\n"
#: unpack-trees.c:272
#, c-format
msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "stratégie de mise à jour de sous-module non supportée pour le sous-module '%s'"
+msgstr ""
+"stratégie de mise à jour de sous-module non supportée pour le sous-module "
+"'%s'"
#: unpack-trees.c:340
msgid "Checking out files"
@@ -4160,8 +4178,8 @@ msgstr "impossible d'ouvrir '%s' en lecture/écriture"
msgid "could not open '%s' for writing"
msgstr "impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
+#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
@@ -4833,110 +4851,110 @@ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/am.c:414
+#: builtin/am.c:412
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:989 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1127 builtin/commit.c:376
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1176
+#: builtin/am.c:1178
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
-#: builtin/am.c:1177
+#: builtin/am.c:1179
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
-#: builtin/am.c:1178
+#: builtin/am.c:1180
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
"abort\"."
-#: builtin/am.c:1316
+#: builtin/am.c:1315
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1390 builtin/log.c:1557
+#: builtin/am.c:1386 builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/am.c:1417
+#: builtin/am.c:1413
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1606
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: builtin/am.c:1612
+#: builtin/am.c:1608
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
-#: builtin/am.c:1631
+#: builtin/am.c:1627
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4944,38 +4962,38 @@ msgstr ""
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1637
+#: builtin/am.c:1633
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1662
+#: builtin/am.c:1658
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1686 builtin/merge.c:631
+#: builtin/am.c:1682 builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1693
+#: builtin/am.c:1689
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1735 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1759
+#: builtin/am.c:1755
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1764
+#: builtin/am.c:1760
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -4983,35 +5001,35 @@ msgstr "Le corps de la validation est :"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1770
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1824
+#: builtin/am.c:1820
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1860 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1876
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1885
+#: builtin/am.c:1884
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1890
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1936
+#: builtin/am.c:1935
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5022,7 +5040,7 @@ msgstr ""
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1943
+#: builtin/am.c:1942
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
@@ -5030,17 +5048,17 @@ msgstr ""
"Vous avez toujours des chemins non fusionnés dans votre index\n"
"Auriez-vous oublié de faire 'git add' ?"
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
+#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
#: builtin/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2103
+#: builtin/am.c:2102
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2137
+#: builtin/am.c:2136
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5048,76 +5066,76 @@ msgstr ""
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2232
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2239
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2242
+#: builtin/am.c:2241
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2247
+#: builtin/am.c:2246
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2250
+#: builtin/am.c:2249
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2252
+#: builtin/am.c:2251
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2253
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2255
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2257
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2261
+#: builtin/am.c:2260
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:2292
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
@@ -5125,58 +5143,58 @@ msgstr "le passer jusqu'à git-apply"
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2289
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2298
+#: builtin/am.c:2297
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2303
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2307
+#: builtin/am.c:2306
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2311
+#: builtin/am.c:2310
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2313
+#: builtin/am.c:2312
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2316
+#: builtin/am.c:2315
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2333
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."
@@ -5184,17 +5202,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:2341
+#: builtin/am.c:2340
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2356
+#: builtin/am.c:2355
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2380
+#: builtin/am.c:2379
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5203,7 +5221,7 @@ msgstr ""
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2386
+#: builtin/am.c:2385
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 "
@@ -5235,11 +5253,6 @@ msgstr "git archive : ACK/NACK attendu, EOF reçu"
msgid "git archive: NACK %s"
msgstr "git archive : NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "erreur distante : %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive : erreur de protocole"
@@ -5934,7 +5947,7 @@ msgid "terminate input and output records by a NUL character"
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -6028,7 +6041,7 @@ msgstr "écrire le contenu dans des fichiers temporaires"
#: builtin/checkout-index.c:174 builtin/column.c:30
#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:472
+#: builtin/worktree.c:477
msgid "string"
msgstr "chaîne"
@@ -6248,8 +6261,8 @@ msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
-#: builtin/worktree.c:327
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
+#: builtin/worktree.c:331
msgid "branch"
msgstr "branche"
@@ -6265,7 +6278,7 @@ msgstr "créer/réinitialiser et extraire une branche"
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1164 builtin/worktree.c:329
+#: builtin/checkout.c:1164 builtin/worktree.c:333
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
@@ -6516,7 +6529,7 @@ msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
+#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "motif"
@@ -6774,7 +6787,7 @@ msgstr "impossible de remballer pour nettoyer"
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:884 builtin/receive-pack.c:1901
+#: builtin/clone.c:884 builtin/receive-pack.c:1900
msgid "Too many arguments."
msgstr "Trop d'arguments."
@@ -6813,7 +6826,7 @@ msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: builtin/worktree.c:221 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
@@ -7275,7 +7288,7 @@ msgid "version"
msgstr "version"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:443
+#: builtin/worktree.c:448
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
@@ -7358,7 +7371,7 @@ msgstr "auteur"
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1588 builtin/gc.c:353
+#: builtin/commit.c:1588 builtin/gc.c:357
msgid "date"
msgstr "date"
@@ -7522,142 +7535,142 @@ msgstr ""
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "Action"
msgstr "Action"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "Type"
msgstr "Type"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:83
+#: builtin/config.c:84
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:84
+#: builtin/config.c:85
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:85
+#: builtin/config.c:86
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:327
+#: builtin/config.c:328
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:471
+#: builtin/config.c:472
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7672,12 +7685,12 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:615
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:623
+#: builtin/config.c:627
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7842,7 +7855,8 @@ msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
#: builtin/describe.c:459
msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
+msgstr ""
+"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
#: builtin/describe.c:477
msgid "--long is incompatible with --abbrev=0"
@@ -8478,12 +8492,12 @@ msgstr "git gc [<options>]"
msgid "Failed to fstat %s: %s"
msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:306
+#: builtin/gc.c:310
#, c-format
msgid "Can't stat %s"
msgstr "impossible de faire un stat de %s"
-#: builtin/gc.c:315
+#: builtin/gc.c:319
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8499,47 +8513,47 @@ msgstr ""
"\n"
"%s"
-#: builtin/gc.c:354
+#: builtin/gc.c:358
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:356
+#: builtin/gc.c:360
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:357
+#: builtin/gc.c:361
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:358
+#: builtin/gc.c:362
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:375
+#: builtin/gc.c:379
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "impossible de lire la valeur de gc.logexpiry %s"
-#: builtin/gc.c:403
+#: builtin/gc.c:407
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:405
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:406
+#: builtin/gc.c:410
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:427
+#: builtin/gc.c:431
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8547,7 +8561,7 @@ msgstr ""
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:471
+#: builtin/gc.c:475
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8780,7 +8794,8 @@ msgstr "aucun motif fourni."
#: builtin/grep.c:1189
msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
+msgstr ""
+"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
#: builtin/grep.c:1195
#, c-format
@@ -9765,106 +9780,106 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:461
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "identifier le statut de fichier avec les étiquettes"
-#: builtin/ls-files.c:512
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
-#: builtin/ls-files.c:514
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:516
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:518
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:520
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr ""
"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "afficher en relatif par rapport au répertoire racine du projet"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
"toujours présents"
-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -11351,7 +11366,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
@@ -11840,7 +11855,7 @@ msgstr "abandonner le rebasage"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:796
+#: builtin/receive-pack.c:795
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -11870,7 +11885,7 @@ msgstr ""
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:816
+#: builtin/receive-pack.c:815
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11890,11 +11905,11 @@ msgstr ""
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1889
+#: builtin/receive-pack.c:1888
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1903
+#: builtin/receive-pack.c:1902
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -12538,22 +12553,22 @@ msgstr "git replace -d <objet>..."
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<motif>]]"
-#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
+#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Nom d'objet invalide : '%s'"
-#: builtin/replace.c:359
+#: builtin/replace.c:360
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "mauvaise étiquette de fusion dans le commit '%s'"
-#: builtin/replace.c:361
+#: builtin/replace.c:362
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "étiquette de fusion malformée dans le commit '%s'"
-#: builtin/replace.c:372
+#: builtin/replace.c:373
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12562,45 +12577,45 @@ msgstr ""
"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
"utilisez --edit au lieu de --graft"
-#: builtin/replace.c:405
+#: builtin/replace.c:406
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "le commit original '%s' contient une signature GPG."
-#: builtin/replace.c:406
+#: builtin/replace.c:407
msgid "the signature will be removed in the replacement commit!"
msgstr "la signature sera éliminée dans la validation de remplacement !"
-#: builtin/replace.c:412
+#: builtin/replace.c:413
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
-#: builtin/replace.c:436
+#: builtin/replace.c:437
msgid "list replace refs"
msgstr "afficher les références de remplacement"
-#: builtin/replace.c:437
+#: builtin/replace.c:438
msgid "delete replace refs"
msgstr "supprimer les références de remplacement"
-#: builtin/replace.c:438
+#: builtin/replace.c:439
msgid "edit existing object"
msgstr "éditer l'objet existant"
-#: builtin/replace.c:439
+#: builtin/replace.c:440
msgid "change a commit's parents"
msgstr "Modifier les parents d'un commit"
-#: builtin/replace.c:440
+#: builtin/replace.c:441
msgid "replace the ref if it exists"
msgstr "remplacer la référence si elle existe"
-#: builtin/replace.c:441
+#: builtin/replace.c:442
msgid "do not pretty-print contents for --edit"
msgstr "afficher sans mise en forme pour --edit"
-#: builtin/replace.c:442
+#: builtin/replace.c:443
msgid "use this format"
msgstr "utiliser ce format"
@@ -13231,7 +13246,7 @@ msgstr "ancre alternative pour les chemins relatifs"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
@@ -13241,7 +13256,9 @@ msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
-msgstr "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme son propre amont d'autorité."
+msgstr ""
+"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
+"son propre amont d'autorité."
#: builtin/submodule--helper.c:406
#, c-format
@@ -13485,7 +13502,8 @@ msgid ""
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objet>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objet>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
#: builtin/tag.c:27
@@ -13551,30 +13569,6 @@ msgstr "pas de message pour l'étiquette ?"
msgid "The tag message has been left in %s\n"
msgstr "Le message pour l'étiquette a été laissé dans %s\n"
-#: builtin/tag.c:312
-msgid "tag: tagging "
-msgstr "étiquette: étiquetage de "
-
-#: builtin/tag.c:320
-msgid "object of unknown type"
-msgstr "objet de type inconnu"
-
-#: builtin/tag.c:327
-msgid "commit object"
-msgstr "objet commit"
-
-#: builtin/tag.c:335
-msgid "tree object"
-msgstr "objet arbre"
-
-#: builtin/tag.c:338
-msgid "blob object"
-msgstr "objet blob"
-
-#: builtin/tag.c:341
-msgid "other tag object"
-msgstr "objet étiquette autre"
-
#: builtin/tag.c:397
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
@@ -13669,7 +13663,8 @@ msgstr "l'option --points-at est autorisée seulement en mode liste"
#: builtin/tag.c:499
msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "les options --merged et --no-merged ne sont autorisées qu'en mode liste"
+msgstr ""
+"les options --merged et --no-merged ne sont autorisées qu'en mode liste"
#: builtin/tag.c:510
msgid "only one -F or -m option is allowed."
@@ -13893,13 +13888,17 @@ msgstr "activer le cache de non-suivis sans tester le système de fichier"
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
-msgstr "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer l'index coupé"
+msgstr ""
+"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment activer l'index coupé"
#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
-msgstr "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver l'index coupé"
+msgstr ""
+"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver l'index coupé"
#: builtin/update-index.c:1127
msgid ""
@@ -14016,28 +14015,28 @@ msgstr "git worktree prune [<options>]"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:43
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:49
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:54
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:65
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:81
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
@@ -14057,63 +14056,67 @@ msgstr "faire expirer les arbres de travail plus vieux que <temps>"
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:235
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:272
+#: builtin/worktree.c:274
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:324
+#: builtin/worktree.c:328
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:326
+#: builtin/worktree.c:330
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:328
+#: builtin/worktree.c:332
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:330
+#: builtin/worktree.c:334
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:338
+#: builtin/worktree.c:335
+msgid "keep the new working tree locked"
+msgstr "conserver le verrou sur le nouvel arbre de travail"
+
+#: builtin/worktree.c:343
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:473
+#: builtin/worktree.c:478
msgid "reason for locking"
msgstr "raison du vérouillage"
-#: builtin/worktree.c:485 builtin/worktree.c:518
+#: builtin/worktree.c:490 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:487 builtin/worktree.c:520
+#: builtin/worktree.c:492 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être vérouillée ou dévérouillée"
-#: builtin/worktree.c:492
+#: builtin/worktree.c:497
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:499
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:522
+#: builtin/worktree.c:527
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
@@ -14183,15 +14186,20 @@ msgstr ""
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:355
+#: http.c:336
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
+
+#: http.c:357
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
-#: http.c:364
+#: http.c:366
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
-#: http.c:1755
+#: http.c:1766
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14584,7 +14592,7 @@ msgstr "Essai de fusion simple avec $pretty_name"
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-rebase.sh:57
+#: git-rebase.sh:58
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -14596,39 +14604,39 @@ msgstr ""
"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
"rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14636,7 +14644,7 @@ msgstr ""
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14658,65 +14666,65 @@ msgstr ""
"chose\n"
"d'important ici."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "invalide $upstream_name en amont"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal : pas de branche : $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
@@ -16127,7 +16135,8 @@ msgid ""
"changes\n"
msgstr ""
"status - montrer les chemins modifiés\n"
-"update - ajouter l'état de l'arbre de travail aux modifications à indexer\n"
+"update - ajouter l'état de l'arbre de travail aux modifications à "
+"indexer\n"
"revert - faire revenir les modifications à indexer à la version HEAD\n"
"patch - sélectionner les sections et mettre à jour sélectivement\n"
"diff - visualiser les diff entre HEAD et l'index\n"
@@ -16508,6 +16517,27 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+#~ msgid "could not stat '%s"
+#~ msgstr "stat impossible de '%s'"
+
+#~ msgid "tag: tagging "
+#~ msgstr "étiquette: étiquetage de "
+
+#~ msgid "object of unknown type"
+#~ msgstr "objet de type inconnu"
+
+#~ msgid "commit object"
+#~ msgstr "objet commit"
+
+#~ msgid "tree object"
+#~ msgstr "objet arbre"
+
+#~ msgid "blob object"
+#~ msgstr "objet blob"
+
+#~ msgid "other tag object"
+#~ msgstr "objet étiquette autre"
+
#~ msgid ""
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
#~ "Perhaps you forgot to add either ':/' or '.' ?"