71ca3ba309 · 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: 2016-11-25 22:50+0800\n"

77 -"PO-Revision-Date: 2016-11-25 22:55+0800\n"

76 +"POT-Creation-Date: 2017-02-04 13:02+0800\n"

77 +"PO-Revision-Date: 2017-02-11 14:53+0100\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"

@@ -125,7 +125,7 @@ msgstr ""

125 msgid "Exiting because of an unresolved conflict."

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

127

128 -#: advice.c:114 builtin/merge.c:1181

128 +#: advice.c:114 builtin/merge.c:1206

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

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

131

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

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

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

615

616 -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

616 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

617 #, c-format

618 msgid "cannot open %s"

619 msgstr "impossible d'ouvrir %s"

@@ -667,15 +667,16 @@ msgid_plural "%d lines applied after fixing whitespace errors."

667 msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."

668 msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."

669

670 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

670 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

671 msgid "Unable to write new index file"

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

673

674 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

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

676 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

677 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

678 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

676 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

677 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

678 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

679 +#: git-add--interactive.perl:239

680 msgid "path"

681 msgstr "chemin"

682

@@ -780,8 +781,8 @@ msgid "allow overlapping hunks"

781 msgstr "accepter les recouvrements de sections"

782

783 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

783 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

784 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

784 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

785 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

786 msgid "be verbose"

787 msgstr "mode verbeux"

788

@@ -822,7 +823,7 @@ msgstr ""

823 msgid "git archive --remote <repo> [--exec <cmd>] --list"

824 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"

825

825 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

826 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

827 #, c-format

828 msgid "pathspec '%s' did not match any files"

829 msgstr "le chemin '%s' ne correspond à aucun fichier"

@@ -843,11 +844,11 @@ 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

846 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603

847 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987

848 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101

849 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401

850 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153

847 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

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

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

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

851 +#: parse-options.h:153

852 msgid "file"

853 msgstr "fichier"

854

@@ -880,7 +881,7 @@ msgid "list supported archive formats"

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

882

883 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

883 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

884 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

885 msgid "repo"

886 msgstr "dépôt"

887

@@ -976,13 +977,13 @@ msgstr ""

977 #: bisect.c:750

978 #, c-format

979 msgid ""

979 -"Some %s revs are not ancestor of the %s rev.\n"

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

981 "git bisect cannot work properly in this case.\n"

982 "Maybe you mistook %s and %s revs?\n"

983 msgstr ""

984 "Certaines révision %s ne sont pas ancêtres de la révision %s.\n"

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

985 -"Peut-être avez-vous inversé les révisions %s et %s ?\n"

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

987

988 #: bisect.c:763

989 #, c-format

@@ -1006,7 +1007,7 @@ msgstr "Bissection : une base de fusion doit être testée\n"

1007 msgid "a %s revision is needed"

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

1009

1009 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

1010 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

1011 #, c-format

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

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

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

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

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

1208

1208 -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1209 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1210 #, c-format

1211 msgid "could not open '%s'"

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

@@ -1214,10 +1215,10 @@ msgstr "impossible d'ouvrir '%s'"

1215 msgid "Repository lacks these prerequisite commits:"

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

1217

1217 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1218 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1218 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1219 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1220 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1220 -#: builtin/merge.c:356 builtin/shortlog.c:170

1221 +#: builtin/merge.c:360 builtin/shortlog.c:177

1222 msgid "revision walk setup failed"

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

1224

@@ -1256,7 +1257,7 @@ msgstr "rev-list a disparu"

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

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

1259

1259 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1260 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1261 #, c-format

1262 msgid "unrecognized argument: %s"

1263 msgstr "argument non reconnu : %s"

@@ -1274,13 +1275,13 @@ msgstr "impossible de créer '%s'"

1275 msgid "index-pack died"

1276 msgstr "l'index de groupe a disparu"

1277

1277 -#: color.c:290

1278 +#: color.c:300

1279 #, c-format

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

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

1282

1282 -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1283 -#: builtin/am.c:2127

1283 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1284 +#: builtin/am.c:1493 builtin/am.c:2127

1285 #, c-format

1286 msgid "could not parse %s"

1287 msgstr "impossible d'analyser %s"

@@ -1306,136 +1307,146 @@ msgstr ""

1307 msgid "memory exhausted"

1308 msgstr "plus de mémoire"

1309

1309 -#: config.c:516

1310 +#: config.c:518

1311 #, c-format

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

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

1314

1314 -#: config.c:520

1315 +#: config.c:522

1316 #, c-format

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

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

1319

1319 -#: config.c:524

1320 +#: config.c:526

1321 #, c-format

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

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

1324

1324 -#: config.c:528

1325 +#: config.c:530

1326 #, c-format

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

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

1329

1329 -#: config.c:532

1330 +#: config.c:534

1331 #, c-format

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

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

1334

1334 -#: config.c:536

1335 +#: config.c:538

1336 #, c-format

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

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

1339

1339 -#: config.c:655

1340 +#: config.c:657

1341 msgid "out of range"

1342 msgstr "hors plage"

1343

1343 -#: config.c:655

1344 +#: config.c:657

1345 msgid "invalid unit"

1346 msgstr "unité invalide"

1347

1347 -#: config.c:661

1348 +#: config.c:663

1349 #, c-format

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

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

1352

1352 -#: config.c:666

1353 +#: config.c:668

1354 #, c-format

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

1356 msgstr ""

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

1358 "%s : %s"

1359

1359 -#: config.c:669

1360 +#: config.c:671

1361 #, c-format

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

1363 msgstr ""

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

1365 "%s : %s"

1366

1366 -#: config.c:672

1367 +#: config.c:674

1368 #, c-format

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

1370 msgstr ""

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

1372 "standard : %s"

1373

1373 -#: config.c:675

1374 +#: config.c:677

1375 #, c-format

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

1377 msgstr ""

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

1379 "sous-module %s : %s"

1380

1380 -#: config.c:678

1381 +#: config.c:680

1382 #, c-format

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

1384 msgstr ""

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

1386 "commande %s : %s"

1387

1387 -#: config.c:681

1388 +#: config.c:683

1389 #, c-format

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

1391 msgstr ""

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

1393

1393 -#: config.c:768

1394 +#: config.c:770

1395 #, c-format

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

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

1398

1398 -#: config.c:852 config.c:863

1399 +#: config.c:865 config.c:876

1400 #, c-format

1401 msgid "bad zlib compression level %d"

1402 msgstr "niveau de compression zlib incorrect %d"

1403

1403 -#: config.c:978

1404 +#: config.c:993

1405 #, c-format

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

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

1408

1408 -#: config.c:1312

1409 +#: config.c:1149

1410 +#, c-format

1411 +msgid "bad pack compression level %d"

1412 +msgstr "niveau de compression du paquet %d"

1413 +

1414 +#: config.c:1339

1415 msgid "unable to parse command-line config"

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

1417

1412 -#: config.c:1362

1418 +#: config.c:1389

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

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

1421

1416 -#: config.c:1716

1422 +#: config.c:1743

1423 #, c-format

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

1425 msgstr ""

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

1427

1422 -#: config.c:1718

1428 +#: config.c:1745

1429 #, c-format

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

1431 msgstr ""

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

1433

1428 -#: config.c:1777

1434 +#: config.c:1804

1435 #, c-format

1436 msgid "%s has multiple values"

1437 msgstr "%s a des valeurs multiples"

1438

1433 -#: config.c:2311

1439 +#: config.c:2225 config.c:2450

1440 +#, c-format

1441 +msgid "fstat on %s failed"

1442 +msgstr "échec de fstat sur %s"

1443 +

1444 +#: config.c:2343

1445 #, c-format

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

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

1448

1438 -#: config.c:2313

1449 +#: config.c:2345

1450 #, c-format

1451 msgid "could not unset '%s'"

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

@@ -1456,7 +1467,7 @@ msgstr ""

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

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

1469

1459 -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1470 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1471 msgid "Checking connectivity"

1472 msgstr "Vérification de la connectivité"

1473

@@ -1595,13 +1606,13 @@ msgstr ""

1606 msgid " Unknown dirstat parameter '%s'\n"

1607 msgstr " Paramètre dirstat inconnu '%s'\n"

1608

1598 -#: diff.c:283

1609 +#: diff.c:281

1610 #, c-format

1611 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1612 msgstr ""

1613 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"

1614

1604 -#: diff.c:346

1615 +#: diff.c:344

1616 #, c-format

1617 msgid ""

1618 "Found errors in 'diff.dirstat' config variable:\n"

@@ -1610,20 +1621,20 @@ msgstr ""

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

1622 "%s"

1623

1613 -#: diff.c:3087

1624 +#: diff.c:3085

1625 #, c-format

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

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

1628

1618 -#: diff.c:3412

1629 +#: diff.c:3411

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

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

1632

1622 -#: diff.c:3502

1633 +#: diff.c:3501

1634 msgid "--follow requires exactly one pathspec"

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

1636

1626 -#: diff.c:3665

1637 +#: diff.c:3664

1638 #, c-format

1639 msgid ""

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

@@ -1632,24 +1643,24 @@ msgstr ""

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

1644 "%s"

1645

1635 -#: diff.c:3679

1646 +#: diff.c:3678

1647 #, c-format

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

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

1650

1640 -#: diff.c:4700

1651 +#: diff.c:4695

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

1653 msgstr ""

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

1655 "fichiers."

1656

1646 -#: diff.c:4703

1657 +#: diff.c:4698

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

1659 msgstr ""

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

1661 "grand nombre de fichiers."

1662

1652 -#: diff.c:4706

1663 +#: diff.c:4701

1664 #, c-format

1665 msgid ""

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

@@ -1657,14 +1668,19 @@ msgstr ""

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

1669 "commande."

1670

1660 -#: dir.c:1866

1671 +#: dir.c:1863

1672 msgid "failed to get kernel name and information"

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

1674

1664 -#: dir.c:1985

1675 +#: dir.c:1982

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

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

1678

1679 +#: dir.c:2760

1680 +#, c-format

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

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

1683 +

1684 #: fetch-pack.c:213

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

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

@@ -1845,35 +1861,40 @@ msgstr "impossible de créer un fichier temporaire"

1861 msgid "failed writing detached signature to '%s'"

1862 msgstr "impossible d'écrire la signature détachée dans '%s'"

1863

1848 -#: grep.c:1782

1864 +#: graph.c:96

1865 +#, c-format

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

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

1868 +

1869 +#: grep.c:1794

1870 #, c-format

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

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

1873

1853 -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1874 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

1875 #, c-format

1876 msgid "failed to stat '%s'"

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

1878

1858 -#: grep.c:1810

1879 +#: grep.c:1822

1880 #, c-format

1881 msgid "'%s': short read"

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

1883

1863 -#: help.c:203

1884 +#: help.c:218

1885 #, c-format

1886 msgid "available git commands in '%s'"

1887 msgstr "commandes git disponibles dans '%s'"

1888

1868 -#: help.c:210

1889 +#: help.c:225

1890 msgid "git commands available from elsewhere on your $PATH"

1891 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"

1892

1872 -#: help.c:241

1893 +#: help.c:256

1894 msgid "These are common Git commands used in various situations:"

1895 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"

1896

1876 -#: help.c:306

1897 +#: help.c:321

1898 #, c-format

1899 msgid ""

1900 "'%s' appears to be a git command, but we were not\n"

@@ -1882,11 +1903,11 @@ msgstr ""

1903 "'%s' semble être une commande git, mais elle n'a pas pu\n"

1904 "être exécutée. Peut-être git-%s est-elle cassée ?"

1905

1885 -#: help.c:361

1906 +#: help.c:376

1907 msgid "Uh oh. Your system reports no Git commands at all."

1908 msgstr "Ahem. Votre système n'indique aucune commande Git."

1909

1889 -#: help.c:383

1910 +#: help.c:398

1911 #, c-format

1912 msgid ""

1913 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -1896,17 +1917,17 @@ msgstr ""

1917 "pas.\n"

1918 "Continuons en supposant que vous avez voulu dire '%s'"

1919

1899 -#: help.c:388

1920 +#: help.c:403

1921 #, c-format

1922 msgid "in %0.1f seconds automatically..."

1923 msgstr "dans %0.1f secondes automatiquement..."

1924

1904 -#: help.c:395

1925 +#: help.c:410

1926 #, c-format

1927 msgid "git: '%s' is not a git command. See 'git --help'."

1928 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."

1929

1909 -#: help.c:399 help.c:465

1930 +#: help.c:414 help.c:480

1931 msgid ""

1932 "\n"

1933 "Did you mean this?"

@@ -1920,7 +1941,7 @@ msgstr[1] ""

1941 "\n"

1942 "Vouliez-vous dire un de ceux-là ?"

1943

1923 -#: help.c:461

1944 +#: help.c:476

1945 #, c-format

1946 msgid "%s: %s - %s"

1947 msgstr "%s: %s - %s"

@@ -1988,69 +2009,69 @@ msgstr "impossible d'écrire le nouveau fichier d'index"

2009 msgid "(bad commit)\n"

2010 msgstr "(mauvais commit)\n"

2011

1991 -#: merge-recursive.c:231

2012 +#: merge-recursive.c:231 merge-recursive.c:239

2013 #, c-format

2014 msgid "addinfo_cache failed for path '%s'"

2015 msgstr "échec de addinfo_cache pour le chemin '%s'"

2016

1996 -#: merge-recursive.c:301

2017 +#: merge-recursive.c:303

2018 msgid "error building trees"

2019 msgstr "erreur de construction des arbres"

2020

2000 -#: merge-recursive.c:720

2021 +#: merge-recursive.c:727

2022 #, c-format

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

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

2025

2005 -#: merge-recursive.c:731

2026 +#: merge-recursive.c:738

2027 #, c-format

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

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

2030

2010 -#: merge-recursive.c:745 merge-recursive.c:764

2031 +#: merge-recursive.c:752 merge-recursive.c:771

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

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

2034

2014 -#: merge-recursive.c:754

2035 +#: merge-recursive.c:761

2036 #, c-format

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

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

2039

2019 -#: merge-recursive.c:796 builtin/cat-file.c:34

2040 +#: merge-recursive.c:803 builtin/cat-file.c:34

2041 #, c-format

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

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

2044

2024 -#: merge-recursive.c:798

2045 +#: merge-recursive.c:805

2046 #, c-format

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

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

2049

2029 -#: merge-recursive.c:822

2050 +#: merge-recursive.c:829

2051 #, c-format

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

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

2054

2034 -#: merge-recursive.c:833

2055 +#: merge-recursive.c:840

2056 #, c-format

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

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

2059

2039 -#: merge-recursive.c:838

2060 +#: merge-recursive.c:845

2061 #, c-format

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

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

2064

2044 -#: merge-recursive.c:978

2065 +#: merge-recursive.c:985

2066 msgid "Failed to execute internal merge"

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

2068

2048 -#: merge-recursive.c:982

2069 +#: merge-recursive.c:989

2070 #, c-format

2071 msgid "Unable to add %s to database"

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

2073

2053 -#: merge-recursive.c:1081 merge-recursive.c:1095

2074 +#: merge-recursive.c:1088 merge-recursive.c:1102

2075 #, c-format

2076 msgid ""

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

@@ -2059,7 +2080,7 @@ msgstr ""

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

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

2082

2062 -#: merge-recursive.c:1087 merge-recursive.c:1100

2083 +#: merge-recursive.c:1094 merge-recursive.c:1107

2084 #, c-format

2085 msgid ""

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

@@ -2068,20 +2089,20 @@ msgstr ""

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

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

2091

2071 -#: merge-recursive.c:1143

2092 +#: merge-recursive.c:1150

2093 msgid "rename"

2094 msgstr "renommage"

2095

2075 -#: merge-recursive.c:1143

2096 +#: merge-recursive.c:1150

2097 msgid "renamed"

2098 msgstr "renommé"

2099

2079 -#: merge-recursive.c:1200

2100 +#: merge-recursive.c:1207

2101 #, c-format

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

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

2104

2084 -#: merge-recursive.c:1225

2105 +#: merge-recursive.c:1232

2106 #, c-format

2107 msgid ""

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

@@ -2090,137 +2111,137 @@ msgstr ""

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

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

2113

2093 -#: merge-recursive.c:1230

2114 +#: merge-recursive.c:1237

2115 msgid " (left unresolved)"

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

2117

2097 -#: merge-recursive.c:1292

2118 +#: merge-recursive.c:1299

2119 #, c-format

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

2121 msgstr ""

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

2123 ">'%s' dans %s"

2124

2104 -#: merge-recursive.c:1325

2125 +#: merge-recursive.c:1332

2126 #, c-format

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

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

2129

2109 -#: merge-recursive.c:1531

2130 +#: merge-recursive.c:1538

2131 #, c-format

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

2133 msgstr ""

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

2135

2115 -#: merge-recursive.c:1546

2136 +#: merge-recursive.c:1553

2137 #, c-format

2138 msgid "Adding merged %s"

2139 msgstr "Ajout de %s fusionné"

2140

2120 -#: merge-recursive.c:1553 merge-recursive.c:1766

2141 +#: merge-recursive.c:1560 merge-recursive.c:1774

2142 #, c-format

2143 msgid "Adding as %s instead"

2144 msgstr "Ajout plutôt comme %s"

2145

2125 -#: merge-recursive.c:1610

2146 +#: merge-recursive.c:1617

2147 #, c-format

2148 msgid "cannot read object %s"

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

2150

2130 -#: merge-recursive.c:1613

2151 +#: merge-recursive.c:1620

2152 #, c-format

2153 msgid "object %s is not a blob"

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

2155

2135 -#: merge-recursive.c:1666

2156 +#: merge-recursive.c:1673

2157 msgid "modify"

2158 msgstr "modification"

2159

2139 -#: merge-recursive.c:1666

2160 +#: merge-recursive.c:1673

2161 msgid "modified"

2162 msgstr "modifié"

2163

2143 -#: merge-recursive.c:1676

2164 +#: merge-recursive.c:1683

2165 msgid "content"

2166 msgstr "contenu"

2167

2147 -#: merge-recursive.c:1683

2168 +#: merge-recursive.c:1690

2169 msgid "add/add"

2170 msgstr "ajout/ajout"

2171

2151 -#: merge-recursive.c:1718

2172 +#: merge-recursive.c:1726

2173 #, c-format

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

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

2176

2156 -#: merge-recursive.c:1732

2177 +#: merge-recursive.c:1740

2178 #, c-format

2179 msgid "Auto-merging %s"

2180 msgstr "Fusion automatique de %s"

2181

2161 -#: merge-recursive.c:1736 git-submodule.sh:924

2182 +#: merge-recursive.c:1744 git-submodule.sh:930

2183 msgid "submodule"

2184 msgstr "sous-module"

2185

2165 -#: merge-recursive.c:1737

2186 +#: merge-recursive.c:1745

2187 #, c-format

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

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

2190

2170 -#: merge-recursive.c:1831

2191 +#: merge-recursive.c:1839

2192 #, c-format

2193 msgid "Removing %s"

2194 msgstr "Suppression de %s"

2195

2175 -#: merge-recursive.c:1857

2196 +#: merge-recursive.c:1865

2197 msgid "file/directory"

2198 msgstr "fichier/répertoire"

2199

2179 -#: merge-recursive.c:1863

2200 +#: merge-recursive.c:1871

2201 msgid "directory/file"

2202 msgstr "répertoire/fichier"

2203

2183 -#: merge-recursive.c:1868

2204 +#: merge-recursive.c:1877

2205 #, c-format

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

2207 msgstr ""

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

2209

2189 -#: merge-recursive.c:1877

2210 +#: merge-recursive.c:1886

2211 #, c-format

2212 msgid "Adding %s"

2213 msgstr "Ajout de %s"

2214

2194 -#: merge-recursive.c:1914

2215 +#: merge-recursive.c:1923

2216 msgid "Already up-to-date!"

2217 msgstr "Déjà à jour !"

2218

2198 -#: merge-recursive.c:1923

2219 +#: merge-recursive.c:1932

2220 #, c-format

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

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

2223

2203 -#: merge-recursive.c:2006

2224 +#: merge-recursive.c:2015

2225 msgid "Merging:"

2226 msgstr "Fusion :"

2227

2207 -#: merge-recursive.c:2019

2228 +#: merge-recursive.c:2028

2229 #, c-format

2230 msgid "found %u common ancestor:"

2231 msgid_plural "found %u common ancestors:"

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

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

2234

2214 -#: merge-recursive.c:2058

2235 +#: merge-recursive.c:2067

2236 msgid "merge returned no commit"

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

2238

2218 -#: merge-recursive.c:2121

2239 +#: merge-recursive.c:2130

2240 #, c-format

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

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

2243

2223 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

2244 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

2245 msgid "Unable to write index."

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

2247

@@ -2301,13 +2322,13 @@ msgstr "nom d'objet malformé '%s'"

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

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

2324

2304 -#: pathspec.c:133

2325 +#: pathspec.c:142

2326 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2327 msgstr ""

2328 "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "

2329 "incompatibles"

2330

2310 -#: pathspec.c:143

2331 +#: pathspec.c:149

2332 msgid ""

2333 "global 'literal' pathspec setting is incompatible with all other global "

2334 "pathspec settings"

@@ -2315,48 +2336,53 @@ msgstr ""

2336 "le réglage global de spécificateur de chemin 'literal' est incompatible avec "

2337 "tous les autres réglages globaux de spécificateur de chemin"

2338

2318 -#: pathspec.c:177

2339 +#: pathspec.c:188

2340 msgid "invalid parameter for pathspec magic 'prefix'"

2341 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"

2342

2322 -#: pathspec.c:183

2343 +#: pathspec.c:201

2344 #, c-format

2345 msgid "Invalid pathspec magic '%.*s' in '%s'"

2346 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"

2347

2327 -#: pathspec.c:187

2348 +#: pathspec.c:206

2349 #, c-format

2350 msgid "Missing ')' at the end of pathspec magic in '%s'"

2351 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"

2352

2332 -#: pathspec.c:205

2353 +#: pathspec.c:238

2354 #, c-format

2355 msgid "Unimplemented pathspec magic '%c' in '%s'"

2356 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"

2357

2337 -#: pathspec.c:230

2358 +#: pathspec.c:293 pathspec.c:315

2359 +#, c-format

2360 +msgid "Pathspec '%s' is in submodule '%.*s'"

2361 +msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

2362 +

2363 +#: pathspec.c:350

2364 #, c-format

2365 msgid "%s: 'literal' and 'glob' are incompatible"

2366 msgstr "%s : 'literal' et 'glob' sont incompatibles"

2367

2342 -#: pathspec.c:241

2368 +#: pathspec.c:363

2369 #, c-format

2370 msgid "%s: '%s' is outside repository"

2371 msgstr "%s : '%s' est hors du dépôt"

2372

2347 -#: pathspec.c:291

2373 +#: pathspec.c:451

2374 #, c-format

2349 -msgid "Pathspec '%s' is in submodule '%.*s'"

2350 -msgstr "Le chemin '%s' est dans le sous-module '%.*s'"

2375 +msgid "'%s' (mnemonic: '%c')"

2376 +msgstr "'%s' (mnémonique : '%c')"

2377

2352 -#: pathspec.c:353

2378 +#: pathspec.c:461

2379 #, c-format

2380 msgid "%s: pathspec magic not supported by this command: %s"

2381 msgstr ""

2382 "%s : le spécificateur magique de chemin n'est pas supporté par cette "

2383 "commande : %s"

2384

2359 -#: pathspec.c:408

2385 +#: pathspec.c:511

2386 msgid ""

2387 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2388 "use . instead if you meant to match all paths"

@@ -2365,12 +2391,12 @@ msgstr ""

2391 "invalides dans les prochaines versions. Veuillez utiliser . à la place pour "

2392 "correspondre à tous le chemins"

2393

2368 -#: pathspec.c:440

2394 +#: pathspec.c:535

2395 #, c-format

2396 msgid "pathspec '%s' is beyond a symbolic link"

2397 msgstr "le chemin '%s' est au-delà d'un lien symbolique"

2398

2373 -#: pathspec.c:449

2399 +#: pathspec.c:544

2400 msgid ""

2401 "There is nothing to exclude from by :(exclude) patterns.\n"

2402 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -2378,11 +2404,11 @@ msgstr ""

2404 "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n"

2405 "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?"

2406

2381 -#: pretty.c:971

2407 +#: pretty.c:982

2408 msgid "unable to parse --pretty format"

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

2410

2385 -#: read-cache.c:1315

2411 +#: read-cache.c:1307

2412 #, c-format

2413 msgid ""

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

@@ -2391,7 +2417,7 @@ msgstr ""

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

2418 "Utilisation de la version %i"

2419

2394 -#: read-cache.c:1325

2420 +#: read-cache.c:1317

2421 #, c-format

2422 msgid ""

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

@@ -2400,7 +2426,7 @@ msgstr ""

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

2427 "Utilisation de la version %i"

2428

2403 -#: refs.c:576 builtin/merge.c:840

2429 +#: refs.c:576 builtin/merge.c:844

2430 #, c-format

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

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

@@ -2420,230 +2446,235 @@ msgstr "impossible de supprimer les références : %s"

2446 msgid "could not remove reference %s"

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

2448

2423 -#: ref-filter.c:55

2449 +#: ref-filter.c:56

2450 #, c-format

2451 msgid "expected format: %%(color:<color>)"

2452 msgstr "format attendu : %%(color:<couleur>)"

2453

2428 -#: ref-filter.c:57

2454 +#: ref-filter.c:58

2455 #, c-format

2456 msgid "unrecognized color: %%(color:%s)"

2457 msgstr "couleur non reconnue : %%(color:%s)"

2458

2433 -#: ref-filter.c:71

2459 +#: ref-filter.c:72

2460 #, c-format

2461 msgid "unrecognized format: %%(%s)"

2462 msgstr "format non reconnu %%(%s)"

2463

2438 -#: ref-filter.c:77

2464 +#: ref-filter.c:78

2465 #, c-format

2466 msgid "%%(body) does not take arguments"

2467 msgstr "%%(body) n'accepte pas d'argument"

2468

2443 -#: ref-filter.c:84

2469 +#: ref-filter.c:85

2470 #, c-format

2471 msgid "%%(subject) does not take arguments"

2472 msgstr "%%(subject) n'accepte pas d'argument"

2473

2448 -#: ref-filter.c:101

2474 +#: ref-filter.c:92

2475 +#, c-format

2476 +msgid "%%(trailers) does not take arguments"

2477 +msgstr "%%(trailers) n'accepte pas d'argument"

2478 +

2479 +#: ref-filter.c:111

2480 #, c-format

2481 msgid "positive value expected contents:lines=%s"

2482 msgstr "valeur positive attendue contents:lines=%s"

2483

2453 -#: ref-filter.c:103

2484 +#: ref-filter.c:113

2485 #, c-format

2486 msgid "unrecognized %%(contents) argument: %s"

2487 msgstr "argument %%(contents) non reconnu : %s"

2488

2458 -#: ref-filter.c:113

2489 +#: ref-filter.c:123

2490 #, c-format

2491 msgid "unrecognized %%(objectname) argument: %s"

2492 msgstr "argument %%(objectname) non reconnu : %s"

2493

2463 -#: ref-filter.c:135

2494 +#: ref-filter.c:145

2495 #, c-format

2496 msgid "expected format: %%(align:<width>,<position>)"

2497 msgstr "format attendu : %%(align:<largeur>,<position>)"

2498

2468 -#: ref-filter.c:147

2499 +#: ref-filter.c:157

2500 #, c-format

2501 msgid "unrecognized position:%s"

2502 msgstr "position non reconnue : %s"

2503

2473 -#: ref-filter.c:151

2504 +#: ref-filter.c:161

2505 #, c-format

2506 msgid "unrecognized width:%s"

2507 msgstr "largeur non reconnue : %s"

2508

2478 -#: ref-filter.c:157

2509 +#: ref-filter.c:167

2510 #, c-format

2511 msgid "unrecognized %%(align) argument: %s"

2512 msgstr "argument %%(align) non reconnu : %s"

2513

2483 -#: ref-filter.c:161

2514 +#: ref-filter.c:171

2515 #, c-format

2516 msgid "positive width expected with the %%(align) atom"

2517 msgstr "valeur positive attendue avec l'atome %%(align)"

2518

2488 -#: ref-filter.c:244

2519 +#: ref-filter.c:255

2520 #, c-format

2521 msgid "malformed field name: %.*s"

2522 msgstr "nom de champ malformé %.*s"

2523

2493 -#: ref-filter.c:270

2524 +#: ref-filter.c:281

2525 #, c-format

2526 msgid "unknown field name: %.*s"

2527 msgstr "nom de champ inconnu : %.*s"

2528

2498 -#: ref-filter.c:372

2529 +#: ref-filter.c:383

2530 #, c-format

2531 msgid "format: %%(end) atom used without corresponding atom"

2532 msgstr "format : atome %%(end) utilisé sans atome correspondant"

2533

2503 -#: ref-filter.c:424

2534 +#: ref-filter.c:435

2535 #, c-format

2536 msgid "malformed format string %s"

2537 msgstr "Chaîne de formatage mal formée %s"

2538

2508 -#: ref-filter.c:878

2539 +#: ref-filter.c:898

2540 msgid ":strip= requires a positive integer argument"

2541 msgstr ":strip= requiert un argument entier positif"

2542

2512 -#: ref-filter.c:883

2543 +#: ref-filter.c:903

2544 #, c-format

2545 msgid "ref '%s' does not have %ld components to :strip"

2546 msgstr "la réf '%s' n'a pas %ld composants à :strip"

2547

2517 -#: ref-filter.c:1046

2548 +#: ref-filter.c:1066

2549 #, c-format

2550 msgid "unknown %.*s format %s"

2551 msgstr "format de %.*s inconnu %s"

2552

2522 -#: ref-filter.c:1066 ref-filter.c:1097

2553 +#: ref-filter.c:1086 ref-filter.c:1117

2554 #, c-format

2555 msgid "missing object %s for %s"

2556 msgstr "objet manquant %s pour %s"

2557

2527 -#: ref-filter.c:1069 ref-filter.c:1100

2558 +#: ref-filter.c:1089 ref-filter.c:1120

2559 #, c-format

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

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

2562

2532 -#: ref-filter.c:1311

2563 +#: ref-filter.c:1343

2564 #, c-format

2565 msgid "malformed object at '%s'"

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

2567

2537 -#: ref-filter.c:1373

2568 +#: ref-filter.c:1410

2569 #, c-format

2570 msgid "ignoring ref with broken name %s"

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

2572

2542 -#: ref-filter.c:1378

2573 +#: ref-filter.c:1415

2574 #, c-format

2575 msgid "ignoring broken ref %s"

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

2577

2547 -#: ref-filter.c:1633

2578 +#: ref-filter.c:1670

2579 #, c-format

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

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

2582

2552 -#: ref-filter.c:1687

2583 +#: ref-filter.c:1734

2584 #, c-format

2585 msgid "malformed object name %s"

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

2587

2557 -#: remote.c:746

2588 +#: remote.c:754

2589 #, c-format

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

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

2592

2562 -#: remote.c:750

2593 +#: remote.c:758

2594 #, c-format

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

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

2597

2567 -#: remote.c:754

2598 +#: remote.c:762

2599 #, c-format

2600 msgid "%s tracks both %s and %s"

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

2602

2572 -#: remote.c:762

2603 +#: remote.c:770

2604 msgid "Internal error"

2605 msgstr "Erreur interne"

2606

2576 -#: remote.c:1677 remote.c:1720

2607 +#: remote.c:1685 remote.c:1787

2608 msgid "HEAD does not point to a branch"

2609 msgstr "HEAD ne pointe pas sur une branche"

2610

2580 -#: remote.c:1686

2611 +#: remote.c:1694

2612 #, c-format

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

2614 msgstr "pas de branche '%s'"

2615

2585 -#: remote.c:1689

2616 +#: remote.c:1697

2617 #, c-format

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

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

2620

2590 -#: remote.c:1695

2621 +#: remote.c:1703

2622 #, c-format

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

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

2625

2595 -#: remote.c:1710

2626 +#: remote.c:1718

2627 #, c-format

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

2629 msgstr ""

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

2631 "branche locale de suivi"

2632

2602 -#: remote.c:1725

2633 +#: remote.c:1730

2634 #, c-format

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

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

2637

2607 -#: remote.c:1736

2638 +#: remote.c:1741

2639 #, c-format

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

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

2642

2612 -#: remote.c:1749

2643 +#: remote.c:1754

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

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

2646

2616 -#: remote.c:1771

2647 +#: remote.c:1776

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

2649 msgstr ""

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

2651

2621 -#: remote.c:2073

2652 +#: remote.c:2081

2653 #, c-format

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

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

2656

2626 -#: remote.c:2077

2657 +#: remote.c:2085

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

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

2660

2630 -#: remote.c:2080

2661 +#: remote.c:2088

2662 #, c-format

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

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

2665

2635 -#: remote.c:2084

2666 +#: remote.c:2092

2667 #, c-format

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

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

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

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

2672

2642 -#: remote.c:2090

2673 +#: remote.c:2098

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

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

2676

2646 -#: remote.c:2093

2677 +#: remote.c:2101

2678 #, c-format

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

2680 msgid_plural ""

@@ -2655,11 +2686,11 @@ msgstr[1] ""

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

2687 "en avance rapide.\n"

2688

2658 -#: remote.c:2101

2689 +#: remote.c:2109

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

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

2692

2662 -#: remote.c:2104

2693 +#: remote.c:2112

2694 #, c-format

2695 msgid ""

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

@@ -2674,7 +2705,7 @@ msgstr[1] ""

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

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

2707

2677 -#: remote.c:2114

2708 +#: remote.c:2122

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

2710 msgstr ""

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

@@ -2692,11 +2723,11 @@ msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

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

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

2725

2695 -#: run-command.c:106

2726 +#: run-command.c:125

2727 msgid "open /dev/null failed"

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

2729

2699 -#: run-command.c:108

2730 +#: run-command.c:127

2731 #, c-format

2732 msgid "dup2(%d,%d) failed"

2733 msgstr "échec de dup2(%d,%d)"

@@ -2725,15 +2756,24 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"

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

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

2758

2728 -#: sequencer.c:171

2759 +#: sequencer.c:215

2760 msgid "revert"

2761 msgstr "revert"

2762

2732 -#: sequencer.c:171

2763 +#: sequencer.c:217

2764 msgid "cherry-pick"

2765 msgstr "cherry-pick"

2766

2736 -#: sequencer.c:228

2767 +#: sequencer.c:219

2768 +msgid "rebase -i"

2769 +msgstr "rebase -i"

2770 +

2771 +#: sequencer.c:221

2772 +#, c-format

2773 +msgid "Unknown action: %d"

2774 +msgstr "Action inconnue : %d"

2775 +

2776 +#: sequencer.c:278

2777 msgid ""

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

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

@@ -2741,7 +2781,7 @@ msgstr ""

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

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

2783

2744 -#: sequencer.c:231

2784 +#: sequencer.c:281

2785 msgid ""

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

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

@@ -2751,60 +2791,63 @@ msgstr ""

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

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

2793

2754 -#: sequencer.c:244 sequencer.c:1209

2794 +#: sequencer.c:294 sequencer.c:1667

2795 #, c-format

2796 msgid "could not lock '%s'"

2797 msgstr "impossible de verrouiller '%s'"

2798

2759 -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2799 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2800 #, c-format

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

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

2803

2764 -#: sequencer.c:251

2804 +#: sequencer.c:301

2805 #, c-format

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

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

2808

2769 -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2809 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2810 #, c-format

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

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

2813

2774 -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2814 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2815 +#: builtin/commit.c:749 builtin/merge.c:1036

2816 #, c-format

2817 msgid "could not read '%s'"

2818 msgstr "impossible de lire '%s'"

2819

2779 -#: sequencer.c:305

2820 +#: sequencer.c:355

2821 #, c-format

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

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

2824

2784 -#: sequencer.c:309

2825 +#: sequencer.c:359

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

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

2828

2788 -#: sequencer.c:324

2829 +#: sequencer.c:388

2830 #, c-format

2831 msgid "%s: fast-forward"

2832 msgstr "%s : avance rapide"

2833

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

2794 -#: sequencer.c:399

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

2835 +#. * "rebase -i".

2836 +#.

2837 +#: sequencer.c:470

2838 #, c-format

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

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

2841

2799 -#: sequencer.c:418

2842 +#: sequencer.c:489

2843 msgid "could not resolve HEAD commit\n"

2844 msgstr "impossible de résoudre le commit HEAD\n"

2845

2803 -#: sequencer.c:438

2846 +#: sequencer.c:509

2847 msgid "unable to update cache tree\n"

2848 msgstr "impossible de mettre à jour l'arbre de cache\n"

2849

2807 -#: sequencer.c:483

2850 +#: sequencer.c:592

2851 #, c-format

2852 msgid ""

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

@@ -2833,174 +2876,394 @@ msgstr ""

2876 "\n"

2877 " git rebase --continue\n"

2878

2836 -#: sequencer.c:567

2879 +#: sequencer.c:688

2880 #, c-format

2881 msgid "could not parse commit %s\n"

2882 msgstr "impossible d'analyser le commit %s\n"

2883

2841 -#: sequencer.c:572

2884 +#: sequencer.c:693

2885 #, c-format

2886 msgid "could not parse parent commit %s\n"

2887 msgstr "impossible d'analyser le commit parent %s\n"

2888

2846 -#: sequencer.c:656

2889 +#: sequencer.c:815

2890 +#, c-format

2891 +msgid ""

2892 +"unexpected 1st line of squash message:\n"

2893 +"\n"

2894 +"\t%.*s"

2895 +msgstr ""

2896 +"première ligne de message de compression inattendue :\n"

2897 +"\n"

2898 +"\t%.*s"

2899 +

2900 +#: sequencer.c:821

2901 +#, c-format

2902 +msgid ""

2903 +"invalid 1st line of squash message:\n"

2904 +"\n"

2905 +"\t%.*s"

2906 +msgstr ""

2907 +"première ligne de message de compression invalide :\n"

2908 +"\n"

2909 +"\t%.*s"

2910 +

2911 +#: sequencer.c:827 sequencer.c:852

2912 +#, c-format

2913 +msgid "This is a combination of %d commits."

2914 +msgstr "Ceci est la combinaison de %d commits."

2915 +

2916 +#: sequencer.c:836

2917 +msgid "need a HEAD to fixup"

2918 +msgstr "une HEAD est nécessaire à la correction"

2919 +

2920 +#: sequencer.c:838

2921 +msgid "could not read HEAD"

2922 +msgstr "Impossible de lire HEAD"

2923 +

2924 +#: sequencer.c:840

2925 +msgid "could not read HEAD's commit message"

2926 +msgstr "impossible de lire le message de validation de HEAD"

2927 +

2928 +#: sequencer.c:846

2929 +#, c-format

2930 +msgid "cannot write '%s'"

2931 +msgstr "impossible d'écrire '%s'"

2932 +

2933 +#: sequencer.c:855 git-rebase--interactive.sh:445

2934 +msgid "This is the 1st commit message:"

2935 +msgstr "Ceci est le premier message de validation :"

2936 +

2937 +#: sequencer.c:863

2938 +#, c-format

2939 +msgid "could not read commit message of %s"

2940 +msgstr "impossible de lire le message de validation de %s"

2941 +

2942 +#: sequencer.c:870

2943 +#, c-format

2944 +msgid "This is the commit message #%d:"

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

2946 +

2947 +#: sequencer.c:875

2948 +#, c-format

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

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

2951 +

2952 +#: sequencer.c:880

2953 +#, c-format

2954 +msgid "unknown command: %d"

2955 +msgstr "commande inconnue : %d"

2956 +

2957 +#: sequencer.c:946

2958 msgid "your index file is unmerged."

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

2960

2850 -#: sequencer.c:675

2961 +#: sequencer.c:964

2962 #, c-format

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

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

2965

2855 -#: sequencer.c:683

2966 +#: sequencer.c:972

2967 #, c-format

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

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

2970

2860 -#: sequencer.c:687

2971 +#: sequencer.c:976

2972 #, c-format

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

2974 msgstr ""

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

2976 "fusion."

2977

2978 +#: sequencer.c:982

2979 +#, c-format

2980 +msgid "cannot get commit message for %s"

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

2982 +

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

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

2869 -#: sequencer.c:700

2985 +#: sequencer.c:1001

2986 #, c-format

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

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

2989

2874 -#: sequencer.c:705

2990 +#: sequencer.c:1063 sequencer.c:1812

2991 #, c-format

2876 -msgid "cannot get commit message for %s"

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

2992 +msgid "could not rename '%s' to '%s'"

2993 +msgstr "impossible de renommer '%s' en '%s'"

2994

2879 -#: sequencer.c:797

2995 +#: sequencer.c:1114

2996 #, c-format

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

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

2999

2884 -#: sequencer.c:798

3000 +#: sequencer.c:1115

3001 #, c-format

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

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

3004

2889 -#: sequencer.c:833

3005 +#: sequencer.c:1157

3006 msgid "empty commit set passed"

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

3008

2893 -#: sequencer.c:843

3009 +#: sequencer.c:1167

3010 #, c-format

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

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

3013

2898 -#: sequencer.c:850

3014 +#: sequencer.c:1174

3015 #, c-format

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

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

3018

2903 -#: sequencer.c:944

3019 +#: sequencer.c:1294

3020 #, c-format

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

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

3023

2908 -#: sequencer.c:950

2909 -msgid "no commits parsed."

2910 -msgstr "aucun commit analysé."

3024 +#: sequencer.c:1302

3025 +#, c-format

3026 +msgid "cannot '%s' without a previous commit"

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

3028

2912 -#: sequencer.c:966

3029 +#: sequencer.c:1334

3030 #, c-format

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

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

3033

2917 -#: sequencer.c:972

3034 +#: sequencer.c:1341

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

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

3037 +

3038 +#: sequencer.c:1343

3039 #, c-format

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

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

3042

2922 -#: sequencer.c:983

3043 +#: sequencer.c:1348

3044 +msgid "no commits parsed."

3045 +msgstr "aucun commit analysé."

3046 +

3047 +#: sequencer.c:1359

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

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

3050

2926 -#: sequencer.c:985

3051 +#: sequencer.c:1361

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

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

3054

2930 -#: sequencer.c:1028

3055 +#: sequencer.c:1424

3056 #, c-format

3057 msgid "invalid key: %s"

3058 msgstr "clé invalide : %s"

3059

2935 -#: sequencer.c:1031

3060 +#: sequencer.c:1427

3061 #, c-format

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

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

3064

2940 -#: sequencer.c:1063

3065 +#: sequencer.c:1484

3066 #, c-format

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

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

3069

2945 -#: sequencer.c:1101

3070 +#: sequencer.c:1522

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

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

3073

2949 -#: sequencer.c:1102

3074 +#: sequencer.c:1523

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

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

3077

2953 -#: sequencer.c:1106

3078 +#: sequencer.c:1526

3079 #, c-format

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

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

3082

2958 -#: sequencer.c:1120

3083 +#: sequencer.c:1540

3084 msgid "could not lock HEAD"

3085 msgstr "impossible de verrouiller HEAD"

3086

2962 -#: sequencer.c:1151 sequencer.c:1289

3087 +#: sequencer.c:1596 sequencer.c:2150

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

3089 msgstr "aucun picorage ou retour en cours"

3090

2966 -#: sequencer.c:1153

3091 +#: sequencer.c:1598

3092 msgid "cannot resolve HEAD"

3093 msgstr "impossible de résoudre HEAD"

3094

2970 -#: sequencer.c:1155 sequencer.c:1189

3095 +#: sequencer.c:1600 sequencer.c:1634

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

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

3098

2974 -#: sequencer.c:1175 builtin/grep.c:578

3099 +#: sequencer.c:1620 builtin/grep.c:904

3100 #, c-format

3101 msgid "cannot open '%s'"

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

3103

2979 -#: sequencer.c:1177

3104 +#: sequencer.c:1622

3105 #, c-format

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

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

3108

2984 -#: sequencer.c:1178

3109 +#: sequencer.c:1623

3110 msgid "unexpected end of file"

3111 msgstr "fin de fichier inattendue"

3112

2988 -#: sequencer.c:1184

3113 +#: sequencer.c:1629

3114 #, c-format

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

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

3117

2993 -#: sequencer.c:1354

3118 +#: sequencer.c:1640

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

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

3121 +

3122 +#: sequencer.c:1777 sequencer.c:2049

3123 +msgid "cannot read HEAD"

3124 +msgstr "impossible de lire HEAD"

3125 +

3126 +#: sequencer.c:1817 builtin/difftool.c:574

3127 +#, c-format

3128 +msgid "could not copy '%s' to '%s'"

3129 +msgstr "impossible de copier '%s' vers '%s'"

3130 +

3131 +#: sequencer.c:1833

3132 +msgid "could not read index"

3133 +msgstr "impossible de lire l'index"

3134 +

3135 +#: sequencer.c:1838

3136 +#, c-format

3137 +msgid ""

3138 +"execution failed: %s\n"

3139 +"%sYou can fix the problem, and then run\n"

3140 +"\n"

3141 +" git rebase --continue\n"

3142 +"\n"

3143 +msgstr ""

3144 +"échec d'exécution : %s\n"

3145 +"%sVous pouvez corriger le problème, puis lancer\n"

3146 +"\n"

3147 +"git rebase --continue\n"

3148 +"\n"

3149 +

3150 +#: sequencer.c:1844

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

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

3153 +

3154 +#: sequencer.c:1850

3155 +#, c-format

3156 +msgid ""

3157 +"execution succeeded: %s\n"

3158 +"but left changes to the index and/or the working tree\n"

3159 +"Commit or stash your changes, and then run\n"

3160 +"\n"

3161 +" git rebase --continue\n"

3162 +"\n"

3163 +msgstr ""

3164 +"L'exécution a réussi : %s\n"

3165 +"mais a laissé des modifications dans l'index ou la copie de travail\n"

3166 +"Validez ou remisez vos modification, puis lancez\n"

3167 +"\n"

3168 +" git rebase --continue\n"

3169 +"\n"

3170 +

3171 +#: sequencer.c:1905 git-rebase.sh:168

3172 +#, c-format

3173 +msgid "Applied autostash."

3174 +msgstr "Autoremisage appliqué."

3175 +

3176 +#: sequencer.c:1917

3177 +#, c-format

3178 +msgid "cannot store %s"

3179 +msgstr "impossible de stocker %s"

3180 +

3181 +#: sequencer.c:1919 git-rebase.sh:172

3182 +#, c-format

3183 +msgid ""

3184 +"Applying autostash resulted in conflicts.\n"

3185 +"Your changes are safe in the stash.\n"

3186 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3187 +msgstr ""

3188 +"L'application de l'autoremisage a provoqué des conflits\n"

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

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

3191 +

3192 +#: sequencer.c:2000

3193 +#, c-format

3194 +msgid "stopped at %s... %.*s"

3195 +msgstr "arrêt à %s... %.*s"

3196 +

3197 +#: sequencer.c:2027

3198 +#, c-format

3199 +msgid "unknown command %d"

3200 +msgstr "commande inconnue %d"

3201 +

3202 +#: sequencer.c:2057

3203 +msgid "could not read orig-head"

3204 +msgstr "impossible de lire orig-head"

3205 +

3206 +#: sequencer.c:2061

3207 +msgid "could not read 'onto'"

3208 +msgstr "impossible de lire 'onto'"

3209 +

3210 +#: sequencer.c:2068

3211 +#, c-format

3212 +msgid "could not update %s"

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

3214 +

3215 +#: sequencer.c:2075

3216 +#, c-format

3217 +msgid "could not update HEAD to %s"

3218 +msgstr "impossible de mettre à jour HEAD sur %s"

3219 +

3220 +#: sequencer.c:2159

3221 +msgid "cannot rebase: You have unstaged changes."

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

3223 +

3224 +#: sequencer.c:2164

3225 +msgid "could not remove CHERRY_PICK_HEAD"

3226 +msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3227 +

3228 +#: sequencer.c:2173

3229 +msgid "cannot amend non-existing commit"

3230 +msgstr "impossible de corriger un commit non-existant"

3231 +

3232 +#: sequencer.c:2175

3233 +#, c-format

3234 +msgid "invalid file: '%s'"

3235 +msgstr "fichier invalide : '%s'"

3236 +

3237 +#: sequencer.c:2177

3238 +#, c-format

3239 +msgid "invalid contents: '%s'"

3240 +msgstr "contenu invalide : '%s'"

3241 +

3242 +#: sequencer.c:2180

3243 +msgid ""

3244 +"\n"

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

3246 +"first and then run 'git rebase --continue' again."

3247 +msgstr ""

3248 +"\n"

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

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

3251 +

3252 +#: sequencer.c:2190

3253 +msgid "could not commit staged changes."

3254 +msgstr "impossible de valider les modifications indexées."

3255 +

3256 +#: sequencer.c:2270

3257 #, c-format

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

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

3260

2998 -#: sequencer.c:1358

3261 +#: sequencer.c:2274

3262 #, c-format

3263 msgid "%s: bad revision"

3264 msgstr "%s : mauvaise révision"

3265

3003 -#: sequencer.c:1391

3266 +#: sequencer.c:2307

3267 msgid "can't revert as initial commit"

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

3269

@@ -3036,29 +3299,29 @@ msgstr ""

3299 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"

3300 "'git <commande> [<révision>...] -- [<chemin>...]'"

3301

3039 -#: setup.c:468

3302 +#: setup.c:470

3303 #, c-format

3304 msgid "Expected git repo version <= %d, found %d"

3305 msgstr "Version attendue du dépôt git <= %d, %d trouvée"

3306

3044 -#: setup.c:476

3307 +#: setup.c:478

3308 msgid "unknown repository extensions found:"

3309 msgstr "extensions de dépôt inconnues trouvées :"

3310

3048 -#: setup.c:762

3311 +#: setup.c:768

3312 #, c-format

3313 msgid "Not a git repository (or any of the parent directories): %s"

3314 msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"

3315

3053 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

3316 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3317 msgid "Cannot come back to cwd"

3318 msgstr "Impossible de revenir au répertoire de travail courant"

3319

3057 -#: setup.c:845

3320 +#: setup.c:852

3321 msgid "Unable to read current working directory"

3322 msgstr "Impossible d'accéder au répertoire de travail courant"

3323

3061 -#: setup.c:920

3324 +#: setup.c:927

3325 #, c-format

3326 msgid ""

3327 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3069,12 +3332,12 @@ msgstr ""

3332 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "

3333 "n'est pas activé)."

3334

3072 -#: setup.c:927

3335 +#: setup.c:934

3336 #, c-format

3337 msgid "Cannot change to '%s/..'"

3338 msgstr "Impossible de se déplacer vers le répertoire '%s/..'"

3339

3077 -#: setup.c:989

3340 +#: setup.c:996

3341 #, c-format

3342 msgid ""

3343 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3084,43 +3347,43 @@ msgstr ""

3347 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

3348 "écriture."

3349

3087 -#: sha1_file.c:473

3350 +#: sha1_file.c:490

3351 #, c-format

3352 msgid "path '%s' does not exist"

3353 msgstr "le chemin '%s' n'existe pas"

3354

3092 -#: sha1_file.c:499

3355 +#: sha1_file.c:516

3356 #, c-format

3357 msgid "reference repository '%s' as a linked checkout is not supported yet."

3358 msgstr ""

3359 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

3360 "encore supporté."

3361

3099 -#: sha1_file.c:505

3362 +#: sha1_file.c:522

3363 #, c-format

3364 msgid "reference repository '%s' is not a local repository."

3365 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

3366

3104 -#: sha1_file.c:511

3367 +#: sha1_file.c:528

3368 #, c-format

3369 msgid "reference repository '%s' is shallow"

3370 msgstr "le dépôt de référence '%s' est superficiel"

3371

3109 -#: sha1_file.c:519

3372 +#: sha1_file.c:536

3373 #, c-format

3374 msgid "reference repository '%s' is grafted"

3375 msgstr "le dépôt de référence '%s' est greffé"

3376

3114 -#: sha1_file.c:1159

3377 +#: sha1_file.c:1176

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

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

3380

3118 -#: sha1_file.c:2592

3381 +#: sha1_file.c:2637

3382 #, c-format

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

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

3385

3123 -#: sha1_file.c:2596

3386 +#: sha1_file.c:2641

3387 #, c-format

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

3389 msgstr ""

@@ -3160,91 +3423,134 @@ msgstr ""

3423 "message\n"

3424 "en lançant \"git config advice.objectNameWarning false\""

3425

3163 -#: submodule.c:64 submodule.c:98

3426 +#: submodule.c:65 submodule.c:99

3427 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3428 msgstr ""

3429 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

3430 "d'abord"

3431

3169 -#: submodule.c:68 submodule.c:102

3432 +#: submodule.c:69 submodule.c:103

3433 #, c-format

3434 msgid "Could not find section in .gitmodules where path=%s"

3435 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

3436

3174 -#: submodule.c:76

3437 +#: submodule.c:77

3438 #, c-format

3439 msgid "Could not update .gitmodules entry %s"

3440 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

3441

3442 # ici %s est un chemin

3180 -#: submodule.c:109

3443 +#: submodule.c:110

3444 #, c-format

3445 msgid "Could not remove .gitmodules entry for %s"

3446 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

3447

3185 -#: submodule.c:120

3448 +#: submodule.c:121

3449 msgid "staging updated .gitmodules failed"

3450 msgstr "échec de la mise en index du .gitmodules mis à jour"

3451

3189 -#: submodule.c:158

3452 +#: submodule.c:159

3453 msgid "negative values not allowed for submodule.fetchJobs"

3454 msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

3455

3193 -#: submodule-config.c:358

3456 +#: submodule.c:1184

3457 +#, c-format

3458 +msgid "could not start 'git status in submodule '%s'"

3459 +msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

3460 +

3461 +#: submodule.c:1197

3462 +#, c-format

3463 +msgid "could not run 'git status in submodule '%s'"

3464 +msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

3465 +

3466 +#: submodule.c:1398

3467 +#, c-format

3468 +msgid ""

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

3470 +msgstr "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail n'est pas supporté"

3471 +

3472 +#: submodule.c:1410 submodule.c:1471

3473 +#, c-format

3474 +msgid "could not lookup name for submodule '%s'"

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

3476 +

3477 +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3478 +#: builtin/submodule--helper.c:650

3479 +#, c-format

3480 +msgid "could not create directory '%s'"

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

3482 +

3483 +#: submodule.c:1420

3484 +#, c-format

3485 +msgid ""

3486 +"Migrating git directory of '%s%s' from\n"

3487 +"'%s' to\n"

3488 +"'%s'\n"

3489 +msgstr ""

3490 +"Migration du répertoire git de '%s%s' depuis\n"

3491 +"'%s' sur\n"

3492 +"'%s'\n"

3493 +

3494 +#: submodule.c:1512

3495 +#, c-format

3496 +msgid "could not recurse into submodule '%s'"

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

3498 +

3499 +#: submodule-config.c:360

3500 #, c-format

3501 msgid "invalid value for %s"

3502 msgstr "Valeur invalide pour %s"

3503

3198 -#: trailer.c:238

3504 +#: trailer.c:240

3505 #, c-format

3506 msgid "running trailer command '%s' failed"

3507 msgstr "échec de la commande trailer '%s'"

3508

3203 -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

3204 -#: trailer.c:541

3509 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3510 +#: trailer.c:543

3511 #, c-format

3512 msgid "unknown value '%s' for key '%s'"

3513 msgstr "valeur inconnue '%s' pour la clé '%s'"

3514

3209 -#: trailer.c:523 trailer.c:528 builtin/remote.c:289

3515 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3516 #, c-format

3517 msgid "more than one %s"

3518 msgstr "plus d'un %s"

3519

3214 -#: trailer.c:672

3520 +#: trailer.c:702

3521 #, c-format

3522 msgid "empty trailer token in trailer '%.*s'"

3523 msgstr "symbole vide dans la ligne de fin '%.*s'"

3524

3219 -#: trailer.c:695

3525 +#: trailer.c:722

3526 #, c-format

3527 msgid "could not read input file '%s'"

3528 msgstr "impossible de lire le fichier d'entrée '%s'"

3529

3224 -#: trailer.c:698

3530 +#: trailer.c:725

3531 msgid "could not read from stdin"

3532 msgstr "Impossible de lire depuis l'entrée standard"

3533

3228 -#: trailer.c:929 builtin/am.c:44

3534 +#: trailer.c:949 builtin/am.c:44

3535 #, c-format

3536 msgid "could not stat %s"

3537 msgstr "stat impossible de %s"

3538

3233 -#: trailer.c:931

3539 +#: trailer.c:951

3540 #, c-format

3541 msgid "file %s is not a regular file"

3542 msgstr "%s n'est pas un fichier régulier"

3543

3238 -#: trailer.c:933

3544 +#: trailer.c:953

3545 #, c-format

3546 msgid "file %s is not writable by user"

3547 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"

3548

3243 -#: trailer.c:945

3549 +#: trailer.c:965

3550 msgid "could not open temporary file"

3551 msgstr "impossible de créer un fichier temporaire"

3552

3247 -#: trailer.c:983

3553 +#: trailer.c:1001

3554 #, c-format

3555 msgid "could not rename temporary file to %s"

3556 msgstr "impossible de renommer un fichier temporaire en %s"

@@ -3259,7 +3565,7 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

3565 msgid "transport: invalid depth option '%s'"

3566 msgstr "transport : option de profondeur invalide '%s'"

3567

3262 -#: transport.c:817

3568 +#: transport.c:885

3569 #, c-format

3570 msgid ""

3571 "The following submodule paths contain changes that can\n"

@@ -3268,7 +3574,7 @@ msgstr ""

3574 "Les chemins suivant de sous-module contiennent des modifications\n"

3575 "qui ne peuvent être trouvées sur aucun distant :\n"

3576

3271 -#: transport.c:821

3577 +#: transport.c:889

3578 #, c-format

3579 msgid ""

3580 "\n"

@@ -3295,7 +3601,7 @@ msgstr ""

3601 "pour les pousser vers un serveur distant.\n"

3602 "\n"

3603

3298 -#: transport.c:829

3604 +#: transport.c:897

3605 msgid "Aborting."

3606 msgstr "Abandon."

3607

@@ -3320,7 +3626,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"

3626 msgid "too-short tree file"

3627 msgstr "fichier arbre trop court"

3628

3323 -#: unpack-trees.c:64

3629 +#: unpack-trees.c:99

3630 #, c-format

3631 msgid ""

3632 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3331,7 +3637,7 @@ msgstr ""

3637 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

3638 "branche."

3639

3334 -#: unpack-trees.c:66

3640 +#: unpack-trees.c:101

3641 #, c-format

3642 msgid ""

3643 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3341,7 +3647,7 @@ msgstr ""

3647 "l'extraction :\n"

3648 "%%s"

3649

3344 -#: unpack-trees.c:69

3650 +#: unpack-trees.c:104

3651 #, c-format

3652 msgid ""

3653 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3351,7 +3657,7 @@ msgstr ""

3657 "fusion :\n"

3658 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

3659

3354 -#: unpack-trees.c:71

3660 +#: unpack-trees.c:106

3661 #, c-format

3662 msgid ""

3663 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3361,7 +3667,7 @@ msgstr ""

3667 "fusion :\n"

3668 "%%s"

3669

3364 -#: unpack-trees.c:74

3670 +#: unpack-trees.c:109

3671 #, c-format

3672 msgid ""

3673 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3370,7 +3676,7 @@ msgstr ""

3676 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

3677 "%%sVeuillez valider ou remiser vos modifications avant %s."

3678

3373 -#: unpack-trees.c:76

3679 +#: unpack-trees.c:111

3680 #, c-format

3681 msgid ""

3682 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3379,17 +3685,16 @@ msgstr ""

3685 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

3686 "%%s"

3687

3382 -#: unpack-trees.c:81

3688 +#: unpack-trees.c:116

3689 #, c-format

3690 msgid ""

3385 -"Updating the following directories would lose untracked files in it:\n"

3691 +"Updating the following directories would lose untracked files in them:\n"

3692 "%s"

3693 msgstr ""

3388 -"La mise à jour des répertoires suivants effacerait les fichiers non suivis "

3389 -"contenus :\n"

3694 +"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"

3695 "%s"

3696

3392 -#: unpack-trees.c:85

3697 +#: unpack-trees.c:120

3698 #, c-format

3699 msgid ""

3700 "The following untracked working tree files would be removed by checkout:\n"

@@ -3399,7 +3704,7 @@ msgstr ""

3704 "l'extraction :\n"

3705 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

3706

3402 -#: unpack-trees.c:87

3707 +#: unpack-trees.c:122

3708 #, c-format

3709 msgid ""

3710 "The following untracked working tree files would be removed by checkout:\n"

@@ -3408,7 +3713,7 @@ msgstr ""

3713 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

3714 "%%s"

3715

3411 -#: unpack-trees.c:90

3716 +#: unpack-trees.c:125

3717 #, c-format

3718 msgid ""

3719 "The following untracked working tree files would be removed by merge:\n"

@@ -3418,7 +3723,7 @@ msgstr ""

3723 "la fusion :\n"

3724 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

3725

3421 -#: unpack-trees.c:92

3726 +#: unpack-trees.c:127

3727 #, c-format

3728 msgid ""

3729 "The following untracked working tree files would be removed by merge:\n"

@@ -3427,7 +3732,7 @@ msgstr ""

3732 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

3733 "%%s"

3734

3430 -#: unpack-trees.c:95

3735 +#: unpack-trees.c:130

3736 #, c-format

3737 msgid ""

3738 "The following untracked working tree files would be removed by %s:\n"

@@ -3437,7 +3742,7 @@ msgstr ""

3742 "%s :\n"

3743 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

3744

3440 -#: unpack-trees.c:97

3745 +#: unpack-trees.c:132

3746 #, c-format

3747 msgid ""

3748 "The following untracked working tree files would be removed by %s:\n"

@@ -3446,7 +3751,7 @@ msgstr ""

3751 "Les fichiers suivants non suivis seraient effacés par %s :\n"

3752 "%%s"

3753

3449 -#: unpack-trees.c:102

3754 +#: unpack-trees.c:137

3755 #, c-format

3756 msgid ""

3757 "The following untracked working tree files would be overwritten by "

@@ -3457,7 +3762,7 @@ msgstr ""

3762 "l'extraction :\n"

3763 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

3764

3460 -#: unpack-trees.c:104

3765 +#: unpack-trees.c:139

3766 #, c-format

3767 msgid ""

3768 "The following untracked working tree files would be overwritten by "

@@ -3467,7 +3772,7 @@ msgstr ""

3772 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

3773 "%%s"

3774

3470 -#: unpack-trees.c:107

3775 +#: unpack-trees.c:142

3776 #, c-format

3777 msgid ""

3778 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3477,7 +3782,7 @@ msgstr ""

3782 "la fusion :\n"

3783 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

3784

3480 -#: unpack-trees.c:109

3785 +#: unpack-trees.c:144

3786 #, c-format

3787 msgid ""

3788 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3486,7 +3791,7 @@ msgstr ""

3791 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

3792 "%%s"

3793

3489 -#: unpack-trees.c:112

3794 +#: unpack-trees.c:147

3795 #, c-format

3796 msgid ""

3797 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3496,7 +3801,7 @@ msgstr ""

3801 "%s :\n"

3802 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

3803

3499 -#: unpack-trees.c:114

3804 +#: unpack-trees.c:149

3805 #, c-format

3806 msgid ""

3807 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3505,12 +3810,12 @@ msgstr ""

3810 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

3811 "%%s"

3812

3508 -#: unpack-trees.c:121

3813 +#: unpack-trees.c:156

3814 #, c-format

3815 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3816 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

3817

3513 -#: unpack-trees.c:124

3818 +#: unpack-trees.c:159

3819 #, c-format

3820 msgid ""

3821 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -3520,7 +3825,7 @@ msgstr ""

3825 "pas à jour :\n"

3826 "%s"

3827

3523 -#: unpack-trees.c:126

3828 +#: unpack-trees.c:161

3829 #, c-format

3830 msgid ""

3831 "The following working tree files would be overwritten by sparse checkout "

@@ -3531,7 +3836,7 @@ msgstr ""

3836 "jour par l'extraction creuse :\n"

3837 "%s"

3838

3534 -#: unpack-trees.c:128

3839 +#: unpack-trees.c:163

3840 #, c-format

3841 msgid ""

3842 "The following working tree files would be removed by sparse checkout "

@@ -3542,12 +3847,12 @@ msgstr ""

3847 "à jour par extraction creuse :\n"

3848 "%s"

3849

3545 -#: unpack-trees.c:205

3850 +#: unpack-trees.c:240

3851 #, c-format

3852 msgid "Aborting\n"

3853 msgstr "Abandon\n"

3854

3550 -#: unpack-trees.c:237

3855 +#: unpack-trees.c:270

3856 msgid "Checking out files"

3857 msgstr "Extraction des fichiers"

3858

@@ -3596,7 +3901,7 @@ msgid "could not open '%s' for writing"

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

3902

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

3599 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029

3904 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

3905 #: builtin/pull.c:341

3906 #, c-format

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

@@ -3813,63 +4118,67 @@ msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

4118 msgid " (use \"git am --abort\" to restore the original branch)"

4119 msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"

4120

3816 -#: wt-status.c:1172

4121 +#: wt-status.c:1176

4122 +msgid "git-rebase-todo is missing."

4123 +msgstr "git-rebase-todo est manquant."

4124 +

4125 +#: wt-status.c:1178

4126 msgid "No commands done."

4127 msgstr "Aucune commande réalisée."

4128

3820 -#: wt-status.c:1175

4129 +#: wt-status.c:1181

4130 #, c-format

4131 msgid "Last command done (%d command done):"

4132 msgid_plural "Last commands done (%d commands done):"

4133 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

4134 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

4135

3827 -#: wt-status.c:1186

4136 +#: wt-status.c:1192

4137 #, c-format

4138 msgid " (see more in file %s)"

4139 msgstr " (voir plus dans le fichier %s)"

4140

3832 -#: wt-status.c:1191

4141 +#: wt-status.c:1197

4142 msgid "No commands remaining."

4143 msgstr "Aucune commande restante."

4144

3836 -#: wt-status.c:1194

4145 +#: wt-status.c:1200

4146 #, c-format

4147 msgid "Next command to do (%d remaining command):"

4148 msgid_plural "Next commands to do (%d remaining commands):"

4149 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

4150 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

4151

3843 -#: wt-status.c:1202

4152 +#: wt-status.c:1208

4153 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4154 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

4155

3847 -#: wt-status.c:1215

4156 +#: wt-status.c:1221

4157 #, c-format

4158 msgid "You are currently rebasing branch '%s' on '%s'."

4159 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

4160

3852 -#: wt-status.c:1220

4161 +#: wt-status.c:1226

4162 msgid "You are currently rebasing."

4163 msgstr "Vous êtes en train de rebaser."

4164

3856 -#: wt-status.c:1234

4165 +#: wt-status.c:1240

4166 msgid " (fix conflicts and then run \"git rebase --continue\")"

4167 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

4168

3860 -#: wt-status.c:1236

4169 +#: wt-status.c:1242

4170 msgid " (use \"git rebase --skip\" to skip this patch)"

4171 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

4172

3864 -#: wt-status.c:1238

4173 +#: wt-status.c:1244

4174 msgid " (use \"git rebase --abort\" to check out the original branch)"

4175 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

4176

3868 -#: wt-status.c:1244

4177 +#: wt-status.c:1250

4178 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4179 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

4180

3872 -#: wt-status.c:1248

4181 +#: wt-status.c:1254

4182 #, c-format

4183 msgid ""

4184 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -3877,124 +4186,124 @@ msgstr ""

4186 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

4187 "de la branche '%s' sur '%s'."

4188

3880 -#: wt-status.c:1253

4189 +#: wt-status.c:1259

4190 msgid "You are currently splitting a commit during a rebase."

4191 msgstr ""

4192 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

4193

3885 -#: wt-status.c:1256

4194 +#: wt-status.c:1262

4195 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4196 msgstr ""

4197 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

4198

3890 -#: wt-status.c:1260

4199 +#: wt-status.c:1266

4200 #, c-format

4201 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4202 msgstr ""

4203 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

4204 "branche '%s' sur '%s'."

4205

3897 -#: wt-status.c:1265

4206 +#: wt-status.c:1271

4207 msgid "You are currently editing a commit during a rebase."

4208 msgstr ""

4209 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

4210

3902 -#: wt-status.c:1268

4211 +#: wt-status.c:1274

4212 msgid " (use \"git commit --amend\" to amend the current commit)"

4213 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

4214

3906 -#: wt-status.c:1270

4215 +#: wt-status.c:1276

4216 msgid ""

4217 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4218 msgstr ""

4219 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

4220 "modifications)"

4221

3913 -#: wt-status.c:1280

4222 +#: wt-status.c:1286

4223 #, c-format

4224 msgid "You are currently cherry-picking commit %s."

4225 msgstr "Vous êtes actuellement en train de picorer le commit %s."

4226

3918 -#: wt-status.c:1285

4227 +#: wt-status.c:1291

4228 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4229 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

4230

3922 -#: wt-status.c:1288

4231 +#: wt-status.c:1294

4232 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4233 msgstr ""

4234 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

4235

3927 -#: wt-status.c:1290

4236 +#: wt-status.c:1296

4237 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4238 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

4239

3931 -#: wt-status.c:1299

4240 +#: wt-status.c:1305

4241 #, c-format

4242 msgid "You are currently reverting commit %s."

4243 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

4244

3936 -#: wt-status.c:1304

4245 +#: wt-status.c:1310

4246 msgid " (fix conflicts and run \"git revert --continue\")"

4247 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

4248

3940 -#: wt-status.c:1307

4249 +#: wt-status.c:1313

4250 msgid " (all conflicts fixed: run \"git revert --continue\")"

4251 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

4252

3944 -#: wt-status.c:1309

4253 +#: wt-status.c:1315

4254 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4255 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

4256

3948 -#: wt-status.c:1320

4257 +#: wt-status.c:1326

4258 #, c-format

4259 msgid "You are currently bisecting, started from branch '%s'."

4260 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

4261

3953 -#: wt-status.c:1324

4262 +#: wt-status.c:1330

4263 msgid "You are currently bisecting."

4264 msgstr "Vous êtes en cours de bissection."

4265

3957 -#: wt-status.c:1327

4266 +#: wt-status.c:1333

4267 msgid " (use \"git bisect reset\" to get back to the original branch)"

4268 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

4269

3961 -#: wt-status.c:1524

4270 +#: wt-status.c:1530

4271 msgid "On branch "

4272 msgstr "Sur la branche "

4273

3965 -#: wt-status.c:1530

4274 +#: wt-status.c:1536

4275 msgid "interactive rebase in progress; onto "

4276 msgstr "rebasage interactif en cours ; sur "

4277

3969 -#: wt-status.c:1532

4278 +#: wt-status.c:1538

4279 msgid "rebase in progress; onto "

4280 msgstr "rebasage en cours ; sur "

4281

3973 -#: wt-status.c:1537

4282 +#: wt-status.c:1543

4283 msgid "HEAD detached at "

4284 msgstr "HEAD détachée sur "

4285

3977 -#: wt-status.c:1539

4286 +#: wt-status.c:1545

4287 msgid "HEAD detached from "

4288 msgstr "HEAD détachée depuis "

4289

3981 -#: wt-status.c:1542

4290 +#: wt-status.c:1548

4291 msgid "Not currently on any branch."

4292 msgstr "Actuellement sur aucun branche."

4293

3985 -#: wt-status.c:1560

4294 +#: wt-status.c:1566

4295 msgid "Initial commit"

4296 msgstr "Validation initiale"

4297

3989 -#: wt-status.c:1574

4298 +#: wt-status.c:1580

4299 msgid "Untracked files"

4300 msgstr "Fichiers non suivis"

4301

3993 -#: wt-status.c:1576

4302 +#: wt-status.c:1582

4303 msgid "Ignored files"

4304 msgstr "Fichiers ignorés"

4305

3997 -#: wt-status.c:1580

4306 +#: wt-status.c:1586

4307 #, c-format

4308 msgid ""

4309 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -4006,32 +4315,32 @@ msgstr ""

4315 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

4316 "status')."

4317

4009 -#: wt-status.c:1586

4318 +#: wt-status.c:1592

4319 #, c-format

4320 msgid "Untracked files not listed%s"

4321 msgstr "Fichiers non suivis non affichés%s"

4322

4014 -#: wt-status.c:1588

4323 +#: wt-status.c:1594

4324 msgid " (use -u option to show untracked files)"

4325 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

4326

4018 -#: wt-status.c:1594

4327 +#: wt-status.c:1600

4328 msgid "No changes"

4329 msgstr "Aucune modification"

4330

4022 -#: wt-status.c:1599

4331 +#: wt-status.c:1605

4332 #, c-format

4333 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4334 msgstr ""

4335 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

4336 "\"git commit -a\")\n"

4337

4029 -#: wt-status.c:1602

4338 +#: wt-status.c:1608

4339 #, c-format

4340 msgid "no changes added to commit\n"

4341 msgstr "aucune modification ajoutée à la validation\n"

4342

4034 -#: wt-status.c:1605

4343 +#: wt-status.c:1611

4344 #, c-format

4345 msgid ""

4346 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -4040,67 +4349,67 @@ msgstr ""

4349 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4350 "sont présents (utilisez \"git add\" pour les suivre)\n"

4351

4043 -#: wt-status.c:1608

4352 +#: wt-status.c:1614

4353 #, c-format

4354 msgid "nothing added to commit but untracked files present\n"

4355 msgstr ""

4356 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4357 "sont présents\n"

4358

4050 -#: wt-status.c:1611

4359 +#: wt-status.c:1617

4360 #, c-format

4361 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4362 msgstr ""

4363 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

4364 "suivre)\n"

4365

4057 -#: wt-status.c:1614 wt-status.c:1619

4366 +#: wt-status.c:1620 wt-status.c:1625

4367 #, c-format

4368 msgid "nothing to commit\n"

4369 msgstr "rien à valider\n"

4370

4062 -#: wt-status.c:1617

4371 +#: wt-status.c:1623

4372 #, c-format

4373 msgid "nothing to commit (use -u to show untracked files)\n"

4374 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

4375

4067 -#: wt-status.c:1621

4376 +#: wt-status.c:1627

4377 #, c-format

4378 msgid "nothing to commit, working tree clean\n"

4379 msgstr "rien à valider, la copie de travail est propre\n"

4380

4072 -#: wt-status.c:1728

4381 +#: wt-status.c:1734

4382 msgid "Initial commit on "

4383 msgstr "Validation initiale sur "

4384

4076 -#: wt-status.c:1732

4385 +#: wt-status.c:1738

4386 msgid "HEAD (no branch)"

4387 msgstr "HEAD (aucune branche)"

4388

4389 # à priori on parle d'une branche ici

4081 -#: wt-status.c:1761

4390 +#: wt-status.c:1767

4391 msgid "gone"

4392 msgstr "disparue"

4393

4085 -#: wt-status.c:1763 wt-status.c:1771

4394 +#: wt-status.c:1769 wt-status.c:1777

4395 msgid "behind "

4396 msgstr "derrière "

4397

4089 -#: wt-status.c:1766 wt-status.c:1769

4398 +#: wt-status.c:1772 wt-status.c:1775

4399 msgid "ahead "

4400 msgstr "devant "

4401

4402 #. TRANSLATORS: the action is e.g. "pull with rebase"

4094 -#: wt-status.c:2270

4403 +#: wt-status.c:2277

4404 #, c-format

4405 msgid "cannot %s: You have unstaged changes."

4406 msgstr "Impossible de %s : vous avez des modifications non indexées."

4407

4099 -#: wt-status.c:2276

4408 +#: wt-status.c:2283

4409 msgid "additionally, your index contains uncommitted changes."

4410 msgstr "de plus, votre index contient des modifications non validées."

4411

4103 -#: wt-status.c:2278

4412 +#: wt-status.c:2285

4413 #, c-format

4414 msgid "cannot %s: Your index contains uncommitted changes."

4415 msgstr "%s impossible : votre index contient des modifications non validées."

@@ -4132,7 +4441,7 @@ msgstr "suppression de '%s'\n"

4441 msgid "Unstaged changes after refreshing the index:"

4442 msgstr "Modifications non indexées après rafraîchissement de l'index :"

4443

4135 -#: builtin/add.c:209 builtin/rev-parse.c:840

4444 +#: builtin/add.c:209 builtin/rev-parse.c:845

4445 msgid "Could not read the index"

4446 msgstr "Impossible de lire l'index"

4447

@@ -4168,9 +4477,9 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

4477 msgstr ""

4478 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

4479

4171 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111

4172 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521

4173 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162

4480 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4481 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4482 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4483 msgid "dry run"

4484 msgstr "simuler l'action"

4485

@@ -4178,7 +4487,7 @@ msgstr "simuler l'action"

4487 msgid "interactive picking"

4488 msgstr "sélection interactive"

4489

4181 -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286

4490 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4491 msgid "select hunks interactively"

4492 msgstr "sélection interactive des sections"

4493

@@ -4264,7 +4573,7 @@ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

4573

4574 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4575 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4267 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

4576 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4577 #: builtin/submodule--helper.c:244

4578 msgid "index file corrupt"

4579 msgstr "fichier d'index corrompu"

@@ -4388,7 +4697,7 @@ msgstr "Retour à un patch de la base et fusion à 3 points..."

4697 msgid "Failed to merge in the changes."

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

4699

4391 -#: builtin/am.c:1686 builtin/merge.c:628

4700 +#: builtin/am.c:1686 builtin/merge.c:632

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

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

4703

@@ -4396,8 +4705,8 @@ msgstr "git write-tree a échoué à écrire un arbre"

4705 msgid "applying to an empty history"

4706 msgstr "application à un historique vide"

4707

4399 -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798

4400 -#: builtin/merge.c:823

4708 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4709 +#: builtin/merge.c:827

4710 msgid "failed to write commit object"

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

4712

@@ -4510,7 +4819,7 @@ msgid "allow fall back on 3way merging if needed"

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

4820

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

4513 -#: builtin/repack.c:172

4822 +#: builtin/repack.c:178

4823 msgid "be quiet"

4824 msgstr "être silencieux"

4825

@@ -4554,15 +4863,15 @@ msgid "pass it through git-apply"

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

4864

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

4557 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135

4558 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185

4559 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340

4866 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4867 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4868 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4869 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4870 msgid "n"

4871 msgstr "n"

4872

4873 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4565 -#: builtin/tag.c:372

4874 +#: builtin/tag.c:387 builtin/verify-tag.c:38

4875 msgid "format"

4876 msgstr "format"

4877

@@ -4599,8 +4908,8 @@ msgstr "mentir sur la date de validation"

4908 msgid "use current timestamp for author date"

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

4910

4602 -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229

4603 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355

4911 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4912 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

4913 msgid "key-id"

4914 msgstr "id-clé"

4915

@@ -4704,125 +5013,117 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

5013 msgid "<rev-opts> are documented in git-rev-list(1)"

5014 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

5015

4707 -#: builtin/blame.c:1781

5016 +#: builtin/blame.c:1786

5017 msgid "Blaming lines"

5018 msgstr "Assignation de blâme au lignes"

5019

4711 -#: builtin/blame.c:2577

5020 +#: builtin/blame.c:2582

5021 msgid "Show blame entries as we find them, incrementally"

5022 msgstr ""

5023 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

5024 "manière incrémentale"

5025

4717 -#: builtin/blame.c:2578

5026 +#: builtin/blame.c:2583

5027 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5028 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

5029

4721 -#: builtin/blame.c:2579

5030 +#: builtin/blame.c:2584

5031 msgid "Do not treat root commits as boundaries (Default: off)"

5032 msgstr ""

5033 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

5034

4726 -#: builtin/blame.c:2580

5035 +#: builtin/blame.c:2585

5036 msgid "Show work cost statistics"

5037 msgstr "Montrer les statistiques de coût d'activité"

5038

4730 -#: builtin/blame.c:2581

5039 +#: builtin/blame.c:2586

5040 msgid "Force progress reporting"

5041 msgstr "Forcer l'affichage de l'état d'avancement"

5042

4734 -#: builtin/blame.c:2582

5043 +#: builtin/blame.c:2587

5044 msgid "Show output score for blame entries"

5045 msgstr "Montrer le score de sortie pour les éléments de blâme"

5046

4738 -#: builtin/blame.c:2583

5047 +#: builtin/blame.c:2588

5048 msgid "Show original filename (Default: auto)"

5049 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

5050

4742 -#: builtin/blame.c:2584

5051 +#: builtin/blame.c:2589

5052 msgid "Show original linenumber (Default: off)"

5053 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

5054

4746 -#: builtin/blame.c:2585

5055 +#: builtin/blame.c:2590

5056 msgid "Show in a format designed for machine consumption"

5057 msgstr "Afficher dans un format propice à la consommation par machine"

5058

4750 -#: builtin/blame.c:2586

5059 +#: builtin/blame.c:2591

5060 msgid "Show porcelain format with per-line commit information"

5061 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

5062

4754 -#: builtin/blame.c:2587

5063 +#: builtin/blame.c:2592

5064 msgid "Use the same output mode as git-annotate (Default: off)"

5065 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

5066

4758 -#: builtin/blame.c:2588

5067 +#: builtin/blame.c:2593

5068 msgid "Show raw timestamp (Default: off)"

5069 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

5070

4762 -#: builtin/blame.c:2589

5071 +#: builtin/blame.c:2594

5072 msgid "Show long commit SHA1 (Default: off)"

5073 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

5074

4766 -#: builtin/blame.c:2590

5075 +#: builtin/blame.c:2595

5076 msgid "Suppress author name and timestamp (Default: off)"

5077 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

5078

4770 -#: builtin/blame.c:2591

5079 +#: builtin/blame.c:2596

5080 msgid "Show author email instead of name (Default: off)"

5081 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

5082

4774 -#: builtin/blame.c:2592

5083 +#: builtin/blame.c:2597

5084 msgid "Ignore whitespace differences"

5085 msgstr "Ignorer les différences d'espace"

5086

4778 -#: builtin/blame.c:2599

4779 -msgid "Use an experimental indent-based heuristic to improve diffs"

4780 -msgstr ""

4781 -"Utiliser une heuristique expérimentale reposant sur l'indentation pour "

4782 -"améliorer les diffs"

4783 -

4784 -#: builtin/blame.c:2600

4785 -msgid "Use an experimental blank-line-based heuristic to improve diffs"

4786 -msgstr ""

4787 -"Utiliser une heuristique expérimentale reposant sur les lignes vides pour "

4788 -"améliorer le diffs"

5087 +#: builtin/blame.c:2604

5088 +msgid "Use an experimental heuristic to improve diffs"

5089 +msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"

5090

4790 -#: builtin/blame.c:2602

5091 +#: builtin/blame.c:2606

5092 msgid "Spend extra cycles to find better match"

5093 msgstr ""

5094 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

5095

4795 -#: builtin/blame.c:2603

5096 +#: builtin/blame.c:2607

5097 msgid "Use revisions from <file> instead of calling git-rev-list"

5098 msgstr ""

5099 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

5100

4800 -#: builtin/blame.c:2604

5101 +#: builtin/blame.c:2608

5102 msgid "Use <file>'s contents as the final image"

5103 msgstr "Utiliser le contenu de <fichier> comme image finale"

5104

4804 -#: builtin/blame.c:2605 builtin/blame.c:2606

5105 +#: builtin/blame.c:2609 builtin/blame.c:2610

5106 msgid "score"

5107 msgstr "score"

5108

4808 -#: builtin/blame.c:2605

5109 +#: builtin/blame.c:2609

5110 msgid "Find line copies within and across files"

5111 msgstr "Trouver les copies de ligne dans et entre les fichiers"

5112

4812 -#: builtin/blame.c:2606

5113 +#: builtin/blame.c:2610

5114 msgid "Find line movements within and across files"

5115 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

5116

4816 -#: builtin/blame.c:2607

5117 +#: builtin/blame.c:2611

5118 msgid "n,m"

5119 msgstr "n,m"

5120

4820 -#: builtin/blame.c:2607

5121 +#: builtin/blame.c:2611

5122 msgid "Process only line range n,m, counting from 1"

5123 msgstr ""

5124 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

5125

4825 -#: builtin/blame.c:2654

5126 +#: builtin/blame.c:2658

5127 msgid "--progress can't be used with --incremental or porcelain formats"

5128 msgstr ""

5129 "--progress ne peut pas être utilisé avec --incremental ou les formats "

@@ -4834,42 +5135,42 @@ msgstr ""

5135 #. takes 22 places, is the longest among various forms of

5136 #. relative timestamps, but your language may need more or

5137 #. fewer display columns.

4837 -#: builtin/blame.c:2700

5138 +#: builtin/blame.c:2706

5139 msgid "4 years, 11 months ago"

5140 msgstr "il y a 10 ans et 11 mois"

5141

4841 -#: builtin/blame.c:2780

5142 +#: builtin/blame.c:2786

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

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

5145

4845 -#: builtin/blame.c:2800

5146 +#: builtin/blame.c:2806

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

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

5149

4849 -#: builtin/blame.c:2805

5150 +#: builtin/blame.c:2811

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

5152 msgstr ""

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

5154 "dernier commit"

5155

4855 -#: builtin/blame.c:2832

5156 +#: builtin/blame.c:2838

5157 msgid ""

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

5159 msgstr ""

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

5161 "premier parent"

5162

4862 -#: builtin/blame.c:2843

5163 +#: builtin/blame.c:2849

5164 #, c-format

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

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

5167

4867 -#: builtin/blame.c:2854

5168 +#: builtin/blame.c:2860

5169 #, c-format

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

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

5172

4872 -#: builtin/blame.c:2873

5173 +#: builtin/blame.c:2879

5174 #, c-format

5175 msgid "file %s has only %lu line"

5176 msgid_plural "file %s has only %lu lines"

@@ -5049,46 +5350,46 @@ msgstr "(HEAD détachée depuis %s)"

5350 msgid "(no branch)"

5351 msgstr "(aucune branche)"

5352

5052 -#: builtin/branch.c:544

5353 +#: builtin/branch.c:535

5354 #, c-format

5355 msgid "Branch %s is being rebased at %s"

5356 msgstr "La branche %s est en cours de rebasage sur %s"

5357

5057 -#: builtin/branch.c:548

5358 +#: builtin/branch.c:539

5359 #, c-format

5360 msgid "Branch %s is being bisected at %s"

5361 msgstr "La branche %s est en cours de bissection sur %s"

5362

5062 -#: builtin/branch.c:563

5363 +#: builtin/branch.c:554

5364 msgid "cannot rename the current branch while not on any."

5365 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

5366

5066 -#: builtin/branch.c:573

5367 +#: builtin/branch.c:564

5368 #, c-format

5369 msgid "Invalid branch name: '%s'"

5370 msgstr "Nom de branche invalide : '%s'"

5371

5071 -#: builtin/branch.c:590

5372 +#: builtin/branch.c:581

5373 msgid "Branch rename failed"

5374 msgstr "Échec de renommage de la branche"

5375

5075 -#: builtin/branch.c:594

5376 +#: builtin/branch.c:585

5377 #, c-format

5378 msgid "Renamed a misnamed branch '%s' away"

5379 msgstr "Renommage d'un branche mal nommée '%s'"

5380

5080 -#: builtin/branch.c:597

5381 +#: builtin/branch.c:588

5382 #, c-format

5383 msgid "Branch renamed to %s, but HEAD is not updated!"

5384 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

5385

5085 -#: builtin/branch.c:604

5386 +#: builtin/branch.c:595

5387 msgid "Branch is renamed, but update of config-file failed"

5388 msgstr ""

5389 "La branche est renommée, mais la mise à jour du fichier de configuration a "

5390 "échoué"

5391

5091 -#: builtin/branch.c:620

5392 +#: builtin/branch.c:611

5393 #, c-format

5394 msgid ""

5395 "Please edit the description for the branch\n"

@@ -5099,163 +5400,167 @@ msgstr ""

5400 " %s\n"

5401 "Les lignes commençant par '%c' seront ignorées.\n"

5402

5102 -#: builtin/branch.c:651

5403 +#: builtin/branch.c:643

5404 msgid "Generic options"

5405 msgstr "Options génériques"

5406

5106 -#: builtin/branch.c:653

5407 +#: builtin/branch.c:645

5408 msgid "show hash and subject, give twice for upstream branch"

5409 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

5410

5110 -#: builtin/branch.c:654

5411 +#: builtin/branch.c:646

5412 msgid "suppress informational messages"

5413 msgstr "supprimer les messages d'information"

5414

5114 -#: builtin/branch.c:655

5415 +#: builtin/branch.c:647

5416 msgid "set up tracking mode (see git-pull(1))"

5417 msgstr "régler le mode de suivi (voir git-pull(1))"

5418

5118 -#: builtin/branch.c:657

5419 +#: builtin/branch.c:649

5420 msgid "change upstream info"

5421 msgstr "modifier l'information amont"

5422

5122 -#: builtin/branch.c:659

5423 +#: builtin/branch.c:651

5424 msgid "upstream"

5425 msgstr "amont"

5426

5126 -#: builtin/branch.c:659

5427 +#: builtin/branch.c:651

5428 msgid "change the upstream info"

5429 msgstr "modifier l'information amont"

5430

5130 -#: builtin/branch.c:660

5431 +#: builtin/branch.c:652

5432 msgid "Unset the upstream info"

5433 msgstr "Désactiver l'information amont"

5434

5134 -#: builtin/branch.c:661

5435 +#: builtin/branch.c:653

5436 msgid "use colored output"

5437 msgstr "utiliser la coloration dans la sortie"

5438

5138 -#: builtin/branch.c:662

5439 +#: builtin/branch.c:654

5440 msgid "act on remote-tracking branches"

5441 msgstr "agir sur les branches de suivi distantes"

5442

5142 -#: builtin/branch.c:664 builtin/branch.c:665

5443 +#: builtin/branch.c:656 builtin/branch.c:657

5444 msgid "print only branches that contain the commit"

5445 msgstr "afficher seulement les branches qui contiennent le commit"

5446

5146 -#: builtin/branch.c:668

5447 +#: builtin/branch.c:660

5448 msgid "Specific git-branch actions:"

5449 msgstr "Actions spécifiques à git-branch :"

5450

5150 -#: builtin/branch.c:669

5451 +#: builtin/branch.c:661

5452 msgid "list both remote-tracking and local branches"

5453 msgstr "afficher à la fois les branches de suivi et les branches locales"

5454

5154 -#: builtin/branch.c:671

5455 +#: builtin/branch.c:663

5456 msgid "delete fully merged branch"

5457 msgstr "supprimer une branche totalement fusionnée"

5458

5158 -#: builtin/branch.c:672

5459 +#: builtin/branch.c:664

5460 msgid "delete branch (even if not merged)"

5461 msgstr "supprimer une branche (même non fusionnée)"

5462

5162 -#: builtin/branch.c:673

5463 +#: builtin/branch.c:665

5464 msgid "move/rename a branch and its reflog"

5465 msgstr "déplacer/renommer une branche et son reflog"

5466

5166 -#: builtin/branch.c:674

5467 +#: builtin/branch.c:666

5468 msgid "move/rename a branch, even if target exists"

5469 msgstr "déplacer/renommer une branche, même si la cible existe"

5470

5170 -#: builtin/branch.c:675

5471 +#: builtin/branch.c:667

5472 msgid "list branch names"

5473 msgstr "afficher les noms des branches"

5474

5174 -#: builtin/branch.c:676

5475 +#: builtin/branch.c:668

5476 msgid "create the branch's reflog"

5477 msgstr "créer le reflog de la branche"

5478

5178 -#: builtin/branch.c:678

5479 +#: builtin/branch.c:670

5480 msgid "edit the description for the branch"

5481 msgstr "éditer la description de la branche"

5482

5182 -#: builtin/branch.c:679

5483 +#: builtin/branch.c:671

5484 msgid "force creation, move/rename, deletion"

5485 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

5486

5186 -#: builtin/branch.c:680

5487 +#: builtin/branch.c:672

5488 msgid "print only branches that are merged"

5489 msgstr "afficher seulement les branches qui sont fusionnées"

5490

5190 -#: builtin/branch.c:681

5491 +#: builtin/branch.c:673

5492 msgid "print only branches that are not merged"

5493 msgstr "afficher seulement les branches qui ne sont pas fusionnées"

5494

5194 -#: builtin/branch.c:682

5495 +#: builtin/branch.c:674

5496 msgid "list branches in columns"

5497 msgstr "afficher les branches en colonnes"

5498

5198 -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

5499 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5500 msgid "key"

5501 msgstr "clé"

5502

5202 -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

5503 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5504 msgid "field name to sort on"

5505 msgstr "nom du champ servant à trier"

5506

5206 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404

5507 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5508 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5208 -#: builtin/tag.c:369

5509 +#: builtin/tag.c:384

5510 msgid "object"

5511 msgstr "objet"

5512

5212 -#: builtin/branch.c:687

5513 +#: builtin/branch.c:679

5514 msgid "print only branches of the object"

5515 msgstr "afficher seulement les branches de l'objet"

5516

5216 -#: builtin/branch.c:705

5517 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5518 +msgid "sorting and filtering are case insensitive"

5519 +msgstr "le tri et le filtrage sont non-sensibles à la casse"

5520 +

5521 +#: builtin/branch.c:698

5522 msgid "Failed to resolve HEAD as a valid ref."

5523 msgstr "Échec de résolution de HEAD comme référence valide."

5524

5220 -#: builtin/branch.c:709 builtin/clone.c:706

5525 +#: builtin/branch.c:702 builtin/clone.c:706

5526 msgid "HEAD not found below refs/heads!"

5527 msgstr "HEAD non trouvée sous refs/heads !"

5528

5224 -#: builtin/branch.c:729

5529 +#: builtin/branch.c:724

5530 msgid "--column and --verbose are incompatible"

5531 msgstr "--column et --verbose sont incompatibles"

5532

5228 -#: builtin/branch.c:740 builtin/branch.c:782

5533 +#: builtin/branch.c:735 builtin/branch.c:787

5534 msgid "branch name required"

5535 msgstr "le nom de branche est requis"

5536

5232 -#: builtin/branch.c:758

5537 +#: builtin/branch.c:763

5538 msgid "Cannot give description to detached HEAD"

5539 msgstr "Impossible de décrire une HEAD détachée"

5540

5236 -#: builtin/branch.c:763

5541 +#: builtin/branch.c:768

5542 msgid "cannot edit description of more than one branch"

5543 msgstr "impossible d'éditer la description de plus d'une branche"

5544

5240 -#: builtin/branch.c:770

5545 +#: builtin/branch.c:775

5546 #, c-format

5547 msgid "No commit on branch '%s' yet."

5548 msgstr "Aucun commit sur la branche '%s'."

5549

5245 -#: builtin/branch.c:773

5550 +#: builtin/branch.c:778

5551 #, c-format

5552 msgid "No branch named '%s'."

5553 msgstr "Aucune branche nommée '%s'."

5554

5250 -#: builtin/branch.c:788

5555 +#: builtin/branch.c:793

5556 msgid "too many branches for a rename operation"

5557 msgstr "trop de branches pour une opération de renommage"

5558

5254 -#: builtin/branch.c:793

5559 +#: builtin/branch.c:798

5560 msgid "too many branches to set new upstream"

5561 msgstr "trop de branches pour spécifier une branche amont"

5562

5258 -#: builtin/branch.c:797

5563 +#: builtin/branch.c:802

5564 #, c-format

5565 msgid ""

5566 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -5263,41 +5568,41 @@ msgstr ""

5568 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

5569 "aucune branche."

5570

5266 -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

5571 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5572 #, c-format

5573 msgid "no such branch '%s'"

5574 msgstr "pas de branche '%s'"

5575

5271 -#: builtin/branch.c:804

5576 +#: builtin/branch.c:809

5577 #, c-format

5578 msgid "branch '%s' does not exist"

5579 msgstr "la branche '%s' n'existe pas"

5580

5276 -#: builtin/branch.c:816

5581 +#: builtin/branch.c:821

5582 msgid "too many branches to unset upstream"

5583 msgstr "trop de branches pour désactiver un amont"

5584

5280 -#: builtin/branch.c:820

5585 +#: builtin/branch.c:825

5586 msgid "could not unset upstream of HEAD when it does not point to any branch."

5587 msgstr ""

5588 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

5589 "aucune branche."

5590

5286 -#: builtin/branch.c:826

5591 +#: builtin/branch.c:831

5592 #, c-format

5593 msgid "Branch '%s' has no upstream information"

5594 msgstr "La branche '%s' n'a aucune information de branche amont"

5595

5291 -#: builtin/branch.c:840

5596 +#: builtin/branch.c:845

5597 msgid "it does not make sense to create 'HEAD' manually"

5598 msgstr "créer manuellement 'HEAD' n'a pas de sens"

5599

5295 -#: builtin/branch.c:846

5600 +#: builtin/branch.c:851

5601 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5602 msgstr ""

5603 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

5604

5300 -#: builtin/branch.c:849

5605 +#: builtin/branch.c:854

5606 #, c-format

5607 msgid ""

5608 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -5306,7 +5611,7 @@ msgstr ""

5611 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

5612 "track ou --set-upstream-to\n"

5613

5309 -#: builtin/branch.c:866

5614 +#: builtin/branch.c:871

5615 #, c-format

5616 msgid ""

5617 "\n"

@@ -5374,7 +5679,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

5679 msgid "for blob objects, run filters on object's content"

5680 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"

5681

5377 -#: builtin/cat-file.c:561 git-submodule.sh:923

5682 +#: builtin/cat-file.c:561 git-submodule.sh:929

5683 msgid "blob"

5684 msgstr "blob"

5685

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

5739 msgstr ""

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

5741

5437 -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325

5742 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5743 msgid "suppress progress reporting"

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

5745

@@ -5526,9 +5831,9 @@ msgid "write the content to temporary files"

5831 msgstr "écrire le contenu dans des fichiers temporaires"

5832

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

5529 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598

5530 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951

5531 -#: builtin/worktree.c:469

5834 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5835 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5836 +#: builtin/worktree.c:471

5837 msgid "string"

5838 msgstr "chaîne"

5839

@@ -5605,50 +5910,50 @@ msgstr "le chemin '%s' n'est pas fusionné"

5910 msgid "you need to resolve your current index first"

5911 msgstr "vous devez d'abord résoudre votre index courant"

5912

5608 -#: builtin/checkout.c:624

5913 +#: builtin/checkout.c:625

5914 #, c-format

5915 msgid "Can not do reflog for '%s': %s\n"

5916 msgstr "Impossible de faire un reflog pour '%s' : %s\n"

5917

5613 -#: builtin/checkout.c:663

5918 +#: builtin/checkout.c:666

5919 msgid "HEAD is now at"

5920 msgstr "HEAD est maintenant sur"

5921

5617 -#: builtin/checkout.c:667 builtin/clone.c:660

5922 +#: builtin/checkout.c:670 builtin/clone.c:660

5923 msgid "unable to update HEAD"

5924 msgstr "impossible de mettre à jour HEAD"

5925

5621 -#: builtin/checkout.c:671

5926 +#: builtin/checkout.c:674

5927 #, c-format

5928 msgid "Reset branch '%s'\n"

5929 msgstr "Remise à zéro de la branche '%s'\n"

5930

5626 -#: builtin/checkout.c:674

5931 +#: builtin/checkout.c:677

5932 #, c-format

5933 msgid "Already on '%s'\n"

5934 msgstr "Déjà sur '%s'\n"

5935

5631 -#: builtin/checkout.c:678

5936 +#: builtin/checkout.c:681

5937 #, c-format

5938 msgid "Switched to and reset branch '%s'\n"

5939 msgstr "Basculement et remise à zéro de la branche '%s'\n"

5940

5636 -#: builtin/checkout.c:680 builtin/checkout.c:1069

5941 +#: builtin/checkout.c:683 builtin/checkout.c:1072

5942 #, c-format

5943 msgid "Switched to a new branch '%s'\n"

5944 msgstr "Basculement sur la nouvelle branche '%s'\n"

5945

5641 -#: builtin/checkout.c:682

5946 +#: builtin/checkout.c:685

5947 #, c-format

5948 msgid "Switched to branch '%s'\n"

5949 msgstr "Basculement sur la branche '%s'\n"

5950

5646 -#: builtin/checkout.c:733

5951 +#: builtin/checkout.c:736

5952 #, c-format

5953 msgid " ... and %d more.\n"

5954 msgstr " ... et %d en plus.\n"

5955

5651 -#: builtin/checkout.c:739

5956 +#: builtin/checkout.c:742

5957 #, c-format

5958 msgid ""

5959 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5671,7 +5976,7 @@ msgstr[1] ""

5976 "\n"

5977 "%s\n"

5978

5674 -#: builtin/checkout.c:758

5979 +#: builtin/checkout.c:761

5980 #, c-format

5981 msgid ""

5982 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5700,151 +6005,151 @@ msgstr[1] ""

6005 "git branch <nouvelle-branche> %s\n"

6006 "\n"

6007

5703 -#: builtin/checkout.c:794

6008 +#: builtin/checkout.c:797

6009 msgid "internal error in revision walk"

6010 msgstr "erreur interne lors du parcours des révisions"

6011

5707 -#: builtin/checkout.c:798

6012 +#: builtin/checkout.c:801

6013 msgid "Previous HEAD position was"

6014 msgstr "La position précédente de HEAD était sur"

6015

5711 -#: builtin/checkout.c:825 builtin/checkout.c:1064

6016 +#: builtin/checkout.c:828 builtin/checkout.c:1067

6017 msgid "You are on a branch yet to be born"

6018 msgstr "Vous êtes sur une branche qui doit encore naître"

6019

5715 -#: builtin/checkout.c:970

6020 +#: builtin/checkout.c:973

6021 #, c-format

6022 msgid "only one reference expected, %d given."

6023 msgstr "une seule référence attendue, %d fournies."

6024

5720 -#: builtin/checkout.c:1010 builtin/worktree.c:214

6025 +#: builtin/checkout.c:1013 builtin/worktree.c:214

6026 #, c-format

6027 msgid "invalid reference: %s"

6028 msgstr "référence invalide : %s"

6029

5725 -#: builtin/checkout.c:1039

6030 +#: builtin/checkout.c:1042

6031 #, c-format

6032 msgid "reference is not a tree: %s"

6033 msgstr "la référence n'est pas un arbre : %s"

6034

5730 -#: builtin/checkout.c:1078

6035 +#: builtin/checkout.c:1081

6036 msgid "paths cannot be used with switching branches"

6037 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

6038

5734 -#: builtin/checkout.c:1081 builtin/checkout.c:1085

6039 +#: builtin/checkout.c:1084 builtin/checkout.c:1088

6040 #, c-format

6041 msgid "'%s' cannot be used with switching branches"

6042 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

6043

5739 -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097

5740 -#: builtin/checkout.c:1100

6044 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

6045 +#: builtin/checkout.c:1103

6046 #, c-format

6047 msgid "'%s' cannot be used with '%s'"

6048 msgstr "'%s' ne peut pas être utilisé avec '%s'"

6049

5745 -#: builtin/checkout.c:1105

6050 +#: builtin/checkout.c:1108

6051 #, c-format

6052 msgid "Cannot switch branch to a non-commit '%s'"

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

6054

5750 -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93

6055 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

6056 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

6057 #: builtin/worktree.c:326

6058 msgid "branch"

6059 msgstr "branche"

6060

5756 -#: builtin/checkout.c:1139

6061 +#: builtin/checkout.c:1142

6062 msgid "create and checkout a new branch"

6063 msgstr "créer et extraire une nouvelle branche"

6064

5760 -#: builtin/checkout.c:1141

6065 +#: builtin/checkout.c:1144

6066 msgid "create/reset and checkout a branch"

6067 msgstr "créer/réinitialiser et extraire une branche"

6068

5764 -#: builtin/checkout.c:1142

6069 +#: builtin/checkout.c:1145

6070 msgid "create reflog for new branch"

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

6072

5768 -#: builtin/checkout.c:1143 builtin/worktree.c:328

6073 +#: builtin/checkout.c:1146 builtin/worktree.c:328

6074 msgid "detach HEAD at named commit"

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

6076

5772 -#: builtin/checkout.c:1144

6077 +#: builtin/checkout.c:1147

6078 msgid "set upstream info for new branch"

6079 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

6080

5776 -#: builtin/checkout.c:1146

6081 +#: builtin/checkout.c:1149

6082 msgid "new-branch"

6083 msgstr "nouvelle branche"

6084

5780 -#: builtin/checkout.c:1146

6085 +#: builtin/checkout.c:1149

6086 msgid "new unparented branch"

6087 msgstr "nouvelle branche sans parent"

6088

5784 -#: builtin/checkout.c:1147

6089 +#: builtin/checkout.c:1150

6090 msgid "checkout our version for unmerged files"

6091 msgstr "extraire notre version pour les fichiers non fusionnés"

6092

5788 -#: builtin/checkout.c:1149

6093 +#: builtin/checkout.c:1152

6094 msgid "checkout their version for unmerged files"

6095 msgstr "extraire leur version pour les fichiers non fusionnés"

6096

5792 -#: builtin/checkout.c:1151

6097 +#: builtin/checkout.c:1154

6098 msgid "force checkout (throw away local modifications)"

6099 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

6100

5796 -#: builtin/checkout.c:1152

6101 +#: builtin/checkout.c:1155

6102 msgid "perform a 3-way merge with the new branch"

6103 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

6104

5800 -#: builtin/checkout.c:1153 builtin/merge.c:231

6105 +#: builtin/checkout.c:1156 builtin/merge.c:235

6106 msgid "update ignored files (default)"

6107 msgstr "mettre à jour les fichiers ignorés (par défaut)"

6108

5804 -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251

6109 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

6110 msgid "style"

6111 msgstr "style"

6112

5808 -#: builtin/checkout.c:1155

6113 +#: builtin/checkout.c:1158

6114 msgid "conflict style (merge or diff3)"

6115 msgstr "style de conflit (merge (fusion) ou diff3)"

6116

5812 -#: builtin/checkout.c:1158

6117 +#: builtin/checkout.c:1161

6118 msgid "do not limit pathspecs to sparse entries only"

6119 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

6120

5816 -#: builtin/checkout.c:1160

6121 +#: builtin/checkout.c:1163

6122 msgid "second guess 'git checkout <no-such-branch>'"

6123 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

6124

5820 -#: builtin/checkout.c:1162

6125 +#: builtin/checkout.c:1165

6126 msgid "do not check if another worktree is holding the given ref"

6127 msgstr ""

6128 "ne pas vérifier si une autre copie de travail contient le référence fournie"

6129

5825 -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119

5826 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536

6130 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

6131 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

6132 #: builtin/send-pack.c:168

6133 msgid "force progress reporting"

6134 msgstr "forcer l'affichage de l'état d'avancement"

6135

5831 -#: builtin/checkout.c:1194

6136 +#: builtin/checkout.c:1197

6137 msgid "-b, -B and --orphan are mutually exclusive"

6138 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

6139

5835 -#: builtin/checkout.c:1211

6140 +#: builtin/checkout.c:1214

6141 msgid "--track needs a branch name"

6142 msgstr "--track requiert un nom de branche"

6143

5839 -#: builtin/checkout.c:1216

6144 +#: builtin/checkout.c:1219

6145 msgid "Missing branch name; try -b"

6146 msgstr "Nom de branche manquant ; essayez -b"

6147

5843 -#: builtin/checkout.c:1252

6148 +#: builtin/checkout.c:1255

6149 msgid "invalid path specification"

6150 msgstr "spécification de chemin invalide"

6151

5847 -#: builtin/checkout.c:1259

6152 +#: builtin/checkout.c:1262

6153 #, c-format

6154 msgid ""

6155 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -5854,12 +6159,12 @@ msgstr ""

6159 "en même temps.\n"

6160 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

6161

5857 -#: builtin/checkout.c:1264

6162 +#: builtin/checkout.c:1267

6163 #, c-format

6164 msgid "git checkout: --detach does not take a path argument '%s'"

6165 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

6166

5862 -#: builtin/checkout.c:1268

6167 +#: builtin/checkout.c:1271

6168 msgid ""

6169 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6170 "checking out of the index."

@@ -5898,19 +6203,21 @@ msgstr "Ignorerait le dépôt %s\n"

6203 msgid "failed to remove %s"

6204 msgstr "échec de la suppression de %s"

6205

5901 -#: builtin/clean.c:291

6206 +#: builtin/clean.c:291 git-add--interactive.perl:623

6207 +#, c-format

6208 msgid ""

6209 "Prompt help:\n"

6210 "1 - select a numbered item\n"

6211 "foo - select item based on unique prefix\n"

5906 -" - (empty) select nothing"

6212 +" - (empty) select nothing\n"

6213 msgstr ""

6214 "Aide en ligne :\n"

6215 "1 - sélectionner un élément numéroté\n"

6216 "foo - sélectionner un élément par un préfixe unique\n"

5911 -" - (vide) ne rien sélectionner"

6217 +" - (vide) ne rien sélectionner\n"

6218

5913 -#: builtin/clean.c:295

6219 +#: builtin/clean.c:295 git-add--interactive.perl:632

6220 +#, c-format

6221 msgid ""

6222 "Prompt help:\n"

6223 "1 - select a single item\n"

@@ -5919,7 +6226,7 @@ msgid ""

6226 "foo - select item based on unique prefix\n"

6227 "-... - unselect specified items\n"

6228 "* - choose all items\n"

5922 -" - (empty) finish selecting"

6229 +" - (empty) finish selecting\n"

6230 msgstr ""

6231 "Aide en ligne :\n"

6232 "1 - sélectionner un seul élément\n"

@@ -5928,12 +6235,13 @@ msgstr ""

6235 "foo - sélectionner un élément par un préfixe unique\n"

6236 "-... - désélectionner les éléments spécifiés\n"

6237 "* - choisir tous les éléments\n"

5931 -" - (vide) terminer la sélection"

6238 +" - (vide) terminer la sélection\n"

6239

5933 -#: builtin/clean.c:511

5934 -#, c-format

5935 -msgid "Huh (%s)?"

5936 -msgstr "Hein (%s) ?"

6240 +#: builtin/clean.c:511 git-add--interactive.perl:598

6241 +#: git-add--interactive.perl:603

6242 +#, c-format, perl-format

6243 +msgid "Huh (%s)?\n"

6244 +msgstr "Hein (%s) ?\n"

6245

6246 #: builtin/clean.c:653

6247 #, c-format

@@ -5955,9 +6263,10 @@ msgstr "Sélectionner les éléments à supprimer"

6263 msgid "Remove %s [y/N]? "

6264 msgstr "Supprimer %s [y/N] ? "

6265

5958 -#: builtin/clean.c:777

5959 -msgid "Bye."

5960 -msgstr "Au revoir."

6266 +#: builtin/clean.c:777 git-add--interactive.perl:1669

6267 +#, c-format

6268 +msgid "Bye.\n"

6269 +msgstr "Au revoir.\n"

6270

6271 #: builtin/clean.c:785

6272 msgid ""

@@ -5977,11 +6286,11 @@ msgstr ""

6286 "help - cet écran\n"

6287 "? - aide pour la sélection en ligne"

6288

5980 -#: builtin/clean.c:812

6289 +#: builtin/clean.c:812 git-add--interactive.perl:1745

6290 msgid "*** Commands ***"

6291 msgstr "*** Commandes ***"

6292

5984 -#: builtin/clean.c:813

6293 +#: builtin/clean.c:813 git-add--interactive.perl:1742

6294 msgid "What now"

6295 msgstr "Et maintenant ?"

6296

@@ -6011,8 +6320,8 @@ msgstr "nettoyage interactif"

6320 msgid "remove whole directories"

6321 msgstr "supprimer les répertoires entiers"

6322

6014 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725

6015 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182

6323 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6324 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

6325 msgid "pattern"

6326 msgstr "motif"

6327

@@ -6092,8 +6401,8 @@ msgstr "répertoire-modèle"

6401 msgid "directory from which templates will be used"

6402 msgstr "répertoire depuis lequel les modèles vont être utilisés"

6403

6095 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602

6096 -#: builtin/submodule--helper.c:954

6404 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6405 +#: builtin/submodule--helper.c:970

6406 msgid "reference repository"

6407 msgstr "dépôt de référence"

6408

@@ -6117,8 +6426,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

6426 msgid "path to git-upload-pack on the remote"

6427 msgstr "chemin vers git-upload-pack sur le serveur distant"

6428

6120 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668

6121 -#: builtin/pull.c:202

6429 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202

6430 msgid "depth"

6431 msgstr "profondeur"

6432

@@ -6126,7 +6434,7 @@ msgstr "profondeur"

6434 msgid "create a shallow clone of that depth"

6435 msgstr "créer un clone superficiel de cette profondeur"

6436

6129 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848

6437 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6438 #: parse-options.h:142

6439 msgid "time"

6440 msgstr "heure"

@@ -6140,9 +6448,8 @@ msgid "revision"

6448 msgstr "révision"

6449

6450 #: builtin/clone.c:102 builtin/fetch.c:125

6143 -msgid "deepen history of shallow clone by excluding rev"

6144 -msgstr ""

6145 -"approfondir l'historique d'un clone superficiel en excluant une révision"

6451 +msgid "deepen history of shallow clone, excluding rev"

6452 +msgstr "approfondir l'historique d'un clone superficiel en excluant une révision"

6453

6454 #: builtin/clone.c:104

6455 msgid "clone only one branch, HEAD or --branch"

@@ -6168,11 +6475,11 @@ msgstr "clé=valeur"

6475 msgid "set config inside the new repository"

6476 msgstr "régler la configuration dans le nouveau dépôt"

6477

6171 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547

6478 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6479 msgid "use IPv4 addresses only"

6480 msgstr "n'utiliser que des adresses IPv4"

6481

6175 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549

6482 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6483 msgid "use IPv6 addresses only"

6484 msgstr "n'utiliser que des adresses IPv6"

6485

@@ -6287,7 +6594,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles."

6594 msgid "repository '%s' does not exist"

6595 msgstr "le dépôt '%s' n'existe pas"

6596

6290 -#: builtin/clone.c:905 builtin/fetch.c:1338

6597 +#: builtin/clone.c:905 builtin/fetch.c:1335

6598 #, c-format

6599 msgid "depth %s is not a positive number"

6600 msgstr "la profondeur %s n'est pas un entier positif"

@@ -6303,8 +6610,9 @@ msgstr ""

6610 msgid "working tree '%s' already exists."

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

6612

6306 -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657

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

6613 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252

6614 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222

6615 +#: builtin/worktree.c:249

6616 #, c-format

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

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

@@ -6582,7 +6890,7 @@ msgstr ""

6890 msgid "could not lookup commit %s"

6891 msgstr "impossible de rechercher le commit %s"

6892

6585 -#: builtin/commit.c:704 builtin/shortlog.c:286

6893 +#: builtin/commit.c:704 builtin/shortlog.c:295

6894 #, c-format

6895 msgid "(reading log message from standard input)\n"

6896 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

@@ -6682,7 +6990,7 @@ msgstr "Impossible de lire l'index"

6990 msgid "Error building trees"

6991 msgstr "Erreur lors de la construction des arbres"

6992

6685 -#: builtin/commit.c:969 builtin/tag.c:266

6993 +#: builtin/commit.c:968 builtin/tag.c:280

6994 #, c-format

6995 msgid "Please supply the message using either -m or -F option.\n"

6996 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

@@ -6694,7 +7002,7 @@ msgstr ""

7002 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

7003 "auteur existant"

7004

6697 -#: builtin/commit.c:1086 builtin/commit.c:1327

7005 +#: builtin/commit.c:1086 builtin/commit.c:1325

7006 #, c-format

7007 msgid "Invalid untracked files mode '%s'"

7008 msgstr "Mode de fichier non suivi invalide '%s'"

@@ -6746,67 +7054,63 @@ msgid "No paths with --include/--only does not make sense."

7054 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

7055

7056 #: builtin/commit.c:1212

6749 -msgid "Clever... amending the last one with dirty index."

6750 -msgstr "Malin... correction du dernier avec un index sale."

6751 -

6752 -#: builtin/commit.c:1214

7057 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

7058 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

7059

6756 -#: builtin/commit.c:1226 builtin/tag.c:474

7060 +#: builtin/commit.c:1224 builtin/tag.c:495

7061 #, c-format

7062 msgid "Invalid cleanup mode %s"

7063 msgstr "Mode de nettoyage invalide %s"

7064

6761 -#: builtin/commit.c:1231

7065 +#: builtin/commit.c:1229

7066 msgid "Paths with -a does not make sense."

7067 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

7068

6765 -#: builtin/commit.c:1341 builtin/commit.c:1617

7069 +#: builtin/commit.c:1339 builtin/commit.c:1612

7070 msgid "show status concisely"

7071 msgstr "afficher le statut avec concision"

7072

6769 -#: builtin/commit.c:1343 builtin/commit.c:1619

7073 +#: builtin/commit.c:1341 builtin/commit.c:1614

7074 msgid "show branch information"

7075 msgstr "afficher l'information de branche"

7076

6773 -#: builtin/commit.c:1345

7077 +#: builtin/commit.c:1343

7078 msgid "version"

7079 msgstr "version"

7080

6777 -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522

6778 -#: builtin/worktree.c:440

7081 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

7082 +#: builtin/worktree.c:442

7083 msgid "machine-readable output"

7084 msgstr "sortie pour traitement automatique"

7085

6782 -#: builtin/commit.c:1348 builtin/commit.c:1623

7086 +#: builtin/commit.c:1346 builtin/commit.c:1618

7087 msgid "show status in long format (default)"

7088 msgstr "afficher le statut en format long (par défaut)"

7089

6786 -#: builtin/commit.c:1351 builtin/commit.c:1626

7090 +#: builtin/commit.c:1349 builtin/commit.c:1621

7091 msgid "terminate entries with NUL"

7092 msgstr "terminer les éléments par NUL"

7093

6790 -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981

6791 -#: builtin/fast-export.c:984 builtin/tag.c:353

7094 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981

7095 +#: builtin/fast-export.c:984 builtin/tag.c:368

7096 msgid "mode"

7097 msgstr "mode"

7098

6795 -#: builtin/commit.c:1354 builtin/commit.c:1629

7099 +#: builtin/commit.c:1352 builtin/commit.c:1624

7100 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

7101 msgstr ""

7102 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

7103 "no. (Défaut : all)"

7104

6801 -#: builtin/commit.c:1357

7105 +#: builtin/commit.c:1355

7106 msgid "show ignored files"

7107 msgstr "afficher les fichiers ignorés"

7108

6805 -#: builtin/commit.c:1358 parse-options.h:155

7109 +#: builtin/commit.c:1356 parse-options.h:155

7110 msgid "when"

7111 msgstr "quand"

7112

6809 -#: builtin/commit.c:1359

7113 +#: builtin/commit.c:1357

7114 msgid ""

7115 "ignore changes to submodules, optional when: all, dirty, untracked. "

7116 "(Default: all)"

@@ -6814,201 +7118,201 @@ msgstr ""

7118 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

7119 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

7120

6817 -#: builtin/commit.c:1361

7121 +#: builtin/commit.c:1359

7122 msgid "list untracked files in columns"

7123 msgstr "afficher les fichiers non suivis en colonnes"

7124

6821 -#: builtin/commit.c:1437

7125 +#: builtin/commit.c:1435

7126 msgid "couldn't look up newly created commit"

7127 msgstr "impossible de retrouver le commit nouvellement créé"

7128

6825 -#: builtin/commit.c:1439

7129 +#: builtin/commit.c:1437

7130 msgid "could not parse newly created commit"

7131 msgstr "impossible d'analyser le commit nouvellement créé"

7132

6829 -#: builtin/commit.c:1484

7133 +#: builtin/commit.c:1482

7134 msgid "detached HEAD"

7135 msgstr "HEAD détachée"

7136

6833 -#: builtin/commit.c:1487

7137 +#: builtin/commit.c:1485

7138 msgid " (root-commit)"

7139 msgstr " (commit racine)"

7140

6837 -#: builtin/commit.c:1587

7141 +#: builtin/commit.c:1582

7142 msgid "suppress summary after successful commit"

7143 msgstr "supprimer le résumé après une validation réussie"

7144

6841 -#: builtin/commit.c:1588

7145 +#: builtin/commit.c:1583

7146 msgid "show diff in commit message template"

7147 msgstr "afficher les diff dans le modèle de message de validation"

7148

6845 -#: builtin/commit.c:1590

7149 +#: builtin/commit.c:1585

7150 msgid "Commit message options"

7151 msgstr "Options du message de validation"

7152

6849 -#: builtin/commit.c:1591 builtin/tag.c:351

7153 +#: builtin/commit.c:1586 builtin/tag.c:366

7154 msgid "read message from file"

7155 msgstr "lire le message depuis un fichier"

7156

6853 -#: builtin/commit.c:1592

7157 +#: builtin/commit.c:1587

7158 msgid "author"

7159 msgstr "auteur"

7160

6857 -#: builtin/commit.c:1592

7161 +#: builtin/commit.c:1587

7162 msgid "override author for commit"

7163 msgstr "remplacer l'auteur pour la validation"

7164

6861 -#: builtin/commit.c:1593 builtin/gc.c:326

7165 +#: builtin/commit.c:1588 builtin/gc.c:333

7166 msgid "date"

7167 msgstr "date"

7168

6865 -#: builtin/commit.c:1593

7169 +#: builtin/commit.c:1588

7170 msgid "override date for commit"

7171 msgstr "remplacer la date pour la validation"

7172

6869 -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398

6870 -#: builtin/notes.c:561 builtin/tag.c:349

7173 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398

7174 +#: builtin/notes.c:561 builtin/tag.c:364

7175 msgid "message"

7176 msgstr "message"

7177

6874 -#: builtin/commit.c:1594

7178 +#: builtin/commit.c:1589

7179 msgid "commit message"

7180 msgstr "message de validation"

7181

6878 -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597

6879 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79

7182 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592

7183 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81

7184 msgid "commit"

7185 msgstr "commit"

7186

6883 -#: builtin/commit.c:1595

7187 +#: builtin/commit.c:1590

7188 msgid "reuse and edit message from specified commit"

7189 msgstr "réutiliser et éditer le message du commit spécifié"

7190

6887 -#: builtin/commit.c:1596

7191 +#: builtin/commit.c:1591

7192 msgid "reuse message from specified commit"

7193 msgstr "réutiliser le message du commit spécifié"

7194

6891 -#: builtin/commit.c:1597

7195 +#: builtin/commit.c:1592

7196 msgid "use autosquash formatted message to fixup specified commit"

7197 msgstr ""

7198 "utiliser un message au format autosquash pour corriger le commit spécifié"

7199

6896 -#: builtin/commit.c:1598

7200 +#: builtin/commit.c:1593

7201 msgid "use autosquash formatted message to squash specified commit"

7202 msgstr ""

7203 "utiliser un message au format autosquash pour compresser le commit spécifié"

7204

6901 -#: builtin/commit.c:1599

7205 +#: builtin/commit.c:1594

7206 msgid "the commit is authored by me now (used with -C/-c/--amend)"

7207 msgstr ""

7208 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

7209

6906 -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86

7210 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86

7211 msgid "add Signed-off-by:"

7212 msgstr "ajouter une entrée Signed-off-by :"

7213

6910 -#: builtin/commit.c:1601

7214 +#: builtin/commit.c:1596

7215 msgid "use specified template file"

7216 msgstr "utiliser le fichier de modèle spécifié"

7217

6914 -#: builtin/commit.c:1602

7218 +#: builtin/commit.c:1597

7219 msgid "force edit of commit"

7220 msgstr "forcer l'édition du commit"

7221

6918 -#: builtin/commit.c:1603

7222 +#: builtin/commit.c:1598

7223 msgid "default"

7224 msgstr "défaut"

7225

6922 -#: builtin/commit.c:1603 builtin/tag.c:354

7226 +#: builtin/commit.c:1598 builtin/tag.c:369

7227 msgid "how to strip spaces and #comments from message"

7228 msgstr "comment éliminer les espaces et les commentaires # du message"

7229

6926 -#: builtin/commit.c:1604

7230 +#: builtin/commit.c:1599

7231 msgid "include status in commit message template"

7232 msgstr "inclure le statut dans le modèle de message de validation"

7233

6930 -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166

7234 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166

7235 #: builtin/revert.c:93

7236 msgid "GPG sign commit"

7237 msgstr "signer la validation avec GPG"

7238

6935 -#: builtin/commit.c:1609

7239 +#: builtin/commit.c:1604

7240 msgid "Commit contents options"

7241 msgstr "Valider les options des contenus"

7242

6939 -#: builtin/commit.c:1610

7243 +#: builtin/commit.c:1605

7244 msgid "commit all changed files"

7245 msgstr "valider tous les fichiers modifiés"

7246

6943 -#: builtin/commit.c:1611

7247 +#: builtin/commit.c:1606

7248 msgid "add specified files to index for commit"

7249 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

7250

6947 -#: builtin/commit.c:1612

7251 +#: builtin/commit.c:1607

7252 msgid "interactively add files"

7253 msgstr "ajouter des fichiers en mode interactif"

7254

6951 -#: builtin/commit.c:1613

7255 +#: builtin/commit.c:1608

7256 msgid "interactively add changes"

7257 msgstr "ajouter les modifications en mode interactif"

7258

6955 -#: builtin/commit.c:1614

7259 +#: builtin/commit.c:1609

7260 msgid "commit only specified files"

7261 msgstr "valider seulement les fichiers spécifiés"

7262

6959 -#: builtin/commit.c:1615

7263 +#: builtin/commit.c:1610

7264 msgid "bypass pre-commit and commit-msg hooks"

7265 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"

7266

6963 -#: builtin/commit.c:1616

7267 +#: builtin/commit.c:1611

7268 msgid "show what would be committed"

7269 msgstr "afficher ce qui serait validé"

7270

6967 -#: builtin/commit.c:1627

7271 +#: builtin/commit.c:1622

7272 msgid "amend previous commit"

7273 msgstr "corriger la validation précédente"

7274

6971 -#: builtin/commit.c:1628

7275 +#: builtin/commit.c:1623

7276 msgid "bypass post-rewrite hook"

7277 msgstr "éviter d'utiliser le crochet post-rewrite"

7278

6975 -#: builtin/commit.c:1633

7279 +#: builtin/commit.c:1628

7280 msgid "ok to record an empty change"

7281 msgstr "accepter d'enregistrer une modification vide"

7282

6979 -#: builtin/commit.c:1635

7283 +#: builtin/commit.c:1630

7284 msgid "ok to record a change with an empty message"

7285 msgstr "accepter d'enregistrer une modification avec un message vide"

7286

6983 -#: builtin/commit.c:1664

7287 +#: builtin/commit.c:1659

7288 msgid "could not parse HEAD commit"

7289 msgstr "impossible d'analyser le commit HEAD"

7290

6987 -#: builtin/commit.c:1712

7291 +#: builtin/commit.c:1707

7292 #, c-format

7293 msgid "Corrupt MERGE_HEAD file (%s)"

7294 msgstr "Fichier MERGE_HEAD corrompu (%s)"

7295

6992 -#: builtin/commit.c:1719

7296 +#: builtin/commit.c:1714

7297 msgid "could not read MERGE_MODE"

7298 msgstr "impossible de lire MERGE_MODE"

7299

6996 -#: builtin/commit.c:1738

7300 +#: builtin/commit.c:1733

7301 #, c-format

7302 msgid "could not read commit message: %s"

7303 msgstr "impossible de lire le message de validation : %s"

7304

7001 -#: builtin/commit.c:1749

7305 +#: builtin/commit.c:1744

7306 #, c-format

7307 msgid "Aborting commit; you did not edit the message.\n"

7308 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

7309

7006 -#: builtin/commit.c:1754

7007 -#, fuzzy, c-format

7310 +#: builtin/commit.c:1749

7311 +#, c-format

7312 msgid "Aborting commit due to empty commit message.\n"

7009 -msgstr "Abandon de la validation dû à un message de validation vide\n"

7313 +msgstr "Abandon de la validation dû à un message de validation vide.\n"

7314

7011 -#: builtin/commit.c:1802

7315 +#: builtin/commit.c:1797

7316 msgid ""

7317 "Repository has been updated, but unable to write\n"

7318 "new_index file. Check that disk is not full and quota is\n"

@@ -7365,6 +7669,91 @@ msgstr "plus de deux blobs spécifiés : '%s'"

7669 msgid "unhandled object '%s' given."

7670 msgstr "objet non géré '%s' spécifié."

7671

7672 +#: builtin/difftool.c:28

7673 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

7674 +msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"

7675 +

7676 +#: builtin/difftool.c:241

7677 +#, c-format

7678 +msgid "failed: %d"

7679 +msgstr "échec : %d"

7680 +

7681 +#: builtin/difftool.c:342

7682 +msgid ""

7683 +"combined diff formats('-c' and '--cc') are not supported in\n"

7684 +"directory diff mode('-d' and '--dir-diff')."

7685 +msgstr ""

7686 +"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"

7687 +"dans le mode de diff de répertoire ('-d' et '--dir-diff')."

7688 +

7689 +#: builtin/difftool.c:567

7690 +#, c-format

7691 +msgid "both files modified: '%s' and '%s'."

7692 +msgstr "les deux fichiers sont modifiés : '%s' et '%s'."

7693 +

7694 +#: builtin/difftool.c:569

7695 +msgid "working tree file has been left."

7696 +msgstr "le fichier dans l'arbre de travail a été laissé."

7697 +

7698 +#: builtin/difftool.c:580

7699 +#, c-format

7700 +msgid "temporary files exist in '%s'."

7701 +msgstr "des fichiers temporaires existent dans '%s'."

7702 +

7703 +#: builtin/difftool.c:581

7704 +msgid "you may want to cleanup or recover these."

7705 +msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."

7706 +

7707 +#: builtin/difftool.c:626

7708 +msgid "use `diff.guitool` instead of `diff.tool`"

7709 +msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"

7710 +

7711 +#: builtin/difftool.c:628

7712 +msgid "perform a full-directory diff"

7713 +msgstr "réalise un diff de répertoire complet"

7714 +

7715 +#: builtin/difftool.c:630

7716 +msgid "do not prompt before launching a diff tool"

7717 +msgstr "ne pas confirmer avant de lancer l'outil de diff"

7718 +

7719 +#: builtin/difftool.c:636

7720 +msgid "use symlinks in dir-diff mode"

7721 +msgstr "utiliser les liens symboliques en mode de diff de répertoire"

7722 +

7723 +#: builtin/difftool.c:637

7724 +msgid "<tool>"

7725 +msgstr "<outil>"

7726 +

7727 +#: builtin/difftool.c:638

7728 +msgid "use the specified diff tool"

7729 +msgstr "utiliser l'outil de diff spécifié"

7730 +

7731 +#: builtin/difftool.c:640

7732 +msgid "print a list of diff tools that may be used with `--tool`"

7733 +msgstr "afficher une liste des outils de diff utilisables avec `--tool`"

7734 +

7735 +#: builtin/difftool.c:643

7736 +msgid ""

7737 +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

7738 +"code"

7739 +msgstr "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code non-nul"

7740 +

7741 +#: builtin/difftool.c:645

7742 +msgid "<command>"

7743 +msgstr "<commande>"

7744 +

7745 +#: builtin/difftool.c:646

7746 +msgid "specify a custom command for viewing diffs"

7747 +msgstr "spécifier une commande personnalisée pour visualiser les différences"

7748 +

7749 +#: builtin/difftool.c:670

7750 +msgid "no <tool> given for --tool=<tool>"

7751 +msgstr "pas d'<outil> spécifié pour --tool=<outil>"

7752 +

7753 +#: builtin/difftool.c:677

7754 +msgid "no <cmd> given for --extcmd=<cmd>"

7755 +msgstr "pas de <commande> spécifié pour --extcmd=<commande>"

7756 +

7757 #: builtin/fast-export.c:25

7758 msgid "git fast-export [rev-list-opts]"

7759 msgstr "git fast-export [options-de-liste-de-révisions]"

@@ -7524,79 +7913,79 @@ msgstr "correspondance de référence"

7913 msgid "specify fetch refmap"

7914 msgstr "spécifier une correspondance de référence pour la récupération"

7915

7527 -#: builtin/fetch.c:398

7916 +#: builtin/fetch.c:395

7917 msgid "Couldn't find remote ref HEAD"

7918 msgstr "impossible de trouver la référence HEAD distante"

7919

7531 -#: builtin/fetch.c:514

7920 +#: builtin/fetch.c:511

7921 #, c-format

7922 msgid "configuration fetch.output contains invalid value %s"

7923 msgstr ""

7924 "le paramètre de configuration fetch.output contient une valeur invalide %s"

7925

7537 -#: builtin/fetch.c:607

7926 +#: builtin/fetch.c:604

7927 #, c-format

7928 msgid "object %s not found"

7929 msgstr "objet %s non trouvé"

7930

7542 -#: builtin/fetch.c:611

7931 +#: builtin/fetch.c:608

7932 msgid "[up to date]"

7933 msgstr "[à jour]"

7934

7546 -#: builtin/fetch.c:624 builtin/fetch.c:704

7935 +#: builtin/fetch.c:621 builtin/fetch.c:701

7936 msgid "[rejected]"

7937 msgstr "[rejeté]"

7938

7550 -#: builtin/fetch.c:625

7939 +#: builtin/fetch.c:622

7940 msgid "can't fetch in current branch"

7941 msgstr "impossible de récupérer dans la branche actuelle"

7942

7554 -#: builtin/fetch.c:634

7943 +#: builtin/fetch.c:631

7944 msgid "[tag update]"

7945 msgstr "[mise à jour de l'étiquette]"

7946

7558 -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684

7559 -#: builtin/fetch.c:699

7947 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681

7948 +#: builtin/fetch.c:696

7949 msgid "unable to update local ref"

7950 msgstr "impossible de mettre à jour la référence locale"

7951

7563 -#: builtin/fetch.c:654

7952 +#: builtin/fetch.c:651

7953 msgid "[new tag]"

7954 msgstr "[nouvelle étiquette]"

7955

7567 -#: builtin/fetch.c:657

7956 +#: builtin/fetch.c:654

7957 msgid "[new branch]"

7958 msgstr "[nouvelle branche]"

7959

7571 -#: builtin/fetch.c:660

7960 +#: builtin/fetch.c:657

7961 msgid "[new ref]"

7962 msgstr "[nouvelle référence]"

7963

7575 -#: builtin/fetch.c:699

7964 +#: builtin/fetch.c:696

7965 msgid "forced update"

7966 msgstr "mise à jour forcée"

7967

7579 -#: builtin/fetch.c:704

7968 +#: builtin/fetch.c:701

7969 msgid "non-fast-forward"

7970 msgstr "pas en avance rapide"

7971

7583 -#: builtin/fetch.c:749

7972 +#: builtin/fetch.c:746

7973 #, c-format

7974 msgid "%s did not send all necessary objects\n"

7975 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

7976

7588 -#: builtin/fetch.c:769

7977 +#: builtin/fetch.c:766

7978 #, c-format

7979 msgid "reject %s because shallow roots are not allowed to be updated"

7980 msgstr ""

7981 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

7982

7594 -#: builtin/fetch.c:856 builtin/fetch.c:952

7983 +#: builtin/fetch.c:853 builtin/fetch.c:949

7984 #, c-format

7985 msgid "From %.*s\n"

7986 msgstr "Depuis %.*s\n"

7987

7599 -#: builtin/fetch.c:867

7988 +#: builtin/fetch.c:864

7989 #, c-format

7990 msgid ""

7991 "some local refs could not be updated; try running\n"

@@ -7605,55 +7994,55 @@ msgstr ""

7994 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

7995 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

7996

7608 -#: builtin/fetch.c:922

7997 +#: builtin/fetch.c:919

7998 #, c-format

7999 msgid " (%s will become dangling)"

8000 msgstr " (%s sera en suspens)"

8001

7613 -#: builtin/fetch.c:923

8002 +#: builtin/fetch.c:920

8003 #, c-format

8004 msgid " (%s has become dangling)"

8005 msgstr " (%s est devenu en suspens)"

8006

7618 -#: builtin/fetch.c:955

8007 +#: builtin/fetch.c:952

8008 msgid "[deleted]"

8009 msgstr "[supprimé]"

8010

7622 -#: builtin/fetch.c:956 builtin/remote.c:1020

8011 +#: builtin/fetch.c:953 builtin/remote.c:1020

8012 msgid "(none)"

8013 msgstr "(aucun(e))"

8014

7626 -#: builtin/fetch.c:979

8015 +#: builtin/fetch.c:976

8016 #, c-format

8017 msgid "Refusing to fetch into current branch %s of non-bare repository"

8018 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

8019

7631 -#: builtin/fetch.c:998

8020 +#: builtin/fetch.c:995

8021 #, c-format

8022 msgid "Option \"%s\" value \"%s\" is not valid for %s"

8023 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

8024

7636 -#: builtin/fetch.c:1001

8025 +#: builtin/fetch.c:998

8026 #, c-format

8027 msgid "Option \"%s\" is ignored for %s\n"

8028 msgstr "L'option \"%s\" est ignorée pour %s\n"

8029

7641 -#: builtin/fetch.c:1077

8030 +#: builtin/fetch.c:1074

8031 #, c-format

8032 msgid "Don't know how to fetch from %s"

8033 msgstr "Je ne sais pas récupérer depuis %s"

8034

7646 -#: builtin/fetch.c:1237

8035 +#: builtin/fetch.c:1234

8036 #, c-format

8037 msgid "Fetching %s\n"

8038 msgstr "Récupération de %s\n"

8039

7651 -#: builtin/fetch.c:1239 builtin/remote.c:96

8040 +#: builtin/fetch.c:1236 builtin/remote.c:96

8041 #, c-format

8042 msgid "Could not fetch %s"

8043 msgstr "Impossible de récupérer %s"

8044

7656 -#: builtin/fetch.c:1257

8045 +#: builtin/fetch.c:1254

8046 msgid ""

8047 "No remote repository specified. Please, specify either a URL or a\n"

8048 "remote name from which new revisions should be fetched."

@@ -7661,40 +8050,40 @@ msgstr ""

8050 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

8051 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

8052

7664 -#: builtin/fetch.c:1280

8053 +#: builtin/fetch.c:1277

8054 msgid "You need to specify a tag name."

8055 msgstr "Vous devez spécifier un nom d'étiquette."

8056

7668 -#: builtin/fetch.c:1322

8057 +#: builtin/fetch.c:1319

8058 msgid "Negative depth in --deepen is not supported"

8059 msgstr "Une profondeur négative dans --deepen n'est pas supportée"

8060

7672 -#: builtin/fetch.c:1324

8061 +#: builtin/fetch.c:1321

8062 msgid "--deepen and --depth are mutually exclusive"

8063 msgstr "--deepen et --depth sont mutuellement exclusifs"

8064

7676 -#: builtin/fetch.c:1329

8065 +#: builtin/fetch.c:1326

8066 msgid "--depth and --unshallow cannot be used together"

8067 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

8068

7680 -#: builtin/fetch.c:1331

8069 +#: builtin/fetch.c:1328

8070 msgid "--unshallow on a complete repository does not make sense"

8071 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

8072

7684 -#: builtin/fetch.c:1353

8073 +#: builtin/fetch.c:1350

8074 msgid "fetch --all does not take a repository argument"

8075 msgstr "fetch --all n'accepte pas d'argument de dépôt"

8076

7688 -#: builtin/fetch.c:1355

8077 +#: builtin/fetch.c:1352

8078 msgid "fetch --all does not make sense with refspecs"

8079 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

8080

7692 -#: builtin/fetch.c:1366

8081 +#: builtin/fetch.c:1363

8082 #, c-format

8083 msgid "No such remote or remote group: %s"

8084 msgstr "distant ou groupe distant inexistant : %s"

8085

7697 -#: builtin/fetch.c:1374

8086 +#: builtin/fetch.c:1371

8087 msgid "Fetching a group and specifying refspecs does not make sense"

8088 msgstr ""

8089 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -7762,7 +8151,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl"

8151 msgid "show only <n> matched refs"

8152 msgstr "n'afficher que <n> références correspondant"

8153

7765 -#: builtin/for-each-ref.c:37 builtin/tag.c:372

8154 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38

8155 msgid "format to use for the output"

8156 msgstr "format à utiliser pour la sortie"

8157

@@ -7782,64 +8171,64 @@ msgstr "afficher seulement les références qui ne sont pas fusionnées"

8171 msgid "print only refs which contain the commit"

8172 msgstr "afficher seulement les références qui contiennent le commit"

8173

7785 -#: builtin/fsck.c:519

8174 +#: builtin/fsck.c:554

8175 msgid "Checking object directories"

8176 msgstr "Vérification des répertoires d'objet"

8177

7789 -#: builtin/fsck.c:588

8178 +#: builtin/fsck.c:646

8179 msgid "git fsck [<options>] [<object>...]"

8180 msgstr "git fsck [<options>] [<objet>...]"

8181

7793 -#: builtin/fsck.c:594

8182 +#: builtin/fsck.c:652

8183 msgid "show unreachable objects"

8184 msgstr "afficher les objets inaccessibles"

8185

7797 -#: builtin/fsck.c:595

8186 +#: builtin/fsck.c:653

8187 msgid "show dangling objects"

8188 msgstr "afficher les objets en suspens"

8189

7801 -#: builtin/fsck.c:596

8190 +#: builtin/fsck.c:654

8191 msgid "report tags"

8192 msgstr "afficher les étiquettes"

8193

7805 -#: builtin/fsck.c:597

8194 +#: builtin/fsck.c:655

8195 msgid "report root nodes"

8196 msgstr "signaler les nœuds racines"

8197

7809 -#: builtin/fsck.c:598

8198 +#: builtin/fsck.c:656

8199 msgid "make index objects head nodes"

8200 msgstr "considérer les objets de l'index comme nœuds tête"

8201

8202 # translated from man page

7814 -#: builtin/fsck.c:599

8203 +#: builtin/fsck.c:657

8204 msgid "make reflogs head nodes (default)"

8205 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

8206

7818 -#: builtin/fsck.c:600

8207 +#: builtin/fsck.c:658

8208 msgid "also consider packs and alternate objects"

8209 msgstr "inspecter aussi les objets pack et alternatifs"

8210

7822 -#: builtin/fsck.c:601

8211 +#: builtin/fsck.c:659

8212 msgid "check only connectivity"

8213 msgstr "ne vérifier que la connectivité"

8214

7826 -#: builtin/fsck.c:602

8215 +#: builtin/fsck.c:660

8216 msgid "enable more strict checking"

8217 msgstr "activer une vérification plus strict"

8218

7830 -#: builtin/fsck.c:604

8219 +#: builtin/fsck.c:662

8220 msgid "write dangling objects in .git/lost-found"

8221 msgstr "écrire les objets en suspens dans .git/lost-found"

8222

7834 -#: builtin/fsck.c:605 builtin/prune.c:107

8223 +#: builtin/fsck.c:663 builtin/prune.c:107

8224 msgid "show progress"

8225 msgstr "afficher la progression"

8226

7838 -#: builtin/fsck.c:606

8227 +#: builtin/fsck.c:664

8228 msgid "show verbose names for reachable objects"

8229 msgstr "afficher les noms étendus pour les objets inaccessibles"

8230

7842 -#: builtin/fsck.c:665

8231 +#: builtin/fsck.c:725

8232 msgid "Checking objects"

8233 msgstr "Vérification des objets"

8234

@@ -7857,7 +8246,7 @@ msgstr "%s invalide : '%s'"

8246 msgid "insanely long object directory %.*s"

8247 msgstr "objet répertoire démentiellement long %.*s"

8248

7860 -#: builtin/gc.c:290

8249 +#: builtin/gc.c:297

8250 #, c-format

8251 msgid ""

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

@@ -7873,42 +8262,42 @@ msgstr ""

8262 "\n"

8263 "%s"

8264

7876 -#: builtin/gc.c:327

8265 +#: builtin/gc.c:334

8266 msgid "prune unreferenced objects"

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

8268

7880 -#: builtin/gc.c:329

8269 +#: builtin/gc.c:336

8270 msgid "be more thorough (increased runtime)"

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

8272

7884 -#: builtin/gc.c:330

8273 +#: builtin/gc.c:337

8274 msgid "enable auto-gc mode"

8275 msgstr "activer le mode auto-gc"

8276

7888 -#: builtin/gc.c:331

8277 +#: builtin/gc.c:338

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

8279 msgstr ""

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

8281 "tourne déjà"

8282

7894 -#: builtin/gc.c:373

8283 +#: builtin/gc.c:380

8284 #, c-format

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

8286 msgstr ""

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

8288 "performances.\n"

8289

7901 -#: builtin/gc.c:375

8290 +#: builtin/gc.c:382

8291 #, c-format

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

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

8294

7906 -#: builtin/gc.c:376

8295 +#: builtin/gc.c:383

8296 #, c-format

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

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

8299

7911 -#: builtin/gc.c:397

8300 +#: builtin/gc.c:404

8301 #, c-format

8302 msgid ""

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

@@ -7916,249 +8305,265 @@ msgstr ""

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

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

8307

7919 -#: builtin/gc.c:441

8308 +#: builtin/gc.c:448

8309 msgid ""

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

8311 msgstr ""

8312 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "

8313 "supprimer."

8314

7926 -#: builtin/grep.c:23

8315 +#: builtin/grep.c:25

8316 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

8317 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"

8318

7930 -#: builtin/grep.c:219

8319 +#: builtin/grep.c:232

8320 #, c-format

8321 msgid "grep: failed to create thread: %s"

8322 msgstr "grep : échec de création du fil: %s"

8323

7935 -#: builtin/grep.c:277

8324 +#: builtin/grep.c:290

8325 #, c-format

8326 msgid "invalid number of threads specified (%d) for %s"

8327 msgstr "nombre de fils spécifié invalide (%d) pour %s"

8328

7940 -#: builtin/grep.c:453 builtin/grep.c:488

8329 +#: builtin/grep.c:763 builtin/grep.c:804

8330 #, c-format

8331 msgid "unable to read tree (%s)"

8332 msgstr "impossible de lire l'arbre (%s)"

8333

7945 -#: builtin/grep.c:503

8334 +#: builtin/grep.c:823

8335 #, c-format

8336 msgid "unable to grep from object of type %s"

8337 msgstr "impossible de faire un grep sur un objet de type %s"

8338

7950 -#: builtin/grep.c:561

8339 +#: builtin/grep.c:887

8340 #, c-format

8341 msgid "switch `%c' expects a numerical value"

8342 msgstr "l'option '%c' attend un valeur numérique"

8343

7955 -#: builtin/grep.c:647

8344 +#: builtin/grep.c:973

8345 msgid "search in index instead of in the work tree"

8346 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

8347

7959 -#: builtin/grep.c:649

8348 +#: builtin/grep.c:975

8349 msgid "find in contents not managed by git"

8350 msgstr "rechercher dans les contenus non gérés par git"

8351

7963 -#: builtin/grep.c:651

8352 +#: builtin/grep.c:977

8353 msgid "search in both tracked and untracked files"

8354 msgstr "rechercher dans les fichiers suivis et non-suivis"

8355

7967 -#: builtin/grep.c:653

8356 +#: builtin/grep.c:979

8357 msgid "ignore files specified via '.gitignore'"

8358 msgstr "ignorer les fichiers spécifiés via '.gitignore'"

8359

7971 -#: builtin/grep.c:656

8360 +#: builtin/grep.c:981

8361 +msgid "recursivley search in each submodule"

8362 +msgstr "rechercher récursivement dans chaque sous-module"

8363 +

8364 +#: builtin/grep.c:983

8365 +msgid "basename"

8366 +msgstr "nom de base"

8367 +

8368 +#: builtin/grep.c:984

8369 +msgid "prepend parent project's basename to output"

8370 +msgstr "préfixer le nom de base du projet parent à la sortie"

8371 +

8372 +#: builtin/grep.c:987

8373 msgid "show non-matching lines"

8374 msgstr "afficher les lignes qui ne correspondent pas"

8375

7975 -#: builtin/grep.c:658

8376 +#: builtin/grep.c:989

8377 msgid "case insensitive matching"

8378 msgstr "correspondance insensible à la casse"

8379

7979 -#: builtin/grep.c:660

8380 +#: builtin/grep.c:991

8381 msgid "match patterns only at word boundaries"

8382 msgstr "rechercher les motifs aux séparateurs de mots"

8383

7983 -#: builtin/grep.c:662

8384 +#: builtin/grep.c:993

8385 msgid "process binary files as text"

8386 msgstr "traiter les fichiers binaires comme texte"

8387

7987 -#: builtin/grep.c:664

8388 +#: builtin/grep.c:995

8389 msgid "don't match patterns in binary files"

8390 msgstr "ne pas chercher les motifs dans les fichiers binaires"

8391

7991 -#: builtin/grep.c:667

8392 +#: builtin/grep.c:998

8393 msgid "process binary files with textconv filters"

8394 msgstr "traiter les fichiers binaires avec les filtres textconv"

8395

7995 -#: builtin/grep.c:669

8396 +#: builtin/grep.c:1000

8397 msgid "descend at most <depth> levels"

8398 msgstr "descendre au plus de <profondeur> dans l'arborescence"

8399

7999 -#: builtin/grep.c:673

8400 +#: builtin/grep.c:1004

8401 msgid "use extended POSIX regular expressions"

8402 msgstr "utiliser des expressions régulières étendues POSIX"

8403

8003 -#: builtin/grep.c:676

8404 +#: builtin/grep.c:1007

8405 msgid "use basic POSIX regular expressions (default)"

8406 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

8407

8007 -#: builtin/grep.c:679

8408 +#: builtin/grep.c:1010

8409 msgid "interpret patterns as fixed strings"

8410 msgstr "interpréter les motifs comme de chaînes fixes"

8411

8011 -#: builtin/grep.c:682

8412 +#: builtin/grep.c:1013

8413 msgid "use Perl-compatible regular expressions"

8414 msgstr "utiliser des expressions régulières compatibles avec Perl"

8415

8015 -#: builtin/grep.c:685

8416 +#: builtin/grep.c:1016

8417 msgid "show line numbers"

8418 msgstr "afficher les numéros de ligne"

8419

8019 -#: builtin/grep.c:686

8420 +#: builtin/grep.c:1017

8421 msgid "don't show filenames"

8422 msgstr "ne pas pas afficher les noms de fichier"

8423

8023 -#: builtin/grep.c:687

8424 +#: builtin/grep.c:1018

8425 msgid "show filenames"

8426 msgstr "afficher les noms de fichier"

8427

8027 -#: builtin/grep.c:689

8428 +#: builtin/grep.c:1020

8429 msgid "show filenames relative to top directory"

8430 msgstr "afficher les noms de fichiers relativement au répertoire de base"

8431

8031 -#: builtin/grep.c:691

8432 +#: builtin/grep.c:1022

8433 msgid "show only filenames instead of matching lines"

8434 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

8435

8035 -#: builtin/grep.c:693

8436 +#: builtin/grep.c:1024

8437 msgid "synonym for --files-with-matches"

8438 msgstr "synonyme pour --files-with-matches"

8439

8039 -#: builtin/grep.c:696

8440 +#: builtin/grep.c:1027

8441 msgid "show only the names of files without match"

8442 msgstr "n'afficher que les noms des fichiers sans correspondance"

8443

8043 -#: builtin/grep.c:698

8444 +#: builtin/grep.c:1029

8445 msgid "print NUL after filenames"

8446 msgstr "imprimer une caractère NUL après le noms de fichier"

8447

8047 -#: builtin/grep.c:700

8448 +#: builtin/grep.c:1031

8449 msgid "show the number of matches instead of matching lines"

8450 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

8451

8051 -#: builtin/grep.c:701

8452 +#: builtin/grep.c:1032

8453 msgid "highlight matches"

8454 msgstr "mettre en évidence les correspondances"

8455

8055 -#: builtin/grep.c:703

8456 +#: builtin/grep.c:1034

8457 msgid "print empty line between matches from different files"

8458 msgstr ""

8459 "imprimer une ligne vide entre les correspondances de fichiers différents"

8460

8060 -#: builtin/grep.c:705

8461 +#: builtin/grep.c:1036

8462 msgid "show filename only once above matches from same file"

8463 msgstr ""

8464 "afficher le nom de fichier une fois au dessus des correspondances du même "

8465 "fichier"

8466

8066 -#: builtin/grep.c:708

8467 +#: builtin/grep.c:1039

8468 msgid "show <n> context lines before and after matches"

8469 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

8470

8070 -#: builtin/grep.c:711

8471 +#: builtin/grep.c:1042

8472 msgid "show <n> context lines before matches"

8473 msgstr "afficher <n> lignes de contexte avant les correspondances"

8474

8074 -#: builtin/grep.c:713

8475 +#: builtin/grep.c:1044

8476 msgid "show <n> context lines after matches"

8477 msgstr "afficher <n> lignes de contexte après les correspondances"

8478

8078 -#: builtin/grep.c:715

8479 +#: builtin/grep.c:1046

8480 msgid "use <n> worker threads"

8481 msgstr "utiliser <n> fils de travail"

8482

8082 -#: builtin/grep.c:716

8483 +#: builtin/grep.c:1047

8484 msgid "shortcut for -C NUM"

8485 msgstr "raccourci pour -C NUM"

8486

8086 -#: builtin/grep.c:719

8487 +#: builtin/grep.c:1050

8488 msgid "show a line with the function name before matches"

8489 msgstr ""

8490 "afficher une ligne avec le nom de la fonction avant les correspondances"

8491

8091 -#: builtin/grep.c:721

8492 +#: builtin/grep.c:1052

8493 msgid "show the surrounding function"

8494 msgstr "afficher la fonction contenante"

8495

8095 -#: builtin/grep.c:724

8496 +#: builtin/grep.c:1055

8497 msgid "read patterns from file"

8498 msgstr "lire les motifs depuis fichier"

8499

8099 -#: builtin/grep.c:726

8500 +#: builtin/grep.c:1057

8501 msgid "match <pattern>"

8502 msgstr "rechercher <motif>"

8503

8103 -#: builtin/grep.c:728

8504 +#: builtin/grep.c:1059

8505 msgid "combine patterns specified with -e"

8506 msgstr "combiner les motifs spécifiés par -e"

8507

8107 -#: builtin/grep.c:740

8508 +#: builtin/grep.c:1071

8509 msgid "indicate hit with exit status without output"

8510 msgstr ""

8511 "indiquer des correspondances avec le code de sortie mais sans rien afficher"

8512

8112 -#: builtin/grep.c:742

8513 +#: builtin/grep.c:1073

8514 msgid "show only matches from files that match all patterns"

8515 msgstr ""

8516 "n'afficher que les correspondances de fichiers qui correspondent à tous les "

8517 "motifs"

8518

8118 -#: builtin/grep.c:744

8519 +#: builtin/grep.c:1075

8520 msgid "show parse tree for grep expression"

8521 msgstr "afficher l'arbre d'analyse pour le motif grep"

8522

8122 -#: builtin/grep.c:748

8523 +#: builtin/grep.c:1079

8524 msgid "pager"

8525 msgstr "pagineur"

8526

8126 -#: builtin/grep.c:748

8527 +#: builtin/grep.c:1079

8528 msgid "show matching files in the pager"

8529 msgstr "afficher les fichiers correspondant dans le pagineur"

8530

8130 -#: builtin/grep.c:751

8531 +#: builtin/grep.c:1082

8532 msgid "allow calling of grep(1) (ignored by this build)"

8533 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

8534

8134 -#: builtin/grep.c:814

8535 +#: builtin/grep.c:1146

8536 msgid "no pattern given."

8537 msgstr "aucun motif fourni."

8538

8138 -#: builtin/grep.c:846 builtin/index-pack.c:1480

8539 +#: builtin/grep.c:1178 builtin/index-pack.c:1482

8540 #, c-format

8541 msgid "invalid number of threads specified (%d)"

8542 msgstr "nombre de fils spécifié invalide (%d)"

8543

8143 -#: builtin/grep.c:876

8544 +#: builtin/grep.c:1215

8545 msgid "--open-files-in-pager only works on the worktree"

8546 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"

8547

8147 -#: builtin/grep.c:902

8548 +#: builtin/grep.c:1238

8549 +msgid "option not supported with --recurse-submodules."

8550 +msgstr "option non supportée avec --recurse-submodules."

8551 +

8552 +#: builtin/grep.c:1244

8553 msgid "--cached or --untracked cannot be used with --no-index."

8554 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."

8555

8151 -#: builtin/grep.c:907

8556 +#: builtin/grep.c:1249

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

8558 msgstr ""

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

8560

8156 -#: builtin/grep.c:910

8561 +#: builtin/grep.c:1252

8562 msgid "--[no-]exclude-standard cannot be used for tracked contents."

8563 msgstr ""

8564 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."

8565

8161 -#: builtin/grep.c:918

8566 +#: builtin/grep.c:1260

8567 msgid "both --cached and trees are given."

8568 msgstr "--cached et des arbres sont fournis en même temps."

8569

@@ -8439,184 +8844,188 @@ msgid "serious inflate inconsistency"

8844 msgstr "grave incohérence dans la décompression (inflate)"

8845

8846 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777

8442 -#: builtin/index-pack.c:811 builtin/index-pack.c:820

8847 +#: builtin/index-pack.c:813 builtin/index-pack.c:822

8848 #, c-format

8849 msgid "SHA1 COLLISION FOUND WITH %s !"

8850 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

8851

8447 -#: builtin/index-pack.c:751 builtin/pack-objects.c:166

8448 -#: builtin/pack-objects.c:258

8852 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164

8853 +#: builtin/pack-objects.c:256

8854 #, c-format

8855 msgid "unable to read %s"

8856 msgstr "impossible de lire %s"

8857

8453 -#: builtin/index-pack.c:817

8858 +#: builtin/index-pack.c:819

8859 #, c-format

8860 msgid "cannot read existing object %s"

8861 msgstr "impossible de lire l'objet existant %s"

8862

8458 -#: builtin/index-pack.c:831

8863 +#: builtin/index-pack.c:833

8864 #, c-format

8865 msgid "invalid blob object %s"

8866 msgstr "objet blob invalide %s"

8867

8463 -#: builtin/index-pack.c:845

8868 +#: builtin/index-pack.c:847

8869 #, c-format

8870 msgid "invalid %s"

8871 msgstr "%s invalide"

8872

8468 -#: builtin/index-pack.c:848

8873 +#: builtin/index-pack.c:850

8874 msgid "Error in object"

8875 msgstr "Erreur dans l'objet"

8876

8472 -#: builtin/index-pack.c:850

8877 +#: builtin/index-pack.c:852

8878 #, c-format

8879 msgid "Not all child objects of %s are reachable"

8880 msgstr "Tous les objets enfants de %s ne sont pas accessibles"

8881

8477 -#: builtin/index-pack.c:922 builtin/index-pack.c:953

8882 +#: builtin/index-pack.c:924 builtin/index-pack.c:955

8883 msgid "failed to apply delta"

8884 msgstr "échec d'application du delta"

8885

8481 -#: builtin/index-pack.c:1123

8886 +#: builtin/index-pack.c:1125

8887 msgid "Receiving objects"

8888 msgstr "Réception d'objets"

8889

8485 -#: builtin/index-pack.c:1123

8890 +#: builtin/index-pack.c:1125

8891 msgid "Indexing objects"

8892 msgstr "Indexation d'objets"

8893

8489 -#: builtin/index-pack.c:1155

8894 +#: builtin/index-pack.c:1157

8895 msgid "pack is corrupted (SHA1 mismatch)"

8896 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"

8897

8493 -#: builtin/index-pack.c:1160

8898 +#: builtin/index-pack.c:1162

8899 msgid "cannot fstat packfile"

8900 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"

l10n: fr.po: v2.11-rc0 first round