f5be008399 · matheusbsbs/matheus-bagliano

@@ -73,8 +73,8 @@ msgid ""

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2017-04-23 09:54+0800\n"

77 -"PO-Revision-Date: 2017-05-02 22:20+0200\n"

76 +"POT-Creation-Date: 2017-05-05 09:35+0800\n"

77 +"PO-Revision-Date: 2017-05-05 12:02+0200\n"

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

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

80 "Language: fr\n"

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

671 msgid "Unable to write new index file"

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

673

674 -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280

674 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279

675 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

676 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

677 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

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

688 msgid "apply changes matching the given path"

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

690

691 -#: apply.c:4917 builtin/am.c:2286

691 +#: apply.c:4917 builtin/am.c:2285

692 msgid "num"

693 msgstr "num"

694

@@ -742,7 +742,7 @@ msgid "build a temporary index based on embedded index information"

742 msgstr ""

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

744

745 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508

745 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515

746 msgid "paths are separated with NUL character"

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

748

@@ -750,7 +750,7 @@ msgstr "les chemins sont séparés par un caractère NUL"

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

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

752

753 -#: apply.c:4949 builtin/am.c:2265

753 +#: apply.c:4949 builtin/am.c:2264

754 msgid "action"

755 msgstr "action"

756

@@ -796,7 +796,7 @@ msgstr ""

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

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

798

799 -#: apply.c:4973 builtin/am.c:2274

799 +#: apply.c:4973 builtin/am.c:2273

800 msgid "root"

801 msgstr "racine"

802

@@ -844,9 +844,9 @@ msgstr "préfixe"

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

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

846

847 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59

847 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60

848 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

849 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545

849 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552

850 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

851 #: parse-options.h:153

852 msgid "file"

@@ -932,27 +932,27 @@ msgstr ""

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

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

934

935 -#: bisect.c:443

935 +#: bisect.c:444

936 #, c-format

937 msgid "Could not open file '%s'"

938 msgstr "impossible d'ouvrir le fichier '%s'"

939

940 -#: bisect.c:448

940 +#: bisect.c:449

941 #, c-format

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

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

944

945 -#: bisect.c:656

945 +#: bisect.c:657

946 #, c-format

947 msgid "We cannot bisect more!\n"

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

949

950 -#: bisect.c:709

950 +#: bisect.c:710

951 #, c-format

952 msgid "Not a valid commit name %s"

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

954

955 -#: bisect.c:733

955 +#: bisect.c:734

956 #, c-format

957 msgid ""

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

@@ -961,7 +961,7 @@ msgstr ""

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

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

963

964 -#: bisect.c:738

964 +#: bisect.c:739

965 #, c-format

966 msgid ""

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

@@ -970,7 +970,7 @@ msgstr ""

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

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

972

973 -#: bisect.c:743

973 +#: bisect.c:744

974 #, c-format

975 msgid ""

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

@@ -979,7 +979,7 @@ msgstr ""

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

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

981

982 -#: bisect.c:751

982 +#: bisect.c:752

983 #, c-format

984 msgid ""

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

@@ -990,7 +990,7 @@ msgstr ""

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

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

992

993 -#: bisect.c:764

993 +#: bisect.c:765

994 #, c-format

995 msgid ""

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

@@ -1002,36 +1002,36 @@ msgstr ""

1002 "et %s.\n"

1003 "On continue tout de même."

1004

1005 -#: bisect.c:799

1005 +#: bisect.c:800

1006 #, c-format

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

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

1009

1010 -#: bisect.c:850

1010 +#: bisect.c:851

1011 #, c-format

1012 msgid "a %s revision is needed"

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

1014

1015 -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255

1015 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255

1016 #, c-format

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

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

1019

1020 -#: bisect.c:918

1020 +#: bisect.c:919

1021 #, c-format

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

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

1024

1025 -#: bisect.c:948

1025 +#: bisect.c:949

1026 msgid "reading bisect refs failed"

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

1028

1029 -#: bisect.c:968

1029 +#: bisect.c:969

1030 #, c-format

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

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

1033

1034 -#: bisect.c:976

1034 +#: bisect.c:977

1035 #, c-format

1036 msgid ""

1037 "No testable commit found.\n"

@@ -1040,7 +1040,7 @@ msgstr ""

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

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

1042

1043 -#: bisect.c:995

1043 +#: bisect.c:996

1044 #, c-format

1045 msgid "(roughly %d step)"

1046 msgid_plural "(roughly %d steps)"

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

1049

1050 #. TRANSLATORS: the last %s will be replaced with

1051 #. "(roughly %d steps)" translation

1052 -#: bisect.c:999

1052 +#: bisect.c:1000

1053 #, c-format

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

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

@@ -1211,7 +1211,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2"

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

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

1213

1214 -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777

1214 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777

1215 #, c-format

1216 msgid "could not open '%s'"

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

@@ -1220,7 +1220,7 @@ msgstr "impossible d'ouvrir '%s'"

1220 msgid "Repository lacks these prerequisite commits:"

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

1222

1223 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299

1223 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321

1224 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1225 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1226 #: builtin/merge.c:359 builtin/shortlog.c:176

@@ -1285,8 +1285,8 @@ msgstr "l'index de groupe a disparu"

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

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

1287

1288 -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457

1289 -#: builtin/am.c:1493 builtin/am.c:2127

1288 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455

1289 +#: builtin/am.c:1489 builtin/am.c:2126

1290 #, c-format

1291 msgid "could not parse %s"

1292 msgstr "impossible d'analyser %s"

@@ -1314,163 +1314,169 @@ msgstr "plus de mémoire"

1314

1315 #: config.c:191

1316 msgid "relative config include conditionals must come from files"

1317 -msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers"

1317 +msgstr ""

1318 +"les conditions d'inclusion de configuration relative doivent venir de "

1319 +"fichiers"

1320

1319 -#: config.c:701

1321 +#: config.c:711

1322 #, c-format

1323 msgid "bad config line %d in blob %s"

1324 msgstr "ligne %d de config incorrecte dans le blob %s"

1325

1324 -#: config.c:705

1326 +#: config.c:715

1327 #, c-format

1328 msgid "bad config line %d in file %s"

1329 msgstr "ligne %d de config incorrecte dans le fichier %s"

1330

1329 -#: config.c:709

1331 +#: config.c:719

1332 #, c-format

1333 msgid "bad config line %d in standard input"

1334 msgstr "ligne %d de config incorrecte dans l'entrée standard"

1335

1334 -#: config.c:713

1336 +#: config.c:723

1337 #, c-format

1338 msgid "bad config line %d in submodule-blob %s"

1339 msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"

1340

1339 -#: config.c:717

1341 +#: config.c:727

1342 #, c-format

1343 msgid "bad config line %d in command line %s"

1344 msgstr "ligne %d de config incorrecte dans la ligne de commande %s"

1345

1344 -#: config.c:721

1346 +#: config.c:731

1347 #, c-format

1348 msgid "bad config line %d in %s"

1349 msgstr "ligne %d de config incorrecte dans %s"

1350

1349 -#: config.c:840

1351 +#: config.c:859

1352 msgid "out of range"

1353 msgstr "hors plage"

1354

1353 -#: config.c:840

1355 +#: config.c:859

1356 msgid "invalid unit"

1357 msgstr "unité invalide"

1358

1357 -#: config.c:846

1359 +#: config.c:865

1360 #, c-format

1361 msgid "bad numeric config value '%s' for '%s': %s"

1362 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"

1363

1362 -#: config.c:851

1364 +#: config.c:870

1365 #, c-format

1366 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1367 msgstr ""

1368 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "

1369 "%s : %s"

1370

1369 -#: config.c:854

1371 +#: config.c:873

1372 #, c-format

1373 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1374 msgstr ""

1375 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "

1376 "%s : %s"

1377

1376 -#: config.c:857

1378 +#: config.c:876

1379 #, c-format

1380 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1381 msgstr ""

1382 "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "

1383 "standard : %s"

1384

1383 -#: config.c:860

1385 +#: config.c:879

1386 #, c-format

1387 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1388 msgstr ""

1389 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "

1390 "sous-module %s : %s"

1391

1390 -#: config.c:863

1392 +#: config.c:882

1393 #, c-format

1394 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1395 msgstr ""

1396 "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "

1397 "commande %s : %s"

1398

1397 -#: config.c:866

1399 +#: config.c:885

1400 #, c-format

1401 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1402 msgstr ""

1403 "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"

1404

1403 -#: config.c:953

1405 +#: config.c:980

1406 #, c-format

1407 msgid "failed to expand user dir in: '%s'"

1408 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"

1409

1408 -#: config.c:1048 config.c:1059

1410 +#: config.c:1075 config.c:1086

1411 #, c-format

1412 msgid "bad zlib compression level %d"

1413 msgstr "niveau de compression zlib incorrect %d"

1414

1413 -#: config.c:1176

1415 +#: config.c:1203

1416 #, c-format

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

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

1419

1418 -#: config.c:1332

1420 +#: config.c:1359

1421 #, c-format

1422 msgid "bad pack compression level %d"

1423 msgstr "niveau de compression du paquet %d"

1424

1423 -#: config.c:1522

1425 +#: config.c:1557

1426 msgid "unable to parse command-line config"

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

1428

1427 -#: config.c:1572

1429 +#: config.c:1611

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

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

1432

1431 -#: config.c:1931

1433 +#: config.c:1970

1434 #, c-format

1435 msgid "Invalid %s: '%s'"

1436 msgstr "%s invalide : '%s'"

1437

1436 -#: config.c:1952

1438 +#: config.c:1991

1439 #, c-format

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

1439 -msgstr "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par défaut"

1441 +msgstr ""

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

1443 +"défaut"

1444

1441 -#: config.c:1978

1445 +#: config.c:2017

1446 #, c-format

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

1444 -msgstr "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et 100"

1448 +msgstr ""

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

1450 +"100"

1451

1446 -#: config.c:1989

1452 +#: config.c:2028

1453 #, c-format

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

1455 msgstr ""

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

1457

1452 -#: config.c:1991

1458 +#: config.c:2030

1459 #, c-format

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

1461 msgstr ""

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

1463

1458 -#: config.c:2050

1464 +#: config.c:2089

1465 #, c-format

1466 msgid "%s has multiple values"

1467 msgstr "%s a des valeurs multiples"

1468

1463 -#: config.c:2384 config.c:2609

1469 +#: config.c:2423 config.c:2648

1470 #, c-format

1471 msgid "fstat on %s failed"

1472 msgstr "échec de fstat sur %s"

1473

1468 -#: config.c:2502

1474 +#: config.c:2541

1475 #, c-format

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

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

1478

1473 -#: config.c:2504 builtin/remote.c:774

1479 +#: config.c:2543 builtin/remote.c:774

1480 #, c-format

1481 msgid "could not unset '%s'"

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

@@ -1723,171 +1729,176 @@ msgstr "git fetch-pack : list courte attendue"

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

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

1731

1726 -#: fetch-pack.c:279

1732 +#: fetch-pack.c:280 builtin/archive.c:63

1733 +#, c-format

1734 +msgid "remote error: %s"

1735 +msgstr "erreur distante : %s"

1736 +

1737 +#: fetch-pack.c:281

1738 #, c-format

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

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

1741

1731 -#: fetch-pack.c:331

1742 +#: fetch-pack.c:333

1743 msgid "--stateless-rpc requires multi_ack_detailed"

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

1745

1735 -#: fetch-pack.c:417

1746 +#: fetch-pack.c:419

1747 #, c-format

1748 msgid "invalid shallow line: %s"

1749 msgstr "ligne de superficiel invalide : %s"

1750

1740 -#: fetch-pack.c:423

1751 +#: fetch-pack.c:425

1752 #, c-format

1753 msgid "invalid unshallow line: %s"

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

1755

1745 -#: fetch-pack.c:425

1756 +#: fetch-pack.c:427

1757 #, c-format

1758 msgid "object not found: %s"

1759 msgstr "objet non trouvé : %s"

1760

1750 -#: fetch-pack.c:428

1761 +#: fetch-pack.c:430

1762 #, c-format

1763 msgid "error in object: %s"

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

1765

1755 -#: fetch-pack.c:430

1766 +#: fetch-pack.c:432

1767 #, c-format

1768 msgid "no shallow found: %s"

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

1770

1760 -#: fetch-pack.c:433

1771 +#: fetch-pack.c:435

1772 #, c-format

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

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

1775

1765 -#: fetch-pack.c:472

1776 +#: fetch-pack.c:474

1777 #, c-format

1778 msgid "got %s %d %s"

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

1780

1770 -#: fetch-pack.c:486

1781 +#: fetch-pack.c:488

1782 #, c-format

1783 msgid "invalid commit %s"

1784 msgstr "commit invalide %s"

1785

1775 -#: fetch-pack.c:519

1786 +#: fetch-pack.c:521

1787 msgid "giving up"

1788 msgstr "abandon"

1789

1779 -#: fetch-pack.c:529 progress.c:235

1790 +#: fetch-pack.c:531 progress.c:235

1791 msgid "done"

1792 msgstr "fait"

1793

1783 -#: fetch-pack.c:541

1794 +#: fetch-pack.c:543

1795 #, c-format

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

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

1798

1788 -#: fetch-pack.c:587

1799 +#: fetch-pack.c:589

1800 #, c-format

1801 msgid "Marking %s as complete"

1802 msgstr "Marquage de %s comme terminé"

1803

1793 -#: fetch-pack.c:735

1804 +#: fetch-pack.c:737

1805 #, c-format

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

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

1808

1798 -#: fetch-pack.c:773

1809 +#: fetch-pack.c:775

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

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

1812

1802 -#: fetch-pack.c:781

1813 +#: fetch-pack.c:783

1814 msgid "protocol error: bad pack header"

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

1816

1806 -#: fetch-pack.c:837

1817 +#: fetch-pack.c:839

1818 #, c-format

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

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

1821

1811 -#: fetch-pack.c:853

1822 +#: fetch-pack.c:855

1823 #, c-format

1824 msgid "%s failed"

1825 msgstr "échec de %s"

1826

1816 -#: fetch-pack.c:855

1827 +#: fetch-pack.c:857

1828 msgid "error in sideband demultiplexer"

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

1830

1820 -#: fetch-pack.c:882

1831 +#: fetch-pack.c:884

1832 msgid "Server does not support shallow clients"

1833 msgstr "Le serveur ne supporte les clients superficiels"

1834

1824 -#: fetch-pack.c:886

1835 +#: fetch-pack.c:888

1836 msgid "Server supports multi_ack_detailed"

1837 msgstr "Le serveur supporte multi_ack_detailed"

1838

1828 -#: fetch-pack.c:889

1839 +#: fetch-pack.c:891

1840 msgid "Server supports no-done"

1841 msgstr "Le serveur support no-done"

1842

1832 -#: fetch-pack.c:895

1843 +#: fetch-pack.c:897

1844 msgid "Server supports multi_ack"

1845 msgstr "Le serveur supporte multi_ack"

1846

1836 -#: fetch-pack.c:899

1847 +#: fetch-pack.c:901

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

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

1850

1840 -#: fetch-pack.c:903

1851 +#: fetch-pack.c:905

1852 msgid "Server supports side-band"

1853 msgstr "Le serveru supporte side-band"

1854

1844 -#: fetch-pack.c:907

1855 +#: fetch-pack.c:909

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

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

1858

1848 -#: fetch-pack.c:911

1859 +#: fetch-pack.c:913

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

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

1862

1852 -#: fetch-pack.c:921

1863 +#: fetch-pack.c:923

1864 msgid "Server supports ofs-delta"

1865 msgstr "Le serveur support ofs-delta"

1866

1856 -#: fetch-pack.c:928

1867 +#: fetch-pack.c:930

1868 #, c-format

1869 msgid "Server version is %.*s"

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

1871

1861 -#: fetch-pack.c:934

1872 +#: fetch-pack.c:936

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

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

1875

1865 -#: fetch-pack.c:938

1876 +#: fetch-pack.c:940

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

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

1879

1869 -#: fetch-pack.c:940

1880 +#: fetch-pack.c:942

1881 msgid "Server does not support --deepen"

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

1883

1873 -#: fetch-pack.c:951

1884 +#: fetch-pack.c:953

1885 msgid "no common commits"

1886 msgstr "pas de commit commun"

1887

1877 -#: fetch-pack.c:963

1888 +#: fetch-pack.c:965

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

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

1891

1881 -#: fetch-pack.c:1125

1892 +#: fetch-pack.c:1127

1893 msgid "no matching remote head"

1894 msgstr "pas de HEAD distante correspondante"

1895

1885 -#: fetch-pack.c:1147

1896 +#: fetch-pack.c:1149

1897 #, c-format

1898 msgid "no such remote ref %s"

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

1900

1890 -#: fetch-pack.c:1150

1901 +#: fetch-pack.c:1152

1902 #, c-format

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

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

@@ -2077,7 +2088,7 @@ msgstr "Impossible de créer '%s.lock' : %s"

2088 msgid "failed to read the cache"

2089 msgstr "impossible de lire le cache"

2090

2080 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393

2091 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393

2092 #: builtin/checkout.c:607 builtin/clone.c:749

2093 msgid "unable to write new index file"

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

@@ -2162,7 +2173,9 @@ msgstr ""

2173 msgid ""

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

2175 "left in tree."

2165 -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre."

2176 +msgstr ""

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

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

2179

2180 #: merge-recursive.c:1104

2181 #, c-format

@@ -2178,7 +2191,9 @@ msgstr ""

2191 msgid ""

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

2193 "left in tree at %s."

2181 -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s."

2194 +msgstr ""

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

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

2197

2198 #: merge-recursive.c:1143

2199 msgid "rename"

@@ -2408,14 +2423,16 @@ msgstr "-NUM"

2423 msgid "malformed object name '%s'"

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

2425

2411 -#: path.c:805

2426 +#: path.c:810

2427 #, c-format

2428 msgid "Could not make %s writable by group"

2429 msgstr "Impossible de rendre %s inscriptible pour le groupe"

2430

2431 #: pathspec.c:125

2432 msgid "Escape character '\\' not allowed as last character in attr value"

2418 -msgstr "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une valeur d'attribut"

2433 +msgstr ""

2434 +"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "

2435 +"valeur d'attribut"

2436

2437 #: pathspec.c:143

2438 msgid "Only one 'attr:' specification is allowed."

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

2525 msgid "unable to parse --pretty format"

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

2527

2511 -#: read-cache.c:1307

2528 +#: read-cache.c:1442

2529 #, c-format

2530 msgid ""

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

@@ -2517,7 +2534,7 @@ msgstr ""

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

2535 "Utilisation de la version %i"

2536

2520 -#: read-cache.c:1317

2537 +#: read-cache.c:1452

2538 #, c-format

2539 msgid ""

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

@@ -2526,42 +2543,41 @@ msgstr ""

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

2544 "Utilisation de la version %i"

2545

2529 -#: read-cache.c:2232

2530 -#, c-format

2531 -msgid "could not stat '%s"

2532 -msgstr "stat impossible de '%s'"

2533 -

2534 -#: read-cache.c:2232

2546 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048

2547 #, c-format

2548 msgid "could not stat '%s'"

2549 msgstr "stat impossible de '%s'"

2550

2539 -#: read-cache.c:2245

2551 +#: read-cache.c:2388

2552 #, c-format

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

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

2555

2544 -#: read-cache.c:2257

2556 +#: read-cache.c:2400

2557 #, c-format

2558 msgid "unable to unlink: %s"

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

2560

2549 -#: refs.c:619 builtin/merge.c:844

2561 +#: refs.c:620 builtin/merge.c:844

2562 #, c-format

2563 msgid "Could not open '%s' for writing"

2564 msgstr "Impossible d'ouvrir '%s' en écriture"

2565

2554 -#: refs/files-backend.c:2531

2566 +#: refs.c:1667

2567 +msgid "ref updates forbidden inside quarantine environment"

2568 +msgstr "mises à jour des références interdites en environnement de quarantaine"

2569 +

2570 +#: refs/files-backend.c:1631

2571 #, c-format

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

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

2574

2559 -#: refs/files-backend.c:2534

2575 +#: refs/files-backend.c:1634

2576 #, c-format

2577 msgid "could not delete references: %s"

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

2579

2564 -#: refs/files-backend.c:2543

2580 +#: refs/files-backend.c:1643

2581 #, c-format

2582 msgid "could not remove reference %s"

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

@@ -3010,12 +3026,12 @@ msgstr ""

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

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

3028

3013 -#: sequencer.c:294 sequencer.c:1675

3029 +#: sequencer.c:294 sequencer.c:1682

3030 #, c-format

3031 msgid "could not lock '%s'"

3032 msgstr "impossible de verrouiller '%s'"

3033

3018 -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694

3034 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701

3035 #, c-format

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

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

@@ -3025,12 +3041,12 @@ msgstr "impossible d'écrire dans '%s'"

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

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

3043

3028 -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682

3044 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689

3045 #, c-format

3046 msgid "failed to finalize '%s'."

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

3048

3033 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259

3049 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257

3050 #: builtin/commit.c:749 builtin/merge.c:1018

3051 #, c-format

3052 msgid "could not read '%s'"

@@ -3206,7 +3222,7 @@ msgstr "impossible d'obtenir un message de validation pour %s"

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

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

3224

3209 -#: sequencer.c:1071 sequencer.c:1820

3225 +#: sequencer.c:1071 sequencer.c:1827

3226 #, c-format

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

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

@@ -3235,124 +3251,124 @@ msgstr "git %s : échec à la lecture de l'index"

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

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

3253

3238 -#: sequencer.c:1302

3254 +#: sequencer.c:1303

3255 #, c-format

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

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

3258

3243 -#: sequencer.c:1310

3259 +#: sequencer.c:1311

3260 #, c-format

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

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

3263

3248 -#: sequencer.c:1342

3264 +#: sequencer.c:1344

3265 #, c-format

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

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

3268

3253 -#: sequencer.c:1349

3269 +#: sequencer.c:1356

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

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

3272

3257 -#: sequencer.c:1351

3273 +#: sequencer.c:1358

3274 #, c-format

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

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

3277

3262 -#: sequencer.c:1356

3278 +#: sequencer.c:1363

3279 msgid "no commits parsed."

3280 msgstr "aucun commit analysé."

3281

3266 -#: sequencer.c:1367

3282 +#: sequencer.c:1374

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

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

3285

3270 -#: sequencer.c:1369

3286 +#: sequencer.c:1376

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

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

3289

3274 -#: sequencer.c:1432

3290 +#: sequencer.c:1439

3291 #, c-format

3292 msgid "invalid key: %s"

3293 msgstr "clé invalide : %s"

3294

3279 -#: sequencer.c:1435

3295 +#: sequencer.c:1442

3296 #, c-format

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

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

3299

3284 -#: sequencer.c:1492

3300 +#: sequencer.c:1499

3301 #, c-format

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

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

3304

3289 -#: sequencer.c:1530

3305 +#: sequencer.c:1537

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

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

3308

3293 -#: sequencer.c:1531

3309 +#: sequencer.c:1538

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

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

3312

3297 -#: sequencer.c:1534

3313 +#: sequencer.c:1541

3314 #, c-format

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

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

3317

3302 -#: sequencer.c:1548

3318 +#: sequencer.c:1555

3319 msgid "could not lock HEAD"

3320 msgstr "impossible de verrouiller HEAD"

3321

3306 -#: sequencer.c:1604 sequencer.c:2159

3322 +#: sequencer.c:1611 sequencer.c:2181

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

3324 msgstr "aucun picorage ou retour en cours"

3325

3310 -#: sequencer.c:1606

3326 +#: sequencer.c:1613

3327 msgid "cannot resolve HEAD"

3328 msgstr "impossible de résoudre HEAD"

3329

3314 -#: sequencer.c:1608 sequencer.c:1642

3330 +#: sequencer.c:1615 sequencer.c:1649

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

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

3333

3318 -#: sequencer.c:1628 builtin/grep.c:910

3334 +#: sequencer.c:1635 builtin/grep.c:910

3335 #, c-format

3336 msgid "cannot open '%s'"

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

3338

3323 -#: sequencer.c:1630

3339 +#: sequencer.c:1637

3340 #, c-format

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

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

3343

3328 -#: sequencer.c:1631

3344 +#: sequencer.c:1638

3345 msgid "unexpected end of file"

3346 msgstr "fin de fichier inattendue"

3347

3332 -#: sequencer.c:1637

3348 +#: sequencer.c:1644

3349 #, c-format

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

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

3352

3337 -#: sequencer.c:1648

3353 +#: sequencer.c:1655

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

3355 msgstr ""

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

3357

3342 -#: sequencer.c:1785 sequencer.c:2058

3358 +#: sequencer.c:1792 sequencer.c:2080

3359 msgid "cannot read HEAD"

3360 msgstr "impossible de lire HEAD"

3361

3346 -#: sequencer.c:1825 builtin/difftool.c:616

3362 +#: sequencer.c:1832 builtin/difftool.c:616

3363 #, c-format

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

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

3366

3351 -#: sequencer.c:1841

3367 +#: sequencer.c:1848

3368 msgid "could not read index"

3369 msgstr "impossible de lire l'index"

3370

3355 -#: sequencer.c:1846

3371 +#: sequencer.c:1853

3372 #, c-format

3373 msgid ""

3374 "execution failed: %s\n"

@@ -3367,11 +3383,11 @@ msgstr ""

3383 "git rebase --continue\n"

3384 "\n"

3385

3370 -#: sequencer.c:1852

3386 +#: sequencer.c:1859

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

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

3389

3374 -#: sequencer.c:1858

3390 +#: sequencer.c:1865

3391 #, c-format

3392 msgid ""

3393 "execution succeeded: %s\n"

@@ -3388,17 +3404,17 @@ msgstr ""

3404 " git rebase --continue\n"

3405 "\n"

3406

3391 -#: sequencer.c:1913 git-rebase.sh:168

3407 +#: sequencer.c:1920 git-rebase.sh:169

3408 #, c-format

3409 msgid "Applied autostash."

3410 msgstr "Autoremisage appliqué."

3411

3396 -#: sequencer.c:1925

3412 +#: sequencer.c:1932

3413 #, c-format

3414 msgid "cannot store %s"

3415 msgstr "impossible de stocker %s"

3416

3401 -#: sequencer.c:1927 git-rebase.sh:172

3417 +#: sequencer.c:1934 git-rebase.sh:173

3418 #, c-format

3419 msgid ""

3420 "Applying autostash resulted in conflicts.\n"

@@ -3409,57 +3425,57 @@ msgstr ""

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

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

3427

3412 -#: sequencer.c:2009

3428 +#: sequencer.c:2016

3429 #, c-format

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

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

3432

3417 -#: sequencer.c:2036

3433 +#: sequencer.c:2058

3434 #, c-format

3435 msgid "unknown command %d"

3436 msgstr "commande inconnue %d"

3437

3422 -#: sequencer.c:2066

3438 +#: sequencer.c:2088

3439 msgid "could not read orig-head"

3440 msgstr "impossible de lire orig-head"

3441

3426 -#: sequencer.c:2070

3442 +#: sequencer.c:2092

3443 msgid "could not read 'onto'"

3444 msgstr "impossible de lire 'onto'"

3445

3430 -#: sequencer.c:2077

3446 +#: sequencer.c:2099

3447 #, c-format

3448 msgid "could not update %s"

3449 msgstr "impossible de mettre à jour %s"

3450

3435 -#: sequencer.c:2084

3451 +#: sequencer.c:2106

3452 #, c-format

3453 msgid "could not update HEAD to %s"

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

3455

3440 -#: sequencer.c:2168

3456 +#: sequencer.c:2190

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

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

3459

3444 -#: sequencer.c:2173

3460 +#: sequencer.c:2195

3461 msgid "could not remove CHERRY_PICK_HEAD"

3462 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3463

3448 -#: sequencer.c:2182

3464 +#: sequencer.c:2204

3465 msgid "cannot amend non-existing commit"

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

3467

3452 -#: sequencer.c:2184

3468 +#: sequencer.c:2206

3469 #, c-format

3470 msgid "invalid file: '%s'"

3471 msgstr "fichier invalide : '%s'"

3472

3457 -#: sequencer.c:2186

3473 +#: sequencer.c:2208

3474 #, c-format

3475 msgid "invalid contents: '%s'"

3476 msgstr "contenu invalide : '%s'"

3477

3462 -#: sequencer.c:2189

3478 +#: sequencer.c:2211

3479 msgid ""

3480 "\n"

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

@@ -3469,21 +3485,21 @@ msgstr ""

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

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

3487

3472 -#: sequencer.c:2199

3488 +#: sequencer.c:2221

3489 msgid "could not commit staged changes."

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

3491

3476 -#: sequencer.c:2279

3492 +#: sequencer.c:2301

3493 #, c-format

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

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

3496

3481 -#: sequencer.c:2283

3497 +#: sequencer.c:2305

3498 #, c-format

3499 msgid "%s: bad revision"

3500 msgstr "%s : mauvaise révision"

3501

3486 -#: sequencer.c:2316

3502 +#: sequencer.c:2338

3503 msgid "can't revert as initial commit"

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

3505

@@ -3693,7 +3709,7 @@ msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

3709 msgid "submodule '%s' has dirty index"

3710 msgstr "le sous-module '%s' a un index sale"

3711

3696 -#: submodule.c:1679

3712 +#: submodule.c:1678

3713 #, c-format

3714 msgid ""

3715 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3701,18 +3717,18 @@ msgstr ""

3717 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

3718 "n'est pas supporté"

3719

3704 -#: submodule.c:1691 submodule.c:1747

3720 +#: submodule.c:1690 submodule.c:1746

3721 #, c-format

3722 msgid "could not lookup name for submodule '%s'"

3723 msgstr "impossible de trouve le nom pour le sous-module '%s'"

3724

3709 -#: submodule.c:1695 builtin/submodule--helper.c:678

3725 +#: submodule.c:1694 builtin/submodule--helper.c:678

3726 #: builtin/submodule--helper.c:688

3727 #, c-format

3728 msgid "could not create directory '%s'"

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

3730

3715 -#: submodule.c:1698

3731 +#: submodule.c:1697

3732 #, c-format

3733 msgid ""

3734 "Migrating git directory of '%s%s' from\n"

@@ -3723,20 +3739,20 @@ msgstr ""

3739 "'%s' sur\n"

3740 "'%s'\n"

3741

3726 -#: submodule.c:1782

3742 +#: submodule.c:1781

3743 #, c-format

3744 msgid "could not recurse into submodule '%s'"

3745 msgstr "récursion impossible dans le sous-module '%s'"

3746

3731 -#: submodule.c:1826

3747 +#: submodule.c:1825

3748 msgid "could not start ls-files in .."

3749 msgstr "impossible de démarrer ls-files dans .."

3750

3735 -#: submodule.c:1846

3751 +#: submodule.c:1845

3752 msgid "BUG: returned path string doesn't match cwd?"

3753 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

3754

3739 -#: submodule.c:1865

3755 +#: submodule.c:1864

3756 #, c-format

3757 msgid "ls-tree returned unexpected return code %d"

3758 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

@@ -4110,7 +4126,9 @@ msgstr "Abandon\n"

4126 #: unpack-trees.c:272

4127 #, c-format

4128 msgid "submodule update strategy not supported for submodule '%s'"

4113 -msgstr "stratégie de mise à jour de sous-module non supportée pour le sous-module '%s'"

4129 +msgstr ""

4130 +"stratégie de mise à jour de sous-module non supportée pour le sous-module "

4131 +"'%s'"

4132

4133 #: unpack-trees.c:340

4134 msgid "Checking out files"

@@ -4160,8 +4178,8 @@ msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4178 msgid "could not open '%s' for writing"

4179 msgstr "impossible d'ouvrir '%s' en écriture"

4180

4163 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

4164 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015

4181 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757

4182 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015

4183 #: builtin/pull.c:341

4184 #, c-format

4185 msgid "could not open '%s' for reading"

@@ -4833,110 +4851,110 @@ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

4851 msgid "index file corrupt"

4852 msgstr "fichier d'index corrompu"

4853

4836 -#: builtin/am.c:414

4854 +#: builtin/am.c:412

4855 msgid "could not parse author script"

4856 msgstr "impossible d'analyser le script author"

4857

4840 -#: builtin/am.c:491

4858 +#: builtin/am.c:489

4859 #, c-format

4860 msgid "'%s' was deleted by the applypatch-msg hook"

4861 msgstr "'%s' a été effacé par le crochet applypatch-msg"

4862

4845 -#: builtin/am.c:532

4863 +#: builtin/am.c:530

4864 #, c-format

4865 msgid "Malformed input line: '%s'."

4866 msgstr "Ligne en entrée malformée : '%s'."

4867

4850 -#: builtin/am.c:569

4868 +#: builtin/am.c:567

4869 #, c-format

4870 msgid "Failed to copy notes from '%s' to '%s'"

4871 msgstr "Impossible de copier les notes de '%s' vers '%s'"

4872

4855 -#: builtin/am.c:595

4873 +#: builtin/am.c:593

4874 msgid "fseek failed"

4875 msgstr "échec de fseek"

4876

4859 -#: builtin/am.c:775

4877 +#: builtin/am.c:777

4878 #, c-format

4879 msgid "could not parse patch '%s'"

4880 msgstr "impossible d'analyser le patch '%s'"

4881

4864 -#: builtin/am.c:840

4882 +#: builtin/am.c:842

4883 msgid "Only one StGIT patch series can be applied at once"

4884 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

4885

4868 -#: builtin/am.c:887

4886 +#: builtin/am.c:889

4887 msgid "invalid timestamp"

4888 msgstr "horodatage invalide"

4889

4872 -#: builtin/am.c:890 builtin/am.c:898

4890 +#: builtin/am.c:892 builtin/am.c:900

4891 msgid "invalid Date line"

4892 msgstr "ligne de Date invalide"

4893

4876 -#: builtin/am.c:895

4894 +#: builtin/am.c:897

4895 msgid "invalid timezone offset"

4896 msgstr "décalage horaire invalide"

4897

4880 -#: builtin/am.c:984

4898 +#: builtin/am.c:986

4899 msgid "Patch format detection failed."

4900 msgstr "Échec de détection du format du patch."

4901

4884 -#: builtin/am.c:989 builtin/clone.c:397

4902 +#: builtin/am.c:991 builtin/clone.c:397

4903 #, c-format

4904 msgid "failed to create directory '%s'"

4905 msgstr "échec de la création du répertoire '%s'"

4906

4889 -#: builtin/am.c:993

4907 +#: builtin/am.c:995

4908 msgid "Failed to split patches."

4909 msgstr "Échec de découpage des patchs."

4910

4893 -#: builtin/am.c:1125 builtin/commit.c:376

4911 +#: builtin/am.c:1127 builtin/commit.c:376

4912 msgid "unable to write index file"

4913 msgstr "impossible d'écrire le fichier d'index"

4914

4897 -#: builtin/am.c:1176

4915 +#: builtin/am.c:1178

4916 #, c-format

4917 msgid "When you have resolved this problem, run \"%s --continue\"."

4918 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

4919

4902 -#: builtin/am.c:1177

4920 +#: builtin/am.c:1179

4921 #, c-format

4922 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

4923 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

4924

4907 -#: builtin/am.c:1178

4925 +#: builtin/am.c:1180

4926 #, c-format

4927 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

4928 msgstr ""

4929 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

4930 "abort\"."

4931

4914 -#: builtin/am.c:1316

4932 +#: builtin/am.c:1315

4933 msgid "Patch is empty. Was it split wrong?"

4934 msgstr "Le patch est vide. Le découpage était-il bon ?"

4935

4918 -#: builtin/am.c:1390 builtin/log.c:1557

4936 +#: builtin/am.c:1386 builtin/log.c:1557

4937 #, c-format

4938 msgid "invalid ident line: %s"

4939 msgstr "ligne d'identification invalide : %s"

4940

4923 -#: builtin/am.c:1417

4941 +#: builtin/am.c:1413

4942 #, c-format

4943 msgid "unable to parse commit %s"

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

4945

4928 -#: builtin/am.c:1610

4946 +#: builtin/am.c:1606

4947 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

4948 msgstr ""

4949 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "

4950 "points."

4951

4934 -#: builtin/am.c:1612

4952 +#: builtin/am.c:1608

4953 msgid "Using index info to reconstruct a base tree..."

4954 msgstr ""

4955 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

4956

4939 -#: builtin/am.c:1631

4957 +#: builtin/am.c:1627

4958 msgid ""

4959 "Did you hand edit your patch?\n"

4960 "It does not apply to blobs recorded in its index."

@@ -4944,38 +4962,38 @@ msgstr ""

4962 "Avez-vous édité le patch à la main ?\n"

4963 "Il ne s'applique pas aux blobs enregistrés dans son index."

4964

4947 -#: builtin/am.c:1637

4965 +#: builtin/am.c:1633

4966 msgid "Falling back to patching base and 3-way merge..."

4967 msgstr "Retour à un patch de la base et fusion à 3 points..."

4968

4951 -#: builtin/am.c:1662

4969 +#: builtin/am.c:1658

4970 msgid "Failed to merge in the changes."

4971 msgstr "Échec d'intégration des modifications."

4972

4955 -#: builtin/am.c:1686 builtin/merge.c:631

4973 +#: builtin/am.c:1682 builtin/merge.c:631

4974 msgid "git write-tree failed to write a tree"

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

4976

4959 -#: builtin/am.c:1693

4977 +#: builtin/am.c:1689

4978 msgid "applying to an empty history"

4979 msgstr "application à un historique vide"

4980

4963 -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4981 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802

4982 #: builtin/merge.c:827

4983 msgid "failed to write commit object"

4984 msgstr "échec de l'écriture de l'objet commit"

4985

4968 -#: builtin/am.c:1739 builtin/am.c:1743

4986 +#: builtin/am.c:1735 builtin/am.c:1739

4987 #, c-format

4988 msgid "cannot resume: %s does not exist."

4989 msgstr "impossible de continuer : %s n'existe pas."

4990

4973 -#: builtin/am.c:1759

4991 +#: builtin/am.c:1755

4992 msgid "cannot be interactive without stdin connected to a terminal."

4993 msgstr ""

4994 "impossible d'être interactif sans entrée standard connectée à un terminal."

4995

4978 -#: builtin/am.c:1764

4996 +#: builtin/am.c:1760

4997 msgid "Commit Body is:"

4998 msgstr "Le corps de la validation est :"

4999

@@ -4983,35 +5001,35 @@ msgstr "Le corps de la validation est :"

5001 #. in your translation. The program will only accept English

5002 #. input at this point.

5003 #.

4986 -#: builtin/am.c:1774

5004 +#: builtin/am.c:1770

5005 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5006 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

5007

4990 -#: builtin/am.c:1824

5008 +#: builtin/am.c:1820

5009 #, c-format

5010 msgid "Dirty index: cannot apply patches (dirty: %s)"

5011 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

5012

4995 -#: builtin/am.c:1861 builtin/am.c:1933

5013 +#: builtin/am.c:1860 builtin/am.c:1932

5014 #, c-format

5015 msgid "Applying: %.*s"

5016 msgstr "Application de %.*s"

5017

5000 -#: builtin/am.c:1877

5018 +#: builtin/am.c:1876

5019 msgid "No changes -- Patch already applied."

5020 msgstr "Pas de changement -- Patch déjà appliqué."

5021

5004 -#: builtin/am.c:1885

5022 +#: builtin/am.c:1884

5023 #, c-format

5024 msgid "Patch failed at %s %.*s"

5025 msgstr "le patch a échoué à %s %.*s"

5026

5009 -#: builtin/am.c:1891

5027 +#: builtin/am.c:1890

5028 #, c-format

5029 msgid "The copy of the patch that failed is found in: %s"

5030 msgstr "La copie du patch qui a échoué se trouve dans : %s"

5031

5014 -#: builtin/am.c:1936

5032 +#: builtin/am.c:1935

5033 msgid ""

5034 "No changes - did you forget to use 'git add'?\n"

5035 "If there is nothing left to stage, chances are that something else\n"

@@ -5022,7 +5040,7 @@ msgstr ""

5040 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

5041 "patch."

5042

5025 -#: builtin/am.c:1943

5043 +#: builtin/am.c:1942

5044 msgid ""

5045 "You still have unmerged paths in your index.\n"

5046 "Did you forget to use 'git add'?"

@@ -5030,17 +5048,17 @@ msgstr ""

5048 "Vous avez toujours des chemins non fusionnés dans votre index\n"

5049 "Auriez-vous oublié de faire 'git add' ?"

5050

5033 -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308

5051 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308

5052 #: builtin/reset.c:316

5053 #, c-format

5054 msgid "Could not parse object '%s'."

5055 msgstr "Impossible d'analyser l'objet '%s'."

5056

5039 -#: builtin/am.c:2103

5057 +#: builtin/am.c:2102

5058 msgid "failed to clean index"

5059 msgstr "échec du nettoyage de l'index"

5060

5043 -#: builtin/am.c:2137

5061 +#: builtin/am.c:2136

5062 msgid ""

5063 "You seem to have moved HEAD since the last 'am' failure.\n"

5064 "Not rewinding to ORIG_HEAD"

@@ -5048,76 +5066,76 @@ msgstr ""

5066 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

5067 "Pas de retour à ORIG_HEAD"

5068

5051 -#: builtin/am.c:2200

5069 +#: builtin/am.c:2199

5070 #, c-format

5071 msgid "Invalid value for --patch-format: %s"

5072 msgstr "Valeur invalide pour --patch-format : %s"

5073

5056 -#: builtin/am.c:2233

5074 +#: builtin/am.c:2232

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

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

5077

5060 -#: builtin/am.c:2234

5078 +#: builtin/am.c:2233

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

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

5081

5064 -#: builtin/am.c:2240

5082 +#: builtin/am.c:2239

5083 msgid "run interactively"

5084 msgstr "exécution interactive"

5085

5068 -#: builtin/am.c:2242

5086 +#: builtin/am.c:2241

5087 msgid "historical option -- no-op"

5088 msgstr "option historique -- no-op"

5089

5072 -#: builtin/am.c:2244

5090 +#: builtin/am.c:2243

5091 msgid "allow fall back on 3way merging if needed"

5092 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

5093

5076 -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

5094 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57

5095 #: builtin/repack.c:178

5096 msgid "be quiet"

5097 msgstr "être silencieux"

5098

5081 -#: builtin/am.c:2247

5099 +#: builtin/am.c:2246

5100 msgid "add a Signed-off-by line to the commit message"

5101 msgstr "ajouter une ligne Signed-off-by au message de validation"

5102

5085 -#: builtin/am.c:2250

5103 +#: builtin/am.c:2249

5104 msgid "recode into utf8 (default)"

5105 msgstr "recoder en utf-8 (par défaut)"

5106

5089 -#: builtin/am.c:2252

5107 +#: builtin/am.c:2251

5108 msgid "pass -k flag to git-mailinfo"

5109 msgstr "passer l'option -k à git-mailinfo"

5110

5093 -#: builtin/am.c:2254

5111 +#: builtin/am.c:2253

5112 msgid "pass -b flag to git-mailinfo"

5113 msgstr "passer l'option -b à git-mailinfo"

5114

5097 -#: builtin/am.c:2256

5115 +#: builtin/am.c:2255

5116 msgid "pass -m flag to git-mailinfo"

5117 msgstr "passer l'option -m à git-mailinfo"

5118

5101 -#: builtin/am.c:2258

5119 +#: builtin/am.c:2257

5120 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5121 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

5122

5105 -#: builtin/am.c:2261

5123 +#: builtin/am.c:2260

5124 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5125 msgstr ""

5126 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

5127

5110 -#: builtin/am.c:2264

5128 +#: builtin/am.c:2263

5129 msgid "strip everything before a scissors line"

5130 msgstr "retirer tout le contenu avant la ligne des ciseaux"

5131

5114 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

5115 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287

5116 -#: builtin/am.c:2293

5132 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274

5133 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286

5134 +#: builtin/am.c:2292

5135 msgid "pass it through git-apply"

5136 msgstr "le passer jusqu'à git-apply"

5137

5120 -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

5138 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

5139 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

5140 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

5141 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

@@ -5125,58 +5143,58 @@ msgstr "le passer jusqu'à git-apply"

5143 msgid "n"

5144 msgstr "n"

5145

5128 -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

5129 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

5146 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37

5147 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38

5148 msgid "format"

5149 msgstr "format"

5150

5133 -#: builtin/am.c:2290

5151 +#: builtin/am.c:2289

5152 msgid "format the patch(es) are in"

5153 msgstr "format de présentation des patchs"

5154

5137 -#: builtin/am.c:2296

5155 +#: builtin/am.c:2295

5156 msgid "override error message when patch failure occurs"

5157 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

5158

5141 -#: builtin/am.c:2298

5159 +#: builtin/am.c:2297

5160 msgid "continue applying patches after resolving a conflict"

5161 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

5162

5145 -#: builtin/am.c:2301

5163 +#: builtin/am.c:2300

5164 msgid "synonyms for --continue"

5165 msgstr "synonymes de --continue"

5166

5149 -#: builtin/am.c:2304

5167 +#: builtin/am.c:2303

5168 msgid "skip the current patch"

5169 msgstr "sauter le patch courant"

5170

5153 -#: builtin/am.c:2307

5171 +#: builtin/am.c:2306

5172 msgid "restore the original branch and abort the patching operation."

5173 msgstr ""

5174 "restaurer la branche originale et abandonner les applications de patch."

5175

5158 -#: builtin/am.c:2311

5176 +#: builtin/am.c:2310

5177 msgid "lie about committer date"

5178 msgstr "mentir sur la date de validation"

5179

5162 -#: builtin/am.c:2313

5180 +#: builtin/am.c:2312

5181 msgid "use current timestamp for author date"

5182 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

5183

5166 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

5184 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232

5185 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

5186 msgid "key-id"

5187 msgstr "id-clé"

5188

5171 -#: builtin/am.c:2316

5189 +#: builtin/am.c:2315

5190 msgid "GPG-sign commits"

5191 msgstr "signer les commits avec GPG"

5192

5175 -#: builtin/am.c:2319

5193 +#: builtin/am.c:2318

5194 msgid "(internal use for git-rebase)"

5195 msgstr "(utilisation interne pour git-rebase)"

5196

5179 -#: builtin/am.c:2334

5197 +#: builtin/am.c:2333

5198 msgid ""

5199 "The -b/--binary option has been a no-op for long time, and\n"

5200 "it will be removed. Please do not use it anymore."

@@ -5184,17 +5202,17 @@ msgstr ""

5202 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

5203 "et elle sera supprimée. Veuillez ne plus l'utiliser."

5204

5187 -#: builtin/am.c:2341

5205 +#: builtin/am.c:2340

5206 msgid "failed to read the index"

5207 msgstr "échec à la lecture de l'index"

5208

5191 -#: builtin/am.c:2356

5209 +#: builtin/am.c:2355

5210 #, c-format

5211 msgid "previous rebase directory %s still exists but mbox given."

5212 msgstr ""

5213 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

5214

5197 -#: builtin/am.c:2380

5215 +#: builtin/am.c:2379

5216 #, c-format

5217 msgid ""

5218 "Stray %s directory found.\n"

@@ -5203,7 +5221,7 @@ msgstr ""

5221 "Répertoire abandonné %s trouvé.\n"

5222 "Utilisez \"git am --abort\" pour le supprimer."

5223

5206 -#: builtin/am.c:2386

5224 +#: builtin/am.c:2385

5225 msgid "Resolve operation not in progress, we are not resuming."

5226 msgstr ""

5227 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

@@ -5235,11 +5253,6 @@ msgstr "git archive : ACK/NACK attendu, EOF reçu"

5253 msgid "git archive: NACK %s"

5254 msgstr "git archive : NACK %s"

5255

5238 -#: builtin/archive.c:63

5239 -#, c-format

5240 -msgid "remote error: %s"

5241 -msgstr "erreur distante : %s"

5242 -

5256 #: builtin/archive.c:64

5257 msgid "git archive: protocol error"

5258 msgstr "git archive : erreur de protocole"

@@ -5934,7 +5947,7 @@ msgid "terminate input and output records by a NUL character"

5947 msgstr ""

5948 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

5949

5937 -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5950 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356

5951 msgid "suppress progress reporting"

5952 msgstr "supprimer l'état d'avancement"

5953

@@ -6028,7 +6041,7 @@ msgstr "écrire le contenu dans des fichiers temporaires"

6041 #: builtin/checkout-index.c:174 builtin/column.c:30

6042 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

6043 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

6031 -#: builtin/worktree.c:472

6044 +#: builtin/worktree.c:477

6045 msgid "string"

6046 msgstr "chaîne"

6047

@@ -6248,8 +6261,8 @@ msgid "Cannot switch branch to a non-commit '%s'"

6261 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

6262

6263 #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

6251 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

6252 -#: builtin/worktree.c:327

6264 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329

6265 +#: builtin/worktree.c:331

6266 msgid "branch"

6267 msgstr "branche"

6268

@@ -6265,7 +6278,7 @@ msgstr "créer/réinitialiser et extraire une branche"

6278 msgid "create reflog for new branch"

6279 msgstr "créer un reflog pour une nouvelle branche"

6280

6268 -#: builtin/checkout.c:1164 builtin/worktree.c:329

6281 +#: builtin/checkout.c:1164 builtin/worktree.c:333

6282 msgid "detach HEAD at named commit"

6283 msgstr "détacher la HEAD au commit nommé"

6284

@@ -6516,7 +6529,7 @@ msgid "remove whole directories"

6529 msgstr "supprimer les répertoires entiers"

6530

6531 #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

6519 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

6532 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348

6533 #: builtin/name-rev.c:350 builtin/show-ref.c:176

6534 msgid "pattern"

6535 msgstr "motif"

@@ -6774,7 +6787,7 @@ msgstr "impossible de remballer pour nettoyer"

6787 msgid "cannot unlink temporary alternates file"

6788 msgstr "impossible de unlinker le fichier temporaire alternates"

6789

6777 -#: builtin/clone.c:884 builtin/receive-pack.c:1901

6790 +#: builtin/clone.c:884 builtin/receive-pack.c:1900

6791 msgid "Too many arguments."

6792 msgstr "Trop d'arguments."

6793

@@ -6813,7 +6826,7 @@ msgid "working tree '%s' already exists."

6826 msgstr "la copie de travail '%s' existe déjà."

6827

6828 #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252

6816 -#: builtin/worktree.c:222 builtin/worktree.c:249

6829 +#: builtin/worktree.c:221 builtin/worktree.c:251

6830 #, c-format

6831 msgid "could not create leading directories of '%s'"

6832 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

@@ -7275,7 +7288,7 @@ msgid "version"

7288 msgstr "version"

7289

7290 #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

7278 -#: builtin/worktree.c:443

7291 +#: builtin/worktree.c:448

7292 msgid "machine-readable output"

7293 msgstr "sortie pour traitement automatique"

7294

@@ -7358,7 +7371,7 @@ msgstr "auteur"

7371 msgid "override author for commit"

7372 msgstr "remplacer l'auteur pour la validation"

7373

7361 -#: builtin/commit.c:1588 builtin/gc.c:353

7374 +#: builtin/commit.c:1588 builtin/gc.c:357

7375 msgid "date"

7376 msgstr "date"

7377

@@ -7522,142 +7535,142 @@ msgstr ""

7535 msgid "git config [<options>]"

7536 msgstr "git config [<options>]"

7537

7525 -#: builtin/config.c:55

7538 +#: builtin/config.c:56

7539 msgid "Config file location"

7540 msgstr "Emplacement du fichier de configuration"

7541

7529 -#: builtin/config.c:56

7542 +#: builtin/config.c:57

7543 msgid "use global config file"

7544 msgstr "utiliser les fichier de configuration global"

7545

7533 -#: builtin/config.c:57

7546 +#: builtin/config.c:58

7547 msgid "use system config file"

7548 msgstr "utiliser le fichier de configuration du système"

7549

7537 -#: builtin/config.c:58

7550 +#: builtin/config.c:59

7551 msgid "use repository config file"

7552 msgstr "utiliser le fichier de configuration du dépôt"

7553

7541 -#: builtin/config.c:59

7554 +#: builtin/config.c:60

7555 msgid "use given config file"

7556 msgstr "utiliser le fichier de configuration spécifié"

7557

7545 -#: builtin/config.c:60

7558 +#: builtin/config.c:61

7559 msgid "blob-id"

7560 msgstr "blob-id"

7561

7549 -#: builtin/config.c:60

7562 +#: builtin/config.c:61

7563 msgid "read config from given blob object"

7564 msgstr "lire la configuration depuis l'objet blob fourni"

7565

7553 -#: builtin/config.c:61

7566 +#: builtin/config.c:62

7567 msgid "Action"

7568 msgstr "Action"

7569

7557 -#: builtin/config.c:62

7570 +#: builtin/config.c:63

7571 msgid "get value: name [value-regex]"

7572 msgstr "obtenir la valeur : nom [regex-de-valeur]"

7573

7561 -#: builtin/config.c:63

7574 +#: builtin/config.c:64

7575 msgid "get all values: key [value-regex]"

7576 msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"

7577

7565 -#: builtin/config.c:64

7578 +#: builtin/config.c:65

7579 msgid "get values for regexp: name-regex [value-regex]"

7580 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"

7581

7569 -#: builtin/config.c:65

7582 +#: builtin/config.c:66

7583 msgid "get value specific for the URL: section[.var] URL"

7584 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"

7585

7573 -#: builtin/config.c:66

7586 +#: builtin/config.c:67

7587 msgid "replace all matching variables: name value [value_regex]"

7588 msgstr ""

7589 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"

7590

7578 -#: builtin/config.c:67

7591 +#: builtin/config.c:68

7592 msgid "add a new variable: name value"

7593 msgstr "ajouter une nouvelle variable : nom valeur"

7594

7582 -#: builtin/config.c:68

7595 +#: builtin/config.c:69

7596 msgid "remove a variable: name [value-regex]"

7597 msgstr "supprimer une variable : nom [regex-de-valeur]"

7598

7586 -#: builtin/config.c:69

7599 +#: builtin/config.c:70

7600 msgid "remove all matches: name [value-regex]"

7601 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"

7602

7590 -#: builtin/config.c:70

7603 +#: builtin/config.c:71

7604 msgid "rename section: old-name new-name"

7605 msgstr "renommer une section : ancien-nom nouveau-nom"

7606

7594 -#: builtin/config.c:71

7607 +#: builtin/config.c:72

7608 msgid "remove a section: name"

7609 msgstr "supprimer une section : nom"

7610

7598 -#: builtin/config.c:72

7611 +#: builtin/config.c:73

7612 msgid "list all"

7613 msgstr "afficher tout"

7614

7602 -#: builtin/config.c:73

7615 +#: builtin/config.c:74

7616 msgid "open an editor"

7617 msgstr "ouvrir un éditeur"

7618

7606 -#: builtin/config.c:74

7619 +#: builtin/config.c:75

7620 msgid "find the color configured: slot [default]"

7621 msgstr "trouver la couleur configurée : slot [par défaut]"

7622

7610 -#: builtin/config.c:75

7623 +#: builtin/config.c:76

7624 msgid "find the color setting: slot [stdout-is-tty]"

7625 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"

7626

7614 -#: builtin/config.c:76

7627 +#: builtin/config.c:77

7628 msgid "Type"

7629 msgstr "Type"

7630

7618 -#: builtin/config.c:77

7631 +#: builtin/config.c:78

7632 msgid "value is \"true\" or \"false\""

7633 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"

7634

7622 -#: builtin/config.c:78

7635 +#: builtin/config.c:79

7636 msgid "value is decimal number"

7637 msgstr "la valeur est un nombre décimal"

7638

7626 -#: builtin/config.c:79

7639 +#: builtin/config.c:80

7640 msgid "value is --bool or --int"

7641 msgstr "la valeur est --bool ou --int"

7642

7630 -#: builtin/config.c:80

7643 +#: builtin/config.c:81

7644 msgid "value is a path (file or directory name)"

7645 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"

7646

7634 -#: builtin/config.c:81

7647 +#: builtin/config.c:82

7648 msgid "Other"

7649 msgstr "Autre"

7650

7638 -#: builtin/config.c:82

7651 +#: builtin/config.c:83

7652 msgid "terminate values with NUL byte"

7653 msgstr "terminer les valeurs avec un caractère NUL"

7654

7642 -#: builtin/config.c:83

7655 +#: builtin/config.c:84

7656 msgid "show variable names only"

7657 msgstr "n'afficher que les noms de variable"

7658

7646 -#: builtin/config.c:84

7659 +#: builtin/config.c:85

7660 msgid "respect include directives on lookup"

7661 msgstr "respecter les directives d'inclusion lors de la recherche"

7662

7650 -#: builtin/config.c:85

7663 +#: builtin/config.c:86

7664 msgid "show origin of config (file, standard input, blob, command line)"

7665 msgstr ""

7666 "afficher l'origine de la configuration (fichier, entrée standard, blob, "

7667 "ligne de commande)"

7668

7656 -#: builtin/config.c:327

7669 +#: builtin/config.c:328

7670 msgid "unable to parse default color value"

7671 msgstr "impossible de lire la valeur de couleur par défaut"

7672

7660 -#: builtin/config.c:471

7673 +#: builtin/config.c:472

7674 #, c-format

7675 msgid ""

7676 "# This is Git's per-user configuration file.\n"

@@ -7672,12 +7685,12 @@ msgstr ""

7685 "#\tname = %s\n"

7686 "#\temail = %s\n"

7687

7675 -#: builtin/config.c:611

7688 +#: builtin/config.c:615

7689 #, c-format

7690 msgid "cannot create configuration file %s"

7691 msgstr "création impossible du fichier de configuration '%s'"

7692

7680 -#: builtin/config.c:623

7693 +#: builtin/config.c:627

7694 #, c-format

7695 msgid ""

7696 "cannot overwrite multiple values with a single value\n"

@@ -7842,7 +7855,8 @@ msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"

7855

7856 #: builtin/describe.c:459

7857 msgid "append <mark> on broken working tree (default: \"-broken\")"

7845 -msgstr "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"

7858 +msgstr ""

7859 +"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"

7860

7861 #: builtin/describe.c:477

7862 msgid "--long is incompatible with --abbrev=0"

@@ -8478,12 +8492,12 @@ msgstr "git gc [<options>]"

8492 msgid "Failed to fstat %s: %s"

8493 msgstr "Échec du stat de %s : %s"

8494

8481 -#: builtin/gc.c:306

8495 +#: builtin/gc.c:310

8496 #, c-format

8497 msgid "Can't stat %s"

8498 msgstr "impossible de faire un stat de %s"

8499

8486 -#: builtin/gc.c:315

8500 +#: builtin/gc.c:319

8501 #, c-format

8502 msgid ""

8503 "The last gc run reported the following. Please correct the root cause\n"

@@ -8499,47 +8513,47 @@ msgstr ""

8513 "\n"

8514 "%s"

8515

8502 -#: builtin/gc.c:354

8516 +#: builtin/gc.c:358

8517 msgid "prune unreferenced objects"

8518 msgstr "éliminer les objets non référencés"

8519

8506 -#: builtin/gc.c:356

8520 +#: builtin/gc.c:360

8521 msgid "be more thorough (increased runtime)"

8522 msgstr "être plus consciencieux (durée de traitement allongée)"

8523

8510 -#: builtin/gc.c:357

8524 +#: builtin/gc.c:361

8525 msgid "enable auto-gc mode"

8526 msgstr "activer le mode auto-gc"

8527

8514 -#: builtin/gc.c:358

8528 +#: builtin/gc.c:362

8529 msgid "force running gc even if there may be another gc running"

8530 msgstr ""

8531 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "

8532 "tourne déjà"

8533

8520 -#: builtin/gc.c:375

8534 +#: builtin/gc.c:379

8535 #, c-format

8536 msgid "Failed to parse gc.logexpiry value %s"

8537 msgstr "impossible de lire la valeur de gc.logexpiry %s"

8538

8525 -#: builtin/gc.c:403

8539 +#: builtin/gc.c:407

8540 #, c-format

8541 msgid "Auto packing the repository in background for optimum performance.\n"

8542 msgstr ""

8543 "Compression automatique du dépôt en tâche de fond pour optimiser les "

8544 "performances.\n"

8545

8532 -#: builtin/gc.c:405

8546 +#: builtin/gc.c:409

8547 #, c-format

8548 msgid "Auto packing the repository for optimum performance.\n"

8549 msgstr "Compression du dépôt pour optimiser les performances.\n"

8550

8537 -#: builtin/gc.c:406

8551 +#: builtin/gc.c:410

8552 #, c-format

8553 msgid "See \"git help gc\" for manual housekeeping.\n"

8554 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"

8555

8542 -#: builtin/gc.c:427

8556 +#: builtin/gc.c:431

8557 #, c-format

8558 msgid ""

8559 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -8547,7 +8561,7 @@ msgstr ""

8561 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "

8562 "(utilisez --force si ce n'est pas le cas)"

8563

8550 -#: builtin/gc.c:471

8564 +#: builtin/gc.c:475

8565 msgid ""

8566 "There are too many unreachable loose objects; run 'git prune' to remove them."

8567 msgstr ""

@@ -8780,7 +8794,8 @@ msgstr "aucun motif fourni."

8794

8795 #: builtin/grep.c:1189

8796 msgid "--no-index or --untracked cannot be used with revs"

8783 -msgstr "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"

8797 +msgstr ""

8798 +"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"

8799

8800 #: builtin/grep.c:1195

8801 #, c-format

@@ -9765,106 +9780,106 @@ msgstr ""

9780 "Impossible de trouver une branche distante suivie, merci de spécifier "

9781 "<branche_amont> manuellement.\n"

9782

9768 -#: builtin/ls-files.c:461

9783 +#: builtin/ls-files.c:468

9784 msgid "git ls-files [<options>] [<file>...]"

9785 msgstr "git ls-files [<options>] [<fichier>...]"

9786

9772 -#: builtin/ls-files.c:510

9787 +#: builtin/ls-files.c:517

9788 msgid "identify the file status with tags"

9789 msgstr "identifier le statut de fichier avec les étiquettes"

9790

9776 -#: builtin/ls-files.c:512

9791 +#: builtin/ls-files.c:519

9792 msgid "use lowercase letters for 'assume unchanged' files"

9793 msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"

9794

9780 -#: builtin/ls-files.c:514

9795 +#: builtin/ls-files.c:521

9796 msgid "show cached files in the output (default)"

9797 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"

9798

9784 -#: builtin/ls-files.c:516

9799 +#: builtin/ls-files.c:523

9800 msgid "show deleted files in the output"

9801 msgstr "afficher les fichiers supprimés dans la sortie"

9802

9788 -#: builtin/ls-files.c:518

9803 +#: builtin/ls-files.c:525

9804 msgid "show modified files in the output"

9805 msgstr "afficher les fichiers modifiés dans la sortie"

9806

9792 -#: builtin/ls-files.c:520

9807 +#: builtin/ls-files.c:527

9808 msgid "show other files in the output"

9809 msgstr "afficher les autres fichiers dans la sortie"

9810

9796 -#: builtin/ls-files.c:522

9811 +#: builtin/ls-files.c:529

9812 msgid "show ignored files in the output"

9813 msgstr "afficher les fichiers ignorés dans la sortie"

9814

9800 -#: builtin/ls-files.c:525

9815 +#: builtin/ls-files.c:532

9816 msgid "show staged contents' object name in the output"

9817 msgstr "afficher les nom des objets indexés dans la sortie"

9818

9804 -#: builtin/ls-files.c:527

9819 +#: builtin/ls-files.c:534

9820 msgid "show files on the filesystem that need to be removed"

9821 msgstr ""

9822 "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"

9823

9809 -#: builtin/ls-files.c:529

9824 +#: builtin/ls-files.c:536

9825 msgid "show 'other' directories' names only"

9826 msgstr "afficher seulement les noms des répertoires 'other'"

9827

9813 -#: builtin/ls-files.c:531

9828 +#: builtin/ls-files.c:538

9829 msgid "show line endings of files"

9830 msgstr "afficher les fins de lignes des fichiers"

9831

9817 -#: builtin/ls-files.c:533

9832 +#: builtin/ls-files.c:540

9833 msgid "don't show empty directories"

9834 msgstr "ne pas afficher les répertoires vides"

9835

9821 -#: builtin/ls-files.c:536

9836 +#: builtin/ls-files.c:543

9837 msgid "show unmerged files in the output"

9838 msgstr "afficher les fichiers non fusionnés dans la sortie"

9839

9825 -#: builtin/ls-files.c:538

9840 +#: builtin/ls-files.c:545

9841 msgid "show resolve-undo information"

9842 msgstr "afficher l'information resolv-undo"

9843

9829 -#: builtin/ls-files.c:540

9844 +#: builtin/ls-files.c:547

9845 msgid "skip files matching pattern"

9846 msgstr "sauter les fichiers correspondant au motif"

9847

9833 -#: builtin/ls-files.c:543

9848 +#: builtin/ls-files.c:550

9849 msgid "exclude patterns are read from <file>"

9850 msgstr "les motifs d'exclusion sont lus depuis <fichier>"

9851

9837 -#: builtin/ls-files.c:546

9852 +#: builtin/ls-files.c:553

9853 msgid "read additional per-directory exclude patterns in <file>"

9854 msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>"

9855

9841 -#: builtin/ls-files.c:548

9856 +#: builtin/ls-files.c:555

9857 msgid "add the standard git exclusions"

9858 msgstr "ajouter les exclusions git standard"

9859

9845 -#: builtin/ls-files.c:551

9860 +#: builtin/ls-files.c:558

9861 msgid "make the output relative to the project top directory"

9862 msgstr "afficher en relatif par rapport au répertoire racine du projet"

9863

9849 -#: builtin/ls-files.c:554

9864 +#: builtin/ls-files.c:561

9865 msgid "recurse through submodules"

9866 msgstr "parcourir récursivement les sous-modules"

9867

9853 -#: builtin/ls-files.c:556

9868 +#: builtin/ls-files.c:563

9869 msgid "if any <file> is not in the index, treat this as an error"

9870 msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur"

9871

9857 -#: builtin/ls-files.c:557

9872 +#: builtin/ls-files.c:564

9873 msgid "tree-ish"

9874 msgstr "arbre ou apparenté"

9875

9861 -#: builtin/ls-files.c:558

9876 +#: builtin/ls-files.c:565

9877 msgid "pretend that paths removed since <tree-ish> are still present"

9878 msgstr ""

9879 "considérer que les chemins supprimés depuis <arbre ou apparenté> sont "

9880 "toujours présents"

9881

9867 -#: builtin/ls-files.c:560

9882 +#: builtin/ls-files.c:567

9883 msgid "show debugging data"

9884 msgstr "afficher les données de débogage"

9885

@@ -11351,7 +11366,7 @@ msgstr "Référez-vous à git-pull(1) pour de plus amples détails."

11366 msgid "<remote>"

11367 msgstr "<distant>"

11368

11354 -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455

11369 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456

11370 #: git-parse-remote.sh:65

11371 msgid "<branch>"

11372 msgstr "<branche>"

@@ -11840,7 +11855,7 @@ msgstr "abandonner le rebasage"

11855 msgid "git receive-pack <git-dir>"

11856 msgstr "git receive-pack <répertoire-git>"

11857

11843 -#: builtin/receive-pack.c:796

11858 +#: builtin/receive-pack.c:795

11859 msgid ""

11860 "By default, updating the current branch in a non-bare repository\n"

11861 "is denied, because it will make the index and work tree inconsistent\n"

@@ -11870,7 +11885,7 @@ msgstr ""

11885 "Pour éliminer ce message et conserver le comportement par défaut,\n"

11886 "réglez « receive.denyCurrentBranch » à 'refuse'."

11887

11873 -#: builtin/receive-pack.c:816

11888 +#: builtin/receive-pack.c:815

11889 msgid ""

11890 "By default, deleting the current branch is denied, because the next\n"

11891 "'git clone' won't result in any file checked out, causing confusion.\n"

@@ -11890,11 +11905,11 @@ msgstr ""

11905 "\n"

11906 "Pour éliminer ce message, réglez-le à 'refuse'."

11907

11893 -#: builtin/receive-pack.c:1889

11908 +#: builtin/receive-pack.c:1888

11909 msgid "quiet"

11910 msgstr "quiet"

11911

11897 -#: builtin/receive-pack.c:1903

11912 +#: builtin/receive-pack.c:1902

11913 msgid "You must specify a directory."

11914 msgstr "Vous devez spécifier un répertoire."

11915

@@ -12538,22 +12553,22 @@ msgstr "git replace -d <objet>..."

12553 msgid "git replace [--format=<format>] [-l [<pattern>]]"

12554 msgstr "git replace [--format=<format>] [-l [<motif>]]"

12555

12541 -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395

12556 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396

12557 #, c-format

12558 msgid "Not a valid object name: '%s'"

12559 msgstr "Nom d'objet invalide : '%s'"

12560

12546 -#: builtin/replace.c:359

12561 +#: builtin/replace.c:360

12562 #, c-format

12563 msgid "bad mergetag in commit '%s'"

12564 msgstr "mauvaise étiquette de fusion dans le commit '%s'"

12565

12551 -#: builtin/replace.c:361

12566 +#: builtin/replace.c:362

12567 #, c-format

12568 msgid "malformed mergetag in commit '%s'"

12569 msgstr "étiquette de fusion malformée dans le commit '%s'"

12570

12556 -#: builtin/replace.c:372

12571 +#: builtin/replace.c:373

12572 #, c-format

12573 msgid ""

12574 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "

@@ -12562,45 +12577,45 @@ msgstr ""

12577 "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "

12578 "utilisez --edit au lieu de --graft"

12579

12565 -#: builtin/replace.c:405

12580 +#: builtin/replace.c:406

12581 #, c-format

12582 msgid "the original commit '%s' has a gpg signature."

12583 msgstr "le commit original '%s' contient une signature GPG."

12584

12570 -#: builtin/replace.c:406

12585 +#: builtin/replace.c:407

12586 msgid "the signature will be removed in the replacement commit!"

12587 msgstr "la signature sera éliminée dans la validation de remplacement !"

12588

12574 -#: builtin/replace.c:412

12589 +#: builtin/replace.c:413

12590 #, c-format

12591 msgid "could not write replacement commit for: '%s'"

12592 msgstr "Impossible d'écrire le commit de remplacement pour '%s'"

12593

12579 -#: builtin/replace.c:436

12594 +#: builtin/replace.c:437

12595 msgid "list replace refs"

12596 msgstr "afficher les références de remplacement"

12597

12583 -#: builtin/replace.c:437

12598 +#: builtin/replace.c:438

12599 msgid "delete replace refs"

12600 msgstr "supprimer les références de remplacement"

12601

12587 -#: builtin/replace.c:438

12602 +#: builtin/replace.c:439

12603 msgid "edit existing object"

12604 msgstr "éditer l'objet existant"

12605

12591 -#: builtin/replace.c:439

12606 +#: builtin/replace.c:440

12607 msgid "change a commit's parents"

12608 msgstr "Modifier les parents d'un commit"

12609

12595 -#: builtin/replace.c:440

12610 +#: builtin/replace.c:441

12611 msgid "replace the ref if it exists"

12612 msgstr "remplacer la référence si elle existe"

12613

12599 -#: builtin/replace.c:441

12614 +#: builtin/replace.c:442

12615 msgid "do not pretty-print contents for --edit"

12616 msgstr "afficher sans mise en forme pour --edit"

12617

12603 -#: builtin/replace.c:442

12618 +#: builtin/replace.c:443

12619 msgid "use this format"

12620 msgstr "utiliser ce format"

12621

@@ -13231,7 +13246,7 @@ msgstr "ancre alternative pour les chemins relatifs"

13246 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"

13247 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"

13248

13234 -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382

13249 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380

13250 #, c-format

13251 msgid "No url found for submodule path '%s' in .gitmodules"

13252 msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"

@@ -13241,7 +13256,9 @@ msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"

13256 msgid ""

13257 "could not lookup configuration '%s'. Assuming this repository is its own "

13258 "authoritative upstream."

13244 -msgstr "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme son propre amont d'autorité."

13259 +msgstr ""

13260 +"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "

13261 +"son propre amont d'autorité."

13262

13263 #: builtin/submodule--helper.c:406

13264 #, c-format

@@ -13485,7 +13502,8 @@ msgid ""

13502 "points-at <object>]\n"

13503 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"

13504 msgstr ""

13488 -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objet>]\n"

13505 +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"

13506 +"points-at <objet>]\n"

13507 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"

13508

13509 #: builtin/tag.c:27

@@ -13551,30 +13569,6 @@ msgstr "pas de message pour l'étiquette ?"

13569 msgid "The tag message has been left in %s\n"

13570 msgstr "Le message pour l'étiquette a été laissé dans %s\n"

13571

13554 -#: builtin/tag.c:312

13555 -msgid "tag: tagging "

13556 -msgstr "étiquette: étiquetage de "

13557 -

13558 -#: builtin/tag.c:320

13559 -msgid "object of unknown type"

13560 -msgstr "objet de type inconnu"

13561 -

13562 -#: builtin/tag.c:327

13563 -msgid "commit object"

13564 -msgstr "objet commit"

13565 -

13566 -#: builtin/tag.c:335

13567 -msgid "tree object"

13568 -msgstr "objet arbre"

13569 -

13570 -#: builtin/tag.c:338

13571 -msgid "blob object"

13572 -msgstr "objet blob"

13573 -

13574 -#: builtin/tag.c:341

13575 -msgid "other tag object"

13576 -msgstr "objet étiquette autre"

13577 -

13572 #: builtin/tag.c:397

13573 msgid "list tag names"

13574 msgstr "afficher les noms des étiquettes"

@@ -13669,7 +13663,8 @@ msgstr "l'option --points-at est autorisée seulement en mode liste"

13663

13664 #: builtin/tag.c:499

13665 msgid "--merged and --no-merged options are only allowed in list mode"

13672 -msgstr "les options --merged et --no-merged ne sont autorisées qu'en mode liste"

13666 +msgstr ""

13667 +"les options --merged et --no-merged ne sont autorisées qu'en mode liste"

13668

13669 #: builtin/tag.c:510

13670 msgid "only one -F or -m option is allowed."

@@ -13893,13 +13888,17 @@ msgstr "activer le cache de non-suivis sans tester le système de fichier"

13888 msgid ""

13889 "core.splitIndex is set to false; remove or change it, if you really want to "

13890 "enable split index"

13896 -msgstr "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer l'index coupé"

13891 +msgstr ""

13892 +"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "

13893 +"souhaitez vraiment activer l'index coupé"

13894

13895 #: builtin/update-index.c:1116

13896 msgid ""

13897 "core.splitIndex is set to true; remove or change it, if you really want to "

13898 "disable split index"

13902 -msgstr "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver l'index coupé"

13899 +msgstr ""

13900 +"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "

13901 +"souhaitez vraiment désactiver l'index coupé"

13902

13903 #: builtin/update-index.c:1127

13904 msgid ""

@@ -14016,28 +14015,28 @@ msgstr "git worktree prune [<options>]"

14015 msgid "git worktree unlock <path>"

14016 msgstr "git worktree unlock <chemin>"

14017

14019 -#: builtin/worktree.c:42

14018 +#: builtin/worktree.c:43

14019 #, c-format

14020 msgid "Removing worktrees/%s: not a valid directory"

14021 msgstr "Suppression de worktrees/%s : répertoire invalide"

14022

14024 -#: builtin/worktree.c:48

14023 +#: builtin/worktree.c:49

14024 #, c-format

14025 msgid "Removing worktrees/%s: gitdir file does not exist"

14026 msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"

14027

14029 -#: builtin/worktree.c:53

14028 +#: builtin/worktree.c:54

14029 #, c-format

14030 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

14031 msgstr ""

14032 "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"

14033

14035 -#: builtin/worktree.c:64

14034 +#: builtin/worktree.c:65

14035 #, c-format

14036 msgid "Removing worktrees/%s: invalid gitdir file"

14037 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"

14038

14040 -#: builtin/worktree.c:80

14039 +#: builtin/worktree.c:81

14040 #, c-format

14041 msgid "Removing worktrees/%s: gitdir file points to non-existent location"

14042 msgstr ""

@@ -14057,63 +14056,67 @@ msgstr "faire expirer les arbres de travail plus vieux que <temps>"

14056 msgid "'%s' already exists"

14057 msgstr "'%s' existe déjà"

14058

14060 -#: builtin/worktree.c:236

14059 +#: builtin/worktree.c:235

14060 #, c-format

14061 msgid "could not create directory of '%s'"

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

14063

14065 -#: builtin/worktree.c:272

14064 +#: builtin/worktree.c:274

14065 #, c-format

14066 msgid "Preparing %s (identifier %s)"

14067 msgstr "Préparation de %s (identifiant %s)"

14068

14070 -#: builtin/worktree.c:324

14069 +#: builtin/worktree.c:328

14070 msgid "checkout <branch> even if already checked out in other worktree"

14071 msgstr ""

14072 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "

14073 "travail"

14074

14076 -#: builtin/worktree.c:326

14075 +#: builtin/worktree.c:330

14076 msgid "create a new branch"

14077 msgstr "créer une nouvelle branche"

14078

14080 -#: builtin/worktree.c:328

14079 +#: builtin/worktree.c:332

14080 msgid "create or reset a branch"

14081 msgstr "créer ou réinitialiser une branche"

14082

14084 -#: builtin/worktree.c:330

14083 +#: builtin/worktree.c:334

14084 msgid "populate the new working tree"

14085 msgstr "remplissage de la nouvelle copie de travail"

14086

14088 -#: builtin/worktree.c:338

14087 +#: builtin/worktree.c:335

14088 +msgid "keep the new working tree locked"

14089 +msgstr "conserver le verrou sur le nouvel arbre de travail"

14090 +

14091 +#: builtin/worktree.c:343

14092 msgid "-b, -B, and --detach are mutually exclusive"

14093 msgstr "-b, -B et --detach sont mutuellement exclusifs"

14094

14092 -#: builtin/worktree.c:473

14095 +#: builtin/worktree.c:478

14096 msgid "reason for locking"

14097 msgstr "raison du vérouillage"

14098

14096 -#: builtin/worktree.c:485 builtin/worktree.c:518

14099 +#: builtin/worktree.c:490 builtin/worktree.c:523

14100 #, c-format

14101 msgid "'%s' is not a working tree"

14102 msgstr "'%s' n'est pas une copie de travail"

14103

14101 -#: builtin/worktree.c:487 builtin/worktree.c:520

14104 +#: builtin/worktree.c:492 builtin/worktree.c:525

14105 msgid "The main working tree cannot be locked or unlocked"

14106 msgstr ""

14107 "La copie de travail principale ne peut pas être vérouillée ou dévérouillée"

14108

14106 -#: builtin/worktree.c:492

14109 +#: builtin/worktree.c:497

14110 #, c-format

14111 msgid "'%s' is already locked, reason: %s"

14112 msgstr "'%s' est déjà verrouillé, car '%s'"

14113

14111 -#: builtin/worktree.c:494

14114 +#: builtin/worktree.c:499

14115 #, c-format

14116 msgid "'%s' is already locked"

14117 msgstr "'%s' est déjà verrouillé"

14118

14116 -#: builtin/worktree.c:522

14119 +#: builtin/worktree.c:527

14120 #, c-format

14121 msgid "'%s' is not locked"

14122 msgstr "'%s' n'est pas verrouillé"

@@ -14183,15 +14186,20 @@ msgstr ""

14186 "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"

14187 "pour en lire plus à propos d'une commande spécifique ou d'un concept."

14188

14186 -#: http.c:355

14189 +#: http.c:336

14190 +#, c-format

14191 +msgid "negative value for http.postbuffer; defaulting to %d"

14192 +msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"

14193 +

14194 +#: http.c:357

14195 msgid "Delegation control is not supported with cURL < 7.22.0"

14196 msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"

14197

14190 -#: http.c:364

14198 +#: http.c:366

14199 msgid "Public key pinning not supported with cURL < 7.44.0"

14200 msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"

14201

14194 -#: http.c:1755

14202 +#: http.c:1766

14203 #, c-format

14204 msgid ""

14205 "unable to update url base from redirection:\n"

@@ -14584,7 +14592,7 @@ msgstr "Essai de fusion simple avec $pretty_name"

14592 msgid "Simple merge did not work, trying automatic merge."

14593 msgstr "La fusion simple a échoué, essai avec la fusion automatique."

14594

14587 -#: git-rebase.sh:57

14595 +#: git-rebase.sh:58

14596 msgid ""

14597 "When you have resolved this problem, run \"git rebase --continue\".\n"

14598 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -14596,39 +14604,39 @@ msgstr ""

14604 "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "

14605 "rebase --abort\"."

14606

14599 -#: git-rebase.sh:157 git-rebase.sh:396

14607 +#: git-rebase.sh:158 git-rebase.sh:397

14608 #, sh-format

14609 msgid "Could not move back to $head_name"

14610 msgstr "Impossible de revenir à $head_name"

14611

14604 -#: git-rebase.sh:171

14612 +#: git-rebase.sh:172

14613 #, sh-format

14614 msgid "Cannot store $stash_sha1"

14615 msgstr "Impossible de stocker $stash_sha1"

14616

14609 -#: git-rebase.sh:211

14617 +#: git-rebase.sh:212

14618 msgid "The pre-rebase hook refused to rebase."

14619 msgstr "Le crochet pre-rebase a refusé de rebaser."

14620

14613 -#: git-rebase.sh:216

14621 +#: git-rebase.sh:217

14622 msgid "It looks like git-am is in progress. Cannot rebase."

14623 msgstr "Il semble que git-am soit en cours. Impossible de rebaser."

14624

14617 -#: git-rebase.sh:357

14625 +#: git-rebase.sh:358

14626 msgid "No rebase in progress?"

14627 msgstr "Pas de rebasage en cours ?"

14628

14621 -#: git-rebase.sh:368

14629 +#: git-rebase.sh:369

14630 msgid "The --edit-todo action can only be used during interactive rebase."

14631 msgstr ""

14632 "L'action --edit-todo peut seulement être utilisée lors d'un rebasage "

14633 "interactif."

14634

14627 -#: git-rebase.sh:375

14635 +#: git-rebase.sh:376

14636 msgid "Cannot read HEAD"

14637 msgstr "Impossible de lire HEAD"

14638

14631 -#: git-rebase.sh:378

14639 +#: git-rebase.sh:379

14640 msgid ""

14641 "You must edit all merge conflicts and then\n"

14642 "mark them as resolved using git add"

@@ -14636,7 +14644,7 @@ msgstr ""

14644 "Vous devez éditer tous les conflits de fusion et\n"

14645 "les marquer comme résolus avec git add"

14646

14639 -#: git-rebase.sh:418

14647 +#: git-rebase.sh:419

14648 #, sh-format

14649 msgid ""

14650 "It seems that there is already a $state_dir_base directory, and\n"

@@ -14658,65 +14666,65 @@ msgstr ""

14666 "chose\n"

14667 "d'important ici."

14668

14661 -#: git-rebase.sh:469

14669 +#: git-rebase.sh:470

14670 #, sh-format

14671 msgid "invalid upstream $upstream_name"

14672 msgstr "invalide $upstream_name en amont"

14673

14666 -#: git-rebase.sh:493

14674 +#: git-rebase.sh:494

14675 #, sh-format

14676 msgid "$onto_name: there are more than one merge bases"

14677 msgstr "$onto_name : il y a plus d'une base de fusion"

14678

14671 -#: git-rebase.sh:496 git-rebase.sh:500

14679 +#: git-rebase.sh:497 git-rebase.sh:501

14680 #, sh-format

14681 msgid "$onto_name: there is no merge base"

14682 msgstr "$onto_name : il n'y a pas de base de fusion"

14683

14676 -#: git-rebase.sh:505

14684 +#: git-rebase.sh:506

14685 #, sh-format

14686 msgid "Does not point to a valid commit: $onto_name"

14687 msgstr "Ne pointe pas sur une validation valide : $onto_name"

14688

14681 -#: git-rebase.sh:528

14689 +#: git-rebase.sh:529

14690 #, sh-format

14691 msgid "fatal: no such branch: $branch_name"

14692 msgstr "fatal : pas de branche : $branch_name"

14693

14686 -#: git-rebase.sh:561

14694 +#: git-rebase.sh:562

14695 msgid "Cannot autostash"

14696 msgstr "Autoremisage impossible"

14697

14690 -#: git-rebase.sh:566

14698 +#: git-rebase.sh:567

14699 #, sh-format

14700 msgid "Created autostash: $stash_abbrev"

14701 msgstr "Autoremisage créé : $stash_abbrev"

14702

14695 -#: git-rebase.sh:570

14703 +#: git-rebase.sh:571

14704 msgid "Please commit or stash them."

14705 msgstr "Veuillez les valider ou les remiser."

14706

14699 -#: git-rebase.sh:590

14707 +#: git-rebase.sh:591

14708 #, sh-format

14709 msgid "Current branch $branch_name is up to date."

14710 msgstr "La branche courante $branch_name est à jour."

14711

14704 -#: git-rebase.sh:594

14712 +#: git-rebase.sh:595

14713 #, sh-format

14714 msgid "Current branch $branch_name is up to date, rebase forced."

14715 msgstr "La branche courante $branch_name est à jour, rebasage forcé."

14716

14709 -#: git-rebase.sh:605

14717 +#: git-rebase.sh:606

14718 #, sh-format

14719 msgid "Changes from $mb to $onto:"

14720 msgstr "Changements de $mb sur $onto :"

14721

14714 -#: git-rebase.sh:614

14722 +#: git-rebase.sh:615

14723 msgid "First, rewinding head to replay your work on top of it..."

14724 msgstr ""

14725 "Premièrement, rembobinons head pour rejouer votre travail par-dessus..."

14726

14719 -#: git-rebase.sh:624

14727 +#: git-rebase.sh:625

14728 #, sh-format

14729 msgid "Fast-forwarded $branch_name to $onto_name."

14730 msgstr "$branch_name mise à jour en avance rapide sur $onto_name."

@@ -16127,7 +16135,8 @@ msgid ""

16135 "changes\n"

16136 msgstr ""

16137 "status - montrer les chemins modifiés\n"

16130 -"update - ajouter l'état de l'arbre de travail aux modifications à indexer\n"

16138 +"update - ajouter l'état de l'arbre de travail aux modifications à "

16139 +"indexer\n"

16140 "revert - faire revenir les modifications à indexer à la version HEAD\n"

16141 "patch - sélectionner les sections et mettre à jour sélectivement\n"

16142 "diff - visualiser les diff entre HEAD et l'index\n"

@@ -16508,6 +16517,27 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"

16517 msgid "Do you really want to send %s? [y|N]: "

16518 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

16519

16520 +#~ msgid "could not stat '%s"

16521 +#~ msgstr "stat impossible de '%s'"

16522 +

16523 +#~ msgid "tag: tagging "

16524 +#~ msgstr "étiquette: étiquetage de "

16525 +

16526 +#~ msgid "object of unknown type"

16527 +#~ msgstr "objet de type inconnu"

16528 +

16529 +#~ msgid "commit object"

16530 +#~ msgstr "objet commit"

16531 +

16532 +#~ msgid "tree object"

16533 +#~ msgstr "objet arbre"

16534 +

16535 +#~ msgid "blob object"

16536 +#~ msgstr "objet blob"

16537 +

16538 +#~ msgid "other tag object"

16539 +#~ msgstr "objet étiquette autre"

16540 +

16541 #~ msgid ""

16542 #~ "There is nothing to exclude from by :(exclude) patterns.\n"

16543 #~ "Perhaps you forgot to add either ':/' or '.' ?"

l10n: fr.po v2.13 rnd 2