6a523d6681 · matheusbsbs/matheus-bagliano

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

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2017-02-18 01:00+0800\n"

77 -"PO-Revision-Date: 2017-02-18 00:09+0100\n"

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

77 +"PO-Revision-Date: 2017-05-02 22:20+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"

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

125 msgid "Exiting because of an unresolved conflict."

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

127

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

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

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

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

131

@@ -408,7 +408,7 @@ msgstr "le patch a échoué : %s:%ld"

408 msgid "cannot checkout %s"

409 msgstr "extraction de %s impossible"

410

411 -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

411 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253

412 #, c-format

413 msgid "failed to read %s"

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

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

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

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

537

538 -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

538 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135

539 #, c-format

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

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

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

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

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

615

616 -#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

616 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988

617 #, c-format

618 msgid "cannot open %s"

619 msgstr "impossible d'ouvrir %s"

@@ -641,166 +641,166 @@ msgstr "entrée non reconnue"

641 msgid "unable to read index file"

642 msgstr "lecture du fichier d'index impossible"

643

644 -#: apply.c:4824

644 +#: apply.c:4823

645 #, c-format

646 msgid "can't open patch '%s': %s"

647 msgstr "ouverture impossible du patch '%s' :%s"

648

649 -#: apply.c:4849

649 +#: apply.c:4850

650 #, c-format

651 msgid "squelched %d whitespace error"

652 msgid_plural "squelched %d whitespace errors"

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

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

655

656 -#: apply.c:4855 apply.c:4870

656 +#: apply.c:4856 apply.c:4871

657 #, c-format

658 msgid "%d line adds whitespace errors."

659 msgid_plural "%d lines add whitespace errors."

660 msgstr[0] "%d ligne a ajouté des erreurs d'espace."

661 msgstr[1] "%d lignes ont ajouté des erreurs d'espace."

662

663 -#: apply.c:4863

663 +#: apply.c:4864

664 #, c-format

665 msgid "%d line applied after fixing whitespace errors."

666 msgid_plural "%d lines applied after fixing whitespace errors."

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

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

669

670 -#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

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

671 msgid "Unable to write new index file"

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

673

674 -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

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

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

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

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

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

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

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

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

678 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

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

680 msgid "path"

681 msgstr "chemin"

682

683 -#: apply.c:4911

683 +#: apply.c:4912

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

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

686

687 -#: apply.c:4914

687 +#: apply.c:4915

688 msgid "apply changes matching the given path"

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

690

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

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

692 msgid "num"

693 msgstr "num"

694

695 -#: apply.c:4917

695 +#: apply.c:4918

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

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

698

699 -#: apply.c:4920

699 +#: apply.c:4921

700 msgid "ignore additions made by the patch"

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

702

703 -#: apply.c:4922

703 +#: apply.c:4923

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

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

706

707 -#: apply.c:4926

707 +#: apply.c:4927

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

709 msgstr ""

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

711

712 -#: apply.c:4928

712 +#: apply.c:4929

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

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

715

716 -#: apply.c:4930

716 +#: apply.c:4931

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

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

719

720 -#: apply.c:4932

720 +#: apply.c:4933

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

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

723

724 -#: apply.c:4934

724 +#: apply.c:4935

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

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

727

728 -#: apply.c:4936

728 +#: apply.c:4937

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

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

731

732 -#: apply.c:4938

732 +#: apply.c:4939

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

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

735

736 -#: apply.c:4940

736 +#: apply.c:4941

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

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

739

740 -#: apply.c:4942

740 +#: apply.c:4943

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

742 msgstr ""

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

744

745 -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

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

746 msgid "paths are separated with NUL character"

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

748

749 -#: apply.c:4947

749 +#: apply.c:4948

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

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

752

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

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

754 msgid "action"

755 msgstr "action"

756

757 -#: apply.c:4949

757 +#: apply.c:4950

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

759 msgstr ""

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

761 "d'espace"

762

763 -#: apply.c:4952 apply.c:4955

763 +#: apply.c:4953 apply.c:4956

764 msgid "ignore changes in whitespace when finding context"

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

766

767 -#: apply.c:4958

767 +#: apply.c:4959

768 msgid "apply the patch in reverse"

769 msgstr "appliquer le patch en sens inverse"

770

771 -#: apply.c:4960

771 +#: apply.c:4961

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

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

774

775 -#: apply.c:4962

775 +#: apply.c:4963

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

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

778

779 -#: apply.c:4964

779 +#: apply.c:4965

780 msgid "allow overlapping hunks"

781 msgstr "accepter les recouvrements de sections"

782

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

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

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

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

785 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134

786 msgid "be verbose"

787 msgstr "mode verbeux"

788

789 -#: apply.c:4967

789 +#: apply.c:4968

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

791 msgstr ""

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

793 "fichier"

794

795 -#: apply.c:4970

795 +#: apply.c:4971

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

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

798

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

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

800 msgid "root"

801 msgstr "racine"

802

803 -#: apply.c:4973

803 +#: apply.c:4974

804 msgid "prepend <root> to all filenames"

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

806

@@ -823,103 +823,108 @@ msgstr ""

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

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

825

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

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

827 #, c-format

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

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

830

831 -#: archive.c:429

831 +#: archive.c:417

832 msgid "fmt"

833 msgstr "fmt"

834

835 -#: archive.c:429

835 +#: archive.c:417

836 msgid "archive format"

837 msgstr "format d'archive"

838

839 -#: archive.c:430 builtin/log.c:1429

839 +#: archive.c:418 builtin/log.c:1436

840 msgid "prefix"

841 msgstr "préfixe"

842

843 -#: archive.c:431

843 +#: archive.c:419

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

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

846

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

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

849 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

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

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

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

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

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

851 #: parse-options.h:153

852 msgid "file"

853 msgstr "fichier"

854

855 -#: archive.c:433 builtin/archive.c:89

855 +#: archive.c:421 builtin/archive.c:89

856 msgid "write the archive to this file"

857 msgstr "écrire l'archive dans ce fichier"

858

859 -#: archive.c:435

859 +#: archive.c:423

860 msgid "read .gitattributes in working directory"

861 msgstr "lire .gitattributes dans le répertoire de travail"

862

863 -#: archive.c:436

863 +#: archive.c:424

864 msgid "report archived files on stderr"

865 msgstr "afficher les fichiers archivés sur stderr"

866

867 -#: archive.c:437

867 +#: archive.c:425

868 msgid "store only"

869 msgstr "stockage seulement"

870

871 -#: archive.c:438

871 +#: archive.c:426

872 msgid "compress faster"

873 msgstr "compression rapide"

874

875 -#: archive.c:446

875 +#: archive.c:434

876 msgid "compress better"

877 msgstr "compression efficace"

878

879 -#: archive.c:449

879 +#: archive.c:437

880 msgid "list supported archive formats"

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

882

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

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

883 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106

884 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

885 msgid "repo"

886 msgstr "dépôt"

887

888 -#: archive.c:452 builtin/archive.c:91

888 +#: archive.c:440 builtin/archive.c:91

889 msgid "retrieve the archive from remote repository <repo>"

890 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"

891

892 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

892 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485

893 msgid "command"

894 msgstr "commande"

895

896 -#: archive.c:454 builtin/archive.c:93

896 +#: archive.c:442 builtin/archive.c:93

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

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

899

900 -#: archive.c:461

900 +#: archive.c:449

901 msgid "Unexpected option --remote"

902 msgstr "Option --remote inattendue"

903

904 -#: archive.c:463

904 +#: archive.c:451

905 msgid "Option --exec can only be used together with --remote"

906 msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"

907

908 -#: archive.c:465

908 +#: archive.c:453

909 msgid "Unexpected option --output"

910 msgstr "Option --output inattendue"

911

912 -#: archive.c:487

912 +#: archive.c:475

913 #, c-format

914 msgid "Unknown archive format '%s'"

915 msgstr "Format d'archive inconnu '%s'"

916

917 -#: archive.c:494

917 +#: archive.c:482

918 #, c-format

919 msgid "Argument not supported for format '%s': -%d"

920 msgstr "Argument non supporté pour le format '%s' : -%d"

921

922 -#: attr.c:263

922 +#: attr.c:212

923 +#, c-format

924 +msgid "%.*s is not a valid attribute name"

925 +msgstr "%.*s n'est pas un nom valide d'attribut"

926 +

927 +#: attr.c:408

928 msgid ""

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

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

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

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

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

934

930 -#: bisect.c:441

935 +#: bisect.c:443

936 #, c-format

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

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

939

935 -#: bisect.c:446

940 +#: bisect.c:448

941 #, c-format

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

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

944

940 -#: bisect.c:655

945 +#: bisect.c:656

946 #, c-format

947 msgid "We cannot bisect more!\n"

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

949

945 -#: bisect.c:708

950 +#: bisect.c:709

951 #, c-format

952 msgid "Not a valid commit name %s"

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

954

950 -#: bisect.c:732

955 +#: bisect.c:733

956 #, c-format

957 msgid ""

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

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

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

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

963

959 -#: bisect.c:737

964 +#: bisect.c:738

965 #, c-format

966 msgid ""

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

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

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

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

972

968 -#: bisect.c:742

973 +#: bisect.c:743

974 #, c-format

975 msgid ""

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

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

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

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

981

977 -#: bisect.c:750

982 +#: bisect.c:751

983 #, c-format

984 msgid ""

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

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

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

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

992

988 -#: bisect.c:763

993 +#: bisect.c:764

994 #, c-format

995 msgid ""

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

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

1002 "et %s.\n"

1003 "On continue tout de même."

1004

1000 -#: bisect.c:798

1005 +#: bisect.c:799

1006 #, c-format

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

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

1009

1005 -#: bisect.c:849

1010 +#: bisect.c:850

1011 #, c-format

1012 msgid "a %s revision is needed"

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

1014

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

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

1016 #, c-format

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

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

1019

1015 -#: bisect.c:917

1020 +#: bisect.c:918

1021 #, c-format

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

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

1024

1020 -#: bisect.c:947

1025 +#: bisect.c:948

1026 msgid "reading bisect refs failed"

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

1028

1024 -#: bisect.c:967

1029 +#: bisect.c:968

1030 #, c-format

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

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

1033

1029 -#: bisect.c:975

1034 +#: bisect.c:976

1035 #, c-format

1036 msgid ""

1037 "No testable commit found.\n"

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

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

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

1042

1038 -#: bisect.c:994

1043 +#: bisect.c:995

1044 #, c-format

1045 msgid "(roughly %d step)"

1046 msgid_plural "(roughly %d steps)"

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

1049

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

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

1047 -#: bisect.c:998

1052 +#: bisect.c:999

1053 #, c-format

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

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

@@ -1191,7 +1196,7 @@ msgstr "Point d'embranchement invalide : '%s'."

1196 msgid "'%s' is already checked out at '%s'"

1197 msgstr "'%s' est déjà extrait dans '%s'"

1198

1194 -#: branch.c:363

1199 +#: branch.c:364

1200 #, c-format

1201 msgid "HEAD of working tree %s is not updated"

1202 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"

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

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

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

1213

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

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

1215 #, c-format

1216 msgid "could not open '%s'"

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

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

1220 msgid "Repository lacks these prerequisite commits:"

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

1222

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

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

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

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

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

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

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

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

1227 msgid "revision walk setup failed"

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

1229

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

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

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

1264

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

1265 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281

1266 #, c-format

1267 msgid "unrecognized argument: %s"

1268 msgstr "argument non reconnu : %s"

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

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

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

1287

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

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

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

1290 #, c-format

1291 msgid "could not parse %s"

@@ -1291,7 +1296,7 @@ msgstr "impossible d'analyser %s"

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

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

1298

1294 -#: commit.c:1514

1299 +#: commit.c:1511

1300 msgid ""

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

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

@@ -1307,146 +1312,165 @@ msgstr ""

1312 msgid "memory exhausted"

1313 msgstr "plus de mémoire"

1314

1310 -#: config.c:518

1315 +#: config.c:191

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

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

1318 +

1319 +#: config.c:701

1320 #, c-format

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

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

1323

1315 -#: config.c:522

1324 +#: config.c:705

1325 #, c-format

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

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

1328

1320 -#: config.c:526

1329 +#: config.c:709

1330 #, c-format

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

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

1333

1325 -#: config.c:530

1334 +#: config.c:713

1335 #, c-format

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

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

1338

1330 -#: config.c:534

1339 +#: config.c:717

1340 #, c-format

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

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

1343

1335 -#: config.c:538

1344 +#: config.c:721

1345 #, c-format

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

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

1348

1340 -#: config.c:657

1349 +#: config.c:840

1350 msgid "out of range"

1351 msgstr "hors plage"

1352

1344 -#: config.c:657

1353 +#: config.c:840

1354 msgid "invalid unit"

1355 msgstr "unité invalide"

1356

1348 -#: config.c:663

1357 +#: config.c:846

1358 #, c-format

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

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

1361

1353 -#: config.c:668

1362 +#: config.c:851

1363 #, c-format

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

1365 msgstr ""

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

1367 "%s : %s"

1368

1360 -#: config.c:671

1369 +#: config.c:854

1370 #, c-format

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

1372 msgstr ""

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

1374 "%s : %s"

1375

1367 -#: config.c:674

1376 +#: config.c:857

1377 #, c-format

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

1379 msgstr ""

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

1381 "standard : %s"

1382

1374 -#: config.c:677

1383 +#: config.c:860

1384 #, c-format

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

1386 msgstr ""

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

1388 "sous-module %s : %s"

1389

1381 -#: config.c:680

1390 +#: config.c:863

1391 #, c-format

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

1393 msgstr ""

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

1395 "commande %s : %s"

1396

1388 -#: config.c:683

1397 +#: config.c:866

1398 #, c-format

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

1400 msgstr ""

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

1402

1394 -#: config.c:770

1403 +#: config.c:953

1404 #, c-format

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

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

1407

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

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

1409 #, c-format

1410 msgid "bad zlib compression level %d"

1411 msgstr "niveau de compression zlib incorrect %d"

1412

1404 -#: config.c:993

1413 +#: config.c:1176

1414 #, c-format

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

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

1417

1409 -#: config.c:1149

1418 +#: config.c:1332

1419 #, c-format

1420 msgid "bad pack compression level %d"

1421 msgstr "niveau de compression du paquet %d"

1422

1414 -#: config.c:1339

1423 +#: config.c:1522

1424 msgid "unable to parse command-line config"

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

1426

1418 -#: config.c:1389

1427 +#: config.c:1572

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

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

1430

1422 -#: config.c:1743

1431 +#: config.c:1931

1432 +#, c-format

1433 +msgid "Invalid %s: '%s'"

1434 +msgstr "%s invalide : '%s'"

1435 +

1436 +#: config.c:1952

1437 +#, c-format

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

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

1440 +

1441 +#: config.c:1978

1442 +#, c-format

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

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

1445 +

1446 +#: config.c:1989

1447 #, c-format

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

1449 msgstr ""

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

1451

1428 -#: config.c:1745

1452 +#: config.c:1991

1453 #, c-format

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

1455 msgstr ""

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

1457

1434 -#: config.c:1804

1458 +#: config.c:2050

1459 #, c-format

1460 msgid "%s has multiple values"

1461 msgstr "%s a des valeurs multiples"

1462

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

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

1464 #, c-format

1465 msgid "fstat on %s failed"

1466 msgstr "échec de fstat sur %s"

1467

1444 -#: config.c:2343

1468 +#: config.c:2502

1469 #, c-format

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

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

1472

1449 -#: config.c:2345

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

1474 #, c-format

1475 msgid "could not unset '%s'"

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

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

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

1646 "%s"

1647

1624 -#: diff.c:3085

1648 +#: diff.c:3102

1649 #, c-format

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

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

1652

1629 -#: diff.c:3411

1653 +#: diff.c:3428

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

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

1656

1633 -#: diff.c:3501

1657 +#: diff.c:3518

1658 msgid "--follow requires exactly one pathspec"

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

1660

1637 -#: diff.c:3664

1661 +#: diff.c:3681

1662 #, c-format

1663 msgid ""

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

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

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

1668 "%s"

1669

1646 -#: diff.c:3678

1670 +#: diff.c:3695

1671 #, c-format

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

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

1674

1651 -#: diff.c:4696

1675 +#: diff.c:4719

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

1677 msgstr ""

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

1679 "fichiers."

1680

1657 -#: diff.c:4699

1681 +#: diff.c:4722

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

1683 msgstr ""

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

1685 "grand nombre de fichiers."

1686

1663 -#: diff.c:4702

1687 +#: diff.c:4725

1688 #, c-format

1689 msgid ""

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

@@ -1668,186 +1692,206 @@ msgstr ""

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

1693 "commande."

1694

1671 -#: dir.c:1862

1695 +#: dir.c:1899

1696 msgid "failed to get kernel name and information"

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

1698

1675 -#: dir.c:1981

1699 +#: dir.c:2018

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

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

1702

1679 -#: dir.c:2759

1703 +#: dir.c:2776 dir.c:2781

1704 +#, c-format

1705 +msgid "could not create directories for %s"

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

1707 +

1708 +#: dir.c:2806

1709 #, c-format

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

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

1712

1684 -#: fetch-pack.c:213

1713 +#: entry.c:280

1714 +#, c-format

1715 +msgid "could not stat file '%s'"

1716 +msgstr "impossible de stat le fichier '%s'"

1717 +

1718 +#: fetch-pack.c:249

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

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

1721

1688 -#: fetch-pack.c:225

1722 +#: fetch-pack.c:261

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

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

1725

1692 -#: fetch-pack.c:243

1726 +#: fetch-pack.c:279

1727 #, c-format

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

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

1730

1697 -#: fetch-pack.c:295

1731 +#: fetch-pack.c:331

1732 msgid "--stateless-rpc requires multi_ack_detailed"

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

1734

1701 -#: fetch-pack.c:381

1735 +#: fetch-pack.c:417

1736 #, c-format

1737 msgid "invalid shallow line: %s"

1738 msgstr "ligne de superficiel invalide : %s"

1739

1706 -#: fetch-pack.c:387

1740 +#: fetch-pack.c:423

1741 #, c-format

1742 msgid "invalid unshallow line: %s"

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

1744

1711 -#: fetch-pack.c:389

1745 +#: fetch-pack.c:425

1746 #, c-format

1747 msgid "object not found: %s"

1748 msgstr "objet non trouvé : %s"

1749

1716 -#: fetch-pack.c:392

1750 +#: fetch-pack.c:428

1751 #, c-format

1752 msgid "error in object: %s"

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

1754

1721 -#: fetch-pack.c:394

1755 +#: fetch-pack.c:430

1756 #, c-format

1757 msgid "no shallow found: %s"

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

1759

1726 -#: fetch-pack.c:397

1760 +#: fetch-pack.c:433

1761 #, c-format

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

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

1764

1731 -#: fetch-pack.c:436

1765 +#: fetch-pack.c:472

1766 #, c-format

1767 msgid "got %s %d %s"

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

1769

1736 -#: fetch-pack.c:450

1770 +#: fetch-pack.c:486

1771 #, c-format

1772 msgid "invalid commit %s"

1773 msgstr "commit invalide %s"

1774

1741 -#: fetch-pack.c:483

1775 +#: fetch-pack.c:519

1776 msgid "giving up"

1777 msgstr "abandon"

1778

1745 -#: fetch-pack.c:493 progress.c:235

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

1780 msgid "done"

1781 msgstr "fait"

1782

1749 -#: fetch-pack.c:505

1783 +#: fetch-pack.c:541

1784 #, c-format

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

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

1787

1754 -#: fetch-pack.c:551

1788 +#: fetch-pack.c:587

1789 #, c-format

1790 msgid "Marking %s as complete"

1791 msgstr "Marquage de %s comme terminé"

1792

1759 -#: fetch-pack.c:697

1793 +#: fetch-pack.c:735

1794 #, c-format

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

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

1797

1764 -#: fetch-pack.c:735

1798 +#: fetch-pack.c:773

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

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

1801

1768 -#: fetch-pack.c:743

1802 +#: fetch-pack.c:781

1803 msgid "protocol error: bad pack header"

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

1805

1772 -#: fetch-pack.c:799

1806 +#: fetch-pack.c:837

1807 #, c-format

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

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

1810

1777 -#: fetch-pack.c:815

1811 +#: fetch-pack.c:853

1812 #, c-format

1813 msgid "%s failed"

1814 msgstr "échec de %s"

1815

1782 -#: fetch-pack.c:817

1816 +#: fetch-pack.c:855

1817 msgid "error in sideband demultiplexer"

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

1819

1786 -#: fetch-pack.c:844

1820 +#: fetch-pack.c:882

1821 msgid "Server does not support shallow clients"

1822 msgstr "Le serveur ne supporte les clients superficiels"

1823

1790 -#: fetch-pack.c:848

1824 +#: fetch-pack.c:886

1825 msgid "Server supports multi_ack_detailed"

1826 msgstr "Le serveur supporte multi_ack_detailed"

1827

1794 -#: fetch-pack.c:851

1828 +#: fetch-pack.c:889

1829 msgid "Server supports no-done"

1830 msgstr "Le serveur support no-done"

1831

1798 -#: fetch-pack.c:857

1832 +#: fetch-pack.c:895

1833 msgid "Server supports multi_ack"

1834 msgstr "Le serveur supporte multi_ack"

1835

1802 -#: fetch-pack.c:861

1836 +#: fetch-pack.c:899

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

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

1839

1806 -#: fetch-pack.c:865

1840 +#: fetch-pack.c:903

1841 msgid "Server supports side-band"

1842 msgstr "Le serveru supporte side-band"

1843

1810 -#: fetch-pack.c:869

1844 +#: fetch-pack.c:907

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

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

1847

1814 -#: fetch-pack.c:873

1848 +#: fetch-pack.c:911

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

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

1851

1818 -#: fetch-pack.c:883

1852 +#: fetch-pack.c:921

1853 msgid "Server supports ofs-delta"

1854 msgstr "Le serveur support ofs-delta"

1855

1822 -#: fetch-pack.c:890

1856 +#: fetch-pack.c:928

1857 #, c-format

1858 msgid "Server version is %.*s"

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

1860

1827 -#: fetch-pack.c:896

1861 +#: fetch-pack.c:934

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

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

1864

1831 -#: fetch-pack.c:900

1865 +#: fetch-pack.c:938

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

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

1868

1835 -#: fetch-pack.c:902

1869 +#: fetch-pack.c:940

1870 msgid "Server does not support --deepen"

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

1872

1839 -#: fetch-pack.c:913

1873 +#: fetch-pack.c:951

1874 msgid "no common commits"

1875 msgstr "pas de commit commun"

1876

1843 -#: fetch-pack.c:925

1877 +#: fetch-pack.c:963

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

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

1880

1847 -#: fetch-pack.c:1087

1881 +#: fetch-pack.c:1125

1882 msgid "no matching remote head"

1883 msgstr "pas de HEAD distante correspondante"

1884

1885 +#: fetch-pack.c:1147

1886 +#, c-format

1887 +msgid "no such remote ref %s"

1888 +msgstr "référence distante inconnue %s"

1889 +

1890 +#: fetch-pack.c:1150

1891 +#, c-format

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

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

1894 +

1895 #: gpg-interface.c:185

1896 msgid "gpg failed to sign the data"

1897 msgstr "gpg n'a pas pu signer les données"

@@ -1866,17 +1910,17 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

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

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

1912

1869 -#: grep.c:1794

1913 +#: grep.c:1796

1914 #, c-format

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

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

1917

1874 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1918 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133

1919 #, c-format

1920 msgid "failed to stat '%s'"

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

1922

1879 -#: grep.c:1822

1923 +#: grep.c:1824

1924 #, c-format

1925 msgid "'%s': short read"

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

@@ -1946,7 +1990,7 @@ msgstr[1] ""

1990 msgid "%s: %s - %s"

1991 msgstr "%s: %s - %s"

1992

1949 -#: ident.c:334

1993 +#: ident.c:343

1994 msgid ""

1995 "\n"

1996 "*** Please tell me who you are.\n"

@@ -1972,6 +2016,39 @@ msgstr ""

2016 "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"

2017 "\n"

2018

2019 +#: ident.c:367

2020 +msgid "no email was given and auto-detection is disabled"

2021 +msgstr "aucun courriel fourni et l'auto-détection est désactivée"

2022 +

2023 +#: ident.c:372

2024 +#, c-format

2025 +msgid "unable to auto-detect email address (got '%s')"

2026 +msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"

2027 +

2028 +#: ident.c:382

2029 +msgid "no name was given and auto-detection is disabled"

2030 +msgstr "aucun nom fourni et l'auto-détection est désactivée"

2031 +

2032 +#: ident.c:388

2033 +#, c-format

2034 +msgid "unable to auto-detect name (got '%s')"

2035 +msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"

2036 +

2037 +#: ident.c:396

2038 +#, c-format

2039 +msgid "empty ident name (for <%s>) not allowed"

2040 +msgstr "nom d'identifiant vide (pour <%s>) non permis"

2041 +

2042 +#: ident.c:402

2043 +#, c-format

2044 +msgid "name consists only of disallowed characters: %s"

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

2046 +

2047 +#: ident.c:417 builtin/commit.c:611

2048 +#, c-format

2049 +msgid "invalid date format: %s"

2050 +msgstr "format de date invalide : %s"

2051 +

2052 #: lockfile.c:152

2053 #, c-format

2054 msgid ""

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

2077 msgid "failed to read the cache"

2078 msgstr "impossible de lire le cache"

2079

2003 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

2004 -#: builtin/checkout.c:588 builtin/clone.c:731

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

2081 +#: builtin/checkout.c:607 builtin/clone.c:749

2082 msgid "unable to write new index file"

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

2084

@@ -2071,7 +2148,7 @@ msgstr "Échec à l'exécution de la fusion interne"

2148 msgid "Unable to add %s to database"

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

2150

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

2151 +#: merge-recursive.c:1092

2152 #, c-format

2153 msgid ""

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

@@ -2080,7 +2157,14 @@ msgstr ""

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

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

2159

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

2160 +#: merge-recursive.c:1097

2161 +#, c-format

2162 +msgid ""

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

2164 +"left in tree."

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

2166 +

2167 +#: merge-recursive.c:1104

2168 #, c-format

2169 msgid ""

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

@@ -2089,20 +2173,27 @@ msgstr ""

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

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

2175

2092 -#: merge-recursive.c:1150

2176 +#: merge-recursive.c:1109

2177 +#, c-format

2178 +msgid ""

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

2180 +"left in tree at %s."

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

2182 +

2183 +#: merge-recursive.c:1143

2184 msgid "rename"

2185 msgstr "renommage"

2186

2096 -#: merge-recursive.c:1150

2187 +#: merge-recursive.c:1143

2188 msgid "renamed"

2189 msgstr "renommé"

2190

2100 -#: merge-recursive.c:1207

2191 +#: merge-recursive.c:1200

2192 #, c-format

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

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

2195

2105 -#: merge-recursive.c:1232

2196 +#: merge-recursive.c:1225

2197 #, c-format

2198 msgid ""

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

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

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

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

2204

2114 -#: merge-recursive.c:1237

2205 +#: merge-recursive.c:1230

2206 msgid " (left unresolved)"

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

2208

2118 -#: merge-recursive.c:1299

2209 +#: merge-recursive.c:1292

2210 #, c-format

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

2212 msgstr ""

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

2214 ">'%s' dans %s"

2215

2125 -#: merge-recursive.c:1332

2216 +#: merge-recursive.c:1325

2217 #, c-format

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

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

2220

2130 -#: merge-recursive.c:1535

2221 +#: merge-recursive.c:1528

2222 #, c-format

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

2224 msgstr ""

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

2226

2136 -#: merge-recursive.c:1550

2227 +#: merge-recursive.c:1543

2228 #, c-format

2229 msgid "Adding merged %s"

2230 msgstr "Ajout de %s fusionné"

2231

2141 -#: merge-recursive.c:1557 merge-recursive.c:1771

2232 +#: merge-recursive.c:1550 merge-recursive.c:1780

2233 #, c-format

2234 msgid "Adding as %s instead"

2235 msgstr "Ajout plutôt comme %s"

2236

2146 -#: merge-recursive.c:1614

2237 +#: merge-recursive.c:1607

2238 #, c-format

2239 msgid "cannot read object %s"

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

2241

2151 -#: merge-recursive.c:1617

2242 +#: merge-recursive.c:1610

2243 #, c-format

2244 msgid "object %s is not a blob"

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

2246

2156 -#: merge-recursive.c:1670

2247 +#: merge-recursive.c:1679

2248 msgid "modify"

2249 msgstr "modification"

2250

2160 -#: merge-recursive.c:1670

2251 +#: merge-recursive.c:1679

2252 msgid "modified"

2253 msgstr "modifié"

2254

2164 -#: merge-recursive.c:1680

2255 +#: merge-recursive.c:1689

2256 msgid "content"

2257 msgstr "contenu"

2258

2168 -#: merge-recursive.c:1687

2259 +#: merge-recursive.c:1696

2260 msgid "add/add"

2261 msgstr "ajout/ajout"

2262

2172 -#: merge-recursive.c:1723

2263 +#: merge-recursive.c:1732

2264 #, c-format

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

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

2267

2177 -#: merge-recursive.c:1737

2268 +#: merge-recursive.c:1746

2269 #, c-format

2270 msgid "Auto-merging %s"

2271 msgstr "Fusion automatique de %s"

2272

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

2273 +#: merge-recursive.c:1750 git-submodule.sh:944

2274 msgid "submodule"

2275 msgstr "sous-module"

2276

2186 -#: merge-recursive.c:1742

2277 +#: merge-recursive.c:1751

2278 #, c-format

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

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

2281

2191 -#: merge-recursive.c:1836

2282 +#: merge-recursive.c:1845

2283 #, c-format

2284 msgid "Removing %s"

2285 msgstr "Suppression de %s"

2286

2196 -#: merge-recursive.c:1862

2287 +#: merge-recursive.c:1871

2288 msgid "file/directory"

2289 msgstr "fichier/répertoire"

2290

2200 -#: merge-recursive.c:1868

2291 +#: merge-recursive.c:1877

2292 msgid "directory/file"

2293 msgstr "répertoire/fichier"

2294

2204 -#: merge-recursive.c:1874

2295 +#: merge-recursive.c:1883

2296 #, c-format

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

2298 msgstr ""

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

2300

2210 -#: merge-recursive.c:1883

2301 +#: merge-recursive.c:1892

2302 #, c-format

2303 msgid "Adding %s"

2304 msgstr "Ajout de %s"

2305

2215 -#: merge-recursive.c:1920

2306 +#: merge-recursive.c:1929

2307 msgid "Already up-to-date!"

2308 msgstr "Déjà à jour !"

2309

2219 -#: merge-recursive.c:1929

2310 +#: merge-recursive.c:1938

2311 #, c-format

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

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

2314

2224 -#: merge-recursive.c:2012

2315 +#: merge-recursive.c:2021

2316 msgid "Merging:"

2317 msgstr "Fusion :"

2318

2228 -#: merge-recursive.c:2025

2319 +#: merge-recursive.c:2034

2320 #, c-format

2321 msgid "found %u common ancestor:"

2322 msgid_plural "found %u common ancestors:"

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

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

2325

2235 -#: merge-recursive.c:2064

2326 +#: merge-recursive.c:2073

2327 msgid "merge returned no commit"

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

2329

2239 -#: merge-recursive.c:2127

2330 +#: merge-recursive.c:2136

2331 #, c-format

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

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

2334

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

2335 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792

2336 msgid "Unable to write index."

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

2338

@@ -2317,18 +2408,35 @@ msgstr "-NUM"

2408 msgid "malformed object name '%s'"

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

2410

2320 -#: path.c:826

2411 +#: path.c:805

2412 #, c-format

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

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

2415

2325 -#: pathspec.c:142

2416 +#: pathspec.c:125

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

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

2419 +

2420 +#: pathspec.c:143

2421 +msgid "Only one 'attr:' specification is allowed."

2422 +msgstr "Une seule spécification 'attr:' est autorisée."

2423 +

2424 +#: pathspec.c:146

2425 +msgid "attr spec must not be empty"

2426 +msgstr "un spécificateur d'attribut ne peut pas être vide"

2427 +

2428 +#: pathspec.c:189

2429 +#, c-format

2430 +msgid "invalid attribute name %s"

2431 +msgstr "nom d'attribut invalide %s"

2432 +

2433 +#: pathspec.c:254

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

2435 msgstr ""

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

2437 "incompatibles"

2438

2331 -#: pathspec.c:149

2439 +#: pathspec.c:261

2440 msgid ""

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

2442 "pathspec settings"

@@ -2336,53 +2444,53 @@ msgstr ""

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

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

2446

2339 -#: pathspec.c:188

2447 +#: pathspec.c:301

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

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

2450

2343 -#: pathspec.c:201

2451 +#: pathspec.c:322

2452 #, c-format

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

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

2455

2348 -#: pathspec.c:206

2456 +#: pathspec.c:327

2457 #, c-format

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

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

2460

2353 -#: pathspec.c:238

2461 +#: pathspec.c:365

2462 #, c-format

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

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

2465

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

2466 +#: pathspec.c:421 pathspec.c:443

2467 #, c-format

2468 msgid "Pathspec '%s' is in submodule '%.*s'"

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

2470

2363 -#: pathspec.c:350

2471 +#: pathspec.c:483

2472 #, c-format

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

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

2475

2368 -#: pathspec.c:363

2476 +#: pathspec.c:496

2477 #, c-format

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

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

2480

2373 -#: pathspec.c:451

2481 +#: pathspec.c:584

2482 #, c-format

2483 msgid "'%s' (mnemonic: '%c')"

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

2485

2378 -#: pathspec.c:461

2486 +#: pathspec.c:594

2487 #, c-format

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

2489 msgstr ""

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

2491 "commande : %s"

2492

2385 -#: pathspec.c:511

2493 +#: pathspec.c:644

2494 msgid ""

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

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

@@ -2391,19 +2499,11 @@ msgstr ""

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

2500 "correspondre à tous le chemins"

2501

2394 -#: pathspec.c:535

2502 +#: pathspec.c:668

2503 #, c-format

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

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

2506

2399 -#: pathspec.c:544

2400 -msgid ""

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

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

2403 -msgstr ""

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

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

2406 -

2507 #: pretty.c:982

2508 msgid "unable to parse --pretty format"

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

@@ -2426,161 +2526,270 @@ msgstr ""

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

2527 "Utilisation de la version %i"

2528

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

2529 +#: read-cache.c:2232

2530 +#, c-format

2531 +msgid "could not stat '%s"

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

2533 +

2534 +#: read-cache.c:2232

2535 +#, c-format

2536 +msgid "could not stat '%s'"

2537 +msgstr "stat impossible de '%s'"

2538 +

2539 +#: read-cache.c:2245

2540 +#, c-format

2541 +msgid "unable to open git dir: %s"

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

2543 +

2544 +#: read-cache.c:2257

2545 +#, c-format

2546 +msgid "unable to unlink: %s"

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

2548 +

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

2550 #, c-format

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

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

2553

2434 -#: refs/files-backend.c:2481

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

2555 #, c-format

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

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

2558

2439 -#: refs/files-backend.c:2484

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

2560 #, c-format

2561 msgid "could not delete references: %s"

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

2563

2444 -#: refs/files-backend.c:2493

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

2565 #, c-format

2566 msgid "could not remove reference %s"

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

2568

2449 -#: ref-filter.c:56

2569 +# à priori on parle d'une branche ici

2570 +#: ref-filter.c:35 wt-status.c:1780

2571 +msgid "gone"

2572 +msgstr "disparue"

2573 +

2574 +#: ref-filter.c:36

2575 +#, c-format

2576 +msgid "ahead %d"

2577 +msgstr "en avance de %d"

2578 +

2579 +#: ref-filter.c:37

2580 +#, c-format

2581 +msgid "behind %d"

2582 +msgstr "en retard de %d"

2583 +

2584 +#: ref-filter.c:38

2585 +#, c-format

2586 +msgid "ahead %d, behind %d"

2587 +msgstr "en avance de %d, en retard de %d"

2588 +

2589 +#: ref-filter.c:104

2590 #, c-format

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

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

2593

2454 -#: ref-filter.c:58

2594 +#: ref-filter.c:106

2595 #, c-format

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

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

2598

2459 -#: ref-filter.c:72

2599 +#: ref-filter.c:120

2600 +#, c-format

2601 +msgid "Integer value expected refname:lstrip=%s"

2602 +msgstr "Valeur entière attendue refname:lstrip=%s"

2603 +

2604 +#: ref-filter.c:124

2605 #, c-format

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

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

2606 +msgid "Integer value expected refname:rstrip=%s"

2607 +msgstr "Valeur entière attendue refname:rstrip=%s"

2608

2464 -#: ref-filter.c:78

2609 +#: ref-filter.c:126

2610 +#, c-format

2611 +msgid "unrecognized %%(%s) argument: %s"

2612 +msgstr "argument %%(%s) non reconnu : %s"

2613 +

2614 +#: ref-filter.c:166

2615 #, c-format

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

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

2618

2469 -#: ref-filter.c:85

2619 +#: ref-filter.c:173

2620 #, c-format

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

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

2623

2474 -#: ref-filter.c:92

2624 +#: ref-filter.c:180

2625 #, c-format

2626 msgid "%%(trailers) does not take arguments"

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

2628

2479 -#: ref-filter.c:111

2629 +#: ref-filter.c:199

2630 #, c-format

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

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

2633

2484 -#: ref-filter.c:113

2634 +#: ref-filter.c:201

2635 #, c-format

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

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

2638

2489 -#: ref-filter.c:123

2639 +#: ref-filter.c:214

2640 +#, c-format

2641 +msgid "positive value expected objectname:short=%s"

2642 +msgstr "valeur positive attendue objectname:short=%s"

2643 +

2644 +#: ref-filter.c:218

2645 #, c-format

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

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

2648

2494 -#: ref-filter.c:145

2649 +#: ref-filter.c:245

2650 #, c-format

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

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

2653

2499 -#: ref-filter.c:157

2654 +#: ref-filter.c:257

2655 #, c-format

2656 msgid "unrecognized position:%s"

2657 msgstr "position non reconnue : %s"

2658

2504 -#: ref-filter.c:161

2659 +#: ref-filter.c:261

2660 #, c-format

2661 msgid "unrecognized width:%s"

2662 msgstr "largeur non reconnue : %s"

2663

2509 -#: ref-filter.c:167

2664 +#: ref-filter.c:267

2665 #, c-format

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

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

2668

2514 -#: ref-filter.c:171

2669 +#: ref-filter.c:271

2670 #, c-format

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

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

2673

2519 -#: ref-filter.c:255

2674 +#: ref-filter.c:286

2675 +#, c-format

2676 +msgid "unrecognized %%(if) argument: %s"

2677 +msgstr "argument %%(if) non reconnu : %s"

2678 +

2679 +#: ref-filter.c:371

2680 #, c-format

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

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

2683

2524 -#: ref-filter.c:281

2684 +#: ref-filter.c:397

2685 #, c-format

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

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

2688

2529 -#: ref-filter.c:383

2689 +#: ref-filter.c:501

2690 +#, c-format

2691 +msgid "format: %%(if) atom used without a %%(then) atom"

2692 +msgstr "format : atome %%(if) utilisé sans un atome %%(then)"

2693 +

2694 +#: ref-filter.c:561

2695 +#, c-format

2696 +msgid "format: %%(then) atom used without an %%(if) atom"

2697 +msgstr "format : atome %%(then) utilisé sans un atome %%(if)"

2698 +

2699 +#: ref-filter.c:563

2700 +#, c-format

2701 +msgid "format: %%(then) atom used more than once"

2702 +msgstr "format : atome %%(then) utilisé plus d'une fois"

2703 +

2704 +#: ref-filter.c:565

2705 +#, c-format

2706 +msgid "format: %%(then) atom used after %%(else)"

2707 +msgstr "format: atome %%(then) utilisé après %%(else)"

2708 +

2709 +#: ref-filter.c:591

2710 +#, c-format

2711 +msgid "format: %%(else) atom used without an %%(if) atom"

2712 +msgstr "format : atome %%(else) utilisé sans un atome %%(if)"

2713 +

2714 +#: ref-filter.c:593

2715 +#, c-format

2716 +msgid "format: %%(else) atom used without a %%(then) atom"

2717 +msgstr "format : atome %%(else) utilisé sans un atome %%(then)"

2718 +

2719 +#: ref-filter.c:595

2720 +#, c-format

2721 +msgid "format: %%(else) atom used more than once"

2722 +msgstr "format : atome %%(else) utilisé plus d'une fois"

2723 +

2724 +#: ref-filter.c:608

2725 #, c-format

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

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

2728

2534 -#: ref-filter.c:435

2729 +#: ref-filter.c:663

2730 #, c-format

2731 msgid "malformed format string %s"

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

2733

2539 -#: ref-filter.c:898

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

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

2734 +#: ref-filter.c:1247

2735 +#, c-format

2736 +msgid "(no branch, rebasing %s)"

2737 +msgstr "(aucune branche, rebasage de %s)"

2738

2543 -#: ref-filter.c:903

2739 +#: ref-filter.c:1250

2740 #, c-format

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

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

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

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

2743

2548 -#: ref-filter.c:1066

2744 +#. TRANSLATORS: make sure this matches

2745 +#. "HEAD detached at " in wt-status.c

2746 +#: ref-filter.c:1256

2747 #, c-format

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

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

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

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

2750

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

2751 +#. TRANSLATORS: make sure this matches

2752 +#. "HEAD detached from " in wt-status.c

2753 +#: ref-filter.c:1261

2754 +#, c-format

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

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

2757 +

2758 +#: ref-filter.c:1265

2759 +msgid "(no branch)"

2760 +msgstr "(aucune branche)"

2761 +

2762 +#: ref-filter.c:1420 ref-filter.c:1451

2763 #, c-format

2764 msgid "missing object %s for %s"

2765 msgstr "objet manquant %s pour %s"

2766

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

2767 +#: ref-filter.c:1423 ref-filter.c:1454

2768 #, c-format

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

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

2771

2563 -#: ref-filter.c:1343

2772 +#: ref-filter.c:1692

2773 #, c-format

2774 msgid "malformed object at '%s'"

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

2776

2568 -#: ref-filter.c:1410

2777 +#: ref-filter.c:1759

2778 #, c-format

2779 msgid "ignoring ref with broken name %s"

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

2781

2573 -#: ref-filter.c:1415

2782 +#: ref-filter.c:1764

2783 #, c-format

2784 msgid "ignoring broken ref %s"

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

2786

2578 -#: ref-filter.c:1670

2787 +#: ref-filter.c:2028

2788 #, c-format

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

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

2791

2583 -#: ref-filter.c:1734

2792 +#: ref-filter.c:2109

2793 #, c-format

2794 msgid "malformed object name %s"

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

@@ -2732,15 +2941,25 @@ msgstr "échec de l'ouverture de /dev/null"

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

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

2943

2735 -#: send-pack.c:297

2944 +#: send-pack.c:150

2945 +#, c-format

2946 +msgid "unable to parse remote unpack status: %s"

2947 +msgstr "impossible d'analyser le status de dépaquetage remote : %s"

2948 +

2949 +#: send-pack.c:152

2950 +#, c-format

2951 +msgid "remote unpack failed: %s"

2952 +msgstr "le dépaquetage a échoué : %s"

2953 +

2954 +#: send-pack.c:315

2955 msgid "failed to sign the push certificate"

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

2957

2739 -#: send-pack.c:410

2958 +#: send-pack.c:428

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

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

2961

2743 -#: send-pack.c:412

2962 +#: send-pack.c:430

2963 msgid ""

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

2965 "signed push"

@@ -2748,11 +2967,11 @@ msgstr ""

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

2968 "poussées avec --signed"

2969

2751 -#: send-pack.c:424

2970 +#: send-pack.c:442

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

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

2973

2755 -#: send-pack.c:429

2974 +#: send-pack.c:447

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

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

2977

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

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

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

3012

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

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

3014 #, c-format

3015 msgid "could not lock '%s'"

3016 msgstr "impossible de verrouiller '%s'"

3017

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

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

3019 #, c-format

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

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

@@ -2806,13 +3025,13 @@ msgstr "impossible d'écrire dans '%s'"

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

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

3027

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

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

3029 #, c-format

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

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

3032

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

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

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

3034 +#: builtin/commit.c:749 builtin/merge.c:1018

3035 #, c-format

3036 msgid "could not read '%s'"

3037 msgstr "impossible de lire '%s'"

@@ -2876,17 +3095,17 @@ msgstr ""

3095 "\n"

3096 " git rebase --continue\n"

3097

2879 -#: sequencer.c:688

3098 +#: sequencer.c:694

3099 #, c-format

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

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

3102

2884 -#: sequencer.c:693

3103 +#: sequencer.c:699

3104 #, c-format

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

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

3107

2889 -#: sequencer.c:815

3108 +#: sequencer.c:821

3109 #, c-format

3110 msgid ""

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

@@ -2897,7 +3116,7 @@ msgstr ""

3116 "\n"

3117 "\t%.*s"

3118

2900 -#: sequencer.c:821

3119 +#: sequencer.c:827

3120 #, c-format

3121 msgid ""

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

@@ -2908,232 +3127,232 @@ msgstr ""

3127 "\n"

3128 "\t%.*s"

3129

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

3130 +#: sequencer.c:833 sequencer.c:858

3131 #, c-format

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

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

3134

2916 -#: sequencer.c:836

3135 +#: sequencer.c:842

3136 msgid "need a HEAD to fixup"

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

3138

2920 -#: sequencer.c:838

3139 +#: sequencer.c:844

3140 msgid "could not read HEAD"

3141 msgstr "Impossible de lire HEAD"

3142

2924 -#: sequencer.c:840

3143 +#: sequencer.c:846

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

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

3146

2928 -#: sequencer.c:846

3147 +#: sequencer.c:852

3148 #, c-format

3149 msgid "cannot write '%s'"

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

3151

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

3152 +#: sequencer.c:861 git-rebase--interactive.sh:445

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

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

3155

2937 -#: sequencer.c:863

3156 +#: sequencer.c:869

3157 #, c-format

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

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

3160

2942 -#: sequencer.c:870

3161 +#: sequencer.c:876

3162 #, c-format

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

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

3165

2947 -#: sequencer.c:875

3166 +#: sequencer.c:881

3167 #, c-format

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

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

3170

2952 -#: sequencer.c:880

3171 +#: sequencer.c:886

3172 #, c-format

3173 msgid "unknown command: %d"

3174 msgstr "commande inconnue : %d"

3175

2957 -#: sequencer.c:946

3176 +#: sequencer.c:952

3177 msgid "your index file is unmerged."

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

3179

2961 -#: sequencer.c:964

3180 +#: sequencer.c:970

3181 #, c-format

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

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

3184

2966 -#: sequencer.c:972

3185 +#: sequencer.c:978

3186 #, c-format

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

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

3189

2971 -#: sequencer.c:976

3190 +#: sequencer.c:982

3191 #, c-format

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

3193 msgstr ""

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

3195 "fusion."

3196

2978 -#: sequencer.c:982

3197 +#: sequencer.c:988

3198 #, c-format

3199 msgid "cannot get commit message for %s"

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

3201

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

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

2985 -#: sequencer.c:1001

3204 +#: sequencer.c:1009

3205 #, c-format

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

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

3208

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

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

3210 #, c-format

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

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

3213

2995 -#: sequencer.c:1114

3214 +#: sequencer.c:1122

3215 #, c-format

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

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

3218

3000 -#: sequencer.c:1115

3219 +#: sequencer.c:1123

3220 #, c-format

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

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

3223

3005 -#: sequencer.c:1157

3224 +#: sequencer.c:1165

3225 msgid "empty commit set passed"

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

3227

3009 -#: sequencer.c:1167

3228 +#: sequencer.c:1175

3229 #, c-format

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

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

3232

3014 -#: sequencer.c:1174

3233 +#: sequencer.c:1182

3234 #, c-format

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

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

3237

3019 -#: sequencer.c:1294

3238 +#: sequencer.c:1302

3239 #, c-format

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

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

3242

3024 -#: sequencer.c:1302

3243 +#: sequencer.c:1310

3244 #, c-format

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

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

3247

3029 -#: sequencer.c:1334

3248 +#: sequencer.c:1342

3249 #, c-format

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

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

3252

3034 -#: sequencer.c:1341

3253 +#: sequencer.c:1349

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

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

3256

3038 -#: sequencer.c:1343

3257 +#: sequencer.c:1351

3258 #, c-format

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

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

3261

3043 -#: sequencer.c:1348

3262 +#: sequencer.c:1356

3263 msgid "no commits parsed."

3264 msgstr "aucun commit analysé."

3265

3047 -#: sequencer.c:1359

3266 +#: sequencer.c:1367

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

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

3269

3051 -#: sequencer.c:1361

3270 +#: sequencer.c:1369

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

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

3273

3055 -#: sequencer.c:1424

3274 +#: sequencer.c:1432

3275 #, c-format

3276 msgid "invalid key: %s"

3277 msgstr "clé invalide : %s"

3278

3060 -#: sequencer.c:1427

3279 +#: sequencer.c:1435

3280 #, c-format

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

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

3283

3065 -#: sequencer.c:1484

3284 +#: sequencer.c:1492

3285 #, c-format

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

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

3288

3070 -#: sequencer.c:1522

3289 +#: sequencer.c:1530

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

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

3292

3074 -#: sequencer.c:1523

3293 +#: sequencer.c:1531

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

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

3296

3078 -#: sequencer.c:1526

3297 +#: sequencer.c:1534

3298 #, c-format

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

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

3301

3083 -#: sequencer.c:1540

3302 +#: sequencer.c:1548

3303 msgid "could not lock HEAD"

3304 msgstr "impossible de verrouiller HEAD"

3305

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

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

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

3308 msgstr "aucun picorage ou retour en cours"

3309

3091 -#: sequencer.c:1598

3310 +#: sequencer.c:1606

3311 msgid "cannot resolve HEAD"

3312 msgstr "impossible de résoudre HEAD"

3313

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

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

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

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

3317

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

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

3319 #, c-format

3320 msgid "cannot open '%s'"

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

3322

3104 -#: sequencer.c:1622

3323 +#: sequencer.c:1630

3324 #, c-format

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

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

3327

3109 -#: sequencer.c:1623

3328 +#: sequencer.c:1631

3329 msgid "unexpected end of file"

3330 msgstr "fin de fichier inattendue"

3331

3113 -#: sequencer.c:1629

3332 +#: sequencer.c:1637

3333 #, c-format

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

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

3336

3118 -#: sequencer.c:1640

3337 +#: sequencer.c:1648

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

3339 msgstr ""

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

3341

3123 -#: sequencer.c:1777 sequencer.c:2049

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

3343 msgid "cannot read HEAD"

3344 msgstr "impossible de lire HEAD"

3345

3127 -#: sequencer.c:1817 builtin/difftool.c:574

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

3347 #, c-format

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

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

3350

3132 -#: sequencer.c:1833

3351 +#: sequencer.c:1841

3352 msgid "could not read index"

3353 msgstr "impossible de lire l'index"

3354

3136 -#: sequencer.c:1838

3355 +#: sequencer.c:1846

3356 #, c-format

3357 msgid ""

3358 "execution failed: %s\n"

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

3367 "git rebase --continue\n"

3368 "\n"

3369

3151 -#: sequencer.c:1844

3370 +#: sequencer.c:1852

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

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

3373

3155 -#: sequencer.c:1850

3374 +#: sequencer.c:1858

3375 #, c-format

3376 msgid ""

3377 "execution succeeded: %s\n"

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

3388 " git rebase --continue\n"

3389 "\n"

3390

3172 -#: sequencer.c:1905 git-rebase.sh:168

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

3392 #, c-format

3393 msgid "Applied autostash."

3394 msgstr "Autoremisage appliqué."

3395

3177 -#: sequencer.c:1917

3396 +#: sequencer.c:1925

3397 #, c-format

3398 msgid "cannot store %s"

3399 msgstr "impossible de stocker %s"

3400

3182 -#: sequencer.c:1919 git-rebase.sh:172

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

3402 #, c-format

3403 msgid ""

3404 "Applying autostash resulted in conflicts.\n"

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

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

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

3411

3193 -#: sequencer.c:2000

3412 +#: sequencer.c:2009

3413 #, c-format

3195 -msgid "stopped at %s... %.*s"

3196 -msgstr "arrêt à %s... %.*s"

3414 +msgid "Stopped at %s... %.*s\n"

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

3416

3198 -#: sequencer.c:2027

3417 +#: sequencer.c:2036

3418 #, c-format

3419 msgid "unknown command %d"

3420 msgstr "commande inconnue %d"

3421

3203 -#: sequencer.c:2057

3422 +#: sequencer.c:2066

3423 msgid "could not read orig-head"

3424 msgstr "impossible de lire orig-head"

3425

3207 -#: sequencer.c:2061

3426 +#: sequencer.c:2070

3427 msgid "could not read 'onto'"

3428 msgstr "impossible de lire 'onto'"

3429

3211 -#: sequencer.c:2068

3430 +#: sequencer.c:2077

3431 #, c-format

3432 msgid "could not update %s"

3433 msgstr "impossible de mettre à jour %s"

3434

3216 -#: sequencer.c:2075

3435 +#: sequencer.c:2084

3436 #, c-format

3437 msgid "could not update HEAD to %s"

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

3439

3221 -#: sequencer.c:2159

3440 +#: sequencer.c:2168

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

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

3443

3225 -#: sequencer.c:2164

3444 +#: sequencer.c:2173

3445 msgid "could not remove CHERRY_PICK_HEAD"

3446 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3447

3229 -#: sequencer.c:2173

3448 +#: sequencer.c:2182

3449 msgid "cannot amend non-existing commit"

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

3451

3233 -#: sequencer.c:2175

3452 +#: sequencer.c:2184

3453 #, c-format

3454 msgid "invalid file: '%s'"

3455 msgstr "fichier invalide : '%s'"

3456

3238 -#: sequencer.c:2177

3457 +#: sequencer.c:2186

3458 #, c-format

3459 msgid "invalid contents: '%s'"

3460 msgstr "contenu invalide : '%s'"

3461

3243 -#: sequencer.c:2180

3462 +#: sequencer.c:2189

3463 msgid ""

3464 "\n"

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

@@ -3250,25 +3469,25 @@ msgstr ""

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

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

3471

3253 -#: sequencer.c:2190

3472 +#: sequencer.c:2199

3473 msgid "could not commit staged changes."

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

3475

3257 -#: sequencer.c:2270

3476 +#: sequencer.c:2279

3477 #, c-format

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

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

3480

3262 -#: sequencer.c:2274

3481 +#: sequencer.c:2283

3482 #, c-format

3483 msgid "%s: bad revision"

3484 msgstr "%s : mauvaise révision"

3485

3267 -#: sequencer.c:2307

3486 +#: sequencer.c:2316

3487 msgid "can't revert as initial commit"

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

3489

3271 -#: setup.c:160

3490 +#: setup.c:165

3491 #, c-format

3492 msgid ""

3493 "%s: no such path in the working tree.\n"

@@ -3278,7 +3497,7 @@ msgstr ""

3497 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "

3498 "n'existent pas localement."

3499

3281 -#: setup.c:173

3500 +#: setup.c:178

3501 #, c-format

3502 msgid ""

3503 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3289,7 +3508,7 @@ msgstr ""

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

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

3510

3292 -#: setup.c:223

3511 +#: setup.c:228

3512 #, c-format

3513 msgid ""

3514 "ambiguous argument '%s': both revision and filename\n"

@@ -3300,29 +3519,34 @@ msgstr ""

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

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

3521

3303 -#: setup.c:470

3522 +#: setup.c:475

3523 #, c-format

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

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

3526

3308 -#: setup.c:478

3527 +#: setup.c:483

3528 msgid "unknown repository extensions found:"

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

3530

3312 -#: setup.c:768

3531 +#: setup.c:776

3532 #, c-format

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

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

3535

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

3536 +#: setup.c:778 builtin/index-pack.c:1646

3537 msgid "Cannot come back to cwd"

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

3539

3321 -#: setup.c:852

3540 +#: setup.c:1010

3541 msgid "Unable to read current working directory"

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

3543

3325 -#: setup.c:927

3544 +#: setup.c:1022 setup.c:1028

3545 +#, c-format

3546 +msgid "Cannot change to '%s'"

3547 +msgstr "Impossible de modifié en '%s'"

3548 +

3549 +#: setup.c:1041

3550 #, c-format

3551 msgid ""

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

@@ -3333,12 +3557,7 @@ msgstr ""

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

3558 "n'est pas activé)."

3559

3336 -#: setup.c:934

3337 -#, c-format

3338 -msgid "Cannot change to '%s/..'"

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

3340 -

3341 -#: setup.c:996

3560 +#: setup.c:1106

3561 #, c-format

3562 msgid ""

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

@@ -3348,58 +3567,58 @@ msgstr ""

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

3568 "écriture."

3569

3351 -#: sha1_file.c:490

3570 +#: sha1_file.c:559

3571 #, c-format

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

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

3574

3356 -#: sha1_file.c:516

3575 +#: sha1_file.c:585

3576 #, c-format

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

3578 msgstr ""

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

3580 "encore supporté."

3581

3363 -#: sha1_file.c:522

3582 +#: sha1_file.c:591

3583 #, c-format

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

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

3586

3368 -#: sha1_file.c:528

3587 +#: sha1_file.c:597

3588 #, c-format

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

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

3591

3373 -#: sha1_file.c:536

3592 +#: sha1_file.c:605

3593 #, c-format

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

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

3596

3378 -#: sha1_file.c:1176

3597 +#: sha1_file.c:1245

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

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

3600

3382 -#: sha1_file.c:2637

3601 +#: sha1_file.c:2721

3602 #, c-format

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

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

3605

3387 -#: sha1_file.c:2641

3606 +#: sha1_file.c:2725

3607 #, c-format

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

3609 msgstr ""

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

3611

3393 -#: sha1_name.c:407

3612 +#: sha1_name.c:409

3613 #, c-format

3614 msgid "short SHA1 %s is ambiguous"

3615 msgstr "le SHA1 court %s est ambigu"

3616

3398 -#: sha1_name.c:418

3617 +#: sha1_name.c:420

3618 msgid "The candidates are:"

3619 msgstr "Les candidats sont :"

3620

3402 -#: sha1_name.c:578

3621 +#: sha1_name.c:580

3622 msgid ""

3623 "Git normally never creates a ref that ends with 40 hex characters\n"

3624 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3424,47 +3643,57 @@ msgstr ""

3643 "message\n"

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

3645

3427 -#: submodule.c:65 submodule.c:99

3646 +#: submodule.c:67 submodule.c:101

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

3648 msgstr ""

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

3650 "d'abord"

3651

3433 -#: submodule.c:69 submodule.c:103

3652 +#: submodule.c:71 submodule.c:105

3653 #, c-format

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

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

3656

3438 -#: submodule.c:77

3657 +#: submodule.c:79

3658 #, c-format

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

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

3661

3662 # ici %s est un chemin

3444 -#: submodule.c:110

3663 +#: submodule.c:112

3664 #, c-format

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

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

3667

3449 -#: submodule.c:121

3668 +#: submodule.c:123

3669 msgid "staging updated .gitmodules failed"

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

3671

3453 -#: submodule.c:159

3672 +#: submodule.c:161

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

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

3675

3457 -#: submodule.c:1184

3676 +#: submodule.c:1194

3677 +#, c-format

3678 +msgid "'%s' not recognized as a git repository"

3679 +msgstr "'%s' n'est pas reconnu comme dépôt git"

3680 +

3681 +#: submodule.c:1332

3682 #, c-format

3459 -msgid "could not start 'git status in submodule '%s'"

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

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

3685

3462 -#: submodule.c:1197

3686 +#: submodule.c:1345

3687 #, c-format

3464 -msgid "could not run 'git status in submodule '%s'"

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

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

3690

3467 -#: submodule.c:1398

3691 +#: submodule.c:1421

3692 +#, c-format

3693 +msgid "submodule '%s' has dirty index"

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

3695 +

3696 +#: submodule.c:1679

3697 #, c-format

3698 msgid ""

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

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

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

3702 "n'est pas supporté"

3703

3475 -#: submodule.c:1410 submodule.c:1471

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

3705 #, c-format

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

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

3708

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

3481 -#: builtin/submodule--helper.c:650

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

3710 +#: builtin/submodule--helper.c:688

3711 #, c-format

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

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

3714

3486 -#: submodule.c:1420

3715 +#: submodule.c:1698

3716 #, c-format

3717 msgid ""

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

@@ -3494,12 +3723,25 @@ msgstr ""

3723 "'%s' sur\n"

3724 "'%s'\n"

3725

3497 -#: submodule.c:1512

3726 +#: submodule.c:1782

3727 #, c-format

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

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

3730

3502 -#: submodule-config.c:360

3731 +#: submodule.c:1826

3732 +msgid "could not start ls-files in .."

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

3734 +

3735 +#: submodule.c:1846

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

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

3738 +

3739 +#: submodule.c:1865

3740 +#, c-format

3741 +msgid "ls-tree returned unexpected return code %d"

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

3743 +

3744 +#: submodule-config.c:380

3745 #, c-format

3746 msgid "invalid value for %s"

3747 msgstr "Valeur invalide pour %s"

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

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

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

3812

3571 -#: transport.c:885

3813 +#: transport.c:889

3814 #, c-format

3815 msgid ""

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

@@ -3577,7 +3819,7 @@ msgstr ""

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

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

3821

3580 -#: transport.c:889

3822 +#: transport.c:893

3823 #, c-format

3824 msgid ""

3825 "\n"

@@ -3604,11 +3846,11 @@ msgstr ""

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

3847 "\n"

3848

3607 -#: transport.c:897

3849 +#: transport.c:901

3850 msgid "Aborting."

3851 msgstr "Abandon."

3852

3611 -#: transport-helper.c:1082

3853 +#: transport-helper.c:1080

3854 #, c-format

3855 msgid "Could not read ref %s"

3856 msgstr "impossible de lire la réf %s"

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

3871 msgid "too-short tree file"

3872 msgstr "fichier arbre trop court"

3873

3632 -#: unpack-trees.c:99

3874 +#: unpack-trees.c:104

3875 #, c-format

3876 msgid ""

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

@@ -3640,7 +3882,7 @@ msgstr ""

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

3883 "branche."

3884

3643 -#: unpack-trees.c:101

3885 +#: unpack-trees.c:106

3886 #, c-format

3887 msgid ""

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

@@ -3650,7 +3892,7 @@ msgstr ""

3892 "l'extraction :\n"

3893 "%%s"

3894

3653 -#: unpack-trees.c:104

3895 +#: unpack-trees.c:109

3896 #, c-format

3897 msgid ""

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

@@ -3660,7 +3902,7 @@ msgstr ""

3902 "fusion :\n"

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

3904

3663 -#: unpack-trees.c:106

3905 +#: unpack-trees.c:111

3906 #, c-format

3907 msgid ""

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

@@ -3670,7 +3912,7 @@ msgstr ""

3912 "fusion :\n"

3913 "%%s"

3914

3673 -#: unpack-trees.c:109

3915 +#: unpack-trees.c:114

3916 #, c-format

3917 msgid ""

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

@@ -3679,7 +3921,7 @@ msgstr ""

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

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

3923

3682 -#: unpack-trees.c:111

3924 +#: unpack-trees.c:116

3925 #, c-format

3926 msgid ""

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

@@ -3688,7 +3930,7 @@ msgstr ""

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

3931 "%%s"

3932

3691 -#: unpack-trees.c:116

3933 +#: unpack-trees.c:121

3934 #, c-format

3935 msgid ""

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

@@ -3698,7 +3940,7 @@ msgstr ""

3940 "contenus :\n"

3941 "%s"

3942

3701 -#: unpack-trees.c:120

3943 +#: unpack-trees.c:125

3944 #, c-format

3945 msgid ""

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

@@ -3708,7 +3950,7 @@ msgstr ""

3950 "l'extraction :\n"

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

3952

3711 -#: unpack-trees.c:122

3953 +#: unpack-trees.c:127

3954 #, c-format

3955 msgid ""

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

@@ -3717,7 +3959,7 @@ msgstr ""

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

3960 "%%s"

3961

3720 -#: unpack-trees.c:125

3962 +#: unpack-trees.c:130

3963 #, c-format

3964 msgid ""

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

@@ -3727,7 +3969,7 @@ msgstr ""

3969 "la fusion :\n"

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

3971

3730 -#: unpack-trees.c:127

3972 +#: unpack-trees.c:132

3973 #, c-format

3974 msgid ""

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

@@ -3736,7 +3978,7 @@ msgstr ""

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

3979 "%%s"

3980

3739 -#: unpack-trees.c:130

3981 +#: unpack-trees.c:135

3982 #, c-format

3983 msgid ""

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

@@ -3746,7 +3988,7 @@ msgstr ""

3988 "%s :\n"

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

3990

3749 -#: unpack-trees.c:132

3991 +#: unpack-trees.c:137

3992 #, c-format

3993 msgid ""

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

@@ -3755,7 +3997,7 @@ msgstr ""

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

3998 "%%s"

3999

3758 -#: unpack-trees.c:137

4000 +#: unpack-trees.c:142

4001 #, c-format

4002 msgid ""

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

@@ -3766,7 +4008,7 @@ msgstr ""

4008 "l'extraction :\n"

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

4010

3769 -#: unpack-trees.c:139

4011 +#: unpack-trees.c:144

4012 #, c-format

4013 msgid ""

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

@@ -3776,7 +4018,7 @@ msgstr ""

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

4019 "%%s"

4020

3779 -#: unpack-trees.c:142

4021 +#: unpack-trees.c:147

4022 #, c-format

4023 msgid ""

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

@@ -3786,7 +4028,7 @@ msgstr ""

4028 "la fusion :\n"

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

4030

3789 -#: unpack-trees.c:144

4031 +#: unpack-trees.c:149

4032 #, c-format

4033 msgid ""

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

@@ -3795,7 +4037,7 @@ msgstr ""

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

4038 "%%s"

4039

3798 -#: unpack-trees.c:147

4040 +#: unpack-trees.c:152

4041 #, c-format

4042 msgid ""

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

@@ -3805,7 +4047,7 @@ msgstr ""

4047 "%s :\n"

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

4049

3808 -#: unpack-trees.c:149

4050 +#: unpack-trees.c:154

4051 #, c-format

4052 msgid ""

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

@@ -3814,12 +4056,12 @@ msgstr ""

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

4057 "%%s"

4058

3817 -#: unpack-trees.c:156

4059 +#: unpack-trees.c:161

4060 #, c-format

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

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

4063

3822 -#: unpack-trees.c:159

4064 +#: unpack-trees.c:164

4065 #, c-format

4066 msgid ""

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

@@ -3829,7 +4071,7 @@ msgstr ""

4071 "pas à jour :\n"

4072 "%s"

4073

3832 -#: unpack-trees.c:161

4074 +#: unpack-trees.c:166

4075 #, c-format

4076 msgid ""

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

@@ -3840,7 +4082,7 @@ msgstr ""

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

4083 "%s"

4084

3843 -#: unpack-trees.c:163

4085 +#: unpack-trees.c:168

4086 #, c-format

4087 msgid ""

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

@@ -3851,45 +4093,59 @@ msgstr ""

4093 "à jour par extraction creuse :\n"

4094 "%s"

4095

3854 -#: unpack-trees.c:240

4096 +#: unpack-trees.c:170

4097 +#, c-format

4098 +msgid ""

4099 +"Cannot update submodule:\n"

4100 +"%s"

4101 +msgstr ""

4102 +"Mise à jour impossible pour le sous-module :\n"

4103 +"%s"

4104 +

4105 +#: unpack-trees.c:247

4106 #, c-format

4107 msgid "Aborting\n"

4108 msgstr "Abandon\n"

4109

3859 -#: unpack-trees.c:270

4110 +#: unpack-trees.c:272

4111 +#, c-format

4112 +msgid "submodule update strategy not supported for submodule '%s'"

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

4114 +

4115 +#: unpack-trees.c:340

4116 msgid "Checking out files"

4117 msgstr "Extraction des fichiers"

4118

3863 -#: urlmatch.c:120

4119 +#: urlmatch.c:163

4120 msgid "invalid URL scheme name or missing '://' suffix"

4121 msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"

4122

3867 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

4123 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405

4124 #, c-format

4125 msgid "invalid %XX escape sequence"

4126 msgstr "séquence d'échappement %XX invalide"

4127

3872 -#: urlmatch.c:172

4128 +#: urlmatch.c:215

4129 msgid "missing host and scheme is not 'file:'"

4130 msgstr "hôte manquant et le schéma n'est pas 'file:'"

4131

3876 -#: urlmatch.c:189

4132 +#: urlmatch.c:232

4133 msgid "a 'file:' URL may not have a port number"

4134 msgstr "une URL 'file:' ne peut pas contenir de numéro de port"

4135

3880 -#: urlmatch.c:199

4136 +#: urlmatch.c:247

4137 msgid "invalid characters in host name"

4138 msgstr "caractères invalides dans le nom d'hôte"

4139

3884 -#: urlmatch.c:244 urlmatch.c:255

4140 +#: urlmatch.c:292 urlmatch.c:303

4141 msgid "invalid port number"

4142 msgstr "numéro de port invalide"

4143

3888 -#: urlmatch.c:322

4144 +#: urlmatch.c:371

4145 msgid "invalid '..' path segment"

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

4147

3892 -#: worktree.c:282

4148 +#: worktree.c:285

4149 #, c-format

4150 msgid "failed to read '%s'"

4151 msgstr "échec de la lecture de '%s'"

@@ -3905,27 +4161,27 @@ msgid "could not open '%s' for writing"

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

4162

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

3908 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

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

4165 #: builtin/pull.c:341

4166 #, c-format

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

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

4169

3914 -#: wrapper.c:605 wrapper.c:626

4170 +#: wrapper.c:581 wrapper.c:602

4171 #, c-format

4172 msgid "unable to access '%s'"

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

4174

3919 -#: wrapper.c:634

4175 +#: wrapper.c:610

4176 msgid "unable to get current working directory"

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

4178

3923 -#: wrapper.c:658

4179 +#: wrapper.c:634

4180 #, c-format

4181 msgid "could not write to %s"

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

4183

3928 -#: wrapper.c:660

4184 +#: wrapper.c:636

4185 #, c-format

4186 msgid "could not close %s"

4187 msgstr "impossible de fermer %s"

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

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

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

4215

3960 -#: wt-status.c:199 wt-status.c:945

4216 +#: wt-status.c:199 wt-status.c:958

4217 msgid "Changes to be committed:"

4218 msgstr "Modifications qui seront validées :"

4219

3964 -#: wt-status.c:217 wt-status.c:954

4220 +#: wt-status.c:217 wt-status.c:967

4221 msgid "Changes not staged for commit:"

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

4223

@@ -4066,15 +4322,15 @@ msgstr "contenu modifié, "

4322 msgid "untracked content, "

4323 msgstr "contenu non suivi, "

4324

4069 -#: wt-status.c:818

4325 +#: wt-status.c:831

4326 msgid "Submodules changed but not updated:"

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

4328

4073 -#: wt-status.c:820

4329 +#: wt-status.c:833

4330 msgid "Submodule changes to be committed:"

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

4332

4077 -#: wt-status.c:901

4333 +#: wt-status.c:914

4334 msgid ""

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

4336 "Everything below will be removed."

@@ -4082,107 +4338,107 @@ msgstr ""

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

4339 "Tout ce qui suit sera éliminé."

4340

4085 -#: wt-status.c:1013

4341 +#: wt-status.c:1026

4342 msgid "You have unmerged paths."

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

4344

4089 -#: wt-status.c:1016

4345 +#: wt-status.c:1029

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

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

4348

4093 -#: wt-status.c:1018

4349 +#: wt-status.c:1031

4350 msgid " (use \"git merge --abort\" to abort the merge)"

4351 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

4352

4097 -#: wt-status.c:1023

4353 +#: wt-status.c:1036

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

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

4356

4101 -#: wt-status.c:1026

4357 +#: wt-status.c:1039

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

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

4360

4105 -#: wt-status.c:1036

4361 +#: wt-status.c:1049

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

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

4364

4109 -#: wt-status.c:1039

4365 +#: wt-status.c:1052

4366 msgid "The current patch is empty."

4367 msgstr "Le patch actuel est vide."

4368

4113 -#: wt-status.c:1043

4369 +#: wt-status.c:1056

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

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

4372

4117 -#: wt-status.c:1045

4373 +#: wt-status.c:1058

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

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

4376

4121 -#: wt-status.c:1047

4377 +#: wt-status.c:1060

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

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

4380

4125 -#: wt-status.c:1176

4381 +#: wt-status.c:1189

4382 msgid "git-rebase-todo is missing."

4383 msgstr "git-rebase-todo est manquant."

4384

4129 -#: wt-status.c:1178

4385 +#: wt-status.c:1191

4386 msgid "No commands done."

4387 msgstr "Aucune commande réalisée."

4388

4133 -#: wt-status.c:1181

4389 +#: wt-status.c:1194

4390 #, c-format

4391 msgid "Last command done (%d command done):"

4392 msgid_plural "Last commands done (%d commands done):"

4393 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

4394 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

4395

4140 -#: wt-status.c:1192

4396 +#: wt-status.c:1205

4397 #, c-format

4398 msgid " (see more in file %s)"

4399 msgstr " (voir plus dans le fichier %s)"

4400

4145 -#: wt-status.c:1197

4401 +#: wt-status.c:1210

4402 msgid "No commands remaining."

4403 msgstr "Aucune commande restante."

4404

4149 -#: wt-status.c:1200

4405 +#: wt-status.c:1213

4406 #, c-format

4407 msgid "Next command to do (%d remaining command):"

4408 msgid_plural "Next commands to do (%d remaining commands):"

4409 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

4410 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

4411

4156 -#: wt-status.c:1208

4412 +#: wt-status.c:1221

4413 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4414 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

4415

4160 -#: wt-status.c:1221

4416 +#: wt-status.c:1234

4417 #, c-format

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

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

4420

4165 -#: wt-status.c:1226

4421 +#: wt-status.c:1239

4422 msgid "You are currently rebasing."

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

4424

4169 -#: wt-status.c:1240

4425 +#: wt-status.c:1253

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

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

4428

4173 -#: wt-status.c:1242

4429 +#: wt-status.c:1255

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

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

4432

4177 -#: wt-status.c:1244

4433 +#: wt-status.c:1257

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

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

4436

4181 -#: wt-status.c:1250

4437 +#: wt-status.c:1263

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

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

4440

4185 -#: wt-status.c:1254

4441 +#: wt-status.c:1267

4442 #, c-format

4443 msgid ""

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

@@ -4190,124 +4446,124 @@ msgstr ""

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

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

4448

4193 -#: wt-status.c:1259

4449 +#: wt-status.c:1272

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

4451 msgstr ""

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

4453

4198 -#: wt-status.c:1262

4454 +#: wt-status.c:1275

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

4456 msgstr ""

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

4458

4203 -#: wt-status.c:1266

4459 +#: wt-status.c:1279

4460 #, c-format

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

4462 msgstr ""

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

4464 "branche '%s' sur '%s'."

4465

4210 -#: wt-status.c:1271

4466 +#: wt-status.c:1284

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

4468 msgstr ""

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

4470

4215 -#: wt-status.c:1274

4471 +#: wt-status.c:1287

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

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

4474

4219 -#: wt-status.c:1276

4475 +#: wt-status.c:1289

4476 msgid ""

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

4478 msgstr ""

4479 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

4480 "modifications)"

4481

4226 -#: wt-status.c:1286

4482 +#: wt-status.c:1299

4483 #, c-format

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

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

4486

4231 -#: wt-status.c:1291

4487 +#: wt-status.c:1304

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

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

4490

4235 -#: wt-status.c:1294

4491 +#: wt-status.c:1307

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

4493 msgstr ""

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

4495

4240 -#: wt-status.c:1296

4496 +#: wt-status.c:1309

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

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

4499

4244 -#: wt-status.c:1305

4500 +#: wt-status.c:1318

4501 #, c-format

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

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

4504

4249 -#: wt-status.c:1310

4505 +#: wt-status.c:1323

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

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

4508

4253 -#: wt-status.c:1313

4509 +#: wt-status.c:1326

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

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

4512

4257 -#: wt-status.c:1315

4513 +#: wt-status.c:1328

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

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

4516

4261 -#: wt-status.c:1326

4517 +#: wt-status.c:1339

4518 #, c-format

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

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

4521

4266 -#: wt-status.c:1330

4522 +#: wt-status.c:1343

4523 msgid "You are currently bisecting."

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

4525

4270 -#: wt-status.c:1333

4526 +#: wt-status.c:1346

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

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

4529

4274 -#: wt-status.c:1530

4530 +#: wt-status.c:1543

4531 msgid "On branch "

4532 msgstr "Sur la branche "

4533

4278 -#: wt-status.c:1536

4534 +#: wt-status.c:1549

4535 msgid "interactive rebase in progress; onto "

4536 msgstr "rebasage interactif en cours ; sur "

4537

4282 -#: wt-status.c:1538

4538 +#: wt-status.c:1551

4539 msgid "rebase in progress; onto "

4540 msgstr "rebasage en cours ; sur "

4541

4286 -#: wt-status.c:1543

4542 +#: wt-status.c:1556

4543 msgid "HEAD detached at "

4544 msgstr "HEAD détachée sur "

4545

4290 -#: wt-status.c:1545

4546 +#: wt-status.c:1558

4547 msgid "HEAD detached from "

4548 msgstr "HEAD détachée depuis "

4549

4294 -#: wt-status.c:1548

4550 +#: wt-status.c:1561

4551 msgid "Not currently on any branch."

4552 msgstr "Actuellement sur aucun branche."

4553

4298 -#: wt-status.c:1566

4554 +#: wt-status.c:1579

4555 msgid "Initial commit"

4556 msgstr "Validation initiale"

4557

4302 -#: wt-status.c:1580

4558 +#: wt-status.c:1593

4559 msgid "Untracked files"

4560 msgstr "Fichiers non suivis"

4561

4306 -#: wt-status.c:1582

4562 +#: wt-status.c:1595

4563 msgid "Ignored files"

4564 msgstr "Fichiers ignorés"

4565

4310 -#: wt-status.c:1586

4566 +#: wt-status.c:1599

4567 #, c-format

4568 msgid ""

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

@@ -4319,32 +4575,32 @@ msgstr ""

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

4576 "status')."

4577

4322 -#: wt-status.c:1592

4578 +#: wt-status.c:1605

4579 #, c-format

4580 msgid "Untracked files not listed%s"

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

4582

4327 -#: wt-status.c:1594

4583 +#: wt-status.c:1607

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

4585 msgstr " (utilisez -u pour afficher les fichiers non suivis)"

4586

4331 -#: wt-status.c:1600

4587 +#: wt-status.c:1613

4588 msgid "No changes"

4589 msgstr "Aucune modification"

4590

4335 -#: wt-status.c:1605

4591 +#: wt-status.c:1618

4592 #, c-format

4593 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4594 msgstr ""

4595 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "

4596 "\"git commit -a\")\n"

4597

4342 -#: wt-status.c:1608

4598 +#: wt-status.c:1621

4599 #, c-format

4600 msgid "no changes added to commit\n"

4601 msgstr "aucune modification ajoutée à la validation\n"

4602

4347 -#: wt-status.c:1611

4603 +#: wt-status.c:1624

4604 #, c-format

4605 msgid ""

4606 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -4353,72 +4609,67 @@ msgstr ""

4609 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4610 "sont présents (utilisez \"git add\" pour les suivre)\n"

4611

4356 -#: wt-status.c:1614

4612 +#: wt-status.c:1627

4613 #, c-format

4614 msgid "nothing added to commit but untracked files present\n"

4615 msgstr ""

4616 "aucune modification ajoutée à la validation mais des fichiers non suivis "

4617 "sont présents\n"

4618

4363 -#: wt-status.c:1617

4619 +#: wt-status.c:1630

4620 #, c-format

4621 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4622 msgstr ""

4623 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "

4624 "suivre)\n"

4625

4370 -#: wt-status.c:1620 wt-status.c:1625

4626 +#: wt-status.c:1633 wt-status.c:1638

4627 #, c-format

4628 msgid "nothing to commit\n"

4629 msgstr "rien à valider\n"

4630

4375 -#: wt-status.c:1623

4631 +#: wt-status.c:1636

4632 #, c-format

4633 msgid "nothing to commit (use -u to show untracked files)\n"

4634 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"

4635

4380 -#: wt-status.c:1627

4636 +#: wt-status.c:1640

4637 #, c-format

4638 msgid "nothing to commit, working tree clean\n"

4639 msgstr "rien à valider, la copie de travail est propre\n"

4640

4385 -#: wt-status.c:1734

4641 +#: wt-status.c:1749

4642 msgid "Initial commit on "

4643 msgstr "Validation initiale sur "

4644

4389 -#: wt-status.c:1738

4645 +#: wt-status.c:1753

4646 msgid "HEAD (no branch)"

4647 msgstr "HEAD (aucune branche)"

4648

4393 -# à priori on parle d'une branche ici

4394 -#: wt-status.c:1767

4395 -msgid "gone"

4396 -msgstr "disparue"

4397 -

4398 -#: wt-status.c:1769 wt-status.c:1777

4649 +#: wt-status.c:1782 wt-status.c:1790

4650 msgid "behind "

4651 msgstr "derrière "

4652

4402 -#: wt-status.c:1772 wt-status.c:1775

4653 +#: wt-status.c:1785 wt-status.c:1788

4654 msgid "ahead "

4655 msgstr "devant "

4656

4657 #. TRANSLATORS: the action is e.g. "pull with rebase"

4407 -#: wt-status.c:2277

4658 +#: wt-status.c:2280

4659 #, c-format

4660 msgid "cannot %s: You have unstaged changes."

4661 msgstr "Impossible de %s : vous avez des modifications non indexées."

4662

4412 -#: wt-status.c:2283

4663 +#: wt-status.c:2286

4664 msgid "additionally, your index contains uncommitted changes."

4665 msgstr "de plus, votre index contient des modifications non validées."

4666

4416 -#: wt-status.c:2285

4667 +#: wt-status.c:2288

4668 #, c-format

4669 msgid "cannot %s: Your index contains uncommitted changes."

4670 msgstr "%s impossible : votre index contient des modifications non validées."

4671

4421 -#: compat/precompose_utf8.c:57 builtin/clone.c:414

4672 +#: compat/precompose_utf8.c:57 builtin/clone.c:432

4673 #, c-format

4674 msgid "failed to unlink '%s'"

4675 msgstr "échec lors de l'unlink de '%s'"

@@ -4445,7 +4696,7 @@ msgstr "suppression de '%s'\n"

4696 msgid "Unstaged changes after refreshing the index:"

4697 msgstr "Modifications non indexées après rafraîchissement de l'index :"

4698

4448 -#: builtin/add.c:209 builtin/rev-parse.c:845

4699 +#: builtin/add.c:209 builtin/rev-parse.c:872

4700 msgid "Could not read the index"

4701 msgstr "Impossible de lire l'index"

4702

@@ -4481,9 +4732,9 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

4732 msgstr ""

4733 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"

4734

4484 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4735 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123

4736 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4486 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4737 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163

4738 msgid "dry run"

4739 msgstr "simuler l'action"

4740

@@ -4491,7 +4742,7 @@ msgstr "simuler l'action"

4742 msgid "interactive picking"

4743 msgstr "sélection interactive"

4744

4494 -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4745 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286

4746 msgid "select hunks interactively"

4747 msgstr "sélection interactive des sections"

4748

@@ -4534,11 +4785,11 @@ msgstr ""

4785 msgid "check if - even missing - files are ignored in dry run"

4786 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

4787

4537 -#: builtin/add.c:283 builtin/update-index.c:947

4788 +#: builtin/add.c:283 builtin/update-index.c:951

4789 msgid "(+/-)x"

4790 msgstr "(+/-)x"

4791

4541 -#: builtin/add.c:283 builtin/update-index.c:948

4792 +#: builtin/add.c:283 builtin/update-index.c:952

4793 msgid "override the executable bit of the listed files"

4794 msgstr "outrepasser le bit exécutable pour les fichiers listés"

4795

@@ -4575,8 +4826,8 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n"

4826 msgid "Maybe you wanted to say 'git add .'?\n"

4827 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

4828

4578 -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4579 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4829 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298

4830 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350

4831 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4832 #: builtin/submodule--helper.c:244

4833 msgid "index file corrupt"

@@ -4630,7 +4881,7 @@ msgstr "décalage horaire invalide"

4881 msgid "Patch format detection failed."

4882 msgstr "Échec de détection du format du patch."

4883

4633 -#: builtin/am.c:989 builtin/clone.c:379

4884 +#: builtin/am.c:989 builtin/clone.c:397

4885 #, c-format

4886 msgid "failed to create directory '%s'"

4887 msgstr "échec de la création du répertoire '%s'"

@@ -4664,7 +4915,7 @@ msgstr ""

4915 msgid "Patch is empty. Was it split wrong?"

4916 msgstr "Le patch est vide. Le découpage était-il bon ?"

4917

4667 -#: builtin/am.c:1390 builtin/log.c:1550

4918 +#: builtin/am.c:1390 builtin/log.c:1557

4919 #, c-format

4920 msgid "invalid ident line: %s"

4921 msgstr "ligne d'identification invalide : %s"

@@ -4701,7 +4952,7 @@ msgstr "Retour à un patch de la base et fusion à 3 points..."

4952 msgid "Failed to merge in the changes."

4953 msgstr "Échec d'intégration des modifications."

4954

4704 -#: builtin/am.c:1686 builtin/merge.c:632

4955 +#: builtin/am.c:1686 builtin/merge.c:631

4956 msgid "git write-tree failed to write a tree"

4957 msgstr "git write-tree a échoué à écrire un arbre"

4958

@@ -4867,15 +5118,15 @@ msgid "pass it through git-apply"

5118 msgstr "le passer jusqu'à git-apply"

5119

5120 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4870 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

5121 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

5122 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4872 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

5123 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

5124 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

5125 msgid "n"

5126 msgstr "n"

5127

4877 -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4878 -#: builtin/tag.c:387 builtin/verify-tag.c:38

5128 +#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

5129 +#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

5130 msgid "format"

5131 msgstr "format"

5132

@@ -4912,8 +5163,8 @@ msgstr "mentir sur la date de validation"

5163 msgid "use current timestamp for author date"

5164 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

5165

4915 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4916 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

5166 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

5167 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

5168 msgid "key-id"

5169 msgstr "id-clé"

5170

@@ -5017,117 +5268,117 @@ msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"

5268 msgid "<rev-opts> are documented in git-rev-list(1)"

5269 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

5270

5020 -#: builtin/blame.c:1786

5271 +#: builtin/blame.c:1777

5272 msgid "Blaming lines"

5273 msgstr "Assignation de blâme au lignes"

5274

5024 -#: builtin/blame.c:2582

5275 +#: builtin/blame.c:2573

5276 msgid "Show blame entries as we find them, incrementally"

5277 msgstr ""

5278 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "

5279 "manière incrémentale"

5280

5030 -#: builtin/blame.c:2583

5281 +#: builtin/blame.c:2574

5282 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5283 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"

5284

5034 -#: builtin/blame.c:2584

5285 +#: builtin/blame.c:2575

5286 msgid "Do not treat root commits as boundaries (Default: off)"

5287 msgstr ""

5288 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"

5289

5039 -#: builtin/blame.c:2585

5290 +#: builtin/blame.c:2576

5291 msgid "Show work cost statistics"

5292 msgstr "Montrer les statistiques de coût d'activité"

5293

5043 -#: builtin/blame.c:2586

5294 +#: builtin/blame.c:2577

5295 msgid "Force progress reporting"

5296 msgstr "Forcer l'affichage de l'état d'avancement"

5297

5047 -#: builtin/blame.c:2587

5298 +#: builtin/blame.c:2578

5299 msgid "Show output score for blame entries"

5300 msgstr "Montrer le score de sortie pour les éléments de blâme"

5301

5051 -#: builtin/blame.c:2588

5302 +#: builtin/blame.c:2579

5303 msgid "Show original filename (Default: auto)"

5304 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"

5305

5055 -#: builtin/blame.c:2589

5306 +#: builtin/blame.c:2580

5307 msgid "Show original linenumber (Default: off)"

5308 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"

5309

5059 -#: builtin/blame.c:2590

5310 +#: builtin/blame.c:2581

5311 msgid "Show in a format designed for machine consumption"

5312 msgstr "Afficher dans un format propice à la consommation par machine"

5313

5063 -#: builtin/blame.c:2591

5314 +#: builtin/blame.c:2582

5315 msgid "Show porcelain format with per-line commit information"

5316 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"

5317

5067 -#: builtin/blame.c:2592

5318 +#: builtin/blame.c:2583

5319 msgid "Use the same output mode as git-annotate (Default: off)"

5320 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"

5321

5071 -#: builtin/blame.c:2593

5322 +#: builtin/blame.c:2584

5323 msgid "Show raw timestamp (Default: off)"

5324 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"

5325

5075 -#: builtin/blame.c:2594

5326 +#: builtin/blame.c:2585

5327 msgid "Show long commit SHA1 (Default: off)"

5328 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"

5329

5079 -#: builtin/blame.c:2595

5330 +#: builtin/blame.c:2586

5331 msgid "Suppress author name and timestamp (Default: off)"

5332 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"

5333

5083 -#: builtin/blame.c:2596

5334 +#: builtin/blame.c:2587

5335 msgid "Show author email instead of name (Default: off)"

5336 msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"

5337

5087 -#: builtin/blame.c:2597

5338 +#: builtin/blame.c:2588

5339 msgid "Ignore whitespace differences"

5340 msgstr "Ignorer les différences d'espace"

5341

5091 -#: builtin/blame.c:2604

5342 +#: builtin/blame.c:2595

5343 msgid "Use an experimental heuristic to improve diffs"

5344 msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"

5345

5095 -#: builtin/blame.c:2606

5346 +#: builtin/blame.c:2597

5347 msgid "Spend extra cycles to find better match"

5348 msgstr ""

5349 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"

5350

5100 -#: builtin/blame.c:2607

5351 +#: builtin/blame.c:2598

5352 msgid "Use revisions from <file> instead of calling git-rev-list"

5353 msgstr ""

5354 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"

5355

5105 -#: builtin/blame.c:2608

5356 +#: builtin/blame.c:2599

5357 msgid "Use <file>'s contents as the final image"

5358 msgstr "Utiliser le contenu de <fichier> comme image finale"

5359

5109 -#: builtin/blame.c:2609 builtin/blame.c:2610

5360 +#: builtin/blame.c:2600 builtin/blame.c:2601

5361 msgid "score"

5362 msgstr "score"

5363

5113 -#: builtin/blame.c:2609

5364 +#: builtin/blame.c:2600

5365 msgid "Find line copies within and across files"

5366 msgstr "Trouver les copies de ligne dans et entre les fichiers"

5367

5117 -#: builtin/blame.c:2610

5368 +#: builtin/blame.c:2601

5369 msgid "Find line movements within and across files"

5370 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"

5371

5121 -#: builtin/blame.c:2611

5372 +#: builtin/blame.c:2602

5373 msgid "n,m"

5374 msgstr "n,m"

5375

5125 -#: builtin/blame.c:2611

5376 +#: builtin/blame.c:2602

5377 msgid "Process only line range n,m, counting from 1"

5378 msgstr ""

5379 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"

5380

5130 -#: builtin/blame.c:2658

5381 +#: builtin/blame.c:2649

5382 msgid "--progress can't be used with --incremental or porcelain formats"

5383 msgstr ""

5384 "--progress ne peut pas être utilisé avec --incremental ou les formats "

@@ -5139,42 +5390,42 @@ msgstr ""

5390 #. takes 22 places, is the longest among various forms of

5391 #. relative timestamps, but your language may need more or

5392 #. fewer display columns.

5142 -#: builtin/blame.c:2706

5393 +#: builtin/blame.c:2697

5394 msgid "4 years, 11 months ago"

5395 msgstr "il y a 10 ans et 11 mois"

5396

5146 -#: builtin/blame.c:2786

5397 +#: builtin/blame.c:2777

5398 msgid "--contents and --reverse do not blend well."

5399 msgstr "--contents et --reverse ne font pas bon ménage."

5400

5150 -#: builtin/blame.c:2806

5401 +#: builtin/blame.c:2797

5402 msgid "cannot use --contents with final commit object name"

5403 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"

5404

5154 -#: builtin/blame.c:2811

5405 +#: builtin/blame.c:2802

5406 msgid "--reverse and --first-parent together require specified latest commit"

5407 msgstr ""

5408 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

5409 "dernier commit"

5410

5160 -#: builtin/blame.c:2838

5411 +#: builtin/blame.c:2829

5412 msgid ""

5413 "--reverse --first-parent together require range along first-parent chain"

5414 msgstr ""

5415 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "

5416 "premier parent"

5417

5167 -#: builtin/blame.c:2849

5418 +#: builtin/blame.c:2840

5419 #, c-format

5420 msgid "no such path %s in %s"

5421 msgstr "pas de chemin %s dans %s"

5422

5172 -#: builtin/blame.c:2860

5423 +#: builtin/blame.c:2851

5424 #, c-format

5425 msgid "cannot read blob %s for path %s"

5426 msgstr "impossible de lire le blob %s pour le chemin %s"

5427

5177 -#: builtin/blame.c:2879

5428 +#: builtin/blame.c:2870

5429 #, c-format

5430 msgid "file %s has only %lu line"

5431 msgid_plural "file %s has only %lu lines"

@@ -5202,7 +5453,11 @@ msgstr ""

5453 msgid "git branch [<options>] [-r | -a] [--points-at]"

5454 msgstr "git branch [<options>] [-r | -a] [--points-at]"

5455

5205 -#: builtin/branch.c:143

5456 +#: builtin/branch.c:31

5457 +msgid "git branch [<options>] [-r | -a] [--format]"

5458 +msgstr "git branch [<options>] [-r | -a] [--format]"

5459 +

5460 +#: builtin/branch.c:144

5461 #, c-format

5462 msgid ""

5463 "deleting branch '%s' that has been merged to\n"

@@ -5211,7 +5466,7 @@ msgstr ""

5466 "suppression de la branche '%s' qui a été fusionnée dans\n"

5467 " '%s', mais pas dans HEAD."

5468

5214 -#: builtin/branch.c:147

5469 +#: builtin/branch.c:148

5470 #, c-format

5471 msgid ""

5472 "not deleting branch '%s' that is not yet merged to\n"

@@ -5220,12 +5475,12 @@ msgstr ""

5475 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"

5476 " '%s', même si elle est fusionnée dans HEAD."

5477

5223 -#: builtin/branch.c:161

5478 +#: builtin/branch.c:162

5479 #, c-format

5480 msgid "Couldn't look up commit object for '%s'"

5481 msgstr "Impossible de rechercher l'objet commit pour '%s'"

5482

5228 -#: builtin/branch.c:165

5483 +#: builtin/branch.c:166

5484 #, c-format

5485 msgid ""

5486 "The branch '%s' is not fully merged.\n"

@@ -5234,166 +5489,93 @@ msgstr ""

5489 "La branche '%s' n'est pas totalement fusionnée.\n"

5490 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."

5491

5237 -#: builtin/branch.c:178

5492 +#: builtin/branch.c:179

5493 msgid "Update of config-file failed"

5494 msgstr "Échec de la mise à jour du fichier de configuration"

5495

5241 -#: builtin/branch.c:206

5496 +#: builtin/branch.c:210

5497 msgid "cannot use -a with -d"

5498 msgstr "impossible d'utiliser -a avec -d"

5499

5245 -#: builtin/branch.c:212

5500 +#: builtin/branch.c:216

5501 msgid "Couldn't look up commit object for HEAD"

5502 msgstr "Impossible de rechercher l'objet commit pour HEAD"

5503

5249 -#: builtin/branch.c:226

5504 +#: builtin/branch.c:230

5505 #, c-format

5506 msgid "Cannot delete branch '%s' checked out at '%s'"

5507 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"

5508

5254 -#: builtin/branch.c:241

5509 +#: builtin/branch.c:245

5510 #, c-format

5511 msgid "remote-tracking branch '%s' not found."

5512 msgstr "branche de suivi '%s' non trouvée."

5513

5259 -#: builtin/branch.c:242

5514 +#: builtin/branch.c:246

5515 #, c-format

5516 msgid "branch '%s' not found."

5517 msgstr "branche '%s' non trouvée."

5518

5264 -#: builtin/branch.c:257

5519 +#: builtin/branch.c:261

5520 #, c-format

5521 msgid "Error deleting remote-tracking branch '%s'"

5522 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"

5523

5269 -#: builtin/branch.c:258

5524 +#: builtin/branch.c:262

5525 #, c-format

5526 msgid "Error deleting branch '%s'"

5527 msgstr "Erreur lors de la suppression de la branche '%s'"

5528

5274 -#: builtin/branch.c:265

5529 +#: builtin/branch.c:269

5530 #, c-format

5531 msgid "Deleted remote-tracking branch %s (was %s).\n"

5532 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"

5533

5279 -#: builtin/branch.c:266

5534 +#: builtin/branch.c:270

5535 #, c-format

5536 msgid "Deleted branch %s (was %s).\n"

5537 msgstr "Branche %s supprimée (précédemment %s).\n"

5538

5284 -# féminin pour une branche

5285 -#: builtin/branch.c:312

5286 -#, c-format

5287 -msgid "[%s: gone]"

5288 -msgstr "[%s: disparue]"

5289 -

5290 -#: builtin/branch.c:317

5291 -#, c-format

5292 -msgid "[%s]"

5293 -msgstr "[%s]"

5294 -

5295 -#: builtin/branch.c:322

5296 -#, c-format

5297 -msgid "[%s: behind %d]"

5298 -msgstr "[%s: en retard de %d]"

5299 -

5300 -#: builtin/branch.c:324

5301 -#, c-format

5302 -msgid "[behind %d]"

5303 -msgstr "[en retard de %d]"

5304 -

5305 -#: builtin/branch.c:328

5306 -#, c-format

5307 -msgid "[%s: ahead %d]"

5308 -msgstr "[%s : en avance de %d]"

5309 -

5310 -#: builtin/branch.c:330

5311 -#, c-format

5312 -msgid "[ahead %d]"

5313 -msgstr "[en avance de %d]"

5314 -

5315 -#: builtin/branch.c:333

5316 -#, c-format

5317 -msgid "[%s: ahead %d, behind %d]"

5318 -msgstr "[%s : en avance de %d, en retard de %d]"

5319 -

5320 -#: builtin/branch.c:336

5321 -#, c-format

5322 -msgid "[ahead %d, behind %d]"

5323 -msgstr "[en avance de %d, en retard de %d]"

5324 -

5325 -#: builtin/branch.c:349

5326 -msgid " **** invalid ref ****"

5327 -msgstr " **** référence invalide ****"

5328 -

5329 -#: builtin/branch.c:375

5330 -#, c-format

5331 -msgid "(no branch, rebasing %s)"

5332 -msgstr "(aucune branche, rebasage de %s)"

5333 -

5334 -#: builtin/branch.c:378

5335 -#, c-format

5336 -msgid "(no branch, bisect started on %s)"

5337 -msgstr "(aucune branche, bisect a démarré sur %s)"

5338 -

5339 -#. TRANSLATORS: make sure this matches

5340 -#. "HEAD detached at " in wt-status.c

5341 -#: builtin/branch.c:384

5342 -#, c-format

5343 -msgid "(HEAD detached at %s)"

5344 -msgstr "(HEAD détachée sur %s)"

5345 -

5346 -#. TRANSLATORS: make sure this matches

5347 -#. "HEAD detached from " in wt-status.c

5348 -#: builtin/branch.c:389

5349 -#, c-format

5350 -msgid "(HEAD detached from %s)"

5351 -msgstr "(HEAD détachée depuis %s)"

5352 -

5353 -#: builtin/branch.c:393

5354 -msgid "(no branch)"

5355 -msgstr "(aucune branche)"

5356 -

5357 -#: builtin/branch.c:535

5539 +#: builtin/branch.c:441

5540 #, c-format

5541 msgid "Branch %s is being rebased at %s"

5542 msgstr "La branche %s est en cours de rebasage sur %s"

5543

5362 -#: builtin/branch.c:539

5544 +#: builtin/branch.c:445

5545 #, c-format

5546 msgid "Branch %s is being bisected at %s"

5547 msgstr "La branche %s est en cours de bissection sur %s"

5548

5367 -#: builtin/branch.c:554

5549 +#: builtin/branch.c:460

5550 msgid "cannot rename the current branch while not on any."

5551 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

5552

5371 -#: builtin/branch.c:564

5553 +#: builtin/branch.c:470

5554 #, c-format

5555 msgid "Invalid branch name: '%s'"

5556 msgstr "Nom de branche invalide : '%s'"

5557

5376 -#: builtin/branch.c:581

5558 +#: builtin/branch.c:487

5559 msgid "Branch rename failed"

5560 msgstr "Échec de renommage de la branche"

5561

5380 -#: builtin/branch.c:585

5562 +#: builtin/branch.c:490

5563 #, c-format

5564 msgid "Renamed a misnamed branch '%s' away"

5565 msgstr "Renommage d'un branche mal nommée '%s'"

5566

5385 -#: builtin/branch.c:588

5567 +#: builtin/branch.c:493

5568 #, c-format

5569 msgid "Branch renamed to %s, but HEAD is not updated!"

5570 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

5571

5390 -#: builtin/branch.c:595

5572 +#: builtin/branch.c:502

5573 msgid "Branch is renamed, but update of config-file failed"

5574 msgstr ""

5575 "La branche est renommée, mais la mise à jour du fichier de configuration a "

5576 "échoué"

5577

5396 -#: builtin/branch.c:611

5578 +#: builtin/branch.c:518

5579 #, c-format

5580 msgid ""

5581 "Please edit the description for the branch\n"

@@ -5404,167 +5586,176 @@ msgstr ""

5586 " %s\n"

5587 "Les lignes commençant par '%c' seront ignorées.\n"

5588

5407 -#: builtin/branch.c:643

5589 +#: builtin/branch.c:551

5590 msgid "Generic options"

5591 msgstr "Options génériques"

5592

5411 -#: builtin/branch.c:645

5593 +#: builtin/branch.c:553

5594 msgid "show hash and subject, give twice for upstream branch"

5595 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

5596

5415 -#: builtin/branch.c:646

5597 +#: builtin/branch.c:554

5598 msgid "suppress informational messages"

5599 msgstr "supprimer les messages d'information"

5600

5419 -#: builtin/branch.c:647

5601 +#: builtin/branch.c:555

5602 msgid "set up tracking mode (see git-pull(1))"

5603 msgstr "régler le mode de suivi (voir git-pull(1))"

5604

5423 -#: builtin/branch.c:649

5605 +#: builtin/branch.c:557

5606 msgid "change upstream info"

5607 msgstr "modifier l'information amont"

5608

5427 -#: builtin/branch.c:651

5609 +#: builtin/branch.c:559

5610 msgid "upstream"

5611 msgstr "amont"

5612

5431 -#: builtin/branch.c:651

5613 +#: builtin/branch.c:559

5614 msgid "change the upstream info"

5615 msgstr "modifier l'information amont"

5616

5435 -#: builtin/branch.c:652

5617 +#: builtin/branch.c:560

5618 msgid "Unset the upstream info"

5619 msgstr "Désactiver l'information amont"

5620

5439 -#: builtin/branch.c:653

5621 +#: builtin/branch.c:561

5622 msgid "use colored output"

5623 msgstr "utiliser la coloration dans la sortie"

5624

5443 -#: builtin/branch.c:654

5625 +#: builtin/branch.c:562

5626 msgid "act on remote-tracking branches"

5627 msgstr "agir sur les branches de suivi distantes"

5628

5447 -#: builtin/branch.c:656 builtin/branch.c:657

5629 +#: builtin/branch.c:564 builtin/branch.c:566

5630 msgid "print only branches that contain the commit"

5631 msgstr "afficher seulement les branches qui contiennent le commit"

5632

5451 -#: builtin/branch.c:660

5633 +#: builtin/branch.c:565 builtin/branch.c:567

5634 +msgid "print only branches that don't contain the commit"

5635 +msgstr "afficher seulement les branches qui ne contiennent pas le commit"

5636 +

5637 +#: builtin/branch.c:570

5638 msgid "Specific git-branch actions:"

5639 msgstr "Actions spécifiques à git-branch :"

5640

5455 -#: builtin/branch.c:661

5641 +#: builtin/branch.c:571

5642 msgid "list both remote-tracking and local branches"

5643 msgstr "afficher à la fois les branches de suivi et les branches locales"

5644

5459 -#: builtin/branch.c:663

5645 +#: builtin/branch.c:573

5646 msgid "delete fully merged branch"

5647 msgstr "supprimer une branche totalement fusionnée"

5648

5463 -#: builtin/branch.c:664

5649 +#: builtin/branch.c:574

5650 msgid "delete branch (even if not merged)"

5651 msgstr "supprimer une branche (même non fusionnée)"

5652

5467 -#: builtin/branch.c:665

5653 +#: builtin/branch.c:575

5654 msgid "move/rename a branch and its reflog"

5655 msgstr "déplacer/renommer une branche et son reflog"

5656

5471 -#: builtin/branch.c:666

5657 +#: builtin/branch.c:576

5658 msgid "move/rename a branch, even if target exists"

5659 msgstr "déplacer/renommer une branche, même si la cible existe"

5660

5475 -#: builtin/branch.c:667

5661 +#: builtin/branch.c:577

5662 msgid "list branch names"

5663 msgstr "afficher les noms des branches"

5664

5479 -#: builtin/branch.c:668

5665 +#: builtin/branch.c:578

5666 msgid "create the branch's reflog"

5667 msgstr "créer le reflog de la branche"

5668

5483 -#: builtin/branch.c:670

5669 +#: builtin/branch.c:580

5670 msgid "edit the description for the branch"

5671 msgstr "éditer la description de la branche"

5672

5487 -#: builtin/branch.c:671

5673 +#: builtin/branch.c:581

5674 msgid "force creation, move/rename, deletion"

5675 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

5676

5491 -#: builtin/branch.c:672

5677 +#: builtin/branch.c:582

5678 msgid "print only branches that are merged"

5679 msgstr "afficher seulement les branches qui sont fusionnées"

5680

5495 -#: builtin/branch.c:673

5681 +#: builtin/branch.c:583

5682 msgid "print only branches that are not merged"

5683 msgstr "afficher seulement les branches qui ne sont pas fusionnées"

5684

5499 -#: builtin/branch.c:674

5685 +#: builtin/branch.c:584

5686 msgid "list branches in columns"

5687 msgstr "afficher les branches en colonnes"

5688

5503 -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5689 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426

5690 msgid "key"

5691 msgstr "clé"

5692

5507 -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5693 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427

5694 msgid "field name to sort on"

5695 msgstr "nom du champ servant à trier"

5696

5511 -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5697 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404

5698 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5513 -#: builtin/tag.c:384

5699 +#: builtin/tag.c:429

5700 msgid "object"

5701 msgstr "objet"

5702

5517 -#: builtin/branch.c:679

5703 +#: builtin/branch.c:589

5704 msgid "print only branches of the object"

5705 msgstr "afficher seulement les branches de l'objet"

5706

5521 -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5707 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434

5708 msgid "sorting and filtering are case insensitive"

5709 msgstr "le tri et le filtrage sont non-sensibles à la casse"

5710

5525 -#: builtin/branch.c:698

5711 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433

5712 +#: builtin/verify-tag.c:38

5713 +msgid "format to use for the output"

5714 +msgstr "format à utiliser pour la sortie"

5715 +

5716 +#: builtin/branch.c:611

5717 msgid "Failed to resolve HEAD as a valid ref."

5718 msgstr "Échec de résolution de HEAD comme référence valide."

5719

5529 -#: builtin/branch.c:702 builtin/clone.c:706

5720 +#: builtin/branch.c:615 builtin/clone.c:724

5721 msgid "HEAD not found below refs/heads!"

5722 msgstr "HEAD non trouvée sous refs/heads !"

5723

5533 -#: builtin/branch.c:724

5724 +#: builtin/branch.c:638

5725 msgid "--column and --verbose are incompatible"

5726 msgstr "--column et --verbose sont incompatibles"

5727

5537 -#: builtin/branch.c:735 builtin/branch.c:787

5728 +#: builtin/branch.c:649 builtin/branch.c:701

5729 msgid "branch name required"

5730 msgstr "le nom de branche est requis"

5731

5541 -#: builtin/branch.c:763

5732 +#: builtin/branch.c:677

5733 msgid "Cannot give description to detached HEAD"

5734 msgstr "Impossible de décrire une HEAD détachée"

5735

5545 -#: builtin/branch.c:768

5736 +#: builtin/branch.c:682

5737 msgid "cannot edit description of more than one branch"

5738 msgstr "impossible d'éditer la description de plus d'une branche"

5739

5549 -#: builtin/branch.c:775

5740 +#: builtin/branch.c:689

5741 #, c-format

5742 msgid "No commit on branch '%s' yet."

5743 msgstr "Aucun commit sur la branche '%s'."

5744

5554 -#: builtin/branch.c:778

5745 +#: builtin/branch.c:692

5746 #, c-format

5747 msgid "No branch named '%s'."

5748 msgstr "Aucune branche nommée '%s'."

5749

5559 -#: builtin/branch.c:793

5750 +#: builtin/branch.c:707

5751 msgid "too many branches for a rename operation"

5752 msgstr "trop de branches pour une opération de renommage"

5753

5563 -#: builtin/branch.c:798

5754 +#: builtin/branch.c:712

5755 msgid "too many branches to set new upstream"

5756 msgstr "trop de branches pour spécifier une branche amont"

5757

5567 -#: builtin/branch.c:802

5758 +#: builtin/branch.c:716

5759 #, c-format

5760 msgid ""

5761 "could not set upstream of HEAD to %s when it does not point to any branch."

@@ -5572,41 +5763,41 @@ msgstr ""

5763 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

5764 "aucune branche."

5765

5575 -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5766 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762

5767 #, c-format

5768 msgid "no such branch '%s'"

5769 msgstr "pas de branche '%s'"

5770

5580 -#: builtin/branch.c:809

5771 +#: builtin/branch.c:723

5772 #, c-format

5773 msgid "branch '%s' does not exist"

5774 msgstr "la branche '%s' n'existe pas"

5775

5585 -#: builtin/branch.c:821

5776 +#: builtin/branch.c:735

5777 msgid "too many branches to unset upstream"

5778 msgstr "trop de branches pour désactiver un amont"

5779

5589 -#: builtin/branch.c:825

5780 +#: builtin/branch.c:739

5781 msgid "could not unset upstream of HEAD when it does not point to any branch."

5782 msgstr ""

5783 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

5784 "aucune branche."

5785

5595 -#: builtin/branch.c:831

5786 +#: builtin/branch.c:745

5787 #, c-format

5788 msgid "Branch '%s' has no upstream information"

5789 msgstr "La branche '%s' n'a aucune information de branche amont"

5790

5600 -#: builtin/branch.c:845

5791 +#: builtin/branch.c:759

5792 msgid "it does not make sense to create 'HEAD' manually"

5793 msgstr "créer manuellement 'HEAD' n'a pas de sens"

5794

5604 -#: builtin/branch.c:851

5795 +#: builtin/branch.c:765

5796 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5797 msgstr ""

5798 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

5799

5609 -#: builtin/branch.c:854

5800 +#: builtin/branch.c:768

5801 #, c-format

5802 msgid ""

5803 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -5615,7 +5806,7 @@ msgstr ""

5806 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

5807 "track ou --set-upstream-to\n"

5808

5618 -#: builtin/branch.c:871

5809 +#: builtin/branch.c:785

5810 #, c-format

5811 msgid ""

5812 "\n"

@@ -5626,16 +5817,16 @@ msgstr ""

5817 "Si vous vouliez que '%s' suive '%s', faites ceci :\n"

5818 "\n"

5819

5629 -#: builtin/bundle.c:51

5820 +#: builtin/bundle.c:45

5821 #, c-format

5822 msgid "%s is okay\n"

5823 msgstr "%s est correct\n"

5824

5634 -#: builtin/bundle.c:64

5825 +#: builtin/bundle.c:58

5826 msgid "Need a repository to create a bundle."

5827 msgstr "La création d'un colis requiert un dépôt."

5828

5638 -#: builtin/bundle.c:68

5829 +#: builtin/bundle.c:62

5830 msgid "Need a repository to unbundle."

5831 msgstr "Le dépaquetage d'un colis requiert un dépôt."

5832

@@ -5683,7 +5874,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"

5874 msgid "for blob objects, run filters on object's content"

5875 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"

5876

5686 -#: builtin/cat-file.c:561 git-submodule.sh:929

5877 +#: builtin/cat-file.c:561 git-submodule.sh:943

5878 msgid "blob"

5879 msgstr "blob"

5880

@@ -5743,7 +5934,7 @@ msgid "terminate input and output records by a NUL character"

5934 msgstr ""

5935 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

5936

5746 -#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5937 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5938 msgid "suppress progress reporting"

5939 msgstr "supprimer l'état d'avancement"

5940

@@ -5835,9 +6026,9 @@ msgid "write the content to temporary files"

6026 msgstr "écrire le contenu dans des fichiers temporaires"

6027

6028 #: builtin/checkout-index.c:174 builtin/column.c:30

5838 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5839 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5840 -#: builtin/worktree.c:471

6029 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

6030 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

6031 +#: builtin/worktree.c:472

6032 msgid "string"

6033 msgstr "chaîne"

6034

@@ -5849,115 +6040,115 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>"

6040 msgid "copy out the files from named stage"

6041 msgstr "copier les fichiers depuis l'index nommé"

6042

5852 -#: builtin/checkout.c:25

6043 +#: builtin/checkout.c:27

6044 msgid "git checkout [<options>] <branch>"

6045 msgstr "git checkout [<options>] <branche>"

6046

5856 -#: builtin/checkout.c:26

6047 +#: builtin/checkout.c:28

6048 msgid "git checkout [<options>] [<branch>] -- <file>..."

6049 msgstr "git checkout [<options>] [<branche>] -- <fichier>..."

6050

5860 -#: builtin/checkout.c:134 builtin/checkout.c:167

6051 +#: builtin/checkout.c:153 builtin/checkout.c:186

6052 #, c-format

6053 msgid "path '%s' does not have our version"

6054 msgstr "le chemin '%s' n'a pas notre version"

6055

5865 -#: builtin/checkout.c:136 builtin/checkout.c:169

6056 +#: builtin/checkout.c:155 builtin/checkout.c:188

6057 #, c-format

6058 msgid "path '%s' does not have their version"

6059 msgstr "le chemin '%s' n'a pas leur version"

6060

5870 -#: builtin/checkout.c:152

6061 +#: builtin/checkout.c:171

6062 #, c-format

6063 msgid "path '%s' does not have all necessary versions"

6064 msgstr "le chemin '%s' n'a aucune des versions nécessaires"

6065

5875 -#: builtin/checkout.c:196

6066 +#: builtin/checkout.c:215

6067 #, c-format

6068 msgid "path '%s' does not have necessary versions"

6069 msgstr "le chemin '%s' n'a pas les versions nécessaires"

6070

5880 -#: builtin/checkout.c:213

6071 +#: builtin/checkout.c:232

6072 #, c-format

6073 msgid "path '%s': cannot merge"

6074 msgstr "chemin '%s' : impossible de fusionner"

6075

5885 -#: builtin/checkout.c:230

6076 +#: builtin/checkout.c:249

6077 #, c-format

6078 msgid "Unable to add merge result for '%s'"

6079 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

6080

5890 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

5891 -#: builtin/checkout.c:259

6081 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275

6082 +#: builtin/checkout.c:278

6083 #, c-format

6084 msgid "'%s' cannot be used with updating paths"

6085 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

6086

5896 -#: builtin/checkout.c:262 builtin/checkout.c:265

6087 +#: builtin/checkout.c:281 builtin/checkout.c:284

6088 #, c-format

6089 msgid "'%s' cannot be used with %s"

6090 msgstr "'%s' ne peut pas être utilisé avec %s"

6091

5901 -#: builtin/checkout.c:268

6092 +#: builtin/checkout.c:287

6093 #, c-format

6094 msgid "Cannot update paths and switch to branch '%s' at the same time."

6095 msgstr ""

6096 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

6097 "même temps."

6098

5908 -#: builtin/checkout.c:339 builtin/checkout.c:346

6099 +#: builtin/checkout.c:358 builtin/checkout.c:365

6100 #, c-format

6101 msgid "path '%s' is unmerged"

6102 msgstr "le chemin '%s' n'est pas fusionné"

6103

5913 -#: builtin/checkout.c:494

6104 +#: builtin/checkout.c:513

6105 msgid "you need to resolve your current index first"

6106 msgstr "vous devez d'abord résoudre votre index courant"

6107

5917 -#: builtin/checkout.c:625

6108 +#: builtin/checkout.c:644

6109 #, c-format

6110 msgid "Can not do reflog for '%s': %s\n"

6111 msgstr "Impossible de faire un reflog pour '%s' : %s\n"

6112

5922 -#: builtin/checkout.c:666

6113 +#: builtin/checkout.c:685

6114 msgid "HEAD is now at"

6115 msgstr "HEAD est maintenant sur"

6116

5926 -#: builtin/checkout.c:670 builtin/clone.c:660

6117 +#: builtin/checkout.c:689 builtin/clone.c:678

6118 msgid "unable to update HEAD"

6119 msgstr "impossible de mettre à jour HEAD"

6120

5930 -#: builtin/checkout.c:674

6121 +#: builtin/checkout.c:693

6122 #, c-format

6123 msgid "Reset branch '%s'\n"

6124 msgstr "Remise à zéro de la branche '%s'\n"

6125

5935 -#: builtin/checkout.c:677

6126 +#: builtin/checkout.c:696

6127 #, c-format

6128 msgid "Already on '%s'\n"

6129 msgstr "Déjà sur '%s'\n"

6130

5940 -#: builtin/checkout.c:681

6131 +#: builtin/checkout.c:700

6132 #, c-format

6133 msgid "Switched to and reset branch '%s'\n"

6134 msgstr "Basculement et remise à zéro de la branche '%s'\n"

6135

5945 -#: builtin/checkout.c:683 builtin/checkout.c:1072

6136 +#: builtin/checkout.c:702 builtin/checkout.c:1090

6137 #, c-format

6138 msgid "Switched to a new branch '%s'\n"

6139 msgstr "Basculement sur la nouvelle branche '%s'\n"

6140

5950 -#: builtin/checkout.c:685

6141 +#: builtin/checkout.c:704

6142 #, c-format

6143 msgid "Switched to branch '%s'\n"

6144 msgstr "Basculement sur la branche '%s'\n"

6145

5955 -#: builtin/checkout.c:736

6146 +#: builtin/checkout.c:755

6147 #, c-format

6148 msgid " ... and %d more.\n"

6149 msgstr " ... et %d en plus.\n"

6150

5960 -#: builtin/checkout.c:742

6151 +#: builtin/checkout.c:761

6152 #, c-format

6153 msgid ""

6154 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5980,7 +6171,7 @@ msgstr[1] ""

6171 "\n"

6172 "%s\n"

6173

5983 -#: builtin/checkout.c:761

6174 +#: builtin/checkout.c:780

6175 #, c-format

6176 msgid ""

6177 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -6009,151 +6200,151 @@ msgstr[1] ""

6200 "git branch <nouvelle-branche> %s\n"

6201 "\n"

6202

6012 -#: builtin/checkout.c:797

6203 +#: builtin/checkout.c:816

6204 msgid "internal error in revision walk"

6205 msgstr "erreur interne lors du parcours des révisions"

6206

6016 -#: builtin/checkout.c:801

6207 +#: builtin/checkout.c:820

6208 msgid "Previous HEAD position was"

6209 msgstr "La position précédente de HEAD était sur"

6210

6020 -#: builtin/checkout.c:828 builtin/checkout.c:1067

6211 +#: builtin/checkout.c:847 builtin/checkout.c:1085

6212 msgid "You are on a branch yet to be born"

6213 msgstr "Vous êtes sur une branche qui doit encore naître"

6214

6024 -#: builtin/checkout.c:973

6215 +#: builtin/checkout.c:991

6216 #, c-format

6217 msgid "only one reference expected, %d given."

6218 msgstr "une seule référence attendue, %d fournies."

6219

6029 -#: builtin/checkout.c:1013 builtin/worktree.c:214

6220 +#: builtin/checkout.c:1031 builtin/worktree.c:214

6221 #, c-format

6222 msgid "invalid reference: %s"

6223 msgstr "référence invalide : %s"

6224

6034 -#: builtin/checkout.c:1042

6225 +#: builtin/checkout.c:1060

6226 #, c-format

6227 msgid "reference is not a tree: %s"

6228 msgstr "la référence n'est pas un arbre : %s"

6229

6039 -#: builtin/checkout.c:1081

6230 +#: builtin/checkout.c:1099

6231 msgid "paths cannot be used with switching branches"

6232 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

6233

6043 -#: builtin/checkout.c:1084 builtin/checkout.c:1088

6234 +#: builtin/checkout.c:1102 builtin/checkout.c:1106

6235 #, c-format

6236 msgid "'%s' cannot be used with switching branches"

6237 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

6238

6048 -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

6049 -#: builtin/checkout.c:1103

6239 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118

6240 +#: builtin/checkout.c:1121

6241 #, c-format

6242 msgid "'%s' cannot be used with '%s'"

6243 msgstr "'%s' ne peut pas être utilisé avec '%s'"

6244

6054 -#: builtin/checkout.c:1108

6245 +#: builtin/checkout.c:1126

6246 #, c-format

6247 msgid "Cannot switch branch to a non-commit '%s'"

6248 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

6249

6059 -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

6060 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

6061 -#: builtin/worktree.c:326

6250 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

6251 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

6252 +#: builtin/worktree.c:327

6253 msgid "branch"

6254 msgstr "branche"

6255

6065 -#: builtin/checkout.c:1142

6256 +#: builtin/checkout.c:1160

6257 msgid "create and checkout a new branch"

6258 msgstr "créer et extraire une nouvelle branche"

6259

6069 -#: builtin/checkout.c:1144

6260 +#: builtin/checkout.c:1162

6261 msgid "create/reset and checkout a branch"

6262 msgstr "créer/réinitialiser et extraire une branche"

6263

6073 -#: builtin/checkout.c:1145

6264 +#: builtin/checkout.c:1163

6265 msgid "create reflog for new branch"

6266 msgstr "créer un reflog pour une nouvelle branche"

6267

6077 -#: builtin/checkout.c:1146 builtin/worktree.c:328

6268 +#: builtin/checkout.c:1164 builtin/worktree.c:329

6269 msgid "detach HEAD at named commit"

6270 msgstr "détacher la HEAD au commit nommé"

6271

6081 -#: builtin/checkout.c:1147

6272 +#: builtin/checkout.c:1165

6273 msgid "set upstream info for new branch"

6274 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

6275

6085 -#: builtin/checkout.c:1149

6276 +#: builtin/checkout.c:1167

6277 msgid "new-branch"

6278 msgstr "nouvelle branche"

6279

6089 -#: builtin/checkout.c:1149

6280 +#: builtin/checkout.c:1167

6281 msgid "new unparented branch"

6282 msgstr "nouvelle branche sans parent"

6283

6093 -#: builtin/checkout.c:1150

6284 +#: builtin/checkout.c:1168

6285 msgid "checkout our version for unmerged files"

6286 msgstr "extraire notre version pour les fichiers non fusionnés"

6287

6097 -#: builtin/checkout.c:1152

6288 +#: builtin/checkout.c:1170

6289 msgid "checkout their version for unmerged files"

6290 msgstr "extraire leur version pour les fichiers non fusionnés"

6291

6101 -#: builtin/checkout.c:1154

6292 +#: builtin/checkout.c:1172

6293 msgid "force checkout (throw away local modifications)"

6294 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

6295

6105 -#: builtin/checkout.c:1155

6296 +#: builtin/checkout.c:1173

6297 msgid "perform a 3-way merge with the new branch"

6298 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

6299

6109 -#: builtin/checkout.c:1156 builtin/merge.c:235

6300 +#: builtin/checkout.c:1174 builtin/merge.c:234

6301 msgid "update ignored files (default)"

6302 msgstr "mettre à jour les fichiers ignorés (par défaut)"

6303

6113 -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

6304 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251

6305 msgid "style"

6306 msgstr "style"

6307

6117 -#: builtin/checkout.c:1158

6308 +#: builtin/checkout.c:1176

6309 msgid "conflict style (merge or diff3)"

6310 msgstr "style de conflit (merge (fusion) ou diff3)"

6311

6121 -#: builtin/checkout.c:1161

6312 +#: builtin/checkout.c:1179

6313 msgid "do not limit pathspecs to sparse entries only"

6314 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"

6315

6125 -#: builtin/checkout.c:1163

6316 +#: builtin/checkout.c:1181

6317 msgid "second guess 'git checkout <no-such-branch>'"

6318 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

6319

6129 -#: builtin/checkout.c:1165

6320 +#: builtin/checkout.c:1183

6321 msgid "do not check if another worktree is holding the given ref"

6322 msgstr ""

6323 "ne pas vérifier si une autre copie de travail contient le référence fournie"

6324

6134 -#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

6135 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

6136 -#: builtin/send-pack.c:168

6325 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119

6326 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539

6327 +#: builtin/send-pack.c:172

6328 msgid "force progress reporting"

6329 msgstr "forcer l'affichage de l'état d'avancement"

6330

6140 -#: builtin/checkout.c:1197

6331 +#: builtin/checkout.c:1224

6332 msgid "-b, -B and --orphan are mutually exclusive"

6333 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

6334

6144 -#: builtin/checkout.c:1214

6335 +#: builtin/checkout.c:1241

6336 msgid "--track needs a branch name"

6337 msgstr "--track requiert un nom de branche"

6338

6148 -#: builtin/checkout.c:1219

6339 +#: builtin/checkout.c:1246

6340 msgid "Missing branch name; try -b"

6341 msgstr "Nom de branche manquant ; essayez -b"

6342

6152 -#: builtin/checkout.c:1255

6343 +#: builtin/checkout.c:1282

6344 msgid "invalid path specification"

6345 msgstr "spécification de chemin invalide"

6346

6156 -#: builtin/checkout.c:1262

6347 +#: builtin/checkout.c:1289

6348 #, c-format

6349 msgid ""

6350 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -6163,12 +6354,12 @@ msgstr ""

6354 "en même temps.\n"

6355 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

6356

6166 -#: builtin/checkout.c:1267

6357 +#: builtin/checkout.c:1294

6358 #, c-format

6359 msgid "git checkout: --detach does not take a path argument '%s'"

6360 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

6361

6171 -#: builtin/checkout.c:1271

6362 +#: builtin/checkout.c:1298

6363 msgid ""

6364 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

6365 "checking out of the index."

@@ -6207,7 +6398,7 @@ msgstr "Ignorerait le dépôt %s\n"

6398 msgid "failed to remove %s"

6399 msgstr "échec de la suppression de %s"

6400

6210 -#: builtin/clean.c:291 git-add--interactive.perl:623

6401 +#: builtin/clean.c:297 git-add--interactive.perl:614

6402 #, c-format

6403 msgid ""

6404 "Prompt help:\n"

@@ -6220,7 +6411,7 @@ msgstr ""

6411 "foo - sélectionner un élément par un préfixe unique\n"

6412 " - (vide) ne rien sélectionner\n"

6413

6223 -#: builtin/clean.c:295 git-add--interactive.perl:632

6414 +#: builtin/clean.c:301 git-add--interactive.perl:623

6415 #, c-format

6416 msgid ""

6417 "Prompt help:\n"

@@ -6241,38 +6432,38 @@ msgstr ""

6432 "* - choisir tous les éléments\n"

6433 " - (vide) terminer la sélection\n"

6434

6244 -#: builtin/clean.c:511 git-add--interactive.perl:598

6245 -#: git-add--interactive.perl:603

6435 +#: builtin/clean.c:517 git-add--interactive.perl:589

6436 +#: git-add--interactive.perl:594

6437 #, c-format, perl-format

6438 msgid "Huh (%s)?\n"

6439 msgstr "Hein (%s) ?\n"

6440

6250 -#: builtin/clean.c:653

6441 +#: builtin/clean.c:659

6442 #, c-format

6443 msgid "Input ignore patterns>> "

6444 msgstr "Entrez les motifs à ignorer>> "

6445

6255 -#: builtin/clean.c:690

6446 +#: builtin/clean.c:696

6447 #, c-format

6448 msgid "WARNING: Cannot find items matched by: %s"

6449 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

6450

6260 -#: builtin/clean.c:711

6451 +#: builtin/clean.c:717

6452 msgid "Select items to delete"

6453 msgstr "Sélectionner les éléments à supprimer"

6454

6455 #. TRANSLATORS: Make sure to keep [y/N] as is

6265 -#: builtin/clean.c:752

6456 +#: builtin/clean.c:758

6457 #, c-format

6458 msgid "Remove %s [y/N]? "

6459 msgstr "Supprimer %s [y/N] ? "

6460

6270 -#: builtin/clean.c:777 git-add--interactive.perl:1669

6461 +#: builtin/clean.c:783 git-add--interactive.perl:1660

6462 #, c-format

6463 msgid "Bye.\n"

6464 msgstr "Au revoir.\n"

6465

6275 -#: builtin/clean.c:785

6466 +#: builtin/clean.c:791

6467 msgid ""

6468 "clean - start cleaning\n"

6469 "filter by pattern - exclude items from deletion\n"

@@ -6290,62 +6481,63 @@ msgstr ""

6481 "help - cet écran\n"

6482 "? - aide pour la sélection en ligne"

6483

6293 -#: builtin/clean.c:812 git-add--interactive.perl:1745

6484 +#: builtin/clean.c:818 git-add--interactive.perl:1736

6485 msgid "*** Commands ***"

6486 msgstr "*** Commandes ***"

6487

6297 -#: builtin/clean.c:813 git-add--interactive.perl:1742

6488 +#: builtin/clean.c:819 git-add--interactive.perl:1733

6489 msgid "What now"

6490 msgstr "Et maintenant ?"

6491

6301 -#: builtin/clean.c:821

6492 +#: builtin/clean.c:827

6493 msgid "Would remove the following item:"

6494 msgid_plural "Would remove the following items:"

6495 msgstr[0] "Supprimerait l'élément suivant :"

6496 msgstr[1] "Supprimerait les éléments suivants :"

6497

6307 -#: builtin/clean.c:838

6498 +#: builtin/clean.c:844

6499 msgid "No more files to clean, exiting."

6500 msgstr "Plus de fichier à nettoyer, sortie."

6501

6311 -#: builtin/clean.c:869

6502 +#: builtin/clean.c:875

6503 msgid "do not print names of files removed"

6504 msgstr "ne pas afficher les noms des fichiers supprimés"

6505

6315 -#: builtin/clean.c:871

6506 +#: builtin/clean.c:877

6507 msgid "force"

6508 msgstr "forcer"

6509

6319 -#: builtin/clean.c:872

6510 +#: builtin/clean.c:878

6511 msgid "interactive cleaning"

6512 msgstr "nettoyage interactif"

6513

6323 -#: builtin/clean.c:874

6514 +#: builtin/clean.c:880

6515 msgid "remove whole directories"

6516 msgstr "supprimer les répertoires entiers"

6517

6327 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6328 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

6518 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

6519 +#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

6520 +#: builtin/name-rev.c:350 builtin/show-ref.c:176

6521 msgid "pattern"

6522 msgstr "motif"

6523

6332 -#: builtin/clean.c:876

6524 +#: builtin/clean.c:882

6525 msgid "add <pattern> to ignore rules"

6526 msgstr "ajouter <motif> aux règles ignore"

6527

6336 -#: builtin/clean.c:877

6528 +#: builtin/clean.c:883

6529 msgid "remove ignored files, too"

6530 msgstr "supprimer les fichiers ignorés, aussi"

6531

6340 -#: builtin/clean.c:879

6532 +#: builtin/clean.c:885

6533 msgid "remove only ignored files"

6534 msgstr "supprimer seulement les fichiers ignorés"

6535

6344 -#: builtin/clean.c:897

6536 +#: builtin/clean.c:903

6537 msgid "-x and -X cannot be used together"

6538 msgstr "-x et -X ne peuvent pas être utilisés ensemble"

6539

6348 -#: builtin/clean.c:901

6540 +#: builtin/clean.c:907

6541 msgid ""

6542 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

6543 "clean"

@@ -6353,7 +6545,7 @@ msgstr ""

6545 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "

6546 "nettoyer"

6547

6356 -#: builtin/clean.c:904

6548 +#: builtin/clean.c:910

6549 msgid ""

6550 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

6551 "refusing to clean"

@@ -6365,130 +6557,135 @@ msgstr ""

6557 msgid "git clone [<options>] [--] <repo> [<dir>]"

6558 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

6559

6368 -#: builtin/clone.c:65

6560 +#: builtin/clone.c:80

6561 msgid "don't create a checkout"

6562 msgstr "ne pas créer d'extraction"

6563

6372 -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478

6564 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478

6565 msgid "create a bare repository"

6566 msgstr "créer un dépôt nu"

6567

6376 -#: builtin/clone.c:70

6568 +#: builtin/clone.c:85

6569 msgid "create a mirror repository (implies bare)"

6570 msgstr "créer un dépôt miroir (implique dépôt nu)"

6571

6380 -#: builtin/clone.c:72

6572 +#: builtin/clone.c:87

6573 msgid "to clone from a local repository"

6574 msgstr "pour cloner depuis un dépôt local"

6575

6384 -#: builtin/clone.c:74

6576 +#: builtin/clone.c:89

6577 msgid "don't use local hardlinks, always copy"

6578 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

6579

6388 -#: builtin/clone.c:76

6580 +#: builtin/clone.c:91

6581 msgid "setup as shared repository"

6582 msgstr "régler comme dépôt partagé"

6583

6392 -#: builtin/clone.c:78 builtin/clone.c:80

6584 +#: builtin/clone.c:93 builtin/clone.c:97

6585 +msgid "pathspec"

6586 +msgstr "spécificateur de chemin"

6587 +

6588 +#: builtin/clone.c:93 builtin/clone.c:97

6589 msgid "initialize submodules in the clone"

6590 msgstr "initialiser les sous-modules dans le clone"

6591

6396 -#: builtin/clone.c:82

6592 +#: builtin/clone.c:100

6593 msgid "number of submodules cloned in parallel"

6594 msgstr "nombre de sous-modules clonés en parallèle"

6595

6400 -#: builtin/clone.c:83 builtin/init-db.c:475

6596 +#: builtin/clone.c:101 builtin/init-db.c:475

6597 msgid "template-directory"

6598 msgstr "répertoire-modèle"

6599

6404 -#: builtin/clone.c:84 builtin/init-db.c:476

6600 +#: builtin/clone.c:102 builtin/init-db.c:476

6601 msgid "directory from which templates will be used"

6602 msgstr "répertoire depuis lequel les modèles vont être utilisés"

6603

6408 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6409 -#: builtin/submodule--helper.c:970

6604 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642

6605 +#: builtin/submodule--helper.c:983

6606 msgid "reference repository"

6607 msgstr "dépôt de référence"

6608

6413 -#: builtin/clone.c:90

6609 +#: builtin/clone.c:108

6610 msgid "use --reference only while cloning"

6611 msgstr "utiliser seulement --reference pour cloner"

6612

6417 -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44

6613 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43

6614 msgid "name"

6615 msgstr "nom"

6616

6421 -#: builtin/clone.c:92

6617 +#: builtin/clone.c:110

6618 msgid "use <name> instead of 'origin' to track upstream"

6619 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

6620

6425 -#: builtin/clone.c:94

6621 +#: builtin/clone.c:112

6622 msgid "checkout <branch> instead of the remote's HEAD"

6623 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

6624

6429 -#: builtin/clone.c:96

6625 +#: builtin/clone.c:114

6626 msgid "path to git-upload-pack on the remote"

6627 msgstr "chemin vers git-upload-pack sur le serveur distant"

6628

6433 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 builtin/pull.c:202

6629 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006

6630 +#: builtin/pull.c:202

6631 msgid "depth"

6632 msgstr "profondeur"

6633

6437 -#: builtin/clone.c:98

6634 +#: builtin/clone.c:116

6635 msgid "create a shallow clone of that depth"

6636 msgstr "créer un clone superficiel de cette profondeur"

6637

6441 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6638 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918

6639 #: parse-options.h:142

6640 msgid "time"

6641 msgstr "heure"

6642

6446 -#: builtin/clone.c:100

6643 +#: builtin/clone.c:118

6644 msgid "create a shallow clone since a specific time"

6645 msgstr "créer un clone superficiel depuis une date spécifique"

6646

6450 -#: builtin/clone.c:101 builtin/fetch.c:124

6647 +#: builtin/clone.c:119 builtin/fetch.c:124

6648 msgid "revision"

6649 msgstr "révision"

6650

6454 -#: builtin/clone.c:102 builtin/fetch.c:125

6651 +#: builtin/clone.c:120 builtin/fetch.c:125

6652 msgid "deepen history of shallow clone, excluding rev"

6653 msgstr ""

6654 "approfondir l'historique d'un clone superficiel en excluant une révision"

6655

6459 -#: builtin/clone.c:104

6656 +#: builtin/clone.c:122

6657 msgid "clone only one branch, HEAD or --branch"

6658 msgstr "cloner seulement une branche, HEAD ou --branch"

6659

6463 -#: builtin/clone.c:106

6660 +#: builtin/clone.c:124

6661 msgid "any cloned submodules will be shallow"

6662 msgstr "tous les sous-modules clonés seront superficiels"

6663

6467 -#: builtin/clone.c:107 builtin/init-db.c:484

6664 +#: builtin/clone.c:125 builtin/init-db.c:484

6665 msgid "gitdir"

6666 msgstr "gitdir"

6667

6471 -#: builtin/clone.c:108 builtin/init-db.c:485

6668 +#: builtin/clone.c:126 builtin/init-db.c:485

6669 msgid "separate git dir from working tree"

6670 msgstr "séparer le répertoire git de la copie de travail"

6671

6475 -#: builtin/clone.c:109

6672 +#: builtin/clone.c:127

6673 msgid "key=value"

6674 msgstr "clé=valeur"

6675

6479 -#: builtin/clone.c:110

6676 +#: builtin/clone.c:128

6677 msgid "set config inside the new repository"

6678 msgstr "régler la configuration dans le nouveau dépôt"

6679

6483 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6680 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550

6681 msgid "use IPv4 addresses only"

6682 msgstr "n'utiliser que des adresses IPv4"

6683

6487 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6684 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552

6685 msgid "use IPv6 addresses only"

6686 msgstr "n'utiliser que des adresses IPv6"

6687

6491 -#: builtin/clone.c:250

6688 +#: builtin/clone.c:268

6689 msgid ""

6690 "No directory name could be guessed.\n"

6691 "Please specify a directory on the command line"

@@ -6496,42 +6693,42 @@ msgstr ""

6693 "Aucun nom de répertoire n'a pu être deviné\n"

6694 "Veuillez spécifier un répertoire dans la ligne de commande"

6695

6499 -#: builtin/clone.c:303

6696 +#: builtin/clone.c:321

6697 #, c-format

6698 msgid "info: Could not add alternate for '%s': %s\n"

6699 msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"

6700

6504 -#: builtin/clone.c:375

6701 +#: builtin/clone.c:393

6702 #, c-format

6703 msgid "failed to open '%s'"

6704 msgstr "échec à l'ouverture de '%s'"

6705

6509 -#: builtin/clone.c:383

6706 +#: builtin/clone.c:401

6707 #, c-format

6708 msgid "%s exists and is not a directory"

6709 msgstr "%s existe et n'est pas un répertoire"

6710

6514 -#: builtin/clone.c:397

6711 +#: builtin/clone.c:415

6712 #, c-format

6713 msgid "failed to stat %s\n"

6714 msgstr "échec du stat de %s\n"

6715

6519 -#: builtin/clone.c:419

6716 +#: builtin/clone.c:437

6717 #, c-format

6718 msgid "failed to create link '%s'"

6719 msgstr "échec de la création du lien '%s'"

6720

6524 -#: builtin/clone.c:423

6721 +#: builtin/clone.c:441

6722 #, c-format

6723 msgid "failed to copy file to '%s'"

6724 msgstr "échec de la copie vers '%s'"

6725

6529 -#: builtin/clone.c:448

6726 +#: builtin/clone.c:466

6727 #, c-format

6728 msgid "done.\n"

6729 msgstr "fait.\n"

6730

6534 -#: builtin/clone.c:460

6731 +#: builtin/clone.c:478

6732 msgid ""

6733 "Clone succeeded, but checkout failed.\n"

6734 "You can inspect what was checked out with 'git status'\n"

@@ -6541,103 +6738,102 @@ msgstr ""

6738 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

6739 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

6740

6544 -#: builtin/clone.c:537

6741 +#: builtin/clone.c:555

6742 #, c-format

6743 msgid "Could not find remote branch %s to clone."

6744 msgstr "Impossible de trouver la branche distante '%s' à cloner."

6745

6549 -#: builtin/clone.c:632

6746 +#: builtin/clone.c:650

6747 msgid "remote did not send all necessary objects"

6748 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

6749

6553 -#: builtin/clone.c:648

6750 +#: builtin/clone.c:666

6751 #, c-format

6752 msgid "unable to update %s"

6753 msgstr "impossible de mettre à jour %s"

6754

6558 -#: builtin/clone.c:697

6755 +#: builtin/clone.c:715

6756 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

6757 msgstr ""

6758 "la HEAD distante réfère à une référence non existante, impossible de "

6759 "l'extraire.\n"

6760

6564 -#: builtin/clone.c:728

l10n: fr.po v2.13 round 1