7b0580583a · matheusbsbs/matheus-bagliano

@@ -1,5 +1,5 @@

1 # French translations for Git.

3 # This file is distributed under the same license as the Git package.

4 # Jean-Noël Avila <jn.avila@free.fr>, 2013.

5 # Sébastien Helleu <flashcode@flashtux.org>, 2013.

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

73 msgstr ""

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

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

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

77 -"PO-Revision-Date: 2015-04-04 18:03+0200\n"

76 +"POT-Creation-Date: 2015-06-27 19:17+0800\n"

77 +"PO-Revision-Date: 2015-06-30 21:30+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"

@@ -93,9 +93,8 @@ msgid ""

93 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

94 "as appropriate to mark resolution and make a commit."

95 msgstr ""

96 -"Corrigez-les dans la copie de travail,\n"

97 -"puis utilisez 'git add/rm <fichier>' si\n"

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

96 +"Corrigez-les puis lancez 'git add/rm <fichier>'\n"

97 +"si nécessaire pour marquer la résolution et valider."

98

99 #: archive.c:11

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

@@ -116,7 +115,7 @@ msgstr ""

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

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

117

119 -#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

118 +#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

119 #, c-format

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

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

@@ -139,9 +138,9 @@ msgstr "préfixer chaque chemin de fichier dans l'archive"

138

139 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

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

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

141 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

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

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

143 +#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

144 msgid "file"

145 msgstr "fichier"

146

@@ -173,7 +172,7 @@ msgstr "compression efficace"

172 msgid "list supported archive formats"

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

174

176 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86

175 +#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

176 msgid "repo"

177 msgstr "dépôt"

178

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

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

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

190

192 -#: attr.c:264

191 +#: attr.c:265

192 msgid ""

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

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

@@ -335,8 +334,8 @@ msgid "Repository lacks these prerequisite commits:"

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

335

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

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

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

337 +#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

338 +#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

339 #: builtin/shortlog.c:158

340 msgid "revision walk setup failed"

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

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

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

586 "%s"

587

589 -#: diff.c:2956

588 +#: diff.c:2997

589 #, c-format

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

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

592

594 -#: diff.c:3351

593 +#: diff.c:3393

594 msgid "--follow requires exactly one pathspec"

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

596

598 -#: diff.c:3514

597 +#: diff.c:3556

598 #, c-format

599 msgid ""

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

@@ -604,11 +603,19 @@ msgstr ""

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

604 "%s"

605

607 -#: diff.c:3528

606 +#: diff.c:3570

607 #, c-format

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

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

610

611 +#: dir.c:1852

612 +msgid "failed to get kernel name and information"

613 +msgstr "echec de l'obtention d'information de kernel"

614 +

615 +#: dir.c:1945

616 +msgid "Untracked cache is disabled on this system."

617 +msgstr "Le cache non suivi est désactivé sur ce système."

618 +

619 #: gpg-interface.c:129 gpg-interface.c:200

620 msgid "could not run gpg."

621 msgstr "impossible de lancer gpg."

@@ -655,11 +662,11 @@ msgstr "commandes git disponibles dans '%s'"

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

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

664

658 -#: help.c:230

659 -msgid "The most commonly used git commands are:"

660 -msgstr "Les commandes git les plus utilisées sont :"

665 +#: help.c:246

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

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

668

662 -#: help.c:289

669 +#: help.c:311

670 #, c-format

671 msgid ""

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

@@ -668,11 +675,11 @@ msgstr ""

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

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

677

671 -#: help.c:346

678 +#: help.c:368

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

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

681

675 -#: help.c:368

682 +#: help.c:390

683 #, c-format

684 msgid ""

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

@@ -682,17 +689,17 @@ msgstr ""

689 "pas.\n"

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

691

685 -#: help.c:373

692 +#: help.c:395

693 #, c-format

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

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

696

690 -#: help.c:380

697 +#: help.c:402

698 #, c-format

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

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

701

695 -#: help.c:384 help.c:444

702 +#: help.c:406 help.c:466

703 msgid ""

704 "\n"

705 "Did you mean this?"

@@ -706,16 +713,16 @@ msgstr[1] ""

713 "\n"

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

715

709 -#: help.c:440

716 +#: help.c:462

717 #, c-format

718 msgid "%s: %s - %s"

719 msgstr "%s: %s - %s"

720

714 -#: lockfile.c:283

721 +#: lockfile.c:345

722 msgid "BUG: reopen a lockfile that is still open"

723 msgstr "BUG: réouverture d'un fichier verrou déjà ouvert"

724

718 -#: lockfile.c:285

725 +#: lockfile.c:347

726 msgid "BUG: reopen a lockfile that has been committed"

727 msgstr "BUG: réouverture d'un fichier verrou validé"

728

@@ -723,8 +730,8 @@ msgstr "BUG: réouverture d'un fichier verrou validé"

730 msgid "failed to read the cache"

731 msgstr "impossible de lire le cache"

732

726 -#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580

727 -#: builtin/clone.c:662

733 +#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

734 +#: builtin/clone.c:654

735 msgid "unable to write new index file"

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

737

@@ -742,64 +749,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'"

749 msgid "error building trees"

750 msgstr "erreur de construction des arbres"

751

745 -#: merge-recursive.c:688

752 +#: merge-recursive.c:687

753 #, c-format

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

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

756

750 -#: merge-recursive.c:699

757 +#: merge-recursive.c:698

758 #, c-format

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

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

761

755 -#: merge-recursive.c:713 merge-recursive.c:734

762 +#: merge-recursive.c:712 merge-recursive.c:733

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

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

765

759 -#: merge-recursive.c:724

766 +#: merge-recursive.c:723

767 #, c-format

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

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

770

764 -#: merge-recursive.c:764

771 +#: merge-recursive.c:763

772 #, c-format

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

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

775

769 -#: merge-recursive.c:766

776 +#: merge-recursive.c:765

777 #, c-format

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

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

780

774 -#: merge-recursive.c:789 builtin/clone.c:321

781 +#: merge-recursive.c:788 builtin/clone.c:313

782 #, c-format

783 msgid "failed to open '%s'"

784 msgstr "échec à l'ouverture de '%s'"

785

779 -#: merge-recursive.c:797

786 +#: merge-recursive.c:796

787 #, c-format

788 msgid "failed to symlink '%s'"

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

790

784 -#: merge-recursive.c:800

791 +#: merge-recursive.c:799

792 #, c-format

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

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

795

789 -#: merge-recursive.c:938

796 +#: merge-recursive.c:937

797 msgid "Failed to execute internal merge"

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

799

793 -#: merge-recursive.c:942

800 +#: merge-recursive.c:941

801 #, c-format

802 msgid "Unable to add %s to database"

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

804

798 -#: merge-recursive.c:958

805 +#: merge-recursive.c:957

806 msgid "unsupported object type in the tree"

807 msgstr "type d'objet non supporté dans l'arbre"

808

802 -#: merge-recursive.c:1033 merge-recursive.c:1047

809 +#: merge-recursive.c:1032 merge-recursive.c:1046

810 #, c-format

811 msgid ""

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

@@ -808,7 +815,7 @@ msgstr ""

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

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

817

811 -#: merge-recursive.c:1039 merge-recursive.c:1052

818 +#: merge-recursive.c:1038 merge-recursive.c:1051

819 #, c-format

820 msgid ""

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

@@ -817,20 +824,20 @@ msgstr ""

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

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

826

820 -#: merge-recursive.c:1093

827 +#: merge-recursive.c:1092

828 msgid "rename"

829 msgstr "renommage"

830

824 -#: merge-recursive.c:1093

831 +#: merge-recursive.c:1092

832 msgid "renamed"

833 msgstr "renommé"

834

828 -#: merge-recursive.c:1149

835 +#: merge-recursive.c:1148

836 #, c-format

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

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

839

833 -#: merge-recursive.c:1171

840 +#: merge-recursive.c:1170

841 #, c-format

842 msgid ""

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

@@ -839,146 +846,146 @@ msgstr ""

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

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

848

842 -#: merge-recursive.c:1176

849 +#: merge-recursive.c:1175

850 msgid " (left unresolved)"

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

852

846 -#: merge-recursive.c:1230

853 +#: merge-recursive.c:1229

854 #, c-format

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

856 msgstr ""

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

858 ">'%s' dans %s"

859

853 -#: merge-recursive.c:1260

860 +#: merge-recursive.c:1259

861 #, c-format

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

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

864

858 -#: merge-recursive.c:1459

865 +#: merge-recursive.c:1458

866 #, c-format

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

868 msgstr ""

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

870

864 -#: merge-recursive.c:1469

871 +#: merge-recursive.c:1468

872 #, c-format

873 msgid "Adding merged %s"

874 msgstr "Ajout de %s fusionné"

875

869 -#: merge-recursive.c:1474 merge-recursive.c:1672

876 +#: merge-recursive.c:1473 merge-recursive.c:1671

877 #, c-format

878 msgid "Adding as %s instead"

879 msgstr "Ajout plutôt comme %s"

880

874 -#: merge-recursive.c:1525

881 +#: merge-recursive.c:1524

882 #, c-format

883 msgid "cannot read object %s"

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

885

879 -#: merge-recursive.c:1528

886 +#: merge-recursive.c:1527

887 #, c-format

888 msgid "object %s is not a blob"

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

890

884 -#: merge-recursive.c:1576

891 +#: merge-recursive.c:1575

892 msgid "modify"

893 msgstr "modification"

894

888 -#: merge-recursive.c:1576

895 +#: merge-recursive.c:1575

896 msgid "modified"

897 msgstr "modifié"

898

892 -#: merge-recursive.c:1586

899 +#: merge-recursive.c:1585

900 msgid "content"

901 msgstr "contenu"

902

896 -#: merge-recursive.c:1593

903 +#: merge-recursive.c:1592

904 msgid "add/add"

905 msgstr "ajout/ajout"

906

900 -#: merge-recursive.c:1627

907 +#: merge-recursive.c:1626

908 #, c-format

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

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

911

905 -#: merge-recursive.c:1641

912 +#: merge-recursive.c:1640

913 #, c-format

914 msgid "Auto-merging %s"

915 msgstr "Fusion automatique de %s"

916

910 -#: merge-recursive.c:1645 git-submodule.sh:1150

917 +#: merge-recursive.c:1644 git-submodule.sh:1150

918 msgid "submodule"

919 msgstr "sous-module"

920

914 -#: merge-recursive.c:1646

921 +#: merge-recursive.c:1645

922 #, c-format

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

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

925

919 -#: merge-recursive.c:1732

926 +#: merge-recursive.c:1731

927 #, c-format

928 msgid "Removing %s"

929 msgstr "Suppression de %s"

930

924 -#: merge-recursive.c:1757

931 +#: merge-recursive.c:1756

932 msgid "file/directory"

933 msgstr "fichier/répertoire"

934

928 -#: merge-recursive.c:1763

935 +#: merge-recursive.c:1762

936 msgid "directory/file"

937 msgstr "répertoire/fichier"

938

932 -#: merge-recursive.c:1768

939 +#: merge-recursive.c:1767

940 #, c-format

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

942 msgstr ""

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

944

938 -#: merge-recursive.c:1778

945 +#: merge-recursive.c:1777

946 #, c-format

947 msgid "Adding %s"

948 msgstr "Ajout de %s"

949

943 -#: merge-recursive.c:1795

950 +#: merge-recursive.c:1794

951 msgid "Fatal merge failure, shouldn't happen."

952 msgstr "Échec fatal de fusion, qui ne devrait jamais arriver."

953

947 -#: merge-recursive.c:1814

954 +#: merge-recursive.c:1813

955 msgid "Already up-to-date!"

956 msgstr "Déjà à jour !"

957

951 -#: merge-recursive.c:1823

958 +#: merge-recursive.c:1822

959 #, c-format

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

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

962

956 -#: merge-recursive.c:1853

963 +#: merge-recursive.c:1852

964 #, c-format

965 msgid "Unprocessed path??? %s"

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

967

961 -#: merge-recursive.c:1901

968 +#: merge-recursive.c:1900

969 msgid "Merging:"

970 msgstr "Fusion :"

971

965 -#: merge-recursive.c:1914

972 +#: merge-recursive.c:1913

973 #, c-format

974 msgid "found %u common ancestor:"

975 msgid_plural "found %u common ancestors:"

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

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

978

972 -#: merge-recursive.c:1951

979 +#: merge-recursive.c:1950

980 msgid "merge returned no commit"

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

982

976 -#: merge-recursive.c:2008

983 +#: merge-recursive.c:2007

984 #, c-format

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

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

987

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

988 +#: merge-recursive.c:2018 builtin/merge.c:645

989 msgid "Unable to write index."

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

991

@@ -1003,7 +1010,7 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

1010 msgid "Bad %s value: '%s'"

1011 msgstr "Mauvaise valeur de %s : '%s'"

1012

1006 -#: object.c:241

1013 +#: object.c:242

1014 #, c-format

1015 msgid "unable to parse object: %s"

1016 msgstr "impossible d'analyser l'objet : %s"

@@ -1105,11 +1112,11 @@ msgstr ""

1112 msgid "unable to parse --pretty format"

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

1114

1108 -#: progress.c:225

1115 +#: progress.c:236

1116 msgid "done"

1117 msgstr "fait"

1118

1112 -#: read-cache.c:1275

1119 +#: read-cache.c:1295

1120 #, c-format

1121 msgid ""

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

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

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

1126 "Utilisation de la version %i"

1127

1121 -#: read-cache.c:1285

1128 +#: read-cache.c:1305

1129 #, c-format

1130 msgid ""

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

@@ -1127,51 +1134,93 @@ msgstr ""

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

1135 "Utilisation de la version %i"

1136

1130 -#: remote.c:782

1137 +#: remote.c:792

1138 #, c-format

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

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

1141

1135 -#: remote.c:786

1142 +#: remote.c:796

1143 #, c-format

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

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

1146

1140 -#: remote.c:790

1147 +#: remote.c:800

1148 #, c-format

1149 msgid "%s tracks both %s and %s"

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

1151

1145 -#: remote.c:798

1152 +#: remote.c:808

1153 msgid "Internal error"

1154 msgstr "Erreur interne"

1155

1149 -#: remote.c:1980

1156 +#: remote.c:1723 remote.c:1766

1157 +msgid "HEAD does not point to a branch"

1158 +msgstr "HEAD ne pointe pas sur une branche"

1159 +

1160 +#: remote.c:1732

1161 +#, c-format

1162 +msgid "no such branch: '%s'"

1163 +msgstr "pas de branche '%s'"

1164 +

1165 +#: remote.c:1735

1166 +#, c-format

1167 +msgid "no upstream configured for branch '%s'"

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

1169 +

1170 +#: remote.c:1741

1171 +#, c-format

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

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

1174 +

1175 +#: remote.c:1756

1176 +#, c-format

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

1178 +msgstr "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de branche locale de suivi"

1179 +

1180 +#: remote.c:1771

1181 +#, c-format

1182 +msgid "branch '%s' has no remote for pushing"

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

1184 +

1185 +#: remote.c:1782

1186 +#, c-format

1187 +msgid "push refspecs for '%s' do not include '%s'"

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

1189 +

1190 +#: remote.c:1795

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

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

1193 +

1194 +#: remote.c:1817

1195 +msgid "cannot resolve 'simple' push to a single destination"

1196 +msgstr "impossible de résoudre une poussée 'simple' pour une destination unique"

1197 +

1198 +#: remote.c:2124

1199 #, c-format

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

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

1202

1154 -#: remote.c:1984

1203 +#: remote.c:2128

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

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

1206

1158 -#: remote.c:1987

1207 +#: remote.c:2131

1208 #, c-format

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

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

1211

1163 -#: remote.c:1991

1212 +#: remote.c:2135

1213 #, c-format

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

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

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

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

1218

1170 -#: remote.c:1997

1219 +#: remote.c:2141

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

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

1222

1174 -#: remote.c:2000

1223 +#: remote.c:2144

1224 #, c-format

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

1226 msgid_plural ""

@@ -1183,11 +1232,11 @@ msgstr[1] ""

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

1233 "en avance rapide.\n"

1234

1186 -#: remote.c:2008

1235 +#: remote.c:2152

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

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

1238

1190 -#: remote.c:2011

1239 +#: remote.c:2155

1240 #, c-format

1241 msgid ""

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

@@ -1202,12 +1251,12 @@ msgstr[1] ""

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

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

1253

1205 -#: remote.c:2021

1254 +#: remote.c:2165

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

1256 msgstr ""

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

1258

1210 -#: revision.c:2348

1259 +#: revision.c:2366

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

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

1262

@@ -1224,22 +1273,22 @@ msgstr "échec de dup2(%d,%d)"

1273 msgid "failed to sign the push certificate"

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

1275

1227 -#: send-pack.c:356

1276 +#: send-pack.c:378

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

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

1279

1231 -#: send-pack.c:366

1280 +#: send-pack.c:389

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

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

1283

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

1236 -#: builtin/merge.c:1005

1284 +#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1285 +#: builtin/merge.c:983

1286 #, c-format

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

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

1289

1241 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1242 -#: builtin/merge.c:1010

1290 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1291 +#: builtin/merge.c:988

1292 #, c-format

1293 msgid "Could not write to '%s'"

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

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

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

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

1490

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

1491 +#: sequencer.c:908 builtin/apply.c:4291

1492 #, c-format

1493 msgid "cannot open %s: %s"

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

@@ -1481,7 +1530,12 @@ msgstr "Impossible d'annuler en tant que commit initial"

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

1531 msgstr "Impossible de picorer vers une HEAD vide"

1532

1484 -#: sha1_name.c:440

1533 +#: setup.c:243

1534 +#, c-format

1535 +msgid "failed to read %s"

1536 +msgstr "échec de la lecture de %s"

1537 +

1538 +#: sha1_name.c:453

1539 msgid ""

1540 "Git normally never creates a ref that ends with 40 hex characters\n"

1541 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1506,25 +1560,6 @@ msgstr ""

1560 "message\n"

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

1562

1509 -#: sha1_name.c:1068

1510 -msgid "HEAD does not point to a branch"

1511 -msgstr "HEAD ne pointe pas sur une branche"

1512 -

1513 -#: sha1_name.c:1071

1514 -#, c-format

1515 -msgid "No such branch: '%s'"

1516 -msgstr "Branche inconnue : '%s'"

1517 -

1518 -#: sha1_name.c:1073

1519 -#, c-format

1520 -msgid "No upstream configured for branch '%s'"

1521 -msgstr "Aucune branche amont configurée pour la branche '%s'"

1522 -

1523 -#: sha1_name.c:1077

1524 -#, c-format

1525 -msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1526 -msgstr "La branche amont '%s' n'est pas stockée comme branche de suivi"

1527 -

1563 #: submodule.c:64 submodule.c:98

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

1565 msgstr ""

@@ -1551,12 +1586,7 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1586 msgid "staging updated .gitmodules failed"

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

1588

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

1555 -#, c-format

1556 -msgid "Could not create git link %s"

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

1558 -

1559 -#: submodule.c:1120

1589 +#: submodule.c:1115

1590 #, c-format

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

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

@@ -1586,7 +1616,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'"

1616 msgid "could not read from stdin"

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

1618

1589 -#: unpack-trees.c:202

1619 +#: unpack-trees.c:203

1620 msgid "Checking out files"

1621 msgstr "Extraction des fichiers"

1622

@@ -1644,6 +1674,21 @@ msgstr "utilisateur inconnu"

1674 msgid "unable to get current working directory"

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

1676

1677 +#: wrapper.c:575

1678 +#, c-format

1679 +msgid "could not open %s for writing"

1680 +msgstr "Impossible d'ouvrir '%s' en écriture"

1681 +

1682 +#: wrapper.c:587

1683 +#, c-format

1684 +msgid "could not write to %s"

1685 +msgstr "Impossible d'écrire dans %s"

1686 +

1687 +#: wrapper.c:593

1688 +#, c-format

1689 +msgid "could not close %s"

1690 +msgstr "impossible de fermer %s"

1691 +

1692 #: wt-status.c:150

1693 msgid "Unmerged paths:"

1694 msgstr "Chemins non fusionnés :"

@@ -1671,11 +1716,11 @@ msgstr ""

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

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

1718

1674 -#: wt-status.c:198 wt-status.c:878

1719 +#: wt-status.c:198 wt-status.c:881

1720 msgid "Changes to be committed:"

1721 msgstr "Modifications qui seront validées :"

1722

1678 -#: wt-status.c:216 wt-status.c:887

1723 +#: wt-status.c:216 wt-status.c:890

1724 msgid "Changes not staged for commit:"

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

1726

@@ -1790,15 +1835,15 @@ msgstr "contenu non suivi, "

1835 msgid "bug: unhandled diff status %c"

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

1837

1793 -#: wt-status.c:753

1838 +#: wt-status.c:755

1839 msgid "Submodules changed but not updated:"

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

1841

1797 -#: wt-status.c:755

1842 +#: wt-status.c:757

1843 msgid "Submodule changes to be committed:"

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

1845

1801 -#: wt-status.c:835

1846 +#: wt-status.c:838

1847 msgid ""

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

1849 "Everything below will be removed."

@@ -1806,68 +1851,68 @@ msgstr ""

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

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

1853

1809 -#: wt-status.c:946

1854 +#: wt-status.c:949

1855 msgid "You have unmerged paths."

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

1857

1813 -#: wt-status.c:949

1858 +#: wt-status.c:952

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

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

1861

1817 -#: wt-status.c:952

1862 +#: wt-status.c:955

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

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

1865

1821 -#: wt-status.c:955

1866 +#: wt-status.c:958

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

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

1869

1825 -#: wt-status.c:965

1870 +#: wt-status.c:968

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

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

1873

1829 -#: wt-status.c:968

1874 +#: wt-status.c:971

1875 msgid "The current patch is empty."

1876 msgstr "Le patch actuel est vide."

1877

1833 -#: wt-status.c:972

1878 +#: wt-status.c:975

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

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

1881

1837 -#: wt-status.c:974

1882 +#: wt-status.c:977

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

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

1885

1841 -#: wt-status.c:976

1886 +#: wt-status.c:979

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

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

1889

1845 -#: wt-status.c:1036 wt-status.c:1053

1890 +#: wt-status.c:1039 wt-status.c:1056

1891 #, c-format

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

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

1894

1850 -#: wt-status.c:1041 wt-status.c:1058

1895 +#: wt-status.c:1044 wt-status.c:1061

1896 msgid "You are currently rebasing."

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

1898

1854 -#: wt-status.c:1044

1899 +#: wt-status.c:1047

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

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

1902

1858 -#: wt-status.c:1046

1903 +#: wt-status.c:1049

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

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

1906

1862 -#: wt-status.c:1048

1907 +#: wt-status.c:1051

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

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

1910

1866 -#: wt-status.c:1061

1911 +#: wt-status.c:1064

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

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

1914

1870 -#: wt-status.c:1065

1915 +#: wt-status.c:1068

1916 #, c-format

1917 msgid ""

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

@@ -1875,120 +1920,120 @@ msgstr ""

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

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

1922

1878 -#: wt-status.c:1070

1923 +#: wt-status.c:1073

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

1925 msgstr ""

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

1927

1883 -#: wt-status.c:1073

1928 +#: wt-status.c:1076

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

1930 msgstr ""

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

1932

1888 -#: wt-status.c:1077

1933 +#: wt-status.c:1080

1934 #, c-format

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

1936 msgstr ""

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

1938 "branche '%s' sur '%s'."

1939

1895 -#: wt-status.c:1082

1940 +#: wt-status.c:1085

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

1942 msgstr ""

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

1944

1900 -#: wt-status.c:1085

1945 +#: wt-status.c:1088

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

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

1948

1904 -#: wt-status.c:1087

1949 +#: wt-status.c:1090

1950 msgid ""

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

1952 msgstr ""

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

1954 "modifications)"

1955

1911 -#: wt-status.c:1097

1956 +#: wt-status.c:1100

1957 #, c-format

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

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

1960

1916 -#: wt-status.c:1102

1961 +#: wt-status.c:1105

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

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

1964

1920 -#: wt-status.c:1105

1965 +#: wt-status.c:1108

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

1967 msgstr ""

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

1969

1925 -#: wt-status.c:1107

1970 +#: wt-status.c:1110

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

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

1973

1929 -#: wt-status.c:1116

1974 +#: wt-status.c:1119

1975 #, c-format

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

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

1978

1934 -#: wt-status.c:1121

1979 +#: wt-status.c:1124

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

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

1982

1938 -#: wt-status.c:1124

1983 +#: wt-status.c:1127

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

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

1986

1942 -#: wt-status.c:1126

1987 +#: wt-status.c:1129

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

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

1990

1946 -#: wt-status.c:1137

1991 +#: wt-status.c:1140

1992 #, c-format

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

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

1995

1951 -#: wt-status.c:1141

1996 +#: wt-status.c:1144

1997 msgid "You are currently bisecting."

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

1999

1955 -#: wt-status.c:1144

2000 +#: wt-status.c:1147

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

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

2003

1959 -#: wt-status.c:1321

2004 +#: wt-status.c:1324

2005 msgid "On branch "

2006 msgstr "Sur la branche "

2007

1963 -#: wt-status.c:1328

2008 +#: wt-status.c:1331

2009 msgid "rebase in progress; onto "

2010 msgstr "rebasage en cours ; sur "

2011

1967 -#: wt-status.c:1333

2012 +#: wt-status.c:1336

2013 msgid "HEAD detached at "

2014 msgstr "HEAD détachée sur "

2015

1971 -#: wt-status.c:1335

2016 +#: wt-status.c:1338

2017 msgid "HEAD detached from "

2018 msgstr "HEAD détachée depuis "

2019

1975 -#: wt-status.c:1338

2020 +#: wt-status.c:1341

2021 msgid "Not currently on any branch."

2022 msgstr "Actuellement sur aucun branche."

2023

1979 -#: wt-status.c:1355

2024 +#: wt-status.c:1358

2025 msgid "Initial commit"

2026 msgstr "Validation initiale"

2027

1983 -#: wt-status.c:1369

2028 +#: wt-status.c:1372

2029 msgid "Untracked files"

2030 msgstr "Fichiers non suivis"

2031

1987 -#: wt-status.c:1371

2032 +#: wt-status.c:1374

2033 msgid "Ignored files"

2034 msgstr "Fichiers ignorés"

2035

1991 -#: wt-status.c:1375

2036 +#: wt-status.c:1378

2037 #, c-format

2038 msgid ""

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

@@ -2000,32 +2045,32 @@ msgstr ""

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

2046 "status')."

2047

2003 -#: wt-status.c:1381

2048 +#: wt-status.c:1384

2049 #, c-format

2050 msgid "Untracked files not listed%s"

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

2052

2008 -#: wt-status.c:1383

2053 +#: wt-status.c:1386

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

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

2056

2012 -#: wt-status.c:1389

2057 +#: wt-status.c:1392

2058 msgid "No changes"

2059 msgstr "Aucune modification"

2060

2016 -#: wt-status.c:1394

2061 +#: wt-status.c:1397

2062 #, c-format

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

2064 msgstr ""

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

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

2067

2023 -#: wt-status.c:1397

2068 +#: wt-status.c:1400

2069 #, c-format

2070 msgid "no changes added to commit\n"

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

2072

2028 -#: wt-status.c:1400

2073 +#: wt-status.c:1403

2074 #, c-format

2075 msgid ""

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

@@ -2034,53 +2079,53 @@ msgstr ""

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

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

2081

2037 -#: wt-status.c:1403

2082 +#: wt-status.c:1406

2083 #, c-format

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

2085 msgstr ""

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

2087 "sont présents\n"

2088

2044 -#: wt-status.c:1406

2089 +#: wt-status.c:1409

2090 #, c-format

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

2092 msgstr ""

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

2094 "suivre)\n"

2095

2051 -#: wt-status.c:1409 wt-status.c:1414

2096 +#: wt-status.c:1412 wt-status.c:1417

2097 #, c-format

2098 msgid "nothing to commit\n"

2099 msgstr "rien à valider\n"

2100

2056 -#: wt-status.c:1412

2101 +#: wt-status.c:1415

2102 #, c-format

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

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

2105

2061 -#: wt-status.c:1416

2106 +#: wt-status.c:1419

2107 #, c-format

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

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

2110

2066 -#: wt-status.c:1525

2111 +#: wt-status.c:1528

2112 msgid "HEAD (no branch)"

2113 msgstr "HEAD (aucune branche)"

2114

2070 -#: wt-status.c:1531

2115 +#: wt-status.c:1534

2116 msgid "Initial commit on "

2117 msgstr "Validation initiale sur "

2118

2119 # à priori on parle d'une branche ici

2075 -#: wt-status.c:1563

2120 +#: wt-status.c:1561

2121 msgid "gone"

2122 msgstr "disparue"

2123

2079 -#: wt-status.c:1565 wt-status.c:1573

2124 +#: wt-status.c:1563 wt-status.c:1571

2125 msgid "behind "

2126 msgstr "derrière "

2127

2083 -#: compat/precompose_utf8.c:55 builtin/clone.c:360

2128 +#: compat/precompose_utf8.c:55 builtin/clone.c:352

2129 #, c-format

2130 msgid "failed to unlink '%s'"

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

@@ -2107,7 +2152,7 @@ msgstr "suppression de '%s'\n"

2152 msgid "Unstaged changes after refreshing the index:"

2153 msgstr "Modifications non indexées après rafraîchissement de l'index :"

2154

2110 -#: builtin/add.c:194 builtin/rev-parse.c:785

2155 +#: builtin/add.c:194 builtin/rev-parse.c:796

2156 msgid "Could not read the index"

2157 msgstr "Impossible de lire l'index"

2158

@@ -2120,118 +2165,122 @@ msgstr "Impossible d'ouvrir '%s' en écriture."

2165 msgid "Could not write patch"

2166 msgstr "Impossible d'écrire le patch"

2167

2123 -#: builtin/add.c:214

2168 +#: builtin/add.c:212

2169 +msgid "editing patch failed"

2170 +msgstr "échec de l'édition du patch"

2171 +

2172 +#: builtin/add.c:215

2173 #, c-format

2174 msgid "Could not stat '%s'"

2175 msgstr "Stat de '%s' impossible"

2176

2128 -#: builtin/add.c:216

2177 +#: builtin/add.c:217

2178 msgid "Empty patch. Aborted."

2179 msgstr "Patch vide. Abandon."

2180

2132 -#: builtin/add.c:221

2181 +#: builtin/add.c:222

2182 #, c-format

2183 msgid "Could not apply '%s'"

2184 msgstr "Impossible d'appliquer '%s'"

2185

2137 -#: builtin/add.c:231

2186 +#: builtin/add.c:232

2187 msgid "The following paths are ignored by one of your .gitignore files:\n"

2188 msgstr ""

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

2190

2142 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

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

2144 -#: builtin/rm.c:269

2191 +#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2192 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2193 +#: builtin/rm.c:268

2194 msgid "dry run"

2195 msgstr "simuler l'action"

2196

2148 -#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19

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

2197 +#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2198 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

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

2200 msgid "be verbose"

2201 msgstr "mode verbeux"

2202

2154 -#: builtin/add.c:251

2203 +#: builtin/add.c:252

2204 msgid "interactive picking"

2205 msgstr "sélection interactive"

2206

2158 -#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2207 +#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2208 msgid "select hunks interactively"

2209 msgstr "sélection interactive des sections"

2210

2162 -#: builtin/add.c:253

2211 +#: builtin/add.c:254

2212 msgid "edit current diff and apply"

2213 msgstr "édition du diff actuel et application"

2214

2166 -#: builtin/add.c:254

2215 +#: builtin/add.c:255

2216 msgid "allow adding otherwise ignored files"

2217 msgstr "permettre l'ajout de fichiers ignorés"

2218

2170 -#: builtin/add.c:255

2219 +#: builtin/add.c:256

2220 msgid "update tracked files"

2221 msgstr "mettre à jour les fichiers suivis"

2222

2174 -#: builtin/add.c:256

2223 +#: builtin/add.c:257

2224 msgid "record only the fact that the path will be added later"

2225 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"

2226

2178 -#: builtin/add.c:257

2227 +#: builtin/add.c:258

2228 msgid "add changes from all tracked and untracked files"

2229 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"

2230

2182 -#: builtin/add.c:260

2231 +#: builtin/add.c:261

2232 msgid "ignore paths removed in the working tree (same as --no-all)"

2233 msgstr ""

2234 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"

2235

2187 -#: builtin/add.c:262

2236 +#: builtin/add.c:263

2237 msgid "don't add, only refresh the index"

2238 msgstr "ne pas ajouter, juste rafraîchir l'index"

2239

2191 -#: builtin/add.c:263

2240 +#: builtin/add.c:264

2241 msgid "just skip files which cannot be added because of errors"

2242 msgstr ""

2243 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "

2244 "d'erreurs"

2245

2197 -#: builtin/add.c:264

2246 +#: builtin/add.c:265

2247 msgid "check if - even missing - files are ignored in dry run"

2248 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

2249

2201 -#: builtin/add.c:286

2250 +#: builtin/add.c:287

2251 #, c-format

2252 msgid "Use -f if you really want to add them.\n"

2253 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"

2254

2206 -#: builtin/add.c:293

2255 +#: builtin/add.c:294

2256 msgid "adding files failed"

2257 msgstr "échec de l'ajout de fichiers"

2258

2210 -#: builtin/add.c:329

2259 +#: builtin/add.c:330

2260 msgid "-A and -u are mutually incompatible"

2261 msgstr "-A et -u sont mutuellement incompatibles"

2262

2214 -#: builtin/add.c:336

2263 +#: builtin/add.c:337

2264 msgid "Option --ignore-missing can only be used together with --dry-run"

2265 msgstr ""

2266 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"

2267

2219 -#: builtin/add.c:357

2268 +#: builtin/add.c:358

2269 #, c-format

2270 msgid "Nothing specified, nothing added.\n"

2271 msgstr "Rien de spécifié, rien n'a été ajouté.\n"

2272

2224 -#: builtin/add.c:358

2273 +#: builtin/add.c:359

2274 #, c-format

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

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

2277

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

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

2278 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2279 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2280 msgid "index file corrupt"

2281 msgstr "fichier d'index corrompu"

2282

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

2283 +#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2284 msgid "Unable to write new index file"

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

2286

@@ -2316,77 +2365,77 @@ msgstr[1] ""

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

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

2367

2319 -#: builtin/apply.c:1656

2368 +#: builtin/apply.c:1659

2369 msgid "new file depends on old contents"

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

2371

2323 -#: builtin/apply.c:1658

2372 +#: builtin/apply.c:1661

2373 msgid "deleted file still has contents"

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

2375

2327 -#: builtin/apply.c:1684

2376 +#: builtin/apply.c:1687

2377 #, c-format

2378 msgid "corrupt patch at line %d"

2379 msgstr "patch corrompu à la ligne %d"

2380

2332 -#: builtin/apply.c:1720

2381 +#: builtin/apply.c:1723

2382 #, c-format

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

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

2385

2337 -#: builtin/apply.c:1722

2386 +#: builtin/apply.c:1725

2387 #, c-format

2388 msgid "deleted file %s still has contents"

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

2390

2342 -#: builtin/apply.c:1725

2391 +#: builtin/apply.c:1728

2392 #, c-format

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

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

2395

2347 -#: builtin/apply.c:1871

2396 +#: builtin/apply.c:1874

2397 #, c-format

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

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

2400

2352 -#: builtin/apply.c:1900

2401 +#: builtin/apply.c:1903

2402 #, c-format

2403 msgid "unrecognized binary patch at line %d"

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

2405

2357 -#: builtin/apply.c:2051

2406 +#: builtin/apply.c:2054

2407 #, c-format

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

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

2410

2362 -#: builtin/apply.c:2141

2411 +#: builtin/apply.c:2144

2412 #, c-format

2413 msgid "unable to read symlink %s"

2414 msgstr "lecture du lien symbolique %s impossible"

2415

2367 -#: builtin/apply.c:2145

2416 +#: builtin/apply.c:2148

2417 #, c-format

2418 msgid "unable to open or read %s"

2419 msgstr "ouverture ou lecture de %s impossible"

2420

2372 -#: builtin/apply.c:2778

2421 +#: builtin/apply.c:2781

2422 #, c-format

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

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

2425

2377 -#: builtin/apply.c:2897

2426 +#: builtin/apply.c:2900

2427 #, c-format

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

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

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

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

2432

2384 -#: builtin/apply.c:2909

2433 +#: builtin/apply.c:2912

2434 #, c-format

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

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

2437

2389 -#: builtin/apply.c:2915

2438 +#: builtin/apply.c:2918

2439 #, c-format

2440 msgid ""

2441 "while searching for:\n"

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

2444 "pendant la recherche de :\n"

2445 "%.*s"

2446

2398 -#: builtin/apply.c:2935

2447 +#: builtin/apply.c:2938

2448 #, c-format

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

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

2451

2403 -#: builtin/apply.c:3036

2452 +#: builtin/apply.c:3039

2453 #, c-format

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

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

2456

2408 -#: builtin/apply.c:3042

2457 +#: builtin/apply.c:3045

2458 #, c-format

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

2460 msgstr ""

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

2462 "trouvé)"

2463

2415 -#: builtin/apply.c:3063

2464 +#: builtin/apply.c:3066

2465 #, c-format

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

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

2468

2420 -#: builtin/apply.c:3187

2469 +#: builtin/apply.c:3190

2470 #, c-format

2471 msgid "cannot checkout %s"

2472 msgstr "extraction de %s impossible"

2473

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

2474 +#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2475 #, c-format

2476 msgid "read of %s failed"

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

2478

2430 -#: builtin/apply.c:3240

2479 +#: builtin/apply.c:3243

2480 #, c-format

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

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

2483

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

2484 +#: builtin/apply.c:3271 builtin/apply.c:3493

2485 #, c-format

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

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

2488

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

2489 +#: builtin/apply.c:3352 builtin/apply.c:3507

2490 #, c-format

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

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

2493

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

2494 +#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2495 #, c-format

2496 msgid "%s: %s"

2497 msgstr "%s : %s"

2498

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

2499 +#: builtin/apply.c:3361 builtin/apply.c:3515

2500 #, c-format

2501 msgid "%s: does not match index"

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

2503

2455 -#: builtin/apply.c:3460

2504 +#: builtin/apply.c:3463

2505 msgid "removal patch leaves file contents"

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

2507

2459 -#: builtin/apply.c:3529

2508 +#: builtin/apply.c:3532

2509 #, c-format

2510 msgid "%s: wrong type"

2511 msgstr "%s : type erroné"

2512

2464 -#: builtin/apply.c:3531

2513 +#: builtin/apply.c:3534

2514 #, c-format

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

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

2517

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

2518 +#: builtin/apply.c:3693 builtin/apply.c:3695

2519 #, c-format

2520 msgid "invalid path '%s'"

2521 msgstr "chemin invalide '%s'"

2522

2474 -#: builtin/apply.c:3747

2523 +#: builtin/apply.c:3750

2524 #, c-format

2525 msgid "%s: already exists in index"

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

2527

2479 -#: builtin/apply.c:3750

2528 +#: builtin/apply.c:3753

2529 #, c-format

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

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

2532

2484 -#: builtin/apply.c:3770

2533 +#: builtin/apply.c:3773

2534 #, c-format

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

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

2537

2489 -#: builtin/apply.c:3775

2538 +#: builtin/apply.c:3778

2539 #, c-format

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

2541 msgstr ""

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

2543

2495 -#: builtin/apply.c:3795

2544 +#: builtin/apply.c:3798

2545 #, c-format

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

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

2548

2500 -#: builtin/apply.c:3799

2549 +#: builtin/apply.c:3802

2550 #, c-format

2551 msgid "%s: patch does not apply"

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

2553

2505 -#: builtin/apply.c:3813

2554 +#: builtin/apply.c:3816

2555 #, c-format

2556 msgid "Checking patch %s..."

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

2558

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

2559 +#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2560 #, c-format

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

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

2563

2515 -#: builtin/apply.c:4049

2564 +#: builtin/apply.c:4052

2565 #, c-format

2566 msgid "unable to remove %s from index"

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

2568

2520 -#: builtin/apply.c:4078

2569 +#: builtin/apply.c:4081

2570 #, c-format

2571 msgid "corrupt patch for submodule %s"

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

2573

2525 -#: builtin/apply.c:4082

2574 +#: builtin/apply.c:4085

2575 #, c-format

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

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

2578

2530 -#: builtin/apply.c:4087

2579 +#: builtin/apply.c:4090

2580 #, c-format

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

2582 msgstr ""

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

2584 "impossible"

2585

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

2586 +#: builtin/apply.c:4093 builtin/apply.c:4201

2587 #, c-format

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

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

2590

2542 -#: builtin/apply.c:4123

2591 +#: builtin/apply.c:4126

2592 #, c-format

2593 msgid "closing file '%s'"

2594 msgstr "fermeture du fichier '%s'"

2595

2547 -#: builtin/apply.c:4172

2596 +#: builtin/apply.c:4175

2597 #, c-format

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

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

2600

2552 -#: builtin/apply.c:4259

2601 +#: builtin/apply.c:4262

2602 #, c-format

2603 msgid "Applied patch %s cleanly."

2604 msgstr "Patch %s appliqué proprement."

2605

2557 -#: builtin/apply.c:4267

2606 +#: builtin/apply.c:4270

2607 msgid "internal error"

2608 msgstr "erreur interne"

2609

2561 -#: builtin/apply.c:4270

2610 +#: builtin/apply.c:4273

2611 #, c-format

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

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

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

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

2616

2568 -#: builtin/apply.c:4280

2617 +#: builtin/apply.c:4283

2618 #, c-format

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

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

2621

2573 -#: builtin/apply.c:4301

2622 +#: builtin/apply.c:4304

2623 #, c-format

2624 msgid "Hunk #%d applied cleanly."

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

2626

2578 -#: builtin/apply.c:4304

2627 +#: builtin/apply.c:4307

2628 #, c-format

2629 msgid "Rejected hunk #%d."

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

2631

2583 -#: builtin/apply.c:4394

2632 +#: builtin/apply.c:4397

2633 msgid "unrecognized input"

2634 msgstr "entrée non reconnue"

2635

2587 -#: builtin/apply.c:4405

2636 +#: builtin/apply.c:4408

2637 msgid "unable to read index file"

2638 msgstr "lecture du fichier d'index impossible"

2639

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

2640 +#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2641 #: builtin/fetch.c:92

2642 msgid "path"

2643 msgstr "chemin"

2644

2596 -#: builtin/apply.c:4523

2645 +#: builtin/apply.c:4526

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

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

2648

2600 -#: builtin/apply.c:4526

2649 +#: builtin/apply.c:4529

2650 msgid "apply changes matching the given path"

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

2652

2604 -#: builtin/apply.c:4528

2653 +#: builtin/apply.c:4531

2654 msgid "num"

2655 msgstr "num"

2656

2608 -#: builtin/apply.c:4529

2657 +#: builtin/apply.c:4532

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

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

2660

2612 -#: builtin/apply.c:4532

2661 +#: builtin/apply.c:4535

2662 msgid "ignore additions made by the patch"

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

2664

2616 -#: builtin/apply.c:4534

2665 +#: builtin/apply.c:4537

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

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

2668

2620 -#: builtin/apply.c:4538

2669 +#: builtin/apply.c:4541

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

2671 msgstr ""

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

2673

2625 -#: builtin/apply.c:4540

2674 +#: builtin/apply.c:4543

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

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

2677

2629 -#: builtin/apply.c:4542

2678 +#: builtin/apply.c:4545

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

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

2681

2633 -#: builtin/apply.c:4544

2682 +#: builtin/apply.c:4547

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

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

2685

2637 -#: builtin/apply.c:4546

2686 +#: builtin/apply.c:4549

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

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

2689

2641 -#: builtin/apply.c:4548

2690 +#: builtin/apply.c:4551

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

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

2693

2645 -#: builtin/apply.c:4550

2694 +#: builtin/apply.c:4553

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

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

2697

2649 -#: builtin/apply.c:4552

2698 +#: builtin/apply.c:4555

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

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

2701

2653 -#: builtin/apply.c:4554

2702 +#: builtin/apply.c:4557

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

2704 msgstr ""

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

2706

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

2707 +#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

2708 msgid "paths are separated with NUL character"

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

2710

2662 -#: builtin/apply.c:4559

2711 +#: builtin/apply.c:4562

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

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

2714

2666 -#: builtin/apply.c:4560

2715 +#: builtin/apply.c:4563

2716 msgid "action"

2717 msgstr "action"

2718

2670 -#: builtin/apply.c:4561

2719 +#: builtin/apply.c:4564

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

2721 msgstr ""

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

2723 "d'espace"

2724

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

2725 +#: builtin/apply.c:4567 builtin/apply.c:4570

2726 msgid "ignore changes in whitespace when finding context"

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

2728

2680 -#: builtin/apply.c:4570

2729 +#: builtin/apply.c:4573

2730 msgid "apply the patch in reverse"

2731 msgstr "appliquer le patch en sens inverse"

2732

2684 -#: builtin/apply.c:4572

2733 +#: builtin/apply.c:4575

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

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

2736

2688 -#: builtin/apply.c:4574

2737 +#: builtin/apply.c:4577

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

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

2740

2692 -#: builtin/apply.c:4576

2741 +#: builtin/apply.c:4579

2742 msgid "allow overlapping hunks"

2743 msgstr "accepter les recouvrements de sections"

2744

2696 -#: builtin/apply.c:4579

2745 +#: builtin/apply.c:4582

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

2747 msgstr ""

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

2749 "fichier"

2750

2702 -#: builtin/apply.c:4582

2751 +#: builtin/apply.c:4585

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

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

2754

2706 -#: builtin/apply.c:4584

2755 +#: builtin/apply.c:4587

2756 msgid "root"

2757 msgstr "racine"

2758

2710 -#: builtin/apply.c:4585

2759 +#: builtin/apply.c:4588

2760 msgid "prepend <root> to all filenames"

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

2762

2714 -#: builtin/apply.c:4607

2763 +#: builtin/apply.c:4610

2764 msgid "--3way outside a repository"

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

2766

2718 -#: builtin/apply.c:4615

2767 +#: builtin/apply.c:4618

2768 msgid "--index outside a repository"

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

2770

2722 -#: builtin/apply.c:4618

2771 +#: builtin/apply.c:4621

2772 msgid "--cached outside a repository"

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

2774

2726 -#: builtin/apply.c:4637

2775 +#: builtin/apply.c:4640

2776 #, c-format

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

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

2779

2731 -#: builtin/apply.c:4651

2780 +#: builtin/apply.c:4654

2781 #, c-format

2782 msgid "squelched %d whitespace error"

2783 msgid_plural "squelched %d whitespace errors"

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

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

2786

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

2787 +#: builtin/apply.c:4660 builtin/apply.c:4670

2788 #, c-format

2789 msgid "%d line adds whitespace errors."

2790 msgid_plural "%d lines add whitespace errors."

@@ -2789,11 +2838,11 @@ msgstr "effectuer 'git bisect next'"

2838 msgid "update BISECT_HEAD instead of checking out the current commit"

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

2840

2792 -#: builtin/blame.c:30

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

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

2841 +#: builtin/blame.c:31

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

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

2844

2796 -#: builtin/blame.c:35

2845 +#: builtin/blame.c:36

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

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

2848

@@ -2922,7 +2971,7 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2971 msgstr ""

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

2973

2925 -#: builtin/branch.c:152

2974 +#: builtin/branch.c:150

2975 #, c-format

2976 msgid ""

2977 "deleting branch '%s' that has been merged to\n"

@@ -2931,7 +2980,7 @@ msgstr ""

2980 "suppression de la branche '%s' qui a été fusionnée dans\n"

2981 " '%s', mais pas dans HEAD."

2982

2934 -#: builtin/branch.c:156

2983 +#: builtin/branch.c:154

2984 #, c-format

2985 msgid ""

2986 "not deleting branch '%s' that is not yet merged to\n"

@@ -2940,12 +2989,12 @@ msgstr ""

2989 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"

2990 " '%s', même si elle est fusionnée dans HEAD."

2991

2943 -#: builtin/branch.c:170

2992 +#: builtin/branch.c:168

2993 #, c-format

2994 msgid "Couldn't look up commit object for '%s'"

2995 msgstr "Impossible de rechercher l'objet commit pour '%s'"

2996

2948 -#: builtin/branch.c:174

2997 +#: builtin/branch.c:172

2998 #, c-format

2999 msgid ""

3000 "The branch '%s' is not fully merged.\n"

@@ -2954,309 +3003,309 @@ msgstr ""

3003 "La branche '%s' n'est pas totalement fusionnée.\n"

3004 "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."

3005

2957 -#: builtin/branch.c:187

3006 +#: builtin/branch.c:185

3007 msgid "Update of config-file failed"

3008 msgstr "Échec de la mise à jour du fichier de configuration"

3009

2961 -#: builtin/branch.c:215

3010 +#: builtin/branch.c:213

3011 msgid "cannot use -a with -d"

3012 msgstr "impossible d'utiliser -a avec -d"

3013

2965 -#: builtin/branch.c:221

3014 +#: builtin/branch.c:219

3015 msgid "Couldn't look up commit object for HEAD"

3016 msgstr "Impossible de rechercher l'objet commit pour HEAD"

3017

2969 -#: builtin/branch.c:229

3018 +#: builtin/branch.c:227

3019 #, c-format

3020 msgid "Cannot delete the branch '%s' which you are currently on."

3021 msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."

3022

2974 -#: builtin/branch.c:245

3023 +#: builtin/branch.c:243

3024 #, c-format

2976 -msgid "remote branch '%s' not found."

2977 -msgstr "branche distante %s' non trouvée."

3025 +msgid "remote-tracking branch '%s' not found."

3026 +msgstr "branche de suivi '%s' non trouvée."

3027

2979 -#: builtin/branch.c:246

3028 +#: builtin/branch.c:244

3029 #, c-format

3030 msgid "branch '%s' not found."

3031 msgstr "branche '%s' non trouvée."

3032

2984 -#: builtin/branch.c:260

3033 +#: builtin/branch.c:258

3034 #, c-format

2986 -msgid "Error deleting remote branch '%s'"

2987 -msgstr "Erreur lors de la suppression de la branche distante '%s'"

3035 +msgid "Error deleting remote-tracking branch '%s'"

3036 +msgstr "Erreur lors de la suppression de la branche de suivi '%s'"

3037

2989 -#: builtin/branch.c:261

3038 +#: builtin/branch.c:259

3039 #, c-format

3040 msgid "Error deleting branch '%s'"

3041 msgstr "Erreur lors de la suppression de la branche '%s'"

3042

2994 -#: builtin/branch.c:268

3043 +#: builtin/branch.c:266

3044 #, c-format

2996 -msgid "Deleted remote branch %s (was %s).\n"

2997 -msgstr "Branche distante %s supprimée (précédemment %s).\n"

3045 +msgid "Deleted remote-tracking branch %s (was %s).\n"

3046 +msgstr "Branche de suivi %s supprimée (précédemment %s).\n"

3047

2999 -#: builtin/branch.c:269

3048 +#: builtin/branch.c:267

3049 #, c-format

3050 msgid "Deleted branch %s (was %s).\n"

3051 msgstr "Branche %s supprimée (précédemment %s).\n"

3052

3004 -#: builtin/branch.c:370

3053 +#: builtin/branch.c:368

3054 #, c-format

3055 msgid "branch '%s' does not point at a commit"

3056 msgstr "la branche '%s' ne pointe pas sur un commit"

3057

3058 # féminin pour une branche

3010 -#: builtin/branch.c:459

3059 +#: builtin/branch.c:451

3060 #, c-format

3061 msgid "[%s: gone]"

3062 msgstr "[%s: disparue]"

3063

3015 -#: builtin/branch.c:464

3064 +#: builtin/branch.c:456

3065 #, c-format

3066 msgid "[%s]"

3067 msgstr "[%s]"

3068

3020 -#: builtin/branch.c:469

3069 +#: builtin/branch.c:461

3070 #, c-format

3071 msgid "[%s: behind %d]"

3072 msgstr "[%s: en retard de %d]"

3073

3025 -#: builtin/branch.c:471

3074 +#: builtin/branch.c:463

3075 #, c-format

3076 msgid "[behind %d]"

3077 msgstr "[en retard de %d]"

3078

3030 -#: builtin/branch.c:475

3079 +#: builtin/branch.c:467

3080 #, c-format

3081 msgid "[%s: ahead %d]"

3082 msgstr "[%s : en avance de %d]"

3083

3035 -#: builtin/branch.c:477

3084 +#: builtin/branch.c:469

3085 #, c-format

3086 msgid "[ahead %d]"

3087 msgstr "[en avance de %d]"

3088

3040 -#: builtin/branch.c:480

3089 +#: builtin/branch.c:472

3090 #, c-format

3091 msgid "[%s: ahead %d, behind %d]"

3092 msgstr "[%s : en avance de %d, en retard de %d]"

3093

3045 -#: builtin/branch.c:483

3094 +#: builtin/branch.c:475

3095 #, c-format

3096 msgid "[ahead %d, behind %d]"

3097 msgstr "[en avance de %d, en retard de %d]"

3098

3050 -#: builtin/branch.c:496

3099 +#: builtin/branch.c:488

3100 msgid " **** invalid ref ****"

3101 msgstr " **** référence invalide ****"

3102

3054 -#: builtin/branch.c:587

3103 +#: builtin/branch.c:579

3104 #, c-format

3105 msgid "(no branch, rebasing %s)"

3106 msgstr "(aucune branche, rebasage de %s)"

3107

3059 -#: builtin/branch.c:590

3108 +#: builtin/branch.c:582

3109 #, c-format

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

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

3112

3064 -#: builtin/branch.c:596

3113 +#: builtin/branch.c:588

3114 #, c-format

3115 msgid "(HEAD detached at %s)"

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

3117

3069 -#: builtin/branch.c:599

3118 +#: builtin/branch.c:591

3119 #, c-format

3120 msgid "(HEAD detached from %s)"

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

3122

3074 -#: builtin/branch.c:603

3123 +#: builtin/branch.c:595

3124 msgid "(no branch)"

3125 msgstr "(aucune branche)"

3126

3078 -#: builtin/branch.c:650

3127 +#: builtin/branch.c:642

3128 #, c-format

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

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

3131

3083 -#: builtin/branch.c:698

3132 +#: builtin/branch.c:690

3133 msgid "some refs could not be read"

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

3135

3087 -#: builtin/branch.c:711

3136 +#: builtin/branch.c:703

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

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

3139

3091 -#: builtin/branch.c:721

3140 +#: builtin/branch.c:713

3141 #, c-format

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

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

3144

3096 -#: builtin/branch.c:736

3145 +#: builtin/branch.c:728

3146 msgid "Branch rename failed"

3147 msgstr "Échec de renommage de la branche"

3148

3100 -#: builtin/branch.c:740

3149 +#: builtin/branch.c:732

3150 #, c-format

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

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

3153

3105 -#: builtin/branch.c:744

3154 +#: builtin/branch.c:736

3155 #, c-format

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

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

3158

3110 -#: builtin/branch.c:751

3159 +#: builtin/branch.c:743

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

3161 msgstr ""

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

3163 "échoué"

3164

3116 -#: builtin/branch.c:766

3165 +#: builtin/branch.c:758

3166 #, c-format

3167 msgid "malformed object name %s"

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

3169

3121 -#: builtin/branch.c:790

3170 +#: builtin/branch.c:780

3171 #, c-format

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

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

3174

3126 -#: builtin/branch.c:820

3175 +#: builtin/branch.c:810

3176 msgid "Generic options"

3177 msgstr "Options génériques"

3178

3130 -#: builtin/branch.c:822

3179 +#: builtin/branch.c:812

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

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

3182

3134 -#: builtin/branch.c:823

3183 +#: builtin/branch.c:813

3184 msgid "suppress informational messages"

3185 msgstr "supprimer les messages d'information"

3186

3138 -#: builtin/branch.c:824

3187 +#: builtin/branch.c:814

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

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

3190

3142 -#: builtin/branch.c:826

3191 +#: builtin/branch.c:816

3192 msgid "change upstream info"

3193 msgstr "modifier l'information amont"

3194

3146 -#: builtin/branch.c:830

3195 +#: builtin/branch.c:820

3196 msgid "use colored output"

3197 msgstr "utiliser la coloration dans la sortie"

3198

3150 -#: builtin/branch.c:831

3199 +#: builtin/branch.c:821

3200 msgid "act on remote-tracking branches"

3201 msgstr "agir sur les branches de suivi distantes"

3202

3154 -#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

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

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

3203 +#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3204 +#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3205 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3206 #: builtin/tag.c:622

3207 msgid "commit"

3208 msgstr "commit"

3209

3161 -#: builtin/branch.c:835 builtin/branch.c:841

3210 +#: builtin/branch.c:825 builtin/branch.c:831

3211 msgid "print only branches that contain the commit"

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

3213

3165 -#: builtin/branch.c:847

3214 +#: builtin/branch.c:837

3215 msgid "Specific git-branch actions:"

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

3217

3169 -#: builtin/branch.c:848

3218 +#: builtin/branch.c:838

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

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

3221

3173 -#: builtin/branch.c:850

3222 +#: builtin/branch.c:840

3223 msgid "delete fully merged branch"

3224 msgstr "supprimer une branche totalement fusionnée"

3225

3177 -#: builtin/branch.c:851

3226 +#: builtin/branch.c:841

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

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

3229

3181 -#: builtin/branch.c:852

3230 +#: builtin/branch.c:842

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

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

3233

3185 -#: builtin/branch.c:853

3234 +#: builtin/branch.c:843

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

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

3237

3189 -#: builtin/branch.c:854

3238 +#: builtin/branch.c:844

3239 msgid "list branch names"

3240 msgstr "afficher les noms des branches"

3241

3193 -#: builtin/branch.c:855

3242 +#: builtin/branch.c:845

3243 msgid "create the branch's reflog"

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

3245

3197 -#: builtin/branch.c:857

3246 +#: builtin/branch.c:847

3247 msgid "edit the description for the branch"

3248 msgstr "éditer la description de la branche"

3249

3201 -#: builtin/branch.c:858

3250 +#: builtin/branch.c:848

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

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

3253

3205 -#: builtin/branch.c:861

3254 +#: builtin/branch.c:851

3255 msgid "print only not merged branches"

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

3257

3209 -#: builtin/branch.c:867

3258 +#: builtin/branch.c:857

3259 msgid "print only merged branches"

3260 msgstr "afficher seulement les branches fusionnées"

3261

3213 -#: builtin/branch.c:871

3262 +#: builtin/branch.c:861

3263 msgid "list branches in columns"

3264 msgstr "afficher les branches en colonnes"

3265

3217 -#: builtin/branch.c:884

3266 +#: builtin/branch.c:874

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

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

3269

3221 -#: builtin/branch.c:888 builtin/clone.c:637

3270 +#: builtin/branch.c:878 builtin/clone.c:629

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

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

3273

3225 -#: builtin/branch.c:910

3274 +#: builtin/branch.c:900

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

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

3277

3229 -#: builtin/branch.c:921 builtin/branch.c:960

3278 +#: builtin/branch.c:911 builtin/branch.c:950

3279 msgid "branch name required"

3280 msgstr "le nom de branche est requis"

3281

3233 -#: builtin/branch.c:936

3282 +#: builtin/branch.c:926

3283 msgid "Cannot give description to detached HEAD"

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

3285

3237 -#: builtin/branch.c:941

3286 +#: builtin/branch.c:931

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

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

3289

3241 -#: builtin/branch.c:948

3290 +#: builtin/branch.c:938

3291 #, c-format

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

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

3294

3246 -#: builtin/branch.c:951

3295 +#: builtin/branch.c:941

3296 #, c-format

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

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

3299

3251 -#: builtin/branch.c:966

3300 +#: builtin/branch.c:956

3301 msgid "too many branches for a rename operation"

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

3303

3255 -#: builtin/branch.c:971

3304 +#: builtin/branch.c:961

3305 msgid "too many branches to set new upstream"

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

3307

3259 -#: builtin/branch.c:975

3308 +#: builtin/branch.c:965

3309 #, c-format

3310 msgid ""

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

@@ -3264,41 +3313,41 @@ msgstr ""

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

3314 "aucune branche."

3315

3267 -#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3316 +#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3317 #, c-format

3318 msgid "no such branch '%s'"

3319 msgstr "pas de branche '%s'"

3320

3272 -#: builtin/branch.c:982

3321 +#: builtin/branch.c:972

3322 #, c-format

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

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

3325

3277 -#: builtin/branch.c:994

3326 +#: builtin/branch.c:984

3327 msgid "too many branches to unset upstream"

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

3329

3281 -#: builtin/branch.c:998

3330 +#: builtin/branch.c:988

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

3332 msgstr ""

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

3334 "aucune branche."

3335

3287 -#: builtin/branch.c:1004

3336 +#: builtin/branch.c:994

3337 #, c-format

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

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

3340

3292 -#: builtin/branch.c:1018

3341 +#: builtin/branch.c:1008

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

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

3344

3296 -#: builtin/branch.c:1024

3345 +#: builtin/branch.c:1014

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

3347 msgstr ""

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

3349

3301 -#: builtin/branch.c:1027

3350 +#: builtin/branch.c:1017

3351 #, c-format

3352 msgid ""

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

@@ -3307,7 +3356,7 @@ msgstr ""

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

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

3358

3310 -#: builtin/branch.c:1044

3359 +#: builtin/branch.c:1034

3360 #, c-format

3361 msgid ""

3362 "\n"

@@ -3318,70 +3367,82 @@ msgstr ""

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

3368 "\n"

3369

3321 -#: builtin/branch.c:1045

3370 +#: builtin/branch.c:1035

3371 #, c-format

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

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

3374

3326 -#: builtin/branch.c:1046

3375 +#: builtin/branch.c:1036

3376 #, c-format

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

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

3379

3331 -#: builtin/bundle.c:47

3380 +#: builtin/bundle.c:51

3381 #, c-format

3382 msgid "%s is okay\n"

3383 msgstr "%s est correct\n"

3384

3336 -#: builtin/bundle.c:56

3385 +#: builtin/bundle.c:64

3386 msgid "Need a repository to create a bundle."

3387 msgstr "La création d'un colis requiert un dépôt."

3388

3340 -#: builtin/bundle.c:60

3389 +#: builtin/bundle.c:68

3390 msgid "Need a repository to unbundle."

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

3392

3344 -#: builtin/cat-file.c:326

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

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

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

3394 +msgid ""

3395 +"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3396 +"<type>|--textconv) <object>"

3398

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

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

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

3399 +#: builtin/cat-file.c:370

3400 +msgid ""

3401 +"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3402 +"objects>"

3403 +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>"

3404

3352 -#: builtin/cat-file.c:364

3405 +#: builtin/cat-file.c:407

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

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

3408

3356 -#: builtin/cat-file.c:365

3409 +#: builtin/cat-file.c:408

3410 msgid "show object type"

3411 msgstr "afficher le type de l'objet"

3412

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

3413 +#: builtin/cat-file.c:409

3414 msgid "show object size"

3415 msgstr "afficher la taille de l'objet"

3416

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

3417 +#: builtin/cat-file.c:411

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

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

3420

3368 -#: builtin/cat-file.c:369

3421 +#: builtin/cat-file.c:412

3422 msgid "pretty-print object's content"

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

3424

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

3425 +#: builtin/cat-file.c:414

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

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

3428

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

3429 +#: builtin/cat-file.c:416

3430 +msgid "allow -s and -t to work with broken/corrupt objects"

3431 +msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"

3432 +

3433 +#: builtin/cat-file.c:418

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

3435 msgstr ""

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

3437

3381 -#: builtin/cat-file.c:376

3438 +#: builtin/cat-file.c:421

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

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

3441

3442 +#: builtin/cat-file.c:424

3443 +msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3444 +msgstr "suivre les liens symbolique internes à la copie de travail (utilisé avec --batch ou --batch-check)"

3445 +

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

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

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

@@ -3399,7 +3460,7 @@ msgstr "afficher tous les attributs associés au fichier"

3460 msgid "use .gitattributes only from the index"

3461 msgstr "utiliser .gitattributes seulement depuis l'index"

3462

3402 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3463 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96

3464 msgid "read file names from stdin"

3465 msgstr "lire les noms de fichier depuis l'entrée standard"

3466

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

3469 msgstr ""

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

3471

3411 -#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3472 +#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3473 msgid "suppress progress reporting"

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

3475

@@ -3507,115 +3568,115 @@ msgstr "lors de la création de fichiers, préfixer par <chaîne>"

3568 msgid "copy out the files from named stage"

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

3570

3510 -#: builtin/checkout.c:25

3571 +#: builtin/checkout.c:26

3572 msgid "git checkout [<options>] <branch>"

3573 msgstr "git checkout [<options>] <branche>"

3574

3514 -#: builtin/checkout.c:26

3575 +#: builtin/checkout.c:27

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

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

3578

3518 -#: builtin/checkout.c:132 builtin/checkout.c:165

3579 +#: builtin/checkout.c:138 builtin/checkout.c:171

3580 #, c-format

3581 msgid "path '%s' does not have our version"

3582 msgstr "le chemin '%s' n'a pas notre version"

3583

3523 -#: builtin/checkout.c:134 builtin/checkout.c:167

3584 +#: builtin/checkout.c:140 builtin/checkout.c:173

3585 #, c-format

3586 msgid "path '%s' does not have their version"

3587 msgstr "le chemin '%s' n'a pas leur version"

3588

3528 -#: builtin/checkout.c:150

3589 +#: builtin/checkout.c:156

3590 #, c-format

3591 msgid "path '%s' does not have all necessary versions"

3592 msgstr "le chemin '%s' n'a aucune des versions nécessaires"

3593

3533 -#: builtin/checkout.c:194

3594 +#: builtin/checkout.c:200

3595 #, c-format

3596 msgid "path '%s' does not have necessary versions"

3597 msgstr "le chemin '%s' n'a pas les versions nécessaires"

3598

3538 -#: builtin/checkout.c:211

3599 +#: builtin/checkout.c:217

3600 #, c-format

3601 msgid "path '%s': cannot merge"

3602 msgstr "chemin '%s' : impossible de fusionner"

3603

3543 -#: builtin/checkout.c:228

3604 +#: builtin/checkout.c:234

3605 #, c-format

3606 msgid "Unable to add merge result for '%s'"

3607 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

3608

3548 -#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3549 -#: builtin/checkout.c:258

3609 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3610 +#: builtin/checkout.c:264 builtin/checkout.c:277

3611 #, c-format

3612 msgid "'%s' cannot be used with updating paths"

3613 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

3614

3554 -#: builtin/checkout.c:261 builtin/checkout.c:264

3615 +#: builtin/checkout.c:267 builtin/checkout.c:270

3616 #, c-format

3617 msgid "'%s' cannot be used with %s"

3618 msgstr "'%s' ne peut pas être utilisé avec %s"

3619

3559 -#: builtin/checkout.c:267

3620 +#: builtin/checkout.c:273

3621 #, c-format

3622 msgid "Cannot update paths and switch to branch '%s' at the same time."

3623 msgstr ""

3624 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

3625 "même temps."

3626

3566 -#: builtin/checkout.c:278 builtin/checkout.c:467

3627 +#: builtin/checkout.c:287 builtin/checkout.c:481

3628 msgid "corrupt index file"

3629 msgstr "fichier d'index corrompu"

3630

3570 -#: builtin/checkout.c:338 builtin/checkout.c:345

3631 +#: builtin/checkout.c:347 builtin/checkout.c:354

3632 #, c-format

3633 msgid "path '%s' is unmerged"

3634 msgstr "le chemin '%s' n'est pas fusionné"

3635

3575 -#: builtin/checkout.c:489

3636 +#: builtin/checkout.c:503

3637 msgid "you need to resolve your current index first"

3638 msgstr "vous devez d'abord résoudre votre index courant"

3639

3579 -#: builtin/checkout.c:615

3640 +#: builtin/checkout.c:634

3641 #, c-format

3642 msgid "Can not do reflog for '%s'\n"

3643 msgstr "Impossible de faire un reflog pour '%s'\n"

3644

3584 -#: builtin/checkout.c:653

3645 +#: builtin/checkout.c:670

3646 msgid "HEAD is now at"

3647 msgstr "HEAD est maintenant sur"

3648

3588 -#: builtin/checkout.c:660

3649 +#: builtin/checkout.c:677

3650 #, c-format

3651 msgid "Reset branch '%s'\n"

3652 msgstr "Remise à zéro de la branche '%s'\n"

3653

3593 -#: builtin/checkout.c:663

3654 +#: builtin/checkout.c:680

3655 #, c-format

3656 msgid "Already on '%s'\n"

3657 msgstr "Déjà sur '%s'\n"

3658

3598 -#: builtin/checkout.c:667

3659 +#: builtin/checkout.c:684

3660 #, c-format

3661 msgid "Switched to and reset branch '%s'\n"

3662 msgstr "Basculement et remise à zéro de la branche '%s'\n"

3663

3603 -#: builtin/checkout.c:669 builtin/checkout.c:1050

3664 +#: builtin/checkout.c:686 builtin/checkout.c:1285

3665 #, c-format

3666 msgid "Switched to a new branch '%s'\n"

3667 msgstr "Basculement sur la nouvelle branche '%s'\n"

3668

3608 -#: builtin/checkout.c:671

3669 +#: builtin/checkout.c:688

3670 #, c-format

3671 msgid "Switched to branch '%s'\n"

3672 msgstr "Basculement sur la branche '%s'\n"

3673

3613 -#: builtin/checkout.c:723

3674 +#: builtin/checkout.c:740

3675 #, c-format

3676 msgid " ... and %d more.\n"

3677 msgstr " ... et %d en plus.\n"

3678

3618 -#: builtin/checkout.c:729

3679 +#: builtin/checkout.c:746

3680 #, c-format

3681 msgid ""

3682 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3638,155 +3699,204 @@ msgstr[1] ""

3699 "\n"

3700 "%s\n"

3701

3641 -#: builtin/checkout.c:747

3702 +#: builtin/checkout.c:765

3703 #, c-format

3704 msgid ""

3705 +"If you want to keep it by creating a new branch, this may be a good time\n"

3706 +"to do so with:\n"

3707 +"\n"

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

3709 +"\n"

3710 +msgid_plural ""

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

3712 "to do so with:\n"

3713 "\n"

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

3715 "\n"

3649 -msgstr ""

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

3651 -"moment\n"

3716 +msgstr[0] ""

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

3718 +"pour le faire avec :\n"

3719 +"\n"

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

3721 +"\n"

3722 +msgstr[1] ""

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

3724 "pour le faire avec :\n"

3725 "\n"

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

3727 "\n"

3728

3657 -#: builtin/checkout.c:777

3729 +#: builtin/checkout.c:801

3730 msgid "internal error in revision walk"

3731 msgstr "erreur interne lors du parcours des révisions"

3732

3661 -#: builtin/checkout.c:781

3733 +#: builtin/checkout.c:805

3734 msgid "Previous HEAD position was"

3735 msgstr "La position précédente de HEAD était sur"

3736

3665 -#: builtin/checkout.c:808 builtin/checkout.c:1045

3737 +#: builtin/checkout.c:832 builtin/checkout.c:1280

3738 msgid "You are on a branch yet to be born"

3739 msgstr "Vous êtes sur une branche qui doit encore naître"

3740

3669 -#: builtin/checkout.c:952

3741 +#: builtin/checkout.c:893

3742 +msgid "no branch specified"

3743 +msgstr "aucune branche spécifiée"

3744 +

3745 +#: builtin/checkout.c:895

3746 +#, c-format

3747 +msgid "'%s' already exists"

3748 +msgstr "'%s' existe déjà"

3749 +

3750 +#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3751 +#: builtin/clone.c:853

3752 +#, c-format

3753 +msgid "could not create leading directories of '%s'"

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

3755 +

3756 +#: builtin/checkout.c:924

3757 +#, c-format

3758 +msgid "could not create directory of '%s'"

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

3760 +

3761 +#: builtin/checkout.c:960

3762 +#, c-format

3763 +msgid "Enter %s (identifier %s)"

3764 +msgstr "Saisir %s (identifiant %s)"

3765 +

3766 +#: builtin/checkout.c:1070

3767 +#, c-format

3768 +msgid "'%s' is already checked out at '%s'"

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

3770 +

3771 +#: builtin/checkout.c:1176

3772 #, c-format

3773 msgid "only one reference expected, %d given."

3774 msgstr "une seule référence attendue, %d fournies."

3775

3674 -#: builtin/checkout.c:991

3776 +#: builtin/checkout.c:1215

3777 #, c-format

3778 msgid "invalid reference: %s"

3779 msgstr "référence invalide : %s"

3780

3679 -#: builtin/checkout.c:1020

3781 +#: builtin/checkout.c:1255

3782 #, c-format

3783 msgid "reference is not a tree: %s"

3784 msgstr "la référence n'est pas un arbre : %s"

3785

3684 -#: builtin/checkout.c:1059

3786 +#: builtin/checkout.c:1294

3787 msgid "paths cannot be used with switching branches"

3788 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

3789

3688 -#: builtin/checkout.c:1062 builtin/checkout.c:1066

3790 +#: builtin/checkout.c:1297 builtin/checkout.c:1301

3791 #, c-format

3792 msgid "'%s' cannot be used with switching branches"

3793 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

3794

3693 -#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3694 -#: builtin/checkout.c:1081

3795 +#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3796 +#: builtin/checkout.c:1316

3797 #, c-format

3798 msgid "'%s' cannot be used with '%s'"

3799 msgstr "'%s' ne peut pas être utilisé avec '%s'"

3800

3699 -#: builtin/checkout.c:1086

3801 +#: builtin/checkout.c:1321

3802 #, c-format

3803 msgid "Cannot switch branch to a non-commit '%s'"

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

3805

3704 -#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3806 +#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3807 #: builtin/remote.c:159 builtin/remote.c:161

3808 msgid "branch"

3809 msgstr "branche"

3810

3709 -#: builtin/checkout.c:1109

3811 +#: builtin/checkout.c:1347

3812 msgid "create and checkout a new branch"

3813 msgstr "créer et extraire une nouvelle branche"

3814

3713 -#: builtin/checkout.c:1111

3815 +#: builtin/checkout.c:1349

3816 msgid "create/reset and checkout a branch"

3817 msgstr "créer/réinitialiser et extraire une branche"

3818

3717 -#: builtin/checkout.c:1112

3819 +#: builtin/checkout.c:1350

3820 msgid "create reflog for new branch"

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

3822

3721 -#: builtin/checkout.c:1113

3823 +#: builtin/checkout.c:1351

3824 msgid "detach the HEAD at named commit"

3825 msgstr "détacher la HEAD à la validation nommée"

3826

3725 -#: builtin/checkout.c:1114

3827 +#: builtin/checkout.c:1352

3828 msgid "set upstream info for new branch"

3829 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

3830

3729 -#: builtin/checkout.c:1116

3831 +#: builtin/checkout.c:1354

3832 msgid "new-branch"

3833 msgstr "nouvelle branche"

3834

3733 -#: builtin/checkout.c:1116

3835 +#: builtin/checkout.c:1354

3836 msgid "new unparented branch"

3837 msgstr "nouvelle branche sans parent"

3838

3737 -#: builtin/checkout.c:1117

3839 +#: builtin/checkout.c:1355

3840 msgid "checkout our version for unmerged files"

3841 msgstr "extraire notre version pour les fichiers non fusionnés"

3842

3741 -#: builtin/checkout.c:1119

3843 +#: builtin/checkout.c:1357

3844 msgid "checkout their version for unmerged files"

3845 msgstr "extraire leur version pour les fichiers non fusionnés"

3846

3745 -#: builtin/checkout.c:1121

3847 +#: builtin/checkout.c:1359

3848 msgid "force checkout (throw away local modifications)"

3849 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

3850

3749 -#: builtin/checkout.c:1122

3851 +#: builtin/checkout.c:1360

3852 msgid "perform a 3-way merge with the new branch"

3853 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

3854

3753 -#: builtin/checkout.c:1123 builtin/merge.c:227

3855 +#: builtin/checkout.c:1361 builtin/merge.c:227

3856 msgid "update ignored files (default)"

3857 msgstr "mettre à jour les fichiers ignorés (par défaut)"

3858

3757 -#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3859 +#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3860 msgid "style"

3861 msgstr "style"

3862

3761 -#: builtin/checkout.c:1125

3863 +#: builtin/checkout.c:1363

3864 msgid "conflict style (merge or diff3)"

3865 msgstr "style de conflit (fusion ou diff3)"

3866

3765 -#: builtin/checkout.c:1128

3867 +#: builtin/checkout.c:1366

3868 msgid "do not limit pathspecs to sparse entries only"

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

3870

3769 -#: builtin/checkout.c:1130

3871 +#: builtin/checkout.c:1368

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

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

3874

3773 -#: builtin/checkout.c:1153

3875 +#: builtin/checkout.c:1370

3876 +msgid "check a branch out in a separate working directory"

3877 +msgstr "extraire une branche dans un répertoire de travail séparé"

3878 +

3879 +#: builtin/checkout.c:1372

3880 +msgid "do not check if another worktree is holding the given ref"

3881 +msgstr "ne pas vérifier si une autre copie de travail contient le référence fournie"

3882 +

3883 +#: builtin/checkout.c:1406

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

3885 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3886

3777 -#: builtin/checkout.c:1170

3887 +#: builtin/checkout.c:1423

3888 msgid "--track needs a branch name"

3889 msgstr "--track requiert un nom de branche"

3890

3781 -#: builtin/checkout.c:1175

3891 +#: builtin/checkout.c:1428

3892 msgid "Missing branch name; try -b"

3893 msgstr "Nom de branche manquant ; essayez -b"

3894

3785 -#: builtin/checkout.c:1212

3895 +#: builtin/checkout.c:1464

3896 msgid "invalid path specification"

3897 msgstr "spécification de chemin invalide"

3898

3789 -#: builtin/checkout.c:1219

3899 +#: builtin/checkout.c:1471

3900 #, c-format

3901 msgid ""

3902 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3796,12 +3906,12 @@ msgstr ""

3906 "en même temps.\n"

3907 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3908

3799 -#: builtin/checkout.c:1224

3909 +#: builtin/checkout.c:1476

3910 #, c-format

3911 msgid "git checkout: --detach does not take a path argument '%s'"

3912 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3913

3804 -#: builtin/checkout.c:1228

3914 +#: builtin/checkout.c:1480

3915 msgid ""

3916 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3917 "checking out of the index."

@@ -3872,36 +3982,36 @@ msgstr ""

3982 "* - choisir tous les éléments\n"

3983 " - (vide) terminer la sélection"

3984

3875 -#: builtin/clean.c:517

3985 +#: builtin/clean.c:515

3986 #, c-format

3987 msgid "Huh (%s)?"

3988 msgstr "Hein (%s) ?"

3989

3880 -#: builtin/clean.c:659

3990 +#: builtin/clean.c:657

3991 #, c-format

3992 msgid "Input ignore patterns>> "

3993 msgstr "Entrez les motifs à ignorer>> "

3994

3885 -#: builtin/clean.c:696

3995 +#: builtin/clean.c:694

3996 #, c-format

3997 msgid "WARNING: Cannot find items matched by: %s"

3998 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"

3999

3890 -#: builtin/clean.c:717

4000 +#: builtin/clean.c:715

4001 msgid "Select items to delete"

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

4003

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

3895 -#: builtin/clean.c:758

4005 +#: builtin/clean.c:756

4006 #, c-format

4007 msgid "Remove %s [y/N]? "

4008 msgstr "Supprimer %s [y/N] ? "

4009

3900 -#: builtin/clean.c:783

4010 +#: builtin/clean.c:781

4011 msgid "Bye."

4012 msgstr "Au revoir."

4013

3904 -#: builtin/clean.c:791

4014 +#: builtin/clean.c:789

4015 msgid ""

4016 "clean - start cleaning\n"

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

@@ -3919,62 +4029,62 @@ msgstr ""

4029 "help - cet écran\n"

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

4031

3922 -#: builtin/clean.c:818

4032 +#: builtin/clean.c:816

4033 msgid "*** Commands ***"

4034 msgstr "*** Commandes ***"

4035

3926 -#: builtin/clean.c:819

4036 +#: builtin/clean.c:817

4037 msgid "What now"

4038 msgstr "Et maintenant ?"

4039

3930 -#: builtin/clean.c:827

4040 +#: builtin/clean.c:825

4041 msgid "Would remove the following item:"

4042 msgid_plural "Would remove the following items:"

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

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

4045

3936 -#: builtin/clean.c:844

4046 +#: builtin/clean.c:842

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

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

4049

3940 -#: builtin/clean.c:875

4050 +#: builtin/clean.c:873

4051 msgid "do not print names of files removed"

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

4053

3944 -#: builtin/clean.c:877

4054 +#: builtin/clean.c:875

4055 msgid "force"

4056 msgstr "forcer"

4057

3948 -#: builtin/clean.c:878

4058 +#: builtin/clean.c:876

4059 msgid "interactive cleaning"

4060 msgstr "nettoyage interactif"

4061

3952 -#: builtin/clean.c:880

4062 +#: builtin/clean.c:878

4063 msgid "remove whole directories"

4064 msgstr "supprimer les répertoires entiers"

4065

3956 -#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

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

4066 +#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

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

4068 msgid "pattern"

4069 msgstr "motif"

4070

3961 -#: builtin/clean.c:882

4071 +#: builtin/clean.c:880

4072 msgid "add <pattern> to ignore rules"

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

4074

3965 -#: builtin/clean.c:883

4075 +#: builtin/clean.c:881

4076 msgid "remove ignored files, too"

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

4078

3969 -#: builtin/clean.c:885

4079 +#: builtin/clean.c:883

4080 msgid "remove only ignored files"

4081 msgstr "supprimer seulement les fichiers ignorés"

4082

3973 -#: builtin/clean.c:903

4083 +#: builtin/clean.c:901

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

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

4086

3977 -#: builtin/clean.c:907

4087 +#: builtin/clean.c:905

4088 msgid ""

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

4090 "clean"

@@ -3982,7 +4092,7 @@ msgstr ""

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

4093 "nettoyer"

4094

3985 -#: builtin/clean.c:910

4095 +#: builtin/clean.c:908

4096 msgid ""

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

4098 "refusing to clean"

@@ -3994,150 +4104,150 @@ msgstr ""

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

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

4106

3997 -#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

4107 +#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

4108 #: builtin/push.c:523

4109 msgid "force progress reporting"

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

4111

4002 -#: builtin/clone.c:68

4112 +#: builtin/clone.c:59

4113 msgid "don't create a checkout"

4114 msgstr "ne pas créer d'extraction"

4115

4006 -#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

4116 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4117 msgid "create a bare repository"

4118 msgstr "créer un dépôt nu"

4119

4010 -#: builtin/clone.c:73

4120 +#: builtin/clone.c:64

4121 msgid "create a mirror repository (implies bare)"

4122 msgstr "créer un dépôt miroir (implique dépôt nu)"

4123

4014 -#: builtin/clone.c:75

4124 +#: builtin/clone.c:66

4125 msgid "to clone from a local repository"

4126 msgstr "pour cloner depuis un dépôt local"

4127

4018 -#: builtin/clone.c:77

4128 +#: builtin/clone.c:68

4129 msgid "don't use local hardlinks, always copy"

4130 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

4131

4022 -#: builtin/clone.c:79

4132 +#: builtin/clone.c:70

4133 msgid "setup as shared repository"

4134 msgstr "régler comme dépôt partagé"

4135

4026 -#: builtin/clone.c:81 builtin/clone.c:83

4136 +#: builtin/clone.c:72 builtin/clone.c:74

4137 msgid "initialize submodules in the clone"

4138 msgstr "initialiser les sous-modules dans le clone"

4139

4030 -#: builtin/clone.c:84 builtin/init-db.c:493

4140 +#: builtin/clone.c:75 builtin/init-db.c:500

4141 msgid "template-directory"

4142 msgstr "répertoire-modèle"

4143

4034 -#: builtin/clone.c:85 builtin/init-db.c:494

4144 +#: builtin/clone.c:76 builtin/init-db.c:501

4145 msgid "directory from which templates will be used"

4146 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4147

4038 -#: builtin/clone.c:87

4148 +#: builtin/clone.c:78

4149 msgid "reference repository"

4150 msgstr "dépôt de référence"

4151

4042 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

4152 +#: builtin/clone.c:80

4153 +msgid "use --reference only while cloning"

4154 +msgstr "utiliser seulement --reference pour cloner"

4155 +

4156 +#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44

4157 msgid "name"

4158 msgstr "nom"

4159

4046 -#: builtin/clone.c:89

4160 +#: builtin/clone.c:82

4161 msgid "use <name> instead of 'origin' to track upstream"

4162 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

4163

4050 -#: builtin/clone.c:91

4164 +#: builtin/clone.c:84

4165 msgid "checkout <branch> instead of the remote's HEAD"

4166 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4167

4054 -#: builtin/clone.c:93

4168 +#: builtin/clone.c:86

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

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

4171

4058 -#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

4172 +#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4173 msgid "depth"

4174 msgstr "profondeur"

4175

4062 -#: builtin/clone.c:95

4176 +#: builtin/clone.c:88

4177 msgid "create a shallow clone of that depth"

4178 msgstr "créer un clone superficiel de cette profondeur"

4179

4066 -#: builtin/clone.c:97

4180 +#: builtin/clone.c:90

4181 msgid "clone only one branch, HEAD or --branch"

4182 msgstr "cloner seulement une branche, HEAD ou --branch"

4183

4070 -#: builtin/clone.c:99

4071 -msgid "use --reference only while cloning"

4072 -msgstr "utiliser seulement --reference pour cloner"

4073 -

4074 -#: builtin/clone.c:100 builtin/init-db.c:502

4184 +#: builtin/clone.c:91 builtin/init-db.c:509

4185 msgid "gitdir"

4186 msgstr "gitdir"

4187

4078 -#: builtin/clone.c:101 builtin/init-db.c:503

4188 +#: builtin/clone.c:92 builtin/init-db.c:510

4189 msgid "separate git dir from working tree"

4190 msgstr "séparer le répertoire git de la copie de travail"

4191

4082 -#: builtin/clone.c:102

4192 +#: builtin/clone.c:93

4193 msgid "key=value"

4194 msgstr "clé=valeur"

4195

4086 -#: builtin/clone.c:103

4196 +#: builtin/clone.c:94

4197 msgid "set config inside the new repository"

4198 msgstr "régler la configuration dans le nouveau dépôt"

4199

4090 -#: builtin/clone.c:256

4200 +#: builtin/clone.c:247

4201 #, c-format

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

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

4204

4095 -#: builtin/clone.c:260

4205 +#: builtin/clone.c:251

4206 #, c-format

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

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

4209

4100 -#: builtin/clone.c:263

4210 +#: builtin/clone.c:254

4211 #, c-format

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

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

4214

4105 -#: builtin/clone.c:325

4215 +#: builtin/clone.c:317

4216 #, c-format

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

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

4219

4110 -#: builtin/clone.c:327 builtin/diff.c:84

4220 +#: builtin/clone.c:319 builtin/diff.c:84

4221 #, c-format

4222 msgid "failed to stat '%s'"

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

4224

4115 -#: builtin/clone.c:329

4225 +#: builtin/clone.c:321

4226 #, c-format

4227 msgid "%s exists and is not a directory"

4228 msgstr "%s existe et n'est pas un répertoire"

4229

4120 -#: builtin/clone.c:343

4230 +#: builtin/clone.c:335

4231 #, c-format

4232 msgid "failed to stat %s\n"

4233 msgstr "échec du stat de %s\n"

4234

4125 -#: builtin/clone.c:365

4235 +#: builtin/clone.c:357

4236 #, c-format

4237 msgid "failed to create link '%s'"

4238 msgstr "échec de la création du lien '%s'"

4239

4130 -#: builtin/clone.c:369

4240 +#: builtin/clone.c:361

4241 #, c-format

4242 msgid "failed to copy file to '%s'"

4243 msgstr "échec de la copie vers '%s'"

4244

4135 -#: builtin/clone.c:392 builtin/clone.c:566

4245 +#: builtin/clone.c:384 builtin/clone.c:558

4246 #, c-format

4247 msgid "done.\n"

4248 msgstr "fait.\n"

4249

4140 -#: builtin/clone.c:404

4250 +#: builtin/clone.c:396

4251 msgid ""

4252 "Clone succeeded, but checkout failed.\n"

4253 "You can inspect what was checked out with 'git status'\n"

@@ -4147,124 +4257,119 @@ msgstr ""

4257 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4258 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4259

4150 -#: builtin/clone.c:481

4260 +#: builtin/clone.c:473

4261 #, c-format

4262 msgid "Could not find remote branch %s to clone."

4263 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4264

4155 -#: builtin/clone.c:561

4265 +#: builtin/clone.c:553

4266 #, c-format

4267 msgid "Checking connectivity... "

4268 msgstr "Vérification de la connectivité... "

4269

4160 -#: builtin/clone.c:564

4270 +#: builtin/clone.c:556

4271 msgid "remote did not send all necessary objects"

4272 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4273

4164 -#: builtin/clone.c:628

4274 +#: builtin/clone.c:620

4275 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4276 msgstr ""

4277 "la HEAD distante réfère à une référence non existante, impossible de "

4278 "l'extraire.\n"

4279

4170 -#: builtin/clone.c:659

4280 +#: builtin/clone.c:651

4281 msgid "unable to checkout working tree"

4282 msgstr "impossible d'extraire la copie de travail"

4283

4174 -#: builtin/clone.c:746

4284 +#: builtin/clone.c:738

4285 msgid "cannot repack to clean up"

4286 msgstr "impossible de remballer pour nettoyer"

4287

4178 -#: builtin/clone.c:748

4288 +#: builtin/clone.c:740

4289 msgid "cannot unlink temporary alternates file"

4290 msgstr "impossible de unlinker le fichier temporaire alternates"

4291

4182 -#: builtin/clone.c:778

4292 +#: builtin/clone.c:770

4293 msgid "Too many arguments."

4294 msgstr "Trop d'arguments."

4295

4186 -#: builtin/clone.c:782

4296 +#: builtin/clone.c:774

4297 msgid "You must specify a repository to clone."

4298 msgstr "Vous devez spécifier un dépôt à cloner."

4299

4190 -#: builtin/clone.c:793

4300 +#: builtin/clone.c:785

4301 #, c-format

4302 msgid "--bare and --origin %s options are incompatible."

4303 msgstr "les options --bare et --origin %s sont incompatibles."

4304

4195 -#: builtin/clone.c:796

4305 +#: builtin/clone.c:788

4306 msgid "--bare and --separate-git-dir are incompatible."

4307 msgstr "--bare et --separate-git-dir sont incompatibles."

4308

4199 -#: builtin/clone.c:809

4309 +#: builtin/clone.c:801

4310 #, c-format

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

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

4313

4204 -#: builtin/clone.c:815 builtin/fetch.c:1156

4314 +#: builtin/clone.c:807 builtin/fetch.c:1160

4315 #, c-format

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

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

4318

4209 -#: builtin/clone.c:825

4319 +#: builtin/clone.c:817

4320 #, c-format

4321 msgid "destination path '%s' already exists and is not an empty directory."

4322 msgstr ""

4323 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4324

4215 -#: builtin/clone.c:835

4325 +#: builtin/clone.c:827

4326 #, c-format

4327 msgid "working tree '%s' already exists."

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

4329

4220 -#: builtin/clone.c:850 builtin/clone.c:861

4221 -#, c-format

4222 -msgid "could not create leading directories of '%s'"

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

4224 -

4225 -#: builtin/clone.c:853

4330 +#: builtin/clone.c:845

4331 #, c-format

4332 msgid "could not create work tree dir '%s'"

4333 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

4334

4230 -#: builtin/clone.c:871

4335 +#: builtin/clone.c:863

4336 #, c-format

4337 msgid "Cloning into bare repository '%s'...\n"

4338 msgstr "Clonage dans le dépôt nu '%s'\n"

4339

4235 -#: builtin/clone.c:873

4340 +#: builtin/clone.c:865

4341 #, c-format

4342 msgid "Cloning into '%s'...\n"

4343 msgstr "Clonage dans '%s'...\n"

4344

4240 -#: builtin/clone.c:898

4345 +#: builtin/clone.c:890

4346 msgid "--dissociate given, but there is no --reference"

4347 msgstr "--dissociate est spécifié, mais --reference est absent"

4348

4244 -#: builtin/clone.c:913

4349 +#: builtin/clone.c:907

4350 msgid "--depth is ignored in local clones; use file:// instead."

4351 msgstr ""

4352 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4353

4249 -#: builtin/clone.c:916

4354 +#: builtin/clone.c:910

4355 msgid "source repository is shallow, ignoring --local"

4356 msgstr "le dépôt source est superficiel, option --local ignorée"

4357

4253 -#: builtin/clone.c:921

4358 +#: builtin/clone.c:915

4359 msgid "--local is ignored"

4360 msgstr "--local est ignoré"

4361

4257 -#: builtin/clone.c:925

4362 +#: builtin/clone.c:919

4363 #, c-format

4364 msgid "Don't know how to clone %s"

4365 msgstr "Je ne sais pas cloner %s"

4366

4262 -#: builtin/clone.c:976 builtin/clone.c:984

4367 +#: builtin/clone.c:968 builtin/clone.c:976

4368 #, c-format

4369 msgid "Remote branch %s not found in upstream %s"

4370 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4371

4267 -#: builtin/clone.c:987

4372 +#: builtin/clone.c:979

4373 msgid "You appear to have cloned an empty repository."

4374 msgstr "Vous semblez avoir cloné un dépôt vide."

4375

@@ -4505,7 +4610,7 @@ msgstr "impossible de lire MERGE_MSG"

4610 msgid "could not read SQUASH_MSG"

4611 msgstr "impossible de lire SQUASH_MSG"

4612

4508 -#: builtin/commit.c:738

4613 +#: builtin/commit.c:738 builtin/merge.c:1079

4614 #, c-format

4615 msgid "could not read '%s'"

4616 msgstr "impossible de lire '%s'"

@@ -4668,32 +4773,32 @@ msgstr "Mode de nettoyage invalide %s"

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

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

4775

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

4776 +#: builtin/commit.c:1324 builtin/commit.c:1603

4777 msgid "show status concisely"

4778 msgstr "afficher le statut avec concision"

4779

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

4780 +#: builtin/commit.c:1326 builtin/commit.c:1605

4781 msgid "show branch information"

4782 msgstr "afficher l'information de branche"

4783

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

4784 +#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4785 msgid "machine-readable output"

4786 msgstr "sortie pour traitement automatique"

4787

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

4788 +#: builtin/commit.c:1331 builtin/commit.c:1609

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

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

4791

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

4792 +#: builtin/commit.c:1334 builtin/commit.c:1612

4793 msgid "terminate entries with NUL"

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

4795

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

4796 +#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

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

4798 msgid "mode"

4799 msgstr "mode"

4800

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

4801 +#: builtin/commit.c:1337 builtin/commit.c:1615

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

4803 msgstr ""

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

@@ -4703,7 +4808,7 @@ msgstr ""

4808 msgid "show ignored files"

4809 msgstr "afficher les fichiers ignorés"

4810

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

4811 +#: builtin/commit.c:1341 parse-options.h:152

4812 msgid "when"

4813 msgstr "quand"

4814

@@ -4719,205 +4824,205 @@ msgstr ""

4824 msgid "list untracked files in columns"

4825 msgstr "afficher les fichiers non suivis en colonnes"

4826

4722 -#: builtin/commit.c:1431

4827 +#: builtin/commit.c:1430

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

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

4830

4726 -#: builtin/commit.c:1433

4831 +#: builtin/commit.c:1432

4832 msgid "could not parse newly created commit"

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

4834

4730 -#: builtin/commit.c:1478

4835 +#: builtin/commit.c:1477

4836 msgid "detached HEAD"

4837 msgstr "HEAD détachée"

4838

4734 -#: builtin/commit.c:1481

4839 +#: builtin/commit.c:1480

4840 msgid " (root-commit)"

4841 msgstr " (commit racine)"

4842

4738 -#: builtin/commit.c:1574

4843 +#: builtin/commit.c:1573

4844 msgid "suppress summary after successful commit"

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

4846

4742 -#: builtin/commit.c:1575

4847 +#: builtin/commit.c:1574

4848 msgid "show diff in commit message template"

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

4850

4746 -#: builtin/commit.c:1577

4851 +#: builtin/commit.c:1576

4852 msgid "Commit message options"

4853 msgstr "Options du message de validation"

4854

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

4855 +#: builtin/commit.c:1577 builtin/tag.c:601

4856 msgid "read message from file"

4857 msgstr "lire le message depuis un fichier"

4858

4754 -#: builtin/commit.c:1579

4859 +#: builtin/commit.c:1578

4860 msgid "author"

4861 msgstr "auteur"

4862

4758 -#: builtin/commit.c:1579

4863 +#: builtin/commit.c:1578

4864 msgid "override author for commit"

4865 msgstr "remplacer l'auteur pour la validation"

4866

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

4867 +#: builtin/commit.c:1579 builtin/gc.c:280

4868 msgid "date"

4869 msgstr "date"

4870

4766 -#: builtin/commit.c:1580

4871 +#: builtin/commit.c:1579

4872 msgid "override date for commit"

4873 msgstr "remplacer la date pour la validation"

4874

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

4875 +#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

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

4877 msgid "message"

4878 msgstr "message"

4879

4775 -#: builtin/commit.c:1581

4880 +#: builtin/commit.c:1580

4881 msgid "commit message"

4882 msgstr "message de validation"

4883

4779 -#: builtin/commit.c:1582

4884 +#: builtin/commit.c:1581

4885 msgid "reuse and edit message from specified commit"

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

4887

4783 -#: builtin/commit.c:1583

4888 +#: builtin/commit.c:1582

4889 msgid "reuse message from specified commit"

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

4891

4787 -#: builtin/commit.c:1584

4892 +#: builtin/commit.c:1583

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

4894 msgstr ""

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

4896

4792 -#: builtin/commit.c:1585

4897 +#: builtin/commit.c:1584

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

4899 msgstr ""

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

4901

4797 -#: builtin/commit.c:1586

4902 +#: builtin/commit.c:1585

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

4904 msgstr ""

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

4906

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

4907 +#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4908 msgid "add Signed-off-by:"

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

4910

4806 -#: builtin/commit.c:1588

4911 +#: builtin/commit.c:1587

4912 msgid "use specified template file"

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

4914

4810 -#: builtin/commit.c:1589

4915 +#: builtin/commit.c:1588

4916 msgid "force edit of commit"

4917 msgstr "forcer l'édition du commit"

4918

4814 -#: builtin/commit.c:1590

4919 +#: builtin/commit.c:1589

4920 msgid "default"

4921 msgstr "défaut"

4922

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

4923 +#: builtin/commit.c:1589 builtin/tag.c:604

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

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

4926

4822 -#: builtin/commit.c:1591

4927 +#: builtin/commit.c:1590

4928 msgid "include status in commit message template"

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

4930

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

4931 +#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4932 #: builtin/tag.c:605

4933 msgid "key-id"

4934 msgstr "id de clé"

4935

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

4936 +#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4937 msgid "GPG sign commit"

4938 msgstr "signer la validation avec GPG"

4939

4835 -#: builtin/commit.c:1596

4940 +#: builtin/commit.c:1595

4941 msgid "Commit contents options"

4942 msgstr "Valider les options des contenus"

4943

4839 -#: builtin/commit.c:1597

4944 +#: builtin/commit.c:1596

4945 msgid "commit all changed files"

4946 msgstr "valider tous les fichiers modifiés"

4947

4843 -#: builtin/commit.c:1598

4948 +#: builtin/commit.c:1597

4949 msgid "add specified files to index for commit"

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

4951

4847 -#: builtin/commit.c:1599

4952 +#: builtin/commit.c:1598

4953 msgid "interactively add files"

4954 msgstr "ajouter des fichiers en mode interactif"

4955

4851 -#: builtin/commit.c:1600

4956 +#: builtin/commit.c:1599

4957 msgid "interactively add changes"

4958 msgstr "ajouter les modifications en mode interactif"

4959

4855 -#: builtin/commit.c:1601

4960 +#: builtin/commit.c:1600

4961 msgid "commit only specified files"

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

4963

4859 -#: builtin/commit.c:1602

4964 +#: builtin/commit.c:1601

4965 msgid "bypass pre-commit hook"

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

4967

4863 -#: builtin/commit.c:1603

4968 +#: builtin/commit.c:1602

4969 msgid "show what would be committed"

4970 msgstr "afficher ce qui serait validé"

4971

4867 -#: builtin/commit.c:1614

4972 +#: builtin/commit.c:1613

4973 msgid "amend previous commit"

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

4975

4871 -#: builtin/commit.c:1615

4976 +#: builtin/commit.c:1614

4977 msgid "bypass post-rewrite hook"

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

4979

4875 -#: builtin/commit.c:1620

4980 +#: builtin/commit.c:1619

4981 msgid "ok to record an empty change"

4982 msgstr "accepter d'enregistrer une modification vide"

4983

4879 -#: builtin/commit.c:1622

4984 +#: builtin/commit.c:1621

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

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

4987

4883 -#: builtin/commit.c:1651

4988 +#: builtin/commit.c:1650

4989 msgid "could not parse HEAD commit"

4990 msgstr "impossible d'analyser le commit HEAD"

4991

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

4992 +#: builtin/commit.c:1689 builtin/merge.c:1076

4993 #, c-format

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

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

4996

4892 -#: builtin/commit.c:1697

4997 +#: builtin/commit.c:1696

4998 #, c-format

4999 msgid "Corrupt MERGE_HEAD file (%s)"

5000 msgstr "Fichier MERGE_HEAD corrompu (%s)"

5001

4897 -#: builtin/commit.c:1704

5002 +#: builtin/commit.c:1703

5003 msgid "could not read MERGE_MODE"

5004 msgstr "impossible de lire MERGE_MODE"

5005

4901 -#: builtin/commit.c:1723

5006 +#: builtin/commit.c:1722

5007 #, c-format

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

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

5010

4906 -#: builtin/commit.c:1734

5011 +#: builtin/commit.c:1733

5012 #, c-format

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

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

5015

4911 -#: builtin/commit.c:1739

5016 +#: builtin/commit.c:1738

5017 #, c-format

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

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

5020

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

5021 +#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

5022 msgid "failed to write commit object"

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

5024

4920 -#: builtin/commit.c:1787

5025 +#: builtin/commit.c:1786

5026 msgid ""

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

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

@@ -4969,7 +5074,7 @@ msgstr "obtenir la valeur : nom [regex-de-valeur]"

5074

5075 #: builtin/config.c:61

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

4972 -msgstr "obtenir toutes le valeurs : clé [regex-de-valeur]"

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

5078

5079 #: builtin/config.c:62

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

@@ -5060,18 +5165,18 @@ msgstr "impossible de lire la valeur de couleur par défaut"

5165 #, c-format

5166 msgid ""

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

5063 -"[core]\n"

5168 +"[user]\n"

5169 "# Please adapt and uncomment the following lines:\n"

5065 -"#\tuser = %s\n"

5170 +"#\tname = %s\n"

5171 "#\temail = %s\n"

5172 msgstr ""

5068 -"# Ceci est le fichier de configuration personnel.\n"

5069 -"[core]\n"

5173 +"# Ceci est le fichier de configuration personnel de Git.\n"

5174 +"[user]\n"

5175 "# Veuillez adapter et décommenter les lignes suivantes :\n"

5071 -"#\tuser = %s\n"

5176 +"#\tname = %s\n"

5177 "#\temail = %s\n"

5178

5074 -#: builtin/config.c:589

5179 +#: builtin/config.c:587

5180 #, c-format

5181 msgid "cannot create configuration file %s"

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

@@ -5406,82 +5511,82 @@ msgstr "correspondance de référence"

5511 msgid "specify fetch refmap"

5512 msgstr "spécifier une correspondance de référence pour la récupération"

5513

5409 -#: builtin/fetch.c:375

5514 +#: builtin/fetch.c:377

5515 msgid "Couldn't find remote ref HEAD"

5516 msgstr "impossible de trouver la référence HEAD distante"

5517

5413 -#: builtin/fetch.c:455

5518 +#: builtin/fetch.c:457

5519 #, c-format

5520 msgid "object %s not found"

5521 msgstr "objet %s non trouvé"

5522

5418 -#: builtin/fetch.c:460

5523 +#: builtin/fetch.c:462

5524 msgid "[up to date]"

5525 msgstr "[à jour]"

5526

5422 -#: builtin/fetch.c:474

5527 +#: builtin/fetch.c:476

5528 #, c-format

5529 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5530 msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)"

5531

5427 -#: builtin/fetch.c:475 builtin/fetch.c:561

5532 +#: builtin/fetch.c:477 builtin/fetch.c:563

5533 msgid "[rejected]"

5534 msgstr "[rejeté]"

5535

5431 -#: builtin/fetch.c:486

5536 +#: builtin/fetch.c:488

5537 msgid "[tag update]"

5538 msgstr "[mise à jour de l'étiquette]"

5539

5435 -#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5540 +#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5541 msgid " (unable to update local ref)"

5542 msgstr " (impossible de mettre à jour la référence locale)"

5543

5439 -#: builtin/fetch.c:506

5544 +#: builtin/fetch.c:508

5545 msgid "[new tag]"

5546 msgstr "[nouvelle étiquette]"

5547

5443 -#: builtin/fetch.c:509

5548 +#: builtin/fetch.c:511

5549 msgid "[new branch]"

5550 msgstr "[nouvelle branche]"

5551

5447 -#: builtin/fetch.c:512

5552 +#: builtin/fetch.c:514

5553 msgid "[new ref]"

5554 msgstr "[nouvelle référence]"

5555

5451 -#: builtin/fetch.c:557

5556 +#: builtin/fetch.c:559

5557 msgid "unable to update local ref"

5558 msgstr "impossible de mettre à jour la référence locale"

5559

5455 -#: builtin/fetch.c:557

5560 +#: builtin/fetch.c:559

5561 msgid "forced update"

5562 msgstr "mise à jour forcée"

5563

5459 -#: builtin/fetch.c:563

5564 +#: builtin/fetch.c:565

5565 msgid "(non-fast-forward)"

5566 msgstr "(pas d'avance rapide)"

5567

5463 -#: builtin/fetch.c:596 builtin/fetch.c:829

5568 +#: builtin/fetch.c:599 builtin/fetch.c:832

5569 #, c-format

5570 msgid "cannot open %s: %s\n"

5571 msgstr "impossible d'ouvrir %s : %s\n"

5572

5468 -#: builtin/fetch.c:605

5573 +#: builtin/fetch.c:608

5574 #, c-format

5575 msgid "%s did not send all necessary objects\n"

5576 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"

5577

5473 -#: builtin/fetch.c:623

5578 +#: builtin/fetch.c:626

5579 #, c-format

5580 msgid "reject %s because shallow roots are not allowed to be updated"

5581 msgstr ""

5582 "%s rejeté parce que les racines superficielles ne sont pas mises à jour"

5583

5479 -#: builtin/fetch.c:711 builtin/fetch.c:794

5584 +#: builtin/fetch.c:714 builtin/fetch.c:797

5585 #, c-format

5586 msgid "From %.*s\n"

5587 msgstr "Depuis %.*s\n"

5588

5484 -#: builtin/fetch.c:722

5589 +#: builtin/fetch.c:725

5590 #, c-format

5591 msgid ""

5592 "some local refs could not be updated; try running\n"

@@ -5490,55 +5595,55 @@ msgstr ""

5595 "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"

5596 " 'git remote prune %s' pour supprimer des branches anciennes en conflit"

5597

5493 -#: builtin/fetch.c:774

5598 +#: builtin/fetch.c:777

5599 #, c-format

5600 msgid " (%s will become dangling)"

5601 msgstr " (%s sera en suspens)"

5602

5498 -#: builtin/fetch.c:775

5603 +#: builtin/fetch.c:778

5604 #, c-format

5605 msgid " (%s has become dangling)"

5606 msgstr " (%s est devenu en suspens)"

5607

5503 -#: builtin/fetch.c:799

5608 +#: builtin/fetch.c:802

5609 msgid "[deleted]"

5610 msgstr "[supprimé]"

5611

5507 -#: builtin/fetch.c:800 builtin/remote.c:1060

5612 +#: builtin/fetch.c:803 builtin/remote.c:1057

5613 msgid "(none)"

5614 msgstr "(aucun(e))"

5615

5511 -#: builtin/fetch.c:819

5616 +#: builtin/fetch.c:822

5617 #, c-format

5618 msgid "Refusing to fetch into current branch %s of non-bare repository"

5619 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"

5620

5516 -#: builtin/fetch.c:838

5621 +#: builtin/fetch.c:841

5622 #, c-format

5623 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5624 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"

5625

5521 -#: builtin/fetch.c:841

5626 +#: builtin/fetch.c:844

5627 #, c-format

5628 msgid "Option \"%s\" is ignored for %s\n"

5629 msgstr "L'option \"%s\" est ignorée pour %s\n"

5630

5526 -#: builtin/fetch.c:897

5631 +#: builtin/fetch.c:900

5632 #, c-format

5633 msgid "Don't know how to fetch from %s"

5634 msgstr "Je ne sais pas récupérer depuis %s"

5635

5531 -#: builtin/fetch.c:1059

5636 +#: builtin/fetch.c:1063

5637 #, c-format

5638 msgid "Fetching %s\n"

5639 msgstr "Récupération de %s\n"

5640

5536 -#: builtin/fetch.c:1061 builtin/remote.c:90

5641 +#: builtin/fetch.c:1065 builtin/remote.c:90

5642 #, c-format

5643 msgid "Could not fetch %s"

5644 msgstr "Impossible de récupérer %s"

5645

5541 -#: builtin/fetch.c:1079

5646 +#: builtin/fetch.c:1083

5647 msgid ""

5648 "No remote repository specified. Please, specify either a URL or a\n"

5649 "remote name from which new revisions should be fetched."

@@ -5546,32 +5651,32 @@ msgstr ""

5651 "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"

5652 "distant depuis lesquels les nouvelles révisions devraient être récupérées."

5653

5549 -#: builtin/fetch.c:1102

5654 +#: builtin/fetch.c:1106

5655 msgid "You need to specify a tag name."

5656 msgstr "Vous devez spécifier un nom d'étiquette."

5657

5553 -#: builtin/fetch.c:1144

5658 +#: builtin/fetch.c:1148

5659 msgid "--depth and --unshallow cannot be used together"

5660 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"

5661

5557 -#: builtin/fetch.c:1146

5662 +#: builtin/fetch.c:1150

5663 msgid "--unshallow on a complete repository does not make sense"

5664 msgstr "--unshallow sur un dépôt complet n'a pas de sens"

5665

5561 -#: builtin/fetch.c:1169

5666 +#: builtin/fetch.c:1173

5667 msgid "fetch --all does not take a repository argument"

5668 msgstr "fetch --all n'accepte pas d'argument de dépôt"

5669

5565 -#: builtin/fetch.c:1171

5670 +#: builtin/fetch.c:1175

5671 msgid "fetch --all does not make sense with refspecs"

5672 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"

5673

5569 -#: builtin/fetch.c:1182

5674 +#: builtin/fetch.c:1186

5675 #, c-format

5676 msgid "No such remote or remote group: %s"

5677 msgstr "distant ou groupe distant inexistant : %s"

5678

5574 -#: builtin/fetch.c:1190

5679 +#: builtin/fetch.c:1194

5680 msgid "Fetching a group and specifying refspecs does not make sense"

5681 msgstr ""

5682 "La récupération d'un groupe et les spécifications de référence n'ont pas de "

@@ -5583,131 +5688,131 @@ msgid ""

5688 msgstr ""

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

5690

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

5691 +#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

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

5588 -#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590

5589 -#: parse-options.h:132 parse-options.h:239

5693 +#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5694 +#: parse-options.h:131 parse-options.h:238

5695 msgid "n"

5696 msgstr "n"

5697

5593 -#: builtin/fmt-merge-msg.c:663

5698 +#: builtin/fmt-merge-msg.c:669

5699 msgid "populate log with at most <n> entries from shortlog"

5700 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"

5701

5597 -#: builtin/fmt-merge-msg.c:666

5702 +#: builtin/fmt-merge-msg.c:672

5703 msgid "alias for --log (deprecated)"

5704 msgstr "alias pour --log (obsolète)"

5705

5601 -#: builtin/fmt-merge-msg.c:669

5706 +#: builtin/fmt-merge-msg.c:675

5707 msgid "text"

5708 msgstr "texte"

5709

5605 -#: builtin/fmt-merge-msg.c:670

5710 +#: builtin/fmt-merge-msg.c:676

5711 msgid "use <text> as start of message"

5712 msgstr "utiliser <texte> comme début de message"

5713

5609 -#: builtin/fmt-merge-msg.c:671

5714 +#: builtin/fmt-merge-msg.c:677

5715 msgid "file to read from"

5716 msgstr "fichier d'où lire"

5717

5613 -#: builtin/for-each-ref.c:675

5718 +#: builtin/for-each-ref.c:687

5719 msgid "unable to parse format"

5720 msgstr "impossible d'analyser le format"

5721

5617 -#: builtin/for-each-ref.c:1063

5722 +#: builtin/for-each-ref.c:1083

5723 msgid "git for-each-ref [<options>] [<pattern>]"

5724 msgstr "git for-each-ref [<options>] [<motif>]"

5725

5621 -#: builtin/for-each-ref.c:1078

5726 +#: builtin/for-each-ref.c:1098

5727 msgid "quote placeholders suitably for shells"

5728 msgstr "échapper les champs réservés pour les interpréteurs de commandes"

5729

5625 -#: builtin/for-each-ref.c:1080

5730 +#: builtin/for-each-ref.c:1100

5731 msgid "quote placeholders suitably for perl"

5732 msgstr "échapper les champs réservés pour perl"

5733

5629 -#: builtin/for-each-ref.c:1082

5734 +#: builtin/for-each-ref.c:1102

5735 msgid "quote placeholders suitably for python"

5736 msgstr "échapper les champs réservés pour python"

5737

5633 -#: builtin/for-each-ref.c:1084

5738 +#: builtin/for-each-ref.c:1104

5739 msgid "quote placeholders suitably for Tcl"

5740 msgstr "échapper les champs réservés pour compatibilité avec Tcl"

5741

5637 -#: builtin/for-each-ref.c:1087

5742 +#: builtin/for-each-ref.c:1107

5743 msgid "show only <n> matched refs"

5744 msgstr "n'afficher que <n> références correspondant"

5745

5641 -#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5746 +#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5747 msgid "format"

5748 msgstr "format"

5749

5645 -#: builtin/for-each-ref.c:1088

5750 +#: builtin/for-each-ref.c:1108

5751 msgid "format to use for the output"

5752 msgstr "format à utiliser pour la sortie"

5753

5649 -#: builtin/for-each-ref.c:1089

5754 +#: builtin/for-each-ref.c:1109

5755 msgid "key"

5756 msgstr "clé"

5757

5653 -#: builtin/for-each-ref.c:1090

5758 +#: builtin/for-each-ref.c:1110

5759 msgid "field name to sort on"

5760 msgstr "nom du champ servant à trier"

5761

5657 -#: builtin/fsck.c:147 builtin/prune.c:137

5762 +#: builtin/fsck.c:147 builtin/prune.c:236

5763 msgid "Checking connectivity"

5764 msgstr "Vérification de la connectivité"

5765

5661 -#: builtin/fsck.c:540

5766 +#: builtin/fsck.c:548

5767 msgid "Checking object directories"

5768 msgstr "Vérification des répertoires d'objet"

5769

5665 -#: builtin/fsck.c:603

5770 +#: builtin/fsck.c:611

5771 msgid "git fsck [<options>] [<object>...]"

5772 msgstr "git fsck [<options>] [<objet>...]"

5773

5669 -#: builtin/fsck.c:609

5774 +#: builtin/fsck.c:617

5775 msgid "show unreachable objects"

5776 msgstr "afficher les objets inaccessibles"

5777

5673 -#: builtin/fsck.c:610

5778 +#: builtin/fsck.c:618

5779 msgid "show dangling objects"

5780 msgstr "afficher les objets en suspens"

5781

5677 -#: builtin/fsck.c:611

5782 +#: builtin/fsck.c:619

5783 msgid "report tags"

5784 msgstr "afficher les étiquettes"

5785

5681 -#: builtin/fsck.c:612

5786 +#: builtin/fsck.c:620

5787 msgid "report root nodes"

5788 msgstr "signaler les nœuds racines"

5789

5685 -#: builtin/fsck.c:613

5790 +#: builtin/fsck.c:621

5791 msgid "make index objects head nodes"

5792 msgstr "considérer les objets de l'index comme nœuds tête"

5793

5794 # translated from man page

5690 -#: builtin/fsck.c:614

5795 +#: builtin/fsck.c:622

5796 msgid "make reflogs head nodes (default)"

5797 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

5798

5694 -#: builtin/fsck.c:615

5799 +#: builtin/fsck.c:623

5800 msgid "also consider packs and alternate objects"

5801 msgstr "inspecter aussi les objets pack et alternatifs"

5802

5698 -#: builtin/fsck.c:616

5803 +#: builtin/fsck.c:624

5804 msgid "enable more strict checking"

5805 msgstr "activer une vérification plus strict"

5806

5702 -#: builtin/fsck.c:618

5807 +#: builtin/fsck.c:626

5808 msgid "write dangling objects in .git/lost-found"

5809 msgstr "écrire les objets en suspens dans .git/lost-found"

5810

5706 -#: builtin/fsck.c:619 builtin/prune.c:108

5811 +#: builtin/fsck.c:627 builtin/prune.c:198

5812 msgid "show progress"

5813 msgstr "afficher la progression"

5814

5710 -#: builtin/fsck.c:669

5815 +#: builtin/fsck.c:677

5816 msgid "Checking objects"

5817 msgstr "Vérification des objets"

5818

@@ -5715,52 +5820,52 @@ msgstr "Vérification des objets"

5820 msgid "git gc [<options>]"

5821 msgstr "git gc [<options>]"

5822

5718 -#: builtin/gc.c:79

5823 +#: builtin/gc.c:67

5824 #, c-format

5720 -msgid "Invalid gc.pruneexpire: '%s'"

5721 -msgstr "gc.pruneexpire invalide : '%s'"

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

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

5827

5723 -#: builtin/gc.c:107

5828 +#: builtin/gc.c:112

5829 #, c-format

5830 msgid "insanely long object directory %.*s"

5831 msgstr "objet répertoire démentiellement long %.*s"

5832

5728 -#: builtin/gc.c:276

5833 +#: builtin/gc.c:281

5834 msgid "prune unreferenced objects"

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

5836

5732 -#: builtin/gc.c:278

5837 +#: builtin/gc.c:283

5838 msgid "be more thorough (increased runtime)"

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

5840

5736 -#: builtin/gc.c:279

5841 +#: builtin/gc.c:284

5842 msgid "enable auto-gc mode"

5843 msgstr "activer le mode auto-gc"

5844

5740 -#: builtin/gc.c:280

5845 +#: builtin/gc.c:285

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

5847 msgstr ""

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

5849 "tourne déjà"

5850

5746 -#: builtin/gc.c:321

5851 +#: builtin/gc.c:327

5852 #, c-format

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

5854 msgstr ""

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

5856 "performances.\n"

5857

5753 -#: builtin/gc.c:323

5858 +#: builtin/gc.c:329

5859 #, c-format

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

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

5862

5758 -#: builtin/gc.c:324

5863 +#: builtin/gc.c:330

5864 #, c-format

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

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

5867

5763 -#: builtin/gc.c:342

5868 +#: builtin/gc.c:348

5869 #, c-format

5870 msgid ""

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

@@ -5768,7 +5873,7 @@ msgstr ""

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

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

5875

5771 -#: builtin/gc.c:364

5876 +#: builtin/gc.c:376

5877 msgid ""

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

5879 msgstr ""

@@ -5979,7 +6084,7 @@ msgstr "afficher les fichiers correspondant dans le pagineur"

6084 msgid "allow calling of grep(1) (ignored by this build)"

6085 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"

6086

5982 -#: builtin/grep.c:741 builtin/show-ref.c:187

6087 +#: builtin/grep.c:741 builtin/show-ref.c:189

6088 msgid "show usage"

6089 msgstr "afficher l'usage"

6090

@@ -6009,7 +6114,7 @@ msgstr ""

6114 msgid "both --cached and trees are given."

6115 msgstr "--cached et des arbres sont fournis en même temps."

6116

6012 -#: builtin/hash-object.c:82

6117 +#: builtin/hash-object.c:80

6118 msgid ""

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

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

@@ -6017,38 +6122,38 @@ msgstr ""

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

6123 "[--] <fichier>..."

6124

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

6125 +#: builtin/hash-object.c:81

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

6127 msgstr "git hash-object --stdin-paths < <liste-de-chemins>"

6128

6024 -#: builtin/hash-object.c:94 builtin/tag.c:612

6129 +#: builtin/hash-object.c:92 builtin/tag.c:612

6130 msgid "type"

6131 msgstr "type"

6132

6028 -#: builtin/hash-object.c:94

6133 +#: builtin/hash-object.c:92

6134 msgid "object type"

6135 msgstr "type d'objet"

6136

6032 -#: builtin/hash-object.c:95

6137 +#: builtin/hash-object.c:93

6138 msgid "write the object into the object database"

6139 msgstr "écrire l'objet dans la base de donnée d'objets"

6140

6036 -#: builtin/hash-object.c:97

6141 +#: builtin/hash-object.c:95

6142 msgid "read the object from stdin"

6143 msgstr "lire l'objet depuis l'entrée standard"

6144

6040 -#: builtin/hash-object.c:99

6145 +#: builtin/hash-object.c:97

6146 msgid "store file as is without filters"

6147 msgstr "stocker le fichier tel quel sans filtrage"

6148

6044 -#: builtin/hash-object.c:100

6149 +#: builtin/hash-object.c:98

6150 msgid ""

6151 "just hash any random garbage to create corrupt objects for debugging Git"

6152 msgstr ""

6153 "juste hasher n'importe quel contenu pour créer des objets corrompus pour "

6154 "debugger Git"

6155

6051 -#: builtin/hash-object.c:101

6156 +#: builtin/hash-object.c:99

6157 msgid "process file as it were from this path"

6158 msgstr "traiter le fichier comme s'il venait de ce chemin"

6159

@@ -6177,292 +6282,292 @@ msgstr "usage : %s%s"

6282 msgid "`git %s' is aliased to `%s'"

6283 msgstr "`git %s\" est un alias de `%s'"

6284

6180 -#: builtin/index-pack.c:150

6285 +#: builtin/index-pack.c:151

6286 #, c-format

6287 msgid "unable to open %s"

6288 msgstr "impossible d'ouvrir %s"

6289

6185 -#: builtin/index-pack.c:200

6290 +#: builtin/index-pack.c:201

6291 #, c-format

6292 msgid "object type mismatch at %s"

6293 msgstr "type d'objet non correspondant à %s"

6294

6190 -#: builtin/index-pack.c:220

6295 +#: builtin/index-pack.c:221

6296 #, c-format

6297 msgid "did not receive expected object %s"

6298 msgstr "objet attendu non reçu %s"

6299

6195 -#: builtin/index-pack.c:223

6300 +#: builtin/index-pack.c:224

6301 #, c-format

6302 msgid "object %s: expected type %s, found %s"

6303 msgstr "objet %s : type attendu %s, reçu %s"

6304

6200 -#: builtin/index-pack.c:265

6305 +#: builtin/index-pack.c:266

6306 #, c-format

6307 msgid "cannot fill %d byte"

6308 msgid_plural "cannot fill %d bytes"

6309 msgstr[0] "impossible de remplir %d octet"

6310 msgstr[1] "impossible de remplir %d octets"

6311

6207 -#: builtin/index-pack.c:275

6312 +#: builtin/index-pack.c:276

6313 msgid "early EOF"

6314 msgstr "fin de fichier prématurée"

6315

6211 -#: builtin/index-pack.c:276

6316 +#: builtin/index-pack.c:277

6317 msgid "read error on input"

6318 msgstr "erreur de lecture sur l'entrée"

6319

6215 -#: builtin/index-pack.c:288

6320 +#: builtin/index-pack.c:289

6321 msgid "used more bytes than were available"

6322 msgstr "plus d'octets utilisés que disponibles"

6323

6219 -#: builtin/index-pack.c:295

6324 +#: builtin/index-pack.c:296

6325 msgid "pack too large for current definition of off_t"

6326 msgstr "le paquet est trop grand pour la définition actuelle de off_t"

6327

6223 -#: builtin/index-pack.c:311

6328 +#: builtin/index-pack.c:312

6329 #, c-format

6330 msgid "unable to create '%s'"

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

6332

6228 -#: builtin/index-pack.c:316

6333 +#: builtin/index-pack.c:317

6334 #, c-format

6335 msgid "cannot open packfile '%s'"

6336 msgstr "impossible d'ouvrir le fichier paquet '%s'"

6337

6233 -#: builtin/index-pack.c:330

6338 +#: builtin/index-pack.c:331

6339 msgid "pack signature mismatch"

6340 msgstr "la signature du paquet ne correspond pas"

6341

6237 -#: builtin/index-pack.c:332

6342 +#: builtin/index-pack.c:333

6343 #, c-format

6344 msgid "pack version %<PRIu32> unsupported"

6345 msgstr "la version de paquet %<PRIu32> non supportée"

6346

6242 -#: builtin/index-pack.c:350

6347 +#: builtin/index-pack.c:351

6348 #, c-format

6349 msgid "pack has bad object at offset %lu: %s"

6350 msgstr "le paquet a un mauvais objet à l'offset %lu: %s"

6351

6247 -#: builtin/index-pack.c:471

6352 +#: builtin/index-pack.c:472

6353 #, c-format

6354 msgid "inflate returned %d"

6355 msgstr "la décompression (inflate) a retourné %d"

6356

6252 -#: builtin/index-pack.c:520

6357 +#: builtin/index-pack.c:521

6358 msgid "offset value overflow for delta base object"

6359 msgstr "dépassement de la valeur d'offset pour l'objet delta de base"

6360

6256 -#: builtin/index-pack.c:528

6361 +#: builtin/index-pack.c:529

6362 msgid "delta base offset is out of bound"

6363 msgstr "l'objet delta de base est hors limite"

6364

6260 -#: builtin/index-pack.c:536

6365 +#: builtin/index-pack.c:537

6366 #, c-format

6367 msgid "unknown object type %d"

6368 msgstr "type d'objet inconnu %d"

6369

6265 -#: builtin/index-pack.c:567

6370 +#: builtin/index-pack.c:568

6371 msgid "cannot pread pack file"

6372 msgstr "impossible de lire (pread) le fichier paquet"

6373

6269 -#: builtin/index-pack.c:569

6374 +#: builtin/index-pack.c:570

6375 #, c-format

6376 msgid "premature end of pack file, %lu byte missing"

6377 msgid_plural "premature end of pack file, %lu bytes missing"

6378 msgstr[0] "fin prématurée du fichier paquet, %lu octet lu"

6379 msgstr[1] "fin prématurée du fichier paquet, %lu octets lus"

6380

6276 -#: builtin/index-pack.c:595

6381 +#: builtin/index-pack.c:596

6382 msgid "serious inflate inconsistency"

6383 msgstr "grave incohérence dans la décompression (inflate)"

6384

6280 -#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715

6281 -#: builtin/index-pack.c:749 builtin/index-pack.c:758

6385 +#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6386 +#: builtin/index-pack.c:805 builtin/index-pack.c:814

6387 #, c-format

6388 msgid "SHA1 COLLISION FOUND WITH %s !"

6389 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"

6390

6286 -#: builtin/index-pack.c:689 builtin/pack-objects.c:162

6391 +#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6392 #: builtin/pack-objects.c:254

6393 #, c-format

6394 msgid "unable to read %s"

6395 msgstr "impossible de lire %s"

6396

6292 -#: builtin/index-pack.c:755

6397 +#: builtin/index-pack.c:811

6398 #, c-format

6399 msgid "cannot read existing object %s"

6400 msgstr "impossible de lire l'objet existant %s"

6401

6297 -#: builtin/index-pack.c:769

6402 +#: builtin/index-pack.c:825

6403 #, c-format

6404 msgid "invalid blob object %s"

6405 msgstr "objet blob invalide %s"

6406

6302 -#: builtin/index-pack.c:783

6407 +#: builtin/index-pack.c:839

6408 #, c-format

6409 msgid "invalid %s"

6410 msgstr "%s invalide"

6411

6307 -#: builtin/index-pack.c:787

6412 +#: builtin/index-pack.c:843

6413 msgid "Error in object"

6414 msgstr "Erreur dans l'objet"

6415

6311 -#: builtin/index-pack.c:789

6416 +#: builtin/index-pack.c:845

6417 #, c-format

6418 msgid "Not all child objects of %s are reachable"

6419 msgstr "Tous les objets enfants de %s ne sont pas accessibles"

6420

6316 -#: builtin/index-pack.c:861 builtin/index-pack.c:890

6421 +#: builtin/index-pack.c:917 builtin/index-pack.c:948

6422 msgid "failed to apply delta"

6423 msgstr "échec d'application du delta"

6424

6320 -#: builtin/index-pack.c:1055

6425 +#: builtin/index-pack.c:1118

6426 msgid "Receiving objects"

6427 msgstr "Réception d'objets"

6428

6324 -#: builtin/index-pack.c:1055

6429 +#: builtin/index-pack.c:1118

6430 msgid "Indexing objects"

6431 msgstr "Indexation d'objets"

6432

6328 -#: builtin/index-pack.c:1081

6433 +#: builtin/index-pack.c:1150

6434 msgid "pack is corrupted (SHA1 mismatch)"

6435 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"

6436

6332 -#: builtin/index-pack.c:1086

6437 +#: builtin/index-pack.c:1155

6438 msgid "cannot fstat packfile"

6439 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"

6440

6336 -#: builtin/index-pack.c:1089

6441 +#: builtin/index-pack.c:1158

6442 msgid "pack has junk at the end"

6443 msgstr "le paquet est invalide à la fin"

6444

6340 -#: builtin/index-pack.c:1100

6445 +#: builtin/index-pack.c:1169

6446 msgid "confusion beyond insanity in parse_pack_objects()"

6447 msgstr "confusion extrême dans parse_pack_objects()"

6448

6344 -#: builtin/index-pack.c:1123

6449 +#: builtin/index-pack.c:1194

6450 msgid "Resolving deltas"

6451 msgstr "Résolution des deltas"

6452

6348 -#: builtin/index-pack.c:1133

6453 +#: builtin/index-pack.c:1205

6454 #, c-format

6455 msgid "unable to create thread: %s"

6456 msgstr "impossible de créer le fil : %s"

6457

6353 -#: builtin/index-pack.c:1175

6458 +#: builtin/index-pack.c:1247

6459 msgid "confusion beyond insanity"

6460 msgstr "confusion extrême"

6461

6357 -#: builtin/index-pack.c:1181

6462 +#: builtin/index-pack.c:1253

6463 #, c-format

6464 msgid "completed with %d local objects"

6465 msgstr "complété avec %d objets locaux"

6466

6362 -#: builtin/index-pack.c:1191

6467 +#: builtin/index-pack.c:1263

6468 #, c-format

6469 msgid "Unexpected tail checksum for %s (disk corruption?)"

6470 msgstr ""

6471 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"

6472

6368 -#: builtin/index-pack.c:1195

6473 +#: builtin/index-pack.c:1267

6474 #, c-format

6475 msgid "pack has %d unresolved delta"

6476 msgid_plural "pack has %d unresolved deltas"

6477 msgstr[0] "le paquet a %d delta non résolu"

6478 msgstr[1] "le paquet a %d deltas non résolus"

6479

6375 -#: builtin/index-pack.c:1219

6480 +#: builtin/index-pack.c:1291

6481 #, c-format

6482 msgid "unable to deflate appended object (%d)"

6483 msgstr "impossible de compresser l'objet ajouté (%d)"

6484

6380 -#: builtin/index-pack.c:1298

6485 +#: builtin/index-pack.c:1367

6486 #, c-format

6487 msgid "local object %s is corrupt"

6488 msgstr "l'objet local %s est corrompu"

6489

6385 -#: builtin/index-pack.c:1322

6490 +#: builtin/index-pack.c:1391

6491 msgid "error while closing pack file"

6492 msgstr "erreur en fermeture du fichier paquet"

6493

6389 -#: builtin/index-pack.c:1335

6494 +#: builtin/index-pack.c:1404

6495 #, c-format

6496 msgid "cannot write keep file '%s'"

6497 msgstr "impossible d'écrire le fichier \"keep\" '%s'"

6498

6394 -#: builtin/index-pack.c:1343

6499 +#: builtin/index-pack.c:1412

6500 #, c-format

6501 msgid "cannot close written keep file '%s'"

6502 msgstr "impossible de fermer le fichier \"keep\" '%s'"

6503

6399 -#: builtin/index-pack.c:1356

6504 +#: builtin/index-pack.c:1425

6505 msgid "cannot store pack file"

6506 msgstr "impossible de stocker le fichier paquet"

6507

6403 -#: builtin/index-pack.c:1367

6508 +#: builtin/index-pack.c:1436

6509 msgid "cannot store index file"

6510 msgstr "impossible de stocker le fichier d'index"

6511

6407 -#: builtin/index-pack.c:1400

6512 +#: builtin/index-pack.c:1469

6513 #, c-format

6514 msgid "bad pack.indexversion=%<PRIu32>"

6515 msgstr "mauvais pack.indexversion=%<PRIu32>"

6516

6412 -#: builtin/index-pack.c:1406

6517 +#: builtin/index-pack.c:1475

6518 #, c-format

6519 msgid "invalid number of threads specified (%d)"

6520 msgstr "nombre de fils spécifié invalide (%d)"

6521

6417 -#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

6522 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6523 #, c-format

6524 msgid "no threads support, ignoring %s"

6525 msgstr "pas de support des fils, ignore %s"

6526

6422 -#: builtin/index-pack.c:1468

6527 +#: builtin/index-pack.c:1537

6528 #, c-format

6529 msgid "Cannot open existing pack file '%s'"

6530 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"

6531

6427 -#: builtin/index-pack.c:1470

6532 +#: builtin/index-pack.c:1539

6533 #, c-format

6534 msgid "Cannot open existing pack idx file for '%s'"

6535 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"

6536

6432 -#: builtin/index-pack.c:1517

6537 +#: builtin/index-pack.c:1586

6538 #, c-format

6539 msgid "non delta: %d object"

6540 msgid_plural "non delta: %d objects"

6541 msgstr[0] "pas un delta : %d objet"

6542 msgstr[1] "pas un delta : %d objets"

6543

6439 -#: builtin/index-pack.c:1524

6544 +#: builtin/index-pack.c:1593

6545 #, c-format

6546 msgid "chain length = %d: %lu object"

6547 msgid_plural "chain length = %d: %lu objects"

6548 msgstr[0] "longueur chaînée = %d : %lu objet"

6549 msgstr[1] "longueur chaînée = %d : %lu objets"

6550

6446 -#: builtin/index-pack.c:1553

6551 +#: builtin/index-pack.c:1622

6552 msgid "Cannot come back to cwd"

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

6554

6450 -#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6451 -#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6555 +#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6556 +#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6557 #, c-format

6558 msgid "bad %s"

6559 msgstr "mauvais %s"

6560

6456 -#: builtin/index-pack.c:1634

6561 +#: builtin/index-pack.c:1703

6562 msgid "--fix-thin cannot be used without --stdin"

6563 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"

6564

6460 -#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6565 +#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6566 #, c-format

6567 msgid "packfile name '%s' does not end with '.pack'"

6568 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"

6569

6465 -#: builtin/index-pack.c:1655

6570 +#: builtin/index-pack.c:1724

6571 msgid "--verify with no packfile name given"

6572 msgstr "--verify sans nom de fichier paquet donné"

6573

@@ -6532,22 +6637,22 @@ msgid "not copying templates of a wrong format version %d from '%s'"

6637 msgstr ""

6638 "pas de copie des modèles étant dans une mauvaise version du format %d de '%s'"

6639

6535 -#: builtin/init-db.c:197

6640 +#: builtin/init-db.c:211

6641 #, c-format

6642 msgid "insane git directory %s"

6643 msgstr "répertoire git démentiel %s"

6644

6540 -#: builtin/init-db.c:331 builtin/init-db.c:334

6645 +#: builtin/init-db.c:343 builtin/init-db.c:346

6646 #, c-format

6647 msgid "%s already exists"

6648 msgstr "%s existe déjà"

6649

6545 -#: builtin/init-db.c:363

6650 +#: builtin/init-db.c:374

6651 #, c-format

6652 msgid "unable to handle file type %d"

6653 msgstr "impossible de traiter le fichier de type %d"

6654

6550 -#: builtin/init-db.c:366

6655 +#: builtin/init-db.c:377

6656 #, c-format

6657 msgid "unable to move %s to %s"

6658 msgstr "impossible de déplacer %s vers %s"

@@ -6555,24 +6660,24 @@ msgstr "impossible de déplacer %s vers %s"

6660 #. TRANSLATORS: The first '%s' is either "Reinitialized

6661 #. existing" or "Initialized empty", the second " shared" or

6662 #. "", and the last '%s%s' is the verbatim directory name.

6558 -#: builtin/init-db.c:426

6663 +#: builtin/init-db.c:433

6664 #, c-format

6665 msgid "%s%s Git repository in %s%s\n"

6666 msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"

6667

6563 -#: builtin/init-db.c:427

6668 +#: builtin/init-db.c:434

6669 msgid "Reinitialized existing"

6670 msgstr "existant réinitialisé"

6671

6567 -#: builtin/init-db.c:427

6672 +#: builtin/init-db.c:434

6673 msgid "Initialized empty"

6674 msgstr "vide initialisé"

6675

6571 -#: builtin/init-db.c:428

6676 +#: builtin/init-db.c:435

6677 msgid " shared"

6678 msgstr " partagé"

6679

6575 -#: builtin/init-db.c:475

6680 +#: builtin/init-db.c:482

6681 msgid ""

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

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

@@ -6580,29 +6685,29 @@ msgstr ""

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

6686 "shared[=<permissions>]] [<répertoire>]"

6687

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

6688 +#: builtin/init-db.c:505

6689 msgid "permissions"

6690 msgstr "permissions"

6691

6587 -#: builtin/init-db.c:499

6692 +#: builtin/init-db.c:506

6693 msgid "specify that the git repository is to be shared amongst several users"

6694 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"

6695

6591 -#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6696 +#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171

6697 msgid "be quiet"

6698 msgstr "être silencieux"

6699

6595 -#: builtin/init-db.c:533 builtin/init-db.c:538

6700 +#: builtin/init-db.c:540 builtin/init-db.c:545

6701 #, c-format

6702 msgid "cannot mkdir %s"

6703 msgstr "impossible de créer le répertoire (mkdir) %s"

6704

6600 -#: builtin/init-db.c:542

6705 +#: builtin/init-db.c:549

6706 #, c-format

6707 msgid "cannot chdir to %s"

6708 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"

6709

6605 -#: builtin/init-db.c:563

6710 +#: builtin/init-db.c:570

6711 #, c-format

6712 msgid ""

6713 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6611,7 +6716,7 @@ msgstr ""

6716 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"

6717 "git-dir=<répertoire>)"

6718

6614 -#: builtin/init-db.c:591

6719 +#: builtin/init-db.c:598

6720 #, c-format

6721 msgid "Cannot access work tree '%s'"

6722 msgstr "Impossible d'accéder à l'arbre de travail '%s'"

@@ -6637,7 +6742,7 @@ msgid "trailer(s) to add"

6742 msgstr "ligne(s) de fin à ajouter"

6743

6744 #: builtin/log.c:41

6640 -msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6745 +msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

6746 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"

6747

6748 #: builtin/log.c:42

@@ -6708,7 +6813,7 @@ msgstr "Impossible d'ouvrir le fichier correctif %s"

6813 msgid "Need exactly one range."

6814 msgstr "Exactement une plage nécessaire."

6815

6711 -#: builtin/log.c:811

6816 +#: builtin/log.c:813

6817 msgid "Not a range."

6818 msgstr "Ceci n'est pas une plage."

6819

@@ -6911,7 +7016,7 @@ msgstr "Échec de création des fichiers en sortie"

7016 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7017 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"

7018

6914 -#: builtin/log.c:1638

7019 +#: builtin/log.c:1637

7020 #, c-format

7021 msgid ""

7022 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

@@ -6919,7 +7024,7 @@ msgstr ""

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

7025 "<branche_amont> manuellement.\n"

7026

6922 -#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665

7027 +#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662

7028 #, c-format

7029 msgid "Unknown commit %s"

7030 msgstr "Commit inconnu %s"

@@ -7199,42 +7304,42 @@ msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"

7304 msgid "'%s' does not point to a commit"

7305 msgstr "'%s' ne pointe pas sur un commit"

7306

7202 -#: builtin/merge.c:559

7307 +#: builtin/merge.c:537

7308 #, c-format

7309 msgid "Bad branch.%s.mergeoptions string: %s"

7310 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"

7311

7207 -#: builtin/merge.c:654

7312 +#: builtin/merge.c:632

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

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

7315

7211 -#: builtin/merge.c:678

7316 +#: builtin/merge.c:656

7317 msgid "Not handling anything other than two heads merge."

7318 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."

7319

7215 -#: builtin/merge.c:692

7320 +#: builtin/merge.c:670

7321 #, c-format

7322 msgid "Unknown option for merge-recursive: -X%s"

7323 msgstr "Options inconnue pour merge-recursive : -X%s"

7324

7220 -#: builtin/merge.c:705

7325 +#: builtin/merge.c:683

7326 #, c-format

7327 msgid "unable to write %s"

7328 msgstr "impossible d'écrire %s"

7329

7225 -#: builtin/merge.c:794

7330 +#: builtin/merge.c:772

7331 #, c-format

7332 msgid "Could not read from '%s'"

7333 msgstr "Impossible de lire depuis '%s'"

7334

7230 -#: builtin/merge.c:803

7335 +#: builtin/merge.c:781

7336 #, c-format

7337 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7338 msgstr ""

7339 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "

7340 "fusion.\n"

7341

7237 -#: builtin/merge.c:809

7342 +#: builtin/merge.c:787

7343 #, c-format

7344 msgid ""

7345 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7251,49 +7356,54 @@ msgstr ""

7356 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"

7357 "abandonne la validation.\n"

7358

7254 -#: builtin/merge.c:833

7359 +#: builtin/merge.c:811

7360 msgid "Empty commit message."

7361 msgstr "Message de validation vide."

7362

7258 -#: builtin/merge.c:845

7363 +#: builtin/merge.c:823

7364 #, c-format

7365 msgid "Wonderful.\n"

7366 msgstr "Merveilleux.\n"

7367

7263 -#: builtin/merge.c:900

7368 +#: builtin/merge.c:878

7369 #, c-format

7370 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7371 msgstr ""

7372 "La fusion automatique a échoué ; réglez les conflits et validez le "

7373 "résultat.\n"

7374

7270 -#: builtin/merge.c:916

7375 +#: builtin/merge.c:894

7376 #, c-format

7377 msgid "'%s' is not a commit"

7378 msgstr "'%s' n'est pas une validation"

7379

7275 -#: builtin/merge.c:957

7380 +#: builtin/merge.c:935

7381 msgid "No current branch."

7382 msgstr "Pas de branche courante."

7383

7279 -#: builtin/merge.c:959

7384 +#: builtin/merge.c:937

7385 msgid "No remote for the current branch."

7386 msgstr "Pas de branche distante pour la branche courante."

7387

7283 -#: builtin/merge.c:961

7388 +#: builtin/merge.c:939

7389 msgid "No default upstream defined for the current branch."

7390 msgstr "Pas de branche amont par défaut définie pour la branche courante."

7391

7287 -#: builtin/merge.c:966

7392 +#: builtin/merge.c:944

7393 #, c-format

7394 msgid "No remote-tracking branch for %s from %s"

7395 msgstr "Pas de branche de suivi pour %s depuis %s"

7396

7292 -#: builtin/merge.c:1122

7397 +#: builtin/merge.c:1081

7398 +#, c-format

7399 +msgid "could not close '%s'"

7400 +msgstr "impossible de fermer '%s'"

7401 +

7402 +#: builtin/merge.c:1208

7403 msgid "There is no merge to abort (MERGE_HEAD missing)."

7404 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."

7405

7296 -#: builtin/merge.c:1138

7406 +#: builtin/merge.c:1224

7407 msgid ""

7408 "You have not concluded your merge (MERGE_HEAD exists).\n"

7409 "Please, commit your changes before you merge."

@@ -7301,11 +7411,11 @@ msgstr ""

7411 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"

7412 "Veuillez valider vos modifications avant de pouvoir fusionner."

7413

7304 -#: builtin/merge.c:1141 git-pull.sh:34

7414 +#: builtin/merge.c:1227 git-pull.sh:74

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

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

7417

7308 -#: builtin/merge.c:1145

7418 +#: builtin/merge.c:1231

7419 msgid ""

7420 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7421 "Please, commit your changes before you merge."

@@ -7313,102 +7423,102 @@ msgstr ""

7423 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"

7424 "Veuillez valider vos modifications avant de pouvoir fusionner."

7425

7316 -#: builtin/merge.c:1148

7426 +#: builtin/merge.c:1234

7427 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7428 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."

7429

7320 -#: builtin/merge.c:1157

7430 +#: builtin/merge.c:1243

7431 msgid "You cannot combine --squash with --no-ff."

7432 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."

7433

7324 -#: builtin/merge.c:1166

7434 +#: builtin/merge.c:1251

7435 msgid "No commit specified and merge.defaultToUpstream not set."

7436 msgstr ""

7437 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."

7438

7329 -#: builtin/merge.c:1198

7330 -msgid "Can merge only exactly one commit into empty head"

7331 -msgstr ""

7332 -"Possible de fusionner exactement une seule validation dans une tête vide"

7333 -

7334 -#: builtin/merge.c:1201

7439 +#: builtin/merge.c:1268

7440 msgid "Squash commit into empty head not supported yet"

7441 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"

7442

7338 -#: builtin/merge.c:1203

7443 +#: builtin/merge.c:1270

7444 msgid "Non-fast-forward commit does not make sense into an empty head"

7445 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"

7446

7342 -#: builtin/merge.c:1208

7447 +#: builtin/merge.c:1276

7448 #, c-format

7449 msgid "%s - not something we can merge"

7450 msgstr "%s - pas possible de fusionner ceci"

7451

7347 -#: builtin/merge.c:1259

7452 +#: builtin/merge.c:1278

7453 +msgid "Can merge only exactly one commit into empty head"

7454 +msgstr ""

7455 +"Possible de fusionner exactement une seule validation dans une tête vide"

7456 +

7457 +#: builtin/merge.c:1333

7458 #, c-format

7459 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7460 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."

7461

7352 -#: builtin/merge.c:1262

7462 +#: builtin/merge.c:1336

7463 #, c-format

7464 msgid "Commit %s has a bad GPG signature allegedly by %s."

7465 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."

7466

7357 -#: builtin/merge.c:1265

7467 +#: builtin/merge.c:1339

7468 #, c-format

7469 msgid "Commit %s does not have a GPG signature."

7470 msgstr "La validation %s n'a pas de signature GPG."

7471

7362 -#: builtin/merge.c:1268

7472 +#: builtin/merge.c:1342

7473 #, c-format

7474 msgid "Commit %s has a good GPG signature by %s\n"

7475 msgstr "La validation %s a une signature GPG correcte par %s\n"

7476

7367 -#: builtin/merge.c:1349

7477 +#: builtin/merge.c:1423

7478 #, c-format

7479 msgid "Updating %s..%s\n"

7480 msgstr "Mise à jour %s..%s\n"

7481

7372 -#: builtin/merge.c:1388

7482 +#: builtin/merge.c:1462

7483 #, c-format

7484 msgid "Trying really trivial in-index merge...\n"

7485 msgstr "Essai de fusion vraiment triviale dans l'index...\n"

7486

7377 -#: builtin/merge.c:1395

7487 +#: builtin/merge.c:1469

7488 #, c-format

7489 msgid "Nope.\n"

7490 msgstr "Non.\n"

7491

7382 -#: builtin/merge.c:1427

7492 +#: builtin/merge.c:1501

7493 msgid "Not possible to fast-forward, aborting."

7494 msgstr "Pas possible d'avancer rapidement, abandon."

7495

7386 -#: builtin/merge.c:1450 builtin/merge.c:1529

7496 +#: builtin/merge.c:1524 builtin/merge.c:1603

7497 #, c-format

7498 msgid "Rewinding the tree to pristine...\n"

7499 msgstr "Retour de l'arbre à l'original...\n"

7500

7391 -#: builtin/merge.c:1454

7501 +#: builtin/merge.c:1528

7502 #, c-format

7503 msgid "Trying merge strategy %s...\n"

7504 msgstr "Essai de la stratégie de fusion %s...\n"

7505

7396 -#: builtin/merge.c:1520

7506 +#: builtin/merge.c:1594

7507 #, c-format

7508 msgid "No merge strategy handled the merge.\n"

7509 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"

7510

7401 -#: builtin/merge.c:1522

7511 +#: builtin/merge.c:1596

7512 #, c-format

7513 msgid "Merge with strategy %s failed.\n"

7514 msgstr "La fusion avec la stratégie %s a échoué.\n"

7515

7406 -#: builtin/merge.c:1531

7516 +#: builtin/merge.c:1605

7517 #, c-format

7518 msgid "Using the %s to prepare resolving by hand.\n"

7519 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"

7520

7411 -#: builtin/merge.c:1543

7521 +#: builtin/merge.c:1617

7522 #, c-format

7523 msgid "Automatic merge went well; stopped before committing as requested\n"

7524 msgstr ""

@@ -7599,7 +7709,7 @@ msgstr "%s, source=%s, destination=%s"

7709 msgid "Renaming %s to %s\n"

7710 msgstr "Renommage de %s en %s\n"

7711

7602 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7712 +#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361

7713 #, c-format

7714 msgid "renaming '%s' failed"

7715 msgstr "le renommage de '%s' a échoué"

@@ -7976,7 +8086,7 @@ msgstr "références-notes"

8086 msgid "use notes from <notes-ref>"

8087 msgstr "utiliser les notes depuis <références-notes>"

8088

7979 -#: builtin/notes.c:989 builtin/remote.c:1621

8089 +#: builtin/notes.c:989 builtin/remote.c:1618

8090 #, c-format

8091 msgid "Unknown subcommand: %s"

8092 msgstr "Sous-commande inconnue : %s"

@@ -8000,181 +8110,181 @@ msgstr "erreur de compression (%d)"

8110 msgid "Writing objects"

8111 msgstr "Écriture des objets"

8112

8003 -#: builtin/pack-objects.c:1013

8113 +#: builtin/pack-objects.c:1011

8114 msgid "disabling bitmap writing, as some objects are not being packed"

8115 msgstr ""

8116 "désactivation de l'écriture en bitmap car certains objets ne sont pas "

8117 "compressés"

8118

8009 -#: builtin/pack-objects.c:2173

8119 +#: builtin/pack-objects.c:2171

8120 msgid "Compressing objects"

8121 msgstr "Compression des objets"

8122

8013 -#: builtin/pack-objects.c:2570

8123 +#: builtin/pack-objects.c:2568

8124 #, c-format

8125 msgid "unsupported index version %s"

8126 msgstr "version d'index non supportée %s"

8127

8018 -#: builtin/pack-objects.c:2574

8128 +#: builtin/pack-objects.c:2572

8129 #, c-format

8130 msgid "bad index version '%s'"

8131 msgstr "mauvaise version d'index '%s'"

8132

8023 -#: builtin/pack-objects.c:2597

8133 +#: builtin/pack-objects.c:2595

8134 #, c-format

8135 msgid "option %s does not accept negative form"

8136 msgstr "l'option %s n'accepte pas de valeur négative"

8137

8028 -#: builtin/pack-objects.c:2601

8138 +#: builtin/pack-objects.c:2599

8139 #, c-format

8140 msgid "unable to parse value '%s' for option %s"

8141 msgstr "impossible d'analyser la valeur '%s' pour l'option %s"

8142

8033 -#: builtin/pack-objects.c:2621

8143 +#: builtin/pack-objects.c:2619

8144 msgid "do not show progress meter"

8145 msgstr "ne pas afficher la barre de progression"

8146

8037 -#: builtin/pack-objects.c:2623

8147 +#: builtin/pack-objects.c:2621

8148 msgid "show progress meter"

8149 msgstr "afficher la barre de progression"

8150

8041 -#: builtin/pack-objects.c:2625

8151 +#: builtin/pack-objects.c:2623

8152 msgid "show progress meter during object writing phase"

8153 msgstr "afficher la barre de progression durant la phase d'écrite des objets"

8154

8045 -#: builtin/pack-objects.c:2628

8155 +#: builtin/pack-objects.c:2626

8156 msgid "similar to --all-progress when progress meter is shown"

8157 msgstr "similaire à --all-progress quand la barre de progression est affichée"

8158

8049 -#: builtin/pack-objects.c:2629

8159 +#: builtin/pack-objects.c:2627

8160 msgid "version[,offset]"

8161 msgstr "version[,offset]"

8162

8053 -#: builtin/pack-objects.c:2630

8163 +#: builtin/pack-objects.c:2628

8164 msgid "write the pack index file in the specified idx format version"

8165 msgstr ""

8166 "écrire le fichier d'index du paquet dans le format d'index de version "

l10n: fr.po v2.5.0-rc0 (2355t)