6a07148356 · matheusbsbs/matheus-bagliano

@@ -74,8 +74,8 @@ msgid ""

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2018-01-07 07:50+0800\n"

78 -"PO-Revision-Date: 2018-01-07 18:53+0100\n"

77 +"POT-Creation-Date: 2018-03-16 07:29+0800\n"

78 +"PO-Revision-Date: 2018-03-17 16:20+0100\n"

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

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

81 "Language: fr\n"

@@ -126,7 +126,7 @@ msgstr ""

126 msgid "Exiting because of an unresolved conflict."

127 msgstr "Abandon à cause de conflit non résolu."

128

129 -#: advice.c:121 builtin/merge.c:1213

129 +#: advice.c:121 builtin/merge.c:1251

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

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

132

@@ -546,7 +546,7 @@ msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"

546 msgid "sha1 information is lacking or useless (%s)."

547 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."

548

549 -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

549 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

550 #, c-format

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

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

@@ -624,7 +624,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..."

624 msgid "truncating .rej filename to %.*s.rej"

625 msgstr "troncature du nom de fichier .rej en %.*s.rej"

626

627 -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

627 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

@@ -682,11 +682,11 @@ msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."

682 msgid "Unable to write new index file"

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

684

685 -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

686 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

687 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

688 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

689 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

685 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

686 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

687 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

688 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

689 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

690 #: git-add--interactive.perl:197

691 msgid "path"

692 msgstr "chemin"

@@ -699,7 +699,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

699 msgid "apply changes matching the given path"

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

701

702 -#: apply.c:4927 builtin/am.c:2229

702 +#: apply.c:4927 builtin/am.c:2263

703 msgid "num"

704 msgstr "num"

705

@@ -740,80 +740,80 @@ msgstr "appliquer les patch sans toucher à la copie de travail"

740 msgid "accept a patch that touches outside the working area"

741 msgstr "accepter un patch qui touche hors de la copie de travail"

742

743 -#: apply.c:4949

743 +#: apply.c:4950

744 msgid "also apply the patch (use with --stat/--summary/--check)"

745 msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"

746

747 -#: apply.c:4951

747 +#: apply.c:4952

748 msgid "attempt three-way merge if a patch does not apply"

749 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"

750

751 -#: apply.c:4953

751 +#: apply.c:4954

752 msgid "build a temporary index based on embedded index information"

753 msgstr ""

754 "construire un index temporaire fondé sur l'information de l'index embarqué"

755

756 -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

756 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

757 msgid "paths are separated with NUL character"

758 msgstr "les chemins sont séparés par un caractère NUL"

759

760 -#: apply.c:4958

760 +#: apply.c:4959

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

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

763

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

764 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

765 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

766 -#: builtin/pack-objects.c:3009

766 +#: builtin/pack-objects.c:3035

767 msgid "action"

768 msgstr "action"

769

770 -#: apply.c:4960

770 +#: apply.c:4961

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

772 msgstr ""

773 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "

774 "d'espace"

775

776 -#: apply.c:4963 apply.c:4966

776 +#: apply.c:4964 apply.c:4967

777 msgid "ignore changes in whitespace when finding context"

778 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"

779

780 -#: apply.c:4969

780 +#: apply.c:4970

781 msgid "apply the patch in reverse"

782 msgstr "appliquer le patch en sens inverse"

783

784 -#: apply.c:4971

784 +#: apply.c:4972

785 msgid "don't expect at least one line of context"

786 msgstr "ne pas s'attendre à au moins une ligne de contexte"

787

788 -#: apply.c:4973

788 +#: apply.c:4974

789 msgid "leave the rejected hunks in corresponding *.rej files"

790 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"

791

792 -#: apply.c:4975

792 +#: apply.c:4976

793 msgid "allow overlapping hunks"

794 msgstr "accepter les recouvrements de sections"

795

796 -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

797 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

798 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

796 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

797 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

798 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

799 msgid "be verbose"

800 msgstr "mode verbeux"

801

802 -#: apply.c:4978

802 +#: apply.c:4979

803 msgid "tolerate incorrectly detected missing new-line at the end of file"

804 msgstr ""

805 "tolérer des erreurs de détection de retours chariot manquants en fin de "

806 "fichier"

807

808 -#: apply.c:4981

808 +#: apply.c:4982

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

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

811

812 -#: apply.c:4983 builtin/am.c:2217

812 +#: apply.c:4984 builtin/am.c:2251

813 msgid "root"

814 msgstr "racine"

815

816 -#: apply.c:4984

816 +#: apply.c:4985

817 msgid "prepend <root> to all filenames"

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

819

@@ -849,7 +849,7 @@ msgstr "fmt"

849 msgid "archive format"

850 msgstr "format d'archive"

851

852 -#: archive.c:437 builtin/log.c:1459

852 +#: archive.c:437 builtin/log.c:1462

853 msgid "prefix"

854 msgstr "préfixe"

855

@@ -857,11 +857,11 @@ msgstr "préfixe"

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

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

859

860 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

861 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

862 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

860 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

861 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

862 +#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

863 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

864 -#: parse-options.h:153

864 +#: parse-options.h:165

865 msgid "file"

866 msgstr "fichier"

867

@@ -893,8 +893,8 @@ msgstr "compression efficace"

893 msgid "list supported archive formats"

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

895

896 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

897 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

896 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

897 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

898 msgid "repo"

899 msgstr "dépôt"

900

@@ -945,22 +945,22 @@ msgstr ""

945 "Les motifs de négation sont ignorés dans les attributs git\n"

946 "Utilisez '\\!' pour un point d'exclamation littéral."

947

948 -#: bisect.c:458

948 +#: bisect.c:460

949 #, c-format

950 msgid "Badly quoted content in file '%s': %s"

951 msgstr "Contenu mal cité dans le fichier '%s' : %s"

952

953 -#: bisect.c:666

953 +#: bisect.c:668

954 #, c-format

955 msgid "We cannot bisect more!\n"

956 msgstr "Impossible de pousser la bissection plus loin !\n"

957

958 -#: bisect.c:720

958 +#: bisect.c:722

959 #, c-format

960 msgid "Not a valid commit name %s"

961 msgstr "%s n'est pas un nom de commit valide"

962

963 -#: bisect.c:744

963 +#: bisect.c:746

964 #, c-format

965 msgid ""

966 "The merge base %s is bad.\n"

@@ -969,7 +969,7 @@ msgstr ""

969 "La base de fusion %s est mauvaise.\n"

970 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"

971

972 -#: bisect.c:749

972 +#: bisect.c:751

973 #, c-format

974 msgid ""

975 "The merge base %s is new.\n"

@@ -978,7 +978,7 @@ msgstr ""

978 "La base de fusion %s est nouvelle.\n"

979 "La propriété a changé entre %s et [%s].\n"

980

981 -#: bisect.c:754

981 +#: bisect.c:756

982 #, c-format

983 msgid ""

984 "The merge base %s is %s.\n"

@@ -987,7 +987,7 @@ msgstr ""

987 "La base de fusion %s est %s.\n"

988 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"

989

990 -#: bisect.c:762

990 +#: bisect.c:764

991 #, c-format

992 msgid ""

993 "Some %s revs are not ancestors of the %s rev.\n"

@@ -998,7 +998,7 @@ msgstr ""

998 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"

999 "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"

1000

1001 -#: bisect.c:775

1001 +#: bisect.c:777

1002 #, c-format

1003 msgid ""

1004 "the merge base between %s and [%s] must be skipped.\n"

@@ -1015,31 +1015,31 @@ msgstr ""

1015 msgid "Bisecting: a merge base must be tested\n"

1016 msgstr "Bissection : une base de fusion doit être testée\n"

1017

1018 -#: bisect.c:862

1018 +#: bisect.c:850

1019 #, c-format

1020 msgid "a %s revision is needed"

1021 msgstr "une révision %s est nécessaire"

1022

1023 -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

1023 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

1024 #, c-format

1025 msgid "could not create file '%s'"

1026 msgstr "impossible de créer le fichier '%s'"

1027

1028 -#: bisect.c:930

1028 +#: bisect.c:920

1029 #, c-format

1030 msgid "could not read file '%s'"

1031 msgstr "impossible de lire le fichier '%s'"

1032

1033 -#: bisect.c:960

1033 +#: bisect.c:950

1034 msgid "reading bisect refs failed"

1035 msgstr "impossible de lire les références de bissection"

1036

1037 -#: bisect.c:979

1037 +#: bisect.c:969

1038 #, c-format

1039 msgid "%s was both %s and %s\n"

1040 msgstr "%s était à la fois %s et %s\n"

1041

1042 -#: bisect.c:987

1042 +#: bisect.c:977

1043 #, c-format

1044 msgid ""

1045 "No testable commit found.\n"

@@ -1048,7 +1048,7 @@ msgstr ""

1048 "Aucun commit testable n'a été trouvé\n"

1049 "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"

1050

1051 -#: bisect.c:1006

1051 +#: bisect.c:996

1052 #, c-format

1053 msgid "(roughly %d step)"

1054 msgid_plural "(roughly %d steps)"

@@ -1058,47 +1058,47 @@ msgstr[1] "(à peu près %d étapes)"

1058 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1059 #. steps)" translation.

1060 #.

1061 -#: bisect.c:1012

1061 +#: bisect.c:1002

1062 #, c-format

1063 msgid "Bisecting: %d revision left to test after this %s\n"

1064 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1065 msgstr[0] "Bissection : %d révision à tester après cette %s\n"

1066 msgstr[1] "Bissection : %d révisions à tester après cette %s\n"

1067

1068 -#: blame.c:1757

1068 +#: blame.c:1758

1069 msgid "--contents and --reverse do not blend well."

1070 msgstr "--contents et --reverse ne font pas bon ménage."

1071

1072 -#: blame.c:1768

1072 +#: blame.c:1769

1073 msgid "cannot use --contents with final commit object name"

1074 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"

1075

1076 -#: blame.c:1788

1076 +#: blame.c:1789

1077 msgid "--reverse and --first-parent together require specified latest commit"

1078 msgstr ""

1079 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

1080 "dernier commit"

1081

1082 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1083 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1084 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1082 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1083 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1084 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1085 #: builtin/shortlog.c:191

1086 msgid "revision walk setup failed"

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

1088

1089 -#: blame.c:1815

1089 +#: blame.c:1816

1090 msgid ""

1091 "--reverse --first-parent together require range along first-parent chain"

1092 msgstr ""

1093 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "

1094 "premier parent"

1095

1096 -#: blame.c:1826

1096 +#: blame.c:1827

1097 #, c-format

1098 msgid "no such path %s in %s"

1099 msgstr "pas de chemin %s dans %s"

1100

1101 -#: blame.c:1837

1101 +#: blame.c:1838

1102 #, c-format

1103 msgid "cannot read blob %s for path %s"

1104 msgstr "impossible de lire le blob %s pour le chemin %s"

@@ -1261,76 +1261,75 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

1263

1264 -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1265 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1264 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1265 #, c-format

1266 msgid "could not open '%s'"

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

1268

1270 -#: bundle.c:140

1269 +#: bundle.c:139

1270 msgid "Repository lacks these prerequisite commits:"

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

1272

1274 -#: bundle.c:193

1273 +#: bundle.c:190

1274 #, c-format

1275 msgid "The bundle contains this ref:"

1276 msgid_plural "The bundle contains these %d refs:"

1277 msgstr[0] "Le colis contient cette référence :"

1278 msgstr[1] "Le colis contient ces %d références :"

1279

1281 -#: bundle.c:200

1280 +#: bundle.c:197

1281 msgid "The bundle records a complete history."

1282 msgstr "Le colis enregistre l'historique complet."

1283

1285 -#: bundle.c:202

1284 +#: bundle.c:199

1285 #, c-format

1286 msgid "The bundle requires this ref:"

1287 msgid_plural "The bundle requires these %d refs:"

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

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

1290

1292 -#: bundle.c:261

1291 +#: bundle.c:258

1292 msgid "Could not spawn pack-objects"

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

1294

1296 -#: bundle.c:272

1295 +#: bundle.c:269

1296 msgid "pack-objects died"

1297 msgstr "les objets groupés ont disparu"

1298

1300 -#: bundle.c:314

1299 +#: bundle.c:311

1300 msgid "rev-list died"

1301 msgstr "rev-list a disparu"

1302

1304 -#: bundle.c:363

1303 +#: bundle.c:360

1304 #, c-format

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

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

1307

1309 -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1308 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1309 #, c-format

1310 msgid "unrecognized argument: %s"

1311 msgstr "argument non reconnu : %s"

1312

1314 -#: bundle.c:461

1313 +#: bundle.c:458

1314 msgid "Refusing to create empty bundle."

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

1316

1318 -#: bundle.c:473

1317 +#: bundle.c:470

1318 #, c-format

1319 msgid "cannot create '%s'"

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

1321

1323 -#: bundle.c:501

1322 +#: bundle.c:498

1323 msgid "index-pack died"

1324 msgstr "l'index de groupe a disparu"

1325

1327 -#: color.c:301

1326 +#: color.c:296

1327 #, c-format

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

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

1330

1332 -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1333 -#: builtin/am.c:1434 builtin/am.c:2069

1331 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1332 +#: builtin/am.c:1436 builtin/am.c:2072

1333 #, c-format

1334 msgid "could not parse %s"

1335 msgstr "impossible d'analyser %s"

@@ -1340,7 +1339,7 @@ msgstr "impossible d'analyser %s"

1339 msgid "%s %s is not a commit!"

1340 msgstr "%s %s n'est pas un commit !"

1341

1343 -#: commit.c:1524

1342 +#: commit.c:1506

1343 msgid ""

1344 "Warning: commit message did not conform to UTF-8.\n"

1345 "You may want to amend it after fixing the message, or set the config\n"

@@ -1461,71 +1460,71 @@ msgstr "'%s' pour '%s' n'est pas un horodatage valide"

1460 msgid "bad zlib compression level %d"

1461 msgstr "niveau de compression zlib incorrect %d"

1462

1464 -#: config.c:1222

1463 +#: config.c:1225

1464 #, c-format

1465 msgid "invalid mode for object creation: %s"

1466 msgstr "mode invalide pour la création d'objet : %s"

1467

1469 -#: config.c:1378

1468 +#: config.c:1386

1469 #, c-format

1470 msgid "bad pack compression level %d"

1471 msgstr "niveau de compression du paquet %d"

1472

1474 -#: config.c:1574

1473 +#: config.c:1582

1474 msgid "unable to parse command-line config"

1475 msgstr "lecture de la configuration de ligne de commande impossible"

1476

1478 -#: config.c:1906

1477 +#: config.c:1914

1478 msgid "unknown error occurred while reading the configuration files"

1479 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"

1480

1482 -#: config.c:2093

1481 +#: config.c:2101

1482 #, c-format

1483 msgid "Invalid %s: '%s'"

1484 msgstr "%s invalide : '%s'"

1485

1487 -#: config.c:2136

1486 +#: config.c:2144

1487 #, c-format

1488 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1489 msgstr ""

1490 "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "

1491 "défaut"

1492

1494 -#: config.c:2162

1493 +#: config.c:2170

1494 #, c-format

1495 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1496 msgstr ""

1497 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "

1498 "100"

1499

1501 -#: config.c:2187

1500 +#: config.c:2195

1501 #, c-format

1502 msgid "unable to parse '%s' from command-line config"

1503 msgstr ""

1504 "impossible d'analyser '%s' depuis le configuration en ligne de commande"

1505

1507 -#: config.c:2189

1506 +#: config.c:2197

1507 #, c-format

1508 msgid "bad config variable '%s' in file '%s' at line %d"

1509 msgstr ""

1510 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"

1511

1513 -#: config.c:2248

1512 +#: config.c:2256

1513 #, c-format

1514 msgid "%s has multiple values"

1515 msgstr "%s a des valeurs multiples"

1516

1518 -#: config.c:2591 config.c:2808

1517 +#: config.c:2599 config.c:2816

1518 #, c-format

1519 msgid "fstat on %s failed"

1520 msgstr "échec de fstat sur %s"

1521

1523 -#: config.c:2698

1522 +#: config.c:2706

1523 #, c-format

1524 msgid "could not set '%s' to '%s'"

1525 msgstr "impossible de régler '%s' à '%s'"

1526

1528 -#: config.c:2700 builtin/remote.c:776

1527 +#: config.c:2708 builtin/remote.c:776

1528 #, c-format

1529 msgid "could not unset '%s'"

1530 msgstr "impossible de désinitialiser '%s'"

@@ -1546,24 +1545,29 @@ msgstr ""

1545 "Veuillez vérifier que vous avez les droits d'accès\n"

1546 "et que le dépôt existe."

1547

1549 -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1548 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1549 msgid "Checking connectivity"

1550 msgstr "Vérification de la connectivité"

1551

1553 -#: connected.c:76

1552 +#: connected.c:78

1553 msgid "Could not run 'git rev-list'"

1554 msgstr "Impossible de lancer 'git rev-list'"

1555

1557 -#: connected.c:96

1556 +#: connected.c:98

1557 msgid "failed write to rev-list"

1558 msgstr "impossible d'écrire dans la rev-list"

1559

1561 -#: connected.c:103

1560 +#: connected.c:105

1561 msgid "failed to close rev-list's stdin"

1562 msgstr "impossible de fermer l'entrée standard du rev-list"

1563

1564 #: convert.c:205

1565 #, c-format

1566 +msgid "CRLF would be replaced by LF in %s."

1567 +msgstr "Les CRLF seraient remplacés par des LF dans %s."

1568 +

1569 +#: convert.c:207

1570 +#, c-format

1571 msgid ""

1572 "CRLF will be replaced by LF in %s.\n"

1573 "The file will have its original line endings in your working directory."

@@ -1572,12 +1576,12 @@ msgstr ""

1576 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1577 "travail."

1578

1575 -#: convert.c:209

1579 +#: convert.c:215

1580 #, c-format

1577 -msgid "CRLF would be replaced by LF in %s."

1578 -msgstr "Les CRLF seraient remplacés par des LF dans %s."

1581 +msgid "LF would be replaced by CRLF in %s"

1582 +msgstr "Les LF seraient remplacés par des CRLF dans %s"

1583

1580 -#: convert.c:215

1584 +#: convert.c:217

1585 #, c-format

1586 msgid ""

1587 "LF will be replaced by CRLF in %s.\n"

@@ -1587,11 +1591,6 @@ msgstr ""

1591 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1592 "travail."

1593

1590 -#: convert.c:219

1591 -#, c-format

1592 -msgid "LF would be replaced by CRLF in %s"

1593 -msgstr "Les LF seraient remplacés par des CRLF dans %s"

1594 -

1594 #: date.c:116

1595 msgid "in the future"

1596 msgstr "dans le futur"

@@ -1708,20 +1707,24 @@ msgstr ""

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

1708 "%s"

1709

1711 -#: diff.c:3799

1710 +#: diff.c:3822

1711 #, c-format

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

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

1714

1716 -#: diff.c:4127

1715 +#: diff.c:4146

1716 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1717 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"

1718

1720 -#: diff.c:4215

1719 +#: diff.c:4149

1720 +msgid "-G, -S and --find-object are mutually exclusive"

1721 +msgstr "-G, -S et --find-object sont mutuellement exclusifs"

1722 +

1723 +#: diff.c:4237

1724 msgid "--follow requires exactly one pathspec"

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

1726

1724 -#: diff.c:4381

1727 +#: diff.c:4403

1728 #, c-format

1729 msgid ""

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

@@ -1730,24 +1733,24 @@ msgstr ""

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

1734 "%s"

1735

1733 -#: diff.c:4395

1736 +#: diff.c:4417

1737 #, c-format

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

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

1740

1738 -#: diff.c:5446

1741 +#: diff.c:5493

1742 msgid "inexact rename detection was skipped due to too many files."

1743 msgstr ""

1744 "détection de renommage inexact annulée à cause d'un trop grand nombre de "

1745 "fichiers."

1746

1744 -#: diff.c:5449

1747 +#: diff.c:5496

1748 msgid "only found copies from modified paths due to too many files."

1749 msgstr ""

1750 "recherche uniquement des copies par modification de chemin à cause d'un trop "

1751 "grand nombre de fichiers."

1752

1750 -#: diff.c:5452

1753 +#: diff.c:5499

1754 #, c-format

1755 msgid ""

1756 "you may want to set your %s variable to at least %d and retry the command."

@@ -1755,20 +1758,25 @@ msgstr ""

1758 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "

1759 "commande."

1760

1758 -#: dir.c:2100

1761 +#: dir.c:1866

1762 +#, c-format

1763 +msgid "could not open directory '%s'"

1764 +msgstr "impossible d'ouvrir le répertoire '%s'"

1765 +

1766 +#: dir.c:2108

1767 msgid "failed to get kernel name and information"

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

1769

1762 -#: dir.c:2219

1770 +#: dir.c:2232

1771 msgid "Untracked cache is disabled on this system or location."

1772 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."

1773

1766 -#: dir.c:3002 dir.c:3007

1774 +#: dir.c:3024 dir.c:3029

1775 #, c-format

1776 msgid "could not create directories for %s"

1777 msgstr "impossible de créer les répertoires pour %s"

1778

1771 -#: dir.c:3032

1779 +#: dir.c:3054

1780 #, c-format

1781 msgid "could not migrate git directory from '%s' to '%s'"

1782 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"

@@ -1789,184 +1797,192 @@ msgstr "Filtrage du contenu"

1797 msgid "could not stat file '%s'"

1798 msgstr "impossible de stat le fichier '%s'"

1799

1792 -#: fetch-pack.c:252

1800 +#: fetch-object.c:17

1801 +msgid "Remote with no URL"

1802 +msgstr "Dépôt distant sans URL"

1803 +

1804 +#: fetch-pack.c:253

1805 msgid "git fetch-pack: expected shallow list"

1806 msgstr "git fetch-pack : list courte attendue"

1807

1796 -#: fetch-pack.c:264

1797 -msgid "git fetch-pack: expected ACK/NAK, got EOF"

1798 -msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"

1808 +#: fetch-pack.c:265

1809 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1810 +msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

1811

1800 -#: fetch-pack.c:283 builtin/archive.c:63

1812 +#: fetch-pack.c:284 builtin/archive.c:63

1813 #, c-format

1814 msgid "remote error: %s"

1815 msgstr "erreur distante : %s"

1816

1805 -#: fetch-pack.c:284

1817 +#: fetch-pack.c:285

1818 #, c-format

1819 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1820 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"

1821

1810 -#: fetch-pack.c:336

1822 +#: fetch-pack.c:337

1823 msgid "--stateless-rpc requires multi_ack_detailed"

1824 msgstr "--stateless-rpc nécessite multi_ack_detailed"

1825

1814 -#: fetch-pack.c:422

1826 +#: fetch-pack.c:428

1827 #, c-format

1828 msgid "invalid shallow line: %s"

1829 msgstr "ligne de superficiel invalide : %s"

1830

1819 -#: fetch-pack.c:428

1831 +#: fetch-pack.c:434

1832 #, c-format

1833 msgid "invalid unshallow line: %s"

1834 msgstr "ligne de fin de superficiel invalide : %s"

1835

1824 -#: fetch-pack.c:430

1836 +#: fetch-pack.c:436

1837 #, c-format

1838 msgid "object not found: %s"

1839 msgstr "objet non trouvé : %s"

1840

1829 -#: fetch-pack.c:433

1841 +#: fetch-pack.c:439

1842 #, c-format

1843 msgid "error in object: %s"

1844 msgstr "Erreur dans l'objet : %s"

1845

1834 -#: fetch-pack.c:435

1846 +#: fetch-pack.c:441

1847 #, c-format

1848 msgid "no shallow found: %s"

1849 msgstr "Pas de superficiel trouvé : %s"

1850

1839 -#: fetch-pack.c:438

1851 +#: fetch-pack.c:444

1852 #, c-format

1853 msgid "expected shallow/unshallow, got %s"

1854 msgstr "superficiel/non superficiel attendu, %s trouvé"

1855

1844 -#: fetch-pack.c:477

1856 +#: fetch-pack.c:485

1857 #, c-format

1858 msgid "got %s %d %s"

1859 msgstr "réponse %s %d %s"

1860

1849 -#: fetch-pack.c:491

1861 +#: fetch-pack.c:499

1862 #, c-format

1863 msgid "invalid commit %s"

1864 msgstr "commit invalide %s"

1865

1854 -#: fetch-pack.c:524

1866 +#: fetch-pack.c:532

1867 msgid "giving up"

1868 msgstr "abandon"

1869

1858 -#: fetch-pack.c:534 progress.c:229

1870 +#: fetch-pack.c:542 progress.c:229

1871 msgid "done"

1872 msgstr "fait"

1873

1862 -#: fetch-pack.c:546

1874 +#: fetch-pack.c:554

1875 #, c-format

1876 msgid "got %s (%d) %s"

1877 msgstr "%s trouvé (%d) %s"

1878

1867 -#: fetch-pack.c:592

1879 +#: fetch-pack.c:600

1880 #, c-format

1881 msgid "Marking %s as complete"

1882 msgstr "Marquage de %s comme terminé"

1883

1872 -#: fetch-pack.c:777

1884 +#: fetch-pack.c:788

1885 #, c-format

1886 msgid "already have %s (%s)"

1887 msgstr "%s déjà possédé (%s)"

1888

1877 -#: fetch-pack.c:815

1889 +#: fetch-pack.c:829

1890 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1891 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"

1892

1881 -#: fetch-pack.c:823

1893 +#: fetch-pack.c:837

1894 msgid "protocol error: bad pack header"

1895 msgstr "erreur de protocole : mauvais entête de paquet"

1896

1885 -#: fetch-pack.c:879

1897 +#: fetch-pack.c:895

1898 #, c-format

1899 msgid "fetch-pack: unable to fork off %s"

1900 msgstr "fetch-pack : impossible de dupliquer %s"

1901

1890 -#: fetch-pack.c:895

1902 +#: fetch-pack.c:911

1903 #, c-format

1904 msgid "%s failed"

1905 msgstr "échec de %s"

1906

1895 -#: fetch-pack.c:897

1907 +#: fetch-pack.c:913

1908 msgid "error in sideband demultiplexer"

1909 msgstr "erreur dans le démultiplexer latéral"

1910

1899 -#: fetch-pack.c:924

1911 +#: fetch-pack.c:940

1912 msgid "Server does not support shallow clients"

1913 msgstr "Le serveur ne supporte les clients superficiels"

1914

1903 -#: fetch-pack.c:928

1915 +#: fetch-pack.c:944

1916 msgid "Server supports multi_ack_detailed"

1917 msgstr "Le serveur supporte multi_ack_detailed"

1918

1907 -#: fetch-pack.c:931

1919 +#: fetch-pack.c:947

1920 msgid "Server supports no-done"

1921 msgstr "Le serveur support no-done"

1922

1911 -#: fetch-pack.c:937

1923 +#: fetch-pack.c:953

1924 msgid "Server supports multi_ack"

1925 msgstr "Le serveur supporte multi_ack"

1926

1915 -#: fetch-pack.c:941

1927 +#: fetch-pack.c:957

1928 msgid "Server supports side-band-64k"

1929 msgstr "Le serveur supporte side-band-64k"

1930

1919 -#: fetch-pack.c:945

1931 +#: fetch-pack.c:961

1932 msgid "Server supports side-band"

1933 msgstr "Le serveru supporte side-band"

1934

1923 -#: fetch-pack.c:949

1935 +#: fetch-pack.c:965

1936 msgid "Server supports allow-tip-sha1-in-want"

1937 msgstr "Le serveur supporte allow-tip-sha1-in-want"

1938

1927 -#: fetch-pack.c:953

1939 +#: fetch-pack.c:969

1940 msgid "Server supports allow-reachable-sha1-in-want"

1941 msgstr "Le serveur supporte allow-reachable-sha1-in-want"

1942

1931 -#: fetch-pack.c:963

1943 +#: fetch-pack.c:979

1944 msgid "Server supports ofs-delta"

1933 -msgstr "Le serveur support ofs-delta"

1945 +msgstr "Le serveur supporte ofs-delta"

1946

1935 -#: fetch-pack.c:970

1947 +#: fetch-pack.c:985

1948 +msgid "Server supports filter"

1949 +msgstr "Le serveur supporte filter"

1950 +

1951 +#: fetch-pack.c:993

1952 #, c-format

1953 msgid "Server version is %.*s"

1954 msgstr "La version du serveur est %.*s"

1955

1940 -#: fetch-pack.c:976

1956 +#: fetch-pack.c:999

1957 msgid "Server does not support --shallow-since"

1958 msgstr "Le receveur ne gère pas --shallow-since"

1959

1944 -#: fetch-pack.c:980

1960 +#: fetch-pack.c:1003

1961 msgid "Server does not support --shallow-exclude"

1962 msgstr "Le receveur ne gère pas --shallow-exclude"

1963

1948 -#: fetch-pack.c:982

1964 +#: fetch-pack.c:1005

1965 msgid "Server does not support --deepen"

1966 msgstr "Le receveur ne gère pas --deepen"

1967

1952 -#: fetch-pack.c:993

1968 +#: fetch-pack.c:1016

1969 msgid "no common commits"

1970 msgstr "pas de commit commun"

1971

1956 -#: fetch-pack.c:1005

1972 +#: fetch-pack.c:1028

1973 msgid "git fetch-pack: fetch failed."

1974 msgstr "git fetch-pack : échec de le récupération."

1975

1960 -#: fetch-pack.c:1167

1976 +#: fetch-pack.c:1190

1977 msgid "no matching remote head"

1978 msgstr "pas de HEAD distante correspondante"

1979

1964 -#: fetch-pack.c:1189

1980 +#: fetch-pack.c:1212

1981 #, c-format

1982 msgid "no such remote ref %s"

1983 msgstr "référence distante inconnue %s"

1984

1969 -#: fetch-pack.c:1192

1985 +#: fetch-pack.c:1215

1986 #, c-format

1987 msgid "Server does not allow request for unadvertised object %s"

1988 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"

@@ -1989,17 +2005,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

2005 msgid "ignore invalid color '%.*s' in log.graphColors"

2006 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"

2007

1992 -#: grep.c:2017

2008 +#: grep.c:2022

2009 #, c-format

2010 msgid "'%s': unable to read %s"

2011 msgstr "'%s' : lecture de %s impossible"

2012

1997 -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

2013 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

2014 +#: builtin/rm.c:134

2015 #, c-format

2016 msgid "failed to stat '%s'"

2017 msgstr "échec du stat de '%s'"

2018

2002 -#: grep.c:2045

2019 +#: grep.c:2050

2020 #, c-format

2021 msgid "'%s': short read"

2022 msgstr "'%s' : lecture tronquée"

@@ -2143,19 +2160,18 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

2160 msgid "name consists only of disallowed characters: %s"

2161 msgstr "le nom n'est constitué que de caractères interdits : %s"

2162

2146 -#: ident.c:416 builtin/commit.c:616

2163 +#: ident.c:416 builtin/commit.c:582

2164 #, c-format

2165 msgid "invalid date format: %s"

2166 msgstr "format de date invalide : %s"

2167

2151 -#: list-objects-filter-options.c:30

2152 -msgid "multiple object filter types cannot be combined"

2153 -msgstr "impossible de combiner des types multiples de filtre d'objets"

2168 +#: list-objects-filter-options.c:36

2169 +msgid "multiple filter-specs cannot be combined"

2170 +msgstr "impossible de combiner des spécificateurs multiples de filtre"

2171

2155 -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2156 -#, c-format

2157 -msgid "invalid filter-spec expression '%s'"

2158 -msgstr "expression de filtre invalide : '%s'"

2172 +#: list-objects-filter-options.c:126

2173 +msgid "cannot change partial clone promisor remote"

2174 +msgstr "impossible de modifier le prometteur distant de clone partiel"

2175

2176 #: lockfile.c:151

2177 #, c-format

@@ -2185,8 +2201,8 @@ msgstr "Impossible de créer '%s.lock' : %s"

2201 msgid "failed to read the cache"

2202 msgstr "impossible de lire le cache"

2203

2188 -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2189 -#: builtin/checkout.c:600 builtin/clone.c:754

2204 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2205 +#: builtin/checkout.c:599 builtin/clone.c:759

2206 msgid "unable to write new index file"

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

2208

@@ -2203,60 +2219,60 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"

2219 msgid "error building trees"

2220 msgstr "erreur de construction des arbres"

2221

2206 -#: merge-recursive.c:752

2222 +#: merge-recursive.c:771

2223 #, c-format

2224 msgid "failed to create path '%s'%s"

2225 msgstr "impossible de créer le chemin '%s' %s"

2226

2211 -#: merge-recursive.c:763

2227 +#: merge-recursive.c:782

2228 #, c-format

2229 msgid "Removing %s to make room for subdirectory\n"

2230 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"

2231

2216 -#: merge-recursive.c:777 merge-recursive.c:796

2232 +#: merge-recursive.c:796 merge-recursive.c:815

2233 msgid ": perhaps a D/F conflict?"

2234 msgstr ": peut-être un conflit D/F ?"

2235

2220 -#: merge-recursive.c:786

2236 +#: merge-recursive.c:805

2237 #, c-format

2238 msgid "refusing to lose untracked file at '%s'"

2239 msgstr "refus de perdre le fichier non suivi '%s'"

2240

2225 -#: merge-recursive.c:828 builtin/cat-file.c:37

2241 +#: merge-recursive.c:847 builtin/cat-file.c:37

2242 #, c-format

2243 msgid "cannot read object %s '%s'"

2244 msgstr "impossible de lire l'objet %s '%s'"

2245

2230 -#: merge-recursive.c:830

2246 +#: merge-recursive.c:849

2247 #, c-format

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

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

2250

2235 -#: merge-recursive.c:854

2251 +#: merge-recursive.c:873

2252 #, c-format

2253 msgid "failed to open '%s': %s"

2254 msgstr "échec à l'ouverture de '%s' : %s"

2255

2240 -#: merge-recursive.c:865

2256 +#: merge-recursive.c:884

2257 #, c-format

2258 msgid "failed to symlink '%s': %s"

2259 msgstr "échec à la création du lien symbolique '%s' : %s"

2260

2245 -#: merge-recursive.c:870

2261 +#: merge-recursive.c:889

2262 #, c-format

2263 msgid "do not know what to do with %06o %s '%s'"

2264 msgstr "ne sait pas traiter %06o %s '%s'"

2265

2250 -#: merge-recursive.c:1010

2266 +#: merge-recursive.c:1029

2267 msgid "Failed to execute internal merge"

2268 msgstr "Échec à l'exécution de la fusion interne"

2269

2254 -#: merge-recursive.c:1014

2270 +#: merge-recursive.c:1034

2271 #, c-format

2272 msgid "Unable to add %s to database"

2273 msgstr "Impossible d'ajouter %s à la base de données"

2274

2259 -#: merge-recursive.c:1117

2275 +#: merge-recursive.c:1146

2276 #, c-format

2277 msgid ""

2278 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2265,7 +2281,7 @@ msgstr ""

2281 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

2282 "%s laissée dans l'arbre."

2283

2268 -#: merge-recursive.c:1122

2284 +#: merge-recursive.c:1151

2285 #, c-format

2286 msgid ""

2287 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2274,7 +2290,7 @@ msgstr ""

2290 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

2291 "%s de %s laissée dans l'arbre."

2292

2277 -#: merge-recursive.c:1129

2293 +#: merge-recursive.c:1158

2294 #, c-format

2295 msgid ""

2296 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2283,7 +2299,7 @@ msgstr ""

2299 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "

2300 "%s laissée dans l'arbre dans le fichier %s."

2301

2286 -#: merge-recursive.c:1134

2302 +#: merge-recursive.c:1163

2303 #, c-format

2304 msgid ""

2305 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2292,20 +2308,20 @@ msgstr ""

2308 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

2309 "%s de %s laissée dans l'arbre dans le fichier %s."

2310

2295 -#: merge-recursive.c:1168

2311 +#: merge-recursive.c:1197

2312 msgid "rename"

2313 msgstr "renommage"

2314

2299 -#: merge-recursive.c:1168

2315 +#: merge-recursive.c:1197

2316 msgid "renamed"

2317 msgstr "renommé"

2318

2303 -#: merge-recursive.c:1225

2319 +#: merge-recursive.c:1254

2320 #, c-format

2321 msgid "%s is a directory in %s adding as %s instead"

2322 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"

2323

2308 -#: merge-recursive.c:1250

2324 +#: merge-recursive.c:1279

2325 #, c-format

2326 msgid ""

2327 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2314,142 +2330,142 @@ msgstr ""

2330 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "

2331 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"

2332

2317 -#: merge-recursive.c:1255

2333 +#: merge-recursive.c:1284

2334 msgid " (left unresolved)"

2335 msgstr " (laissé non résolu)"

2336

2321 -#: merge-recursive.c:1317

2337 +#: merge-recursive.c:1346

2338 #, c-format

2339 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2340 msgstr ""

2341 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"

2342 ">'%s' dans %s"

2343

2328 -#: merge-recursive.c:1350

2344 +#: merge-recursive.c:1379

2345 #, c-format

2346 msgid "Renaming %s to %s and %s to %s instead"

2347 msgstr "Renommage de %s en %s et de %s en %s à la place"

2348

2333 -#: merge-recursive.c:1553

2349 +#: merge-recursive.c:1582

2350 #, c-format

2351 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2352 msgstr ""

2353 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"

2354

2339 -#: merge-recursive.c:1568

2355 +#: merge-recursive.c:1597

2356 #, c-format

2357 msgid "Adding merged %s"

2358 msgstr "Ajout de %s fusionné"

2359

2344 -#: merge-recursive.c:1575 merge-recursive.c:1805

2360 +#: merge-recursive.c:1604 merge-recursive.c:1834

2361 #, c-format

2362 msgid "Adding as %s instead"

2363 msgstr "Ajout plutôt comme %s"

2364

2349 -#: merge-recursive.c:1632

2365 +#: merge-recursive.c:1661

2366 #, c-format

2367 msgid "cannot read object %s"

2368 msgstr "impossible de lire l'objet %s"

2369

2354 -#: merge-recursive.c:1635

2370 +#: merge-recursive.c:1664

2371 #, c-format

2372 msgid "object %s is not a blob"

2373 msgstr "l'objet %s n'est pas un blob"

2374

2359 -#: merge-recursive.c:1704

2375 +#: merge-recursive.c:1733

2376 msgid "modify"

2377 msgstr "modification"

2378

2363 -#: merge-recursive.c:1704

2379 +#: merge-recursive.c:1733

2380 msgid "modified"

2381 msgstr "modifié"

2382

2367 -#: merge-recursive.c:1714

2383 +#: merge-recursive.c:1743

2384 msgid "content"

2385 msgstr "contenu"

2386

2371 -#: merge-recursive.c:1721

2387 +#: merge-recursive.c:1750

2388 msgid "add/add"

2389 msgstr "ajout/ajout"

2390

2375 -#: merge-recursive.c:1757

2391 +#: merge-recursive.c:1786

2392 #, c-format

2393 msgid "Skipped %s (merged same as existing)"

2394 msgstr "%s sauté (fusion identique à l'existant)"

2395

2380 -#: merge-recursive.c:1771

2396 +#: merge-recursive.c:1800

2397 #, c-format

2398 msgid "Auto-merging %s"

2399 msgstr "Fusion automatique de %s"

2400

2385 -#: merge-recursive.c:1775 git-submodule.sh:932

2401 +#: merge-recursive.c:1804 git-submodule.sh:879

2402 msgid "submodule"

2403 msgstr "sous-module"

2404

2389 -#: merge-recursive.c:1776

2405 +#: merge-recursive.c:1805

2406 #, c-format

2407 msgid "CONFLICT (%s): Merge conflict in %s"

2408 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"

2409

2394 -#: merge-recursive.c:1870

2410 +#: merge-recursive.c:1899

2411 #, c-format

2412 msgid "Removing %s"

2413 msgstr "Suppression de %s"

2414

2399 -#: merge-recursive.c:1896

2415 +#: merge-recursive.c:1925

2416 msgid "file/directory"

2417 msgstr "fichier/répertoire"

2418

2403 -#: merge-recursive.c:1902

2419 +#: merge-recursive.c:1931

2420 msgid "directory/file"

2421 msgstr "répertoire/fichier"

2422

2407 -#: merge-recursive.c:1909

2423 +#: merge-recursive.c:1938

2424 #, c-format

2425 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2426 msgstr ""

2427 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"

2428

2413 -#: merge-recursive.c:1918

2429 +#: merge-recursive.c:1947

2430 #, c-format

2431 msgid "Adding %s"

2432 msgstr "Ajout de %s"

2433

2418 -#: merge-recursive.c:1958

2434 +#: merge-recursive.c:1987

2435 #, c-format

2436 msgid "Dirty index: cannot merge (dirty: %s)"

2437 msgstr "Index sale : fusion impossible (sales : %s)"

2438

2423 -#: merge-recursive.c:1962

2439 +#: merge-recursive.c:1991

2440 msgid "Already up to date!"

2441 msgstr "Déjà à jour !"

2442

2427 -#: merge-recursive.c:1971

2443 +#: merge-recursive.c:2000

2444 #, c-format

2445 msgid "merging of trees %s and %s failed"

2446 msgstr "échec de fusion des arbres %s et %s"

2447

2432 -#: merge-recursive.c:2068

2448 +#: merge-recursive.c:2097

2449 msgid "Merging:"

2450 msgstr "Fusion :"

2451

2436 -#: merge-recursive.c:2081

2452 +#: merge-recursive.c:2110

2453 #, c-format

2454 msgid "found %u common ancestor:"

2455 msgid_plural "found %u common ancestors:"

2456 msgstr[0] "%u ancêtre commun trouvé :"

2457 msgstr[1] "%u ancêtres communs trouvés :"

2458

2443 -#: merge-recursive.c:2120

2459 +#: merge-recursive.c:2149

2460 msgid "merge returned no commit"

2461 msgstr "la fusion n'a pas retourné de commit"

2462

2447 -#: merge-recursive.c:2183

2463 +#: merge-recursive.c:2212

2464 #, c-format

2465 msgid "Could not parse object '%s'"

2466 msgstr "Impossible d'analyser l'objet '%s'"

2467

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

2468 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2469 msgid "Unable to write index."

2470 msgstr "Impossible d'écrire l'index."

2471

@@ -2469,16 +2485,16 @@ msgstr ""

2485 msgid "You have not concluded your notes merge (%s exists)."

2486 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."

2487

2472 -#: notes-utils.c:42

2488 +#: notes-utils.c:43

2489 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

2491

2476 -#: notes-utils.c:101

2492 +#: notes-utils.c:102

2493 #, c-format

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

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

2496

2481 -#: notes-utils.c:111

2497 +#: notes-utils.c:112

2498 #, c-format

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

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

@@ -2487,7 +2503,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

2503 #. the environment variable, the second %s is

2504 #. its value.

2505 #.

2490 -#: notes-utils.c:141

2506 +#: notes-utils.c:142

2507 #, c-format

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

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

@@ -2497,26 +2513,26 @@ msgstr "Mauvaise valeur de %s : '%s'"

2513 msgid "unable to parse object: %s"

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

2515

2500 -#: packfile.c:556

2516 +#: packfile.c:561

2517 msgid "offset before end of packfile (broken .idx?)"

2518 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

2519

2504 -#: packfile.c:1683

2520 +#: packfile.c:1694

2521 #, c-format

2522 msgid "offset before start of pack index for %s (corrupt index?)"

2523 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

2524

2509 -#: packfile.c:1687

2525 +#: packfile.c:1698

2526 #, c-format

2527 msgid "offset beyond end of pack index for %s (truncated index?)"

2528 msgstr ""

2529 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

2530

2515 -#: parse-options.c:573

2531 +#: parse-options.c:619

2532 msgid "..."

2533 msgstr "..."

2534

2519 -#: parse-options.c:592

2535 +#: parse-options.c:638

2536 #, c-format

2537 msgid "usage: %s"

2538 msgstr "usage : %s"

@@ -2524,17 +2540,17 @@ msgstr "usage : %s"

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

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

2542 #.

2527 -#: parse-options.c:598

2543 +#: parse-options.c:644

2544 #, c-format

2545 msgid " or: %s"

2546 msgstr " ou : %s"

2547

2532 -#: parse-options.c:601

2548 +#: parse-options.c:647

2549 #, c-format

2550 msgid " %s"

2551 msgstr " %s"

2552

2537 -#: parse-options.c:640

2553 +#: parse-options.c:686

2554 msgid "-NUM"

2555 msgstr "-NUM"

2556

@@ -2631,7 +2647,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"

2647 msgid "unable to parse --pretty format"

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

2649

2634 -#: read-cache.c:1472

2650 +#: read-cache.c:1473

2651 #, c-format

2652 msgid ""

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

@@ -2640,7 +2656,7 @@ msgstr ""

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

2657 "Utilisation de la version %i"

2658

2643 -#: read-cache.c:1482

2659 +#: read-cache.c:1483

2660 #, c-format

2661 msgid ""

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

@@ -2649,22 +2665,22 @@ msgstr ""

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

2666 "Utilisation de la version %i"

2667

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

2668 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2669 #, c-format

2670 msgid "could not close '%s'"

2671 msgstr "impossible de fermer '%s'"

2672

2657 -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2673 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2674 #, c-format

2675 msgid "could not stat '%s'"

2676 msgstr "stat impossible de '%s'"

2677

2662 -#: read-cache.c:2455

2678 +#: read-cache.c:2461

2679 #, c-format

2680 msgid "unable to open git dir: %s"

2681 msgstr "impossible d'ouvrir le répertoire git : %s"

2682

2667 -#: read-cache.c:2467

2683 +#: read-cache.c:2473

2684 #, c-format

2685 msgid "unable to unlink: %s"

2686 msgstr "échec lors de l'unlink : %s"

@@ -2683,19 +2699,19 @@ msgstr "mises à jour des références interdites en environnement de quarantain

2699 msgid "could not remove reference %s"

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

2701

2686 -#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2687 -#: refs/packed-backend.c:1534

2702 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2703 +#: refs/packed-backend.c:1538

2704 #, c-format

2705 msgid "could not delete reference %s: %s"

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

2707

2692 -#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2708 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2709 #, c-format

2710 msgid "could not delete references: %s"

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

2712

2713 # à priori on parle d'une branche ici

2698 -#: ref-filter.c:35 wt-status.c:1816

2714 +#: ref-filter.c:35 wt-status.c:1842

2715 msgid "gone"

2716 msgstr "disparue"

2717

@@ -2889,131 +2905,141 @@ msgstr "(HEAD détachée depuis %s)"

2905 msgid "(no branch)"

2906 msgstr "(aucune branche)"

2907

2892 -#: ref-filter.c:1488 ref-filter.c:1519

2908 +#: ref-filter.c:1364

2909 #, c-format

2910 msgid "missing object %s for %s"

2911 msgstr "objet manquant %s pour %s"

2912

2897 -#: ref-filter.c:1491 ref-filter.c:1522

2913 +#: ref-filter.c:1367

2914 #, c-format

2915 msgid "parse_object_buffer failed on %s for %s"

2916 msgstr "echec de parse_object_buffer sur %s pour %s"

2917

2902 -#: ref-filter.c:1822

2918 +#: ref-filter.c:1819

2919 #, c-format

2920 msgid "malformed object at '%s'"

2921 msgstr "objet malformé à '%s'"

2922

2907 -#: ref-filter.c:1889

2923 +#: ref-filter.c:1886

2924 #, c-format

2925 msgid "ignoring ref with broken name %s"

2926 msgstr "réf avec un nom cassé %s ignoré"

2927

2912 -#: ref-filter.c:1894

2928 +#: ref-filter.c:1891

2929 #, c-format

2930 msgid "ignoring broken ref %s"

2931 msgstr "réf cassé %s ignoré"

2932

2917 -#: ref-filter.c:2156

2933 +#: ref-filter.c:2152

2934 #, c-format

2935 msgid "format: %%(end) atom missing"

2936 msgstr "format: atome %%(end) manquant"

2937

2922 -#: ref-filter.c:2250

2938 +#: ref-filter.c:2246

2939 #, c-format

2940 msgid "malformed object name %s"

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

2942

2927 -#: remote.c:780

2943 +#: remote.c:795

2944 #, c-format

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

2946 msgstr "Impossible de récupérer à la fois %s et %s pour %s"

2947

2932 -#: remote.c:784

2948 +#: remote.c:799

2949 #, c-format

2950 msgid "%s usually tracks %s, not %s"

2951 msgstr "%s suit habituellement %s, pas %s"

2952

2937 -#: remote.c:788

2953 +#: remote.c:803

2954 #, c-format

2955 msgid "%s tracks both %s and %s"

2956 msgstr "%s suit à la fois %s et %s"

2957

2942 -#: remote.c:796

2958 +#: remote.c:811

2959 msgid "Internal error"

2960 msgstr "Erreur interne"

2961

2946 -#: remote.c:1711 remote.c:1813

2962 +#: remote.c:1726 remote.c:1828

2963 msgid "HEAD does not point to a branch"

2964 msgstr "HEAD ne pointe pas sur une branche"

2965

2950 -#: remote.c:1720

2966 +#: remote.c:1735

2967 #, c-format

2968 msgid "no such branch: '%s'"

2969 msgstr "pas de branche '%s'"

2970

2955 -#: remote.c:1723

2971 +#: remote.c:1738

2972 #, c-format

2973 msgid "no upstream configured for branch '%s'"

2974 msgstr "aucune branche amont configurée pour la branche '%s'"

2975

2960 -#: remote.c:1729

2976 +#: remote.c:1744

2977 #, c-format

2978 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2979 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"

2980

2965 -#: remote.c:1744

2981 +#: remote.c:1759

2982 #, c-format

2983 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2984 msgstr ""

2985 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

2986 "branche locale de suivi"

2987

2972 -#: remote.c:1756

2988 +#: remote.c:1771

2989 #, c-format

2990 msgid "branch '%s' has no remote for pushing"

2991 msgstr "la branche '%s' n'a aucune branche distante de poussée"

2992

2977 -#: remote.c:1767

2993 +#: remote.c:1782

2994 #, c-format

2995 msgid "push refspecs for '%s' do not include '%s'"

2996 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

2997

2982 -#: remote.c:1780

2998 +#: remote.c:1795

2999 msgid "push has no destination (push.default is 'nothing')"

3000 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

3001

2986 -#: remote.c:1802

3002 +#: remote.c:1817

3003 msgid "cannot resolve 'simple' push to a single destination"

3004 msgstr ""

3005 "impossible de résoudre une poussée 'simple' pour une destination unique"

3006

2991 -#: remote.c:2106

3007 +#: remote.c:2132

3008 #, c-format

3009 msgid "Your branch is based on '%s', but the upstream is gone.\n"

3010 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"

3011

2996 -#: remote.c:2110

3012 +#: remote.c:2136

3013 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

3014 msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"

3015

3000 -#: remote.c:2113

3016 +#: remote.c:2139

3017 #, c-format

3018 msgid "Your branch is up to date with '%s'.\n"

3019 msgstr "Votre branche est à jour avec '%s'.\n"

3020

3005 -#: remote.c:2117

3021 +#: remote.c:2143

3022 +#, c-format

3023 +msgid "Your branch and '%s' refer to different commits.\n"

3024 +msgstr "Votre branche et '%s' font référence à des commits différents.\n"

3025 +

3026 +#: remote.c:2146

3027 +#, c-format, fuzzy

3028 +msgid " (use \"%s\" for details)\n"

3029 +msgstr " (utilisez \"%s\" pour plus de détails)\n"

3030 +

3031 +#: remote.c:2150

3032 #, c-format

3033 msgid "Your branch is ahead of '%s' by %d commit.\n"

3034 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

3035 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"

3036 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"

3037

3012 -#: remote.c:2123

3038 +#: remote.c:2156

3039 msgid " (use \"git push\" to publish your local commits)\n"

3040 msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"

3041

3016 -#: remote.c:2126

3042 +#: remote.c:2159

3043 #, c-format

3044 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

3045 msgid_plural ""

@@ -3025,11 +3051,11 @@ msgstr[1] ""

3051 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "

3052 "en avance rapide.\n"

3053

3028 -#: remote.c:2134

3054 +#: remote.c:2167

3055 msgid " (use \"git pull\" to update your local branch)\n"

3056 msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"

3057

3032 -#: remote.c:2137

3058 +#: remote.c:2170

3059 #, c-format

3060 msgid ""

3061 "Your branch and '%s' have diverged,\n"

@@ -3044,29 +3070,29 @@ msgstr[1] ""

3070 "Votre branche et '%s' ont divergé,\n"

3071 "et ont %d et %d commits différents chacune respectivement.\n"

3072

3047 -#: remote.c:2147

3073 +#: remote.c:2180

3074 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

3075 msgstr ""

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

3077

3052 -#: revision.c:2268

3078 +#: revision.c:2277

3079 msgid "your current branch appears to be broken"

3080 msgstr "votre branche actuelle semble cassée"

3081

3056 -#: revision.c:2271

3082 +#: revision.c:2280

3083 #, c-format

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

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

3086

3061 -#: revision.c:2465

3087 +#: revision.c:2477

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

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

3090

3065 -#: run-command.c:645

3091 +#: run-command.c:731

3092 msgid "open /dev/null failed"

3093 msgstr "échec de l'ouverture de /dev/null"

3094

3069 -#: run-command.c:1188

3095 +#: run-command.c:1274

3096 #, c-format

3097 msgid ""

3098 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -3077,24 +3103,28 @@ msgstr ""

3103 "false`."

3104

3105 #: send-pack.c:141

3106 +msgid "unexpected flush packet while reading remote unpack status"

3107 +msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant"

3108 +

3109 +#: send-pack.c:143

3110 #, c-format

3111 msgid "unable to parse remote unpack status: %s"

3112 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

3113

3084 -#: send-pack.c:143

3114 +#: send-pack.c:145

3115 #, c-format

3116 msgid "remote unpack failed: %s"

3117 msgstr "le dépaquetage a échoué : %s"

3118

3089 -#: send-pack.c:306

3119 +#: send-pack.c:308

3120 msgid "failed to sign the push certificate"

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

3122

3093 -#: send-pack.c:419

3123 +#: send-pack.c:421

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

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

3126

3097 -#: send-pack.c:421

3127 +#: send-pack.c:423

3128 msgid ""

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

3130 "signed push"

@@ -3102,32 +3132,37 @@ msgstr ""

3132 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

3133 "poussées avec --signed"

3134

3105 -#: send-pack.c:433

3135 +#: send-pack.c:435

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

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

3138

3109 -#: send-pack.c:438

3139 +#: send-pack.c:440

3140 msgid "the receiving end does not support push options"

3141 msgstr "Le receveur ne gère pas les options de poussées"

3142

3113 -#: sequencer.c:218

3143 +#: sequencer.c:158

3144 +#, c-format

3145 +msgid "invalid commit message cleanup mode '%s'"

3146 +msgstr "mode de nettoyage invalide de message de validation '%s'"

3147 +

3148 +#: sequencer.c:267

3149 msgid "revert"

3150 msgstr "revert"

3151

3117 -#: sequencer.c:220

3152 +#: sequencer.c:269

3153 msgid "cherry-pick"

3154 msgstr "cherry-pick"

3155

3121 -#: sequencer.c:222

3156 +#: sequencer.c:271

3157 msgid "rebase -i"

3158 msgstr "rebase -i"

3159

3125 -#: sequencer.c:224

3160 +#: sequencer.c:273

3161 #, c-format

3162 msgid "Unknown action: %d"

3163 msgstr "Action inconnue : %d"

3164

3130 -#: sequencer.c:281

3165 +#: sequencer.c:330

3166 msgid ""

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

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

@@ -3135,7 +3170,7 @@ msgstr ""

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

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

3172

3138 -#: sequencer.c:284

3173 +#: sequencer.c:333

3174 msgid ""

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

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

@@ -3145,43 +3180,43 @@ msgstr ""

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

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

3182

3148 -#: sequencer.c:297 sequencer.c:1718

3183 +#: sequencer.c:346 sequencer.c:2245

3184 #, c-format

3185 msgid "could not lock '%s'"

3186 msgstr "impossible de verrouiller '%s'"

3187

3153 -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3154 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3188 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3189 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3190 #, c-format

3191 msgid "could not write to '%s'"

3192 msgstr "impossible d'écrire dans '%s'"

3193

3159 -#: sequencer.c:304

3194 +#: sequencer.c:353

3195 #, c-format

3196 msgid "could not write eol to '%s'"

3197 msgstr "impossible d'écrire la fin de ligne dans '%s'"

3198

3164 -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3199 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3200 #, c-format

3166 -msgid "failed to finalize '%s'."

3167 -msgstr "échec lors de la finalisation de '%s'."

3201 +msgid "failed to finalize '%s'"

3202 +msgstr "échec lors de la finalisation de '%s'"

3203

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

3170 -#: builtin/commit.c:754 builtin/merge.c:1046

3204 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3205 +#: builtin/commit.c:722 builtin/merge.c:1047

3206 #, c-format

3207 msgid "could not read '%s'"

3208 msgstr "impossible de lire '%s'"

3209

3175 -#: sequencer.c:358

3210 +#: sequencer.c:405

3211 #, c-format

3212 msgid "your local changes would be overwritten by %s."

3213 msgstr "vos modifications locales seraient écrasées par %s."

3214

3180 -#: sequencer.c:362

3215 +#: sequencer.c:409

3216 msgid "commit your changes or stash them to proceed."

3217 msgstr "validez vos modifications ou les remiser pour continuer."

3218

3184 -#: sequencer.c:391

3219 +#: sequencer.c:438

3220 #, c-format

3221 msgid "%s: fast-forward"

3222 msgstr "%s : avance rapide"

@@ -3189,20 +3224,20 @@ msgstr "%s : avance rapide"

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

3225 #. "rebase -i".

3226 #.

3192 -#: sequencer.c:477

3227 +#: sequencer.c:526

3228 #, c-format

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

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

3231

3197 -#: sequencer.c:496

3232 +#: sequencer.c:542

3233 msgid "could not resolve HEAD commit"

3234 msgstr "impossible de résoudre le commit HEAD"

3235

3201 -#: sequencer.c:516

3236 +#: sequencer.c:562

3237 msgid "unable to update cache tree"

3238 msgstr "impossible de mettre à jour l'arbre de cache"

3239

3205 -#: sequencer.c:600

3240 +#: sequencer.c:658

3241 #, c-format

3242 msgid ""

3243 "you have staged changes in your working tree\n"

@@ -3231,17 +3266,126 @@ msgstr ""

3266 "\n"

3267 " git rebase --continue\n"

3268

3234 -#: sequencer.c:702

3269 +#: sequencer.c:915

3270 +msgid "'prepare-commit-msg' hook failed"

3271 +msgstr "échec du crochet 'prepare-commit-msg'"

3272 +

3273 +#: sequencer.c:922

3274 +msgid ""

3275 +"Your name and email address were configured automatically based\n"

3276 +"on your username and hostname. Please check that they are accurate.\n"

3277 +"You can suppress this message by setting them explicitly. Run the\n"

3278 +"following command and follow the instructions in your editor to edit\n"

3279 +"your configuration file:\n"

3280 +"\n"

3281 +" git config --global --edit\n"

3282 +"\n"

3283 +"After doing this, you may fix the identity used for this commit with:\n"

3284 +"\n"

3285 +" git commit --amend --reset-author\n"

3286 +msgstr ""

3287 +"Votre nom et votre adresse courriel ont été configurés automatiquement en "

3288 +"se\n"

3289 +"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"

3290 +"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"

3291 +"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"

3292 +"instruction dans votre éditeur pour éditer votre fichier de configuration :\n"

3293 +"\n"

3294 +" git config --global --edit\n"

3295 +"\n"

3296 +"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "

3297 +"avec :\n"

3298 +"\n"

3299 +" git commit --amend --reset-author\n"

3300 +

3301 +#: sequencer.c:935

3302 +msgid ""

3303 +"Your name and email address were configured automatically based\n"

3304 +"on your username and hostname. Please check that they are accurate.\n"

3305 +"You can suppress this message by setting them explicitly:\n"

3306 +"\n"

3307 +" git config --global user.name \"Your Name\"\n"

3308 +" git config --global user.email you@example.com\n"

3309 +"\n"

3310 +"After doing this, you may fix the identity used for this commit with:\n"

3311 +"\n"

3312 +" git commit --amend --reset-author\n"

3313 +msgstr ""

3314 +"Votre nom et votre adresse courriel ont été configurés automatiquement en se "

3315 +"fondant\n"

3316 +"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "

3317 +"qu'ils sont corrects.\n"

3318 +"Vous pouvez supprimer ce message en les paramétrant explicitement :\n"

3319 +"\n"

3320 +" git config --global user.name \"Votre Nom\"\n"

3321 +" git config --global user.email vous@exemple.com\n"

3322 +"\n"

3323 +"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n"

3324 +"\n"

3325 +" git commit --amend --reset-author\n"

3326 +

3327 +#: sequencer.c:975

3328 +msgid "couldn't look up newly created commit"

3329 +msgstr "impossible de retrouver le commit nouvellement créé"

3330 +

3331 +#: sequencer.c:977

3332 +msgid "could not parse newly created commit"

3333 +msgstr "impossible d'analyser le commit nouvellement créé"

3334 +

3335 +#: sequencer.c:1023

3336 +msgid "unable to resolve HEAD after creating commit"

3337 +msgstr "impossible de résoudre HEAD après création du commit"

3338 +

3339 +#: sequencer.c:1025

3340 +msgid "detached HEAD"

3341 +msgstr "HEAD détachée"

3342 +

3343 +#: sequencer.c:1029

3344 +msgid " (root-commit)"

3345 +msgstr " (commit racine)"

3346 +

3347 +#: sequencer.c:1050

3348 +msgid "could not parse HEAD"

3349 +msgstr "impossible de lire HEAD"

3350 +

3351 +#: sequencer.c:1052

3352 +#, c-format

3353 +msgid "HEAD %s is not a commit!"

3354 +msgstr "HEAD %s n'est pas un commit !"

3355 +

3356 +#: sequencer.c:1056 builtin/commit.c:1491

3357 +msgid "could not parse HEAD commit"

3358 +msgstr "impossible d'analyser le commit HEAD"

3359 +

3360 +#: sequencer.c:1107 sequencer.c:1673

3361 +msgid "unable to parse commit author"

3362 +msgstr "impossible d'analyser l'auteur du commit"

3363 +

3364 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

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

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

3367 +

3368 +#: sequencer.c:1134 sequencer.c:1186

3369 +#, c-format

3370 +msgid "unable to read commit message from '%s'"

3371 +msgstr "impossible de lire le message de validation de '%s'"

3372 +

3373 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3374 +#: builtin/merge.c:851

3375 +msgid "failed to write commit object"

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

3377 +

3378 +#: sequencer.c:1213

3379 #, c-format

3380 msgid "could not parse commit %s"

3381 msgstr "impossible d'analyser le commit %s"

3382

3239 -#: sequencer.c:707

3383 +#: sequencer.c:1218

3384 #, c-format

3385 msgid "could not parse parent commit %s"

3386 msgstr "impossible d'analyser le commit parent %s"

3387

3244 -#: sequencer.c:836

3388 +#: sequencer.c:1347

3389 #, c-format

3390 msgid ""

3391 "unexpected 1st line of squash message:\n"

@@ -3252,7 +3396,7 @@ msgstr ""

3396 "\n"

3397 "\t%.*s"

3398

3255 -#: sequencer.c:842

3399 +#: sequencer.c:1353

3400 #, c-format

3401 msgid ""

3402 "invalid 1st line of squash message:\n"

@@ -3263,243 +3407,247 @@ msgstr ""

3407 "\n"

3408 "\t%.*s"

3409

3266 -#: sequencer.c:848 sequencer.c:873

3410 +#: sequencer.c:1359 sequencer.c:1384

3411 #, c-format

3412 msgid "This is a combination of %d commits."

3413 msgstr "Ceci est la combinaison de %d commits."

3414

3271 -#: sequencer.c:857 sequencer.c:2748

3415 +#: sequencer.c:1368 sequencer.c:3265

3416 msgid "need a HEAD to fixup"

3417 msgstr "une HEAD est nécessaire à la correction"

3418

3275 -#: sequencer.c:859

3419 +#: sequencer.c:1370

3420 msgid "could not read HEAD"

3421 msgstr "Impossible de lire HEAD"

3422

3279 -#: sequencer.c:861

3423 +#: sequencer.c:1372

3424 msgid "could not read HEAD's commit message"

3425 msgstr "impossible de lire le message de validation de HEAD"

3426

3283 -#: sequencer.c:867

3427 +#: sequencer.c:1378

3428 #, c-format

3429 msgid "cannot write '%s'"

3430 msgstr "impossible d'écrire '%s'"

3431

3288 -#: sequencer.c:876 git-rebase--interactive.sh:446

3432 +#: sequencer.c:1387 git-rebase--interactive.sh:452

3433 msgid "This is the 1st commit message:"

3434 msgstr "Ceci est le premier message de validation :"

3435

3292 -#: sequencer.c:884

3436 +#: sequencer.c:1395

3437 #, c-format

3438 msgid "could not read commit message of %s"

3439 msgstr "impossible de lire le message de validation de %s"

3440

3297 -#: sequencer.c:891

3441 +#: sequencer.c:1402

3442 #, c-format

3443 msgid "This is the commit message #%d:"

3444 msgstr "Ceci est le message de validation numéro %d :"

3445

3302 -#: sequencer.c:896

3446 +#: sequencer.c:1407

3447 #, c-format

3448 msgid "The commit message #%d will be skipped:"

3449 msgstr "Le message de validation %d sera ignoré :"

3450

3307 -#: sequencer.c:901

3451 +#: sequencer.c:1412

3452 #, c-format

3453 msgid "unknown command: %d"

3454 msgstr "commande inconnue : %d"

3455

3312 -#: sequencer.c:967

3456 +#: sequencer.c:1479

3457 msgid "your index file is unmerged."

3458 msgstr "votre fichier d'index n'est pas fusionné."

3459

3316 -#: sequencer.c:986

3460 +#: sequencer.c:1498

3461 #, c-format

3462 msgid "commit %s is a merge but no -m option was given."

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

3464

3321 -#: sequencer.c:994

3465 +#: sequencer.c:1506

3466 #, c-format

3467 msgid "commit %s does not have parent %d"

3468 msgstr "le commit %s n'a pas de parent %d"

3469

3326 -#: sequencer.c:998

3470 +#: sequencer.c:1510

3471 #, c-format

3472 msgid "mainline was specified but commit %s is not a merge."

3473 msgstr ""

3474 "une branche principale a été spécifiée mais le commit %s n'est pas une "

3475 "fusion."

3476

3333 -#: sequencer.c:1004

3477 +#: sequencer.c:1516

3478 #, c-format

3479 msgid "cannot get commit message for %s"

3480 msgstr "impossible d'obtenir un message de validation pour %s"

3481

3482 #. TRANSLATORS: The first %s will be a "todo" command like

3483 #. "revert" or "pick", the second %s a SHA1.

3340 -#: sequencer.c:1023

3484 +#: sequencer.c:1535

3485 #, c-format

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

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

3488

3345 -#: sequencer.c:1086 sequencer.c:1867

3489 +#: sequencer.c:1600 sequencer.c:2397

3490 #, c-format

3491 msgid "could not rename '%s' to '%s'"

3492 msgstr "impossible de renommer '%s' en '%s'"

3493

3350 -#: sequencer.c:1137

3494 +#: sequencer.c:1654

3495 #, c-format

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

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

3498

3355 -#: sequencer.c:1138

3499 +#: sequencer.c:1655

3500 #, c-format

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

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

3503

3360 -#: sequencer.c:1180

3504 +#: sequencer.c:1702

3505 msgid "empty commit set passed"

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

3507

3364 -#: sequencer.c:1190

3508 +#: sequencer.c:1712

3509 #, c-format

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

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

3512

3369 -#: sequencer.c:1196

3513 +#: sequencer.c:1718

3514 #, c-format

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

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

3517

3374 -#: sequencer.c:1270

3518 +#: sequencer.c:1792

3519 #, c-format

3520 msgid "%s does not accept arguments: '%s'"

3521 msgstr "%s n'accepte pas d'argument : '%s'"

3522

3379 -#: sequencer.c:1279

3523 +#: sequencer.c:1801

3524 #, c-format

3525 msgid "missing arguments for %s"

3526 msgstr "argument manquant pour %s"

3527

3384 -#: sequencer.c:1322

3528 +#: sequencer.c:1844

3529 #, c-format

3530 msgid "invalid line %d: %.*s"

3531 msgstr "ligne %d invalide : %.*s"

3532

3389 -#: sequencer.c:1330

3533 +#: sequencer.c:1852

3534 #, c-format

3535 msgid "cannot '%s' without a previous commit"

3536 msgstr "'%s' impossible avec le commit précédent"

3537

3394 -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3395 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3538 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3539 #, c-format

3540 msgid "could not read '%s'."

3541 msgstr "impossible de lire '%s'."

3542

3400 -#: sequencer.c:1375

3543 +#: sequencer.c:1906

3544 msgid "please fix this using 'git rebase --edit-todo'."

3545 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3546

3404 -#: sequencer.c:1377

3547 +#: sequencer.c:1908

3548 #, c-format

3549 msgid "unusable instruction sheet: '%s'"

3550 msgstr "feuille d'instruction inutilisable : '%s'"

3551

3409 -#: sequencer.c:1382

3552 +#: sequencer.c:1913

3553 msgid "no commits parsed."

3554 msgstr "aucun commit analysé."

3555

3413 -#: sequencer.c:1393

3556 +#: sequencer.c:1924

3557 msgid "cannot cherry-pick during a revert."

3558 msgstr "impossible de picorer pendant l'annulation d'un commit."

3559

3417 -#: sequencer.c:1395

3560 +#: sequencer.c:1926

3561 msgid "cannot revert during a cherry-pick."

3562 msgstr "impossible d'annuler un commit pendant un picorage."

3563

3421 -#: sequencer.c:1462

3564 +#: sequencer.c:1993

3565 #, c-format

3566 msgid "invalid key: %s"

3567 msgstr "clé invalide : %s"

3568

3426 -#: sequencer.c:1465

3569 +#: sequencer.c:1996

3570 #, c-format

3571 msgid "invalid value for %s: %s"

3572 msgstr "valeur invalide pour %s : %s"

3573

3431 -#: sequencer.c:1531

3574 +#: sequencer.c:2062

3575 #, c-format

3576 msgid "malformed options sheet: '%s'"

3577 msgstr "feuille d'options malformée : %s"

3578

3436 -#: sequencer.c:1569

3579 +#: sequencer.c:2100

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

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

3582

3440 -#: sequencer.c:1570

3583 +#: sequencer.c:2101

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

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

3586

3444 -#: sequencer.c:1573

3587 +#: sequencer.c:2104

3588 #, c-format

3589 msgid "could not create sequencer directory '%s'"

3590 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3591

3449 -#: sequencer.c:1588

3592 +#: sequencer.c:2118

3593 msgid "could not lock HEAD"

3594 msgstr "impossible de verrouiller HEAD"

3595

3453 -#: sequencer.c:1646 sequencer.c:2230

3596 +#: sequencer.c:2173 sequencer.c:2761

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

3598 msgstr "aucun picorage ou retour en cours"

3599

3457 -#: sequencer.c:1648

3600 +#: sequencer.c:2175

3601 msgid "cannot resolve HEAD"

3602 msgstr "impossible de résoudre HEAD"

3603

3461 -#: sequencer.c:1650 sequencer.c:1685

3604 +#: sequencer.c:2177 sequencer.c:2212

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

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

3607

3465 -#: sequencer.c:1671 builtin/grep.c:713

3608 +#: sequencer.c:2198 builtin/grep.c:720

3609 #, c-format

3610 msgid "cannot open '%s'"

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

3612

3470 -#: sequencer.c:1673

3613 +#: sequencer.c:2200

3614 #, c-format

3615 msgid "cannot read '%s': %s"

3616 msgstr "impossible de lire '%s' : %s"

3617

3475 -#: sequencer.c:1674

3618 +#: sequencer.c:2201

3619 msgid "unexpected end of file"

3620 msgstr "fin de fichier inattendue"

3621

3479 -#: sequencer.c:1680

3622 +#: sequencer.c:2207

3623 #, c-format

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

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

3626

3484 -#: sequencer.c:1691

3627 +#: sequencer.c:2218

3628 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3629 msgstr ""

3630 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3631

3489 -#: sequencer.c:1832 sequencer.c:2128

3632 +#: sequencer.c:2324 sequencer.c:2679

3633 +#, c-format

3634 +msgid "could not update %s"

3635 +msgstr "impossible de mettre à jour %s"

3636 +

3637 +#: sequencer.c:2362 sequencer.c:2659

3638 msgid "cannot read HEAD"

3639 msgstr "impossible de lire HEAD"

3640

3493 -#: sequencer.c:1872 builtin/difftool.c:639

3641 +#: sequencer.c:2402 builtin/difftool.c:639

3642 #, c-format

3643 msgid "could not copy '%s' to '%s'"

3644 msgstr "impossible de copier '%s' vers '%s'"

3645

3498 -#: sequencer.c:1891

3646 +#: sequencer.c:2421

3647 msgid "could not read index"

3648 msgstr "impossible de lire l'index"

3649

3502 -#: sequencer.c:1896

3650 +#: sequencer.c:2426

3651 #, c-format

3652 msgid ""

3653 "execution failed: %s\n"

@@ -3514,11 +3662,11 @@ msgstr ""

3662 "git rebase --continue\n"

3663 "\n"

3664

3517 -#: sequencer.c:1902

3665 +#: sequencer.c:2432

3666 msgid "and made changes to the index and/or the working tree\n"

3667 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3668

3521 -#: sequencer.c:1908

3669 +#: sequencer.c:2438

3670 #, c-format

3671 msgid ""

3672 "execution succeeded: %s\n"

@@ -3535,17 +3683,17 @@ msgstr ""

3683 " git rebase --continue\n"

3684 "\n"

3685

3538 -#: sequencer.c:1967

3686 +#: sequencer.c:2497

3687 #, c-format

3688 msgid "Applied autostash.\n"

3689 msgstr "Autoremisage appliqué.\n"

3690

3543 -#: sequencer.c:1979

3691 +#: sequencer.c:2509

3692 #, c-format

3693 msgid "cannot store %s"

3694 msgstr "impossible de stocker %s"

3695

3548 -#: sequencer.c:1982 git-rebase.sh:175

3696 +#: sequencer.c:2512 git-rebase.sh:178

3697 #, c-format

3698 msgid ""

3699 "Applying autostash resulted in conflicts.\n"

@@ -3556,57 +3704,52 @@ msgstr ""

3704 "Vos modifications sont à l'abri dans la remise.\n"

3705 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

3706

3559 -#: sequencer.c:2064

3707 +#: sequencer.c:2595

3708 #, c-format

3709 msgid "Stopped at %s... %.*s\n"

3710 msgstr "arrêt à %s... %.*s\n"

3711

3564 -#: sequencer.c:2106

3712 +#: sequencer.c:2637

3713 #, c-format

3714 msgid "unknown command %d"

3715 msgstr "commande inconnue %d"

3716

3569 -#: sequencer.c:2136

3717 +#: sequencer.c:2667

3718 msgid "could not read orig-head"

3719 msgstr "impossible de lire orig-head"

3720

3573 -#: sequencer.c:2141 sequencer.c:2745

3721 +#: sequencer.c:2672 sequencer.c:3262

3722 msgid "could not read 'onto'"

3723 msgstr "impossible de lire 'onto'"

3724

3577 -#: sequencer.c:2148

3578 -#, c-format

3579 -msgid "could not update %s"

3580 -msgstr "impossible de mettre à jour %s"

3581 -

3582 -#: sequencer.c:2155

3725 +#: sequencer.c:2686

3726 #, c-format

3727 msgid "could not update HEAD to %s"

3728 msgstr "impossible de mettre à jour HEAD sur %s"

3729

3587 -#: sequencer.c:2239

3730 +#: sequencer.c:2770

3731 msgid "cannot rebase: You have unstaged changes."

3732 msgstr "impossible de rebaser : vous avez des modifications non indexées."

3733

3591 -#: sequencer.c:2244

3734 +#: sequencer.c:2775

3735 msgid "could not remove CHERRY_PICK_HEAD"

3736 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3737

3595 -#: sequencer.c:2253

3738 +#: sequencer.c:2784

3739 msgid "cannot amend non-existing commit"

3740 msgstr "impossible de corriger un commit non-existant"

3741

3599 -#: sequencer.c:2255

3742 +#: sequencer.c:2786

3743 #, c-format

3744 msgid "invalid file: '%s'"

3745 msgstr "fichier invalide : '%s'"

3746

3604 -#: sequencer.c:2257

3747 +#: sequencer.c:2788

3748 #, c-format

3749 msgid "invalid contents: '%s'"

3750 msgstr "contenu invalide : '%s'"

3751

3609 -#: sequencer.c:2260

3752 +#: sequencer.c:2791

3753 msgid ""

3754 "\n"

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

@@ -3616,45 +3759,45 @@ msgstr ""

3759 "Vous avez des modifications non validées dans votre copie de travail.\n"

3760 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

3761

3619 -#: sequencer.c:2270

3762 +#: sequencer.c:2801

3763 msgid "could not commit staged changes."

3764 msgstr "impossible de valider les modifications indexées."

3765

3623 -#: sequencer.c:2350

3766 +#: sequencer.c:2881

3767 #, c-format

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

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

3770

3628 -#: sequencer.c:2354

3771 +#: sequencer.c:2885

3772 #, c-format

3773 msgid "%s: bad revision"

3774 msgstr "%s : mauvaise révision"

3775

3633 -#: sequencer.c:2387

3776 +#: sequencer.c:2918

3777 msgid "can't revert as initial commit"

3778 msgstr "impossible d'annuler en tant que commit initial"

3779

3637 -#: sequencer.c:2492

3780 +#: sequencer.c:3023

3781 msgid "make_script: unhandled options"

3782 msgstr "make_script : options non gérées"

3783

3641 -#: sequencer.c:2495

3784 +#: sequencer.c:3026

3785 msgid "make_script: error preparing revisions"

3786 msgstr "make_script : erreur lors de la préparation des révisions"

3787

3645 -#: sequencer.c:2529 sequencer.c:2564

3788 +#: sequencer.c:3060 sequencer.c:3095

3789 #, c-format

3790 msgid "unusable todo list: '%s'"

3791 msgstr "liste à faire inutilisable : '%s'"

3792

3650 -#: sequencer.c:2615

3793 +#: sequencer.c:3146

3794 #, c-format

3795 msgid ""

3796 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3797 msgstr ""

3798 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

3799

3657 -#: sequencer.c:2695

3800 +#: sequencer.c:3212

3801 #, c-format

3802 msgid ""

3803 "Warning: some commits may have been dropped accidentally.\n"

@@ -3663,7 +3806,7 @@ msgstr ""

3806 "Attention : certains commits ont pu être accidentellement supprimés.\n"

3807 "Commits supprimés (du plus jeune au plus vieux) :\n"

3808

3666 -#: sequencer.c:2702

3809 +#: sequencer.c:3219

3810 #, c-format

3811 msgid ""

3812 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3681,7 +3824,7 @@ msgstr ""

3824 "Les comportements disponibles sont : ignore, warn, error.\n"

3825 "\n"

3826

3684 -#: sequencer.c:2714

3827 +#: sequencer.c:3231

3828 #, c-format

3829 msgid ""

3830 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3692,21 +3835,26 @@ msgstr ""

3835 "rebase --continue'.\n"

3836 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

3837

3695 -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3838 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3839 #: builtin/am.c:779

3840 #, c-format

3841 msgid "could not open '%s' for writing"

3842 msgstr "impossible d'ouvrir '%s' en écriture"

3843

3701 -#: sequencer.c:2775

3844 +#: sequencer.c:3285

3845 #, c-format

3846 msgid "could not parse commit '%s'"

3847 msgstr "impossible d'analyser le commit '%s'"

3848

3706 -#: sequencer.c:2897

3849 +#: sequencer.c:3401

3850 msgid "the script was already rearranged."

3851 msgstr "le script a déjà été réarrangé."

3852

3853 +#: setup.c:122

3854 +#, c-format

3855 +msgid "'%s' is outside repository"

3856 +msgstr "'%s' est hors du dépôt"

3857 +

3858 #: setup.c:171

3859 #, c-format

3860 msgid ""

@@ -3728,6 +3876,11 @@ msgstr ""

3876 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3877 "'git <commande> [<révision>...] -- [<chemin>...]'"

3878

3879 +#: setup.c:233

3880 +#, c-format

3881 +msgid "option '%s' must come before non-option arguments"

3882 +msgstr "l'option '%s' doit être présente avant les arguments qui ne sont pas des options"

3883 +

3884 #: setup.c:252

3885 #, c-format

3886 msgid ""

@@ -3739,77 +3892,144 @@ msgstr ""

3892 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3893 "'git <commande> [<révision>...] -- [<chemin>...]'"

3894

3742 -#: setup.c:501

3895 +#: setup.c:388

3896 +msgid "unable to set up work tree using invalid config"

3897 +msgstr "impossible de mettre en place le répertoire de travail en utilisant une configuration invalide"

3898 +

3899 +#: setup.c:395

3900 +msgid "this operation must be run in a work tree"

3901 +msgstr "Cette opération doit être effectuée dans un arbre de travail"

3902 +

3903 +#: setup.c:506

3904 #, c-format

3905 msgid "Expected git repo version <= %d, found %d"

3906 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

3907

3747 -#: setup.c:509

3908 +#: setup.c:514

3909 msgid "unknown repository extensions found:"

3910 msgstr "extensions de dépôt inconnues trouvées :"

3911

3751 -#: setup.c:811

3912 +#: setup.c:533

3913 #, c-format

3753 -msgid "Not a git repository (or any of the parent directories): %s"

3754 -msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3914 +msgid "error opening '%s'"

3915 +msgstr "erreur à l'ouverture de '%s'"

3916

3756 -#: setup.c:813 builtin/index-pack.c:1653

3757 -msgid "Cannot come back to cwd"

3758 -msgstr "Impossible de revenir au répertoire de travail courant"

3917 +#: setup.c:535

3918 +#, c-format

3919 +msgid "too large to be a .git file: '%s'"

3920 +msgstr "trop gros pour être une fichier .git : '%s'"

3921 +

3922 +#: setup.c:537

3923 +#, c-format

3924 +msgid "error reading %s"

3925 +msgstr "erreur à la lecture de %s"

3926 +

3927 +#: setup.c:539

3928 +#, c-format

3929 +msgid "invalid gitfile format: %s"

3930 +msgstr "format de fichier git invalide : %s"

3931 +

3932 +#: setup.c:541

3933 +#, c-format

3934 +msgid "no path in gitfile: %s"

3935 +msgstr "aucun chemin dans le fichier git : %s"

3936 +

3937 +#: setup.c:543

3938 +#, c-format

3939 +msgid "not a git repository: %s"

3940 +msgstr "ce n'est pas un dépôt git : %s"

3941 +

3942 +#: setup.c:642

3943 +#, c-format

3944 +msgid "'$%s' too big"

3945 +msgstr "'$%s' trop gros"

3946 +

3947 +#: setup.c:656

3948 +#, c-format

3949 +msgid "not a git repository: '%s'"

3950 +msgstr "ce n'est pas un dépôt git : '%s'"

3951 +

3952 +#: setup.c:685 setup.c:687 setup.c:718

3953 +#, c-format

3954 +msgid "cannot chdir to '%s'"

3955 +msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"

3956 +

3957 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3958 +msgid "cannot come back to cwd"

3959 +msgstr "impossible de revenir au répertoire de travail courant"

3960 +

3961 +#: setup.c:816

3962 +#, c-format

3963 +msgid "not a git repository (or any of the parent directories): %s"

3964 +msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3965

3760 -#: setup.c:1052

3966 +#: setup.c:827

3967 +#, c-format

3968 +msgid "failed to stat '%*s%s%s'"

3969 +msgstr "échec du stat de '%*s%s%s'"

3970 +

3971 +#: setup.c:1057

3972 msgid "Unable to read current working directory"

3973 msgstr "Impossible d'accéder au répertoire de travail courant"

3974

3764 -#: setup.c:1064 setup.c:1070

3975 +#: setup.c:1069 setup.c:1075

3976 #, c-format

3766 -msgid "Cannot change to '%s'"

3767 -msgstr "Impossible de modifié en '%s'"

3977 +msgid "cannot change to '%s'"

3978 +msgstr "impossible de modifier en '%s'"

3979

3769 -#: setup.c:1083

3980 +#: setup.c:1088

3981 #, c-format

3982 msgid ""

3772 -"Not a git repository (or any parent up to mount point %s)\n"

3983 +"not a git repository (or any parent up to mount point %s)\n"

3984 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3985 msgstr ""

3775 -"Ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "

3776 -"n'est un dépôt git\n"

3777 -"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

3778 -"n'est pas activé)."

3986 +"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n"

3987 +"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)."

3988

3780 -#: setup.c:1167

3989 +#: setup.c:1172

3990 #, c-format

3991 msgid ""

3783 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

3992 +"problem with core.sharedRepository filemode value (0%.3o).\n"

3993 "The owner of files must always have read and write permissions."

3994 msgstr ""

3786 -"Problème avec la valeur de core.sharedRepository (0%.3o).\n"

3787 -"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

3788 -"écriture."

3995 +"problème avec la valeur de core.sharedRepository (0%.3o).\n"

3996 +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture."

3997 +

3998 +#: setup.c:1215

3999 +msgid "open /dev/null or dup failed"

4000 +msgstr "échec de l'ouverture ou au dup de /dev/null"

4001 +

4002 +#: setup.c:1230

4003 +msgid "fork failed"

4004 +msgstr "échec de la bifurcation"

4005

3790 -#: sha1_file.c:598

4006 +#: setup.c:1235

4007 +msgid "setsid failed"

4008 +msgstr "échec du setsid"

4009 +

4010 +#: sha1_file.c:592

4011 #, c-format

4012 msgid "path '%s' does not exist"

4013 msgstr "le chemin '%s' n'existe pas"

4014

3795 -#: sha1_file.c:624

4015 +#: sha1_file.c:618

4016 #, c-format

4017 msgid "reference repository '%s' as a linked checkout is not supported yet."

4018 msgstr ""

4019 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

4020 "encore supporté."

4021

3802 -#: sha1_file.c:630

4022 +#: sha1_file.c:624

4023 #, c-format

4024 msgid "reference repository '%s' is not a local repository."

4025 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

4026

3807 -#: sha1_file.c:636

4027 +#: sha1_file.c:630

4028 #, c-format

4029 msgid "reference repository '%s' is shallow"

4030 msgstr "le dépôt de référence '%s' est superficiel"

4031

3812 -#: sha1_file.c:644

4032 +#: sha1_file.c:638

4033 #, c-format

4034 msgid "reference repository '%s' is grafted"

4035 msgstr "le dépôt de référence '%s' est greffé"

@@ -3889,7 +4109,7 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

4109 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4110 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

4111

3892 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

4112 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

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

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

4115

@@ -3913,7 +4133,7 @@ msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

4133 msgid "submodule '%s' has dirty index"

4134 msgstr "le sous-module '%s' a un index sale"

4135

3916 -#: submodule.c:1876

4136 +#: submodule.c:1878

4137 #, c-format

4138 msgid ""

4139 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3921,18 +4141,18 @@ msgstr ""

4141 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

4142 "n'est pas supporté"

4143

3924 -#: submodule.c:1888 submodule.c:1944

4144 +#: submodule.c:1890 submodule.c:1946

4145 #, c-format

4146 msgid "could not lookup name for submodule '%s'"

4147 msgstr "impossible de trouve le nom pour le sous-module '%s'"

4148

3929 -#: submodule.c:1892 builtin/submodule--helper.c:909

3930 -#: builtin/submodule--helper.c:919

4149 +#: submodule.c:1894 builtin/submodule--helper.c:1246

4150 +#: builtin/submodule--helper.c:1256

4151 #, c-format

4152 msgid "could not create directory '%s'"

4153 msgstr "impossible de créer le répertoire '%s'"

4154

3935 -#: submodule.c:1895

4155 +#: submodule.c:1897

4156 #, c-format

4157 msgid ""

4158 "Migrating git directory of '%s%s' from\n"

@@ -3943,20 +4163,20 @@ msgstr ""

4163 "'%s' sur\n"

4164 "'%s'\n"

4165

3946 -#: submodule.c:1979

4166 +#: submodule.c:1981

4167 #, c-format

4168 msgid "could not recurse into submodule '%s'"

4169 msgstr "récursion impossible dans le sous-module '%s'"

4170

3951 -#: submodule.c:2023

4171 +#: submodule.c:2025

4172 msgid "could not start ls-files in .."

4173 msgstr "impossible de démarrer ls-files dans .."

4174

3955 -#: submodule.c:2043

4175 +#: submodule.c:2045

4176 msgid "BUG: returned path string doesn't match cwd?"

4177 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

4178

3959 -#: submodule.c:2062

4179 +#: submodule.c:2064

4180 #, c-format

4181 msgid "ls-tree returned unexpected return code %d"

4182 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

@@ -4034,7 +4254,7 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

4254 msgid "transport: invalid depth option '%s'"

4255 msgstr "transport : option de profondeur invalide '%s'"

4256

4037 -#: transport.c:904

4257 +#: transport.c:916

4258 #, c-format

4259 msgid ""

4260 "The following submodule paths contain changes that can\n"

@@ -4043,7 +4263,7 @@ msgstr ""

4263 "Les chemins suivant de sous-module contiennent des modifications\n"

4264 "qui ne peuvent être trouvées sur aucun distant :\n"

4265

4046 -#: transport.c:908

4266 +#: transport.c:920

4267 #, c-format

4268 msgid ""

4269 "\n"

@@ -4070,11 +4290,11 @@ msgstr ""

4290 "pour les pousser vers un serveur distant.\n"

4291 "\n"

4292

4073 -#: transport.c:916

4293 +#: transport.c:928

4294 msgid "Aborting."

4295 msgstr "Abandon."

4296

4077 -#: transport-helper.c:1074

4297 +#: transport-helper.c:1079

4298 #, c-format

4299 msgid "Could not read ref %s"

4300 msgstr "impossible de lire la réf %s"

@@ -4095,7 +4315,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"

4315 msgid "too-short tree file"

4316 msgstr "fichier arbre trop court"

4317

4098 -#: unpack-trees.c:107

4318 +#: unpack-trees.c:108

4319 #, c-format

4320 msgid ""

4321 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4106,7 +4326,7 @@ msgstr ""

4326 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

4327 "branche."

4328

4109 -#: unpack-trees.c:109

4329 +#: unpack-trees.c:110

4330 #, c-format

4331 msgid ""

4332 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4116,7 +4336,7 @@ msgstr ""

4336 "l'extraction :\n"

4337 "%%s"

4338

4119 -#: unpack-trees.c:112

4339 +#: unpack-trees.c:113

4340 #, c-format

4341 msgid ""

4342 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4126,7 +4346,7 @@ msgstr ""

4346 "fusion :\n"

4347 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

4348

4129 -#: unpack-trees.c:114

4349 +#: unpack-trees.c:115

4350 #, c-format

4351 msgid ""

4352 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4136,7 +4356,7 @@ msgstr ""

4356 "fusion :\n"

4357 "%%s"

4358

4139 -#: unpack-trees.c:117

4359 +#: unpack-trees.c:118

4360 #, c-format

4361 msgid ""

4362 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4145,7 +4365,7 @@ msgstr ""

4365 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4366 "%%sVeuillez valider ou remiser vos modifications avant %s."

4367

4148 -#: unpack-trees.c:119

4368 +#: unpack-trees.c:120

4369 #, c-format

4370 msgid ""

4371 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4154,7 +4374,7 @@ msgstr ""

4374 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4375 "%%s"

4376

4157 -#: unpack-trees.c:124

4377 +#: unpack-trees.c:125

4378 #, c-format

4379 msgid ""

4380 "Updating the following directories would lose untracked files in them:\n"

@@ -4164,7 +4384,7 @@ msgstr ""

4384 "contenus :\n"

4385 "%s"

4386

4167 -#: unpack-trees.c:128

4387 +#: unpack-trees.c:129

4388 #, c-format

4389 msgid ""

4390 "The following untracked working tree files would be removed by checkout:\n"

@@ -4174,7 +4394,7 @@ msgstr ""

4394 "l'extraction :\n"

4395 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4396

4177 -#: unpack-trees.c:130

4397 +#: unpack-trees.c:131

4398 #, c-format

4399 msgid ""

4400 "The following untracked working tree files would be removed by checkout:\n"

@@ -4183,7 +4403,7 @@ msgstr ""

4403 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

4404 "%%s"

4405

4186 -#: unpack-trees.c:133

4406 +#: unpack-trees.c:134

4407 #, c-format

4408 msgid ""

4409 "The following untracked working tree files would be removed by merge:\n"

@@ -4193,7 +4413,7 @@ msgstr ""

4413 "la fusion :\n"

4414 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4415

4196 -#: unpack-trees.c:135

4416 +#: unpack-trees.c:136

4417 #, c-format

4418 msgid ""

4419 "The following untracked working tree files would be removed by merge:\n"

@@ -4202,7 +4422,7 @@ msgstr ""

4422 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

4423 "%%s"

4424

4205 -#: unpack-trees.c:138

4425 +#: unpack-trees.c:139

4426 #, c-format

4427 msgid ""

4428 "The following untracked working tree files would be removed by %s:\n"

@@ -4212,7 +4432,7 @@ msgstr ""

4432 "%s :\n"

4433 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4434

4215 -#: unpack-trees.c:140

4435 +#: unpack-trees.c:141

4436 #, c-format

4437 msgid ""

4438 "The following untracked working tree files would be removed by %s:\n"

@@ -4221,7 +4441,7 @@ msgstr ""

4441 "Les fichiers suivants non suivis seraient effacés par %s :\n"

4442 "%%s"

4443

4224 -#: unpack-trees.c:145

4444 +#: unpack-trees.c:146

4445 #, c-format

4446 msgid ""

4447 "The following untracked working tree files would be overwritten by "

@@ -4232,7 +4452,7 @@ msgstr ""

4452 "l'extraction :\n"

4453 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4454

4235 -#: unpack-trees.c:147

4455 +#: unpack-trees.c:148

4456 #, c-format

4457 msgid ""

4458 "The following untracked working tree files would be overwritten by "

@@ -4242,7 +4462,7 @@ msgstr ""

4462 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

4463 "%%s"

4464

4245 -#: unpack-trees.c:150

4465 +#: unpack-trees.c:151

4466 #, c-format

4467 msgid ""

4468 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4252,7 +4472,7 @@ msgstr ""

4472 "la fusion :\n"

4473 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4474

4255 -#: unpack-trees.c:152

4475 +#: unpack-trees.c:153

4476 #, c-format

4477 msgid ""

4478 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4261,7 +4481,7 @@ msgstr ""

4481 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

4482 "%%s"

4483

4264 -#: unpack-trees.c:155

4484 +#: unpack-trees.c:156

4485 #, c-format

4486 msgid ""

4487 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4271,7 +4491,7 @@ msgstr ""

4491 "%s :\n"

4492 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4493

4274 -#: unpack-trees.c:157

4494 +#: unpack-trees.c:158

4495 #, c-format

4496 msgid ""

4497 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4280,12 +4500,12 @@ msgstr ""

4500 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

4501 "%%s"

4502

4283 -#: unpack-trees.c:164

4503 +#: unpack-trees.c:165

4504 #, c-format

4505 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4506 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

4507

4288 -#: unpack-trees.c:167

4508 +#: unpack-trees.c:168

4509 #, c-format

4510 msgid ""

4511 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4295,7 +4515,7 @@ msgstr ""

4515 "pas à jour :\n"

4516 "%s"

4517

4298 -#: unpack-trees.c:169

4518 +#: unpack-trees.c:170

4519 #, c-format

4520 msgid ""

4521 "The following working tree files would be overwritten by sparse checkout "

@@ -4306,7 +4526,7 @@ msgstr ""

4526 "jour par l'extraction creuse :\n"

4527 "%s"

4528

4309 -#: unpack-trees.c:171

4529 +#: unpack-trees.c:172

4530 #, c-format

4531 msgid ""

4532 "The following working tree files would be removed by sparse checkout "

@@ -4317,7 +4537,7 @@ msgstr ""

4537 "à jour par extraction creuse :\n"

4538 "%s"

4539

4320 -#: unpack-trees.c:173

4540 +#: unpack-trees.c:174

4541 #, c-format

4542 msgid ""

4543 "Cannot update submodule:\n"

@@ -4326,12 +4546,12 @@ msgstr ""

4546 "Mise à jour impossible pour le sous-module :\n"

4547 "%s"

4548

4329 -#: unpack-trees.c:250

4549 +#: unpack-trees.c:251

4550 #, c-format

4551 msgid "Aborting\n"

4552 msgstr "Abandon\n"

4553

4334 -#: unpack-trees.c:332

4554 +#: unpack-trees.c:333

4555 msgid "Checking out files"

4556 msgstr "Extraction des fichiers"

4557

@@ -4364,18 +4584,43 @@ msgstr "numéro de port invalide"

4584 msgid "invalid '..' path segment"

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

4586

4367 -#: worktree.c:245

4587 +#: worktree.c:245 builtin/am.c:2147

4588 #, c-format

4589 msgid "failed to read '%s'"

4590 msgstr "échec de la lecture de '%s'"

4591

4592 +#: worktree.c:291

4593 +#, c-format

4594 +msgid "'%s' at main working tree is not the repository directory"

4595 +msgstr "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"

4596 +

4597 +#: worktree.c:302

4598 +#, c-format

4599 +msgid "'%s' file does not contain absolute path to the working tree location"

4600 +msgstr "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre de travail"

4601 +

4602 +#: worktree.c:314

4603 +#, c-format

4604 +msgid "'%s' does not exist"

4605 +msgstr "'%s' n'existe pas"

4606 +

4607 +#: worktree.c:320

4608 +#, c-format

4609 +msgid "'%s' is not a .git file, error code %d"

4610 +msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"

4611 +

4612 +#: worktree.c:328

4613 +#, c-format

4614 +msgid "'%s' does not point back to '%s'"

4615 +msgstr "'%s' ne pointe pas en retour sur '%s'"

4616 +

4617 #: wrapper.c:223 wrapper.c:393

4618 #, c-format

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

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

4621

4622 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4378 -#: builtin/am.c:862 builtin/merge.c:1043

4623 +#: builtin/am.c:862 builtin/merge.c:1044

4624 #, c-format

4625 msgid "could not open '%s' for reading"

4626 msgstr "impossible d'ouvrir '%s' en lecture"

@@ -4389,158 +4634,158 @@ msgstr "impossible d'accéder à '%s'"

4634 msgid "unable to get current working directory"

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

4636

4392 -#: wt-status.c:150

4637 +#: wt-status.c:151

4638 msgid "Unmerged paths:"

4639 msgstr "Chemins non fusionnés :"

4640

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

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

4642 #, c-format

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

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

4645

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

4646 +#: wt-status.c:180 wt-status.c:207

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

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

4649

4405 -#: wt-status.c:183

4650 +#: wt-status.c:184

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

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

4653

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

4654 +#: wt-status.c:186 wt-status.c:190

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

4656 msgstr ""

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

4658 "résolu)"

4659

4415 -#: wt-status.c:187

4660 +#: wt-status.c:188

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

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

4663

4419 -#: wt-status.c:198 wt-status.c:984

4664 +#: wt-status.c:199 wt-status.c:1007

4665 msgid "Changes to be committed:"

4666 msgstr "Modifications qui seront validées :"

4667

4423 -#: wt-status.c:216 wt-status.c:993

4668 +#: wt-status.c:217 wt-status.c:1016

4669 msgid "Changes not staged for commit:"

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

4671

4427 -#: wt-status.c:220

4672 +#: wt-status.c:221

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

4674 msgstr ""

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

4676

4432 -#: wt-status.c:222

4677 +#: wt-status.c:223

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

4679 msgstr ""

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

4681 "validé)"

4682

4438 -#: wt-status.c:223

4683 +#: wt-status.c:224

4684 msgid ""

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

4686 msgstr ""

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

4688 "dans la copie de travail)"

4689

4445 -#: wt-status.c:225

4690 +#: wt-status.c:226

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

4692 msgstr ""

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

4694

4450 -#: wt-status.c:237

4695 +#: wt-status.c:238

4696 #, c-format

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

4698 msgstr ""

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

4700

4456 -#: wt-status.c:252

4701 +#: wt-status.c:253

4702 msgid "both deleted:"

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

4704

4460 -#: wt-status.c:254

4705 +#: wt-status.c:255

4706 msgid "added by us:"

4707 msgstr "ajouté par nous :"

4708

4464 -#: wt-status.c:256

4709 +#: wt-status.c:257

4710 msgid "deleted by them:"

4711 msgstr "supprimé par eux :"

4712

4468 -#: wt-status.c:258

4713 +#: wt-status.c:259

4714 msgid "added by them:"

4715 msgstr "ajouté par eux :"

4716

4472 -#: wt-status.c:260

4717 +#: wt-status.c:261

4718 msgid "deleted by us:"

4719 msgstr "supprimé par nous :"

4720

4476 -#: wt-status.c:262

4721 +#: wt-status.c:263

4722 msgid "both added:"

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

4724

4480 -#: wt-status.c:264

4725 +#: wt-status.c:265

4726 msgid "both modified:"

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

4728

4484 -#: wt-status.c:274

4729 +#: wt-status.c:275

4730 msgid "new file:"

4731 msgstr "nouveau fichier :"

4732

4488 -#: wt-status.c:276

4733 +#: wt-status.c:277

4734 msgid "copied:"

4735 msgstr "copié :"

4736

4492 -#: wt-status.c:278

4737 +#: wt-status.c:279

4738 msgid "deleted:"

4739 msgstr "supprimé :"

4740

4496 -#: wt-status.c:280

4741 +#: wt-status.c:281

4742 msgid "modified:"

4743 msgstr "modifié :"

4744

4500 -#: wt-status.c:282

4745 +#: wt-status.c:283

4746 msgid "renamed:"

4747 msgstr "renommé :"

4748

4504 -#: wt-status.c:284

4749 +#: wt-status.c:285

4750 msgid "typechange:"

4751 msgstr "modif. type :"

4752

4508 -#: wt-status.c:286

4753 +#: wt-status.c:287

4754 msgid "unknown:"

4755 msgstr "inconnu :"

4756

4512 -#: wt-status.c:288

4757 +#: wt-status.c:289

4758 msgid "unmerged:"

4759 msgstr "non fusionné :"

4760

4516 -#: wt-status.c:370

4761 +#: wt-status.c:369

4762 msgid "new commits, "

4763 msgstr "nouveaux commits, "

4764

4520 -#: wt-status.c:372

4765 +#: wt-status.c:371

4766 msgid "modified content, "

4767 msgstr "contenu modifié, "

4768

4524 -#: wt-status.c:374

4769 +#: wt-status.c:373

4770 msgid "untracked content, "

4771 msgstr "contenu non suivi, "

4772

4528 -#: wt-status.c:824

4773 +#: wt-status.c:847

4774 #, c-format

4775 msgid "Your stash currently has %d entry"

4776 msgid_plural "Your stash currently has %d entries"

4777 msgstr[0] "Votre remisage contient actuellement %d entrée"

4778 msgstr[1] "Votre remisage contient actuellement %d entrées"

4779

4535 -#: wt-status.c:856

4780 +#: wt-status.c:879

4781 msgid "Submodules changed but not updated:"

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

4783

4539 -#: wt-status.c:858

4784 +#: wt-status.c:881

4785 msgid "Submodule changes to be committed:"

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

4787

4543 -#: wt-status.c:940

4788 +#: wt-status.c:963

4789 msgid ""

4790 "Do not modify or remove the line above.\n"

4791 "Everything below it will be ignored."

@@ -4548,107 +4793,107 @@ msgstr ""

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

4794 "Tout ce qui suit sera éliminé."

4795

4551 -#: wt-status.c:1053

4796 +#: wt-status.c:1076

4797 msgid "You have unmerged paths."

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

4799

4555 -#: wt-status.c:1056

4800 +#: wt-status.c:1079

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

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

4803

4559 -#: wt-status.c:1058

4804 +#: wt-status.c:1081

4805 msgid " (use \"git merge --abort\" to abort the merge)"

4806 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

4807

4563 -#: wt-status.c:1063

4808 +#: wt-status.c:1086

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

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

4811

4567 -#: wt-status.c:1066

4812 +#: wt-status.c:1089

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

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

4815

4571 -#: wt-status.c:1076

4816 +#: wt-status.c:1099

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

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

4819

4575 -#: wt-status.c:1079

4820 +#: wt-status.c:1102

4821 msgid "The current patch is empty."

4822 msgstr "Le patch actuel est vide."

4823

4579 -#: wt-status.c:1083

4824 +#: wt-status.c:1106

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

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

4827

4583 -#: wt-status.c:1085

4828 +#: wt-status.c:1108

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

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

4831

4587 -#: wt-status.c:1087

4832 +#: wt-status.c:1110

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

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

4835

4591 -#: wt-status.c:1219

4836 +#: wt-status.c:1242

4837 msgid "git-rebase-todo is missing."

4838 msgstr "git-rebase-todo est manquant."

4839

4595 -#: wt-status.c:1221

4840 +#: wt-status.c:1244

4841 msgid "No commands done."

4842 msgstr "Aucune commande réalisée."

4843

4599 -#: wt-status.c:1224

4844 +#: wt-status.c:1247

4845 #, c-format

4846 msgid "Last command done (%d command done):"

4847 msgid_plural "Last commands done (%d commands done):"

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

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

4850

4606 -#: wt-status.c:1235

4851 +#: wt-status.c:1258

4852 #, c-format

4853 msgid " (see more in file %s)"

4854 msgstr " (voir plus dans le fichier %s)"

4855

4611 -#: wt-status.c:1240

4856 +#: wt-status.c:1263

4857 msgid "No commands remaining."

4858 msgstr "Aucune commande restante."

4859

4615 -#: wt-status.c:1243

4860 +#: wt-status.c:1266

4861 #, c-format

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

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

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

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

4866

4622 -#: wt-status.c:1251

4867 +#: wt-status.c:1274

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

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

4870

4626 -#: wt-status.c:1264

4871 +#: wt-status.c:1287

4872 #, c-format

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

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

4875

4631 -#: wt-status.c:1269

4876 +#: wt-status.c:1292

4877 msgid "You are currently rebasing."

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

4879

4635 -#: wt-status.c:1283

4880 +#: wt-status.c:1306

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

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

4883

4639 -#: wt-status.c:1285

4884 +#: wt-status.c:1308

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

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

4887

4643 -#: wt-status.c:1287

4888 +#: wt-status.c:1310

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

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

4891

4647 -#: wt-status.c:1293

4892 +#: wt-status.c:1316

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

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

4895

4651 -#: wt-status.c:1297

4896 +#: wt-status.c:1320

4897 #, c-format

4898 msgid ""

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

@@ -4656,128 +4901,128 @@ msgstr ""

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

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

4903

4659 -#: wt-status.c:1302

4904 +#: wt-status.c:1325

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

4906 msgstr ""

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

4908

4664 -#: wt-status.c:1305

4909 +#: wt-status.c:1328

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

4911 msgstr ""

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

4913

4669 -#: wt-status.c:1309

4914 +#: wt-status.c:1332

4915 #, c-format

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

4917 msgstr ""

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

4919 "branche '%s' sur '%s'."

4920

4676 -#: wt-status.c:1314

4921 +#: wt-status.c:1337

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

4923 msgstr ""

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

4925

4681 -#: wt-status.c:1317

4926 +#: wt-status.c:1340

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

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

4929

4685 -#: wt-status.c:1319

4930 +#: wt-status.c:1342

4931 msgid ""

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

4933 msgstr ""

4934 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

4935 "modifications)"

4936

4692 -#: wt-status.c:1329

4937 +#: wt-status.c:1352

4938 #, c-format

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

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

4941

4697 -#: wt-status.c:1334

4942 +#: wt-status.c:1357

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

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

4945

4701 -#: wt-status.c:1337

4946 +#: wt-status.c:1360

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

4948 msgstr ""

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

4950

4706 -#: wt-status.c:1339

4951 +#: wt-status.c:1362

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

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

4954

4710 -#: wt-status.c:1348

4955 +#: wt-status.c:1371

4956 #, c-format

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

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

4959

4715 -#: wt-status.c:1353

4960 +#: wt-status.c:1376

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

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

4963

4719 -#: wt-status.c:1356

4964 +#: wt-status.c:1379

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

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

4967

4723 -#: wt-status.c:1358

4968 +#: wt-status.c:1381

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

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

4971

4727 -#: wt-status.c:1369

4972 +#: wt-status.c:1392

4973 #, c-format

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

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

4976

4732 -#: wt-status.c:1373

4977 +#: wt-status.c:1396

4978 msgid "You are currently bisecting."

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

4980

4736 -#: wt-status.c:1376

4981 +#: wt-status.c:1399

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

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

4984

4740 -#: wt-status.c:1573

4985 +#: wt-status.c:1596

4986 msgid "On branch "

4987 msgstr "Sur la branche "

4988

4744 -#: wt-status.c:1579

4989 +#: wt-status.c:1602

4990 msgid "interactive rebase in progress; onto "

4991 msgstr "rebasage interactif en cours ; sur "

4992

4748 -#: wt-status.c:1581

4993 +#: wt-status.c:1604

4994 msgid "rebase in progress; onto "

4995 msgstr "rebasage en cours ; sur "

4996

4752 -#: wt-status.c:1586

4997 +#: wt-status.c:1609

4998 msgid "HEAD detached at "

4999 msgstr "HEAD détachée sur "

5000

4756 -#: wt-status.c:1588

5001 +#: wt-status.c:1611

5002 msgid "HEAD detached from "

5003 msgstr "HEAD détachée depuis "

5004

4760 -#: wt-status.c:1591

5005 +#: wt-status.c:1614

5006 msgid "Not currently on any branch."

5007 msgstr "Actuellement sur aucun branche."

5008

4764 -#: wt-status.c:1611

5009 +#: wt-status.c:1634

5010 msgid "Initial commit"

5011 msgstr "Validation initiale"

5012

4768 -#: wt-status.c:1612

5013 +#: wt-status.c:1635

5014 msgid "No commits yet"

5015 msgstr "Aucun commit"

5016

4772 -#: wt-status.c:1626

5017 +#: wt-status.c:1649

5018 msgid "Untracked files"

5019 msgstr "Fichiers non suivis"

5020

4776 -#: wt-status.c:1628

5021 +#: wt-status.c:1651

5022 msgid "Ignored files"

5023 msgstr "Fichiers ignorés"

5024

4780 -#: wt-status.c:1632

5025 +#: wt-status.c:1655

5026 #, c-format

5027 msgid ""

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

@@ -4789,32 +5034,32 @@ msgstr ""

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

5035 "status')."

5036

4792 -#: wt-status.c:1638

5037 +#: wt-status.c:1661

5038 #, c-format

5039 msgid "Untracked files not listed%s"

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

5041

4797 -#: wt-status.c:1640

5042 +#: wt-status.c:1663

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

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

5045

4801 -#: wt-status.c:1646

5046 +#: wt-status.c:1669

5047 msgid "No changes"

5048 msgstr "Aucune modification"

5049

4805 -#: wt-status.c:1651

5050 +#: wt-status.c:1674

5051 #, c-format

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

5053 msgstr ""

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

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

5056

4812 -#: wt-status.c:1654

5057 +#: wt-status.c:1677

5058 #, c-format

5059 msgid "no changes added to commit\n"

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

5061

4817 -#: wt-status.c:1657

5062 +#: wt-status.c:1680

5063 #, c-format

5064 msgid ""

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

@@ -4823,67 +5068,71 @@ msgstr ""

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

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

5070

4826 -#: wt-status.c:1660

5071 +#: wt-status.c:1683

5072 #, c-format

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

5074 msgstr ""

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

5076 "sont présents\n"

5077

4833 -#: wt-status.c:1663

5078 +#: wt-status.c:1686

5079 #, c-format

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

5081 msgstr ""

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

5083 "suivre)\n"

5084

4840 -#: wt-status.c:1666 wt-status.c:1671

5085 +#: wt-status.c:1689 wt-status.c:1694

5086 #, c-format

5087 msgid "nothing to commit\n"

5088 msgstr "rien à valider\n"

5089

4845 -#: wt-status.c:1669

5090 +#: wt-status.c:1692

5091 #, c-format

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

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

5094

4850 -#: wt-status.c:1673

5095 +#: wt-status.c:1696

5096 #, c-format

5097 msgid "nothing to commit, working tree clean\n"

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

5099

4855 -#: wt-status.c:1785

5100 +#: wt-status.c:1809

5101 msgid "No commits yet on "

5102 msgstr "Encore aucun commit sur "

5103

4859 -#: wt-status.c:1789

5104 +#: wt-status.c:1813

5105 msgid "HEAD (no branch)"

5106 msgstr "HEAD (aucune branche)"

5107

4863 -#: wt-status.c:1818 wt-status.c:1826

5108 +#: wt-status.c:1844

5109 +msgid "different"

5110 +msgstr "différent"

5111 +

5112 +#: wt-status.c:1846 wt-status.c:1854

5113 msgid "behind "

5114 msgstr "derrière "

5115

4867 -#: wt-status.c:1821 wt-status.c:1824

5116 +#: wt-status.c:1849 wt-status.c:1852

5117 msgid "ahead "

5118 msgstr "devant "

5119

5120 #. TRANSLATORS: the action is e.g. "pull with rebase"

4872 -#: wt-status.c:2318

5121 +#: wt-status.c:2358

5122 #, c-format

5123 msgid "cannot %s: You have unstaged changes."

5124 msgstr "Impossible de %s : vous avez des modifications non indexées."

5125

4877 -#: wt-status.c:2324

5126 +#: wt-status.c:2364

5127 msgid "additionally, your index contains uncommitted changes."

5128 msgstr "de plus, votre index contient des modifications non validées."

5129

4881 -#: wt-status.c:2326

5130 +#: wt-status.c:2366

5131 #, c-format

5132 msgid "cannot %s: Your index contains uncommitted changes."

5133 msgstr "%s impossible : votre index contient des modifications non validées."

5134

4886 -#: compat/precompose_utf8.c:58 builtin/clone.c:437

5135 +#: compat/precompose_utf8.c:58 builtin/clone.c:440

5136 #, c-format

5137 msgid "failed to unlink '%s'"

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

@@ -4897,7 +5146,7 @@ msgstr "git add [<options>] [--] <chemin>..."

5146 msgid "unexpected diff status %c"

5147 msgstr "état de diff inattendu %c"

5148

4900 -#: builtin/add.c:88 builtin/commit.c:291

5149 +#: builtin/add.c:88 builtin/commit.c:257

5150 msgid "updating files failed"

5151 msgstr "échec de la mise à jour des fichiers"

5152

@@ -4946,7 +5195,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

5195 msgstr ""

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

5197

4949 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

5198 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5199 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5200 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5201 msgid "dry run"

@@ -4956,7 +5205,7 @@ msgstr "simuler l'action"

5205 msgid "interactive picking"

5206 msgstr "sélection interactive"

5207

4959 -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

5208 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5209 msgid "select hunks interactively"

5210 msgstr "sélection interactive des sections"

5211

@@ -5085,10 +5334,10 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"

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

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

5336

5088 -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

5089 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

5090 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

5091 -#: builtin/rm.c:271 builtin/submodule--helper.c:311

5337 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5338 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5339 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5340 +#: builtin/rm.c:271 builtin/submodule--helper.c:326

5341 msgid "index file corrupt"

5342 msgstr "fichier d'index corrompu"

5343

@@ -5140,62 +5389,62 @@ msgstr "décalage horaire invalide"

5389 msgid "Patch format detection failed."

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

5391

5143 -#: builtin/am.c:1013 builtin/clone.c:402

5392 +#: builtin/am.c:1013 builtin/clone.c:405

5393 #, c-format

5394 msgid "failed to create directory '%s'"

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

5396

5148 -#: builtin/am.c:1017

5397 +#: builtin/am.c:1018

5398 msgid "Failed to split patches."

5399 msgstr "Échec de découpage des patchs."

5400

5152 -#: builtin/am.c:1146 builtin/commit.c:376

5401 +#: builtin/am.c:1148 builtin/commit.c:342

5402 msgid "unable to write index file"

5403 msgstr "impossible d'écrire le fichier d'index"

5404

5156 -#: builtin/am.c:1160

5405 +#: builtin/am.c:1162

5406 #, c-format

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

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

5409

5161 -#: builtin/am.c:1161

5410 +#: builtin/am.c:1163

5411 #, c-format

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

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

5414

5166 -#: builtin/am.c:1162

5415 +#: builtin/am.c:1164

5416 #, c-format

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

5418 msgstr ""

5419 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

5420 "abort\"."

5421

5173 -#: builtin/am.c:1269

5422 +#: builtin/am.c:1271

5423 msgid "Patch is empty."

5424 msgstr "Le patch actuel est vide."

5425

5177 -#: builtin/am.c:1335

5426 +#: builtin/am.c:1337

5427 #, c-format

5428 msgid "invalid ident line: %.*s"

5429 msgstr "ligne d'identification invalide : %.*s"

5430

5182 -#: builtin/am.c:1357

5431 +#: builtin/am.c:1359

5432 #, c-format

5433 msgid "unable to parse commit %s"

5434 msgstr "impossible d'analyser le commit %s"

5435

5187 -#: builtin/am.c:1550

5436 +#: builtin/am.c:1554

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

5438 msgstr ""

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

5440 "points."

5441

5193 -#: builtin/am.c:1552

5442 +#: builtin/am.c:1556

5443 msgid "Using index info to reconstruct a base tree..."

5444 msgstr ""

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

5446

5198 -#: builtin/am.c:1571

5447 +#: builtin/am.c:1575

5448 msgid ""

5449 "Did you hand edit your patch?\n"

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

@@ -5203,38 +5452,29 @@ msgstr ""

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

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

5454

5206 -#: builtin/am.c:1577

5455 +#: builtin/am.c:1581

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

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

5458

5210 -#: builtin/am.c:1602

5459 +#: builtin/am.c:1606

5460 msgid "Failed to merge in the changes."

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

5462

5214 -#: builtin/am.c:1626 builtin/merge.c:642

5215 -msgid "git write-tree failed to write a tree"

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

5217 -

5218 -#: builtin/am.c:1633

5463 +#: builtin/am.c:1637

5464 msgid "applying to an empty history"

5465 msgstr "application à un historique vide"

5466

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

5223 -#: builtin/merge.c:850

5224 -msgid "failed to write commit object"

5225 -msgstr "échec de l'écriture de l'objet commit"

5226 -

5227 -#: builtin/am.c:1679 builtin/am.c:1683

5467 +#: builtin/am.c:1683 builtin/am.c:1687

5468 #, c-format

5469 msgid "cannot resume: %s does not exist."

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

5471

5232 -#: builtin/am.c:1699

5472 +#: builtin/am.c:1703

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

5474 msgstr ""

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

5476

5237 -#: builtin/am.c:1704

5477 +#: builtin/am.c:1708

5478 msgid "Commit Body is:"

5479 msgstr "Le corps de la validation est :"

5480

@@ -5242,35 +5482,34 @@ msgstr "Le corps de la validation est :"

5482 #. in your translation. The program will only accept English

5483 #. input at this point.

5484 #.

5245 -#: builtin/am.c:1714

5485 +#: builtin/am.c:1718

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

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

5488

5249 -#: builtin/am.c:1764

5489 +#: builtin/am.c:1768

5490 #, c-format

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

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

5493

5254 -#: builtin/am.c:1804 builtin/am.c:1876

5494 +#: builtin/am.c:1808 builtin/am.c:1879

5495 #, c-format

5496 msgid "Applying: %.*s"

5497 msgstr "Application de %.*s"

5498

5259 -#: builtin/am.c:1820

5499 +#: builtin/am.c:1824

5500 msgid "No changes -- Patch already applied."

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

5502

5263 -#: builtin/am.c:1828

5503 +#: builtin/am.c:1832

5504 #, c-format

5505 msgid "Patch failed at %s %.*s"

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

5507

5268 -#: builtin/am.c:1834

5269 -#, c-format

5270 -msgid "The copy of the patch that failed is found in: %s"

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

5508 +#: builtin/am.c:1838

5509 +msgid "Use 'git am --show-current-patch' to see the failed patch"

5510 +msgstr "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"

5511

5273 -#: builtin/am.c:1879

5512 +#: builtin/am.c:1882

5513 msgid ""

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

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

@@ -5281,7 +5520,7 @@ msgstr ""

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

5521 "patch."

5522

5284 -#: builtin/am.c:1886

5523 +#: builtin/am.c:1889

5524 msgid ""

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

5526 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5294,17 +5533,17 @@ msgstr ""

5533 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "

5534 "accepter son état."

5535

5297 -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5298 -#: builtin/reset.c:340

5536 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324

5537 +#: builtin/reset.c:332

5538 #, c-format

5539 msgid "Could not parse object '%s'."

5540 msgstr "Impossible d'analyser l'objet '%s'."

5541

5303 -#: builtin/am.c:2045

5542 +#: builtin/am.c:2048

5543 msgid "failed to clean index"

5544 msgstr "échec du nettoyage de l'index"

5545

5307 -#: builtin/am.c:2080

5546 +#: builtin/am.c:2083

5547 msgid ""

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

5549 "Not rewinding to ORIG_HEAD"

@@ -5312,135 +5551,143 @@ msgstr ""

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

5552 "Pas de retour à ORIG_HEAD"

5553

5315 -#: builtin/am.c:2143

5554 +#: builtin/am.c:2174

5555 #, c-format

5556 msgid "Invalid value for --patch-format: %s"

5557 msgstr "Valeur invalide pour --patch-format : %s"

5558

5320 -#: builtin/am.c:2176

5559 +#: builtin/am.c:2210

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

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

5562

5324 -#: builtin/am.c:2177

5563 +#: builtin/am.c:2211

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

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

5566

5328 -#: builtin/am.c:2183

5567 +#: builtin/am.c:2217

5568 msgid "run interactively"

5569 msgstr "exécution interactive"

5570

5332 -#: builtin/am.c:2185

5571 +#: builtin/am.c:2219

5572 msgid "historical option -- no-op"

5573 msgstr "option historique -- no-op"

5574

5336 -#: builtin/am.c:2187

5575 +#: builtin/am.c:2221

5576 msgid "allow fall back on 3way merging if needed"

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

5578

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

5341 -#: builtin/repack.c:180

5579 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5580 +#: builtin/repack.c:182

5581 msgid "be quiet"

5582 msgstr "être silencieux"

5583

5345 -#: builtin/am.c:2190

5584 +#: builtin/am.c:2224

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

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

5587

5349 -#: builtin/am.c:2193

5588 +#: builtin/am.c:2227

5589 msgid "recode into utf8 (default)"

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

5591

5353 -#: builtin/am.c:2195

5592 +#: builtin/am.c:2229

5593 msgid "pass -k flag to git-mailinfo"

5594 msgstr "passer l'option -k à git-mailinfo"

5595

5357 -#: builtin/am.c:2197

5596 +#: builtin/am.c:2231

5597 msgid "pass -b flag to git-mailinfo"

5598 msgstr "passer l'option -b à git-mailinfo"

5599

5361 -#: builtin/am.c:2199

5600 +#: builtin/am.c:2233

5601 msgid "pass -m flag to git-mailinfo"

5602 msgstr "passer l'option -m à git-mailinfo"

5603

5365 -#: builtin/am.c:2201

5604 +#: builtin/am.c:2235

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

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

5607

5369 -#: builtin/am.c:2204

5608 +#: builtin/am.c:2238

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

5610 msgstr ""

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

5612

5374 -#: builtin/am.c:2207

5613 +#: builtin/am.c:2241

5614 msgid "strip everything before a scissors line"

5615 msgstr "retirer tout le contenu avant la ligne des ciseaux"

5616

5378 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5379 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5380 -#: builtin/am.c:2236

5617 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252

5618 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264

5619 +#: builtin/am.c:2270

5620 msgid "pass it through git-apply"

5621 msgstr "le passer jusqu'à git-apply"

5622

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

5385 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5386 -#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5387 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5388 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5623 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5624 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5625 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5626 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5627 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5628 msgid "n"

5629 msgstr "n"

5630

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

5393 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5631 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5632 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5633 msgid "format"

5634 msgstr "format"

5635

5397 -#: builtin/am.c:2233

5636 +#: builtin/am.c:2267

5637 msgid "format the patch(es) are in"

5638 msgstr "format de présentation des patchs"

5639

5401 -#: builtin/am.c:2239

5640 +#: builtin/am.c:2273

5641 msgid "override error message when patch failure occurs"

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

5643

5405 -#: builtin/am.c:2241

5644 +#: builtin/am.c:2275

5645 msgid "continue applying patches after resolving a conflict"

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

5647

5409 -#: builtin/am.c:2244

5648 +#: builtin/am.c:2278

5649 msgid "synonyms for --continue"

5650 msgstr "synonymes de --continue"

5651

5413 -#: builtin/am.c:2247

5652 +#: builtin/am.c:2281

5653 msgid "skip the current patch"

5654 msgstr "sauter le patch courant"

5655

5417 -#: builtin/am.c:2250

5656 +#: builtin/am.c:2284

5657 msgid "restore the original branch and abort the patching operation."

5658 msgstr ""

5659 "restaurer la branche originale et abandonner les applications de patch."

5660

5422 -#: builtin/am.c:2254

5661 +#: builtin/am.c:2287

5662 +msgid "abort the patching operation but keep HEAD where it is."

5663 +msgstr "abandonne l'opération de patch mais garde HEAD où il est."

5664 +

5665 +#: builtin/am.c:2290

5666 +msgid "show the patch being applied."

5667 +msgstr "afficher le patch en cours d'application."

5668 +

5669 +#: builtin/am.c:2294

5670 msgid "lie about committer date"

5671 msgstr "mentir sur la date de validation"

5672

5426 -#: builtin/am.c:2256

5673 +#: builtin/am.c:2296

5674 msgid "use current timestamp for author date"

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

5676

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

5431 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5677 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5678 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5679 msgid "key-id"

5680 msgstr "id-clé"

5681

5435 -#: builtin/am.c:2259

5682 +#: builtin/am.c:2299

5683 msgid "GPG-sign commits"

5684 msgstr "signer les commits avec GPG"

5685

5439 -#: builtin/am.c:2262

5686 +#: builtin/am.c:2302

5687 msgid "(internal use for git-rebase)"

5688 msgstr "(utilisation interne pour git-rebase)"

5689

5443 -#: builtin/am.c:2280

5690 +#: builtin/am.c:2320

5691 msgid ""

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

5693 "it will be removed. Please do not use it anymore."

@@ -5448,17 +5695,17 @@ msgstr ""

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

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

5697

5451 -#: builtin/am.c:2287

5698 +#: builtin/am.c:2327

5699 msgid "failed to read the index"

5700 msgstr "échec à la lecture de l'index"

5701

5455 -#: builtin/am.c:2302

5702 +#: builtin/am.c:2342

5703 #, c-format

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

5705 msgstr ""

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

5707

5461 -#: builtin/am.c:2326

5708 +#: builtin/am.c:2366

5709 #, c-format

5710 msgid ""

5711 "Stray %s directory found.\n"

@@ -5467,7 +5714,7 @@ msgstr ""

5714 "Répertoire abandonné %s trouvé.\n"

5715 "Utilisez \"git am --abort\" pour le supprimer."

5716

5470 -#: builtin/am.c:2332

5717 +#: builtin/am.c:2372

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

5719 msgstr ""

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

@@ -5491,8 +5738,8 @@ msgid "git archive: Remote with no URL"

5738 msgstr "git archive : Dépôt distant sans URL"

5739

5740 #: builtin/archive.c:58

5494 -msgid "git archive: expected ACK/NAK, got EOF"

5495 -msgstr "git archive : ACK/NACK attendu, EOF reçu"

5741 +msgid "git archive: expected ACK/NAK, got a flush packet"

5742 +msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"

5743

5744 #: builtin/archive.c:61

5745 #, c-format

@@ -5578,113 +5825,113 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"

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

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

5827

5581 -#: builtin/blame.c:668

5828 +#: builtin/blame.c:677

5829 msgid "Show blame entries as we find them, incrementally"

5830 msgstr ""

5831 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

5832 "manière incrémentale"

5833

5587 -#: builtin/blame.c:669

5834 +#: builtin/blame.c:678

5835 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5836 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

5837

5591 -#: builtin/blame.c:670

5838 +#: builtin/blame.c:679

5839 msgid "Do not treat root commits as boundaries (Default: off)"

5840 msgstr ""

5841 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

5842

5596 -#: builtin/blame.c:671

5843 +#: builtin/blame.c:680

5844 msgid "Show work cost statistics"

5845 msgstr "Montrer les statistiques de coût d'activité"

5846

5600 -#: builtin/blame.c:672

5847 +#: builtin/blame.c:681

5848 msgid "Force progress reporting"

5849 msgstr "Forcer l'affichage de l'état d'avancement"

5850

5604 -#: builtin/blame.c:673

5851 +#: builtin/blame.c:682

5852 msgid "Show output score for blame entries"

5853 msgstr "Montrer le score de sortie pour les éléments de blâme"

5854

5608 -#: builtin/blame.c:674

5855 +#: builtin/blame.c:683

5856 msgid "Show original filename (Default: auto)"

5857 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

5858

5612 -#: builtin/blame.c:675

5859 +#: builtin/blame.c:684

5860 msgid "Show original linenumber (Default: off)"

5861 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

5862

5616 -#: builtin/blame.c:676

5863 +#: builtin/blame.c:685

5864 msgid "Show in a format designed for machine consumption"

5865 msgstr "Afficher dans un format propice à la consommation par machine"

5866

5620 -#: builtin/blame.c:677

5867 +#: builtin/blame.c:686

5868 msgid "Show porcelain format with per-line commit information"

5869 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

5870

5624 -#: builtin/blame.c:678

5871 +#: builtin/blame.c:687

5872 msgid "Use the same output mode as git-annotate (Default: off)"

5873 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

5874

5628 -#: builtin/blame.c:679

5875 +#: builtin/blame.c:688

5876 msgid "Show raw timestamp (Default: off)"

5877 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

5878

5632 -#: builtin/blame.c:680

5879 +#: builtin/blame.c:689

5880 msgid "Show long commit SHA1 (Default: off)"

5881 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

5882

5636 -#: builtin/blame.c:681

5883 +#: builtin/blame.c:690

5884 msgid "Suppress author name and timestamp (Default: off)"

5885 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

5886

5640 -#: builtin/blame.c:682

5887 +#: builtin/blame.c:691

5888 msgid "Show author email instead of name (Default: off)"

5889 msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"

5890

5644 -#: builtin/blame.c:683

5891 +#: builtin/blame.c:692

5892 msgid "Ignore whitespace differences"

5893 msgstr "Ignorer les différences d'espace"

5894

5648 -#: builtin/blame.c:690

5895 +#: builtin/blame.c:699

5896 msgid "Use an experimental heuristic to improve diffs"

5897 msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"

5898

5652 -#: builtin/blame.c:692

5899 +#: builtin/blame.c:701

5900 msgid "Spend extra cycles to find better match"

5901 msgstr ""

5902 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

5903

5657 -#: builtin/blame.c:693

5904 +#: builtin/blame.c:702

5905 msgid "Use revisions from <file> instead of calling git-rev-list"

5906 msgstr ""

5907 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

5908

5662 -#: builtin/blame.c:694

5909 +#: builtin/blame.c:703

5910 msgid "Use <file>'s contents as the final image"

5911 msgstr "Utiliser le contenu de <fichier> comme image finale"

5912

5666 -#: builtin/blame.c:695 builtin/blame.c:696

5913 +#: builtin/blame.c:704 builtin/blame.c:705

5914 msgid "score"

5915 msgstr "score"

5916

5670 -#: builtin/blame.c:695

5917 +#: builtin/blame.c:704

5918 msgid "Find line copies within and across files"

5919 msgstr "Trouver les copies de ligne dans et entre les fichiers"

5920

5674 -#: builtin/blame.c:696

5921 +#: builtin/blame.c:705

5922 msgid "Find line movements within and across files"

5923 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

5924

5678 -#: builtin/blame.c:697

5925 +#: builtin/blame.c:706

5926 msgid "n,m"

5927 msgstr "n,m"

5928

5682 -#: builtin/blame.c:697

5929 +#: builtin/blame.c:706

5930 msgid "Process only line range n,m, counting from 1"

5931 msgstr ""

5932 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

5933

5687 -#: builtin/blame.c:744

5934 +#: builtin/blame.c:753

5935 msgid "--progress can't be used with --incremental or porcelain formats"

5936 msgstr ""

5937 "--progress ne peut pas être utilisé avec --incremental ou les formats "

@@ -5698,18 +5945,18 @@ msgstr ""

5945 #. your language may need more or fewer display

5946 #. columns.

5947 #.

5701 -#: builtin/blame.c:795

5948 +#: builtin/blame.c:804

5949 msgid "4 years, 11 months ago"

5950 msgstr "il y a 10 ans et 11 mois"

5951

5705 -#: builtin/blame.c:882

5952 +#: builtin/blame.c:890

5953 #, c-format

5954 msgid "file %s has only %lu line"

5955 msgid_plural "file %s has only %lu lines"

5956 msgstr[0] "le fichier %s n'a qu'%lu ligne"

5957 msgstr[1] "le fichier %s n'a que %lu lignes"

5958

5712 -#: builtin/blame.c:928

5959 +#: builtin/blame.c:936

5960 msgid "Blaming lines"

5961 msgstr "Assignation de blâme aux lignes"

5962

@@ -6003,17 +6250,17 @@ msgstr "afficher seulement les branches qui ne sont pas fusionnées"

6250 msgid "list branches in columns"

6251 msgstr "afficher les branches en colonnes"

6252

6006 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

6253 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

6254 msgid "key"

6255 msgstr "clé"

6256

6010 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

6257 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

6258 msgid "field name to sort on"

6259 msgstr "nom du champ servant à trier"

6260

6261 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

6262 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

6016 -#: builtin/tag.c:408

6263 +#: builtin/tag.c:414

6264 msgid "object"

6265 msgstr "objet"

6266

@@ -6021,16 +6268,16 @@ msgstr "objet"

6268 msgid "print only branches of the object"

6269 msgstr "afficher seulement les branches de l'objet"

6270

6024 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

6271 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

6272 msgid "sorting and filtering are case insensitive"

6273 msgstr "le tri et le filtrage sont non-sensibles à la casse"

6274

6028 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

6275 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

6276 #: builtin/verify-tag.c:39

6277 msgid "format to use for the output"

6278 msgstr "format à utiliser pour la sortie"

6279

6033 -#: builtin/branch.c:652 builtin/clone.c:730

6280 +#: builtin/branch.c:652 builtin/clone.c:735

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

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

6283

@@ -6131,7 +6378,7 @@ msgstr "La création d'un colis requiert un dépôt."

6378 msgid "Need a repository to unbundle."

6379 msgstr "Le dépaquetage d'un colis requiert un dépôt."

6380

6134 -#: builtin/cat-file.c:521

6381 +#: builtin/cat-file.c:523

6382 msgid ""

6383 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6384 "p | <type> | --textconv | --filters) [--path=<path>] <object>"

@@ -6139,7 +6386,7 @@ msgstr ""

6386 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "

6387 "| <type> | --textconv | --filters) [--path=<chemin>] <objet>"

6388

6142 -#: builtin/cat-file.c:522

6389 +#: builtin/cat-file.c:524

6390 msgid ""

6391 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6392 "filters]"

@@ -6147,66 +6394,66 @@ msgstr ""

6394 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6395 "filters]"

6396

6150 -#: builtin/cat-file.c:559

6397 +#: builtin/cat-file.c:561

6398 msgid "<type> can be one of: blob, tree, commit, tag"

6399 msgstr "<type> peut être : blob, tree, commit ou tag"

6400

6154 -#: builtin/cat-file.c:560

6401 +#: builtin/cat-file.c:562

6402 msgid "show object type"

6403 msgstr "afficher le type de l'objet"

6404

6158 -#: builtin/cat-file.c:561

6405 +#: builtin/cat-file.c:563

6406 msgid "show object size"

6407 msgstr "afficher la taille de l'objet"

6408

6162 -#: builtin/cat-file.c:563

6409 +#: builtin/cat-file.c:565

6410 msgid "exit with zero when there's no error"

6411 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"

6412

6166 -#: builtin/cat-file.c:564

6413 +#: builtin/cat-file.c:566

6414 msgid "pretty-print object's content"

6415 msgstr "afficher avec mise en forme le contenu de l'objet"

6416

6170 -#: builtin/cat-file.c:566

6417 +#: builtin/cat-file.c:568

6418 msgid "for blob objects, run textconv on object's content"

6419 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

6420

6174 -#: builtin/cat-file.c:568

6421 +#: builtin/cat-file.c:570

6422 msgid "for blob objects, run filters on object's content"

6423 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"

6424

6178 -#: builtin/cat-file.c:569 git-submodule.sh:931

6425 +#: builtin/cat-file.c:571 git-submodule.sh:878

6426 msgid "blob"

6427 msgstr "blob"

6428

6182 -#: builtin/cat-file.c:570

6429 +#: builtin/cat-file.c:572

6430 msgid "use a specific path for --textconv/--filters"

6431 msgstr "utiliser un chemin spécifique pour --textconv/--filters"

6432

6186 -#: builtin/cat-file.c:572

6433 +#: builtin/cat-file.c:574

6434 msgid "allow -s and -t to work with broken/corrupt objects"

6435 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"

6436

6190 -#: builtin/cat-file.c:573

6437 +#: builtin/cat-file.c:575

6438 msgid "buffer --batch output"

6439 msgstr "bufferiser la sortie de --batch"

6440

6194 -#: builtin/cat-file.c:575

6441 +#: builtin/cat-file.c:577

6442 msgid "show info and content of objects fed from the standard input"

6443 msgstr ""

6444 "afficher l'information et le contenu des objets passés en entrée standard"

6445

6199 -#: builtin/cat-file.c:578

6446 +#: builtin/cat-file.c:580

6447 msgid "show info about objects fed from the standard input"

6448 msgstr "afficher l'information des objets passés en entrée standard"

6449

6203 -#: builtin/cat-file.c:581

6450 +#: builtin/cat-file.c:583

6451 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

6452 msgstr ""

6453 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"

6454 "batch ou --batch-check)"

6455

6209 -#: builtin/cat-file.c:583

6456 +#: builtin/cat-file.c:585

6457 msgid "show all objects with --batch or --batch-check"

6458 msgstr "montrer tous les objets avec --batch ou --batch-check"

6459

@@ -6226,7 +6473,7 @@ msgstr "afficher tous les attributs associés au fichier"

6473 msgid "use .gitattributes only from the index"

6474 msgstr "utiliser .gitattributes seulement depuis l'index"

6475

6229 -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99

6476 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

6477 msgid "read file names from stdin"

6478 msgstr "lire les noms de fichier depuis l'entrée standard"

6479

@@ -6235,7 +6482,7 @@ msgid "terminate input and output records by a NUL character"

6482 msgstr ""

6483 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

6484

6238 -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6485 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

6486 msgid "suppress progress reporting"

6487 msgstr "supprimer l'état d'avancement"

6488

@@ -6247,27 +6494,27 @@ msgstr "afficher les chemins en entrée qui ne correspondent pas"

6494 msgid "ignore index when checking"

6495 msgstr "ignorer l'index pendant la vérification"

6496

6250 -#: builtin/check-ignore.c:158

6497 +#: builtin/check-ignore.c:159

6498 msgid "cannot specify pathnames with --stdin"

6499 msgstr "impossible de spécifier les chemins avec --stdin"

6500

6254 -#: builtin/check-ignore.c:161

6501 +#: builtin/check-ignore.c:162

6502 msgid "-z only makes sense with --stdin"

6503 msgstr "-z n'a de sens qu'avec l'option --stdin"

6504

6258 -#: builtin/check-ignore.c:163

6505 +#: builtin/check-ignore.c:164

6506 msgid "no path specified"

6507 msgstr "aucun chemin spécifié"

6508

6262 -#: builtin/check-ignore.c:167

6509 +#: builtin/check-ignore.c:168

6510 msgid "--quiet is only valid with a single pathname"

6511 msgstr "--quiet n'est valide qu'avec un seul chemin"

6512

6266 -#: builtin/check-ignore.c:169

6513 +#: builtin/check-ignore.c:170

6514 msgid "cannot have both --quiet and --verbose"

6515 msgstr "impossible d'avoir --quiet et --verbose"

6516

6270 -#: builtin/check-ignore.c:172

6517 +#: builtin/check-ignore.c:173

6518 msgid "--non-matching is only valid with --verbose"

6519 msgstr "--non-matching n'est valide qu'avec --verbose"

6520

@@ -6327,9 +6574,9 @@ msgid "write the content to temporary files"

6574 msgstr "écrire le contenu dans des fichiers temporaires"

6575

6576 #: builtin/checkout-index.c:173 builtin/column.c:31

6330 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6331 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6332 -#: builtin/worktree.c:552

6577 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206

6578 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574

6579 +#: builtin/worktree.c:570

6580 msgid "string"

6581 msgstr "chaîne"

6582

@@ -6374,82 +6621,82 @@ msgstr "le chemin '%s' n'a pas les versions nécessaires"

6621 msgid "path '%s': cannot merge"

6622 msgstr "chemin '%s' : impossible de fusionner"

6623

6377 -#: builtin/checkout.c:232

6624 +#: builtin/checkout.c:231

6625 #, c-format

6626 msgid "Unable to add merge result for '%s'"

6627 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

6628

6382 -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

6383 -#: builtin/checkout.c:263

6629 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

6630 +#: builtin/checkout.c:262

6631 #, c-format

6632 msgid "'%s' cannot be used with updating paths"

6633 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

6634

6388 -#: builtin/checkout.c:266 builtin/checkout.c:269

6635 +#: builtin/checkout.c:265 builtin/checkout.c:268

6636 #, c-format

6637 msgid "'%s' cannot be used with %s"

6638 msgstr "'%s' ne peut pas être utilisé avec %s"

6639

6393 -#: builtin/checkout.c:272

6640 +#: builtin/checkout.c:271

6641 #, c-format

6642 msgid "Cannot update paths and switch to branch '%s' at the same time."

6643 msgstr ""

6644 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

6645 "même temps."

6646

6400 -#: builtin/checkout.c:341 builtin/checkout.c:348

6647 +#: builtin/checkout.c:340 builtin/checkout.c:347

6648 #, c-format

6649 msgid "path '%s' is unmerged"

6650 msgstr "le chemin '%s' n'est pas fusionné"

6651

6405 -#: builtin/checkout.c:506

6652 +#: builtin/checkout.c:505

6653 msgid "you need to resolve your current index first"

6654 msgstr "vous devez d'abord résoudre votre index courant"

6655

6409 -#: builtin/checkout.c:637

6656 +#: builtin/checkout.c:636

6657 #, c-format

6658 msgid "Can not do reflog for '%s': %s\n"

6659 msgstr "Impossible de faire un reflog pour '%s' : %s\n"

6660

6414 -#: builtin/checkout.c:678

6661 +#: builtin/checkout.c:677

6662 msgid "HEAD is now at"

6663 msgstr "HEAD est maintenant sur"

6664

6418 -#: builtin/checkout.c:682 builtin/clone.c:684

6665 +#: builtin/checkout.c:681 builtin/clone.c:689

6666 msgid "unable to update HEAD"

6667 msgstr "impossible de mettre à jour HEAD"

6668

6422 -#: builtin/checkout.c:686

6669 +#: builtin/checkout.c:685

6670 #, c-format

6671 msgid "Reset branch '%s'\n"

6672 msgstr "Remise à zéro de la branche '%s'\n"

6673

6427 -#: builtin/checkout.c:689

6674 +#: builtin/checkout.c:688

6675 #, c-format

6676 msgid "Already on '%s'\n"

6677 msgstr "Déjà sur '%s'\n"

6678

6432 -#: builtin/checkout.c:693

6679 +#: builtin/checkout.c:692

6680 #, c-format

6681 msgid "Switched to and reset branch '%s'\n"

6682 msgstr "Basculement et remise à zéro de la branche '%s'\n"

6683

6437 -#: builtin/checkout.c:695 builtin/checkout.c:1051

6684 +#: builtin/checkout.c:694 builtin/checkout.c:1039

6685 #, c-format

6686 msgid "Switched to a new branch '%s'\n"

6687 msgstr "Basculement sur la nouvelle branche '%s'\n"

6688

6442 -#: builtin/checkout.c:697

6689 +#: builtin/checkout.c:696

6690 #, c-format

6691 msgid "Switched to branch '%s'\n"

6692 msgstr "Basculement sur la branche '%s'\n"

6693

6447 -#: builtin/checkout.c:748

6694 +#: builtin/checkout.c:747

6695 #, c-format

6696 msgid " ... and %d more.\n"

6697 msgstr " ... et %d en plus.\n"

6698

6452 -#: builtin/checkout.c:754

6699 +#: builtin/checkout.c:753

6700 #, c-format

6701 msgid ""

6702 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -6472,7 +6719,7 @@ msgstr[1] ""

6719 "\n"

6720 "%s\n"

6721

6475 -#: builtin/checkout.c:773

6722 +#: builtin/checkout.c:772

6723 #, c-format

6724 msgid ""

6725 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -6501,162 +6748,162 @@ msgstr[1] ""

6748 "git branch <nouvelle-branche> %s\n"

6749 "\n"

6750

6504 -#: builtin/checkout.c:814

6751 +#: builtin/checkout.c:804

6752 msgid "internal error in revision walk"

6753 msgstr "erreur interne lors du parcours des révisions"

6754

6508 -#: builtin/checkout.c:818

6755 +#: builtin/checkout.c:808

6756 msgid "Previous HEAD position was"

6757 msgstr "La position précédente de HEAD était sur"

6758

6512 -#: builtin/checkout.c:848 builtin/checkout.c:1046

6759 +#: builtin/checkout.c:836 builtin/checkout.c:1034

6760 msgid "You are on a branch yet to be born"

6761 msgstr "Vous êtes sur une branche qui doit encore naître"

6762

6516 -#: builtin/checkout.c:952

6763 +#: builtin/checkout.c:940

6764 #, c-format

6765 msgid "only one reference expected, %d given."

6766 msgstr "une seule référence attendue, %d fournies."

6767

6521 -#: builtin/checkout.c:992 builtin/worktree.c:247

6768 +#: builtin/checkout.c:980 builtin/worktree.c:249

6769 #, c-format

6770 msgid "invalid reference: %s"

6771 msgstr "référence invalide : %s"

6772

6526 -#: builtin/checkout.c:1021

6773 +#: builtin/checkout.c:1009

6774 #, c-format

6775 msgid "reference is not a tree: %s"

6776 msgstr "la référence n'est pas un arbre : %s"

6777

6531 -#: builtin/checkout.c:1060

6778 +#: builtin/checkout.c:1048

6779 msgid "paths cannot be used with switching branches"

6780 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

6781

6535 -#: builtin/checkout.c:1063 builtin/checkout.c:1067

6782 +#: builtin/checkout.c:1051 builtin/checkout.c:1055

6783 #, c-format

6784 msgid "'%s' cannot be used with switching branches"

6785 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

6786

6540 -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079

6541 -#: builtin/checkout.c:1082

6787 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067

6788 +#: builtin/checkout.c:1070

6789 #, c-format

6790 msgid "'%s' cannot be used with '%s'"

6791 msgstr "'%s' ne peut pas être utilisé avec '%s'"

6792

6546 -#: builtin/checkout.c:1087

6793 +#: builtin/checkout.c:1075

6794 #, c-format

6795 msgid "Cannot switch branch to a non-commit '%s'"

6796 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

6797

6551 -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114

6552 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369

6553 -#: builtin/worktree.c:371

6798 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116

6799 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387

6800 +#: builtin/worktree.c:389

6801 msgid "branch"

6802 msgstr "branche"

6803

6557 -#: builtin/checkout.c:1120

6804 +#: builtin/checkout.c:1108

6805 msgid "create and checkout a new branch"

6806 msgstr "créer et extraire une nouvelle branche"

6807

6561 -#: builtin/checkout.c:1122

6808 +#: builtin/checkout.c:1110

6809 msgid "create/reset and checkout a branch"

6810 msgstr "créer/réinitialiser et extraire une branche"

6811

6565 -#: builtin/checkout.c:1123

6812 +#: builtin/checkout.c:1111

6813 msgid "create reflog for new branch"

6814 msgstr "créer un reflog pour une nouvelle branche"

6815

6569 -#: builtin/checkout.c:1124 builtin/worktree.c:373

6816 +#: builtin/checkout.c:1112 builtin/worktree.c:391

6817 msgid "detach HEAD at named commit"

6818 msgstr "détacher la HEAD au commit nommé"

6819

6573 -#: builtin/checkout.c:1125

6820 +#: builtin/checkout.c:1113

6821 msgid "set upstream info for new branch"

6822 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

6823

6577 -#: builtin/checkout.c:1127

6824 +#: builtin/checkout.c:1115

6825 msgid "new-branch"

6826 msgstr "nouvelle branche"

6827

6581 -#: builtin/checkout.c:1127

6828 +#: builtin/checkout.c:1115

6829 msgid "new unparented branch"

6830 msgstr "nouvelle branche sans parent"

6831

6585 -#: builtin/checkout.c:1128

6832 +#: builtin/checkout.c:1116

6833 msgid "checkout our version for unmerged files"

6834 msgstr "extraire notre version pour les fichiers non fusionnés"

6835

6589 -#: builtin/checkout.c:1130

6836 +#: builtin/checkout.c:1118

6837 msgid "checkout their version for unmerged files"

6838 msgstr "extraire leur version pour les fichiers non fusionnés"

6839

6593 -#: builtin/checkout.c:1132

6840 +#: builtin/checkout.c:1120

6841 msgid "force checkout (throw away local modifications)"

6842 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

6843

6597 -#: builtin/checkout.c:1133

6844 +#: builtin/checkout.c:1122

6845 msgid "perform a 3-way merge with the new branch"

6846 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

6847

6601 -#: builtin/checkout.c:1134 builtin/merge.c:238

6848 +#: builtin/checkout.c:1124 builtin/merge.c:239

6849 msgid "update ignored files (default)"

6850 msgstr "mettre à jour les fichiers ignorés (par défaut)"

6851

6605 -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251

6852 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263

6853 msgid "style"

6854 msgstr "style"

6855

6609 -#: builtin/checkout.c:1136

6856 +#: builtin/checkout.c:1127

6857 msgid "conflict style (merge or diff3)"

6858 msgstr "style de conflit (merge (fusion) ou diff3)"

6859

6613 -#: builtin/checkout.c:1139

6860 +#: builtin/checkout.c:1130

6861 msgid "do not limit pathspecs to sparse entries only"

6862 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

6863

6617 -#: builtin/checkout.c:1141

6864 +#: builtin/checkout.c:1132

6865 msgid "second guess 'git checkout <no-such-branch>'"

6866 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

6867

6621 -#: builtin/checkout.c:1143

6868 +#: builtin/checkout.c:1134

6869 msgid "do not check if another worktree is holding the given ref"

6870 msgstr ""

6871 "ne pas vérifier si une autre copie de travail contient le référence fournie"

6872

6626 -#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137

6627 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556

6873 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150

6874 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556

6875 #: builtin/send-pack.c:173

6876 msgid "force progress reporting"

6877 msgstr "forcer l'affichage de l'état d'avancement"

6878

6632 -#: builtin/checkout.c:1177

6879 +#: builtin/checkout.c:1168

6880 msgid "-b, -B and --orphan are mutually exclusive"

6881 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

6882

6636 -#: builtin/checkout.c:1194

6883 +#: builtin/checkout.c:1185

6884 msgid "--track needs a branch name"

6885 msgstr "--track requiert un nom de branche"

6886

6640 -#: builtin/checkout.c:1199

6887 +#: builtin/checkout.c:1190

6888 msgid "Missing branch name; try -b"

6889 msgstr "Nom de branche manquant ; essayez -b"

6890

6644 -#: builtin/checkout.c:1235

6891 +#: builtin/checkout.c:1226

6892 msgid "invalid path specification"

6893 msgstr "spécification de chemin invalide"

6894

6648 -#: builtin/checkout.c:1242

6895 +#: builtin/checkout.c:1233

6896 #, c-format

6897 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

6898 msgstr ""

6899 "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"

6900

6654 -#: builtin/checkout.c:1246

6901 +#: builtin/checkout.c:1237

6902 #, c-format

6903 msgid "git checkout: --detach does not take a path argument '%s'"

6904 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

6905

6659 -#: builtin/checkout.c:1250

6906 +#: builtin/checkout.c:1241

6907 msgid ""

6908 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6909 "checking out of the index."

@@ -6755,7 +7002,7 @@ msgstr "Sélectionner les éléments à supprimer"

7002 msgid "Remove %s [y/N]? "

7003 msgstr "Supprimer %s [y/N] ? "

7004

6758 -#: builtin/clean.c:788 git-add--interactive.perl:1616

7005 +#: builtin/clean.c:788 git-add--interactive.perl:1710

7006 #, c-format

7007 msgid "Bye.\n"

7008 msgstr "Au revoir.\n"

@@ -6778,11 +7025,11 @@ msgstr ""

7025 "help - cet écran\n"

7026 "? - aide pour la sélection en ligne"

7027

6781 -#: builtin/clean.c:823 git-add--interactive.perl:1692

7028 +#: builtin/clean.c:823 git-add--interactive.perl:1786

7029 msgid "*** Commands ***"

7030 msgstr "*** Commandes ***"

7031

6785 -#: builtin/clean.c:824 git-add--interactive.perl:1689

7032 +#: builtin/clean.c:824 git-add--interactive.perl:1783

7033 msgid "What now"

7034 msgstr "Et maintenant ?"

7035

@@ -6812,8 +7059,8 @@ msgstr "nettoyage interactif"

7059 msgid "remove whole directories"

7060 msgstr "supprimer les répertoires entiers"

7061

6815 -#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532

6816 -#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157

7062 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535

7063 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159

7064 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399

7065 #: builtin/show-ref.c:176

7066 msgid "pattern"

@@ -6851,147 +7098,147 @@ msgstr ""

7098 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "

7099 "nettoyer"

7100

6854 -#: builtin/clone.c:39

7101 +#: builtin/clone.c:40

7102 msgid "git clone [<options>] [--] <repo> [<dir>]"

7103 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

7104

6858 -#: builtin/clone.c:83

7105 +#: builtin/clone.c:85

7106 msgid "don't create a checkout"

7107 msgstr "ne pas créer d'extraction"

7108

6862 -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479

7109 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479

7110 msgid "create a bare repository"

7111 msgstr "créer un dépôt nu"

7112

6866 -#: builtin/clone.c:88

7113 +#: builtin/clone.c:90

7114 msgid "create a mirror repository (implies bare)"

7115 msgstr "créer un dépôt miroir (implique dépôt nu)"

7116

6870 -#: builtin/clone.c:90

7117 +#: builtin/clone.c:92

7118 msgid "to clone from a local repository"

7119 msgstr "pour cloner depuis un dépôt local"

7120

6874 -#: builtin/clone.c:92

7121 +#: builtin/clone.c:94

7122 msgid "don't use local hardlinks, always copy"

7123 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

7124

6878 -#: builtin/clone.c:94

7125 +#: builtin/clone.c:96

7126 msgid "setup as shared repository"

7127 msgstr "régler comme dépôt partagé"

7128

6882 -#: builtin/clone.c:96 builtin/clone.c:100

7129 +#: builtin/clone.c:98 builtin/clone.c:102

7130 msgid "pathspec"

7131 msgstr "spécificateur de chemin"

7132

6886 -#: builtin/clone.c:96 builtin/clone.c:100

7133 +#: builtin/clone.c:98 builtin/clone.c:102

7134 msgid "initialize submodules in the clone"

7135 msgstr "initialiser les sous-modules dans le clone"

7136

6890 -#: builtin/clone.c:103

7137 +#: builtin/clone.c:105

7138 msgid "number of submodules cloned in parallel"

7139 msgstr "nombre de sous-modules clonés en parallèle"

7140

6894 -#: builtin/clone.c:104 builtin/init-db.c:476

7141 +#: builtin/clone.c:106 builtin/init-db.c:476

7142 msgid "template-directory"

7143 msgstr "répertoire-modèle"

7144

6898 -#: builtin/clone.c:105 builtin/init-db.c:477

7145 +#: builtin/clone.c:107 builtin/init-db.c:477

7146 msgid "directory from which templates will be used"

7147 msgstr "répertoire depuis lequel les modèles vont être utilisés"

7148

6902 -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873

6903 -#: builtin/submodule--helper.c:1240

7149 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210

7150 +#: builtin/submodule--helper.c:1577

7151 msgid "reference repository"

7152 msgstr "dépôt de référence"

7153

6907 -#: builtin/clone.c:111

7154 +#: builtin/clone.c:113

7155 msgid "use --reference only while cloning"

7156 msgstr "utiliser seulement --reference pour cloner"

7157

6911 -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44

7158 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44

7159 msgid "name"

7160 msgstr "nom"

7161

6915 -#: builtin/clone.c:113

7162 +#: builtin/clone.c:115

7163 msgid "use <name> instead of 'origin' to track upstream"

7164 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

7165

6919 -#: builtin/clone.c:115

7166 +#: builtin/clone.c:117

7167 msgid "checkout <branch> instead of the remote's HEAD"

7168 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

7169

6923 -#: builtin/clone.c:117

7170 +#: builtin/clone.c:119

7171 msgid "path to git-upload-pack on the remote"

7172 msgstr "chemin vers git-upload-pack sur le serveur distant"

7173

6927 -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806

7174 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813

7175 #: builtin/pull.c:211

7176 msgid "depth"

7177 msgstr "profondeur"

7178

6932 -#: builtin/clone.c:119

7179 +#: builtin/clone.c:121

7180 msgid "create a shallow clone of that depth"

7181 msgstr "créer un clone superficiel de cette profondeur"

7182

6936 -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991

6937 -#: parse-options.h:142

7183 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017

7184 +#: parse-options.h:154

7185 msgid "time"

7186 msgstr "heure"

7187

6941 -#: builtin/clone.c:121

7188 +#: builtin/clone.c:123

7189 msgid "create a shallow clone since a specific time"

7190 msgstr "créer un clone superficiel depuis une date spécifique"

7191

6945 -#: builtin/clone.c:122 builtin/fetch.c:142

7192 +#: builtin/clone.c:124 builtin/fetch.c:155

7193 msgid "revision"

7194 msgstr "révision"

7195

6949 -#: builtin/clone.c:123 builtin/fetch.c:143

7196 +#: builtin/clone.c:125 builtin/fetch.c:156

7197 msgid "deepen history of shallow clone, excluding rev"

7198 msgstr ""

7199 "approfondir l'historique d'un clone superficiel en excluant une révision"

7200

6954 -#: builtin/clone.c:125

7201 +#: builtin/clone.c:127

7202 msgid "clone only one branch, HEAD or --branch"

7203 msgstr "cloner seulement une branche, HEAD ou --branch"

7204

6958 -#: builtin/clone.c:127

7205 +#: builtin/clone.c:129

7206 msgid "don't clone any tags, and make later fetches not to follow them"

7207 msgstr ""

7208 "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "

7209 "faire"

7210

6964 -#: builtin/clone.c:129

7211 +#: builtin/clone.c:131

7212 msgid "any cloned submodules will be shallow"

7213 msgstr "tous les sous-modules clonés seront superficiels"

7214

6968 -#: builtin/clone.c:130 builtin/init-db.c:485

7215 +#: builtin/clone.c:132 builtin/init-db.c:485

7216 msgid "gitdir"

7217 msgstr "gitdir"

7218

6972 -#: builtin/clone.c:131 builtin/init-db.c:486

7219 +#: builtin/clone.c:133 builtin/init-db.c:486

7220 msgid "separate git dir from working tree"

7221 msgstr "séparer le répertoire git de la copie de travail"

7222

6976 -#: builtin/clone.c:132

7223 +#: builtin/clone.c:134

7224 msgid "key=value"

7225 msgstr "clé=valeur"

7226

6980 -#: builtin/clone.c:133

7227 +#: builtin/clone.c:135

7228 msgid "set config inside the new repository"

7229 msgstr "régler la configuration dans le nouveau dépôt"

7230

6984 -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224

7231 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224

7232 #: builtin/push.c:567

7233 msgid "use IPv4 addresses only"

7234 msgstr "n'utiliser que des adresses IPv4"

7235

6989 -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227

7236 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227

7237 #: builtin/push.c:569

l10n: fr.po v2.17.0 round 1