fa54b52432 · 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-03-27 13:33+0800\n"

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

76 +"POT-Creation-Date: 2015-04-03 08:13+0800\n"

77 +"PO-Revision-Date: 2015-04-04 18:03+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"

@@ -108,7 +108,9 @@ msgstr "git archive --list"

108 #: archive.c:13

109 msgid ""

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>...]"

111 +msgstr ""

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

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

114

115 #: archive.c:14

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

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

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

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

327

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

328 +#: bundle.c:87 builtin/commit.c:766

329 #, c-format

330 msgid "could not open '%s'"

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

@@ -333,7 +335,7 @@ msgid "Repository lacks these prerequisite commits:"

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

336

337 #: 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

338 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330

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

340 #: builtin/shortlog.c:158

341 msgid "revision walk setup failed"

@@ -956,27 +958,27 @@ msgstr "échec de fusion des arbres %s et %s"

958 msgid "Unprocessed path??? %s"

959 msgstr "Chemin non traité ??? %s"

960

959 -#: merge-recursive.c:1898

961 +#: merge-recursive.c:1901

962 msgid "Merging:"

963 msgstr "Fusion :"

964

963 -#: merge-recursive.c:1911

965 +#: merge-recursive.c:1914

966 #, c-format

967 msgid "found %u common ancestor:"

968 msgid_plural "found %u common ancestors:"

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

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

971

970 -#: merge-recursive.c:1948

972 +#: merge-recursive.c:1951

973 msgid "merge returned no commit"

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

975

974 -#: merge-recursive.c:2005

976 +#: merge-recursive.c:2008

977 #, c-format

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

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

980

979 -#: merge-recursive.c:2016 builtin/merge.c:667

981 +#: merge-recursive.c:2019 builtin/merge.c:667

982 msgid "Unable to write index."

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

984

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

1109 msgid "done"

1110 msgstr "fait"

1111

1110 -#: read-cache.c:1273

1112 +#: read-cache.c:1275

1113 #, c-format

1114 msgid ""

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

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

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

1119 "Utilisation de la version %i"

1120

1119 -#: read-cache.c:1283

1121 +#: read-cache.c:1285

1122 #, c-format

1123 msgid ""

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

@@ -1227,8 +1229,8 @@ msgid "the receiving end does not support --signed push"

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

1230

1231 #: send-pack.c:366

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

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

1232 +msgid "the receiving end does not support --atomic push"

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

1234

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

1236 #: builtin/merge.c:1005

@@ -1437,7 +1439,7 @@ msgstr "impossible de résoudre HEAD"

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

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

1441

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

1442 +#: sequencer.c:908 builtin/apply.c:4288

1443 #, c-format

1444 msgid "cannot open %s: %s"

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

@@ -2092,7 +2094,7 @@ msgstr "git add [<options>] [--] <chemin>..."

2094 msgid "unexpected diff status %c"

2095 msgstr "status de diff inattendu %c"

2096

2095 -#: builtin/add.c:70 builtin/commit.c:275

2097 +#: builtin/add.c:70 builtin/commit.c:277

2098 msgid "updating files failed"

2099 msgstr "échec de la mise à jour des fichiers"

2100

@@ -2143,8 +2145,8 @@ msgstr ""

2145 msgid "dry run"

2146 msgstr "simuler l'action"

2147

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/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

2149 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608

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

2151 msgid "be verbose"

2152 msgstr "mode verbeux"

@@ -2225,11 +2227,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2228

2229 #: 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

2230 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2231 msgid "index file corrupt"

2232 msgstr "fichier d'index corrompu"

2233

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

2234 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431

2235 msgid "Unable to write new index file"

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

2237

@@ -2372,19 +2374,19 @@ msgstr "ouverture ou lecture de %s impossible"

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

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

2376

2375 -#: builtin/apply.c:2896

2377 +#: builtin/apply.c:2897

2378 #, c-format

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

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

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

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

2383

2382 -#: builtin/apply.c:2908

2384 +#: builtin/apply.c:2909

2385 #, c-format

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

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

2388

2387 -#: builtin/apply.c:2914

2389 +#: builtin/apply.c:2915

2390 #, c-format

2391 msgid ""

2392 "while searching for:\n"

@@ -2393,347 +2395,347 @@ msgstr ""

2395 "pendant la recherche de :\n"

2396 "%.*s"

2397

2396 -#: builtin/apply.c:2933

2398 +#: builtin/apply.c:2935

2399 #, c-format

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

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

2402

2401 -#: builtin/apply.c:3034

2403 +#: builtin/apply.c:3036

2404 #, c-format

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

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

2407

2406 -#: builtin/apply.c:3040

2408 +#: builtin/apply.c:3042

2409 #, c-format

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

2411 msgstr ""

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

2413 "trouvé)"

2414

2413 -#: builtin/apply.c:3061

2415 +#: builtin/apply.c:3063

2416 #, c-format

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

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

2419

2418 -#: builtin/apply.c:3185

2420 +#: builtin/apply.c:3187

2421 #, c-format

2422 msgid "cannot checkout %s"

2423 msgstr "extraction de %s impossible"

2424

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

2425 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288

2426 #, c-format

2427 msgid "read of %s failed"

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

2429

2428 -#: builtin/apply.c:3238

2430 +#: builtin/apply.c:3240

2431 #, c-format

2432 msgid "reading from '%s' beyond a symbolic link"

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

2434

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

2435 +#: builtin/apply.c:3268 builtin/apply.c:3490

2436 #, c-format

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

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

2439

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

2440 +#: builtin/apply.c:3349 builtin/apply.c:3504

2441 #, c-format

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

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

2444

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

2445 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518

2446 #, c-format

2447 msgid "%s: %s"

2448 msgstr "%s : %s"

2449

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

2450 +#: builtin/apply.c:3358 builtin/apply.c:3512

2451 #, c-format

2452 msgid "%s: does not match index"

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

2454

2453 -#: builtin/apply.c:3458

2455 +#: builtin/apply.c:3460

2456 msgid "removal patch leaves file contents"

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

2458

2457 -#: builtin/apply.c:3527

2459 +#: builtin/apply.c:3529

2460 #, c-format

2461 msgid "%s: wrong type"

2462 msgstr "%s : type erroné"

2463

2462 -#: builtin/apply.c:3529

2464 +#: builtin/apply.c:3531

2465 #, c-format

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

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

2468

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

2469 +#: builtin/apply.c:3690 builtin/apply.c:3692

2470 #, c-format

2471 msgid "invalid path '%s'"

2472 msgstr "chemin invalide '%s'"

2473

2472 -#: builtin/apply.c:3745

2474 +#: builtin/apply.c:3747

2475 #, c-format

2476 msgid "%s: already exists in index"

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

2478

2477 -#: builtin/apply.c:3748

2479 +#: builtin/apply.c:3750

2480 #, c-format

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

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

2483

2482 -#: builtin/apply.c:3768

2484 +#: builtin/apply.c:3770

2485 #, c-format

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

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

2488

2487 -#: builtin/apply.c:3773

2489 +#: builtin/apply.c:3775

2490 #, c-format

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

2492 msgstr ""

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

2494

2493 -#: builtin/apply.c:3793

2495 +#: builtin/apply.c:3795

2496 #, c-format

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

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

2499

2498 -#: builtin/apply.c:3797

2500 +#: builtin/apply.c:3799

2501 #, c-format

2502 msgid "%s: patch does not apply"

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

2504

2503 -#: builtin/apply.c:3811

2505 +#: builtin/apply.c:3813

2506 #, c-format

2507 msgid "Checking patch %s..."

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

2509

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

2510 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135

2511 #, c-format

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

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

2514

2513 -#: builtin/apply.c:4047

2515 +#: builtin/apply.c:4049

2516 #, c-format

2517 msgid "unable to remove %s from index"

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

2519

2518 -#: builtin/apply.c:4076

2520 +#: builtin/apply.c:4078

2521 #, c-format

2522 msgid "corrupt patch for submodule %s"

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

2524

2523 -#: builtin/apply.c:4080

2525 +#: builtin/apply.c:4082

2526 #, c-format

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

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

2529

2528 -#: builtin/apply.c:4085

2530 +#: builtin/apply.c:4087

2531 #, c-format

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

2533 msgstr ""

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

2535 "impossible"

2536

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

2537 +#: builtin/apply.c:4090 builtin/apply.c:4198

2538 #, c-format

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

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

2541

2540 -#: builtin/apply.c:4121

2542 +#: builtin/apply.c:4123

2543 #, c-format

2544 msgid "closing file '%s'"

2545 msgstr "fermeture du fichier '%s'"

2546

2545 -#: builtin/apply.c:4170

2547 +#: builtin/apply.c:4172

2548 #, c-format

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

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

2551

2550 -#: builtin/apply.c:4257

2552 +#: builtin/apply.c:4259

2553 #, c-format

2554 msgid "Applied patch %s cleanly."

2555 msgstr "Patch %s appliqué proprement."

2556

2555 -#: builtin/apply.c:4265

2557 +#: builtin/apply.c:4267

2558 msgid "internal error"

2559 msgstr "erreur interne"

2560

2559 -#: builtin/apply.c:4268

2561 +#: builtin/apply.c:4270

2562 #, c-format

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

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

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

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

2567

2566 -#: builtin/apply.c:4278

2568 +#: builtin/apply.c:4280

2569 #, c-format

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

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

2572

2571 -#: builtin/apply.c:4299

2573 +#: builtin/apply.c:4301

2574 #, c-format

2575 msgid "Hunk #%d applied cleanly."

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

2577

2576 -#: builtin/apply.c:4302

2578 +#: builtin/apply.c:4304

2579 #, c-format

2580 msgid "Rejected hunk #%d."

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

2582

2581 -#: builtin/apply.c:4392

2583 +#: builtin/apply.c:4394

2584 msgid "unrecognized input"

2585 msgstr "entrée non reconnue"

2586

2585 -#: builtin/apply.c:4403

2587 +#: builtin/apply.c:4405

2588 msgid "unable to read index file"

2589 msgstr "lecture du fichier d'index impossible"

2590

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

2591 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92

2592 #: builtin/fetch.c:92

2593 msgid "path"

2594 msgstr "chemin"

2595

2594 -#: builtin/apply.c:4521

2596 +#: builtin/apply.c:4523

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

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

2599

2598 -#: builtin/apply.c:4524

2600 +#: builtin/apply.c:4526

2601 msgid "apply changes matching the given path"

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

2603

2602 -#: builtin/apply.c:4526

2604 +#: builtin/apply.c:4528

2605 msgid "num"

2606 msgstr "num"

2607

2606 -#: builtin/apply.c:4527

2608 +#: builtin/apply.c:4529

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

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

2611

2610 -#: builtin/apply.c:4530

2612 +#: builtin/apply.c:4532

2613 msgid "ignore additions made by the patch"

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

2615

2614 -#: builtin/apply.c:4532

2616 +#: builtin/apply.c:4534

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

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

2619

2618 -#: builtin/apply.c:4536

2620 +#: builtin/apply.c:4538

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

2622 msgstr ""

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

2624

2623 -#: builtin/apply.c:4538

2625 +#: builtin/apply.c:4540

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

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

2628

2627 -#: builtin/apply.c:4540

2629 +#: builtin/apply.c:4542

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

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

2632

2631 -#: builtin/apply.c:4542

2633 +#: builtin/apply.c:4544

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

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

2636

2635 -#: builtin/apply.c:4544

2637 +#: builtin/apply.c:4546

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

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

2640

2639 -#: builtin/apply.c:4546

2641 +#: builtin/apply.c:4548

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

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

2644

2643 -#: builtin/apply.c:4548

2645 +#: builtin/apply.c:4550

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

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

2648

2647 -#: builtin/apply.c:4550

2649 +#: builtin/apply.c:4552

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

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

2652

2651 -#: builtin/apply.c:4552

2653 +#: builtin/apply.c:4554

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

2655 msgstr ""

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

2657

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

2658 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412

2659 msgid "paths are separated with NUL character"

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

2661

2660 -#: builtin/apply.c:4557

2662 +#: builtin/apply.c:4559

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

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

2665

2664 -#: builtin/apply.c:4558

2666 +#: builtin/apply.c:4560

2667 msgid "action"

2668 msgstr "action"

2669

2668 -#: builtin/apply.c:4559

2670 +#: builtin/apply.c:4561

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

2672 msgstr ""

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

2674 "d'espace"

2675

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

2676 +#: builtin/apply.c:4564 builtin/apply.c:4567

2677 msgid "ignore changes in whitespace when finding context"

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

2679

2678 -#: builtin/apply.c:4568

2680 +#: builtin/apply.c:4570

2681 msgid "apply the patch in reverse"

2682 msgstr "appliquer le patch en sens inverse"

2683

2682 -#: builtin/apply.c:4570

2684 +#: builtin/apply.c:4572

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

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

2687

2686 -#: builtin/apply.c:4572

2688 +#: builtin/apply.c:4574

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

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

2691

2690 -#: builtin/apply.c:4574

2692 +#: builtin/apply.c:4576

2693 msgid "allow overlapping hunks"

2694 msgstr "accepter les recouvrements de sections"

2695

2694 -#: builtin/apply.c:4577

2696 +#: builtin/apply.c:4579

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

2698 msgstr ""

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

2700 "fichier"

2701

2700 -#: builtin/apply.c:4580

2702 +#: builtin/apply.c:4582

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

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

2705

2704 -#: builtin/apply.c:4582

2706 +#: builtin/apply.c:4584

2707 msgid "root"

2708 msgstr "racine"

2709

2708 -#: builtin/apply.c:4583

2710 +#: builtin/apply.c:4585

2711 msgid "prepend <root> to all filenames"

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

2713

2712 -#: builtin/apply.c:4605

2714 +#: builtin/apply.c:4607

2715 msgid "--3way outside a repository"

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

2717

2716 -#: builtin/apply.c:4613

2718 +#: builtin/apply.c:4615

2719 msgid "--index outside a repository"

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

2721

2720 -#: builtin/apply.c:4616

2722 +#: builtin/apply.c:4618

2723 msgid "--cached outside a repository"

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

2725

2724 -#: builtin/apply.c:4635

2726 +#: builtin/apply.c:4637

2727 #, c-format

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

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

2730

2729 -#: builtin/apply.c:4649

2731 +#: builtin/apply.c:4651

2732 #, c-format

2733 msgid "squelched %d whitespace error"

2734 msgid_plural "squelched %d whitespace errors"

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

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

2737

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

2738 +#: builtin/apply.c:4657 builtin/apply.c:4667

2739 #, c-format

2740 msgid "%d line adds whitespace errors."

2741 msgid_plural "%d lines add whitespace errors."

@@ -2917,7 +2919,8 @@ msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."

2919

2920 #: builtin/branch.c:27

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

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

2922 +msgstr ""

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

2924

2925 #: builtin/branch.c:152

2926 #, c-format

@@ -3149,8 +3152,8 @@ msgid "act on remote-tracking branches"

3152 msgstr "agir sur les branches de suivi distantes"

3153

3154 #: 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

3155 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583

3156 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616

3157 #: builtin/tag.c:622

3158 msgid "commit"

3159 msgstr "commit"

@@ -3385,7 +3388,8 @@ msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."

3388

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

3390 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>"

3391 +msgstr ""

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

3393

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

3395 msgid "report all attributes set on file"

@@ -3643,7 +3647,8 @@ msgid ""

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

3648 "\n"

3649 msgstr ""

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

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

3651 +"moment\n"

3652 "pour le faire avec :\n"

3653 "\n"

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

@@ -4402,70 +4407,70 @@ msgstr ""

4407 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

4408 "des commits restants.\n"

4409

4405 -#: builtin/commit.c:302

4410 +#: builtin/commit.c:304

4411 msgid "failed to unpack HEAD tree object"

4412 msgstr "échec du dépaquetage de l'objet arbre HEAD"

4413

4409 -#: builtin/commit.c:342

4414 +#: builtin/commit.c:344

4415 msgid "unable to create temporary index"

4416 msgstr "impossible de créer l'index temporaire"

4417

4413 -#: builtin/commit.c:348

4418 +#: builtin/commit.c:350

4419 msgid "interactive add failed"

4420 msgstr "échec de l'ajout interactif"

4421

4417 -#: builtin/commit.c:359

4422 +#: builtin/commit.c:361

4423 msgid "unable to write index file"

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

4425

4421 -#: builtin/commit.c:361

4426 +#: builtin/commit.c:363

4427 msgid "unable to update temporary index"

4428 msgstr "impossible de mettre à jour l'index temporaire"

4429

4425 -#: builtin/commit.c:363

4430 +#: builtin/commit.c:365

4431 msgid "Failed to update main cache tree"

4432 msgstr "Impossible de mettre à jour l'arbre de cache principal"

4433

4429 -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

4434 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463

4435 msgid "unable to write new_index file"

4436 msgstr "impossible d'écrire le fichier new_index"

4437

4433 -#: builtin/commit.c:443

4438 +#: builtin/commit.c:445

4439 msgid "cannot do a partial commit during a merge."

4440 msgstr "impossible de faire une validation partielle pendant une fusion."

4441

4437 -#: builtin/commit.c:445

4442 +#: builtin/commit.c:447

4443 msgid "cannot do a partial commit during a cherry-pick."

4444 msgstr "impossible de faire une validation partielle pendant un picorage."

4445

4441 -#: builtin/commit.c:454

4446 +#: builtin/commit.c:456

4447 msgid "cannot read the index"

4448 msgstr "impossible de lire l'index"

4449

4445 -#: builtin/commit.c:473

4450 +#: builtin/commit.c:475

4451 msgid "unable to write temporary index file"

4452 msgstr "impossible d'écrire le fichier d'index temporaire"

4453

4449 -#: builtin/commit.c:578

4454 +#: builtin/commit.c:580

4455 #, c-format

4456 msgid "commit '%s' lacks author header"

4457 msgstr "entête d'auteur manquant dans le commit '%s'"

4458

4454 -#: builtin/commit.c:580

4459 +#: builtin/commit.c:582

4460 #, c-format

4461 msgid "commit '%s' has malformed author line"

4462 msgstr "le commit '%s' a une ligne d'auteur malformée"

4463

4459 -#: builtin/commit.c:599

4464 +#: builtin/commit.c:601

4465 msgid "malformed --author parameter"

4466 msgstr "paramètre --author mal formé"

4467

4463 -#: builtin/commit.c:607

4468 +#: builtin/commit.c:609

4469 #, c-format

4470 msgid "invalid date format: %s"

4471 msgstr "format de date invalide : %s"

4472

4468 -#: builtin/commit.c:651

4473 +#: builtin/commit.c:653

4474 msgid ""

4475 "unable to select a comment character that is not used\n"

4476 "in the current commit message"

@@ -4473,43 +4478,43 @@ msgstr ""

4478 "impossible de sélectionner un caractère de commentaire\n"

4479 "qui n'est pas utilisé dans le message de validation actuel"

4480

4476 -#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078

4481 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

4482 #, c-format

4483 msgid "could not lookup commit %s"

4484 msgstr "impossible de rechercher le commit %s"

4485

4481 -#: builtin/commit.c:700 builtin/shortlog.c:273

4486 +#: builtin/commit.c:702 builtin/shortlog.c:273

4487 #, c-format

4488 msgid "(reading log message from standard input)\n"

4489 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

4490

4486 -#: builtin/commit.c:702

4491 +#: builtin/commit.c:704

4492 msgid "could not read log from standard input"

4493 msgstr "impossible de lire le journal depuis l'entrée standard"

4494

4490 -#: builtin/commit.c:706

4495 +#: builtin/commit.c:708

4496 #, c-format

4497 msgid "could not read log file '%s'"

4498 msgstr "impossible de lire le fichier de journal '%s'"

4499

4495 -#: builtin/commit.c:728

4500 +#: builtin/commit.c:730

4501 msgid "could not read MERGE_MSG"

4502 msgstr "impossible de lire MERGE_MSG"

4503

4499 -#: builtin/commit.c:732

4504 +#: builtin/commit.c:734

4505 msgid "could not read SQUASH_MSG"

4506 msgstr "impossible de lire SQUASH_MSG"

4507

4503 -#: builtin/commit.c:736

4508 +#: builtin/commit.c:738

4509 #, c-format

4510 msgid "could not read '%s'"

4511 msgstr "impossible de lire '%s'"

4512

4508 -#: builtin/commit.c:783

4513 +#: builtin/commit.c:785

4514 msgid "could not write commit template"

4515 msgstr "impossible d'écrire le modèle de commit"

4516

4512 -#: builtin/commit.c:801

4517 +#: builtin/commit.c:803

4518 #, c-format

4519 msgid ""

4520 "\n"

@@ -4524,7 +4529,7 @@ msgstr ""

4529 "\t%s\n"

4530 "et essayez à nouveau.\n"

4531

4527 -#: builtin/commit.c:806

4532 +#: builtin/commit.c:808

4533 #, c-format

4534 msgid ""

4535 "\n"

@@ -4539,7 +4544,7 @@ msgstr ""

4544 "\t%s\n"

4545 "et essayez à nouveau.\n"

4546

4542 -#: builtin/commit.c:819

4547 +#: builtin/commit.c:821

4548 #, c-format

4549 msgid ""

4550 "Please enter the commit message for your changes. Lines starting\n"

@@ -4549,7 +4554,7 @@ msgstr ""

4554 "commençant par '%c' seront ignorées, et un message vide abandonne la "

4555 "validation.\n"

4556

4552 -#: builtin/commit.c:826

4557 +#: builtin/commit.c:828

4558 #, c-format

4559 msgid ""

4560 "Please enter the commit message for your changes. Lines starting\n"

@@ -4560,147 +4565,149 @@ msgstr ""

4565 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

4566 "si vous le souhaitez. Un message vide abandonne la validation.\n"

4567

4563 -#: builtin/commit.c:846

4568 +#: builtin/commit.c:848

4569 #, c-format

4570 msgid "%sAuthor: %.*s <%.*s>"

4571 msgstr "%sAuteur : %.*s <%.*s>"

4572

4568 -#: builtin/commit.c:854

4573 +#: builtin/commit.c:856

4574 #, c-format

4575 msgid "%sDate: %s"

4576 msgstr "%sDate : %s"

4577

4573 -#: builtin/commit.c:861

4578 +#: builtin/commit.c:863

4579 #, c-format

4580 msgid "%sCommitter: %.*s <%.*s>"

4581 msgstr "%sValidateur : %.*s <%.*s>"

4582

4578 -#: builtin/commit.c:879

4583 +#: builtin/commit.c:881

4584 msgid "Cannot read index"

4585 msgstr "Impossible de lire l'index"

4586

4582 -#: builtin/commit.c:936

4587 +#: builtin/commit.c:938

4588 msgid "Error building trees"

4589 msgstr "Erreur lors de la construction des arbres"

4590

4586 -#: builtin/commit.c:951 builtin/tag.c:495

4591 +#: builtin/commit.c:953 builtin/tag.c:495

4592 #, c-format

4593 msgid "Please supply the message using either -m or -F option.\n"

4594 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

4595

4591 -#: builtin/commit.c:1053

4596 +#: builtin/commit.c:1055

4597 #, c-format

4598 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"

4599 +msgstr ""

4600 +"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

4601 +"auteur existant"

4602

4596 -#: builtin/commit.c:1068 builtin/commit.c:1308

4603 +#: builtin/commit.c:1070 builtin/commit.c:1310

4604 #, c-format

4605 msgid "Invalid untracked files mode '%s'"

4606 msgstr "Mode de fichier non suivi invalide '%s'"

4607

4601 -#: builtin/commit.c:1105

4608 +#: builtin/commit.c:1107

4609 msgid "--long and -z are incompatible"

4610 msgstr "--long et -z sont incompatibles"

4611

4605 -#: builtin/commit.c:1135

4612 +#: builtin/commit.c:1137

4613 msgid "Using both --reset-author and --author does not make sense"

4614 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

4615

4609 -#: builtin/commit.c:1144

4616 +#: builtin/commit.c:1146

4617 msgid "You have nothing to amend."

4618 msgstr "Il n'y a rien à corriger."

4619

4613 -#: builtin/commit.c:1147

4620 +#: builtin/commit.c:1149

4621 msgid "You are in the middle of a merge -- cannot amend."

4622 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

4623

4617 -#: builtin/commit.c:1149

4624 +#: builtin/commit.c:1151

4625 msgid "You are in the middle of a cherry-pick -- cannot amend."

4626 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

4627

4621 -#: builtin/commit.c:1152

4628 +#: builtin/commit.c:1154

4629 msgid "Options --squash and --fixup cannot be used together"

4630 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

4631

4625 -#: builtin/commit.c:1162

4632 +#: builtin/commit.c:1164

4633 msgid "Only one of -c/-C/-F/--fixup can be used."

4634 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

4635

4629 -#: builtin/commit.c:1164

4636 +#: builtin/commit.c:1166

4637 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4638 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

4639

4633 -#: builtin/commit.c:1172

4640 +#: builtin/commit.c:1174

4641 msgid "--reset-author can be used only with -C, -c or --amend."

4642 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

4643

4637 -#: builtin/commit.c:1189

4644 +#: builtin/commit.c:1191

4645 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4646 msgstr ""

4647 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

4648 "être utilisée."

4649

4643 -#: builtin/commit.c:1191

4650 +#: builtin/commit.c:1193

4651 msgid "No paths with --include/--only does not make sense."

4652 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

4653

4647 -#: builtin/commit.c:1193

4654 +#: builtin/commit.c:1195

4655 msgid "Clever... amending the last one with dirty index."

4656 msgstr "Malin... correction du dernier avec un index sale."

4657

4651 -#: builtin/commit.c:1195

4658 +#: builtin/commit.c:1197

4659 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4660 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

4661

4655 -#: builtin/commit.c:1207 builtin/tag.c:728

4662 +#: builtin/commit.c:1209 builtin/tag.c:728

4663 #, c-format

4664 msgid "Invalid cleanup mode %s"

4665 msgstr "Mode de nettoyage invalide %s"

4666

4660 -#: builtin/commit.c:1212

4667 +#: builtin/commit.c:1214

4668 msgid "Paths with -a does not make sense."

4669 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

4670

4664 -#: builtin/commit.c:1322 builtin/commit.c:1602

4671 +#: builtin/commit.c:1324 builtin/commit.c:1604

4672 msgid "show status concisely"

4673 msgstr "afficher le statut avec concision"

4674

4668 -#: builtin/commit.c:1324 builtin/commit.c:1604

4675 +#: builtin/commit.c:1326 builtin/commit.c:1606

4676 msgid "show branch information"

4677 msgstr "afficher l'information de branche"

4678

4672 -#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509

4679 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509

4680 msgid "machine-readable output"

4681 msgstr "sortie pour traitement automatique"

4682

4676 -#: builtin/commit.c:1329 builtin/commit.c:1608

4683 +#: builtin/commit.c:1331 builtin/commit.c:1610

4684 msgid "show status in long format (default)"

4685 msgstr "afficher le statut en format long (par défaut)"

4686

4680 -#: builtin/commit.c:1332 builtin/commit.c:1611

4687 +#: builtin/commit.c:1334 builtin/commit.c:1613

4688 msgid "terminate entries with NUL"

4689 msgstr "terminer les éléments par NUL"

4690

4684 -#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980

4691 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980

4692 #: builtin/fast-export.c:983 builtin/tag.c:603

4693 msgid "mode"

4694 msgstr "mode"

4695

4689 -#: builtin/commit.c:1335 builtin/commit.c:1614

4696 +#: builtin/commit.c:1337 builtin/commit.c:1616

4697 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4698 msgstr ""

4699 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

4700 "no. (Défaut : all)"

4701

4695 -#: builtin/commit.c:1338

4702 +#: builtin/commit.c:1340

4703 msgid "show ignored files"

4704 msgstr "afficher les fichiers ignorés"

4705

4699 -#: builtin/commit.c:1339 parse-options.h:153

4706 +#: builtin/commit.c:1341 parse-options.h:153

4707 msgid "when"

4708 msgstr "quand"

4709

4703 -#: builtin/commit.c:1340

4710 +#: builtin/commit.c:1342

4711 msgid ""

4712 "ignore changes to submodules, optional when: all, dirty, untracked. "

4713 "(Default: all)"

@@ -4708,209 +4715,209 @@ msgstr ""

4715 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

4716 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

4717

4711 -#: builtin/commit.c:1342

4718 +#: builtin/commit.c:1344

4719 msgid "list untracked files in columns"

4720 msgstr "afficher les fichiers non suivis en colonnes"

4721

4715 -#: builtin/commit.c:1429

4722 +#: builtin/commit.c:1431

4723 msgid "couldn't look up newly created commit"

4724 msgstr "impossible de retrouver le commit nouvellement créé"

4725

4719 -#: builtin/commit.c:1431

4726 +#: builtin/commit.c:1433

4727 msgid "could not parse newly created commit"

4728 msgstr "impossible d'analyser le commit nouvellement créé"

4729

4723 -#: builtin/commit.c:1476

4730 +#: builtin/commit.c:1478

4731 msgid "detached HEAD"

4732 msgstr "HEAD détachée"

4733

4727 -#: builtin/commit.c:1479

4734 +#: builtin/commit.c:1481

4735 msgid " (root-commit)"

4736 msgstr " (commit racine)"

4737

4731 -#: builtin/commit.c:1572

4738 +#: builtin/commit.c:1574

4739 msgid "suppress summary after successful commit"

4740 msgstr "supprimer le résumé après une validation réussie"

4741

4735 -#: builtin/commit.c:1573

4742 +#: builtin/commit.c:1575

4743 msgid "show diff in commit message template"

4744 msgstr "afficher les diff dans le modèle de message de validation"

4745

4739 -#: builtin/commit.c:1575

4746 +#: builtin/commit.c:1577

4747 msgid "Commit message options"

4748 msgstr "Options du message de validation"

4749

4743 -#: builtin/commit.c:1576 builtin/tag.c:601

4750 +#: builtin/commit.c:1578 builtin/tag.c:601

4751 msgid "read message from file"

4752 msgstr "lire le message depuis un fichier"

4753

4747 -#: builtin/commit.c:1577

4754 +#: builtin/commit.c:1579

4755 msgid "author"

4756 msgstr "auteur"

4757

4751 -#: builtin/commit.c:1577

4758 +#: builtin/commit.c:1579

4759 msgid "override author for commit"

4760 msgstr "remplacer l'auteur pour la validation"

4761

4755 -#: builtin/commit.c:1578 builtin/gc.c:275

4762 +#: builtin/commit.c:1580 builtin/gc.c:275

4763 msgid "date"

4764 msgstr "date"

4765

4759 -#: builtin/commit.c:1578

4766 +#: builtin/commit.c:1580

4767 msgid "override date for commit"

4768 msgstr "remplacer la date pour la validation"

4769

4763 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391

4770 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391

4771 #: builtin/notes.c:554 builtin/tag.c:599

4772 msgid "message"

4773 msgstr "message"

4774

4768 -#: builtin/commit.c:1579

4775 +#: builtin/commit.c:1581

4776 msgid "commit message"

4777 msgstr "message de validation"

4778

4772 -#: builtin/commit.c:1580

4779 +#: builtin/commit.c:1582

4780 msgid "reuse and edit message from specified commit"

4781 msgstr "réutiliser et éditer le message du commit spécifié"

4782

4776 -#: builtin/commit.c:1581

4783 +#: builtin/commit.c:1583

4784 msgid "reuse message from specified commit"

4785 msgstr "réutiliser le message du commit spécifié"

4786

4780 -#: builtin/commit.c:1582

4787 +#: builtin/commit.c:1584

4788 msgid "use autosquash formatted message to fixup specified commit"

4789 msgstr ""

4790 "utiliser un message au format autosquash pour corriger le commit spécifié"

4791

4785 -#: builtin/commit.c:1583

4792 +#: builtin/commit.c:1585

4793 msgid "use autosquash formatted message to squash specified commit"

4794 msgstr ""

4795 "utiliser un message au format autosquash pour compresser le commit spécifié"

4796

4790 -#: builtin/commit.c:1584

4797 +#: builtin/commit.c:1586

4798 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4799 msgstr ""

4800 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

4801

4795 -#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86

4802 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86

4803 msgid "add Signed-off-by:"

4804 msgstr "ajouter une entrée Signed-off-by :"

4805

4799 -#: builtin/commit.c:1586

4806 +#: builtin/commit.c:1588

4807 msgid "use specified template file"

4808 msgstr "utiliser le fichier de modèle spécifié"

4809

4803 -#: builtin/commit.c:1587

4810 +#: builtin/commit.c:1589

4811 msgid "force edit of commit"

4812 msgstr "forcer l'édition du commit"

4813

4807 -#: builtin/commit.c:1588

4814 +#: builtin/commit.c:1590

4815 msgid "default"

4816 msgstr "défaut"

4817

4811 -#: builtin/commit.c:1588 builtin/tag.c:604

4818 +#: builtin/commit.c:1590 builtin/tag.c:604

4819 msgid "how to strip spaces and #comments from message"

4820 msgstr "comment éliminer les espaces et les commentaires # du message"

4821

4815 -#: builtin/commit.c:1589

4822 +#: builtin/commit.c:1591

4823 msgid "include status in commit message template"

4824 msgstr "inclure le statut dans le modèle de message de validation"

4825

4819 -#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92

4826 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92

4827 #: builtin/tag.c:605

4828 msgid "key-id"

4829 msgstr "id de clé"

4830

4824 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93

4831 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93

4832 msgid "GPG sign commit"

4833 msgstr "signer la validation avec GPG"

4834

4828 -#: builtin/commit.c:1594

4835 +#: builtin/commit.c:1596

4836 msgid "Commit contents options"

4837 msgstr "Valider les options des contenus"

4838

4832 -#: builtin/commit.c:1595

4839 +#: builtin/commit.c:1597

4840 msgid "commit all changed files"

4841 msgstr "valider tous les fichiers modifiés"

4842

4836 -#: builtin/commit.c:1596

4843 +#: builtin/commit.c:1598

4844 msgid "add specified files to index for commit"

4845 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

4846

4840 -#: builtin/commit.c:1597

4847 +#: builtin/commit.c:1599

4848 msgid "interactively add files"

4849 msgstr "ajouter des fichiers en mode interactif"

4850

4844 -#: builtin/commit.c:1598

4851 +#: builtin/commit.c:1600

4852 msgid "interactively add changes"

4853 msgstr "ajouter les modifications en mode interactif"

4854

4848 -#: builtin/commit.c:1599

4855 +#: builtin/commit.c:1601

4856 msgid "commit only specified files"

4857 msgstr "valider seulement les fichiers spécifiés"

4858

4852 -#: builtin/commit.c:1600

4859 +#: builtin/commit.c:1602

4860 msgid "bypass pre-commit hook"

4861 msgstr "éviter d'utiliser le crochet pre-commit"

4862

4856 -#: builtin/commit.c:1601

4863 +#: builtin/commit.c:1603

4864 msgid "show what would be committed"

4865 msgstr "afficher ce qui serait validé"

4866

4860 -#: builtin/commit.c:1612

4867 +#: builtin/commit.c:1614

4868 msgid "amend previous commit"

4869 msgstr "corriger la validation précédente"

4870

4864 -#: builtin/commit.c:1613

4871 +#: builtin/commit.c:1615

4872 msgid "bypass post-rewrite hook"

4873 msgstr "éviter d'utiliser le crochet post-rewrite"

4874

4868 -#: builtin/commit.c:1618

4875 +#: builtin/commit.c:1620

4876 msgid "ok to record an empty change"

4877 msgstr "accepter d'enregistrer une modification vide"

4878

4872 -#: builtin/commit.c:1620

4879 +#: builtin/commit.c:1622

4880 msgid "ok to record a change with an empty message"

4881 msgstr "accepter d'enregistrer une modification avec un message vide"

4882

4876 -#: builtin/commit.c:1649

4883 +#: builtin/commit.c:1651

4884 msgid "could not parse HEAD commit"

4885 msgstr "impossible d'analyser le commit HEAD"

4886

4880 -#: builtin/commit.c:1688 builtin/merge.c:519

4887 +#: builtin/commit.c:1690 builtin/merge.c:519

4888 #, c-format

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

4890 msgstr "impossible d'ouvrir '%s' en lecture"

4891

4885 -#: builtin/commit.c:1695

4892 +#: builtin/commit.c:1697

4893 #, c-format

4894 msgid "Corrupt MERGE_HEAD file (%s)"

4895 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4896

4890 -#: builtin/commit.c:1702

4897 +#: builtin/commit.c:1704

4898 msgid "could not read MERGE_MODE"

4899 msgstr "impossible de lire MERGE_MODE"

4900

4894 -#: builtin/commit.c:1721

4901 +#: builtin/commit.c:1723

4902 #, c-format

4903 msgid "could not read commit message: %s"

4904 msgstr "impossible de lire le message de validation : %s"

4905

4899 -#: builtin/commit.c:1732

4906 +#: builtin/commit.c:1734

4907 #, c-format

4908 msgid "Aborting commit; you did not edit the message.\n"

4909 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

4910

4904 -#: builtin/commit.c:1737

4911 +#: builtin/commit.c:1739

4912 #, c-format

4913 msgid "Aborting commit due to empty commit message.\n"

4914 msgstr "Abandon de la validation du à un message de validation vide\n"

4915

4909 -#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876

4916 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876

4917 msgid "failed to write commit object"

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

4919

4913 -#: builtin/commit.c:1785

4920 +#: builtin/commit.c:1787

4921 msgid ""

4922 "Repository has been updated, but unable to write\n"

4923 "new_index file. Check that disk is not full and quota is\n"

@@ -5573,7 +5580,8 @@ msgstr ""

5580 #: builtin/fmt-merge-msg.c:13

5581 msgid ""

5582 "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>]"

5583 +msgstr ""

5584 +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"

5585

5586 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

5587 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

@@ -6005,7 +6013,9 @@ msgstr "--cached et des arbres sont fournis en même temps."

6013 msgid ""

6014 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

6015 "[--] <file>..."

6008 -msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..."

6016 +msgstr ""

6017 +"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "

6018 +"[--] <fichier>..."

6019

6020 #: builtin/hash-object.c:83

6021 msgid "git hash-object --stdin-paths < <list-of-paths>"

@@ -6566,7 +6576,9 @@ msgstr " partagé"

6576 msgid ""

6577 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6578 "shared[=<permissions>]] [<directory>]"

6569 -msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]"

6579 +msgstr ""

6580 +"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"

6581 +"shared[=<permissions>]] [<répertoire>]"

6582

6583 #: builtin/init-db.c:498

6584 msgid "permissions"

@@ -7446,7 +7458,9 @@ msgstr "trouver où <validation> a divergé du reflog de <référence>"

7458 msgid ""

7459 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "

7460 "<orig-file> <file2>"

7449 -msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>"

7461 +msgstr ""

7462 +"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "

7463 +"<fichier-orig> <fichier2>"

7464

7465 #: builtin/merge-file.c:33

7466 msgid "send results to standard output"

@@ -7639,17 +7653,22 @@ msgstr "git notes [--ref <références-notes>] [list [<object>]]"

7653 msgid ""

7654 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7655 "| (-c | -C) <object>] [<object>]"

7642 -msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"

7656 +msgstr ""

7657 +"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "

7658 +"| -F <fichier> | (-c | -C) <objet>] [<objet>]"

7659

7660 #: builtin/notes.c:26

7661 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>"

7662 +msgstr ""

7663 +"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"

7664

7665 #: builtin/notes.c:27

7666 msgid ""

7667 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7668 "(-c | -C) <object>] [<object>]"

7652 -msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"

7669 +msgstr ""

7670 +"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"

7671 +"F <fichier> | (-c | -C) <objet>] [<objet>]"

7672

7673 #: builtin/notes.c:28

7674 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

@@ -7662,7 +7681,9 @@ msgstr "git notes [--ref <références-notes>] show [<objet>]"

7681 #: builtin/notes.c:30

7682 msgid ""

7683 "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>"

7684 +msgstr ""

7685 +"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "

7686 +"<références-notes>"

7687

7688 #: builtin/notes.c:31

7689 msgid "git notes merge --commit [-v | -q]"

@@ -8636,7 +8657,9 @@ msgstr "git remote [-v | --verbose]"

8657 msgid ""

8658 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"

8659 "mirror=<fetch|push>] <name> <url>"

8639 -msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>"

8660 +msgstr ""

8661 +"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"

8662 +"mirror=<fetch|push>] <nom> <url>"

8663

8664 #: builtin/remote.c:14 builtin/remote.c:33

8665 msgid "git remote rename <old> <new>"

@@ -9289,7 +9312,8 @@ msgstr "utiliser ce format"

9312

9313 #: builtin/rerere.c:12

9315 +msgstr ""

9317

9318 #: builtin/rerere.c:57

9319 msgid "register clean resolutions in index"

@@ -9458,7 +9482,8 @@ msgstr ""

9482 " ou : git rev-parse --sq-quote [<argument>...]\n"

9483 " ou : git rev-parse [options] [<argument>...]\n"

9484 "\n"

9461 -"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale."

9485 +"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "

9486 +"l'utilisation principale."

9487

9488 #: builtin/revert.c:22

9489 msgid "git revert [<options>] <commit-ish>..."

@@ -9771,7 +9796,9 @@ msgstr ""

9796 msgid ""

9797 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9798 "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>...]"

9799 +msgstr ""

9800 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9801 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"

9802

9803 #: builtin/show-ref.c:11

9804 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

@@ -9847,7 +9874,9 @@ msgstr "raison de la mise à jour"

9874 msgid ""

9875 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "

9876 "[<head>]"

9850 -msgstr "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-étiquette> [<head>]"

9877 +msgstr ""

9878 +"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"

9879 +"étiquette> [<head>]"

9880

9881 #: builtin/tag.c:23

9882 msgid "git tag -d <tagname>..."

@@ -10073,119 +10102,119 @@ msgstr "Dépaquetage des objets"

10102 msgid "git update-index [<options>] [--] [<file>...]"

10103 msgstr "git update-index [<options>] [--] [<fichier>...]"

10104

10076 -#: builtin/update-index.c:756

10105 +#: builtin/update-index.c:757

10106 msgid "continue refresh even when index needs update"

10107 msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"

10108

10080 -#: builtin/update-index.c:759

10109 +#: builtin/update-index.c:760

10110 msgid "refresh: ignore submodules"

10111 msgstr "rafraîchir : ignorer les sous-modules"

10112

10084 -#: builtin/update-index.c:762

10113 +#: builtin/update-index.c:763

10114 msgid "do not ignore new files"

10115 msgstr "ne pas ignorer les nouveaux fichiers"

10116

10088 -#: builtin/update-index.c:764

10117 +#: builtin/update-index.c:765

10118 msgid "let files replace directories and vice-versa"

10119 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"

10120

10092 -#: builtin/update-index.c:766

10121 +#: builtin/update-index.c:767

10122 msgid "notice files missing from worktree"

10123 msgstr "aviser des fichiers manquants dans la copie de travail"

10124

10096 -#: builtin/update-index.c:768

10125 +#: builtin/update-index.c:769

10126 msgid "refresh even if index contains unmerged entries"

10127 msgstr "rafraîchir même si l'index contient des éléments non fusionnés"

10128

10100 -#: builtin/update-index.c:771

10129 +#: builtin/update-index.c:772

10130 msgid "refresh stat information"

10131 msgstr "rafraîchir l'information de stat"

10132

10104 -#: builtin/update-index.c:775

10133 +#: builtin/update-index.c:776

10134 msgid "like --refresh, but ignore assume-unchanged setting"

10135 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"

10136

10108 -#: builtin/update-index.c:779

10137 +#: builtin/update-index.c:780

10138 msgid "<mode>,<object>,<path>"

10139 msgstr "<mode>, <objet>, <chemin>"

10140

10112 -#: builtin/update-index.c:780

10141 +#: builtin/update-index.c:781

10142 msgid "add the specified entry to the index"

10143 msgstr "ajouter l'élément spécifié dans l'index"

10144

10116 -#: builtin/update-index.c:784

10145 +#: builtin/update-index.c:785

10146 msgid "(+/-)x"

10147 msgstr "(+/-)x"

10148

10120 -#: builtin/update-index.c:785

10149 +#: builtin/update-index.c:786

10150 msgid "override the executable bit of the listed files"

10151 msgstr "outrepasser le bit exécutable pour les fichiers listés"

10152

10124 -#: builtin/update-index.c:789

10153 +#: builtin/update-index.c:790

10154 msgid "mark files as \"not changing\""

10155 msgstr "marquer les fichiers comme \"non changeants\""

10156

10128 -#: builtin/update-index.c:792

10157 +#: builtin/update-index.c:793

10158 msgid "clear assumed-unchanged bit"

10159 msgstr "mettre à zéro le bit supposé-non-modifié"

10160

10132 -#: builtin/update-index.c:795

10161 +#: builtin/update-index.c:796

10162 msgid "mark files as \"index-only\""

10163 msgstr "marquer les fichiers comme \"index seulement\""

10164

10136 -#: builtin/update-index.c:798

10165 +#: builtin/update-index.c:799

10166 msgid "clear skip-worktree bit"

10167 msgstr "mettre à zéro le bit sauter-la-copie-de travail"

10168

10140 -#: builtin/update-index.c:801

10169 +#: builtin/update-index.c:802

10170 msgid "add to index only; do not add content to object database"

10171 msgstr ""

10172 "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "

10173 "données des objets"

10174

10146 -#: builtin/update-index.c:803

10175 +#: builtin/update-index.c:804

10176 msgid "remove named paths even if present in worktree"

10177 msgstr ""

10178 "supprimer les chemins nommés même s'ils sont présents dans la copie de "

10179 "travail"

10180

10152 -#: builtin/update-index.c:805

10181 +#: builtin/update-index.c:806

10182 msgid "with --stdin: input lines are terminated by null bytes"

10183 msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"

10184

10156 -#: builtin/update-index.c:807

10185 +#: builtin/update-index.c:808

10186 msgid "read list of paths to be updated from standard input"

10187 msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"

10188

10160 -#: builtin/update-index.c:811

10189 +#: builtin/update-index.c:812

10190 msgid "add entries from standard input to the index"

10191 msgstr "ajouter les éléments depuis l'entrée standard à l'index"

10192

10164 -#: builtin/update-index.c:815

10193 +#: builtin/update-index.c:816

10194 msgid "repopulate stages #2 and #3 for the listed paths"

10195 msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"

10196

10168 -#: builtin/update-index.c:819

10197 +#: builtin/update-index.c:820

10198 msgid "only update entries that differ from HEAD"

10199 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"

10200

10172 -#: builtin/update-index.c:823

10201 +#: builtin/update-index.c:824

10202 msgid "ignore files missing from worktree"

10203 msgstr "ignorer les fichiers manquants dans la copie de travail"

10204

10176 -#: builtin/update-index.c:826

10205 +#: builtin/update-index.c:827

10206 msgid "report actions to standard output"

10207 msgstr "afficher les actions sur la sortie standard"

10208

10180 -#: builtin/update-index.c:828

10209 +#: builtin/update-index.c:829

10210 msgid "(for porcelains) forget saved unresolved conflicts"

10211 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"

10212

10184 -#: builtin/update-index.c:832

10213 +#: builtin/update-index.c:833

10214 msgid "write index in this format"

10215 msgstr "écrire l'index dans ce format"

10216

10188 -#: builtin/update-index.c:834

10217 +#: builtin/update-index.c:835

10218 msgid "enable or disable split index"

10219 msgstr "activer ou désactiver l'index divisé"

10220

@@ -10195,7 +10224,9 @@ msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"

10224

10225 #: builtin/update-ref.c:10

10226 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"

10198 -msgstr "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]"

10227 +msgstr ""

10228 +"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-"

10229 +"valeur>]"

10230

10231 #: builtin/update-ref.c:11

10232 msgid "git update-ref [<options>] --stdin [-z]"

@@ -10609,7 +10640,9 @@ msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD"

10640 #, sh-format

10641 msgid ""

10642 "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>'."

10643 +msgstr ""

10644 +"L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-"

10645 +"valide>'."

10646

10647 #: git-bisect.sh:140

10648 msgid "won't bisect on cg-seek'ed tree"

@@ -11387,6 +11420,9 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"

11420 msgid "Synchronizing submodule url for '$displaypath'"

11421 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"

11422

11423 +#~ msgid "server does not support --atomic push"

11424 +#~ msgstr "le serveur ne gère pas push --atomic"

11425 +

11426 #~ msgid "(detached from %s)"

11427 #~ msgstr "(détaché de %s)"

11428

l10n: fr.po v2.4.0 round 2