7298ca7b2e · 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: 2015-01-21 14:21+0800\n"

77 -"PO-Revision-Date: 2015-01-21 14:57+0800\n"

76 +"POT-Creation-Date: 2015-03-27 13:33+0800\n"

77 +"PO-Revision-Date: 2015-03-30 10:53+0200\n"

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

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

80 "Language: fr\n"

@@ -98,8 +98,8 @@ msgstr ""

98 "nécessaire pour marquer la résolution et valider."

99

100 #: archive.c:11

101 -msgid "git archive [options] <tree-ish> [<path>...]"

102 -msgstr "git archive [options] <arbre ou apparenté> [<chemin>...]"

101 +msgid "git archive [<options>] <tree-ish> [<path>...]"

102 +msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"

103

104 #: archive.c:12

105 msgid "git archive --list"

@@ -107,10 +107,8 @@ msgstr "git archive --list"

107

108 #: archive.c:13

109 msgid ""

110 -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

111 -msgstr ""

112 -"git archive --remote <dépôt> [--exec <commande>] [options] <arbre ou "

113 -"apparenté> [<chemin>...]"

110 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

111 +msgstr "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou apparenté> [<chemin>...]"

112

113 #: archive.c:14

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

@@ -137,10 +135,10 @@ msgstr "préfixe"

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

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

137

140 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

141 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

138 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

139 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

140 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

143 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

141 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

142 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

143 msgid "file"

144 msgstr "fichier"

@@ -189,7 +187,7 @@ msgstr "commande"

187 msgid "path to the remote git-upload-archive command"

188 msgstr "chemin vers la commande distante git-upload-archive"

189

192 -#: attr.c:258

190 +#: attr.c:264

191 msgid ""

192 "Negative patterns are ignored in git attributes\n"

193 "Use '\\!' for literal leading exclamation."

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

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

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

325

328 -#: bundle.c:87 builtin/commit.c:770

326 +#: bundle.c:87 builtin/commit.c:764

327 #, c-format

328 msgid "could not open '%s'"

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

@@ -334,8 +332,8 @@ msgstr "impossible d'ouvrir '%s'"

332 msgid "Repository lacks these prerequisite commits:"

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

334

337 -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

338 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

335 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

336 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330

337 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

338 #: builtin/shortlog.c:158

339 msgid "revision walk setup failed"

@@ -376,21 +374,21 @@ msgstr "rev-list a disparu"

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

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

376

379 -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

377 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

378 #, c-format

379 msgid "unrecognized argument: %s"

380 msgstr "argument non reconnu : %s"

381

384 -#: bundle.c:444

382 +#: bundle.c:443

383 msgid "Refusing to create empty bundle."

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

385

388 -#: bundle.c:454

386 +#: bundle.c:453

387 #, c-format

388 msgid "cannot create '%s'"

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

390

393 -#: bundle.c:475

391 +#: bundle.c:474

392 msgid "index-pack died"

393 msgstr "l'index de groupe a disparu"

394

@@ -413,58 +411,58 @@ msgstr "%s %s n'est pas un commit !"

411 msgid "memory exhausted"

412 msgstr "plus de mémoire"

413

416 -#: config.c:469 config.c:471

414 +#: config.c:474 config.c:476

415 #, c-format

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

417 msgstr "ligne %d de fichier de config incorrecte dans %s"

418

421 -#: config.c:587

419 +#: config.c:592

420 #, c-format

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

422 msgstr ""

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

424

427 -#: config.c:589

425 +#: config.c:594

426 #, c-format

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

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

429

432 -#: config.c:674

430 +#: config.c:679

431 #, c-format

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

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

434

437 -#: config.c:752 config.c:763

435 +#: config.c:757 config.c:768

436 #, c-format

437 msgid "bad zlib compression level %d"

438 msgstr "niveau de compression zlib incorrect %d"

439

442 -#: config.c:885

440 +#: config.c:890

441 #, c-format

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

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

444

447 -#: config.c:1211

445 +#: config.c:1216

446 msgid "unable to parse command-line config"

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

448

451 -#: config.c:1272

449 +#: config.c:1277

450 msgid "unknown error occured while reading the configuration files"

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

452

455 -#: config.c:1596

453 +#: config.c:1601

454 #, c-format

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

456 msgstr ""

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

458

461 -#: config.c:1598

459 +#: config.c:1603

460 #, c-format

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

462 msgstr ""

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

464

467 -#: config.c:1657

465 +#: config.c:1662

466 #, c-format

467 msgid "%s has multiple values"

468 msgstr "%s a des valeurs multiples"

@@ -556,7 +554,7 @@ msgstr[1] "il y a %lu ans"

554 msgid "failed to read orderfile '%s'"

555 msgstr "impossible de lire le fichier de commande '%s'"

556

559 -#: diffcore-rename.c:516

557 +#: diffcore-rename.c:536

558 msgid "Performing inexact rename detection"

559 msgstr "Détection de renommage inexact en cours"

560

@@ -586,16 +584,16 @@ msgstr ""

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

585 "%s"

586

589 -#: diff.c:2957

587 +#: diff.c:2956

588 #, c-format

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

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

591

594 -#: diff.c:3352

592 +#: diff.c:3351

593 msgid "--follow requires exactly one pathspec"

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

595

598 -#: diff.c:3515

596 +#: diff.c:3514

597 #, c-format

598 msgid ""

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

@@ -604,7 +602,7 @@ msgstr ""

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

603 "%s"

604

607 -#: diff.c:3529

605 +#: diff.c:3528

606 #, c-format

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

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

@@ -1109,7 +1107,7 @@ msgstr "impossible d'analyser le format --pretty"

1107 msgid "done"

1108 msgstr "fait"

1109

1112 -#: read-cache.c:1267

1110 +#: read-cache.c:1273

1111 #, c-format

1112 msgid ""

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

@@ -1118,7 +1116,7 @@ msgstr ""

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

1117 "Utilisation de la version %i"

1118

1121 -#: read-cache.c:1277

1119 +#: read-cache.c:1283

1120 #, c-format

1121 msgid ""

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

@@ -1207,23 +1205,31 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1205 msgstr ""

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

1207

1210 -#: run-command.c:87

1208 +#: revision.c:2348

1209 +msgid "--first-parent is incompatible with --bisect"

1210 +msgstr "--first-parent est incompatible avec --bisect"

1211 +

1212 +#: run-command.c:83

1213 msgid "open /dev/null failed"

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

1215

1214 -#: run-command.c:89

1216 +#: run-command.c:85

1217 #, c-format

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

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

1220

1219 -#: send-pack.c:268

1221 +#: send-pack.c:272

1222 msgid "failed to sign the push certificate"

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

1224

1223 -#: send-pack.c:325

1225 +#: send-pack.c:356

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

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

1228

1229 +#: send-pack.c:366

1230 +msgid "server does not support --atomic push"

1231 +msgstr "le serveur ne gère pas push --atomic"

1232 +

1233 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1234 #: builtin/merge.c:1005

1235 #, c-format

@@ -1254,7 +1260,7 @@ msgstr ""

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

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

1262

1257 -#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1263 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1264 #, c-format

1265 msgid "Could not write to %s"

1266 msgstr "Impossible d'écrire dans %s"

@@ -1290,31 +1296,31 @@ msgstr "Impossible de résoudre le commit HEAD\n"

1296 msgid "Unable to update cache tree\n"

1297 msgstr "Impossible de mettre à jour l'arbre de cache\n"

1298

1293 -#: sequencer.c:406

1299 +#: sequencer.c:411

1300 #, c-format

1301 msgid "Could not parse commit %s\n"

1302 msgstr "Impossible d'analyser le commit %s\n"

1303

1298 -#: sequencer.c:411

1304 +#: sequencer.c:416

1305 #, c-format

1306 msgid "Could not parse parent commit %s\n"

1307 msgstr "Impossible d'analyser le commit parent %s\n"

1308

1303 -#: sequencer.c:477

1309 +#: sequencer.c:482

1310 msgid "Your index file is unmerged."

1311 msgstr "Votre fichier d'index n'est pas fusionné."

1312

1307 -#: sequencer.c:496

1313 +#: sequencer.c:501

1314 #, c-format

1315 msgid "Commit %s is a merge but no -m option was given."

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

1317

1312 -#: sequencer.c:504

1318 +#: sequencer.c:509

1319 #, c-format

1320 msgid "Commit %s does not have parent %d"

1321 msgstr "Le commit %s n'a pas le parent %d"

1322

1317 -#: sequencer.c:508

1323 +#: sequencer.c:513

1324 #, c-format

1325 msgid "Mainline was specified but commit %s is not a merge."

1326 msgstr ""

@@ -1323,153 +1329,153 @@ msgstr ""

1329

1330 #. TRANSLATORS: The first %s will be "revert" or

1331 #. "cherry-pick", the second %s a SHA1

1326 -#: sequencer.c:521

1332 +#: sequencer.c:526

1333 #, c-format

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

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

1336

1331 -#: sequencer.c:525

1337 +#: sequencer.c:530

1338 #, c-format

1339 msgid "Cannot get commit message for %s"

1340 msgstr "Impossible d'obtenir un message de validation pour %s"

1341

1336 -#: sequencer.c:611

1342 +#: sequencer.c:616

1343 #, c-format

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

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

1346

1341 -#: sequencer.c:612

1347 +#: sequencer.c:617

1348 #, c-format

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

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

1351

1346 -#: sequencer.c:648

1352 +#: sequencer.c:653

1353 msgid "empty commit set passed"

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

1355

1350 -#: sequencer.c:656

1356 +#: sequencer.c:661

1357 #, c-format

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

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

1360

1355 -#: sequencer.c:660

1361 +#: sequencer.c:665

1362 #, c-format

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

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

1365

1360 -#: sequencer.c:720

1366 +#: sequencer.c:725

1367 #, c-format

1368 msgid "Cannot %s during a %s"

1369 msgstr "Impossible de %s pendant un %s"

1370

1365 -#: sequencer.c:742

1371 +#: sequencer.c:747

1372 #, c-format

1373 msgid "Could not parse line %d."

1374 msgstr "Impossible d'analyser la ligne %d."

1375

1370 -#: sequencer.c:747

1376 +#: sequencer.c:752

1377 msgid "No commits parsed."

1378 msgstr "Aucun commit analysé."

1379

1374 -#: sequencer.c:760

1380 +#: sequencer.c:765

1381 #, c-format

1382 msgid "Could not open %s"

1383 msgstr "Impossible d'ouvrir %s"

1384

1379 -#: sequencer.c:764

1385 +#: sequencer.c:769

1386 #, c-format

1387 msgid "Could not read %s."

1388 msgstr "Impossible de lire %s."

1389

1384 -#: sequencer.c:771

1390 +#: sequencer.c:776

1391 #, c-format

1392 msgid "Unusable instruction sheet: %s"

1393 msgstr "Feuille d'instruction inutilisable : %s"

1394

1389 -#: sequencer.c:801

1395 +#: sequencer.c:806

1396 #, c-format

1397 msgid "Invalid key: %s"

1398 msgstr "Clé invalide: %s"

1399

1394 -#: sequencer.c:804

1400 +#: sequencer.c:809

1401 #, c-format

1402 msgid "Invalid value for %s: %s"

1403 msgstr "Valeur invalide pour %s : %s"

1404

1399 -#: sequencer.c:816

1405 +#: sequencer.c:821

1406 #, c-format

1407 msgid "Malformed options sheet: %s"

1408 msgstr "Feuille d'options malformée : %s"

1409

1404 -#: sequencer.c:837

1410 +#: sequencer.c:842

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

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

1413

1408 -#: sequencer.c:838

1414 +#: sequencer.c:843

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

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

1417

1412 -#: sequencer.c:842

1418 +#: sequencer.c:847

1419 #, c-format

1420 msgid "Could not create sequencer directory %s"

1421 msgstr "Impossible de créer le répertoire de séquenceur %s"

1422

1417 -#: sequencer.c:858 sequencer.c:943

1423 +#: sequencer.c:863 sequencer.c:948

1424 #, c-format

1425 msgid "Error wrapping up %s."

1426 msgstr "Erreur lors de l'emballage de %s."

1427

1422 -#: sequencer.c:877 sequencer.c:1013

1428 +#: sequencer.c:882 sequencer.c:1018

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

1430 msgstr "aucun picorage ou retour en cours"

1431

1426 -#: sequencer.c:879

1432 +#: sequencer.c:884

1433 msgid "cannot resolve HEAD"

1434 msgstr "impossible de résoudre HEAD"

1435

1430 -#: sequencer.c:881

1436 +#: sequencer.c:886

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

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

1439

1434 -#: sequencer.c:903 builtin/apply.c:4128

1440 +#: sequencer.c:908 builtin/apply.c:4286

1441 #, c-format

1442 msgid "cannot open %s: %s"

1443 msgstr "impossible d'ouvrir %s : %s"

1444

1439 -#: sequencer.c:906

1445 +#: sequencer.c:911

1446 #, c-format

1447 msgid "cannot read %s: %s"

1448 msgstr "impossible de lire %s : %s"

1449

1444 -#: sequencer.c:907

1450 +#: sequencer.c:912

1451 msgid "unexpected end of file"

1452 msgstr "fin de fichier inattendue"

1453

1448 -#: sequencer.c:913

1454 +#: sequencer.c:918

1455 #, c-format

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

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

1458

1453 -#: sequencer.c:936

1459 +#: sequencer.c:941

1460 #, c-format

1461 msgid "Could not format %s."

1462 msgstr "Impossible de formater %s."

1463

1458 -#: sequencer.c:1081

1464 +#: sequencer.c:1086

1465 #, c-format

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

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

1468

1463 -#: sequencer.c:1084

1469 +#: sequencer.c:1089

1470 #, c-format

1471 msgid "%s: bad revision"

1472 msgstr "%s : mauvaise révision"

1473

1468 -#: sequencer.c:1118

1474 +#: sequencer.c:1123

1475 msgid "Can't revert as initial commit"

1476 msgstr "Impossible d'annuler en tant que commit initial"

1477

1472 -#: sequencer.c:1119

1478 +#: sequencer.c:1124

1479 msgid "Can't cherry-pick into empty head"

1480 msgstr "Impossible de picorer vers une HEAD vide"

1481

@@ -1543,38 +1549,38 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1549 msgid "staging updated .gitmodules failed"

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

1551

1546 -#: submodule.c:1111 builtin/init-db.c:371

1552 +#: submodule.c:1109 builtin/init-db.c:371

1553 #, c-format

1554 msgid "Could not create git link %s"

1555 msgstr "Impossible de créer le lien git %s"

1556

1551 -#: submodule.c:1122

1557 +#: submodule.c:1120

1558 #, c-format

1559 msgid "Could not set core.worktree in %s"

1560 msgstr "Impossible de paramétrer core.worktree dans %s"

1561

1556 -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1557 -#: trailer.c:570

1562 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1563 +#: trailer.c:561

1564 #, c-format

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

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

1567

1562 -#: trailer.c:552 trailer.c:557 builtin/remote.c:290

1568 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1569 #, c-format

1570 msgid "more than one %s"

1571 msgstr "plus d'un %s"

1572

1567 -#: trailer.c:590

1573 +#: trailer.c:581

1574 #, c-format

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

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

1577

1572 -#: trailer.c:710

1578 +#: trailer.c:701

1579 #, c-format

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

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

1582

1577 -#: trailer.c:713

1583 +#: trailer.c:704

1584 msgid "could not read from stdin"

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

1586

@@ -1611,28 +1617,28 @@ msgstr "numéro de port invalide"

1617 msgid "invalid '..' path segment"

1618 msgstr "segment de chemin '..' invalide"

1619

1614 -#: wrapper.c:509

1620 +#: wrapper.c:523

1621 #, c-format

1622 msgid "unable to access '%s': %s"

1623 msgstr "impossible d'accéder à '%s' : %s"

1624

1619 -#: wrapper.c:530

1625 +#: wrapper.c:544

1626 #, c-format

1627 msgid "unable to access '%s'"

1628 msgstr "impossible d'accéder à '%s'"

1629

1624 -#: wrapper.c:541

1630 +#: wrapper.c:555

1631 #, c-format

1632 msgid "unable to look up current user in the passwd file: %s"

1633 msgstr ""

1634 "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "

1635 "passe : %s"

1636

1631 -#: wrapper.c:542

1637 +#: wrapper.c:556

1638 msgid "no such user"

1639 msgstr "utilisateur inconnu"

1640

1635 -#: wrapper.c:550

1641 +#: wrapper.c:564

1642 msgid "unable to get current working directory"

1643 msgstr "impossible d'accéder au répertoire de travail courant"

1644

@@ -1663,11 +1669,11 @@ msgstr ""

1669 msgid " (use \"git rm <file>...\" to mark resolution)"

1670 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

1671

1666 -#: wt-status.c:198

1672 +#: wt-status.c:198 wt-status.c:878

1673 msgid "Changes to be committed:"

1674 msgstr "Modifications qui seront validées :"

1675

1670 -#: wt-status.c:216

1676 +#: wt-status.c:216 wt-status.c:887

1677 msgid "Changes not staged for commit:"

1678 msgstr "Modifications qui ne seront pas validées :"

1679

@@ -1782,15 +1788,15 @@ msgstr "contenu non suivi, "

1788 msgid "bug: unhandled diff status %c"

1789 msgstr "bogue : état de diff non géré %c"

1790

1785 -#: wt-status.c:758

1791 +#: wt-status.c:753

1792 msgid "Submodules changed but not updated:"

1793 msgstr "Sous-modules modifiés mais non mis à jour :"

1794

1789 -#: wt-status.c:760

1795 +#: wt-status.c:755

1796 msgid "Submodule changes to be committed:"

1797 msgstr "Changements du sous-module à valider :"

1798

1793 -#: wt-status.c:839

1799 +#: wt-status.c:835

1800 msgid ""

1801 "Do not touch the line above.\n"

1802 "Everything below will be removed."

@@ -1798,68 +1804,68 @@ msgstr ""

1804 "Ne touchez pas à la ligne ci-dessus\n"

1805 "Tout se qui suit sera éliminé."

1806

1801 -#: wt-status.c:930

1807 +#: wt-status.c:946

1808 msgid "You have unmerged paths."

1809 msgstr "Vous avez des chemins non fusionnés."

1810

1805 -#: wt-status.c:933

1811 +#: wt-status.c:949

1812 msgid " (fix conflicts and run \"git commit\")"

1813 msgstr " (réglez les conflits puis lancez \"git commit\")"

1814

1809 -#: wt-status.c:936

1815 +#: wt-status.c:952

1816 msgid "All conflicts fixed but you are still merging."

1817 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."

1818

1813 -#: wt-status.c:939

1819 +#: wt-status.c:955

1820 msgid " (use \"git commit\" to conclude merge)"

1821 msgstr " (utilisez \"git commit\" pour terminer la fusion)"

1822

1817 -#: wt-status.c:949

1823 +#: wt-status.c:965

1824 msgid "You are in the middle of an am session."

1825 msgstr "Vous êtes au milieu d'une session am."

1826

1821 -#: wt-status.c:952

1827 +#: wt-status.c:968

1828 msgid "The current patch is empty."

1829 msgstr "Le patch actuel est vide."

1830

1825 -#: wt-status.c:956

1831 +#: wt-status.c:972

1832 msgid " (fix conflicts and then run \"git am --continue\")"

1833 msgstr " (réglez les conflits puis lancez \"git am --continue\")"

1834

1829 -#: wt-status.c:958

1835 +#: wt-status.c:974

1836 msgid " (use \"git am --skip\" to skip this patch)"

1837 msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"

1838

1833 -#: wt-status.c:960

1839 +#: wt-status.c:976

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

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

1842

1837 -#: wt-status.c:1020 wt-status.c:1037

1843 +#: wt-status.c:1036 wt-status.c:1053

1844 #, c-format

1845 msgid "You are currently rebasing branch '%s' on '%s'."

1846 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."

1847

1842 -#: wt-status.c:1025 wt-status.c:1042

1848 +#: wt-status.c:1041 wt-status.c:1058

1849 msgid "You are currently rebasing."

1850 msgstr "Vous êtes en train de rebaser."

1851

1846 -#: wt-status.c:1028

1852 +#: wt-status.c:1044

1853 msgid " (fix conflicts and then run \"git rebase --continue\")"

1854 msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"

1855

1850 -#: wt-status.c:1030

1856 +#: wt-status.c:1046

1857 msgid " (use \"git rebase --skip\" to skip this patch)"

1858 msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"

1859

1854 -#: wt-status.c:1032

1860 +#: wt-status.c:1048

1861 msgid " (use \"git rebase --abort\" to check out the original branch)"

1862 msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"

1863

1858 -#: wt-status.c:1045

1864 +#: wt-status.c:1061

1865 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1866 msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"

1867

1862 -#: wt-status.c:1049

1868 +#: wt-status.c:1065

1869 #, c-format

1870 msgid ""

1871 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -1867,120 +1873,120 @@ msgstr ""

1873 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "

1874 "de la branche '%s' sur '%s'."

1875

1870 -#: wt-status.c:1054

1876 +#: wt-status.c:1070

1877 msgid "You are currently splitting a commit during a rebase."

1878 msgstr ""

1879 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."

1880

1875 -#: wt-status.c:1057

1881 +#: wt-status.c:1073

1882 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1883 msgstr ""

1884 " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"

1885

1880 -#: wt-status.c:1061

1886 +#: wt-status.c:1077

1887 #, c-format

1888 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1889 msgstr ""

1890 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "

1891 "branche '%s' sur '%s'."

1892

1887 -#: wt-status.c:1066

1893 +#: wt-status.c:1082

1894 msgid "You are currently editing a commit during a rebase."

1895 msgstr ""

1896 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."

1897

1892 -#: wt-status.c:1069

1898 +#: wt-status.c:1085

1899 msgid " (use \"git commit --amend\" to amend the current commit)"

1900 msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"

1901

1896 -#: wt-status.c:1071

1902 +#: wt-status.c:1087

1903 msgid ""

1904 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1905 msgstr ""

1906 " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos "

1907 "modifications)"

1908

1903 -#: wt-status.c:1081

1909 +#: wt-status.c:1097

1910 #, c-format

1911 msgid "You are currently cherry-picking commit %s."

1912 msgstr "Vous êtes actuellement en train de picorer le commit %s."

1913

1908 -#: wt-status.c:1086

1914 +#: wt-status.c:1102

1915 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1916 msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"

1917

1912 -#: wt-status.c:1089

1918 +#: wt-status.c:1105

1919 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1920 msgstr ""

1921 " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"

1922

1917 -#: wt-status.c:1091

1923 +#: wt-status.c:1107

1924 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1925 msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"

1926

1921 -#: wt-status.c:1100

1927 +#: wt-status.c:1116

1928 #, c-format

1929 msgid "You are currently reverting commit %s."

1930 msgstr "Vous êtes actuellement en train de rétablir le commit %s."

1931

1926 -#: wt-status.c:1105

1932 +#: wt-status.c:1121

1933 msgid " (fix conflicts and run \"git revert --continue\")"

1934 msgstr " (réglez les conflits puis lancez \"git revert --continue\")"

1935

1930 -#: wt-status.c:1108

1936 +#: wt-status.c:1124

1937 msgid " (all conflicts fixed: run \"git revert --continue\")"

1938 msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"

1939

1934 -#: wt-status.c:1110

1940 +#: wt-status.c:1126

1941 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1942 msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"

1943

1938 -#: wt-status.c:1121

1944 +#: wt-status.c:1137

1945 #, c-format

1946 msgid "You are currently bisecting, started from branch '%s'."

1947 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."

1948

1943 -#: wt-status.c:1125

1949 +#: wt-status.c:1141

1950 msgid "You are currently bisecting."

1951 msgstr "Vous êtes en cours de bissection."

1952

1947 -#: wt-status.c:1128

1953 +#: wt-status.c:1144

1954 msgid " (use \"git bisect reset\" to get back to the original branch)"

1955 msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"

1956

1951 -#: wt-status.c:1303

1957 +#: wt-status.c:1321

1958 msgid "On branch "

1959 msgstr "Sur la branche "

1960

1955 -#: wt-status.c:1310

1961 +#: wt-status.c:1328

1962 msgid "rebase in progress; onto "

1963 msgstr "rebasage en cours ; sur "

1964

1959 -#: wt-status.c:1317

1965 +#: wt-status.c:1333

1966 msgid "HEAD detached at "

1967 msgstr "HEAD détachée sur "

1968

1963 -#: wt-status.c:1319

1969 +#: wt-status.c:1335

1970 msgid "HEAD detached from "

1971 msgstr "HEAD détachée depuis "

1972

1967 -#: wt-status.c:1322

1973 +#: wt-status.c:1338

1974 msgid "Not currently on any branch."

1975 msgstr "Actuellement sur aucun branche."

1976

1971 -#: wt-status.c:1339

1977 +#: wt-status.c:1355

1978 msgid "Initial commit"

1979 msgstr "Validation initiale"

1980

1975 -#: wt-status.c:1353

1981 +#: wt-status.c:1369

1982 msgid "Untracked files"

1983 msgstr "Fichiers non suivis"

1984

1979 -#: wt-status.c:1355

1985 +#: wt-status.c:1371

1986 msgid "Ignored files"

1987 msgstr "Fichiers ignorés"

1988

1983 -#: wt-status.c:1359

1989 +#: wt-status.c:1375

1990 #, c-format

1991 msgid ""

1992 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1992,32 +1998,32 @@ msgstr ""

1998 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "

1999 "status')."

2000

1995 -#: wt-status.c:1365

2001 +#: wt-status.c:1381

2002 #, c-format

2003 msgid "Untracked files not listed%s"

2004 msgstr "Fichiers non suivis non affichés%s"

2005

2000 -#: wt-status.c:1367

2006 +#: wt-status.c:1383

2007 msgid " (use -u option to show untracked files)"

2008 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

2009

2004 -#: wt-status.c:1373

2010 +#: wt-status.c:1389

2011 msgid "No changes"

2012 msgstr "Aucune modification"

2013

2008 -#: wt-status.c:1378

2014 +#: wt-status.c:1394

2015 #, c-format

2016 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

2017 msgstr ""

2018 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

2019 "\"git commit -a\")\n"

2020

2015 -#: wt-status.c:1381

2021 +#: wt-status.c:1397

2022 #, c-format

2023 msgid "no changes added to commit\n"

2024 msgstr "aucune modification ajoutée à la validation\n"

2025

2020 -#: wt-status.c:1384

2026 +#: wt-status.c:1400

2027 #, c-format

2028 msgid ""

2029 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -2026,49 +2032,49 @@ msgstr ""

2032 "aucune modification ajoutée à la validation mais des fichiers non suivis "

2033 "sont présents (utilisez \"git add\" pour les suivre)\n"

2034

2029 -#: wt-status.c:1387

2035 +#: wt-status.c:1403

2036 #, c-format

2037 msgid "nothing added to commit but untracked files present\n"

2038 msgstr ""

2039 "aucune modification ajoutée à la validation mais des fichiers non suivis "

2040 "sont présents\n"

2041

2036 -#: wt-status.c:1390

2042 +#: wt-status.c:1406

2043 #, c-format

2044 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2045 msgstr ""

2046 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

2047 "suivre)\n"

2048

2043 -#: wt-status.c:1393 wt-status.c:1398

2049 +#: wt-status.c:1409 wt-status.c:1414

2050 #, c-format

2051 msgid "nothing to commit\n"

2052 msgstr "rien à valider\n"

2053

2048 -#: wt-status.c:1396

2054 +#: wt-status.c:1412

2055 #, c-format

2056 msgid "nothing to commit (use -u to show untracked files)\n"

2057 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

2058

2053 -#: wt-status.c:1400

2059 +#: wt-status.c:1416

2060 #, c-format

2061 msgid "nothing to commit, working directory clean\n"

2062 msgstr "rien à valider, la copie de travail est propre\n"

2063

2058 -#: wt-status.c:1509

2064 +#: wt-status.c:1525

2065 msgid "HEAD (no branch)"

2066 msgstr "HEAD (aucune branche)"

2067

2062 -#: wt-status.c:1515

2068 +#: wt-status.c:1531

2069 msgid "Initial commit on "

2070 msgstr "Validation initiale sur "

2071

2072 # à priori on parle d'une branche ici

2067 -#: wt-status.c:1547

2073 +#: wt-status.c:1563

2074 msgid "gone"

2075 msgstr "disparue"

2076

2071 -#: wt-status.c:1549 wt-status.c:1557

2077 +#: wt-status.c:1565 wt-status.c:1573

2078 msgid "behind "

2079 msgstr "derrière "

2080

@@ -2078,8 +2084,8 @@ msgid "failed to unlink '%s'"

2084 msgstr "échec lors de l'unlink de '%s'"

2085

2086 #: builtin/add.c:22

2081 -msgid "git add [options] [--] <pathspec>..."

2082 -msgstr "git add [options] [--] <chemin>..."

2087 +msgid "git add [<options>] [--] <pathspec>..."

2088 +msgstr "git add [<options>] [--] <chemin>..."

2089

2090 #: builtin/add.c:65

2091 #, c-format

@@ -2131,14 +2137,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2137 msgstr ""

2138 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

2139

2134 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2135 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372

2140 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

2141 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

2142 #: builtin/rm.c:269

2143 msgid "dry run"

2144 msgstr "simuler l'action"

2145

2140 -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2141 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

2146 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19

2147 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608

2148 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2149 msgid "be verbose"

2150 msgstr "mode verbeux"

@@ -2218,82 +2224,82 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"

2224 msgid "Maybe you wanted to say 'git add .'?\n"

2225 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

2226

2221 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2227 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2228 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2229 msgid "index file corrupt"

2230 msgstr "fichier d'index corrompu"

2231

2226 -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2232 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431

2233 msgid "Unable to write new index file"

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

2235

2230 -#: builtin/apply.c:58

2231 -msgid "git apply [options] [<patch>...]"

2232 -msgstr "git apply [options] [<patch>...]"

2236 +#: builtin/apply.c:59

2237 +msgid "git apply [<options>] [<patch>...]"

2238 +msgstr "git apply [<options>] [<patch>...]"

2239

2234 -#: builtin/apply.c:111

2240 +#: builtin/apply.c:112

2241 #, c-format

2242 msgid "unrecognized whitespace option '%s'"

2243 msgstr "option d'espace non reconnue '%s'"

2244

2239 -#: builtin/apply.c:126

2245 +#: builtin/apply.c:127

2246 #, c-format

2247 msgid "unrecognized whitespace ignore option '%s'"

2248 msgstr "option d'ignorance d'espace non reconnue '%s'"

2249

2244 -#: builtin/apply.c:826

2250 +#: builtin/apply.c:822

2251 #, c-format

2252 msgid "Cannot prepare timestamp regexp %s"

2253 msgstr "Impossible de préparer la regexp d'horodatage %s"

2254

2249 -#: builtin/apply.c:835

2255 +#: builtin/apply.c:831

2256 #, c-format

2257 msgid "regexec returned %d for input: %s"

2258 msgstr "regexec a retourné %d pour l'entrée : %s"

2259

2254 -#: builtin/apply.c:916

2260 +#: builtin/apply.c:912

2261 #, c-format

2262 msgid "unable to find filename in patch at line %d"

2263 msgstr "nom de fichier du patch introuvable à la ligne %d"

2264

2259 -#: builtin/apply.c:948

2265 +#: builtin/apply.c:944

2266 #, c-format

2267 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

2268 msgstr ""

2269 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "

2270 "ligne %d"

2271

2266 -#: builtin/apply.c:952

2272 +#: builtin/apply.c:948

2273 #, c-format

2274 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

2275 msgstr ""

2276 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "

2277 "à la ligne %d"

2278

2273 -#: builtin/apply.c:953

2279 +#: builtin/apply.c:949

2280 #, c-format

2281 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

2282 msgstr ""

2283 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "

2284 "à la ligne %d"

2285

2280 -#: builtin/apply.c:960

2286 +#: builtin/apply.c:956

2287 #, c-format

2288 msgid "git apply: bad git-diff - expected /dev/null on line %d"

2289 msgstr ""

2290 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"

2291

2286 -#: builtin/apply.c:1423

2292 +#: builtin/apply.c:1419

2293 #, c-format

2294 msgid "recount: unexpected line: %.*s"

2295 msgstr "recomptage : ligne inattendue : %.*s"

2296

2291 -#: builtin/apply.c:1480

2297 +#: builtin/apply.c:1476

2298 #, c-format

2299 msgid "patch fragment without header at line %d: %.*s"

2300 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"

2301

2296 -#: builtin/apply.c:1497

2302 +#: builtin/apply.c:1493

2303 #, c-format

2304 msgid ""

2305 "git diff header lacks filename information when removing %d leading pathname "

@@ -2308,77 +2314,77 @@ msgstr[1] ""

2314 "information de nom de fichier manquante dans l'en-tête de git diff lors de "

2315 "la suppression de %d composants de préfixe de chemin (ligne %d)"

2316

2311 -#: builtin/apply.c:1657

2317 +#: builtin/apply.c:1656

2318 msgid "new file depends on old contents"

2319 msgstr "le nouveau fichier dépend de contenus anciens"

2320

2315 -#: builtin/apply.c:1659

2321 +#: builtin/apply.c:1658

2322 msgid "deleted file still has contents"

2323 msgstr "le fichier supprimé a encore du contenu"

2324

2319 -#: builtin/apply.c:1685

2325 +#: builtin/apply.c:1684

2326 #, c-format

2327 msgid "corrupt patch at line %d"

2328 msgstr "patch corrompu à la ligne %d"

2329

2324 -#: builtin/apply.c:1721

2330 +#: builtin/apply.c:1720

2331 #, c-format

2332 msgid "new file %s depends on old contents"

2333 msgstr "le nouveau fichier %s dépend de contenus anciens"

2334

2329 -#: builtin/apply.c:1723

2335 +#: builtin/apply.c:1722

2336 #, c-format

2337 msgid "deleted file %s still has contents"

2338 msgstr "le fichier supprimé %s a encore du contenu"

2339

2334 -#: builtin/apply.c:1726

2340 +#: builtin/apply.c:1725

2341 #, c-format

2342 msgid "** warning: file %s becomes empty but is not deleted"

2343 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"

2344

2339 -#: builtin/apply.c:1872

2345 +#: builtin/apply.c:1871

2346 #, c-format

2347 msgid "corrupt binary patch at line %d: %.*s"

2348 msgstr "patch binaire corrompu à la ligne %d : %.*s"

2349

2344 -#: builtin/apply.c:1901

2350 +#: builtin/apply.c:1900

2351 #, c-format

2352 msgid "unrecognized binary patch at line %d"

2353 msgstr "patch binaire non reconnu à la ligne %d"

2354

2349 -#: builtin/apply.c:2052

2355 +#: builtin/apply.c:2051

2356 #, c-format

2357 msgid "patch with only garbage at line %d"

2358 msgstr "patch totalement incompréhensible à la ligne %d"

2359

2354 -#: builtin/apply.c:2142

2360 +#: builtin/apply.c:2141

2361 #, c-format

2362 msgid "unable to read symlink %s"

2363 msgstr "lecture du lien symbolique %s impossible"

2364

2359 -#: builtin/apply.c:2146

2365 +#: builtin/apply.c:2145

2366 #, c-format

2367 msgid "unable to open or read %s"

2368 msgstr "ouverture ou lecture de %s impossible"

2369

2364 -#: builtin/apply.c:2754

2370 +#: builtin/apply.c:2778

2371 #, c-format

2372 msgid "invalid start of line: '%c'"

2373 msgstr "début de ligne invalide : '%c'"

2374

2369 -#: builtin/apply.c:2872

2375 +#: builtin/apply.c:2896

2376 #, c-format

2377 msgid "Hunk #%d succeeded at %d (offset %d line)."

2378 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

2379 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."

2380 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."

2381

2376 -#: builtin/apply.c:2884

2382 +#: builtin/apply.c:2908

2383 #, c-format

2384 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

2385 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"

2386

2381 -#: builtin/apply.c:2890

2387 +#: builtin/apply.c:2914

2388 #, c-format

2389 msgid ""

2390 "while searching for:\n"

@@ -2387,328 +2393,347 @@ msgstr ""

2393 "pendant la recherche de :\n"

2394 "%.*s"

2395

2390 -#: builtin/apply.c:2909

2396 +#: builtin/apply.c:2933

2397 #, c-format

2398 msgid "missing binary patch data for '%s'"

2399 msgstr "données de patch binaire manquantes pour '%s'"

2400

2395 -#: builtin/apply.c:3010

2401 +#: builtin/apply.c:3034

2402 #, c-format

2403 msgid "binary patch does not apply to '%s'"

2404 msgstr "le patch binaire ne s'applique par correctement à '%s'"

2405

2400 -#: builtin/apply.c:3016

2406 +#: builtin/apply.c:3040

2407 #, c-format

2408 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

2409 msgstr ""

2410 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "

2411 "trouvé)"

2412

2407 -#: builtin/apply.c:3037

2413 +#: builtin/apply.c:3061

2414 #, c-format

2415 msgid "patch failed: %s:%ld"

2416 msgstr "le patch a échoué : %s:%ld"

2417

2412 -#: builtin/apply.c:3161

2418 +#: builtin/apply.c:3185

2419 #, c-format

2420 msgid "cannot checkout %s"

2421 msgstr "extraction de %s impossible"

2422

2417 -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2423 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286

2424 #, c-format

2425 msgid "read of %s failed"

2426 msgstr "échec de la lecture de %s"

2427

2422 -#: builtin/apply.c:3240 builtin/apply.c:3462

2428 +#: builtin/apply.c:3238

2429 +#, c-format

2430 +msgid "reading from '%s' beyond a symbolic link"

2431 +msgstr "lecture depuis '%s' au-delà d'un lien symbolique"

2432 +

2433 +#: builtin/apply.c:3266 builtin/apply.c:3488

2434 #, c-format

2435 msgid "path %s has been renamed/deleted"

2436 msgstr "le chemin %s a été renommé/supprimé"

2437

2427 -#: builtin/apply.c:3321 builtin/apply.c:3476

2438 +#: builtin/apply.c:3347 builtin/apply.c:3502

2439 #, c-format

2440 msgid "%s: does not exist in index"

2441 msgstr "%s : n'existe pas dans l'index"

2442

2432 -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2443 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516

2444 #, c-format

2445 msgid "%s: %s"

2446 msgstr "%s : %s"

2447

2437 -#: builtin/apply.c:3330 builtin/apply.c:3484

2448 +#: builtin/apply.c:3356 builtin/apply.c:3510

2449 #, c-format

2450 msgid "%s: does not match index"

2451 msgstr "%s : ne correspond pas à l'index"

2452

2442 -#: builtin/apply.c:3432

2453 +#: builtin/apply.c:3458

2454 msgid "removal patch leaves file contents"

2455 msgstr "le patch de suppression laisse un contenu dans le fichier"

2456

2446 -#: builtin/apply.c:3501

2457 +#: builtin/apply.c:3527

2458 #, c-format

2459 msgid "%s: wrong type"

2460 msgstr "%s : type erroné"

2461

2451 -#: builtin/apply.c:3503

2462 +#: builtin/apply.c:3529

2463 #, c-format

2464 msgid "%s has type %o, expected %o"

2465 msgstr "%s est de type %o, mais %o attendu"

2466

2456 -#: builtin/apply.c:3604

2467 +#: builtin/apply.c:3688 builtin/apply.c:3690

2468 +#, c-format

2469 +msgid "invalid path '%s'"

2470 +msgstr "chemin invalide '%s'"

2471 +

2472 +#: builtin/apply.c:3745

2473 #, c-format

2474 msgid "%s: already exists in index"

2475 msgstr "%s : existe déjà dans l'index"

2476

2461 -#: builtin/apply.c:3607

2477 +#: builtin/apply.c:3748

2478 #, c-format

2479 msgid "%s: already exists in working directory"

2480 msgstr "%s : existe déjà dans la copie de travail"

2481

2466 -#: builtin/apply.c:3627

2482 +#: builtin/apply.c:3768

2483 #, c-format

2484 msgid "new mode (%o) of %s does not match old mode (%o)"

2485 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"

2486

2471 -#: builtin/apply.c:3632

2487 +#: builtin/apply.c:3773

2488 #, c-format

2489 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

2490 msgstr ""

2491 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"

2492

2477 -#: builtin/apply.c:3640

2493 +#: builtin/apply.c:3793

2494 +#, c-format

2495 +msgid "affected file '%s' is beyond a symbolic link"

2496 +msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"

2497 +

2498 +#: builtin/apply.c:3797

2499 #, c-format

2500 msgid "%s: patch does not apply"

2501 msgstr "%s : le patch ne s'applique pas"

2502

2482 -#: builtin/apply.c:3653

2503 +#: builtin/apply.c:3811

2504 #, c-format

2505 msgid "Checking patch %s..."

2506 msgstr "Vérification du patch %s..."

2507

2487 -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2508 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135

2509 #, c-format

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

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

2512

2492 -#: builtin/apply.c:3889

2513 +#: builtin/apply.c:4047

2514 #, c-format

2515 msgid "unable to remove %s from index"

2516 msgstr "suppression de %s dans l'index impossible"

2517

2497 -#: builtin/apply.c:3918

2518 +#: builtin/apply.c:4076

2519 #, c-format

2520 msgid "corrupt patch for submodule %s"

2521 msgstr "patch corrompu pour le sous-module %s"

2522

2502 -#: builtin/apply.c:3922

2523 +#: builtin/apply.c:4080

2524 #, c-format

2525 msgid "unable to stat newly created file '%s'"

2526 msgstr "stat du fichier nouvellement créé '%s' impossible"

2527

2507 -#: builtin/apply.c:3927

2528 +#: builtin/apply.c:4085

2529 #, c-format

2530 msgid "unable to create backing store for newly created file %s"

2531 msgstr ""

2532 "création du magasin de stockage pour le fichier nouvellement créé %s "

2533 "impossible"

2534

2514 -#: builtin/apply.c:3930 builtin/apply.c:4038

2535 +#: builtin/apply.c:4088 builtin/apply.c:4196

2536 #, c-format

2537 msgid "unable to add cache entry for %s"

2538 msgstr "ajout de l'élément de cache %s impossible"

2539

2519 -#: builtin/apply.c:3963

2540 +#: builtin/apply.c:4121

2541 #, c-format

2542 msgid "closing file '%s'"

2543 msgstr "fermeture du fichier '%s'"

2544

2524 -#: builtin/apply.c:4012

2545 +#: builtin/apply.c:4170

2546 #, c-format

2547 msgid "unable to write file '%s' mode %o"

2548 msgstr "écriture du fichier '%s' mode %o impossible"

2549

2529 -#: builtin/apply.c:4099

2550 +#: builtin/apply.c:4257

2551 #, c-format

2552 msgid "Applied patch %s cleanly."

2553 msgstr "Patch %s appliqué proprement."

2554

2534 -#: builtin/apply.c:4107

2555 +#: builtin/apply.c:4265

2556 msgid "internal error"

2557 msgstr "erreur interne"

2558

2538 -#: builtin/apply.c:4110

2559 +#: builtin/apply.c:4268

2560 #, c-format

2561 msgid "Applying patch %%s with %d reject..."

2562 msgid_plural "Applying patch %%s with %d rejects..."

2563 msgstr[0] "Application du patch %%s avec %d rejet..."

2564 msgstr[1] "Application du patch %%s avec %d rejets..."

2565

2545 -#: builtin/apply.c:4120

2566 +#: builtin/apply.c:4278

2567 #, c-format

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

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

2570

2550 -#: builtin/apply.c:4141

2571 +#: builtin/apply.c:4299

2572 #, c-format

2573 msgid "Hunk #%d applied cleanly."

2574 msgstr "Section n°%d appliquée proprement."

2575

2555 -#: builtin/apply.c:4144

2576 +#: builtin/apply.c:4302

2577 #, c-format

2578 msgid "Rejected hunk #%d."

2579 msgstr "Section n°%d rejetée."

2580

2560 -#: builtin/apply.c:4234

2581 +#: builtin/apply.c:4392

2582 msgid "unrecognized input"

2583 msgstr "entrée non reconnue"

2584

2564 -#: builtin/apply.c:4245

2585 +#: builtin/apply.c:4403

2586 msgid "unable to read index file"

2587 msgstr "lecture du fichier d'index impossible"

2588

2568 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2569 -#: builtin/fetch.c:93

2589 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92

2590 +#: builtin/fetch.c:92

2591 msgid "path"

2592 msgstr "chemin"

2593

2573 -#: builtin/apply.c:4363

2594 +#: builtin/apply.c:4521

2595 msgid "don't apply changes matching the given path"

2596 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

2597

2577 -#: builtin/apply.c:4366

2598 +#: builtin/apply.c:4524

2599 msgid "apply changes matching the given path"

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

2601

2581 -#: builtin/apply.c:4368

2602 +#: builtin/apply.c:4526

2603 msgid "num"

2604 msgstr "num"

2605

2585 -#: builtin/apply.c:4369

2606 +#: builtin/apply.c:4527

2607 msgid "remove <num> leading slashes from traditional diff paths"

2608 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"

2609

2589 -#: builtin/apply.c:4372

2610 +#: builtin/apply.c:4530

2611 msgid "ignore additions made by the patch"

2612 msgstr "ignorer les additions réalisées par le patch"

2613

2593 -#: builtin/apply.c:4374

2614 +#: builtin/apply.c:4532

2615 msgid "instead of applying the patch, output diffstat for the input"

2616 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"

2617

2597 -#: builtin/apply.c:4378

2618 +#: builtin/apply.c:4536

2619 msgid "show number of added and deleted lines in decimal notation"

2620 msgstr ""

2621 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"

2622

2602 -#: builtin/apply.c:4380

2623 +#: builtin/apply.c:4538

2624 msgid "instead of applying the patch, output a summary for the input"

2625 msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"

2626

2606 -#: builtin/apply.c:4382

2627 +#: builtin/apply.c:4540

2628 msgid "instead of applying the patch, see if the patch is applicable"

2629 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"

2630

2610 -#: builtin/apply.c:4384

2631 +#: builtin/apply.c:4542

2632 msgid "make sure the patch is applicable to the current index"

2633 msgstr "s'assurer que le patch est applicable sur l'index actuel"

2634

2614 -#: builtin/apply.c:4386

2635 +#: builtin/apply.c:4544

2636 msgid "apply a patch without touching the working tree"

2637 msgstr "appliquer les patch sans toucher à la copie de travail"

2638

2618 -#: builtin/apply.c:4388

2639 +#: builtin/apply.c:4546

2640 +msgid "accept a patch that touches outside the working area"

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

2642 +

2643 +#: builtin/apply.c:4548

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

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

2646

2622 -#: builtin/apply.c:4390

2647 +#: builtin/apply.c:4550

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

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

2650

2626 -#: builtin/apply.c:4392

2651 +#: builtin/apply.c:4552

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

2653 msgstr ""

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

2655

2631 -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2656 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412

2657 msgid "paths are separated with NUL character"

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

2659

2635 -#: builtin/apply.c:4397

2660 +#: builtin/apply.c:4557

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

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

2663

2639 -#: builtin/apply.c:4398

2664 +#: builtin/apply.c:4558

2665 msgid "action"

2666 msgstr "action"

2667

2643 -#: builtin/apply.c:4399

2668 +#: builtin/apply.c:4559

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

2670 msgstr ""

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

2672 "d'espace"

2673

2649 -#: builtin/apply.c:4402 builtin/apply.c:4405

2674 +#: builtin/apply.c:4562 builtin/apply.c:4565

2675 msgid "ignore changes in whitespace when finding context"

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

2677

2653 -#: builtin/apply.c:4408

2678 +#: builtin/apply.c:4568

2679 msgid "apply the patch in reverse"

2680 msgstr "appliquer le patch en sens inverse"

2681

2657 -#: builtin/apply.c:4410

2682 +#: builtin/apply.c:4570

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

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

2685

2661 -#: builtin/apply.c:4412

2686 +#: builtin/apply.c:4572

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

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

2689

2665 -#: builtin/apply.c:4414

2690 +#: builtin/apply.c:4574

2691 msgid "allow overlapping hunks"

2692 msgstr "accepter les recouvrements de sections"

2693

2669 -#: builtin/apply.c:4417

2694 +#: builtin/apply.c:4577

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

2696 msgstr ""

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

2698 "fichier"

2699

2675 -#: builtin/apply.c:4420

2700 +#: builtin/apply.c:4580

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

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

2703

2679 -#: builtin/apply.c:4422

2704 +#: builtin/apply.c:4582

2705 msgid "root"

2706 msgstr "racine"

2707

2683 -#: builtin/apply.c:4423

2708 +#: builtin/apply.c:4583

2709 msgid "prepend <root> to all filenames"

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

2711

2687 -#: builtin/apply.c:4445

2712 +#: builtin/apply.c:4605

2713 msgid "--3way outside a repository"

2714 msgstr "--3way hors d'un dépôt"

2715

2691 -#: builtin/apply.c:4453

2716 +#: builtin/apply.c:4613

2717 msgid "--index outside a repository"

2718 msgstr "--index hors d'un dépôt"

2719

2695 -#: builtin/apply.c:4456

2720 +#: builtin/apply.c:4616

2721 msgid "--cached outside a repository"

2722 msgstr "--cached hors d'un dépôt"

2723

2699 -#: builtin/apply.c:4472

2724 +#: builtin/apply.c:4635

2725 #, c-format

2726 msgid "can't open patch '%s'"

2727 msgstr "ouverture impossible du patch '%s'"

2728

2704 -#: builtin/apply.c:4486

2729 +#: builtin/apply.c:4649

2730 #, c-format

2731 msgid "squelched %d whitespace error"

2732 msgid_plural "squelched %d whitespace errors"

2733 msgstr[0] "%d erreur d'espace ignorée"

2734 msgstr[1] "%d erreurs d'espace ignorées"

2735

2711 -#: builtin/apply.c:4492 builtin/apply.c:4502

2736 +#: builtin/apply.c:4655 builtin/apply.c:4665

2737 #, c-format

2738 msgid "%d line adds whitespace errors."

2739 msgid_plural "%d lines add whitespace errors."

@@ -2763,107 +2788,107 @@ msgid "update BISECT_HEAD instead of checking out the current commit"

2788 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"

2789

2790 #: builtin/blame.c:30

2766 -msgid "git blame [options] [rev-opts] [rev] [--] file"

2767 -msgstr "git blame [options] [options-de-révision] [rev] [--] fichier"

2791 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2792 +msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] fichier"

2793

2794 #: builtin/blame.c:35

2770 -msgid "[rev-opts] are documented in git-rev-list(1)"

2771 -msgstr "[options-de-révision] sont documentés dans git-rev-list(1)"

2795 +msgid "<rev-opts> are documented in git-rev-list(1)"

2796 +msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

2797

2773 -#: builtin/blame.c:2501

2798 +#: builtin/blame.c:2500

2799 msgid "Show blame entries as we find them, incrementally"

2800 msgstr ""

2801 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

2802 "manière incrémentale"

2803

2779 -#: builtin/blame.c:2502

2804 +#: builtin/blame.c:2501

2805 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2806 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

2807

2783 -#: builtin/blame.c:2503

2808 +#: builtin/blame.c:2502

2809 msgid "Do not treat root commits as boundaries (Default: off)"

2810 msgstr ""

2811 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

2812

2788 -#: builtin/blame.c:2504

2813 +#: builtin/blame.c:2503

2814 msgid "Show work cost statistics"

2815 msgstr "Montrer les statistiques de coût d'activité"

2816

2792 -#: builtin/blame.c:2505

2817 +#: builtin/blame.c:2504

2818 msgid "Show output score for blame entries"

2819 msgstr "Montrer le score de sortie pour les éléments de blâme"

2820

2796 -#: builtin/blame.c:2506

2821 +#: builtin/blame.c:2505

2822 msgid "Show original filename (Default: auto)"

2823 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

2824

2800 -#: builtin/blame.c:2507

2825 +#: builtin/blame.c:2506

2826 msgid "Show original linenumber (Default: off)"

2827 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

2828

2804 -#: builtin/blame.c:2508

2829 +#: builtin/blame.c:2507

2830 msgid "Show in a format designed for machine consumption"

2831 msgstr "Afficher dans un format propice à la consommation par machine"

2832

2808 -#: builtin/blame.c:2509

2833 +#: builtin/blame.c:2508

2834 msgid "Show porcelain format with per-line commit information"

2835 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

2836

2812 -#: builtin/blame.c:2510

2837 +#: builtin/blame.c:2509

2838 msgid "Use the same output mode as git-annotate (Default: off)"

2839 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

2840

2816 -#: builtin/blame.c:2511

2841 +#: builtin/blame.c:2510

2842 msgid "Show raw timestamp (Default: off)"

2843 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

2844

2820 -#: builtin/blame.c:2512

2845 +#: builtin/blame.c:2511

2846 msgid "Show long commit SHA1 (Default: off)"

2847 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

2848

2824 -#: builtin/blame.c:2513

2849 +#: builtin/blame.c:2512

2850 msgid "Suppress author name and timestamp (Default: off)"

2851 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

2852

2828 -#: builtin/blame.c:2514

2853 +#: builtin/blame.c:2513

2854 msgid "Show author email instead of name (Default: off)"

2855 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

2856

2832 -#: builtin/blame.c:2515

2857 +#: builtin/blame.c:2514

2858 msgid "Ignore whitespace differences"

2859 msgstr "Ignorer les différences d'espace"

2860

2836 -#: builtin/blame.c:2516

2861 +#: builtin/blame.c:2515

2862 msgid "Spend extra cycles to find better match"

2863 msgstr ""

2864 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

2865

2841 -#: builtin/blame.c:2517

2866 +#: builtin/blame.c:2516

2867 msgid "Use revisions from <file> instead of calling git-rev-list"

2868 msgstr ""

2869 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

2870

2846 -#: builtin/blame.c:2518

2871 +#: builtin/blame.c:2517

2872 msgid "Use <file>'s contents as the final image"

2873 msgstr "Utiliser le contenu de <fichier> comme image finale"

2874

2850 -#: builtin/blame.c:2519 builtin/blame.c:2520

2875 +#: builtin/blame.c:2518 builtin/blame.c:2519

2876 msgid "score"

2877 msgstr "score"

2878

2854 -#: builtin/blame.c:2519

2879 +#: builtin/blame.c:2518

2880 msgid "Find line copies within and across files"

2881 msgstr "Trouver les copies de ligne dans et entre les fichiers"

2882

2858 -#: builtin/blame.c:2520

2883 +#: builtin/blame.c:2519

2884 msgid "Find line movements within and across files"

2885 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

2886

2862 -#: builtin/blame.c:2521

2887 +#: builtin/blame.c:2520

2888 msgid "n,m"

2889 msgstr "n,m"

2890

2866 -#: builtin/blame.c:2521

2891 +#: builtin/blame.c:2520

2892 msgid "Process only line range n,m, counting from 1"

2893 msgstr ""

2894 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

@@ -2874,25 +2899,25 @@ msgstr ""

2899 #. takes 22 places, is the longest among various forms of

2900 #. relative timestamps, but your language may need more or

2901 #. fewer display columns.

2877 -#: builtin/blame.c:2602

2902 +#: builtin/blame.c:2601

2903 msgid "4 years, 11 months ago"

2904 msgstr "il y a 10 ans et 11 mois"

2905

2906 #: builtin/branch.c:24

2882 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2883 -msgstr "git branch [options] [-r | -a] [--merged | --no-merged]"

2907 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

2908 +msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"

2909

2910 #: builtin/branch.c:25

2886 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2887 -msgstr "git branch [options] [-l] [-f] <nomdebranche> [<point-de-départ>]"

2911 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

2912 +msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"

2913

2914 #: builtin/branch.c:26

2890 -msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2891 -msgstr "git branch [options] [-r] (-d | -D) <nomdebranche>..."

2915 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

2916 +msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."

2917

2918 #: builtin/branch.c:27

2894 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2895 -msgstr "git branch [options] (-m | -M) [<anciennebranche>] <nouvellebranche>"

2919 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2920 +msgstr "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"

2921

2922 #: builtin/branch.c:152

2923 #, c-format

@@ -3033,197 +3058,202 @@ msgstr "(aucune branche, rebasage de %s)"

3058 msgid "(no branch, bisect started on %s)"

3059 msgstr "(aucune branche, bisect a démarré sur %s)"

3060

3036 -#: builtin/branch.c:593

3061 +#: builtin/branch.c:596

3062 #, c-format

3038 -msgid "(detached from %s)"

3039 -msgstr "(détaché de %s)"

3063 +msgid "(HEAD detached at %s)"

3064 +msgstr "(HEAD détachée sur %s)"

3065

3041 -#: builtin/branch.c:596

3066 +#: builtin/branch.c:599

3067 +#, c-format

3068 +msgid "(HEAD detached from %s)"

3069 +msgstr "(HEAD détachée depuis %s)"

3070 +

3071 +#: builtin/branch.c:603

3072 msgid "(no branch)"

3073 msgstr "(aucune branche)"

3074

3045 -#: builtin/branch.c:643

3075 +#: builtin/branch.c:650

3076 #, c-format

3077 msgid "object '%s' does not point to a commit"

3078 msgstr "l'objet '%s' ne pointe pas sur un commit"

3079

3050 -#: builtin/branch.c:691

3080 +#: builtin/branch.c:698

3081 msgid "some refs could not be read"

3082 msgstr "des références n'ont pas pu être lues"

3083

3054 -#: builtin/branch.c:704

3084 +#: builtin/branch.c:711

3085 msgid "cannot rename the current branch while not on any."

3086 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

3087

3058 -#: builtin/branch.c:714

3088 +#: builtin/branch.c:721

3089 #, c-format

3090 msgid "Invalid branch name: '%s'"

3091 msgstr "Nom de branche invalide : '%s'"

3092

3063 -#: builtin/branch.c:729

3093 +#: builtin/branch.c:736

3094 msgid "Branch rename failed"

3095 msgstr "Échec de renommage de la branche"

3096

3067 -#: builtin/branch.c:733

3097 +#: builtin/branch.c:740

3098 #, c-format

3099 msgid "Renamed a misnamed branch '%s' away"

3100 msgstr "Renommage d'un branche mal nommée '%s'"

3101

3072 -#: builtin/branch.c:737

3102 +#: builtin/branch.c:744

3103 #, c-format

3104 msgid "Branch renamed to %s, but HEAD is not updated!"

3105 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

3106

3077 -#: builtin/branch.c:744

3107 +#: builtin/branch.c:751

3108 msgid "Branch is renamed, but update of config-file failed"

3109 msgstr ""

3110 "La branche est renommée, mais la mise à jour du fichier de configuration a "

3111 "échoué"

3112

3083 -#: builtin/branch.c:759

3113 +#: builtin/branch.c:766

3114 #, c-format

3115 msgid "malformed object name %s"

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

3117

3088 -#: builtin/branch.c:783

3118 +#: builtin/branch.c:790

3119 #, c-format

3120 msgid "could not write branch description template: %s"

3121 msgstr "impossible d'écrire le modèle de description de branche : %s"

3122

3093 -#: builtin/branch.c:813

3123 +#: builtin/branch.c:820

3124 msgid "Generic options"

3125 msgstr "Options génériques"

3126

3097 -#: builtin/branch.c:815

3127 +#: builtin/branch.c:822

3128 msgid "show hash and subject, give twice for upstream branch"

3129 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

3130

3101 -#: builtin/branch.c:816

3131 +#: builtin/branch.c:823

3132 msgid "suppress informational messages"

3133 msgstr "supprimer les messages d'information"

3134

3105 -#: builtin/branch.c:817

3135 +#: builtin/branch.c:824

3136 msgid "set up tracking mode (see git-pull(1))"

3137 msgstr "régler le mode de suivi (voir git-pull(1))"

3138

3109 -#: builtin/branch.c:819

3139 +#: builtin/branch.c:826

3140 msgid "change upstream info"

3141 msgstr "modifier l'information amont"

3142

3113 -#: builtin/branch.c:823

3143 +#: builtin/branch.c:830

3144 msgid "use colored output"

3145 msgstr "utiliser la coloration dans la sortie"

3146

3117 -#: builtin/branch.c:824

3147 +#: builtin/branch.c:831

3148 msgid "act on remote-tracking branches"

3149 msgstr "agir sur les branches de suivi distantes"

3150

3121 -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

3122 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

3123 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

3151 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

3152 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581

3153 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616

3154 #: builtin/tag.c:622

3155 msgid "commit"

3156 msgstr "commit"

3157

3128 -#: builtin/branch.c:828 builtin/branch.c:834

3158 +#: builtin/branch.c:835 builtin/branch.c:841

3159 msgid "print only branches that contain the commit"

3160 msgstr "afficher seulement les branches qui contiennent le commit"

3161

3132 -#: builtin/branch.c:840

3162 +#: builtin/branch.c:847

3163 msgid "Specific git-branch actions:"

3164 msgstr "Actions spécifiques à git-branch :"

3165

3136 -#: builtin/branch.c:841

3166 +#: builtin/branch.c:848

3167 msgid "list both remote-tracking and local branches"

3168 msgstr "afficher à la fois les branches de suivi et les branches locales"

3169

3140 -#: builtin/branch.c:843

3170 +#: builtin/branch.c:850

3171 msgid "delete fully merged branch"

3172 msgstr "supprimer une branche totalement fusionnée"

3173

3144 -#: builtin/branch.c:844

3174 +#: builtin/branch.c:851

3175 msgid "delete branch (even if not merged)"

3176 msgstr "supprimer une branche (même non fusionnée)"

3177

3148 -#: builtin/branch.c:845

3178 +#: builtin/branch.c:852

3179 msgid "move/rename a branch and its reflog"

3180 msgstr "déplacer/renommer une branche et son reflog"

3181

3152 -#: builtin/branch.c:846

3182 +#: builtin/branch.c:853

3183 msgid "move/rename a branch, even if target exists"

3184 msgstr "déplacer/renommer une branche, même si la cible existe"

3185

3156 -#: builtin/branch.c:847

3186 +#: builtin/branch.c:854

3187 msgid "list branch names"

3188 msgstr "afficher les noms des branches"

3189

3160 -#: builtin/branch.c:848

3190 +#: builtin/branch.c:855

3191 msgid "create the branch's reflog"

3192 msgstr "créer le reflog de la branche"

3193

3164 -#: builtin/branch.c:850

3194 +#: builtin/branch.c:857

3195 msgid "edit the description for the branch"

3196 msgstr "éditer la description de la branche"

3197

3168 -#: builtin/branch.c:851

3198 +#: builtin/branch.c:858

3199 msgid "force creation, move/rename, deletion"

3200 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

3201

3172 -#: builtin/branch.c:854

3202 +#: builtin/branch.c:861

3203 msgid "print only not merged branches"

3204 msgstr "afficher seulement les branches non fusionnées"

3205

3176 -#: builtin/branch.c:860

3206 +#: builtin/branch.c:867

3207 msgid "print only merged branches"

3208 msgstr "afficher seulement les branches fusionnées"

3209

3180 -#: builtin/branch.c:864

3210 +#: builtin/branch.c:871

3211 msgid "list branches in columns"

3212 msgstr "afficher les branches en colonnes"

3213

3184 -#: builtin/branch.c:877

3214 +#: builtin/branch.c:884

3215 msgid "Failed to resolve HEAD as a valid ref."

3216 msgstr "Échec de résolution de HEAD comme référence valide."

3217

3188 -#: builtin/branch.c:881 builtin/clone.c:637

3218 +#: builtin/branch.c:888 builtin/clone.c:637

3219 msgid "HEAD not found below refs/heads!"

3220 msgstr "HEAD non trouvée sous refs/heads !"

3221

3192 -#: builtin/branch.c:903

3222 +#: builtin/branch.c:910

3223 msgid "--column and --verbose are incompatible"

3224 msgstr "--column et --verbose sont incompatibles"

3225

3196 -#: builtin/branch.c:914 builtin/branch.c:953

3226 +#: builtin/branch.c:921 builtin/branch.c:960

3227 msgid "branch name required"

3228 msgstr "le nom de branche est requis"

3229

3200 -#: builtin/branch.c:929

3230 +#: builtin/branch.c:936

3231 msgid "Cannot give description to detached HEAD"

3232 msgstr "Impossible de décrire une HEAD détachée"

3233

3204 -#: builtin/branch.c:934

3234 +#: builtin/branch.c:941

3235 msgid "cannot edit description of more than one branch"

3236 msgstr "impossible d'éditer la description de plus d'une branche"

3237

3208 -#: builtin/branch.c:941

3238 +#: builtin/branch.c:948

3239 #, c-format

3240 msgid "No commit on branch '%s' yet."

3241 msgstr "Aucun commit sur la branche '%s'."

3242

3213 -#: builtin/branch.c:944

3243 +#: builtin/branch.c:951

3244 #, c-format

3245 msgid "No branch named '%s'."

3246 msgstr "Aucune branche nommée '%s'."

3247

3218 -#: builtin/branch.c:959

3248 +#: builtin/branch.c:966

3249 msgid "too many branches for a rename operation"

3250 msgstr "trop de branches pour une opération de renommage"

3251

3222 -#: builtin/branch.c:964

3252 +#: builtin/branch.c:971

3253 msgid "too many branches to set new upstream"

3254 msgstr "trop de branches pour spécifier une branche amont"

3255

3226 -#: builtin/branch.c:968

3256 +#: builtin/branch.c:975

3257 #, c-format

3258 msgid ""

3259 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -3231,41 +3261,41 @@ msgstr ""

3261 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

3262 "aucune branche."

3263

3234 -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

3264 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3265 #, c-format

3266 msgid "no such branch '%s'"

3267 msgstr "pas de branche '%s'"

3268

3239 -#: builtin/branch.c:975

3269 +#: builtin/branch.c:982

3270 #, c-format

3271 msgid "branch '%s' does not exist"

3272 msgstr "la branche '%s' n'existe pas"

3273

3244 -#: builtin/branch.c:987

3274 +#: builtin/branch.c:994

3275 msgid "too many branches to unset upstream"

3276 msgstr "trop de branches pour désactiver un amont"

3277

3248 -#: builtin/branch.c:991

3278 +#: builtin/branch.c:998

3279 msgid "could not unset upstream of HEAD when it does not point to any branch."

3280 msgstr ""

3281 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

3282 "aucune branche."

3283

3254 -#: builtin/branch.c:997

3284 +#: builtin/branch.c:1004

3285 #, c-format

3286 msgid "Branch '%s' has no upstream information"

3287 msgstr "La branche '%s' n'a aucune information de branche amont"

3288

3259 -#: builtin/branch.c:1011

3289 +#: builtin/branch.c:1018

3290 msgid "it does not make sense to create 'HEAD' manually"

3291 msgstr "créer manuellement 'HEAD' n'a pas de sens"

3292

3263 -#: builtin/branch.c:1017

3293 +#: builtin/branch.c:1024

3294 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3295 msgstr ""

3296 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

3297

3268 -#: builtin/branch.c:1020

3298 +#: builtin/branch.c:1027

3299 #, c-format

3300 msgid ""

3301 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3274,7 +3304,7 @@ msgstr ""

3304 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

3305 "track ou --set-upstream-to\n"

3306

3277 -#: builtin/branch.c:1037

3307 +#: builtin/branch.c:1044

3308 #, c-format

3309 msgid ""

3310 "\n"

@@ -3285,12 +3315,12 @@ msgstr ""

3315 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

3316 "\n"

3317

3288 -#: builtin/branch.c:1038

3318 +#: builtin/branch.c:1045

3319 #, c-format

3320 msgid " git branch -d %s\n"

3321 msgstr " git branch -d %s\n"

3322

3293 -#: builtin/branch.c:1039

3323 +#: builtin/branch.c:1046

3324 #, c-format

3325 msgid " git branch --set-upstream-to %s\n"

3326 msgstr " git branch --set-upstream-to %s\n"

@@ -3308,55 +3338,54 @@ msgstr "La création d'un colis requiert un dépôt."

3338 msgid "Need a repository to unbundle."

3339 msgstr "Le dépaquetage d'un colis requiert un dépôt."

3340

3311 -#: builtin/cat-file.c:328

3312 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3313 -msgstr "git cat-file (-t|-s|-e|-p|<type>|--textconv) <objet>"

3341 +#: builtin/cat-file.c:326

3342 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"

3343 +msgstr "git cat-file (-t | -s | -e | -p | <type> | --textconv) <objet>"

3344

3315 -#: builtin/cat-file.c:329

3316 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3317 -msgstr "git cat-file (--batch|--batch-check) < <liste_d_objets>"

3345 +#: builtin/cat-file.c:327

3346 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3347 +msgstr "git cat-file (--batch | --batch-check) < <liste-d-objets>"

3348

3319 -#: builtin/cat-file.c:366

3349 +#: builtin/cat-file.c:364

3350 msgid "<type> can be one of: blob, tree, commit, tag"

3351 msgstr "<type> peut être : blob, tree, commit ou tag"

3352

3323 -#: builtin/cat-file.c:367

3353 +#: builtin/cat-file.c:365

3354 msgid "show object type"

3355 msgstr "afficher le type de l'objet"

3356

3327 -#: builtin/cat-file.c:368

3357 +#: builtin/cat-file.c:366

3358 msgid "show object size"

3359 msgstr "afficher la taille de l'objet"

3360

3331 -#: builtin/cat-file.c:370

3361 +#: builtin/cat-file.c:368

3362 msgid "exit with zero when there's no error"

3363 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"

3364

3335 -#: builtin/cat-file.c:371

3365 +#: builtin/cat-file.c:369

3366 msgid "pretty-print object's content"

3367 msgstr "afficher avec mise en forme le contenu de l'objet"

3368

3339 -#: builtin/cat-file.c:373

3369 +#: builtin/cat-file.c:371

3370 msgid "for blob objects, run textconv on object's content"

3371 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

3372

3343 -#: builtin/cat-file.c:375

3373 +#: builtin/cat-file.c:373

3374 msgid "show info and content of objects fed from the standard input"

3375 msgstr ""

3376 "afficher l'information et le contenu des objets passés en entrée standard"

3377

3348 -#: builtin/cat-file.c:378

3378 +#: builtin/cat-file.c:376

3379 msgid "show info about objects fed from the standard input"

3380 msgstr "afficher l'information des objets passés en entrée standard"

3381

3382 #: builtin/check-attr.c:11

3353 -msgid "git check-attr [-a | --all | attr...] [--] pathname..."

3354 -msgstr "git check-attr [-a | --all | attr...] [--] chemin..."

3383 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3384 +msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."

3385

3386 #: builtin/check-attr.c:12

3357 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"

3358 -msgstr ""

3359 -"git check-attr --stdin [-z] [-a | --all | attr...] < <liste-de-chemins>"

3387 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3388 +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>"

3389

3390 #: builtin/check-attr.c:19

3391 msgid "report all attributes set on file"

@@ -3412,8 +3441,8 @@ msgid "--non-matching is only valid with --verbose"

3441 msgstr "--non-matching n'est valide qu'avec --verbose"

3442

3443 #: builtin/check-mailmap.c:8

3415 -msgid "git check-mailmap [options] <contact>..."

3416 -msgstr "git check-mailmap [options] <contact>..."

3444 +msgid "git check-mailmap [<options>] <contact>..."

3445 +msgstr "git check-mailmap [<options>] <contact>..."

3446

3447 #: builtin/check-mailmap.c:13

3448 msgid "also read contacts from stdin"

@@ -3429,8 +3458,8 @@ msgid "no contacts specified"

3458 msgstr "aucun contact spécifié"

3459

3460 #: builtin/checkout-index.c:126

3432 -msgid "git checkout-index [options] [--] [<file>...]"

3433 -msgstr "git checkout-index [options] [--] [<fichier>...]"

3461 +msgid "git checkout-index [<options>] [--] [<file>...]"

3462 +msgstr "git checkout-index [<options>] [--] [<fichier>...]"

3463

3464 #: builtin/checkout-index.c:188

3465 msgid "check out all files in the index"

@@ -3475,12 +3504,12 @@ msgid "copy out the files from named stage"

3504 msgstr "copier les fichiers depuis l'index nommé"

3505

3506 #: builtin/checkout.c:25

3478 -msgid "git checkout [options] <branch>"

3479 -msgstr "git checkout [options] <branche>"

3507 +msgid "git checkout [<options>] <branch>"

3508 +msgstr "git checkout [<options>] <branche>"

3509

3510 #: builtin/checkout.c:26

3482 -msgid "git checkout [options] [<branch>] -- <file>..."

3483 -msgstr "git checkout [options] [<branche>] -- <fichier>..."

3511 +msgid "git checkout [<options>] [<branch>] -- <file>..."

3512 +msgstr "git checkout [<options>] [<branche>] -- <fichier>..."

3513

3514 #: builtin/checkout.c:132 builtin/checkout.c:165

3515 #, c-format

@@ -3611,14 +3640,13 @@ msgid ""

3640 "If you want to keep them by creating a new branch, this may be a good time\n"

3641 "to do so with:\n"

3642 "\n"

3614 -" git branch new_branch_name %s\n"

3643 +" git branch <new-branch-name> %s\n"

3644 "\n"

3645 msgstr ""

3617 -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon "

3618 -"moment\n"

3646 +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n"

3647 "pour le faire avec :\n"

3648 "\n"

3621 -"git branch nouvelle_branche %s\n"

3649 +"git branch <nouvelle-branche> %s\n"

3650 "\n"

3651

3652 #: builtin/checkout.c:777

@@ -3734,8 +3762,8 @@ msgid "do not limit pathspecs to sparse entries only"

3762 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

3763

3764 #: builtin/checkout.c:1130

3737 -msgid "second guess 'git checkout no-such-branch'"

3738 -msgstr "deuxième chance 'git checkout branche-inexistante'"

3765 +msgid "second guess 'git checkout <no-such-branch>'"

3766 +msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

3767

3768 #: builtin/checkout.c:1153

3769 msgid "-b, -B and --orphan are mutually exclusive"

@@ -3858,16 +3886,17 @@ msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

3886 msgid "Select items to delete"

3887 msgstr "Sélectionner les éléments à supprimer"

3888

3861 -#: builtin/clean.c:757

3889 +#. TRANSLATORS: Make sure to keep [y/N] as is

3890 +#: builtin/clean.c:758

3891 #, c-format

3863 -msgid "remove %s? "

3864 -msgstr "supprimer %s ? "

3892 +msgid "Remove %s [y/N]? "

3893 +msgstr "Supprimer %s [y/N] ? "

3894

3866 -#: builtin/clean.c:782

3895 +#: builtin/clean.c:783

3896 msgid "Bye."

3897 msgstr "Au revoir."

3898

3870 -#: builtin/clean.c:790

3899 +#: builtin/clean.c:791

3900 msgid ""

3901 "clean - start cleaning\n"

3902 "filter by pattern - exclude items from deletion\n"

@@ -3885,62 +3914,62 @@ msgstr ""

3914 "help - cet écran\n"

3915 "? - aide pour la sélection en ligne"

3916

3888 -#: builtin/clean.c:817

3917 +#: builtin/clean.c:818

3918 msgid "*** Commands ***"

3919 msgstr "*** Commandes ***"

3920

3892 -#: builtin/clean.c:818

3921 +#: builtin/clean.c:819

3922 msgid "What now"

3923 msgstr "Et maintenant ?"

3924

3896 -#: builtin/clean.c:826

3925 +#: builtin/clean.c:827

3926 msgid "Would remove the following item:"

3927 msgid_plural "Would remove the following items:"

3928 msgstr[0] "Supprimerait l'élément suivant :"

3929 msgstr[1] "Supprimerait les éléments suivants :"

3930

3902 -#: builtin/clean.c:843

3931 +#: builtin/clean.c:844

3932 msgid "No more files to clean, exiting."

3933 msgstr "Plus de fichier à nettoyer, sortie."

3934

3906 -#: builtin/clean.c:874

3935 +#: builtin/clean.c:875

3936 msgid "do not print names of files removed"

3937 msgstr "ne pas afficher les noms des fichiers supprimés"

3938

3910 -#: builtin/clean.c:876

3939 +#: builtin/clean.c:877

3940 msgid "force"

3941 msgstr "forcer"

3942

3914 -#: builtin/clean.c:877

3943 +#: builtin/clean.c:878

3944 msgid "interactive cleaning"

3945 msgstr "nettoyage interactif"

3946

3918 -#: builtin/clean.c:879

3947 +#: builtin/clean.c:880

3948 msgid "remove whole directories"

3949 msgstr "supprimer les répertoires entiers"

3950

3922 -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3923 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3951 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3952 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3953 msgid "pattern"

3954 msgstr "motif"

3955

3927 -#: builtin/clean.c:881

3956 +#: builtin/clean.c:882

3957 msgid "add <pattern> to ignore rules"

3958 msgstr "ajouter <motif> aux règles ignore"

3959

3931 -#: builtin/clean.c:882

3960 +#: builtin/clean.c:883

3961 msgid "remove ignored files, too"

3962 msgstr "supprimer les fichiers ignorés, aussi"

3963

3935 -#: builtin/clean.c:884

3964 +#: builtin/clean.c:885

3965 msgid "remove only ignored files"

3966 msgstr "supprimer seulement les fichiers ignorés"

3967

3939 -#: builtin/clean.c:902

3968 +#: builtin/clean.c:903

3969 msgid "-x and -X cannot be used together"

3970 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

3971

3943 -#: builtin/clean.c:906

3972 +#: builtin/clean.c:907

3973 msgid ""

3974 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3975 "clean"

@@ -3948,7 +3977,7 @@ msgstr ""

3977 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

3978 "nettoyer"

3979

3951 -#: builtin/clean.c:909

3980 +#: builtin/clean.c:910

3981 msgid ""

3982 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3983 "refusing to clean"

@@ -3957,11 +3986,11 @@ msgstr ""

3986 "nettoyer"

3987

3988 #: builtin/clone.c:37

3960 -msgid "git clone [options] [--] <repo> [<dir>]"

3961 -msgstr "git clone [options] [--] <dépôt> [<répertoire>]"

3989 +msgid "git clone [<options>] [--] <repo> [<dir>]"

3990 +msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

3991

3963 -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3964 -#: builtin/push.c:514

3992 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3993 +#: builtin/push.c:523

3994 msgid "force progress reporting"

3995 msgstr "forcer l'affichage de l'état d'avancement"

3996

@@ -4021,7 +4050,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4050 msgid "path to git-upload-pack on the remote"

4051 msgstr "chemin vers git-upload-pack sur le serveur distant"

4052

4024 -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

4053 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

4054 msgid "depth"

4055 msgstr "profondeur"

4056

@@ -4167,7 +4196,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles."

4196 msgid "repository '%s' does not exist"

4197 msgstr "le dépôt '%s' n'existe pas"

4198

4170 -#: builtin/clone.c:815 builtin/fetch.c:1155

4199 +#: builtin/clone.c:815 builtin/fetch.c:1156

4200 #, c-format

4201 msgid "depth %s is not a positive number"

4202 msgstr "la profondeur %s n'est pas un entier positif"

@@ -4183,60 +4212,60 @@ msgstr ""

4212 msgid "working tree '%s' already exists."

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

4214

4186 -#: builtin/clone.c:848 builtin/clone.c:860

4215 +#: builtin/clone.c:850 builtin/clone.c:861

4216 #, c-format

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

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

4219

4191 -#: builtin/clone.c:851

4220 +#: builtin/clone.c:853

4221 #, c-format

4193 -msgid "could not create work tree dir '%s'."

4194 -msgstr "impossible de créer le répertoire de la copie de travail '%s'."

4222 +msgid "could not create work tree dir '%s'"

4223 +msgstr "impossible de créer le répertoire de la copie de travail '%s'"

4224

4196 -#: builtin/clone.c:870

4225 +#: builtin/clone.c:871

4226 #, c-format

4227 msgid "Cloning into bare repository '%s'...\n"

4228 msgstr "Clonage dans le dépôt nu '%s'\n"

4229

4201 -#: builtin/clone.c:872

4230 +#: builtin/clone.c:873

4231 #, c-format

4232 msgid "Cloning into '%s'...\n"

4233 msgstr "Clonage dans '%s'...\n"

4234

4206 -#: builtin/clone.c:897

4235 +#: builtin/clone.c:898

4236 msgid "--dissociate given, but there is no --reference"

4237 msgstr "--dissociate est spécifié, mais --reference est absent"

4238

4210 -#: builtin/clone.c:912

4239 +#: builtin/clone.c:913

4240 msgid "--depth is ignored in local clones; use file:// instead."

4241 msgstr ""

4242 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4243

4215 -#: builtin/clone.c:915

4244 +#: builtin/clone.c:916

4245 msgid "source repository is shallow, ignoring --local"

4246 msgstr "le dépôt source est superficiel, option --local ignorée"

4247

4219 -#: builtin/clone.c:920

4248 +#: builtin/clone.c:921

4249 msgid "--local is ignored"

4250 msgstr "--local est ignoré"

4251

4223 -#: builtin/clone.c:924

4252 +#: builtin/clone.c:925

4253 #, c-format

4254 msgid "Don't know how to clone %s"

4255 msgstr "Je ne sais pas cloner %s"

4256

4228 -#: builtin/clone.c:975 builtin/clone.c:983

4257 +#: builtin/clone.c:976 builtin/clone.c:984

4258 #, c-format

4259 msgid "Remote branch %s not found in upstream %s"

4260 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4261

4233 -#: builtin/clone.c:986

4262 +#: builtin/clone.c:987

4263 msgid "You appear to have cloned an empty repository."

4264 msgstr "Vous semblez avoir cloné un dépôt vide."

4265

4266 #: builtin/column.c:9

4238 -msgid "git column [options]"

4239 -msgstr "git column [options]"

4267 +msgid "git column [<options>]"

4268 +msgstr "git column [<options>]"

4269

4270 #: builtin/column.c:26

4271 msgid "lookup config vars"

@@ -4267,12 +4296,12 @@ msgid "--command must be the first argument"

4296 msgstr "--command doit être le premier argument"

4297

4298 #: builtin/commit.c:37

4270 -msgid "git commit [options] [--] <pathspec>..."

4271 -msgstr "git commit [options] [--] <spécification-de-chemin>..."

4299 +msgid "git commit [<options>] [--] <pathspec>..."

4300 +msgstr "git commit [<options>] [--] <spécification-de-chemin>..."

4301

4302 #: builtin/commit.c:42

4274 -msgid "git status [options] [--] <pathspec>..."

4275 -msgstr "git status [options] [--] <spécification-de-chemin>..."

4303 +msgid "git status [<options>] [--] <pathspec>..."

4304 +msgstr "git status [<options>] [--] <spécification-de-chemin>..."

4305

4306 #: builtin/commit.c:47

4307 msgid ""

@@ -4417,26 +4446,26 @@ msgstr "impossible de lire l'index"

4446 msgid "unable to write temporary index file"

4447 msgstr "impossible d'écrire le fichier d'index temporaire"

4448

4420 -#: builtin/commit.c:584

4449 +#: builtin/commit.c:578

4450 #, c-format

4451 msgid "commit '%s' lacks author header"

4452 msgstr "entête d'auteur manquant dans le commit '%s'"

4453

4425 -#: builtin/commit.c:586

4454 +#: builtin/commit.c:580

4455 #, c-format

4456 msgid "commit '%s' has malformed author line"

4457 msgstr "le commit '%s' a une ligne d'auteur malformée"

4458

4430 -#: builtin/commit.c:605

4459 +#: builtin/commit.c:599

4460 msgid "malformed --author parameter"

4461 msgstr "paramètre --author mal formé"

4462

4434 -#: builtin/commit.c:613

4463 +#: builtin/commit.c:607

4464 #, c-format

4465 msgid "invalid date format: %s"

4466 msgstr "format de date invalide : %s"

4467

4439 -#: builtin/commit.c:657

4468 +#: builtin/commit.c:651

4469 msgid ""

4470 "unable to select a comment character that is not used\n"

4471 "in the current commit message"

@@ -4444,43 +4473,43 @@ msgstr ""

4473 "impossible de sélectionner un caractère de commentaire\n"

4474 "qui n'est pas utilisé dans le message de validation actuel"

4475

4447 -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4476 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078

4477 #, c-format

4478 msgid "could not lookup commit %s"

4479 msgstr "impossible de rechercher le commit %s"

4480

4452 -#: builtin/commit.c:706 builtin/shortlog.c:273

4481 +#: builtin/commit.c:700 builtin/shortlog.c:273

4482 #, c-format

4483 msgid "(reading log message from standard input)\n"

4484 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4485

4457 -#: builtin/commit.c:708

4486 +#: builtin/commit.c:702

4487 msgid "could not read log from standard input"

4488 msgstr "impossible de lire le journal depuis l'entrée standard"

4489

4461 -#: builtin/commit.c:712

4490 +#: builtin/commit.c:706

4491 #, c-format

4492 msgid "could not read log file '%s'"

4493 msgstr "impossible de lire le fichier de journal '%s'"

4494

4466 -#: builtin/commit.c:734

4495 +#: builtin/commit.c:728

4496 msgid "could not read MERGE_MSG"

4497 msgstr "impossible de lire MERGE_MSG"

4498

4470 -#: builtin/commit.c:738

4499 +#: builtin/commit.c:732

4500 msgid "could not read SQUASH_MSG"

4501 msgstr "impossible de lire SQUASH_MSG"

4502

4474 -#: builtin/commit.c:742

4503 +#: builtin/commit.c:736

4504 #, c-format

4505 msgid "could not read '%s'"

4506 msgstr "impossible de lire '%s'"

4507

4479 -#: builtin/commit.c:789

4508 +#: builtin/commit.c:783

4509 msgid "could not write commit template"

4510 msgstr "impossible d'écrire le modèle de commit"

4511

4483 -#: builtin/commit.c:807

4512 +#: builtin/commit.c:801

4513 #, c-format

4514 msgid ""

4515 "\n"

@@ -4495,7 +4524,7 @@ msgstr ""

4524 "\t%s\n"

4525 "et essayez à nouveau.\n"

4526

4498 -#: builtin/commit.c:812

4527 +#: builtin/commit.c:806

4528 #, c-format

4529 msgid ""

4530 "\n"

@@ -4510,7 +4539,7 @@ msgstr ""

4539 "\t%s\n"

4540 "et essayez à nouveau.\n"

4541

4513 -#: builtin/commit.c:825

4542 +#: builtin/commit.c:819

4543 #, c-format

4544 msgid ""

4545 "Please enter the commit message for your changes. Lines starting\n"

@@ -4520,7 +4549,7 @@ msgstr ""

4549 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4550 "validation.\n"

4551

4523 -#: builtin/commit.c:832

4552 +#: builtin/commit.c:826

4553 #, c-format

4554 msgid ""

4555 "Please enter the commit message for your changes. Lines starting\n"

@@ -4531,147 +4560,147 @@ msgstr ""

4560 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4561 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4562

4534 -#: builtin/commit.c:852

4563 +#: builtin/commit.c:846

4564 #, c-format

4565 msgid "%sAuthor: %.*s <%.*s>"

4566 msgstr "%sAuteur : %.*s <%.*s>"

4567

4539 -#: builtin/commit.c:860

4568 +#: builtin/commit.c:854

4569 #, c-format

4570 msgid "%sDate: %s"

4571 msgstr "%sDate : %s"

4572

4544 -#: builtin/commit.c:867

4573 +#: builtin/commit.c:861

4574 #, c-format

4575 msgid "%sCommitter: %.*s <%.*s>"

4576 msgstr "%sValidateur : %.*s <%.*s>"

4577

4549 -#: builtin/commit.c:885

4578 +#: builtin/commit.c:879

4579 msgid "Cannot read index"

4580 msgstr "Impossible de lire l'index"

4581

4553 -#: builtin/commit.c:942

4582 +#: builtin/commit.c:936

4583 msgid "Error building trees"

4584 msgstr "Erreur lors de la construction des arbres"

4585

4557 -#: builtin/commit.c:957 builtin/tag.c:495

4586 +#: builtin/commit.c:951 builtin/tag.c:495

4587 #, c-format

4588 msgid "Please supply the message using either -m or -F option.\n"

4589 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4590

4562 -#: builtin/commit.c:1059

4591 +#: builtin/commit.c:1053

4592 #, c-format

4564 -msgid "No existing author found with '%s'"

4565 -msgstr "Aucun auteur existant trouvé avec '%s'"

4593 +msgid "--author '%s' is not 'Name <email>' and matches no existing author"

4594 +msgstr "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun auteur existant"

4595

4567 -#: builtin/commit.c:1074 builtin/commit.c:1314

4596 +#: builtin/commit.c:1068 builtin/commit.c:1308

4597 #, c-format

4598 msgid "Invalid untracked files mode '%s'"

4599 msgstr "Mode de fichier non suivi invalide '%s'"

4600

4572 -#: builtin/commit.c:1111

4601 +#: builtin/commit.c:1105

4602 msgid "--long and -z are incompatible"

4603 msgstr "--long et -z sont incompatibles"

4604

4576 -#: builtin/commit.c:1141

4605 +#: builtin/commit.c:1135

4606 msgid "Using both --reset-author and --author does not make sense"

4607 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4608

4580 -#: builtin/commit.c:1150

4609 +#: builtin/commit.c:1144

4610 msgid "You have nothing to amend."

4611 msgstr "Il n'y a rien à corriger."

4612

4584 -#: builtin/commit.c:1153

4613 +#: builtin/commit.c:1147

4614 msgid "You are in the middle of a merge -- cannot amend."

4615 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4616

4588 -#: builtin/commit.c:1155

4617 +#: builtin/commit.c:1149

4618 msgid "You are in the middle of a cherry-pick -- cannot amend."

4619 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4620

4592 -#: builtin/commit.c:1158

4621 +#: builtin/commit.c:1152

4622 msgid "Options --squash and --fixup cannot be used together"

4623 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4624

4596 -#: builtin/commit.c:1168

4625 +#: builtin/commit.c:1162

4626 msgid "Only one of -c/-C/-F/--fixup can be used."

4627 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4628

4600 -#: builtin/commit.c:1170

4629 +#: builtin/commit.c:1164

4630 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4631 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4632

4604 -#: builtin/commit.c:1178

4633 +#: builtin/commit.c:1172

4634 msgid "--reset-author can be used only with -C, -c or --amend."

4635 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4636

4608 -#: builtin/commit.c:1195

4637 +#: builtin/commit.c:1189

4638 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4639 msgstr ""

4640 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4641 "être utilisée."

4642

4614 -#: builtin/commit.c:1197

4643 +#: builtin/commit.c:1191

4644 msgid "No paths with --include/--only does not make sense."

4645 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4646

4618 -#: builtin/commit.c:1199

4647 +#: builtin/commit.c:1193

4648 msgid "Clever... amending the last one with dirty index."

4649 msgstr "Malin... correction du dernier avec un index sale."

4650

4622 -#: builtin/commit.c:1201

4651 +#: builtin/commit.c:1195

4652 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4653 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4654

4626 -#: builtin/commit.c:1213 builtin/tag.c:728

4655 +#: builtin/commit.c:1207 builtin/tag.c:728

4656 #, c-format

4657 msgid "Invalid cleanup mode %s"

4658 msgstr "Mode de nettoyage invalide %s"

4659

4631 -#: builtin/commit.c:1218

4660 +#: builtin/commit.c:1212

4661 msgid "Paths with -a does not make sense."

4662 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4663

4635 -#: builtin/commit.c:1328 builtin/commit.c:1608

4664 +#: builtin/commit.c:1322 builtin/commit.c:1602

4665 msgid "show status concisely"

4666 msgstr "afficher le statut avec concision"

4667

4639 -#: builtin/commit.c:1330 builtin/commit.c:1610

4668 +#: builtin/commit.c:1324 builtin/commit.c:1604

4669 msgid "show branch information"

4670 msgstr "afficher l'information de branche"

4671

4643 -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4672 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509

4673 msgid "machine-readable output"

4674 msgstr "sortie pour traitement automatique"

4675

4647 -#: builtin/commit.c:1335 builtin/commit.c:1614

4676 +#: builtin/commit.c:1329 builtin/commit.c:1608

4677 msgid "show status in long format (default)"

4678 msgstr "afficher le statut en format long (par défaut)"

4679

4651 -#: builtin/commit.c:1338 builtin/commit.c:1617

4680 +#: builtin/commit.c:1332 builtin/commit.c:1611

4681 msgid "terminate entries with NUL"

4682 msgstr "terminer les éléments par NUL"

4683

4655 -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

4684 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980

4685 #: builtin/fast-export.c:983 builtin/tag.c:603

4686 msgid "mode"

4687 msgstr "mode"

4688

4660 -#: builtin/commit.c:1341 builtin/commit.c:1620

4689 +#: builtin/commit.c:1335 builtin/commit.c:1614

4690 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4691 msgstr ""

4692 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4693 "no. (Défaut : all)"

4694

4666 -#: builtin/commit.c:1344

4695 +#: builtin/commit.c:1338

4696 msgid "show ignored files"

4697 msgstr "afficher les fichiers ignorés"

4698

4670 -#: builtin/commit.c:1345 parse-options.h:153

4699 +#: builtin/commit.c:1339 parse-options.h:153

4700 msgid "when"

4701 msgstr "quand"

4702

4674 -#: builtin/commit.c:1346

4703 +#: builtin/commit.c:1340

4704 msgid ""

4705 "ignore changes to submodules, optional when: all, dirty, untracked. "

4706 "(Default: all)"

@@ -4679,209 +4708,209 @@ msgstr ""

4708 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4709 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4710

4682 -#: builtin/commit.c:1348

4711 +#: builtin/commit.c:1342

4712 msgid "list untracked files in columns"

4713 msgstr "afficher les fichiers non suivis en colonnes"

4714

4686 -#: builtin/commit.c:1435

4715 +#: builtin/commit.c:1429

4716 msgid "couldn't look up newly created commit"

4717 msgstr "impossible de retrouver le commit nouvellement créé"

4718

4690 -#: builtin/commit.c:1437

4719 +#: builtin/commit.c:1431

4720 msgid "could not parse newly created commit"

4721 msgstr "impossible d'analyser le commit nouvellement créé"

4722

4694 -#: builtin/commit.c:1482

4723 +#: builtin/commit.c:1476

4724 msgid "detached HEAD"

4725 msgstr "HEAD détachée"

4726

4698 -#: builtin/commit.c:1485

4727 +#: builtin/commit.c:1479

4728 msgid " (root-commit)"

4729 msgstr " (commit racine)"

4730

4702 -#: builtin/commit.c:1578

4731 +#: builtin/commit.c:1572

4732 msgid "suppress summary after successful commit"

4733 msgstr "supprimer le résumé après une validation réussie"

4734

4706 -#: builtin/commit.c:1579

4735 +#: builtin/commit.c:1573

4736 msgid "show diff in commit message template"

4737 msgstr "afficher les diff dans le modèle de message de validation"

4738

4710 -#: builtin/commit.c:1581

4739 +#: builtin/commit.c:1575

4740 msgid "Commit message options"

4741 msgstr "Options du message de validation"

4742

4714 -#: builtin/commit.c:1582 builtin/tag.c:601

4743 +#: builtin/commit.c:1576 builtin/tag.c:601

4744 msgid "read message from file"

4745 msgstr "lire le message depuis un fichier"

4746

4718 -#: builtin/commit.c:1583

4747 +#: builtin/commit.c:1577

4748 msgid "author"

4749 msgstr "auteur"

4750

4722 -#: builtin/commit.c:1583

4751 +#: builtin/commit.c:1577

4752 msgid "override author for commit"

4753 msgstr "remplacer l'auteur pour la validation"

4754

4726 -#: builtin/commit.c:1584 builtin/gc.c:275

4755 +#: builtin/commit.c:1578 builtin/gc.c:275

4756 msgid "date"

4757 msgstr "date"

4758

4730 -#: builtin/commit.c:1584

4759 +#: builtin/commit.c:1578

4760 msgid "override date for commit"

4761 msgstr "remplacer la date pour la validation"

4762

4734 -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4763 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391

4764 #: builtin/notes.c:554 builtin/tag.c:599

4765 msgid "message"

4766 msgstr "message"

4767

4739 -#: builtin/commit.c:1585

4768 +#: builtin/commit.c:1579

4769 msgid "commit message"

4770 msgstr "message de validation"

4771

4743 -#: builtin/commit.c:1586

4772 +#: builtin/commit.c:1580

4773 msgid "reuse and edit message from specified commit"

4774 msgstr "réutiliser et éditer le message du commit spécifié"

4775

4747 -#: builtin/commit.c:1587

4776 +#: builtin/commit.c:1581

4777 msgid "reuse message from specified commit"

4778 msgstr "réutiliser le message du commit spécifié"

4779

4751 -#: builtin/commit.c:1588

4780 +#: builtin/commit.c:1582

4781 msgid "use autosquash formatted message to fixup specified commit"

4782 msgstr ""

4783 "utiliser un message au format autosquash pour corriger le commit spécifié"

4784

4756 -#: builtin/commit.c:1589

4785 +#: builtin/commit.c:1583

4786 msgid "use autosquash formatted message to squash specified commit"

4787 msgstr ""

4788 "utiliser un message au format autosquash pour compresser le commit spécifié"

4789

4761 -#: builtin/commit.c:1590

4790 +#: builtin/commit.c:1584

4791 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4792 msgstr ""

4793 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4794

4766 -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4795 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86

4796 msgid "add Signed-off-by:"

4797 msgstr "ajouter une entrée Signed-off-by :"

4798

4770 -#: builtin/commit.c:1592

4799 +#: builtin/commit.c:1586

4800 msgid "use specified template file"

4801 msgstr "utiliser le fichier de modèle spécifié"

4802

4774 -#: builtin/commit.c:1593

4803 +#: builtin/commit.c:1587

4804 msgid "force edit of commit"

4805 msgstr "forcer l'édition du commit"

4806

4778 -#: builtin/commit.c:1594

4807 +#: builtin/commit.c:1588

4808 msgid "default"

4809 msgstr "défaut"

4810

4782 -#: builtin/commit.c:1594 builtin/tag.c:604

4811 +#: builtin/commit.c:1588 builtin/tag.c:604

4812 msgid "how to strip spaces and #comments from message"

4813 msgstr "comment éliminer les espaces et les commentaires # du message"

4814

4786 -#: builtin/commit.c:1595

4815 +#: builtin/commit.c:1589

4816 msgid "include status in commit message template"

4817 msgstr "inclure le statut dans le modèle de message de validation"

4818

4790 -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4819 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92

4820 #: builtin/tag.c:605

4821 msgid "key-id"

4822 msgstr "id de clé"

4823

4795 -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4824 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93

4825 msgid "GPG sign commit"

4826 msgstr "signer la validation avec GPG"

4827

4799 -#: builtin/commit.c:1600

4828 +#: builtin/commit.c:1594

4829 msgid "Commit contents options"

4830 msgstr "Valider les options des contenus"

4831

4803 -#: builtin/commit.c:1601

4832 +#: builtin/commit.c:1595

4833 msgid "commit all changed files"

4834 msgstr "valider tous les fichiers modifiés"

4835

4807 -#: builtin/commit.c:1602

4836 +#: builtin/commit.c:1596

4837 msgid "add specified files to index for commit"

4838 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4839

4811 -#: builtin/commit.c:1603

4840 +#: builtin/commit.c:1597

4841 msgid "interactively add files"

4842 msgstr "ajouter des fichiers en mode interactif"

4843

4815 -#: builtin/commit.c:1604

4844 +#: builtin/commit.c:1598

4845 msgid "interactively add changes"

4846 msgstr "ajouter les modifications en mode interactif"

4847

4819 -#: builtin/commit.c:1605

4848 +#: builtin/commit.c:1599

4849 msgid "commit only specified files"

4850 msgstr "valider seulement les fichiers spécifiés"

4851

4823 -#: builtin/commit.c:1606

4852 +#: builtin/commit.c:1600

4853 msgid "bypass pre-commit hook"

4854 msgstr "éviter d'utiliser le crochet pre-commit"

4855

4827 -#: builtin/commit.c:1607

4856 +#: builtin/commit.c:1601

4857 msgid "show what would be committed"

4858 msgstr "afficher ce qui serait validé"

4859

4831 -#: builtin/commit.c:1618

4860 +#: builtin/commit.c:1612

4861 msgid "amend previous commit"

4862 msgstr "corriger la validation précédente"

4863

4835 -#: builtin/commit.c:1619

4864 +#: builtin/commit.c:1613

4865 msgid "bypass post-rewrite hook"

4866 msgstr "éviter d'utiliser le crochet post-rewrite"

4867

4839 -#: builtin/commit.c:1624

4868 +#: builtin/commit.c:1618

4869 msgid "ok to record an empty change"

4870 msgstr "accepter d'enregistrer une modification vide"

4871

4843 -#: builtin/commit.c:1626

4872 +#: builtin/commit.c:1620

4873 msgid "ok to record a change with an empty message"

4874 msgstr "accepter d'enregistrer une modification avec un message vide"

4875

4847 -#: builtin/commit.c:1655

4876 +#: builtin/commit.c:1649

4877 msgid "could not parse HEAD commit"

4878 msgstr "impossible d'analyser le commit HEAD"

4879

4851 -#: builtin/commit.c:1694 builtin/merge.c:519

4880 +#: builtin/commit.c:1688 builtin/merge.c:519

4881 #, c-format

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

4883 msgstr "impossible d'ouvrir '%s' en lecture"

4884

4856 -#: builtin/commit.c:1701

4885 +#: builtin/commit.c:1695

4886 #, c-format

4887 msgid "Corrupt MERGE_HEAD file (%s)"

4888 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4889

4861 -#: builtin/commit.c:1708

4890 +#: builtin/commit.c:1702

4891 msgid "could not read MERGE_MODE"

4892 msgstr "impossible de lire MERGE_MODE"

4893

4865 -#: builtin/commit.c:1727

4894 +#: builtin/commit.c:1721

4895 #, c-format

4896 msgid "could not read commit message: %s"

4897 msgstr "impossible de lire le message de validation : %s"

4898

4870 -#: builtin/commit.c:1738

4899 +#: builtin/commit.c:1732

4900 #, c-format

4901 msgid "Aborting commit; you did not edit the message.\n"

4902 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4903

4875 -#: builtin/commit.c:1743

4904 +#: builtin/commit.c:1737

4905 #, c-format

4906 msgid "Aborting commit due to empty commit message.\n"

4907 msgstr "Abandon de la validation du à un message de validation vide\n"

4908

4880 -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4909 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876

4910 msgid "failed to write commit object"

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

4912

4884 -#: builtin/commit.c:1791

4913 +#: builtin/commit.c:1785

4914 msgid ""

4915 "Repository has been updated, but unable to write\n"

4916 "new_index file. Check that disk is not full and quota is\n"

@@ -4892,8 +4921,8 @@ msgstr ""

4921 "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."

4922

4923 #: builtin/config.c:8

4895 -msgid "git config [options]"

4896 -msgstr "git config [options]"

4924 +msgid "git config [<options>]"

4925 +msgstr "git config [<options>]"

4926

4927 #: builtin/config.c:53

4928 msgid "Config file location"

@@ -5049,12 +5078,12 @@ msgid "print sizes in human readable format"

5078 msgstr "affiche les tailles dans un format humainement lisible"

5079

5080 #: builtin/describe.c:17

5052 -msgid "git describe [options] <commit-ish>*"

5053 -msgstr "git describe [options] <commit ou apparenté>*"

5081 +msgid "git describe [<options>] [<commit-ish>...]"

5082 +msgstr "git describe [<options>] <commit ou apparenté>*"

5083

5084 #: builtin/describe.c:18

5056 -msgid "git describe [options] --dirty"

5057 -msgstr "git describe [options] --dirty"

5085 +msgid "git describe [<options>] --dirty"

5086 +msgstr "git describe [<options>] --dirty"

5087

5088 #: builtin/describe.c:217

5089 #, c-format

@@ -5272,180 +5301,180 @@ msgstr "Appliquer le spécificateur de référence aux références exportées"

5301 msgid "anonymize output"

5302 msgstr "anonymise la sortie"

5303

5275 -#: builtin/fetch.c:20

5304 +#: builtin/fetch.c:19

5305 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5306 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"

5307

5279 -#: builtin/fetch.c:21

5308 +#: builtin/fetch.c:20

5309 msgid "git fetch [<options>] <group>"

5310 msgstr "git fetch [<options>] <groupe>"

5311

5283 -#: builtin/fetch.c:22

5312 +#: builtin/fetch.c:21

5313 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

5314 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

5315

5287 -#: builtin/fetch.c:23

5316 +#: builtin/fetch.c:22

5317 msgid "git fetch --all [<options>]"

5318 msgstr "git fetch --all [<options>]"

5319

5291 -#: builtin/fetch.c:90

5320 +#: builtin/fetch.c:89

5321 msgid "fetch from all remotes"

5322 msgstr "récupérer depuis tous le dépôts distants"

5323

5295 -#: builtin/fetch.c:92

5324 +#: builtin/fetch.c:91

5325 msgid "append to .git/FETCH_HEAD instead of overwriting"

5326 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

5327

5299 -#: builtin/fetch.c:94

5328 +#: builtin/fetch.c:93

5329 msgid "path to upload pack on remote end"

5330 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

5331

5303 -#: builtin/fetch.c:95

5332 +#: builtin/fetch.c:94

5333 msgid "force overwrite of local branch"

5334 msgstr "forcer l'écrasement de la branche locale"

5335

5307 -#: builtin/fetch.c:97

5336 +#: builtin/fetch.c:96

5337 msgid "fetch from multiple remotes"

5338 msgstr "récupérer depuis plusieurs dépôts distants"

5339

5311 -#: builtin/fetch.c:99

5340 +#: builtin/fetch.c:98

5341 msgid "fetch all tags and associated objects"

5342 msgstr "récupérer toutes les étiquettes et leurs objets associés"

5343

5315 -#: builtin/fetch.c:101

5344 +#: builtin/fetch.c:100

5345 msgid "do not fetch all tags (--no-tags)"

5346 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

5347

5319 -#: builtin/fetch.c:103

5348 +#: builtin/fetch.c:102

5349 msgid "prune remote-tracking branches no longer on remote"

5350 msgstr ""

5351 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

5352 "dépôt distant"

5353

5325 -#: builtin/fetch.c:104

5354 +#: builtin/fetch.c:103

5355 msgid "on-demand"

5356 msgstr "à la demande"

5357

5329 -#: builtin/fetch.c:105

5358 +#: builtin/fetch.c:104

5359 msgid "control recursive fetching of submodules"

5360 msgstr "contrôler la récupération récursive dans les sous-modules"

5361

5333 -#: builtin/fetch.c:109

5362 +#: builtin/fetch.c:108

5363 msgid "keep downloaded pack"

5364 msgstr "conserver le paquet téléchargé"

5365

5337 -#: builtin/fetch.c:111

5366 +#: builtin/fetch.c:110

5367 msgid "allow updating of HEAD ref"

5368 msgstr "permettre la mise à jour de la référence HEAD"

5369

5341 -#: builtin/fetch.c:114

5370 +#: builtin/fetch.c:113

5371 msgid "deepen history of shallow clone"

5372 msgstr "approfondir l'historique d'un clone superficiel"

5373

5345 -#: builtin/fetch.c:116

5374 +#: builtin/fetch.c:115

5375 msgid "convert to a complete repository"

5376 msgstr "convertir en un dépôt complet"

5377

5349 -#: builtin/fetch.c:118 builtin/log.c:1208

5378 +#: builtin/fetch.c:117 builtin/log.c:1208

5379 msgid "dir"

5380 msgstr "dir"

5381

5353 -#: builtin/fetch.c:119

5382 +#: builtin/fetch.c:118

5383 msgid "prepend this to submodule path output"

5384 msgstr "préfixer ceci à la sortie du chemin du sous-module"

5385

5357 -#: builtin/fetch.c:122

5386 +#: builtin/fetch.c:121

5387 msgid "default mode for recursion"

5388 msgstr "mode par défaut pour la récursion"

5389

5361 -#: builtin/fetch.c:124

5390 +#: builtin/fetch.c:123

5391 msgid "accept refs that update .git/shallow"

5392 msgstr "accepter les références qui mettent à jour .git/shallow"

5393

5365 -#: builtin/fetch.c:125

5394 +#: builtin/fetch.c:124

5395 msgid "refmap"

5396 msgstr "correspondance de référence"

5397

5369 -#: builtin/fetch.c:126

5398 +#: builtin/fetch.c:125

5399 msgid "specify fetch refmap"

5400 msgstr "spécifier une correspondance de référence pour la récupération"

5401

5373 -#: builtin/fetch.c:376

5402 +#: builtin/fetch.c:375

5403 msgid "Couldn't find remote ref HEAD"

5404 msgstr "impossible de trouver la référence HEAD distante"

5405

5377 -#: builtin/fetch.c:454

5406 +#: builtin/fetch.c:455

5407 #, c-format

5408 msgid "object %s not found"

5409 msgstr "objet %s non trouvé"

5410

5382 -#: builtin/fetch.c:459

5411 +#: builtin/fetch.c:460

5412 msgid "[up to date]"

5413 msgstr "[à jour]"

5414

5386 -#: builtin/fetch.c:473

5415 +#: builtin/fetch.c:474

5416 #, c-format

5417 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5418 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5419

5391 -#: builtin/fetch.c:474 builtin/fetch.c:560

5420 +#: builtin/fetch.c:475 builtin/fetch.c:561

5421 msgid "[rejected]"

5422 msgstr "[rejeté]"

5423

5395 -#: builtin/fetch.c:485

5424 +#: builtin/fetch.c:486

5425 msgid "[tag update]"

5426 msgstr "[mise à jour de l'étiquette]"

5427

5399 -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5428 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5429 msgid " (unable to update local ref)"

5430 msgstr " (impossible de mettre à jour la référence locale)"

5431

5403 -#: builtin/fetch.c:505

5432 +#: builtin/fetch.c:506

5433 msgid "[new tag]"

5434 msgstr "[nouvelle étiquette]"

5435

5407 -#: builtin/fetch.c:508

5436 +#: builtin/fetch.c:509

5437 msgid "[new branch]"

5438 msgstr "[nouvelle branche]"

5439

5411 -#: builtin/fetch.c:511

5440 +#: builtin/fetch.c:512

5441 msgid "[new ref]"

5442 msgstr "[nouvelle référence]"

5443

5415 -#: builtin/fetch.c:556

5444 +#: builtin/fetch.c:557

5445 msgid "unable to update local ref"

5446 msgstr "impossible de mettre à jour la référence locale"

5447

5419 -#: builtin/fetch.c:556

5448 +#: builtin/fetch.c:557

5449 msgid "forced update"

5450 msgstr "mise à jour forcée"

5451

5423 -#: builtin/fetch.c:562

5452 +#: builtin/fetch.c:563

5453 msgid "(non-fast-forward)"

5454 msgstr "(pas d'avance rapide)"

5455

5427 -#: builtin/fetch.c:595 builtin/fetch.c:828

5456 +#: builtin/fetch.c:596 builtin/fetch.c:829

5457 #, c-format

5458 msgid "cannot open %s: %s\n"

5459 msgstr "impossible d'ouvrir %s : %s\n"

5460

5432 -#: builtin/fetch.c:604

5461 +#: builtin/fetch.c:605

5462 #, c-format

5463 msgid "%s did not send all necessary objects\n"

5464 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

5465

5437 -#: builtin/fetch.c:622

5466 +#: builtin/fetch.c:623

5467 #, c-format

5468 msgid "reject %s because shallow roots are not allowed to be updated"

5469 msgstr ""

5470 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

5471

5443 -#: builtin/fetch.c:710 builtin/fetch.c:793

5472 +#: builtin/fetch.c:711 builtin/fetch.c:794

5473 #, c-format

5474 msgid "From %.*s\n"

5475 msgstr "Depuis %.*s\n"

5476

5448 -#: builtin/fetch.c:721

5477 +#: builtin/fetch.c:722

5478 #, c-format

5479 msgid ""

5480 "some local refs could not be updated; try running\n"

@@ -5454,55 +5483,55 @@ msgstr ""

5483 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

5484 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

5485

5457 -#: builtin/fetch.c:773

5486 +#: builtin/fetch.c:774

5487 #, c-format

5488 msgid " (%s will become dangling)"

5489 msgstr " (%s sera en suspens)"

5490

5462 -#: builtin/fetch.c:774

5491 +#: builtin/fetch.c:775

5492 #, c-format

5493 msgid " (%s has become dangling)"

5494 msgstr " (%s est devenu en suspens)"

5495

5467 -#: builtin/fetch.c:798

5496 +#: builtin/fetch.c:799

5497 msgid "[deleted]"

5498 msgstr "[supprimé]"

5499

5471 -#: builtin/fetch.c:799 builtin/remote.c:1060

5500 +#: builtin/fetch.c:800 builtin/remote.c:1060

5501 msgid "(none)"

5502 msgstr "(aucun(e))"

5503

5475 -#: builtin/fetch.c:818

5504 +#: builtin/fetch.c:819

5505 #, c-format

5506 msgid "Refusing to fetch into current branch %s of non-bare repository"

5507 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

5508

5480 -#: builtin/fetch.c:837

5509 +#: builtin/fetch.c:838

5510 #, c-format

5511 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5512 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

5513

5485 -#: builtin/fetch.c:840

5514 +#: builtin/fetch.c:841

5515 #, c-format

5516 msgid "Option \"%s\" is ignored for %s\n"

5517 msgstr "L'option \"%s\" est ignorée pour %s\n"

5518

5490 -#: builtin/fetch.c:896

5519 +#: builtin/fetch.c:897

5520 #, c-format

5521 msgid "Don't know how to fetch from %s"

5522 msgstr "Je ne sais pas récupérer depuis %s"

5523

5495 -#: builtin/fetch.c:1058

5524 +#: builtin/fetch.c:1059

5525 #, c-format

5526 msgid "Fetching %s\n"

5527 msgstr "Récupération de %s\n"

5528

5500 -#: builtin/fetch.c:1060 builtin/remote.c:90

5529 +#: builtin/fetch.c:1061 builtin/remote.c:90

5530 #, c-format

5531 msgid "Could not fetch %s"

5532 msgstr "Impossible de récupérer %s"

5533

5505 -#: builtin/fetch.c:1078

5534 +#: builtin/fetch.c:1079

5535 msgid ""

5536 "No remote repository specified. Please, specify either a URL or a\n"

5537 "remote name from which new revisions should be fetched."

@@ -5510,41 +5539,41 @@ msgstr ""

5539 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

5540 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

5541

5513 -#: builtin/fetch.c:1101

5542 +#: builtin/fetch.c:1102

5543 msgid "You need to specify a tag name."

5544 msgstr "Vous devez spécifier un nom d'étiquette."

5545

5517 -#: builtin/fetch.c:1143

5546 +#: builtin/fetch.c:1144

5547 msgid "--depth and --unshallow cannot be used together"

5548 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

5549

5521 -#: builtin/fetch.c:1145

5550 +#: builtin/fetch.c:1146

5551 msgid "--unshallow on a complete repository does not make sense"

5552 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

5553

5525 -#: builtin/fetch.c:1168

5554 +#: builtin/fetch.c:1169

5555 msgid "fetch --all does not take a repository argument"

5556 msgstr "fetch --all n'accepte pas d'argument de dépôt"

5557

5529 -#: builtin/fetch.c:1170

5558 +#: builtin/fetch.c:1171

5559 msgid "fetch --all does not make sense with refspecs"

5560 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

5561

5533 -#: builtin/fetch.c:1181

5562 +#: builtin/fetch.c:1182

5563 #, c-format

5564 msgid "No such remote or remote group: %s"

5565 msgstr "distant ou groupe distant inexistant : %s"

5566

5538 -#: builtin/fetch.c:1189

5567 +#: builtin/fetch.c:1190

5568 msgid "Fetching a group and specifying refspecs does not make sense"

5569 msgstr ""

5570 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

5571 "sens"

5572

5573 #: builtin/fmt-merge-msg.c:13

5545 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5546 -msgstr ""

5547 -"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <fichier>]"

5574 +msgid ""

5575 +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

5576 +msgstr "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"

5577

5578 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5579 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

@@ -5573,51 +5602,51 @@ msgstr "utiliser <texte> comme début de message"

5602 msgid "file to read from"

5603 msgstr "fichier d'où lire"

5604

5576 -#: builtin/for-each-ref.c:676

5605 +#: builtin/for-each-ref.c:675

5606 msgid "unable to parse format"

5607 msgstr "impossible d'analyser le format"

5608

5580 -#: builtin/for-each-ref.c:1064

5581 -msgid "git for-each-ref [options] [<pattern>]"

5582 -msgstr "git for-each-ref [options] [<motif>]"

5609 +#: builtin/for-each-ref.c:1063

5610 +msgid "git for-each-ref [<options>] [<pattern>]"

5611 +msgstr "git for-each-ref [<options>] [<motif>]"

5612

5584 -#: builtin/for-each-ref.c:1079

5613 +#: builtin/for-each-ref.c:1078

5614 msgid "quote placeholders suitably for shells"

5615 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

5616

5588 -#: builtin/for-each-ref.c:1081

5617 +#: builtin/for-each-ref.c:1080

5618 msgid "quote placeholders suitably for perl"

5619 msgstr "échapper les champs réservés pour perl"

5620

5592 -#: builtin/for-each-ref.c:1083

5621 +#: builtin/for-each-ref.c:1082

5622 msgid "quote placeholders suitably for python"

5623 msgstr "échapper les champs réservés pour python"

5624

5596 -#: builtin/for-each-ref.c:1085

5625 +#: builtin/for-each-ref.c:1084

5626 msgid "quote placeholders suitably for Tcl"

5627 msgstr "échapper les champs réservés pour compatibilité avec Tcl"

5628

5600 -#: builtin/for-each-ref.c:1088

5629 +#: builtin/for-each-ref.c:1087

5630 msgid "show only <n> matched refs"

5631 msgstr "n'afficher que <n> références correspondant"

5632

5604 -#: builtin/for-each-ref.c:1089 builtin/replace.c:438

5633 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5634 msgid "format"

5635 msgstr "format"

5636

5608 -#: builtin/for-each-ref.c:1089

5637 +#: builtin/for-each-ref.c:1088

5638 msgid "format to use for the output"

5639 msgstr "format à utiliser pour la sortie"

5640

5612 -#: builtin/for-each-ref.c:1090

5641 +#: builtin/for-each-ref.c:1089

5642 msgid "key"

5643 msgstr "clé"

5644

5616 -#: builtin/for-each-ref.c:1091

5645 +#: builtin/for-each-ref.c:1090

5646 msgid "field name to sort on"

5647 msgstr "nom du champ servant à trier"

5648

5620 -#: builtin/fsck.c:147 builtin/prune.c:136

5649 +#: builtin/fsck.c:147 builtin/prune.c:137

5650 msgid "Checking connectivity"

5651 msgstr "Vérification de la connectivité"

5652

@@ -5626,8 +5655,8 @@ msgid "Checking object directories"

5655 msgstr "Vérification des répertoires d'objet"

5656

5657 #: builtin/fsck.c:603

5629 -msgid "git fsck [options] [<object>...]"

5630 -msgstr "git fsck [options] [<objet>...]"

5658 +msgid "git fsck [<options>] [<object>...]"

5659 +msgstr "git fsck [<options>] [<objet>...]"

5660

5661 #: builtin/fsck.c:609

5662 msgid "show unreachable objects"

@@ -5675,8 +5704,8 @@ msgid "Checking objects"

5704 msgstr "Vérification des objets"

5705

5706 #: builtin/gc.c:24

5678 -msgid "git gc [options]"

5679 -msgstr "git gc [options]"

5707 +msgid "git gc [<options>]"

5708 +msgstr "git gc [<options>]"

5709

5710 #: builtin/gc.c:79

5711 #, c-format

@@ -5739,8 +5768,8 @@ msgstr ""

5768 "supprimer."

5769

5770 #: builtin/grep.c:23

5742 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5743 -msgstr "git grep [options] [-e] <motif> [<révision>...] [[--] <chemin>...]"

5771 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

5772 +msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"

5773

5774 #: builtin/grep.c:218

5775 #, c-format

@@ -5780,8 +5809,8 @@ msgid "search in both tracked and untracked files"

5809 msgstr "rechercher dans les fichiers suivis et non-suivis"

5810

5811 #: builtin/grep.c:644

5783 -msgid "search also in ignored files"

5784 -msgstr "rechercher aussi dans les fichiers ignorés"

5812 +msgid "ignore files specified via '.gitignore'"

5813 +msgstr "ignorer les fichiers spécifiés via '.gitignore'"

5814

5815 #: builtin/grep.c:647

5816 msgid "show non-matching lines"

@@ -5974,17 +6003,15 @@ msgstr "--cached et des arbres sont fournis en même temps."

6003

6004 #: builtin/hash-object.c:82

6005 msgid ""

5977 -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

5978 -"<file>..."

5979 -msgstr ""

5980 -"git hash-object [-t <type>] [-w] [--path=<fichier>|--no-filters] [--stdin] "

5981 -"[--] <fichier>..."

6006 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6007 +"[--] <file>..."

6008 +msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..."

6009

6010 #: builtin/hash-object.c:83

6011 msgid "git hash-object --stdin-paths < <list-of-paths>"

6012 msgstr "git hash-object --stdin-paths < <liste-de-chemins>"

6013

5987 -#: builtin/hash-object.c:94 builtin/tag.c:610

6014 +#: builtin/hash-object.c:94 builtin/tag.c:612

6015 msgid "type"

6016 msgstr "type"

6017

@@ -6036,8 +6063,8 @@ msgid "show info page"

6063 msgstr "afficher la page info"

6064

6065 #: builtin/help.c:52

6039 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

6040 -msgstr "git help [--all] [--guides] [--man|--web|--info] [commande]"

6066 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"

6067 +msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"

6068

6069 #: builtin/help.c:64

6070 #, c-format

@@ -6246,8 +6273,8 @@ msgstr "grave incohérence dans la décompression (inflate)"

6273 msgid "SHA1 COLLISION FOUND WITH %s !"

6274 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6275

6249 -#: builtin/index-pack.c:689 builtin/pack-objects.c:164

6250 -#: builtin/pack-objects.c:256

6276 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6277 +#: builtin/pack-objects.c:254

6278 #, c-format

6279 msgid "unable to read %s"

6280 msgstr "impossible de lire %s"

@@ -6335,97 +6362,97 @@ msgid_plural "pack has %d unresolved deltas"

6362 msgstr[0] "le paquet a %d delta non résolu"

6363 msgstr[1] "le paquet a %d deltas non résolus"

6364

6338 -#: builtin/index-pack.c:1220

6365 +#: builtin/index-pack.c:1219

6366 #, c-format

6367 msgid "unable to deflate appended object (%d)"

6368 msgstr "impossible de compresser l'objet ajouté (%d)"

6369

6343 -#: builtin/index-pack.c:1299

6370 +#: builtin/index-pack.c:1298

6371 #, c-format

6372 msgid "local object %s is corrupt"

6373 msgstr "l'objet local %s est corrompu"

6374

6348 -#: builtin/index-pack.c:1323

6375 +#: builtin/index-pack.c:1322

6376 msgid "error while closing pack file"

6377 msgstr "erreur en fermeture du fichier paquet"

6378

6352 -#: builtin/index-pack.c:1336

6379 +#: builtin/index-pack.c:1335

6380 #, c-format

6381 msgid "cannot write keep file '%s'"

6382 msgstr "impossible d'écrire le fichier \"keep\" '%s'"

6383

6357 -#: builtin/index-pack.c:1344

6384 +#: builtin/index-pack.c:1343

6385 #, c-format

6386 msgid "cannot close written keep file '%s'"

6387 msgstr "impossible de fermer le fichier \"keep\" '%s'"

6388

6362 -#: builtin/index-pack.c:1357

6389 +#: builtin/index-pack.c:1356

6390 msgid "cannot store pack file"

6391 msgstr "impossible de stocker le fichier paquet"

6392

6366 -#: builtin/index-pack.c:1368

6393 +#: builtin/index-pack.c:1367

6394 msgid "cannot store index file"

6395 msgstr "impossible de stocker le fichier d'index"

6396

6370 -#: builtin/index-pack.c:1401

6397 +#: builtin/index-pack.c:1400

6398 #, c-format

6399 msgid "bad pack.indexversion=%<PRIu32>"

6400 msgstr "mauvais pack.indexversion=%<PRIu32>"

6401

6375 -#: builtin/index-pack.c:1407

6402 +#: builtin/index-pack.c:1406

6403 #, c-format

6404 msgid "invalid number of threads specified (%d)"

6405 msgstr "nombre de fils spécifié invalide (%d)"

6406

6380 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590

6407 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6408 #, c-format

6409 msgid "no threads support, ignoring %s"

6410 msgstr "pas de support des fils, ignore %s"

6411

6385 -#: builtin/index-pack.c:1469

6412 +#: builtin/index-pack.c:1468

6413 #, c-format

6414 msgid "Cannot open existing pack file '%s'"

6415 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"

6416

6390 -#: builtin/index-pack.c:1471

6417 +#: builtin/index-pack.c:1470

6418 #, c-format

6419 msgid "Cannot open existing pack idx file for '%s'"

6420 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"

6421

6395 -#: builtin/index-pack.c:1518

6422 +#: builtin/index-pack.c:1517

6423 #, c-format

6424 msgid "non delta: %d object"

6425 msgid_plural "non delta: %d objects"

6426 msgstr[0] "pas un delta : %d objet"

6427 msgstr[1] "pas un delta : %d objets"

6428

6402 -#: builtin/index-pack.c:1525

6429 +#: builtin/index-pack.c:1524

6430 #, c-format

6431 msgid "chain length = %d: %lu object"

6432 msgid_plural "chain length = %d: %lu objects"

6433 msgstr[0] "longueur chaînée = %d : %lu objet"

6434 msgstr[1] "longueur chaînée = %d : %lu objets"

6435

6409 -#: builtin/index-pack.c:1554

6436 +#: builtin/index-pack.c:1553

6437 msgid "Cannot come back to cwd"

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

6439

6413 -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605

6414 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621

6440 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6441 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6442 #, c-format

6443 msgid "bad %s"

6444 msgstr "mauvais %s"

6445

6419 -#: builtin/index-pack.c:1635

6446 +#: builtin/index-pack.c:1634

6447 msgid "--fix-thin cannot be used without --stdin"

6448 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

6449

6423 -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648

6450 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6451 #, c-format

6452 msgid "packfile name '%s' does not end with '.pack'"

6453 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"

6454

6428 -#: builtin/index-pack.c:1656

6455 +#: builtin/index-pack.c:1655

6456 msgid "--verify with no packfile name given"

6457 msgstr "--verify sans nom de fichier paquet donné"

6458

@@ -6538,10 +6565,8 @@ msgstr " partagé"

6565 #: builtin/init-db.c:475

6566 msgid ""

6567 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6541 -"shared[=<permissions>]] [directory]"

6542 -msgstr ""

6543 -"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"

6544 -"shared[=<permissions>]] [répertoire]"

6568 +"shared[=<permissions>]] [<directory>]"

6569 +msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]"

6570

6571 #: builtin/init-db.c:498

6572 msgid "permissions"

@@ -6604,8 +6629,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6629 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"

6630

6631 #: builtin/log.c:42

6607 -msgid "git show [options] <object>..."

6608 -msgstr "git show [options] <objet>..."

6632 +msgid "git show [<options>] <object>..."

6633 +msgstr "git show [<options>] <objet>..."

6634

6635 #: builtin/log.c:81

6636 #, c-format

@@ -6685,8 +6710,8 @@ msgid "insane in-reply-to: %s"

6710 msgstr "in-reply-to aberrant : %s"

6711

6712 #: builtin/log.c:1026

6688 -msgid "git format-patch [options] [<since> | <revision range>]"

6689 -msgstr "git format-patch [options] [<depuis> | <plage de révisions>]"

6713 +msgid "git format-patch [<options>] [<since> | <revision-range>]"

6714 +msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"

6715

6716 #: builtin/log.c:1071

6717 msgid "Two output directories?"

@@ -6887,98 +6912,98 @@ msgstr ""

6912 msgid "Unknown commit %s"

6913 msgstr "Commit inconnu %s"

6914

6890 -#: builtin/ls-files.c:401

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

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

6915 +#: builtin/ls-files.c:358

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

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

6918

6894 -#: builtin/ls-files.c:458

6919 +#: builtin/ls-files.c:415

6920 msgid "identify the file status with tags"

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

6922

6898 -#: builtin/ls-files.c:460

6923 +#: builtin/ls-files.c:417

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

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

6926

6902 -#: builtin/ls-files.c:462

6927 +#: builtin/ls-files.c:419

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

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

6930

6906 -#: builtin/ls-files.c:464

6931 +#: builtin/ls-files.c:421

6932 msgid "show deleted files in the output"

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

6934

6910 -#: builtin/ls-files.c:466

6935 +#: builtin/ls-files.c:423

6936 msgid "show modified files in the output"

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

6938

6914 -#: builtin/ls-files.c:468

6939 +#: builtin/ls-files.c:425

6940 msgid "show other files in the output"

6941 msgstr "afficher les autres fichiers dans la sortie"

6942

6918 -#: builtin/ls-files.c:470

6943 +#: builtin/ls-files.c:427

6944 msgid "show ignored files in the output"

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

6946

6922 -#: builtin/ls-files.c:473

6947 +#: builtin/ls-files.c:430

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

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

6950

6926 -#: builtin/ls-files.c:475

6951 +#: builtin/ls-files.c:432

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

6953 msgstr ""

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

6955

6931 -#: builtin/ls-files.c:477

6956 +#: builtin/ls-files.c:434

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

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

6959

6935 -#: builtin/ls-files.c:480

6960 +#: builtin/ls-files.c:437

6961 msgid "don't show empty directories"

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

6963

6939 -#: builtin/ls-files.c:483

6964 +#: builtin/ls-files.c:440

6965 msgid "show unmerged files in the output"

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

6967

6943 -#: builtin/ls-files.c:485

6968 +#: builtin/ls-files.c:442

6969 msgid "show resolve-undo information"

6970 msgstr "afficher l'information resolv-undo"

6971

6947 -#: builtin/ls-files.c:487

6972 +#: builtin/ls-files.c:444

6973 msgid "skip files matching pattern"

6974 msgstr "sauter les fichiers correspondant au motif"

6975

6951 -#: builtin/ls-files.c:490

6976 +#: builtin/ls-files.c:447

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

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

6979

6955 -#: builtin/ls-files.c:493

6980 +#: builtin/ls-files.c:450

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

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

6983

6959 -#: builtin/ls-files.c:495

6984 +#: builtin/ls-files.c:452

6985 msgid "add the standard git exclusions"

6986 msgstr "ajouter les exclusions git standard"

6987

6963 -#: builtin/ls-files.c:498

6988 +#: builtin/ls-files.c:455

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

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

6991

6967 -#: builtin/ls-files.c:501

6992 +#: builtin/ls-files.c:458

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

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

6995

6971 -#: builtin/ls-files.c:502

6996 +#: builtin/ls-files.c:459

6997 msgid "tree-ish"

6998 msgstr "arbre ou apparenté"

6999

6975 -#: builtin/ls-files.c:503

7000 +#: builtin/ls-files.c:460

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

7002 msgstr ""

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

7004 "toujours présents"

7005

6981 -#: builtin/ls-files.c:505

7006 +#: builtin/ls-files.c:462

7007 msgid "show debugging data"

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

7009

@@ -7021,12 +7046,12 @@ msgstr ""

7046 "full-name)"

7047

7048 #: builtin/merge.c:45

7024 -msgid "git merge [options] [<commit>...]"

7025 -msgstr "git merge [options] [<commit>...]"

7049 +msgid "git merge [<options>] [<commit>...]"

7050 +msgstr "git merge [<options>] [<commit>...]"

7051

7052 #: builtin/merge.c:46

7028 -msgid "git merge [options] <msg> HEAD <commit>"

7029 -msgstr "git merge [options] <message> HEAD <commit>"

7053 +msgid "git merge [<options>] <msg> HEAD <commit>"

7054 +msgstr "git merge [<options>] <message> HEAD <commit>"

7055

7056 #: builtin/merge.c:47

7057 msgid "git merge --abort"

@@ -7378,12 +7403,12 @@ msgstr ""

7403 "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"

7404

7405 #: builtin/merge-base.c:29

7381 -msgid "git merge-base [-a|--all] <commit> <commit>..."

7382 -msgstr "git merge-base [-a|--all] <validation> <validation>..."

7406 +msgid "git merge-base [-a | --all] <commit> <commit>..."

7407 +msgstr "git merge-base [-a | --all] <commit> <commit>..."

7408

7409 #: builtin/merge-base.c:30

7385 -msgid "git merge-base [-a|--all] --octopus <commit>..."

7386 -msgstr "git merge-base [-a|--all] --octopus <validation>..."

7410 +msgid "git merge-base [-a | --all] --octopus <commit>..."

7411 +msgstr "git merge-base [-a | --all] --octopus <commit>..."

7412

7413 #: builtin/merge-base.c:31

7414 msgid "git merge-base --independent <commit>..."

@@ -7419,11 +7444,9 @@ msgstr "trouver où <validation> a divergé du reflog de <référence>"

7444

7445 #: builtin/merge-file.c:8

7446 msgid ""

7422 -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

7423 -"file2"

7424 -msgstr ""

7425 -"git merge-file [options] [-L nom1 [-L orig [-L nom2]]] fichier1 orig_file "

7426 -"fichier2"

7447 +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "

7448 +"<orig-file> <file2>"

7449 +msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>"

7450

7451 #: builtin/merge-file.c:33

7452 msgid "send results to standard output"

@@ -7454,8 +7477,8 @@ msgid "do not warn about conflicts"

7477 msgstr "ne pas avertir à propos des conflits"

7478

7479 #: builtin/merge-file.c:45

7457 -msgid "set labels for file1/orig_file/file2"

7458 -msgstr "définir les labels pour fichier1/orig_file/fichier2"

7480 +msgid "set labels for file1/orig-file/file2"

7481 +msgstr "définir les labels pour fichier1/fichier-orig/fichier2"

7482

7483 #: builtin/mktree.c:64

7484 msgid "git mktree [-z] [--missing] [--batch]"

@@ -7474,8 +7497,8 @@ msgid "allow creation of more than one tree"

7497 msgstr "autoriser la création de plus d'un arbre"

7498

7499 #: builtin/mv.c:15

7477 -msgid "git mv [options] <source>... <destination>"

7478 -msgstr "git mv [options] <source>... <destination>"

7500 +msgid "git mv [<options>] <source>... <destination>"

7501 +msgstr "git mv [<options>] <source>... <destination>"

7502

7503 #: builtin/mv.c:69

7504 #, c-format

@@ -7562,22 +7585,22 @@ msgstr "%s, source=%s, destination=%s"

7585 msgid "Renaming %s to %s\n"

7586 msgstr "Renommage de %s en %s\n"

7587

7565 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355

7588 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7589 #, c-format

7590 msgid "renaming '%s' failed"

7591 msgstr "le renommage de '%s' a échoué"

7592

7593 #: builtin/name-rev.c:255

7571 -msgid "git name-rev [options] <commit>..."

7572 -msgstr "git name-rev [options] <validation>..."

7594 +msgid "git name-rev [<options>] <commit>..."

7595 +msgstr "git name-rev [<options>] <validation>..."

7596

7597 #: builtin/name-rev.c:256

7575 -msgid "git name-rev [options] --all"

7576 -msgstr "git name-rev [options] --all"

7598 +msgid "git name-rev [<options>] --all"

7599 +msgstr "git name-rev [<options>] --all"

7600

7601 #: builtin/name-rev.c:257

7579 -msgid "git name-rev [options] --stdin"

7580 -msgstr "git name-rev [options] --stdin"

7602 +msgid "git name-rev [<options>] --stdin"

7603 +msgstr "git name-rev [<options>] --stdin"

7604

7605 #: builtin/name-rev.c:309

7606 msgid "print only names (no SHA-1)"

@@ -7609,44 +7632,37 @@ msgid "dereference tags in the input (internal use)"

7632 msgstr "déréférencer les étiquettes en entrée (usage interne)"

7633

7634 #: builtin/notes.c:24

7612 -msgid "git notes [--ref <notes_ref>] [list [<object>]]"

7613 -msgstr "git notes [--ref <références_notes>] [list [<object>]]"

7635 +msgid "git notes [--ref <notes-ref>] [list [<object>]]"

7636 +msgstr "git notes [--ref <références-notes>] [list [<object>]]"

7637

7638 #: builtin/notes.c:25

7639 msgid ""

7617 -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7640 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7641 "| (-c | -C) <object>] [<object>]"

7619 -msgstr ""

7620 -"git notes [--ref <références_notes>] add [-f] [--allow-empty] [-m <message> "

7621 -"| -F <fichier> | (-c | -C) <objet>] [<objet>]"

7642 +msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"

7643

7644 #: builtin/notes.c:26

7624 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

7625 -msgstr ""

7626 -"git notes [--ref <références_notes>] copy [-f] <depuis-objet> <vers-objet>"

7645 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"

7646 +msgstr "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"

7647

7648 #: builtin/notes.c:27

7649 msgid ""

7630 -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7650 +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7651 "(-c | -C) <object>] [<object>]"

7632 -msgstr ""

7633 -"git notes [--ref <références_notes>] append [--allow-empty] [-m <message> | -"

7634 -"F <fichier> | (-c | -C) <objet>] [<objet>]"

7652 +msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"

7653

7654 #: builtin/notes.c:28

7637 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7638 -msgstr "git notes [--ref <références_notes>] edit [--allow-empty] [<objet>]"

7655 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

7656 +msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"

7657

7658 #: builtin/notes.c:29

7641 -msgid "git notes [--ref <notes_ref>] show [<object>]"

7642 -msgstr "git notes [--ref <références_notes>] show [<objet>]"

7659 +msgid "git notes [--ref <notes-ref>] show [<object>]"

7660 +msgstr "git notes [--ref <références-notes>] show [<objet>]"

7661

7662 #: builtin/notes.c:30

7663 msgid ""

7646 -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

7647 -msgstr ""

7648 -"git notes [--ref <références_notes>] merge [-v | -q] [-s <stratégie> ] "

7649 -"<références_notes>"

7664 +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"

7665 +msgstr "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] <références-notes>"

7666

7667 #: builtin/notes.c:31

7668 msgid "git notes merge --commit [-v | -q]"

@@ -7657,16 +7673,16 @@ msgid "git notes merge --abort [-v | -q]"

7673 msgstr "git notes merge --abort [-v | -q]"

7674

7675 #: builtin/notes.c:33

7660 -msgid "git notes [--ref <notes_ref>] remove [<object>...]"

7661 -msgstr "git notes [--ref <références_notes>] remove [<objet>...]"

7676 +msgid "git notes [--ref <notes-ref>] remove [<object>...]"

7677 +msgstr "git notes [--ref <références-notes>] remove [<objet>...]"

7678

7679 #: builtin/notes.c:34

7664 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

7665 -msgstr "git notes [--ref <références_notes>] prune [-n | -v]"

7680 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]"

7681 +msgstr "git notes [--ref <références-notes>] prune [-n | -v]"

7682

7683 #: builtin/notes.c:35

7668 -msgid "git notes [--ref <notes_ref>] get-ref"

7669 -msgstr "git notes [--ref <références_notes>] get-ref"

7684 +msgid "git notes [--ref <notes-ref>] get-ref"

7685 +msgstr "git notes [--ref <références-notes>] get-ref"

7686

7687 #: builtin/notes.c:40

7688 msgid "git notes [list [<object>]]"

@@ -7697,8 +7713,8 @@ msgid "git notes show [<object>]"

7713 msgstr "git notes show [<objet>]"

7714

7715 #: builtin/notes.c:71

7700 -msgid "git notes merge [<options>] <notes_ref>"

7701 -msgstr "git notes merge [<options>] <références_notes>"

7716 +msgid "git notes merge [<options>] <notes-ref>"

7717 +msgstr "git notes merge [<options>] <références-notes>"

7718

7719 #: builtin/notes.c:72

7720 msgid "git notes merge --commit [<options>]"

@@ -7936,8 +7952,8 @@ msgid "notes-ref"

7952 msgstr "références-notes"

7953

7954 #: builtin/notes.c:954

7939 -msgid "use notes from <notes_ref>"

7940 -msgstr "utiliser les notes depuis <références_notes>"

7955 +msgid "use notes from <notes-ref>"

7956 +msgstr "utiliser les notes depuis <références-notes>"

7957

7958 #: builtin/notes.c:989 builtin/remote.c:1621

7959 #, c-format

@@ -7954,196 +7970,196 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7970 msgstr ""

7971 "git pack-objects [options...] base-name [< liste-références | < liste-objets]"

7972

7957 -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180

7973 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7974 #, c-format

7975 msgid "deflate error (%d)"

7976 msgstr "erreur de compression (%d)"

7977

7962 -#: builtin/pack-objects.c:773

7978 +#: builtin/pack-objects.c:771

7979 msgid "Writing objects"

7980 msgstr "Écriture des objets"

7981

7966 -#: builtin/pack-objects.c:1015

7982 +#: builtin/pack-objects.c:1013

7983 msgid "disabling bitmap writing, as some objects are not being packed"

7984 msgstr ""

7985 "désactivation de l'écriture en bitmap car certains objets ne sont pas "

7986 "compressés"

7987

7972 -#: builtin/pack-objects.c:2175

7988 +#: builtin/pack-objects.c:2173

7989 msgid "Compressing objects"

7990 msgstr "Compression des objets"

7991

7976 -#: builtin/pack-objects.c:2572

7992 +#: builtin/pack-objects.c:2570

7993 #, c-format

7994 msgid "unsupported index version %s"

7995 msgstr "version d'index non supportée %s"

7996

7981 -#: builtin/pack-objects.c:2576

7997 +#: builtin/pack-objects.c:2574

7998 #, c-format

7999 msgid "bad index version '%s'"

8000 msgstr "mauvaise version d'index '%s'"

8001

7986 -#: builtin/pack-objects.c:2599

8002 +#: builtin/pack-objects.c:2597

8003 #, c-format

8004 msgid "option %s does not accept negative form"

8005 msgstr "l'option %s n'accepte pas de valeur négative"

8006

7991 -#: builtin/pack-objects.c:2603

8007 +#: builtin/pack-objects.c:2601

8008 #, c-format

8009 msgid "unable to parse value '%s' for option %s"

8010 msgstr "impossible d'analyser la valeur '%s' pour l'option %s"

8011

7996 -#: builtin/pack-objects.c:2623

8012 +#: builtin/pack-objects.c:2621

8013 msgid "do not show progress meter"

8014 msgstr "ne pas afficher la barre de progression"

8015

8000 -#: builtin/pack-objects.c:2625

8016 +#: builtin/pack-objects.c:2623

8017 msgid "show progress meter"

8018 msgstr "afficher la barre de progression"

8019

8004 -#: builtin/pack-objects.c:2627

8020 +#: builtin/pack-objects.c:2625

8021 msgid "show progress meter during object writing phase"

8022 msgstr "afficher la barre de progression durant la phase d'écrite des objets"

8023

8008 -#: builtin/pack-objects.c:2630

8024 +#: builtin/pack-objects.c:2628

8025 msgid "similar to --all-progress when progress meter is shown"

8026 msgstr "similaire à --all-progress quand la barre de progression est affichée"

8027

8012 -#: builtin/pack-objects.c:2631

8028 +#: builtin/pack-objects.c:2629

8029 msgid "version[,offset]"

8030 msgstr "version[,offset]"

8031

8016 -#: builtin/pack-objects.c:2632

8032 +#: builtin/pack-objects.c:2630

8033 msgid "write the pack index file in the specified idx format version"

8034 msgstr ""

8035 "écrire le fichier d'index du paquet dans le format d'index de version "

8036 "spécifié"

8037

8022 -#: builtin/pack-objects.c:2635

8038 +#: builtin/pack-objects.c:2633

8039 msgid "maximum size of each output pack file"

8040 msgstr "taille maximum de chaque fichier paquet en sortie"

8041

8026 -#: builtin/pack-objects.c:2637

8042 +#: builtin/pack-objects.c:2635

8043 msgid "ignore borrowed objects from alternate object store"

8044 msgstr "ignorer les objets empruntés à un autre magasin d'objets"

8045

8030 -#: builtin/pack-objects.c:2639

8046 +#: builtin/pack-objects.c:2637

8047 msgid "ignore packed objects"

8048 msgstr "ignorer les objets empaquetés"

8049

8034 -#: builtin/pack-objects.c:2641

8050 +#: builtin/pack-objects.c:2639

8051 msgid "limit pack window by objects"

8052 msgstr "limiter la fenêtre d'empaquetage par objets"

8053

8038 -#: builtin/pack-objects.c:2643

8054 +#: builtin/pack-objects.c:2641

8055 msgid "limit pack window by memory in addition to object limit"

8056 msgstr ""

8057 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"

8058

8043 -#: builtin/pack-objects.c:2645

8059 +#: builtin/pack-objects.c:2643

8060 msgid "maximum length of delta chain allowed in the resulting pack"

8061 msgstr ""

8062 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"

8063

8048 -#: builtin/pack-objects.c:2647

8064 +#: builtin/pack-objects.c:2645

8065 msgid "reuse existing deltas"

8066 msgstr "réutiliser les deltas existants"

8067

8052 -#: builtin/pack-objects.c:2649

8068 +#: builtin/pack-objects.c:2647

8069 msgid "reuse existing objects"

8070 msgstr "réutiliser les objets existants"

8071

8056 -#: builtin/pack-objects.c:2651

8072 +#: builtin/pack-objects.c:2649

8073 msgid "use OFS_DELTA objects"

8074 msgstr "utiliser les objets OFS_DELTA"

8075

8060 -#: builtin/pack-objects.c:2653

8076 +#: builtin/pack-objects.c:2651

8077 msgid "use threads when searching for best delta matches"

8078 msgstr ""

8079 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "

8080 "deltas"

8081

8066 -#: builtin/pack-objects.c:2655

8082 +#: builtin/pack-objects.c:2653

8083 msgid "do not create an empty pack output"

8084 msgstr "ne pas créer un paquet vide"

8085

8070 -#: builtin/pack-objects.c:2657

8086 +#: builtin/pack-objects.c:2655

8087 msgid "read revision arguments from standard input"

8088 msgstr "lire les paramètres de révision depuis l'entrée standard"

8089

8074 -#: builtin/pack-objects.c:2659

8090 +#: builtin/pack-objects.c:2657

8091 msgid "limit the objects to those that are not yet packed"

8092 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"

8093

8078 -#: builtin/pack-objects.c:2662

8094 +#: builtin/pack-objects.c:2660

8095 msgid "include objects reachable from any reference"

8096 msgstr "inclure les objets accessibles depuis toute référence"

8097

8082 -#: builtin/pack-objects.c:2665

8098 +#: builtin/pack-objects.c:2663

8099 msgid "include objects referred by reflog entries"

8100 msgstr "inclure les objets référencés par les éléments de reflog"

8101

8086 -#: builtin/pack-objects.c:2668

8102 +#: builtin/pack-objects.c:2666

8103 msgid "include objects referred to by the index"

8104 msgstr "inclure les objets référencés par l'index"

8105

8090 -#: builtin/pack-objects.c:2671

8106 +#: builtin/pack-objects.c:2669

8107 msgid "output pack to stdout"

8108 msgstr "afficher l'empaquetage sur la sortie standard"

8109

8094 -#: builtin/pack-objects.c:2673

8110 +#: builtin/pack-objects.c:2671

8111 msgid "include tag objects that refer to objects to be packed"

8112 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"

8113

8098 -#: builtin/pack-objects.c:2675

8114 +#: builtin/pack-objects.c:2673

8115 msgid "keep unreachable objects"

8116 msgstr "garder les objets inaccessibles"

8117

8102 -#: builtin/pack-objects.c:2676 parse-options.h:140

8118 +#: builtin/pack-objects.c:2674 parse-options.h:140

8119 msgid "time"

8120 msgstr "heure"

8121

8106 -#: builtin/pack-objects.c:2677

8122 +#: builtin/pack-objects.c:2675

8123 msgid "unpack unreachable objects newer than <time>"

8124 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"

8125

8110 -#: builtin/pack-objects.c:2680

8126 +#: builtin/pack-objects.c:2678

8127 msgid "create thin packs"

8128 msgstr "créer des paquets légers"

8129

8114 -#: builtin/pack-objects.c:2682

8130 +#: builtin/pack-objects.c:2680

8131 msgid "create packs suitable for shallow fetches"

8132 msgstr "créer des paquets permettant des récupérations superficielles"

8133

8118 -#: builtin/pack-objects.c:2684

8134 +#: builtin/pack-objects.c:2682

8135 msgid "ignore packs that have companion .keep file"

8136 msgstr "ignorer les paquets qui ont un fichier .keep"

8137

8122 -#: builtin/pack-objects.c:2686

8138 +#: builtin/pack-objects.c:2684

8139 msgid "pack compression level"

8140 msgstr "niveau de compression du paquet"

8141

8126 -#: builtin/pack-objects.c:2688

8142 +#: builtin/pack-objects.c:2686

8143 msgid "do not hide commits by grafts"

8144 msgstr "ne pas cacher les validations par greffes"

8145

8130 -#: builtin/pack-objects.c:2690

8146 +#: builtin/pack-objects.c:2688

8147 msgid "use a bitmap index if available to speed up counting objects"

8148 msgstr ""

8149 "utiliser un index en bitmap si disponible pour accélerer le décompte des "

8150 "objets"

8151

8136 -#: builtin/pack-objects.c:2692

8152 +#: builtin/pack-objects.c:2690

8153 msgid "write a bitmap index together with the pack index"

8154 msgstr "écrire un index en bitmap associé à l'index de paquet"

8155

8140 -#: builtin/pack-objects.c:2783

8156 +#: builtin/pack-objects.c:2781

8157 msgid "Counting objects"

8158 msgstr "Décompte des objets"

8159

8160 #: builtin/pack-refs.c:6

8145 -msgid "git pack-refs [options]"

8146 -msgstr "git pack-refs [options]"

8161 +msgid "git pack-refs [<options>]"

8162 +msgstr "git pack-refs [<options>]"

8163

8164 #: builtin/pack-refs.c:14

8165 msgid "pack everything"

@@ -8154,8 +8170,8 @@ msgid "prune loose refs (default)"

8170 msgstr "éliminer les références perdues (défaut)"

8171

8172 #: builtin/prune-packed.c:7

8157 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"

8158 -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"

8173 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"

8174 +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"

8175

8176 #: builtin/prune-packed.c:40

8177 msgid "Removing duplicate objects"

@@ -8450,76 +8466,80 @@ msgstr "--mirror ne peut pas être combiné avec des spécifications de référe

8466 msgid "--all and --mirror are incompatible"

8467 msgstr "--all et --mirror sont incompatibles"

8468

8453 -#: builtin/push.c:493

8469 +#: builtin/push.c:502

8470 msgid "repository"

8471 msgstr "dépôt"

8472

8457 -#: builtin/push.c:494

8473 +#: builtin/push.c:503

8474 msgid "push all refs"

8475 msgstr "pousser toutes les références"

8476

8461 -#: builtin/push.c:495

8477 +#: builtin/push.c:504

8478 msgid "mirror all refs"

8479 msgstr "refléter toutes les références"

8480

8465 -#: builtin/push.c:497

8481 +#: builtin/push.c:506

8482 msgid "delete refs"

8483 msgstr "supprimer les références"

8484

8469 -#: builtin/push.c:498

8485 +#: builtin/push.c:507

8486 msgid "push tags (can't be used with --all or --mirror)"

8487 msgstr ""

8488 "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"

8489

8474 -#: builtin/push.c:501

8490 +#: builtin/push.c:510

8491 msgid "force updates"

8492 msgstr "forcer les mises à jour"

8493

8478 -#: builtin/push.c:503

8494 +#: builtin/push.c:512

8495 msgid "refname>:<expect"

8496 msgstr "nom de référence>:<attendu"

8497

8482 -#: builtin/push.c:504

8498 +#: builtin/push.c:513

8499 msgid "require old value of ref to be at this value"

8500 msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"

8501

8486 -#: builtin/push.c:507

8502 +#: builtin/push.c:516

8503 msgid "control recursive pushing of submodules"

8504 msgstr "contrôler la poussée récursive des sous-modules"

8505

8490 -#: builtin/push.c:509

8506 +#: builtin/push.c:518

8507 msgid "use thin pack"

8508 msgstr "utiliser un empaquetage léger"

8509

8494 -#: builtin/push.c:510 builtin/push.c:511

8510 +#: builtin/push.c:519 builtin/push.c:520

8511 msgid "receive pack program"

8512 msgstr "recevoir le programme d'empaquetage"

8513

8498 -#: builtin/push.c:512

8514 +#: builtin/push.c:521

8515 msgid "set upstream for git pull/status"

8516 msgstr "définir la branche amont pour git pull/status"

8517

8502 -#: builtin/push.c:515

8518 +#: builtin/push.c:524

8519 msgid "prune locally removed refs"

8520 msgstr "éliminer les références locales supprimées"

8521

8506 -#: builtin/push.c:517

8522 +#: builtin/push.c:526

8523 msgid "bypass pre-push hook"

8524 msgstr "éviter d'utiliser le crochet pre-push"

8525

8510 -#: builtin/push.c:518

8526 +#: builtin/push.c:527

8527 msgid "push missing but relevant tags"

8528 msgstr "pousser les étiquettes manquantes mais pertinentes"

8529

8514 -#: builtin/push.c:520

8530 +#: builtin/push.c:529

8531 msgid "GPG sign the push"

8532 msgstr "signer la poussée avec GPG"

8533

8518 -#: builtin/push.c:529

8534 +#: builtin/push.c:530

8535 +msgid "request atomic transaction on remote side"

8536 +msgstr "demande une transaction atomique sur le serveur distant"

8537 +

8538 +#: builtin/push.c:539

8539 msgid "--delete is incompatible with --all, --mirror and --tags"

8540 msgstr "--delete est incompatible avec --all, --mirror et --tags"

8541

8522 -#: builtin/push.c:531

8542 +#: builtin/push.c:541

8543 msgid "--delete doesn't make sense without any refs"

8544 msgstr "--delete n'a pas de sens sans aucune référence"

8545

@@ -8598,12 +8618,12 @@ msgstr "sauter l'application du filtre d'extraction creuse"

8618 msgid "debug unpack-trees"

8619 msgstr "déboguer unpack-trees"

8620

8601 -#: builtin/reflog.c:499

8621 +#: builtin/reflog.c:429

8622 #, c-format

8623 msgid "%s' for '%s' is not a valid timestamp"

8624 msgstr "%s' pour '%s' n'est pas un horodatage valide"

8625

8606 -#: builtin/reflog.c:615 builtin/reflog.c:620

8626 +#: builtin/reflog.c:546 builtin/reflog.c:551

8627 #, c-format

8628 msgid "'%s' is not a valid timestamp"

8629 msgstr "'%s' n'est pas un horodatage valide"

@@ -8614,11 +8634,9 @@ msgstr "git remote [-v | --verbose]"

8634

8635 #: builtin/remote.c:13

8636 msgid ""

8617 -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

8637 +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"

8638 "mirror=<fetch|push>] <name> <url>"

8619 -msgstr ""

8620 -"git remote add [-t <branche>] [-m <maîtresse>] [-f] [--tags|--no-tags] [--"

8621 -"mirror=<fetch|push>] <nom> <URL>"

8639 +msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>"

8640

8641 #: builtin/remote.c:14 builtin/remote.c:33

8642 msgid "git remote rename <old> <new>"

@@ -8628,9 +8646,9 @@ msgstr "git remote rename <ancienne> <nouvelle>"

8646 msgid "git remote remove <name>"

8647 msgstr "git remote remove <nom>"

8648

8631 -#: builtin/remote.c:16

8632 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

8633 -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"

8649 +#: builtin/remote.c:16 builtin/remote.c:43

8650 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8651 +msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"

8652

8653 #: builtin/remote.c:17

8654 msgid "git remote [-v | --verbose] show [-n] <name>"

@@ -8667,10 +8685,6 @@ msgstr "git remote set-url --delete <nom> <URL>"

8685 msgid "git remote add [<options>] <name> <url>"

8686 msgstr "git remote add [<options>] <nom> <URL>"

8687

8670 -#: builtin/remote.c:43

8671 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8672 -msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"

8673 -

8688 #: builtin/remote.c:48

8689 msgid "git remote set-branches <name> <branch>..."

8690 msgstr "git remote set-branches <nom> <branche>..."

@@ -9114,8 +9128,8 @@ msgid "be verbose; must be placed before a subcommand"

9128 msgstr "être verbeux : doit être placé avant une sous-commande"

9129

9130 #: builtin/repack.c:17

9117 -msgid "git repack [options]"

9118 -msgstr "git repack [options]"

9131 +msgid "git repack [<options>]"

9132 +msgstr "git repack [<options>]"

9133

9134 #: builtin/repack.c:159

9135 msgid "pack everything in a single pack"

@@ -9182,7 +9196,7 @@ msgstr "taille maximum de chaque fichier paquet"

9196 msgid "repack objects in packs marked with .keep"

9197 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"

9198

9185 -#: builtin/repack.c:371

9199 +#: builtin/repack.c:375

9200 #, c-format

9201 msgid "removing '%s' failed"

9202 msgstr "la suppression de '%s' a échoué"

@@ -9274,8 +9288,8 @@ msgid "use this format"

9288 msgstr "utiliser ce format"

9289

9290 #: builtin/rerere.c:12

9293

9294 #: builtin/rerere.c:57

9295 msgid "register clean resolutions in index"

@@ -9417,8 +9431,8 @@ msgid "Could not write new index file."

9431 msgstr "Impossible d'écrire le nouveau fichier d'index."

9432

9433 #: builtin/rev-parse.c:361

9420 -msgid "git rev-parse --parseopt [options] -- [<args>...]"

9421 -msgstr "git rev-parse --parseopt [options] -- [<arguments>...]"

9434 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]"

9435 +msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"

9436

9437 #: builtin/rev-parse.c:366

9438 msgid "keep the `--` passed as an arg"

@@ -9434,30 +9448,29 @@ msgstr "sortie en forme longue fixée"

9448

9449 #: builtin/rev-parse.c:499

9450 msgid ""

9437 -"git rev-parse --parseopt [options] -- [<args>...]\n"

9451 +"git rev-parse --parseopt [<options>] -- [<args>...]\n"

9452 " or: git rev-parse --sq-quote [<arg>...]\n"

9439 -" or: git rev-parse [options] [<arg>...]\n"

9453 +" or: git rev-parse [<options>] [<arg>...]\n"

9454 "\n"

9455 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."

9456 msgstr ""

9443 -"git rev-parse --parseopt [options] -- [<arguments>...]\n"

9457 +"git rev-parse --parseopt [<options>] -- [<arguments>...]\n"

9458 " ou : git rev-parse --sq-quote [<argument>...]\n"

9459 " ou : git rev-parse [options] [<argument>...]\n"

9460 "\n"

9447 -"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "

9448 -"l'utilisation principale."

9461 +"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale."

9462

9463 #: builtin/revert.c:22

9451 -msgid "git revert [options] <commit-ish>..."

9452 -msgstr "git revert [options] <commit ou apparenté>..."

9464 +msgid "git revert [<options>] <commit-ish>..."

9465 +msgstr "git revert [<options>] <commit ou apparenté>..."

9466

9467 #: builtin/revert.c:23

9468 msgid "git revert <subcommand>"

9469 msgstr "git revert <sous-commande>"

9470

9471 #: builtin/revert.c:28

9459 -msgid "git cherry-pick [options] <commit-ish>..."

9460 -msgstr "git cherry-pick [options] <commit ou apparenté>..."

9472 +msgid "git cherry-pick [<options>] <commit-ish>..."

9473 +msgstr "git cherry-pick [<options>] <commit ou apparenté>..."

9474

9475 #: builtin/revert.c:29

9476 msgid "git cherry-pick <subcommand>"

@@ -9537,8 +9550,8 @@ msgid "cherry-pick failed"

9550 msgstr "le picorage a échoué"

9551

9552 #: builtin/rm.c:17

9540 -msgid "git rm [options] [--] <file>..."

9541 -msgstr "git rm [options] [--] <fichier>..."

9553 +msgid "git rm [<options>] [--] <file>..."

9554 +msgstr "git rm [<options>] [--] <fichier>..."

9555

9556 #: builtin/rm.c:65

9557 msgid ""

@@ -9642,8 +9655,8 @@ msgid "git rm: unable to remove %s"

9655 msgstr "git rm : impossible de supprimer %s"

9656

9657 #: builtin/shortlog.c:13

9645 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

9646 -msgstr "git shortlog [<options>] [<intervalle révisions>] [[--] [<chemin>...]]"

9658 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"

9659 +msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"

9660

9661 #: builtin/shortlog.c:131

9662 #, c-format

@@ -9674,19 +9687,19 @@ msgstr "Couper les lignes"

9687

9688 #: builtin/show-branch.c:9

9689 msgid ""

9677 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"

9690 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

9691 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"

9692 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"

9693 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"

9694 msgstr ""

9682 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"

9695 +"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"

9696 "\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"

9697 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"

9698 "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"

9699

9700 #: builtin/show-branch.c:13

9688 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9689 -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<référence>]"

9701 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"

9702 +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"

9703

9704 #: builtin/show-branch.c:652

9705 msgid "show remote-tracking and local branches"

@@ -9756,11 +9769,9 @@ msgstr ""

9769

9770 #: builtin/show-ref.c:10

9771 msgid ""

9759 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

9760 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

9761 -msgstr ""

9762 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

9763 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [motif*] "

9772 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9773 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"

9774 +msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"

9775

9776 #: builtin/show-ref.c:11

9777 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

@@ -9804,12 +9815,12 @@ msgstr ""

9815 "local"

9816

9817 #: builtin/symbolic-ref.c:7

9807 -msgid "git symbolic-ref [options] name [ref]"

9808 -msgstr "git symbolic-ref [options] nom [référence]"

9818 +msgid "git symbolic-ref [<options>] <name> [<ref>]"

9819 +msgstr "git symbolic-ref [<options>] nom [<référence>]"

9820

9821 #: builtin/symbolic-ref.c:8

9811 -msgid "git symbolic-ref -d [-q] name"

9812 -msgstr "git symbolic-ref -d [-q] nom"

9822 +msgid "git symbolic-ref -d [-q] <name>"

9823 +msgstr "git symbolic-ref -d [-q] <nom>"

9824

9825 #: builtin/symbolic-ref.c:40

9826 msgid "suppress error message for non-symbolic (detached) refs"

@@ -9834,10 +9845,9 @@ msgstr "raison de la mise à jour"

9845

9846 #: builtin/tag.c:22

9847 msgid ""

9837 -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"

9838 -msgstr ""

9839 -"git tag [-a|-s|-u <id-clé>] [-f] [-m <message>|-F <file>] <nométiquette> "

9848 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "

9849 "[<head>]"

9850 +msgstr "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-étiquette> [<head>]"

9851

9852 #: builtin/tag.c:23

9853 msgid "git tag -d <tagname>..."

@@ -9845,10 +9855,10 @@ msgstr "git tag -d <nométiquette>..."

9855

9856 #: builtin/tag.c:24

9857 msgid ""

9848 -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"

9858 +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"

9859 "\t\t[<pattern>...]"

9860 msgstr ""

9851 -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>] \n"

9861 +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n"

9862 "\t\t[<motif>...]"

9863

9864 #: builtin/tag.c:26

@@ -9992,18 +10002,18 @@ msgstr "utiliser une autre clé pour signer l'étiquette"

10002 msgid "replace the tag if exists"

10003 msgstr "remplacer l'étiquette si elle existe"

10004

9995 -#: builtin/tag.c:608

10005 +#: builtin/tag.c:609

10006 +msgid "Tag listing options"

10007 +msgstr "Options d'affichage des étiquettes"

10008 +

10009 +#: builtin/tag.c:610

10010 msgid "show tag list in columns"

10011 msgstr "afficher la liste des étiquettes sous forme de colonnes"

10012

9999 -#: builtin/tag.c:610

10013 +#: builtin/tag.c:612

10014 msgid "sort tags"

10015 msgstr "trier les étiquettes"

10016

10003 -#: builtin/tag.c:614

10004 -msgid "Tag listing options"

10005 -msgstr "Options d'affichage des étiquettes"

10006 -

10017 #: builtin/tag.c:617 builtin/tag.c:623

10018 msgid "print only tags that contain the commit"

10019 msgstr "afficher seulement les étiquettes qui contiennent la validation"

@@ -10060,8 +10070,8 @@ msgid "Unpacking objects"

10070 msgstr "Dépaquetage des objets"

10071

10072 #: builtin/update-index.c:403

10063 -msgid "git update-index [options] [--] [<file>...]"

10064 -msgstr "git update-index [options] [--] [<fichier>...]"

10073 +msgid "git update-index [<options>] [--] [<file>...]"

10074 +msgstr "git update-index [<options>] [--] [<fichier>...]"

10075

10076 #: builtin/update-index.c:756

10077 msgid "continue refresh even when index needs update"

@@ -10180,18 +10190,16 @@ msgid "enable or disable split index"

10190 msgstr "activer ou désactiver l'index divisé"

10191

10192 #: builtin/update-ref.c:9

10183 -msgid "git update-ref [options] -d <refname> [<oldval>]"

10184 -msgstr "git update-ref [options] -d <nomréférence> [<anciennevaleur>]"

10193 +msgid "git update-ref [<options>] -d <refname> [<old-val>]"

10194 +msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"

10195

10196 #: builtin/update-ref.c:10

10187 -msgid "git update-ref [options] <refname> <newval> [<oldval>]"

10188 -msgstr ""

10189 -"git update-ref [options] <nomréférence> <nouvellevaleur> "

10190 -"[<anciennevaleur>]"

10197 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"

10198 +msgstr "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]"

10199

10200 #: builtin/update-ref.c:11

10193 -msgid "git update-ref [options] --stdin [-z]"

10194 -msgstr "git update-ref [options] --stdin [-z]"

10201 +msgid "git update-ref [<options>] --stdin [-z]"

10202 +msgstr "git update-ref [<options>] --stdin [-z]"

10203

10204 #: builtin/update-ref.c:359

10205 msgid "delete the reference"

@@ -10218,16 +10226,16 @@ msgid "update the info files from scratch"

10226 msgstr "mettre à jour les fichiers d'information à partir de zéro"

10227

10228 #: builtin/verify-commit.c:17

10221 -msgid "git verify-commit [-v|--verbose] <commit>..."

10222 -msgstr "git verify-commit [-v|--verbose] <commit>..."

10229 +msgid "git verify-commit [-v | --verbose] <commit>..."

10230 +msgstr "git verify-commit [-v | --verbose] <commit>..."

10231

10232 #: builtin/verify-commit.c:75

10233 msgid "print commit contents"

10234 msgstr "afficher le contenu du commit"

10235

10236 #: builtin/verify-pack.c:54

10229 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."

10230 -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."

10237 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."

10238 +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."

10239

10240 #: builtin/verify-pack.c:64

10241 msgid "verbose"

@@ -10238,8 +10246,8 @@ msgid "show statistics only"

10246 msgstr "afficher seulement les statistiques"

10247

10248 #: builtin/verify-tag.c:17

10241 -msgid "git verify-tag [-v|--verbose] <tag>..."

10242 -msgstr "git verify-tag [-v|--verbose] <étiquette>..."

10249 +msgid "git verify-tag [-v | --verbose] <tag>..."

10250 +msgstr "git verify-tag [-v | --verbose] <étiquette>..."

10251

10252 #: builtin/verify-tag.c:73

10253 msgid "print tag contents"

@@ -10600,10 +10608,8 @@ msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"

10608 #: git-bisect.sh:130

10609 #, sh-format

10610 msgid ""

10603 -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."

10604 -msgstr ""

10605 -"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset "

10606 -"<branchevalide>'."

10611 +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."

10612 +msgstr "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-valide>'."

10613

10614 #: git-bisect.sh:140

10615 msgid "won't bisect on cg-seek'ed tree"

@@ -11381,6 +11387,18 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"

11387 msgid "Synchronizing submodule url for '$displaypath'"

11388 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"

11389

11390 +#~ msgid "(detached from %s)"

11391 +#~ msgstr "(détaché de %s)"

11392 +

11393 +#~ msgid "No existing author found with '%s'"

11394 +#~ msgstr "Aucun auteur existant trouvé avec '%s'"

11395 +

11396 +#~ msgid "search also in ignored files"

11397 +#~ msgstr "rechercher aussi dans les fichiers ignorés"

11398 +

11399 +#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

11400 +#~ msgstr "git remote set-head <nom> (-a | --auto | -d | --delete |<branche>)"

11401 +

11402 #~ msgid "no files added"

11403 #~ msgstr "aucun fichier ajouté"

11404

l10n: fr.po v2.4.0-rc0 round 1