9905988a57 · matheusbsbs/matheus-bagliano

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

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2014-11-20 09:42+0800\n"

77 -"PO-Revision-Date: 2014-11-20 16:10+0800\n"

76 +"POT-Creation-Date: 2015-01-13 14:05+0800\n"

77 +"PO-Revision-Date: 2015-01-13 20:21+0100\n"

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

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

80 "Language: fr\n"

@@ -116,76 +116,76 @@ msgstr ""

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

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

118

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

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

120 #, c-format

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

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

123

124 -#: archive.c:419

124 +#: archive.c:427

125 msgid "fmt"

126 msgstr "fmt"

127

128 -#: archive.c:419

128 +#: archive.c:427

129 msgid "archive format"

130 msgstr "format d'archive"

131

132 -#: archive.c:420 builtin/log.c:1204

132 +#: archive.c:428 builtin/log.c:1204

133 msgid "prefix"

134 msgstr "préfixe"

135

136 -#: archive.c:421

136 +#: archive.c:429

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

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

139

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

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

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

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

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

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

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

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

145 msgid "file"

146 msgstr "fichier"

147

148 -#: archive.c:423 builtin/archive.c:89

148 +#: archive.c:431 builtin/archive.c:89

149 msgid "write the archive to this file"

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

151

152 -#: archive.c:425

152 +#: archive.c:433

153 msgid "read .gitattributes in working directory"

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

155

156 -#: archive.c:426

156 +#: archive.c:434

157 msgid "report archived files on stderr"

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

159

160 -#: archive.c:427

160 +#: archive.c:435

161 msgid "store only"

162 msgstr "stockage seulement"

163

164 -#: archive.c:428

164 +#: archive.c:436

165 msgid "compress faster"

166 msgstr "compression rapide"

167

168 -#: archive.c:436

168 +#: archive.c:444

169 msgid "compress better"

170 msgstr "compression efficace"

171

172 -#: archive.c:439

172 +#: archive.c:447

173 msgid "list supported archive formats"

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

175

176 -#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

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

177 msgid "repo"

178 msgstr "dépôt"

179

180 -#: archive.c:442 builtin/archive.c:91

180 +#: archive.c:450 builtin/archive.c:91

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

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

183

184 -#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

184 +#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

185 msgid "command"

186 msgstr "commande"

187

188 -#: archive.c:444 builtin/archive.c:93

188 +#: archive.c:452 builtin/archive.c:93

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

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

191

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

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

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

327

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

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

329 #, c-format

330 msgid "could not open '%s'"

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

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

334 msgid "Repository lacks these prerequisite commits:"

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

336

337 -#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

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

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

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

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

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

340 #: builtin/shortlog.c:158

341 msgid "revision walk setup failed"

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

@@ -394,7 +394,7 @@ msgstr "impossible de créer '%s'"

394 msgid "index-pack died"

395 msgstr "l'index de groupe a disparu"

396

397 -#: color.c:157

397 +#: color.c:259

398 #, c-format

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

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

@@ -444,27 +444,27 @@ msgstr "niveau de compression zlib incorrect %d"

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

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

446

447 -#: config.c:1201

447 +#: config.c:1211

448 msgid "unable to parse command-line config"

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

450

451 -#: config.c:1262

451 +#: config.c:1272

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

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

454

455 -#: config.c:1586

455 +#: config.c:1596

456 #, c-format

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

458 msgstr ""

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

460

461 -#: config.c:1588

461 +#: config.c:1598

462 #, c-format

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

464 msgstr ""

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

466

467 -#: config.c:1647

467 +#: config.c:1657

468 #, c-format

469 msgid "%s has multiple values"

470 msgstr "%s a des valeurs multiples"

@@ -711,11 +711,11 @@ msgstr[1] ""

711 msgid "%s: %s - %s"

712 msgstr "%s: %s - %s"

713

714 -#: lockfile.c:275

714 +#: lockfile.c:283

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

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

717

718 -#: lockfile.c:277

718 +#: lockfile.c:285

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

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

721

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

723 msgid "failed to read the cache"

724 msgstr "impossible de lire le cache"

725

726 -#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

727 -#: builtin/clone.c:659

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

727 +#: builtin/clone.c:662

728 msgid "unable to write new index file"

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

730

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

742 msgid "error building trees"

743 msgstr "erreur de construction des arbres"

744

745 -#: merge-recursive.c:691

745 +#: merge-recursive.c:688

746 #, c-format

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

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

749

750 -#: merge-recursive.c:702

750 +#: merge-recursive.c:699

751 #, c-format

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

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

754

755 -#: merge-recursive.c:716 merge-recursive.c:737

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

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

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

758

759 -#: merge-recursive.c:727

759 +#: merge-recursive.c:724

760 #, c-format

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

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

763

764 -#: merge-recursive.c:767

764 +#: merge-recursive.c:764

765 #, c-format

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

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

768

769 -#: merge-recursive.c:769

769 +#: merge-recursive.c:766

770 #, c-format

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

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

773

774 -#: merge-recursive.c:792 builtin/clone.c:318

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

775 #, c-format

776 msgid "failed to open '%s'"

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

778

779 -#: merge-recursive.c:800

779 +#: merge-recursive.c:797

780 #, c-format

781 msgid "failed to symlink '%s'"

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

783

784 -#: merge-recursive.c:803

784 +#: merge-recursive.c:800

785 #, c-format

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

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

788

789 -#: merge-recursive.c:941

789 +#: merge-recursive.c:938

790 msgid "Failed to execute internal merge"

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

792

793 -#: merge-recursive.c:945

793 +#: merge-recursive.c:942

794 #, c-format

795 msgid "Unable to add %s to database"

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

797

798 -#: merge-recursive.c:961

798 +#: merge-recursive.c:958

799 msgid "unsupported object type in the tree"

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

801

802 -#: merge-recursive.c:1036 merge-recursive.c:1050

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

803 #, c-format

804 msgid ""

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

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

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

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

810

811 -#: merge-recursive.c:1042 merge-recursive.c:1055

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

812 #, c-format

813 msgid ""

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

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

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

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

819

820 -#: merge-recursive.c:1096

820 +#: merge-recursive.c:1093

821 msgid "rename"

822 msgstr "renommage"

823

824 -#: merge-recursive.c:1096

824 +#: merge-recursive.c:1093

825 msgid "renamed"

826 msgstr "renommé"

827

828 -#: merge-recursive.c:1152

828 +#: merge-recursive.c:1149

829 #, c-format

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

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

832

833 -#: merge-recursive.c:1174

833 +#: merge-recursive.c:1171

834 #, c-format

835 msgid ""

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

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

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

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

841

842 -#: merge-recursive.c:1179

842 +#: merge-recursive.c:1176

843 msgid " (left unresolved)"

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

845

846 -#: merge-recursive.c:1233

846 +#: merge-recursive.c:1230

847 #, c-format

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

849 msgstr ""

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

851 ">'%s' dans %s"

852

853 -#: merge-recursive.c:1263

853 +#: merge-recursive.c:1260

854 #, c-format

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

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

857

858 -#: merge-recursive.c:1462

858 +#: merge-recursive.c:1459

859 #, c-format

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

861 msgstr ""

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

863

864 -#: merge-recursive.c:1472

864 +#: merge-recursive.c:1469

865 #, c-format

866 msgid "Adding merged %s"

867 msgstr "Ajout de %s fusionné"

868

869 -#: merge-recursive.c:1477 merge-recursive.c:1675

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

870 #, c-format

871 msgid "Adding as %s instead"

872 msgstr "Ajout plutôt comme %s"

873

874 -#: merge-recursive.c:1528

874 +#: merge-recursive.c:1525

875 #, c-format

876 msgid "cannot read object %s"

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

878

879 -#: merge-recursive.c:1531

879 +#: merge-recursive.c:1528

880 #, c-format

881 msgid "object %s is not a blob"

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

883

884 -#: merge-recursive.c:1579

884 +#: merge-recursive.c:1576

885 msgid "modify"

886 msgstr "modification"

887

888 -#: merge-recursive.c:1579

888 +#: merge-recursive.c:1576

889 msgid "modified"

890 msgstr "modifié"

891

892 -#: merge-recursive.c:1589

892 +#: merge-recursive.c:1586

893 msgid "content"

894 msgstr "contenu"

895

896 -#: merge-recursive.c:1596

896 +#: merge-recursive.c:1593

897 msgid "add/add"

898 msgstr "ajout/ajout"

899

900 -#: merge-recursive.c:1630

900 +#: merge-recursive.c:1627

901 #, c-format

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

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

904

905 -#: merge-recursive.c:1644

905 +#: merge-recursive.c:1641

906 #, c-format

907 msgid "Auto-merging %s"

908 msgstr "Fusion automatique de %s"

909

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

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

911 msgid "submodule"

912 msgstr "sous-module"

913

914 -#: merge-recursive.c:1649

914 +#: merge-recursive.c:1646

915 #, c-format

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

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

918

919 -#: merge-recursive.c:1735

919 +#: merge-recursive.c:1732

920 #, c-format

921 msgid "Removing %s"

922 msgstr "Suppression de %s"

923

924 -#: merge-recursive.c:1760

924 +#: merge-recursive.c:1757

925 msgid "file/directory"

926 msgstr "fichier/répertoire"

927

928 -#: merge-recursive.c:1766

928 +#: merge-recursive.c:1763

929 msgid "directory/file"

930 msgstr "répertoire/fichier"

931

932 -#: merge-recursive.c:1771

932 +#: merge-recursive.c:1768

933 #, c-format

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

935 msgstr ""

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

937

938 -#: merge-recursive.c:1781

938 +#: merge-recursive.c:1778

939 #, c-format

940 msgid "Adding %s"

941 msgstr "Ajout de %s"

942

943 -#: merge-recursive.c:1798

943 +#: merge-recursive.c:1795

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

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

946

947 -#: merge-recursive.c:1817

947 +#: merge-recursive.c:1814

948 msgid "Already up-to-date!"

949 msgstr "Déjà à jour !"

950

951 -#: merge-recursive.c:1826

951 +#: merge-recursive.c:1823

952 #, c-format

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

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

955

956 -#: merge-recursive.c:1856

956 +#: merge-recursive.c:1853

957 #, c-format

958 msgid "Unprocessed path??? %s"

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

960

961 -#: merge-recursive.c:1901

961 +#: merge-recursive.c:1898

962 msgid "Merging:"

963 msgstr "Fusion :"

964

965 -#: merge-recursive.c:1914

965 +#: merge-recursive.c:1911

966 #, c-format

967 msgid "found %u common ancestor:"

968 msgid_plural "found %u common ancestors:"

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

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

971

972 -#: merge-recursive.c:1951

972 +#: merge-recursive.c:1948

973 msgid "merge returned no commit"

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

975

976 -#: merge-recursive.c:2008

976 +#: merge-recursive.c:2005

977 #, c-format

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

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

980

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

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

982 msgid "Unable to write index."

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

984

@@ -986,19 +986,19 @@ msgstr "Impossible d'écrire l'index."

986 msgid "Cannot commit uninitialized/unreferenced notes tree"

987 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"

988

989 -#: notes-utils.c:83

989 +#: notes-utils.c:82

990 #, c-format

991 msgid "Bad notes.rewriteMode value: '%s'"

992 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"

993

994 -#: notes-utils.c:93

994 +#: notes-utils.c:92

995 #, c-format

996 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

997 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

998

999 #. TRANSLATORS: The first %s is the name of the

1000 #. environment variable, the second %s is its value

1001 -#: notes-utils.c:120

1001 +#: notes-utils.c:119

1002 #, c-format

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

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

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

1109 msgid "done"

1110 msgstr "fait"

1111

1112 -#: read-cache.c:1261

1112 +#: read-cache.c:1267

1113 #, c-format

1114 msgid ""

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

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

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

1119 "Utilisation de la version %i"

1120

1121 -#: read-cache.c:1271

1121 +#: read-cache.c:1277

1122 #, c-format

1123 msgid ""

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

@@ -1146,32 +1146,32 @@ msgstr "%s suit à la fois %s et %s"

1146 msgid "Internal error"

1147 msgstr "Erreur interne"

1148

1149 -#: remote.c:1968

1149 +#: remote.c:1980

1150 #, c-format

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

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

1153

1154 -#: remote.c:1972

1154 +#: remote.c:1984

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

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

1157

1158 -#: remote.c:1975

1158 +#: remote.c:1987

1159 #, c-format

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

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

1162

1163 -#: remote.c:1979

1163 +#: remote.c:1991

1164 #, c-format

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

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

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

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

1169

1170 -#: remote.c:1985

1170 +#: remote.c:1997

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

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

1173

1174 -#: remote.c:1988

1174 +#: remote.c:2000

1175 #, c-format

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

1177 msgid_plural ""

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

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

1184 "en avance rapide.\n"

1185

1186 -#: remote.c:1996

1186 +#: remote.c:2008

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

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

1189

1190 -#: remote.c:1999

1190 +#: remote.c:2011

1191 #, c-format

1192 msgid ""

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

@@ -1202,7 +1202,7 @@ msgstr[1] ""

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

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

1204

1205 -#: remote.c:2009

1205 +#: remote.c:2021

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

1207 msgstr ""

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

@@ -1216,22 +1216,22 @@ msgstr "échec de l'ouverture de /dev/null"

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

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

1218

1219 -#: send-pack.c:265

1219 +#: send-pack.c:268

1220 msgid "failed to sign the push certificate"

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

1222

1223 -#: send-pack.c:322

1223 +#: send-pack.c:325

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

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

1226

1227 -#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1228 -#: builtin/merge.c:1002 builtin/merge.c:1012

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

1228 +#: builtin/merge.c:1005

1229 #, c-format

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

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

1232

1233 -#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1234 -#: builtin/merge.c:1004 builtin/merge.c:1017

1233 +#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997

1234 +#: builtin/merge.c:1010

1235 #, c-format

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

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

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

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

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

1256

1257 -#: sequencer.c:211 sequencer.c:852 sequencer.c:935

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

1258 #, c-format

1259 msgid "Could not write to %s"

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

@@ -1277,44 +1277,44 @@ msgid "Commit your changes or stash them to proceed."

1277 msgstr "Validez vos modifications ou les remiser pour continuer."

1278

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

1280 -#: sequencer.c:304

1280 +#: sequencer.c:321

1281 #, c-format

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

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

1284

1285 -#: sequencer.c:335

1285 +#: sequencer.c:339

1286 msgid "Could not resolve HEAD commit\n"

1287 msgstr "Impossible de résoudre le commit HEAD\n"

1288

1289 -#: sequencer.c:355

1289 +#: sequencer.c:359

1290 msgid "Unable to update cache tree\n"

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

1292

1293 -#: sequencer.c:402

1293 +#: sequencer.c:406

1294 #, c-format

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

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

1297

1298 -#: sequencer.c:407

1298 +#: sequencer.c:411

1299 #, c-format

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

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

1302

1303 -#: sequencer.c:473

1303 +#: sequencer.c:477

1304 msgid "Your index file is unmerged."

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

1306

1307 -#: sequencer.c:492

1307 +#: sequencer.c:496

1308 #, c-format

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

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

1311

1312 -#: sequencer.c:500

1312 +#: sequencer.c:504

1313 #, c-format

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

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

1316

1317 -#: sequencer.c:504

1317 +#: sequencer.c:508

1318 #, c-format

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

1320 msgstr ""

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

1323

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

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

1326 -#: sequencer.c:517

1326 +#: sequencer.c:521

1327 #, c-format

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

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

1330

1331 -#: sequencer.c:521

1331 +#: sequencer.c:525

1332 #, c-format

1333 msgid "Cannot get commit message for %s"

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

1335

1336 -#: sequencer.c:607

1336 +#: sequencer.c:611

1337 #, c-format

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

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

1340

1341 -#: sequencer.c:608

1341 +#: sequencer.c:612

1342 #, c-format

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

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

1345

1346 -#: sequencer.c:644

1346 +#: sequencer.c:648

1347 msgid "empty commit set passed"

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

1349

1350 -#: sequencer.c:652

1350 +#: sequencer.c:656

1351 #, c-format

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

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

1354

1355 -#: sequencer.c:656

1355 +#: sequencer.c:660

1356 #, c-format

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

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

1359

1360 -#: sequencer.c:716

1360 +#: sequencer.c:720

1361 #, c-format

1362 msgid "Cannot %s during a %s"

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

1364

1365 -#: sequencer.c:738

1365 +#: sequencer.c:742

1366 #, c-format

1367 msgid "Could not parse line %d."

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

1369

1370 -#: sequencer.c:743

1370 +#: sequencer.c:747

1371 msgid "No commits parsed."

1372 msgstr "Aucun commit analysé."

1373

1374 -#: sequencer.c:756

1374 +#: sequencer.c:760

1375 #, c-format

1376 msgid "Could not open %s"

1377 msgstr "Impossible d'ouvrir %s"

1378

1379 -#: sequencer.c:760

1379 +#: sequencer.c:764

1380 #, c-format

1381 msgid "Could not read %s."

1382 msgstr "Impossible de lire %s."

1383

1384 -#: sequencer.c:767

1384 +#: sequencer.c:771

1385 #, c-format

1386 msgid "Unusable instruction sheet: %s"

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

1388

1389 -#: sequencer.c:797

1389 +#: sequencer.c:801

1390 #, c-format

1391 msgid "Invalid key: %s"

1392 msgstr "Clé invalide: %s"

1393

1394 -#: sequencer.c:800

1394 +#: sequencer.c:804

1395 #, c-format

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

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

1398

1399 -#: sequencer.c:812

1399 +#: sequencer.c:816

1400 #, c-format

1401 msgid "Malformed options sheet: %s"

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

1403

1404 -#: sequencer.c:833

1404 +#: sequencer.c:837

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

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

1407

1408 -#: sequencer.c:834

1408 +#: sequencer.c:838

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

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

1411

1412 -#: sequencer.c:838

1412 +#: sequencer.c:842

1413 #, c-format

1414 msgid "Could not create sequencer directory %s"

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

1416

1417 -#: sequencer.c:854 sequencer.c:939

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

1418 #, c-format

1419 msgid "Error wrapping up %s."

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

1421

1422 -#: sequencer.c:873 sequencer.c:1009

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

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

1424 msgstr "aucun picorage ou retour en cours"

1425

1426 -#: sequencer.c:875

1426 +#: sequencer.c:879

1427 msgid "cannot resolve HEAD"

1428 msgstr "impossible de résoudre HEAD"

1429

1430 -#: sequencer.c:877

1430 +#: sequencer.c:881

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

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

1433

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

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

1435 #, c-format

1436 msgid "cannot open %s: %s"

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

1438

1439 -#: sequencer.c:902

1439 +#: sequencer.c:906

1440 #, c-format

1441 msgid "cannot read %s: %s"

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

1443

1444 -#: sequencer.c:903

1444 +#: sequencer.c:907

1445 msgid "unexpected end of file"

1446 msgstr "fin de fichier inattendue"

1447

1448 -#: sequencer.c:909

1448 +#: sequencer.c:913

1449 #, c-format

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

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

1452

1453 -#: sequencer.c:932

1453 +#: sequencer.c:936

1454 #, c-format

1455 msgid "Could not format %s."

1456 msgstr "Impossible de formater %s."

1457

1458 -#: sequencer.c:1077

1458 +#: sequencer.c:1081

1459 #, c-format

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

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

1462

1463 -#: sequencer.c:1080

1463 +#: sequencer.c:1084

1464 #, c-format

1465 msgid "%s: bad revision"

1466 msgstr "%s : mauvaise révision"

1467

1468 -#: sequencer.c:1114

1468 +#: sequencer.c:1118

1469 msgid "Can't revert as initial commit"

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

1471

1472 -#: sequencer.c:1115

1472 +#: sequencer.c:1119

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

1474 msgstr "Impossible de picorer vers une HEAD vide"

1475

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

1543 msgid "staging updated .gitmodules failed"

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

1545

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

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

1547 #, c-format

1548 msgid "Could not create git link %s"

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

@@ -1553,28 +1553,28 @@ msgstr "Impossible de créer le lien git %s"

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

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

1555

1556 -#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565

1557 -#: trailer.c:569

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

1557 +#: trailer.c:570

1558 #, c-format

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

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

1561

1562 -#: trailer.c:551 trailer.c:556 builtin/remote.c:288

1562 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1563 #, c-format

1564 msgid "more than one %s"

1565 msgstr "plus d'un %s"

1566

1567 -#: trailer.c:589

1567 +#: trailer.c:590

1568 #, c-format

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

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

1571

1572 -#: trailer.c:709

1572 +#: trailer.c:710

1573 #, c-format

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

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

1576

1577 -#: trailer.c:712

1577 +#: trailer.c:713

1578 msgid "could not read from stdin"

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

1580

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

1782 msgid "bug: unhandled diff status %c"

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

1784

1785 -#: wt-status.c:761

1785 +#: wt-status.c:758

1786 msgid "Submodules changed but not updated:"

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

1788

1789 -#: wt-status.c:763

1789 +#: wt-status.c:760

1790 msgid "Submodule changes to be committed:"

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

1792

1793 -#: wt-status.c:842

1793 +#: wt-status.c:839

1794 msgid ""

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

1796 "Everything below will be removed."

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

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

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

1800

1801 -#: wt-status.c:933

1801 +#: wt-status.c:930

1802 msgid "You have unmerged paths."

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

1804

1805 -#: wt-status.c:936

1805 +#: wt-status.c:933

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

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

1808

1809 -#: wt-status.c:939

1809 +#: wt-status.c:936

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

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

1812

1813 -#: wt-status.c:942

1813 +#: wt-status.c:939

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

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

1816

1817 -#: wt-status.c:952

1817 +#: wt-status.c:949

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

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

1820

1821 -#: wt-status.c:955

1821 +#: wt-status.c:952

1822 msgid "The current patch is empty."

1823 msgstr "Le patch actuel est vide."

1824

1825 -#: wt-status.c:959

1825 +#: wt-status.c:956

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

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

1828

1829 -#: wt-status.c:961

1829 +#: wt-status.c:958

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

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

1832

1833 -#: wt-status.c:963

1833 +#: wt-status.c:960

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

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

1836

1837 -#: wt-status.c:1023 wt-status.c:1040

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

1838 #, c-format

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

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

1841

1842 -#: wt-status.c:1028 wt-status.c:1045

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

1843 msgid "You are currently rebasing."

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

1845

1846 -#: wt-status.c:1031

1846 +#: wt-status.c:1028

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

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

1849

1850 -#: wt-status.c:1033

1850 +#: wt-status.c:1030

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

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

1853

1854 -#: wt-status.c:1035

1854 +#: wt-status.c:1032

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

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

1857

1858 -#: wt-status.c:1048

1858 +#: wt-status.c:1045

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

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

1861

1862 -#: wt-status.c:1052

1862 +#: wt-status.c:1049

1863 #, c-format

1864 msgid ""

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

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

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

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

1869

1870 -#: wt-status.c:1057

1870 +#: wt-status.c:1054

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

1872 msgstr ""

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

1874

1875 -#: wt-status.c:1060

1875 +#: wt-status.c:1057

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

1877 msgstr ""

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

1879

1880 -#: wt-status.c:1064

1880 +#: wt-status.c:1061

1881 #, c-format

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

1883 msgstr ""

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

1885 "branche '%s' sur '%s'."

1886

1887 -#: wt-status.c:1069

1887 +#: wt-status.c:1066

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

1889 msgstr ""

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

1891

1892 -#: wt-status.c:1072

1892 +#: wt-status.c:1069

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

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

1895

1896 -#: wt-status.c:1074

1896 +#: wt-status.c:1071

1897 msgid ""

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

1899 msgstr ""

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

1901 "modifications)"

1902

1903 -#: wt-status.c:1084

1903 +#: wt-status.c:1081

1904 #, c-format

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

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

1907

1908 -#: wt-status.c:1089

1908 +#: wt-status.c:1086

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

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

1911

1912 -#: wt-status.c:1092

1912 +#: wt-status.c:1089

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

1914 msgstr ""

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

1916

1917 -#: wt-status.c:1094

1917 +#: wt-status.c:1091

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

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

1920

1921 -#: wt-status.c:1103

1921 +#: wt-status.c:1100

1922 #, c-format

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

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

1925

1926 -#: wt-status.c:1108

1926 +#: wt-status.c:1105

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

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

1929

1930 -#: wt-status.c:1111

1930 +#: wt-status.c:1108

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

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

1933

1934 -#: wt-status.c:1113

1934 +#: wt-status.c:1110

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

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

1937

1938 -#: wt-status.c:1124

1938 +#: wt-status.c:1121

1939 #, c-format

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

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

1942

1943 -#: wt-status.c:1128

1943 +#: wt-status.c:1125

1944 msgid "You are currently bisecting."

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

1946

1947 -#: wt-status.c:1131

1947 +#: wt-status.c:1128

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

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

1950

1951 -#: wt-status.c:1306

1951 +#: wt-status.c:1303

1952 msgid "On branch "

1953 msgstr "Sur la branche "

1954

1955 -#: wt-status.c:1313

1955 +#: wt-status.c:1310

1956 msgid "rebase in progress; onto "

1957 msgstr "rebasage en cours ; sur "

1958

1959 -#: wt-status.c:1320

1959 +#: wt-status.c:1317

1960 msgid "HEAD detached at "

1961 msgstr "HEAD détachée sur "

1962

1963 -#: wt-status.c:1322

1963 +#: wt-status.c:1319

1964 msgid "HEAD detached from "

1965 msgstr "HEAD détachée depuis "

1966

1967 -#: wt-status.c:1325

1967 +#: wt-status.c:1322

1968 msgid "Not currently on any branch."

1969 msgstr "Actuellement sur aucun branche."

1970

1971 -#: wt-status.c:1342

1971 +#: wt-status.c:1339

1972 msgid "Initial commit"

1973 msgstr "Validation initiale"

1974

1975 -#: wt-status.c:1356

1975 +#: wt-status.c:1353

1976 msgid "Untracked files"

1977 msgstr "Fichiers non suivis"

1978

1979 -#: wt-status.c:1358

1979 +#: wt-status.c:1355

1980 msgid "Ignored files"

1981 msgstr "Fichiers ignorés"

1982

1983 -#: wt-status.c:1362

1983 +#: wt-status.c:1359

1984 #, c-format

1985 msgid ""

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

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

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

1993 "status')."

1994

1995 -#: wt-status.c:1368

1995 +#: wt-status.c:1365

1996 #, c-format

1997 msgid "Untracked files not listed%s"

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

1999

2000 -#: wt-status.c:1370

2000 +#: wt-status.c:1367

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

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

2003

2004 -#: wt-status.c:1376

2004 +#: wt-status.c:1373

2005 msgid "No changes"

2006 msgstr "Aucune modification"

2007

2008 -#: wt-status.c:1381

2008 +#: wt-status.c:1378

2009 #, c-format

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

2011 msgstr ""

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

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

2014

2015 -#: wt-status.c:1384

2015 +#: wt-status.c:1381

2016 #, c-format

2017 msgid "no changes added to commit\n"

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

2019

2020 -#: wt-status.c:1387

2020 +#: wt-status.c:1384

2021 #, c-format

2022 msgid ""

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

@@ -2026,53 +2026,53 @@ msgstr ""

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

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

2028

2029 -#: wt-status.c:1390

2029 +#: wt-status.c:1387

2030 #, c-format

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

2032 msgstr ""

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

2034 "sont présents\n"

2035

2036 -#: wt-status.c:1393

2036 +#: wt-status.c:1390

2037 #, c-format

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

2039 msgstr ""

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

2041 "suivre)\n"

2042

2043 -#: wt-status.c:1396 wt-status.c:1401

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

2044 #, c-format

2045 msgid "nothing to commit\n"

2046 msgstr "rien à valider\n"

2047

2048 -#: wt-status.c:1399

2048 +#: wt-status.c:1396

2049 #, c-format

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

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

2052

2053 -#: wt-status.c:1403

2053 +#: wt-status.c:1400

2054 #, c-format

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

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

2057

2058 -#: wt-status.c:1512

2058 +#: wt-status.c:1509

2059 msgid "HEAD (no branch)"

2060 msgstr "HEAD (aucune branche)"

2061

2062 -#: wt-status.c:1518

2062 +#: wt-status.c:1515

2063 msgid "Initial commit on "

2064 msgstr "Validation initiale sur "

2065

2066 # à priori on parle d'une branche ici

2067 -#: wt-status.c:1550

2067 +#: wt-status.c:1547

2068 msgid "gone"

2069 msgstr "disparue"

2070

2071 -#: wt-status.c:1552 wt-status.c:1560

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

2072 msgid "behind "

2073 msgstr "derrière "

2074

2075 -#: compat/precompose_utf8.c:55 builtin/clone.c:357

2075 +#: compat/precompose_utf8.c:55 builtin/clone.c:360

2076 #, c-format

2077 msgid "failed to unlink '%s'"

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

@@ -2132,13 +2132,13 @@ msgstr ""

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

2133

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

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

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

2136 #: builtin/rm.c:269

2137 msgid "dry run"

2138 msgstr "simuler l'action"

2139

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

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

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

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

2143 msgid "be verbose"

2144 msgstr "mode verbeux"

@@ -2147,7 +2147,7 @@ msgstr "mode verbeux"

2147 msgid "interactive picking"

2148 msgstr "sélection interactive"

2149

2150 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2150 +#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286

2151 msgid "select hunks interactively"

2152 msgstr "sélection interactive des sections"

2153

@@ -2195,10 +2195,6 @@ msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"

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

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

2197

2198 -#: builtin/add.c:287

2199 -msgid "no files added"

2200 -msgstr "aucun fichier ajouté"

2201 -

2198 #: builtin/add.c:293

2199 msgid "adding files failed"

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

@@ -2488,7 +2484,7 @@ msgstr "%s : le patch ne s'applique pas"

2484 msgid "Checking patch %s..."

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

2486

2491 -#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

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

2488 #, c-format

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

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

@@ -2569,7 +2565,7 @@ msgstr "entrée non reconnue"

2565 msgid "unable to read index file"

2566 msgstr "lecture du fichier d'index impossible"

2567

2572 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

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

2569 #: builtin/fetch.c:93

2570 msgid "path"

2571 msgstr "chemin"

@@ -3123,8 +3119,8 @@ msgid "act on remote-tracking branches"

3119 msgstr "agir sur les branches de suivi distantes"

3120

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

3126 -#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

3127 -#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

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

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

3124 #: builtin/tag.c:622

3125 msgid "commit"

3126 msgstr "commit"

@@ -3170,8 +3166,8 @@ msgid "edit the description for the branch"

3166 msgstr "éditer la description de la branche"

3167

3168 #: builtin/branch.c:851

3173 -msgid "force creation (when already exists)"

3174 -msgstr "forcer la création (même si la cible existe)"

3169 +msgid "force creation, move/rename, deletion"

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

3171

3172 #: builtin/branch.c:854

3173 msgid "print only not merged branches"

@@ -3189,7 +3185,7 @@ msgstr "afficher les branches en colonnes"

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

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

3187

3192 -#: builtin/branch.c:881 builtin/clone.c:634

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

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

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

3191

@@ -3197,37 +3193,37 @@ msgstr "HEAD non trouvée sous refs/heads !"

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

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

3195

3200 -#: builtin/branch.c:909 builtin/branch.c:948

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

3197 msgid "branch name required"

3198 msgstr "le nom de branche est requis"

3199

3204 -#: builtin/branch.c:924

3200 +#: builtin/branch.c:929

3201 msgid "Cannot give description to detached HEAD"

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

3203

3208 -#: builtin/branch.c:929

3204 +#: builtin/branch.c:934

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

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

3207

3212 -#: builtin/branch.c:936

3208 +#: builtin/branch.c:941

3209 #, c-format

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

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

3212

3217 -#: builtin/branch.c:939

3213 +#: builtin/branch.c:944

3214 #, c-format

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

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

3217

3222 -#: builtin/branch.c:954

3218 +#: builtin/branch.c:959

3219 msgid "too many branches for a rename operation"

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

3221

3226 -#: builtin/branch.c:959

3222 +#: builtin/branch.c:964

3223 msgid "too many branches to set new upstream"

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

3225

3230 -#: builtin/branch.c:963

3226 +#: builtin/branch.c:968

3227 #, c-format

3228 msgid ""

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

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

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

3232 "aucune branche."

3233

3238 -#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

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

3235 #, c-format

3236 msgid "no such branch '%s'"

3237 msgstr "pas de branche '%s'"

3238

3243 -#: builtin/branch.c:970

3239 +#: builtin/branch.c:975

3240 #, c-format

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

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

3243

3248 -#: builtin/branch.c:982

3244 +#: builtin/branch.c:987

3245 msgid "too many branches to unset upstream"

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

3247

3252 -#: builtin/branch.c:986

3248 +#: builtin/branch.c:991

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

3250 msgstr ""

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

3252 "aucune branche."

3253

3258 -#: builtin/branch.c:992

3254 +#: builtin/branch.c:997

3255 #, c-format

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

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

3258

3263 -#: builtin/branch.c:1006

3259 +#: builtin/branch.c:1011

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

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

3262

3267 -#: builtin/branch.c:1012

3263 +#: builtin/branch.c:1017

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

3265 msgstr ""

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

3267

3272 -#: builtin/branch.c:1015

3268 +#: builtin/branch.c:1020

3269 #, c-format

3270 msgid ""

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

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

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

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

3276

3281 -#: builtin/branch.c:1032

3277 +#: builtin/branch.c:1037

3278 #, c-format

3279 msgid ""

3280 "\n"

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

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

3286 "\n"

3287

3292 -#: builtin/branch.c:1033

3288 +#: builtin/branch.c:1038

3289 #, c-format

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

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

3292

3297 -#: builtin/branch.c:1034

3293 +#: builtin/branch.c:1039

3294 #, c-format

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

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

@@ -3379,7 +3375,7 @@ msgid "terminate input and output records by a NUL character"

3375 msgstr ""

3376 "terminer les enregistrements en entrée et en sortie par un caractère NUL"

3377

3382 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

3378 +#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274

3379 msgid "suppress progress reporting"

3380 msgstr "supprimer l'état d'avancement"

3381

@@ -3486,107 +3482,107 @@ msgstr "git checkout [options] <branche>"

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

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

3484

3489 -#: builtin/checkout.c:114 builtin/checkout.c:147

3485 +#: builtin/checkout.c:132 builtin/checkout.c:165

3486 #, c-format

3487 msgid "path '%s' does not have our version"

3488 msgstr "le chemin '%s' n'a pas notre version"

3489

3494 -#: builtin/checkout.c:116 builtin/checkout.c:149

3490 +#: builtin/checkout.c:134 builtin/checkout.c:167

3491 #, c-format

3492 msgid "path '%s' does not have their version"

3493 msgstr "le chemin '%s' n'a pas leur version"

3494

3499 -#: builtin/checkout.c:132

3495 +#: builtin/checkout.c:150

3496 #, c-format

3497 msgid "path '%s' does not have all necessary versions"

3498 msgstr "le chemin '%s' n'a aucune des versions nécessaires"

3499

3504 -#: builtin/checkout.c:176

3500 +#: builtin/checkout.c:194

3501 #, c-format

3502 msgid "path '%s' does not have necessary versions"

3503 msgstr "le chemin '%s' n'a pas les versions nécessaires"

3504

3509 -#: builtin/checkout.c:193

3505 +#: builtin/checkout.c:211

3506 #, c-format

3507 msgid "path '%s': cannot merge"

3508 msgstr "chemin '%s' : impossible de fusionner"

3509

3514 -#: builtin/checkout.c:210

3510 +#: builtin/checkout.c:228

3511 #, c-format

3512 msgid "Unable to add merge result for '%s'"

3513 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"

3514

3519 -#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3520 -#: builtin/checkout.c:240

3515 +#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255

3516 +#: builtin/checkout.c:258

3517 #, c-format

3518 msgid "'%s' cannot be used with updating paths"

3519 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"

3520

3525 -#: builtin/checkout.c:243 builtin/checkout.c:246

3521 +#: builtin/checkout.c:261 builtin/checkout.c:264

3522 #, c-format

3523 msgid "'%s' cannot be used with %s"

3524 msgstr "'%s' ne peut pas être utilisé avec %s"

3525

3530 -#: builtin/checkout.c:249

3526 +#: builtin/checkout.c:267

3527 #, c-format

3528 msgid "Cannot update paths and switch to branch '%s' at the same time."

3529 msgstr ""

3530 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "

3531 "même temps."

3532

3537 -#: builtin/checkout.c:260 builtin/checkout.c:449

3533 +#: builtin/checkout.c:278 builtin/checkout.c:467

3534 msgid "corrupt index file"

3535 msgstr "fichier d'index corrompu"

3536

3541 -#: builtin/checkout.c:320 builtin/checkout.c:327

3537 +#: builtin/checkout.c:338 builtin/checkout.c:345

3538 #, c-format

3539 msgid "path '%s' is unmerged"

3540 msgstr "le chemin '%s' n'est pas fusionné"

3541

3546 -#: builtin/checkout.c:471

3542 +#: builtin/checkout.c:489

3543 msgid "you need to resolve your current index first"

3544 msgstr "vous devez d'abord résoudre votre index courant"

3545

3550 -#: builtin/checkout.c:597

3546 +#: builtin/checkout.c:615

3547 #, c-format

3548 msgid "Can not do reflog for '%s'\n"

3549 msgstr "Impossible de faire un reflog pour '%s'\n"

3550

3555 -#: builtin/checkout.c:635

3551 +#: builtin/checkout.c:653

3552 msgid "HEAD is now at"

3553 msgstr "HEAD est maintenant sur"

3554

3559 -#: builtin/checkout.c:642

3555 +#: builtin/checkout.c:660

3556 #, c-format

3557 msgid "Reset branch '%s'\n"

3558 msgstr "Remise à zéro de la branche '%s'\n"

3559

3564 -#: builtin/checkout.c:645

3560 +#: builtin/checkout.c:663

3561 #, c-format

3562 msgid "Already on '%s'\n"

3563 msgstr "Déjà sur '%s'\n"

3564

3569 -#: builtin/checkout.c:649

3565 +#: builtin/checkout.c:667

3566 #, c-format

3567 msgid "Switched to and reset branch '%s'\n"

3568 msgstr "Basculement et remise à zéro de la branche '%s'\n"

3569

3574 -#: builtin/checkout.c:651 builtin/checkout.c:1032

3570 +#: builtin/checkout.c:669 builtin/checkout.c:1050

3571 #, c-format

3572 msgid "Switched to a new branch '%s'\n"

3573 msgstr "Basculement sur la nouvelle branche '%s'\n"

3574

3579 -#: builtin/checkout.c:653

3575 +#: builtin/checkout.c:671

3576 #, c-format

3577 msgid "Switched to branch '%s'\n"

3578 msgstr "Basculement sur la branche '%s'\n"

3579

3584 -#: builtin/checkout.c:705

3580 +#: builtin/checkout.c:723

3581 #, c-format

3582 msgid " ... and %d more.\n"

3583 msgstr " ... et %d en plus.\n"

3584

3589 -#: builtin/checkout.c:711

3585 +#: builtin/checkout.c:729

3586 #, c-format

3587 msgid ""

3588 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3609,7 +3605,7 @@ msgstr[1] ""

3605 "\n"

3606 "%s\n"

3607

3612 -#: builtin/checkout.c:729

3608 +#: builtin/checkout.c:747

3609 #, c-format

3610 msgid ""

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

@@ -3625,139 +3621,139 @@ msgstr ""

3621 "git branch nouvelle_branche %s\n"

3622 "\n"

3623

3628 -#: builtin/checkout.c:759

3624 +#: builtin/checkout.c:777

3625 msgid "internal error in revision walk"

3626 msgstr "erreur interne lors du parcours des révisions"

3627

3632 -#: builtin/checkout.c:763

3628 +#: builtin/checkout.c:781

3629 msgid "Previous HEAD position was"

3634 -msgstr "La position précédente de HEAD était sur "

3630 +msgstr "La position précédente de HEAD était sur"

3631

3636 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3632 +#: builtin/checkout.c:808 builtin/checkout.c:1045

3633 msgid "You are on a branch yet to be born"

3634 msgstr "Vous êtes sur une branche qui doit encore naître"

3635

3640 -#: builtin/checkout.c:934

3636 +#: builtin/checkout.c:952

3637 #, c-format

3638 msgid "only one reference expected, %d given."

3639 msgstr "une seule référence attendue, %d fournies."

3640

3645 -#: builtin/checkout.c:973

3641 +#: builtin/checkout.c:991

3642 #, c-format

3643 msgid "invalid reference: %s"

3644 msgstr "référence invalide : %s"

3645

3650 -#: builtin/checkout.c:1002

3646 +#: builtin/checkout.c:1020

3647 #, c-format

3648 msgid "reference is not a tree: %s"

3649 msgstr "la référence n'est pas un arbre : %s"

3650

3655 -#: builtin/checkout.c:1041

3651 +#: builtin/checkout.c:1059

3652 msgid "paths cannot be used with switching branches"

3653 msgstr "impossible d'utiliser des chemins avec un basculement de branches"

3654

3659 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3655 +#: builtin/checkout.c:1062 builtin/checkout.c:1066

3656 #, c-format

3657 msgid "'%s' cannot be used with switching branches"

3658 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"

3659

3664 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3665 -#: builtin/checkout.c:1063

3660 +#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078

3661 +#: builtin/checkout.c:1081

3662 #, c-format

3663 msgid "'%s' cannot be used with '%s'"

3664 msgstr "'%s' ne peut pas être utilisé avec '%s'"

3665

3670 -#: builtin/checkout.c:1068

3666 +#: builtin/checkout.c:1086

3667 #, c-format

3668 msgid "Cannot switch branch to a non-commit '%s'"

3669 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"

3670

3675 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3671 +#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90

3672 #: builtin/remote.c:159 builtin/remote.c:161

3673 msgid "branch"

3674 msgstr "branche"

3675

3680 -#: builtin/checkout.c:1091

3676 +#: builtin/checkout.c:1109

3677 msgid "create and checkout a new branch"

3678 msgstr "créer et extraire une nouvelle branche"

3679

3684 -#: builtin/checkout.c:1093

3680 +#: builtin/checkout.c:1111

3681 msgid "create/reset and checkout a branch"

3682 msgstr "créer/réinitialiser et extraire une branche"

3683

3688 -#: builtin/checkout.c:1094

3684 +#: builtin/checkout.c:1112

3685 msgid "create reflog for new branch"

3686 msgstr "créer un reflog pour une nouvelle branche"

3687

3692 -#: builtin/checkout.c:1095

3688 +#: builtin/checkout.c:1113

3689 msgid "detach the HEAD at named commit"

3690 msgstr "détacher la HEAD à la validation nommée"

3691

3696 -#: builtin/checkout.c:1096

3692 +#: builtin/checkout.c:1114

3693 msgid "set upstream info for new branch"

3694 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"

3695

3700 -#: builtin/checkout.c:1098

3696 +#: builtin/checkout.c:1116

3697 msgid "new-branch"

3698 msgstr "nouvelle branche"

3699

3704 -#: builtin/checkout.c:1098

3700 +#: builtin/checkout.c:1116

3701 msgid "new unparented branch"

3702 msgstr "nouvelle branche sans parent"

3703

3708 -#: builtin/checkout.c:1099

3704 +#: builtin/checkout.c:1117

3705 msgid "checkout our version for unmerged files"

3706 msgstr "extraire notre version pour les fichiers non fusionnés"

3707

3712 -#: builtin/checkout.c:1101

3708 +#: builtin/checkout.c:1119

3709 msgid "checkout their version for unmerged files"

3710 msgstr "extraire leur version pour les fichiers non fusionnés"

3711

3716 -#: builtin/checkout.c:1103

3712 +#: builtin/checkout.c:1121

3713 msgid "force checkout (throw away local modifications)"

3714 msgstr "forcer l'extraction (laisser tomber les modifications locales)"

3715

3720 -#: builtin/checkout.c:1104

3716 +#: builtin/checkout.c:1122

3717 msgid "perform a 3-way merge with the new branch"

3718 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

3719

3724 -#: builtin/checkout.c:1105 builtin/merge.c:226

3720 +#: builtin/checkout.c:1123 builtin/merge.c:227

3721 msgid "update ignored files (default)"

3722 msgstr "mettre à jour les fichiers ignorés (par défaut)"

3723

3728 -#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3724 +#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245

3725 msgid "style"

3726 msgstr "style"

3727

3732 -#: builtin/checkout.c:1107

3728 +#: builtin/checkout.c:1125

3729 msgid "conflict style (merge or diff3)"

3730 msgstr "style de conflit (fusion ou diff3)"

3731

3736 -#: builtin/checkout.c:1110

3732 +#: builtin/checkout.c:1128

3733 msgid "do not limit pathspecs to sparse entries only"

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

3735

3740 -#: builtin/checkout.c:1112

3736 +#: builtin/checkout.c:1130

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

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

3739

3744 -#: builtin/checkout.c:1135

3740 +#: builtin/checkout.c:1153

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

3742 msgstr "-b, -B et --orphan sont mutuellement exclusifs"

3743

3748 -#: builtin/checkout.c:1152

3744 +#: builtin/checkout.c:1170

3745 msgid "--track needs a branch name"

3746 msgstr "--track requiert un nom de branche"

3747

3752 -#: builtin/checkout.c:1157

3748 +#: builtin/checkout.c:1175

3749 msgid "Missing branch name; try -b"

3750 msgstr "Nom de branche manquant ; essayez -b"

3751

3756 -#: builtin/checkout.c:1194

3752 +#: builtin/checkout.c:1212

3753 msgid "invalid path specification"

3754 msgstr "spécification de chemin invalide"

3755

3760 -#: builtin/checkout.c:1201

3756 +#: builtin/checkout.c:1219

3757 #, c-format

3758 msgid ""

3759 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3767,12 +3763,12 @@ msgstr ""

3763 "en même temps.\n"

3764 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

3765

3770 -#: builtin/checkout.c:1206

3766 +#: builtin/checkout.c:1224

3767 #, c-format

3768 msgid "git checkout: --detach does not take a path argument '%s'"

3769 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

3770

3775 -#: builtin/checkout.c:1210

3771 +#: builtin/checkout.c:1228

3772 msgid ""

3773 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3774 "checking out of the index."

@@ -3964,146 +3960,150 @@ msgstr ""

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

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

3962

3967 -#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

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

3964 #: builtin/push.c:514

3965 msgid "force progress reporting"

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

3967

3972 -#: builtin/clone.c:67

3968 +#: builtin/clone.c:68

3969 msgid "don't create a checkout"

3970 msgstr "ne pas créer d'extraction"

3971

3976 -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3972 +#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496

3973 msgid "create a bare repository"

3974 msgstr "créer un dépôt nu"

3975

3980 -#: builtin/clone.c:72

3976 +#: builtin/clone.c:73

3977 msgid "create a mirror repository (implies bare)"

3978 msgstr "créer un dépôt miroir (implique dépôt nu)"

3979

3984 -#: builtin/clone.c:74

3980 +#: builtin/clone.c:75

3981 msgid "to clone from a local repository"

3982 msgstr "pour cloner depuis un dépôt local"

3983

3988 -#: builtin/clone.c:76

3984 +#: builtin/clone.c:77

3985 msgid "don't use local hardlinks, always copy"

3986 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

3987

3992 -#: builtin/clone.c:78

3988 +#: builtin/clone.c:79

3989 msgid "setup as shared repository"

3990 msgstr "régler comme dépôt partagé"

3991

3996 -#: builtin/clone.c:80 builtin/clone.c:82

3992 +#: builtin/clone.c:81 builtin/clone.c:83

3993 msgid "initialize submodules in the clone"

3994 msgstr "initialiser les sous-modules dans le clone"

3995

4000 -#: builtin/clone.c:83 builtin/init-db.c:485

3996 +#: builtin/clone.c:84 builtin/init-db.c:493

3997 msgid "template-directory"

3998 msgstr "répertoire-modèle"

3999

4004 -#: builtin/clone.c:84 builtin/init-db.c:486

4000 +#: builtin/clone.c:85 builtin/init-db.c:494

4001 msgid "directory from which templates will be used"

4002 msgstr "répertoire depuis lequel les modèles vont être utilisés"

4003

4008 -#: builtin/clone.c:86

4004 +#: builtin/clone.c:87

4005 msgid "reference repository"

4006 msgstr "dépôt de référence"

4007

4012 -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

4008 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

4009 msgid "name"

4010 msgstr "nom"

4011

4016 -#: builtin/clone.c:88

4012 +#: builtin/clone.c:89

4013 msgid "use <name> instead of 'origin' to track upstream"

4014 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

4015

4020 -#: builtin/clone.c:90

4016 +#: builtin/clone.c:91

4017 msgid "checkout <branch> instead of the remote's HEAD"

4018 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

4019

4024 -#: builtin/clone.c:92

4020 +#: builtin/clone.c:93

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

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

4023

4028 -#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

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

4025 msgid "depth"

4026 msgstr "profondeur"

4027

4032 -#: builtin/clone.c:94

4028 +#: builtin/clone.c:95

4029 msgid "create a shallow clone of that depth"

4030 msgstr "créer un clone superficiel de cette profondeur"

4031

4036 -#: builtin/clone.c:96

4032 +#: builtin/clone.c:97

4033 msgid "clone only one branch, HEAD or --branch"

4034 msgstr "cloner seulement une branche, HEAD ou --branch"

4035

4040 -#: builtin/clone.c:97 builtin/init-db.c:494

4036 +#: builtin/clone.c:99

4037 +msgid "use --reference only while cloning"

4038 +msgstr "utiliser seulement --reference pour cloner"

4039 +

4040 +#: builtin/clone.c:100 builtin/init-db.c:502

4041 msgid "gitdir"

4042 msgstr "gitdir"

4043

4044 -#: builtin/clone.c:98 builtin/init-db.c:495

4044 +#: builtin/clone.c:101 builtin/init-db.c:503

4045 msgid "separate git dir from working tree"

4046 msgstr "séparer le répertoire git de la copie de travail"

4047

4048 -#: builtin/clone.c:99

4048 +#: builtin/clone.c:102

4049 msgid "key=value"

4050 msgstr "clé=valeur"

4051

4052 -#: builtin/clone.c:100

4052 +#: builtin/clone.c:103

4053 msgid "set config inside the new repository"

4054 msgstr "régler la configuration dans le nouveau dépôt"

4055

4056 -#: builtin/clone.c:253

4056 +#: builtin/clone.c:256

4057 #, c-format

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

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

4060

4061 -#: builtin/clone.c:257

4061 +#: builtin/clone.c:260

4062 #, c-format

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

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

4065

4066 -#: builtin/clone.c:260

4066 +#: builtin/clone.c:263

4067 #, c-format

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

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

4070

4071 -#: builtin/clone.c:322

4071 +#: builtin/clone.c:325

4072 #, c-format

4073 msgid "failed to create directory '%s'"

4074 msgstr "échec de la création du répertoire '%s'"

4075

4076 -#: builtin/clone.c:324 builtin/diff.c:84

4076 +#: builtin/clone.c:327 builtin/diff.c:84

4077 #, c-format

4078 msgid "failed to stat '%s'"

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

4080

4081 -#: builtin/clone.c:326

4081 +#: builtin/clone.c:329

4082 #, c-format

4083 msgid "%s exists and is not a directory"

4084 msgstr "%s existe et n'est pas un répertoire"

4085

4086 -#: builtin/clone.c:340

4086 +#: builtin/clone.c:343

4087 #, c-format

4088 msgid "failed to stat %s\n"

4089 msgstr "échec du stat de %s\n"

4090

4091 -#: builtin/clone.c:362

4091 +#: builtin/clone.c:365

4092 #, c-format

4093 msgid "failed to create link '%s'"

4094 msgstr "échec de la création du lien '%s'"

4095

4096 -#: builtin/clone.c:366

4096 +#: builtin/clone.c:369

4097 #, c-format

4098 msgid "failed to copy file to '%s'"

4099 msgstr "échec de la copie vers '%s'"

4100

4101 -#: builtin/clone.c:389 builtin/clone.c:563

4101 +#: builtin/clone.c:392 builtin/clone.c:566

4102 #, c-format

4103 msgid "done.\n"

4104 msgstr "fait.\n"

4105

4106 -#: builtin/clone.c:401

4106 +#: builtin/clone.c:404

4107 msgid ""

4108 "Clone succeeded, but checkout failed.\n"

4109 "You can inspect what was checked out with 'git status'\n"

@@ -4113,112 +4113,124 @@ msgstr ""

4113 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

4114 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

4115

4116 -#: builtin/clone.c:478

4116 +#: builtin/clone.c:481

4117 #, c-format

4118 msgid "Could not find remote branch %s to clone."

4119 msgstr "Impossible de trouver la branche distante '%s' à cloner."

4120

4121 -#: builtin/clone.c:558

4121 +#: builtin/clone.c:561

4122 #, c-format

4123 msgid "Checking connectivity... "

4124 msgstr "Vérification de la connectivité... "

4125

4126 -#: builtin/clone.c:561

4126 +#: builtin/clone.c:564

4127 msgid "remote did not send all necessary objects"

4128 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

4129

4130 -#: builtin/clone.c:625

4130 +#: builtin/clone.c:628

4131 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4132 msgstr ""

4133 "la HEAD distante réfère à une référence non existante, impossible de "

4134 "l'extraire.\n"

4135

4136 -#: builtin/clone.c:656

4136 +#: builtin/clone.c:659

4137 msgid "unable to checkout working tree"

4138 msgstr "impossible d'extraire la copie de travail"

4139

4140 -#: builtin/clone.c:765

4140 +#: builtin/clone.c:746

4141 +msgid "cannot repack to clean up"

4142 +msgstr "impossible de remballer pour nettoyer"

4143 +

4144 +#: builtin/clone.c:748

4145 +msgid "cannot unlink temporary alternates file"

4146 +msgstr "impossible de unlinker le fichier temporaire alternates"

4147 +

4148 +#: builtin/clone.c:778

4149 msgid "Too many arguments."

4150 msgstr "Trop d'arguments."

4151

4144 -#: builtin/clone.c:769

4152 +#: builtin/clone.c:782

4153 msgid "You must specify a repository to clone."

4154 msgstr "Vous devez spécifier un dépôt à cloner."

4155

4148 -#: builtin/clone.c:780

4156 +#: builtin/clone.c:793

4157 #, c-format

4158 msgid "--bare and --origin %s options are incompatible."

4159 msgstr "les options --bare et --origin %s sont incompatibles."

4160

4153 -#: builtin/clone.c:783

4161 +#: builtin/clone.c:796

4162 msgid "--bare and --separate-git-dir are incompatible."

4163 msgstr "--bare et --separate-git-dir sont incompatibles."

4164

4157 -#: builtin/clone.c:796

4165 +#: builtin/clone.c:809

4166 #, c-format

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

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

4169

4162 -#: builtin/clone.c:802 builtin/fetch.c:1155

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

4171 #, c-format

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

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

4174

4167 -#: builtin/clone.c:812

4175 +#: builtin/clone.c:825

4176 #, c-format

4177 msgid "destination path '%s' already exists and is not an empty directory."

4178 msgstr ""

4179 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

4180

4173 -#: builtin/clone.c:822

4181 +#: builtin/clone.c:835

4182 #, c-format

4183 msgid "working tree '%s' already exists."

4184 msgstr "la copie de travail '%s' existe déjà."

4185

4178 -#: builtin/clone.c:835 builtin/clone.c:847

4186 +#: builtin/clone.c:848 builtin/clone.c:860

4187 #, c-format

4188 msgid "could not create leading directories of '%s'"

4189 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

4190

4183 -#: builtin/clone.c:838

4191 +#: builtin/clone.c:851

4192 #, c-format

4193 msgid "could not create work tree dir '%s'."

4194 msgstr "impossible de créer le répertoire de la copie de travail '%s'."

4195

4188 -#: builtin/clone.c:857

4196 +#: builtin/clone.c:870

4197 #, c-format

4198 msgid "Cloning into bare repository '%s'...\n"

4199 msgstr "Clonage dans le dépôt nu '%s'\n"

4200

4193 -#: builtin/clone.c:859

4201 +#: builtin/clone.c:872

4202 #, c-format

4203 msgid "Cloning into '%s'...\n"

4204 msgstr "Clonage dans '%s'...\n"

4205

4198 -#: builtin/clone.c:895

4206 +#: builtin/clone.c:897

4207 +msgid "--dissociate given, but there is no --reference"

4208 +msgstr "--dissociate est spécifié, mais --reference est absent"

4209 +

4210 +#: builtin/clone.c:912

4211 msgid "--depth is ignored in local clones; use file:// instead."

4212 msgstr ""

4213 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

4214

4203 -#: builtin/clone.c:898

4215 +#: builtin/clone.c:915

4216 msgid "source repository is shallow, ignoring --local"

4217 msgstr "le dépôt source est superficiel, option --local ignorée"

4218

4207 -#: builtin/clone.c:903

4219 +#: builtin/clone.c:920

4220 msgid "--local is ignored"

4221 msgstr "--local est ignoré"

4222

4211 -#: builtin/clone.c:907

4223 +#: builtin/clone.c:924

4224 #, c-format

4225 msgid "Don't know how to clone %s"

4226 msgstr "Je ne sais pas cloner %s"

4227

4216 -#: builtin/clone.c:958 builtin/clone.c:966

4228 +#: builtin/clone.c:975 builtin/clone.c:983

4229 #, c-format

4230 msgid "Remote branch %s not found in upstream %s"

4231 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

4232

4221 -#: builtin/clone.c:969

4233 +#: builtin/clone.c:986

4234 msgid "You appear to have cloned an empty repository."

4235 msgstr "Vous semblez avoir cloné un dépôt vide."

4236

@@ -4405,31 +4417,26 @@ msgstr "impossible de lire l'index"

4417 msgid "unable to write temporary index file"

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

4419

4408 -#: builtin/commit.c:592

4420 +#: builtin/commit.c:584

4421 #, c-format

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

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

4424

4413 -#: builtin/commit.c:594

4425 +#: builtin/commit.c:586

4426 #, c-format

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

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

4429

4418 -#: builtin/commit.c:613

4430 +#: builtin/commit.c:605

4431 msgid "malformed --author parameter"

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

4433

4422 -#: builtin/commit.c:621

4434 +#: builtin/commit.c:613

4435 #, c-format

4436 msgid "invalid date format: %s"

4437 msgstr "format de date invalide : %s"

4438

4427 -#: builtin/commit.c:642

4428 -#, c-format

4429 -msgid "Malformed ident string: '%s'"

4430 -msgstr "Chaîne ident mal formée : '%s'"

4431 -

4432 -#: builtin/commit.c:675

4439 +#: builtin/commit.c:657

4440 msgid ""

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

4442 "in the current commit message"

@@ -4437,43 +4444,43 @@ msgstr ""

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

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

4446

4440 -#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4447 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4448 #, c-format

4449 msgid "could not lookup commit %s"

4450 msgstr "impossible de rechercher le commit %s"

4451

4445 -#: builtin/commit.c:724 builtin/shortlog.c:273

4452 +#: builtin/commit.c:706 builtin/shortlog.c:273

4453 #, c-format

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

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

4456

4450 -#: builtin/commit.c:726

4457 +#: builtin/commit.c:708

4458 msgid "could not read log from standard input"

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

4460

4454 -#: builtin/commit.c:730

4461 +#: builtin/commit.c:712

4462 #, c-format

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

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

4465

4459 -#: builtin/commit.c:752

4466 +#: builtin/commit.c:734

4467 msgid "could not read MERGE_MSG"

4468 msgstr "impossible de lire MERGE_MSG"

4469

4463 -#: builtin/commit.c:756

4470 +#: builtin/commit.c:738

4471 msgid "could not read SQUASH_MSG"

4472 msgstr "impossible de lire SQUASH_MSG"

4473

4467 -#: builtin/commit.c:760

4474 +#: builtin/commit.c:742

4475 #, c-format

4476 msgid "could not read '%s'"

4477 msgstr "impossible de lire '%s'"

4478

4472 -#: builtin/commit.c:831

4479 +#: builtin/commit.c:789

4480 msgid "could not write commit template"

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

4482

4476 -#: builtin/commit.c:849

4483 +#: builtin/commit.c:807

4484 #, c-format

4485 msgid ""

4486 "\n"

@@ -4488,7 +4495,7 @@ msgstr ""

4495 "\t%s\n"

4496 "et essayez à nouveau.\n"

4497

4491 -#: builtin/commit.c:854

4498 +#: builtin/commit.c:812

4499 #, c-format

4500 msgid ""

4501 "\n"

@@ -4503,7 +4510,7 @@ msgstr ""

4510 "\t%s\n"

4511 "et essayez à nouveau.\n"

4512

4506 -#: builtin/commit.c:867

4513 +#: builtin/commit.c:825

4514 #, c-format

4515 msgid ""

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

@@ -4513,7 +4520,7 @@ msgstr ""

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

4521 "validation.\n"

4522

4516 -#: builtin/commit.c:874

4523 +#: builtin/commit.c:832

4524 #, c-format

4525 msgid ""

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

@@ -4524,147 +4531,147 @@ msgstr ""

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

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

4533

4527 -#: builtin/commit.c:888

4534 +#: builtin/commit.c:852

4535 #, c-format

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

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

4538

4532 -#: builtin/commit.c:896

4539 +#: builtin/commit.c:860

4540 #, c-format

4541 msgid "%sDate: %s"

4542 msgstr "%sDate : %s"

4543

4537 -#: builtin/commit.c:903

4544 +#: builtin/commit.c:867

4545 #, c-format

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

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

4548

4542 -#: builtin/commit.c:921

4549 +#: builtin/commit.c:885

4550 msgid "Cannot read index"

4551 msgstr "Impossible de lire l'index"

4552

4546 -#: builtin/commit.c:978

4553 +#: builtin/commit.c:942

4554 msgid "Error building trees"

4555 msgstr "Erreur lors de la construction des arbres"

4556

4550 -#: builtin/commit.c:993 builtin/tag.c:495

4557 +#: builtin/commit.c:957 builtin/tag.c:495

4558 #, c-format

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

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

4561

4555 -#: builtin/commit.c:1095

4562 +#: builtin/commit.c:1059

4563 #, c-format

4564 msgid "No existing author found with '%s'"

4565 msgstr "Aucun auteur existant trouvé avec '%s'"

4566

4560 -#: builtin/commit.c:1110 builtin/commit.c:1350

4567 +#: builtin/commit.c:1074 builtin/commit.c:1314

4568 #, c-format

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

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

4571

4565 -#: builtin/commit.c:1147

4572 +#: builtin/commit.c:1111

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

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

4575

4569 -#: builtin/commit.c:1177

4576 +#: builtin/commit.c:1141

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

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

4579

4573 -#: builtin/commit.c:1186

4580 +#: builtin/commit.c:1150

4581 msgid "You have nothing to amend."

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

4583

4577 -#: builtin/commit.c:1189

4584 +#: builtin/commit.c:1153

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

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

4587

4581 -#: builtin/commit.c:1191

4588 +#: builtin/commit.c:1155

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

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

4591

4585 -#: builtin/commit.c:1194

4592 +#: builtin/commit.c:1158

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

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

4595

4589 -#: builtin/commit.c:1204

4596 +#: builtin/commit.c:1168

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

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

4599

4593 -#: builtin/commit.c:1206

4600 +#: builtin/commit.c:1170

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

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

4603

4597 -#: builtin/commit.c:1214

4604 +#: builtin/commit.c:1178

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

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

4607

4601 -#: builtin/commit.c:1231

4608 +#: builtin/commit.c:1195

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

4610 msgstr ""

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

4612 "être utilisée."

4613

4607 -#: builtin/commit.c:1233

4614 +#: builtin/commit.c:1197

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

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

4617

4611 -#: builtin/commit.c:1235

4618 +#: builtin/commit.c:1199

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

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

4621

4615 -#: builtin/commit.c:1237

4622 +#: builtin/commit.c:1201

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

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

4625

4619 -#: builtin/commit.c:1249 builtin/tag.c:728

4626 +#: builtin/commit.c:1213 builtin/tag.c:728

4627 #, c-format

4628 msgid "Invalid cleanup mode %s"

4629 msgstr "Mode de nettoyage invalide %s"

4630

4624 -#: builtin/commit.c:1254

4631 +#: builtin/commit.c:1218

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

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

4634

4628 -#: builtin/commit.c:1364 builtin/commit.c:1644

4635 +#: builtin/commit.c:1328 builtin/commit.c:1608

4636 msgid "show status concisely"

4637 msgstr "afficher le statut avec concision"

4638

4632 -#: builtin/commit.c:1366 builtin/commit.c:1646

4639 +#: builtin/commit.c:1330 builtin/commit.c:1610

4640 msgid "show branch information"

4641 msgstr "afficher l'information de branche"

4642

4636 -#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4643 +#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4644 msgid "machine-readable output"

4645 msgstr "sortie pour traitement automatique"

4646

4640 -#: builtin/commit.c:1371 builtin/commit.c:1650

4647 +#: builtin/commit.c:1335 builtin/commit.c:1614

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

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

4650

4644 -#: builtin/commit.c:1374 builtin/commit.c:1653

4651 +#: builtin/commit.c:1338 builtin/commit.c:1617

4652 msgid "terminate entries with NUL"

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

4654

4648 -#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4655 +#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

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

4657 msgid "mode"

4658 msgstr "mode"

4659

4653 -#: builtin/commit.c:1377 builtin/commit.c:1656

4660 +#: builtin/commit.c:1341 builtin/commit.c:1620

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

4662 msgstr ""

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

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

4665

4659 -#: builtin/commit.c:1380

4666 +#: builtin/commit.c:1344

4667 msgid "show ignored files"

4668 msgstr "afficher les fichiers ignorés"

4669

4663 -#: builtin/commit.c:1381 parse-options.h:153

4670 +#: builtin/commit.c:1345 parse-options.h:153

4671 msgid "when"

4672 msgstr "quand"

4673

4667 -#: builtin/commit.c:1382

4674 +#: builtin/commit.c:1346

4675 msgid ""

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

4677 "(Default: all)"

@@ -4672,209 +4679,209 @@ msgstr ""

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

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

4681

4675 -#: builtin/commit.c:1384

4682 +#: builtin/commit.c:1348

4683 msgid "list untracked files in columns"

4684 msgstr "afficher les fichiers non suivis en colonnes"

4685

4679 -#: builtin/commit.c:1471

4686 +#: builtin/commit.c:1435

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

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

4689

4683 -#: builtin/commit.c:1473

4690 +#: builtin/commit.c:1437

4691 msgid "could not parse newly created commit"

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

4693

4687 -#: builtin/commit.c:1518

4694 +#: builtin/commit.c:1482

4695 msgid "detached HEAD"

4696 msgstr "HEAD détachée"

4697

4691 -#: builtin/commit.c:1521

4698 +#: builtin/commit.c:1485

4699 msgid " (root-commit)"

4700 msgstr " (commit racine)"

4701

4695 -#: builtin/commit.c:1614

4702 +#: builtin/commit.c:1578

4703 msgid "suppress summary after successful commit"

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

4705

4699 -#: builtin/commit.c:1615

4706 +#: builtin/commit.c:1579

4707 msgid "show diff in commit message template"

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

4709

4703 -#: builtin/commit.c:1617

4710 +#: builtin/commit.c:1581

4711 msgid "Commit message options"

4712 msgstr "Options du message de validation"

4713

4707 -#: builtin/commit.c:1618 builtin/tag.c:601

4714 +#: builtin/commit.c:1582 builtin/tag.c:601

4715 msgid "read message from file"

4716 msgstr "lire le message depuis un fichier"

4717

4711 -#: builtin/commit.c:1619

4718 +#: builtin/commit.c:1583

4719 msgid "author"

4720 msgstr "auteur"

4721

4715 -#: builtin/commit.c:1619

4722 +#: builtin/commit.c:1583

4723 msgid "override author for commit"

4724 msgstr "remplacer l'auteur pour la validation"

4725

4719 -#: builtin/commit.c:1620 builtin/gc.c:275

4726 +#: builtin/commit.c:1584 builtin/gc.c:275

4727 msgid "date"

4728 msgstr "date"

4729

4723 -#: builtin/commit.c:1620

4730 +#: builtin/commit.c:1584

4731 msgid "override date for commit"

4732 msgstr "remplacer la date pour la validation"

4733

4727 -#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4728 -#: builtin/notes.c:565 builtin/tag.c:599

4734 +#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4735 +#: builtin/notes.c:554 builtin/tag.c:599

4736 msgid "message"

4737 msgstr "message"

4738

4732 -#: builtin/commit.c:1621

4739 +#: builtin/commit.c:1585

4740 msgid "commit message"

4741 msgstr "message de validation"

4742

4736 -#: builtin/commit.c:1622

4743 +#: builtin/commit.c:1586

4744 msgid "reuse and edit message from specified commit"

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

4746

4740 -#: builtin/commit.c:1623

4747 +#: builtin/commit.c:1587

4748 msgid "reuse message from specified commit"

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

4750

4744 -#: builtin/commit.c:1624

4751 +#: builtin/commit.c:1588

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

4753 msgstr ""

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

4755

4749 -#: builtin/commit.c:1625

4756 +#: builtin/commit.c:1589

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

4758 msgstr ""

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

4760

4754 -#: builtin/commit.c:1626

4761 +#: builtin/commit.c:1590

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

4763 msgstr ""

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

4765

4759 -#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4766 +#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4767 msgid "add Signed-off-by:"

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

4769

4763 -#: builtin/commit.c:1628

4770 +#: builtin/commit.c:1592

4771 msgid "use specified template file"

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

4773

4767 -#: builtin/commit.c:1629

4774 +#: builtin/commit.c:1593

4775 msgid "force edit of commit"

4776 msgstr "forcer l'édition du commit"

4777

4771 -#: builtin/commit.c:1630

4778 +#: builtin/commit.c:1594

4779 msgid "default"

4780 msgstr "défaut"

4781

4775 -#: builtin/commit.c:1630 builtin/tag.c:604

4782 +#: builtin/commit.c:1594 builtin/tag.c:604

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

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

4785

4779 -#: builtin/commit.c:1631

4786 +#: builtin/commit.c:1595

4787 msgid "include status in commit message template"

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

4789

4783 -#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4790 +#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4791 #: builtin/tag.c:605

4792 msgid "key-id"

4793 msgstr "id de clé"

4794

4788 -#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4795 +#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4796 msgid "GPG sign commit"

4797 msgstr "signer la validation avec GPG"

4798

4792 -#: builtin/commit.c:1636

4799 +#: builtin/commit.c:1600

4800 msgid "Commit contents options"

4801 msgstr "Valider les options des contenus"

4802

4796 -#: builtin/commit.c:1637

4803 +#: builtin/commit.c:1601

4804 msgid "commit all changed files"

4805 msgstr "valider tous les fichiers modifiés"

4806

4800 -#: builtin/commit.c:1638

4807 +#: builtin/commit.c:1602

4808 msgid "add specified files to index for commit"

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

4810

4804 -#: builtin/commit.c:1639

4811 +#: builtin/commit.c:1603

4812 msgid "interactively add files"

4813 msgstr "ajouter des fichiers en mode interactif"

4814

4808 -#: builtin/commit.c:1640

4815 +#: builtin/commit.c:1604

4816 msgid "interactively add changes"

4817 msgstr "ajouter les modifications en mode interactif"

4818

4812 -#: builtin/commit.c:1641

4819 +#: builtin/commit.c:1605

4820 msgid "commit only specified files"

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

4822

4816 -#: builtin/commit.c:1642

4823 +#: builtin/commit.c:1606

4824 msgid "bypass pre-commit hook"

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

4826

4820 -#: builtin/commit.c:1643

4827 +#: builtin/commit.c:1607

4828 msgid "show what would be committed"

4829 msgstr "afficher ce qui serait validé"

4830

4824 -#: builtin/commit.c:1654

4831 +#: builtin/commit.c:1618

4832 msgid "amend previous commit"

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

4834

4828 -#: builtin/commit.c:1655

4835 +#: builtin/commit.c:1619

4836 msgid "bypass post-rewrite hook"

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

4838

4832 -#: builtin/commit.c:1660

4839 +#: builtin/commit.c:1624

4840 msgid "ok to record an empty change"

4841 msgstr "accepter d'enregistrer une modification vide"

4842

4836 -#: builtin/commit.c:1662

4843 +#: builtin/commit.c:1626

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

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

4846

4840 -#: builtin/commit.c:1691

4847 +#: builtin/commit.c:1655

4848 msgid "could not parse HEAD commit"

4849 msgstr "impossible d'analyser le commit HEAD"

4850

4844 -#: builtin/commit.c:1730 builtin/merge.c:518

4851 +#: builtin/commit.c:1694 builtin/merge.c:519

4852 #, c-format

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

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

4855

4849 -#: builtin/commit.c:1737

4856 +#: builtin/commit.c:1701

4857 #, c-format

4858 msgid "Corrupt MERGE_HEAD file (%s)"

4859 msgstr "Fichier MERGE_HEAD corrompu (%s)"

4860

4854 -#: builtin/commit.c:1744

4861 +#: builtin/commit.c:1708

4862 msgid "could not read MERGE_MODE"

4863 msgstr "impossible de lire MERGE_MODE"

4864

4858 -#: builtin/commit.c:1763

4865 +#: builtin/commit.c:1727

4866 #, c-format

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

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

4869

4863 -#: builtin/commit.c:1774

4870 +#: builtin/commit.c:1738

4871 #, c-format

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

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

4874

4868 -#: builtin/commit.c:1779

4875 +#: builtin/commit.c:1743

4876 #, c-format

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

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

4879

4873 -#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4880 +#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4881 msgid "failed to write commit object"

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

4883

4877 -#: builtin/commit.c:1827

4884 +#: builtin/commit.c:1791

4885 msgid ""

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

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

@@ -4969,17 +4976,13 @@ msgstr "afficher tout"

4976 msgid "open an editor"

4977 msgstr "ouvrir un éditeur"

4978

4972 -#: builtin/config.c:72 builtin/config.c:73

4973 -msgid "slot"

4974 -msgstr "emplacement"

4975 -

4979 #: builtin/config.c:72

4977 -msgid "find the color configured: [default]"

4978 -msgstr "trouver la couleur configurée : [par défaut]"

4980 +msgid "find the color configured: slot [default]"

4981 +msgstr "trouver la couleur configurée : slot [par défaut]"

4982

4983 #: builtin/config.c:73

4981 -msgid "find the color setting: [stdout-is-tty]"

4982 -msgstr "trouver le réglage de la couleur : [stdout-est-tty]"

4984 +msgid "find the color setting: slot [stdout-is-tty]"

4985 +msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"

4986

4987 #: builtin/config.c:74

4988 msgid "Type"

@@ -5013,11 +5016,11 @@ msgstr "terminer les valeurs avec un caractère NUL"

5016 msgid "respect include directives on lookup"

5017 msgstr "respecter les directives d'inclusion lors de la recherche"

5018

5016 -#: builtin/config.c:315

5019 +#: builtin/config.c:316

5020 msgid "unable to parse default color value"

5021 msgstr "impossible de lire la valeur de couleur par défaut"

5022

5020 -#: builtin/config.c:455

5023 +#: builtin/config.c:457

5024 #, c-format

5025 msgid ""

5026 "# This is Git's per-user configuration file.\n"

@@ -5032,7 +5035,7 @@ msgstr ""

5035 "#\tuser = %s\n"

5036 "#\temail = %s\n"

5037

5035 -#: builtin/config.c:590

5038 +#: builtin/config.c:589

5039 #, c-format

5040 msgid "cannot create configuration file %s"

5041 msgstr "création impossible du fichier de configuration '%s'"

@@ -5465,7 +5468,7 @@ msgstr " (%s est devenu en suspens)"

5468 msgid "[deleted]"

5469 msgstr "[supprimé]"

5470

5468 -#: builtin/fetch.c:799 builtin/remote.c:1063

5471 +#: builtin/fetch.c:799 builtin/remote.c:1058

5472 msgid "(none)"

5473 msgstr "(aucun(e))"

5474

@@ -5543,30 +5546,30 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5546 msgstr ""

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

5548

5546 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5547 -#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

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

5550 +#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5551 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5552 #: parse-options.h:132 parse-options.h:239

5553 msgid "n"

5554 msgstr "n"

5555

5553 -#: builtin/fmt-merge-msg.c:664

5556 +#: builtin/fmt-merge-msg.c:663

5557 msgid "populate log with at most <n> entries from shortlog"

5558 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"

5559

5557 -#: builtin/fmt-merge-msg.c:667

5560 +#: builtin/fmt-merge-msg.c:666

5561 msgid "alias for --log (deprecated)"

5562 msgstr "alias pour --log (obsolète)"

5563

5561 -#: builtin/fmt-merge-msg.c:670

5564 +#: builtin/fmt-merge-msg.c:669

5565 msgid "text"

5566 msgstr "texte"

5567

5565 -#: builtin/fmt-merge-msg.c:671

5568 +#: builtin/fmt-merge-msg.c:670

5569 msgid "use <text> as start of message"

5570 msgstr "utiliser <texte> comme début de message"

5571

5569 -#: builtin/fmt-merge-msg.c:672

5572 +#: builtin/fmt-merge-msg.c:671

5573 msgid "file to read from"

5574 msgstr "fichier d'où lire"

5575

@@ -5591,8 +5594,8 @@ msgid "quote placeholders suitably for python"

5594 msgstr "échapper les champs réservés pour python"

5595

5596 #: builtin/for-each-ref.c:1078

5594 -msgid "quote placeholders suitably for tcl"

5595 -msgstr "échapper les champs réservés pour tcl"

5597 +msgid "quote placeholders suitably for Tcl"

5598 +msgstr "échapper les champs réservés pour compatibilité avec Tcl"

5599

5600 #: builtin/for-each-ref.c:1081

5601 msgid "show only <n> matched refs"

@@ -6077,62 +6080,62 @@ msgstr ""

6080 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"

6081 "Veuillez utiliser plutôt 'man.<outil>.cmd'."

6082

6080 -#: builtin/help.c:352

6083 +#: builtin/help.c:354

6084 #, c-format

6085 msgid "'%s': unknown man viewer."

6086 msgstr "'%s' : visualiseur de manuel inconnu."

6087

6085 -#: builtin/help.c:369

6088 +#: builtin/help.c:371

6089 msgid "no man viewer handled the request"

6090 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"

6091

6089 -#: builtin/help.c:377

6092 +#: builtin/help.c:379

6093 msgid "no info viewer handled the request"

6094 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"

6095

6093 -#: builtin/help.c:423

6096 +#: builtin/help.c:428

6097 msgid "Defining attributes per path"

6098 msgstr "Définition des attributs par chemin"

6099

6097 -#: builtin/help.c:424

6100 +#: builtin/help.c:429

6101 msgid "Everyday Git With 20 Commands Or So"

6102 msgstr "Git de tous les jours avec à peu près 20 commandes"

6103

6101 -#: builtin/help.c:425

6104 +#: builtin/help.c:430

6105 msgid "A Git glossary"

6106 msgstr "Un glossaire Git"

6107

6105 -#: builtin/help.c:426

6108 +#: builtin/help.c:431

6109 msgid "Specifies intentionally untracked files to ignore"

6110 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"

6111

6109 -#: builtin/help.c:427

6112 +#: builtin/help.c:432

6113 msgid "Defining submodule properties"

6114 msgstr "Définition des propriétés de sous-module"

6115

6113 -#: builtin/help.c:428

6116 +#: builtin/help.c:433

6117 msgid "Specifying revisions and ranges for Git"

6118 msgstr "Spécification des révisions et portées pour Git"

6119

6117 -#: builtin/help.c:429

6120 +#: builtin/help.c:434

6121 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

6122 msgstr ""

6123 "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"

6124

6122 -#: builtin/help.c:430

6125 +#: builtin/help.c:435

6126 msgid "An overview of recommended workflows with Git"

6127 msgstr "Un aperçu des flux de travail recommandés avec Git"

6128

6126 -#: builtin/help.c:442

6129 +#: builtin/help.c:447

6130 msgid "The common Git guides are:\n"

6131 msgstr "Les guides Git populaires sont : \n"

6132

6130 -#: builtin/help.c:463 builtin/help.c:480

6133 +#: builtin/help.c:468 builtin/help.c:485

6134 #, c-format

6135 msgid "usage: %s%s"

6136 msgstr "usage : %s%s"

6137

6135 -#: builtin/help.c:496

6138 +#: builtin/help.c:501

6139 #, c-format

6140 msgid "`git %s' is aliased to `%s'"

6141 msgstr "`git %s\" est un alias de `%s'"

@@ -6476,38 +6479,38 @@ msgstr "impossible de copier '%s' vers '%s'"

6479 msgid "ignoring template %s"

6480 msgstr "modèle %s ignoré"

6481

6479 -#: builtin/init-db.c:133

6482 +#: builtin/init-db.c:136

6483 #, c-format

6484 msgid "insanely long template path %s"

6485 msgstr "chemin de modèle %s démentiellement long"

6486

6484 -#: builtin/init-db.c:141

6487 +#: builtin/init-db.c:144

6488 #, c-format

6489 msgid "templates not found %s"

6490 msgstr "modèles non trouvés %s"

6491

6489 -#: builtin/init-db.c:154

6492 +#: builtin/init-db.c:157

6493 #, c-format

6494 msgid "not copying templates of a wrong format version %d from '%s'"

6495 msgstr ""

6496 "pas de copie des modèles étant dans une mauvaise version du format %d de '%s'"

6497

6495 -#: builtin/init-db.c:192

6498 +#: builtin/init-db.c:197

6499 #, c-format

6500 msgid "insane git directory %s"

6501 msgstr "répertoire git démentiel %s"

6502

6500 -#: builtin/init-db.c:323 builtin/init-db.c:326

6503 +#: builtin/init-db.c:331 builtin/init-db.c:334

6504 #, c-format

6505 msgid "%s already exists"

6506 msgstr "%s existe déjà"

6507

6505 -#: builtin/init-db.c:355

6508 +#: builtin/init-db.c:363

6509 #, c-format

6510 msgid "unable to handle file type %d"

6511 msgstr "impossible de traiter le fichier de type %d"

6512

6510 -#: builtin/init-db.c:358

6513 +#: builtin/init-db.c:366

6514 #, c-format

6515 msgid "unable to move %s to %s"

6516 msgstr "impossible de déplacer %s vers %s"

@@ -6515,24 +6518,24 @@ msgstr "impossible de déplacer %s vers %s"

6518 #. TRANSLATORS: The first '%s' is either "Reinitialized

6519 #. existing" or "Initialized empty", the second " shared" or

6520 #. "", and the last '%s%s' is the verbatim directory name.

6518 -#: builtin/init-db.c:418

6521 +#: builtin/init-db.c:426

6522 #, c-format

6523 msgid "%s%s Git repository in %s%s\n"

6524 msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n"

6525

6523 -#: builtin/init-db.c:419

6526 +#: builtin/init-db.c:427

6527 msgid "Reinitialized existing"

6528 msgstr "existant réinitialisé"

6529

6527 -#: builtin/init-db.c:419

6530 +#: builtin/init-db.c:427

6531 msgid "Initialized empty"

6532 msgstr "vide initialisé"

6533

6531 -#: builtin/init-db.c:420

6534 +#: builtin/init-db.c:428

6535 msgid " shared"

6536 msgstr " partagé"

6537

6535 -#: builtin/init-db.c:467

6538 +#: builtin/init-db.c:475

6539 msgid ""

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

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

@@ -6540,29 +6543,29 @@ msgstr ""

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

6544 "shared[=<permissions>]] [répertoire]"

6545

6543 -#: builtin/init-db.c:490

6546 +#: builtin/init-db.c:498

6547 msgid "permissions"

6548 msgstr "permissions"

6549

6547 -#: builtin/init-db.c:491

6550 +#: builtin/init-db.c:499

6551 msgid "specify that the git repository is to be shared amongst several users"

6552 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"

6553

6551 -#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172

6554 +#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171

6555 msgid "be quiet"

6556 msgstr "être silencieux"

6557

6555 -#: builtin/init-db.c:525 builtin/init-db.c:530

6558 +#: builtin/init-db.c:533 builtin/init-db.c:538

6559 #, c-format

6560 msgid "cannot mkdir %s"

6561 msgstr "impossible de créer le répertoire (mkdir) %s"

6562

6560 -#: builtin/init-db.c:534

6563 +#: builtin/init-db.c:542

6564 #, c-format

6565 msgid "cannot chdir to %s"

6566 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"

6567

6565 -#: builtin/init-db.c:555

6568 +#: builtin/init-db.c:563

6569 #, c-format

6570 msgid ""

6571 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6571,7 +6574,7 @@ msgstr ""

6574 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"

6575 "git-dir=<répertoire>)"

6576

6574 -#: builtin/init-db.c:583

6577 +#: builtin/init-db.c:591

6578 #, c-format

6579 msgid "Cannot access work tree '%s'"

6580 msgstr "Impossible d'accéder à l'arbre de travail '%s'"

@@ -6983,218 +6986,218 @@ msgstr "afficher les données de débogage"

6986 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

6987 msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"

6988

6986 -#: builtin/ls-tree.c:126

6989 +#: builtin/ls-tree.c:127

6990 msgid "only show trees"

6991 msgstr "afficher seulement les arbres"

6992

6990 -#: builtin/ls-tree.c:128

6993 +#: builtin/ls-tree.c:129

6994 msgid "recurse into subtrees"

6995 msgstr "parcourir les sous-arbres"

6996

6994 -#: builtin/ls-tree.c:130

6997 +#: builtin/ls-tree.c:131

6998 msgid "show trees when recursing"

6999 msgstr "afficher les arbres en les parcourant"

7000

6998 -#: builtin/ls-tree.c:133

7001 +#: builtin/ls-tree.c:134

7002 msgid "terminate entries with NUL byte"

7003 msgstr "terminer les éléments avec un octet NUL"

7004

7002 -#: builtin/ls-tree.c:134

7005 +#: builtin/ls-tree.c:135

7006 msgid "include object size"

7007 msgstr "inclure la taille d'objet"

7008

7006 -#: builtin/ls-tree.c:136 builtin/ls-tree.c:138

7009 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139

7010 msgid "list only filenames"

7011 msgstr "afficher seulement les noms de fichiers"

7012

7010 -#: builtin/ls-tree.c:141

7013 +#: builtin/ls-tree.c:142

7014 msgid "use full path names"

7015 msgstr "utiliser les noms de chemins complets"

7016

7014 -#: builtin/ls-tree.c:143

7017 +#: builtin/ls-tree.c:144

7018 msgid "list entire tree; not just current directory (implies --full-name)"

7019 msgstr ""

7020 "afficher l'arbre entier ; pas seulement le répertoire courant (implique --"

7021 "full-name)"

7022

7020 -#: builtin/merge.c:44

7023 +#: builtin/merge.c:45

7024 msgid "git merge [options] [<commit>...]"

7025 msgstr "git merge [options] [<commit>...]"

7026

7024 -#: builtin/merge.c:45

7027 +#: builtin/merge.c:46

7028 msgid "git merge [options] <msg> HEAD <commit>"

7029 msgstr "git merge [options] <message> HEAD <commit>"

7030

7028 -#: builtin/merge.c:46

7031 +#: builtin/merge.c:47

7032 msgid "git merge --abort"

7033 msgstr "git merge --abort"

7034

7032 -#: builtin/merge.c:99

7035 +#: builtin/merge.c:100

7036 msgid "switch `m' requires a value"

7037 msgstr "le commutateur `m' a besoin d'une valeur"

7038

7036 -#: builtin/merge.c:136

7039 +#: builtin/merge.c:137

7040 #, c-format

7041 msgid "Could not find merge strategy '%s'.\n"

7042 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"

7043

7041 -#: builtin/merge.c:137

7044 +#: builtin/merge.c:138

7045 #, c-format

7046 msgid "Available strategies are:"

7047 msgstr "Les stratégies disponibles sont :"

7048

7046 -#: builtin/merge.c:142

7049 +#: builtin/merge.c:143

7050 #, c-format

7051 msgid "Available custom strategies are:"

7052 msgstr "Les stratégies personnalisées sont :"

7053

7051 -#: builtin/merge.c:192

7054 +#: builtin/merge.c:193

7055 msgid "do not show a diffstat at the end of the merge"

7056 msgstr "ne pas afficher un diffstat à la fin de la fusion"

7057

7055 -#: builtin/merge.c:195

7058 +#: builtin/merge.c:196

7059 msgid "show a diffstat at the end of the merge"

7060 msgstr "afficher un diffstat à la fin de la fusion"

7061

7059 -#: builtin/merge.c:196

7062 +#: builtin/merge.c:197

7063 msgid "(synonym to --stat)"

7064 msgstr "(synonyme de --stat)"

7065

7063 -#: builtin/merge.c:198

7066 +#: builtin/merge.c:199

7067 msgid "add (at most <n>) entries from shortlog to merge commit message"

7068 msgstr ""

7069 "ajouter (au plus <n>) éléments du journal court au message de validation de "

7070 "la fusion"

7071

7069 -#: builtin/merge.c:201

7072 +#: builtin/merge.c:202

7073 msgid "create a single commit instead of doing a merge"

7074 msgstr "créer une validation unique au lieu de faire une fusion"

7075

7073 -#: builtin/merge.c:203

7076 +#: builtin/merge.c:204

7077 msgid "perform a commit if the merge succeeds (default)"

7078 msgstr "effectuer une validation si la fusion réussit (défaut)"

7079

7077 -#: builtin/merge.c:205

7080 +#: builtin/merge.c:206

7081 msgid "edit message before committing"

7082 msgstr "éditer le message avant la validation"

7083

7081 -#: builtin/merge.c:206

7084 +#: builtin/merge.c:207

7085 msgid "allow fast-forward (default)"

7086 msgstr "autoriser l'avance rapide (défaut)"

7087

7085 -#: builtin/merge.c:208

7088 +#: builtin/merge.c:209

7089 msgid "abort if fast-forward is not possible"

7090 msgstr "abandonner si l'avance rapide n'est pas possible"

7091

7089 -#: builtin/merge.c:212

7092 +#: builtin/merge.c:213

7093 msgid "Verify that the named commit has a valid GPG signature"

7094 msgstr "Vérifier que la validation a une signature GPG valide"

7095

7093 -#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89

7096 +#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89

7097 msgid "strategy"

7098 msgstr "stratégie"

7099

7097 -#: builtin/merge.c:214

7100 +#: builtin/merge.c:215

7101 msgid "merge strategy to use"

7102 msgstr "stratégie de fusion à utiliser"

7103

7101 -#: builtin/merge.c:215

7104 +#: builtin/merge.c:216

7105 msgid "option=value"

7106 msgstr "option=valeur"

7107

7105 -#: builtin/merge.c:216

7108 +#: builtin/merge.c:217

7109 msgid "option for selected merge strategy"

7110 msgstr "option pour la stratégie de fusion sélectionnée"

7111

7109 -#: builtin/merge.c:218

7112 +#: builtin/merge.c:219

7113 msgid "merge commit message (for a non-fast-forward merge)"

7114 msgstr ""

7115 "message de validation de la fusion (pour une fusion sans avance rapide)"

7116

7114 -#: builtin/merge.c:222

7117 +#: builtin/merge.c:223

7118 msgid "abort the current in-progress merge"

7119 msgstr "abandonner la fusion en cours"

7120

7118 -#: builtin/merge.c:250

7121 +#: builtin/merge.c:251

7122 msgid "could not run stash."

7123 msgstr "impossible de lancer le remisage."

7124

7122 -#: builtin/merge.c:255

7125 +#: builtin/merge.c:256

7126 msgid "stash failed"

7127 msgstr "échec du remisage"

7128

7126 -#: builtin/merge.c:260

7129 +#: builtin/merge.c:261

7130 #, c-format

7131 msgid "not a valid object: %s"

7132 msgstr "pas un objet valide : %s"

7133

7131 -#: builtin/merge.c:279 builtin/merge.c:296

7134 +#: builtin/merge.c:280 builtin/merge.c:297

7135 msgid "read-tree failed"

7136 msgstr "read-tree a échoué"

7137

7135 -#: builtin/merge.c:326

7138 +#: builtin/merge.c:327

7139 msgid " (nothing to squash)"

7140 msgstr " (rien à compresser)"

7141

7139 -#: builtin/merge.c:339

7142 +#: builtin/merge.c:340

7143 #, c-format

7144 msgid "Squash commit -- not updating HEAD\n"

7145 msgstr "Validation compressée -- HEAD non mise à jour\n"

7146

7144 -#: builtin/merge.c:371

7147 +#: builtin/merge.c:372

7148 msgid "Writing SQUASH_MSG"

7149 msgstr "Écriture de SQUASH_MSG"

7150

7148 -#: builtin/merge.c:373

7151 +#: builtin/merge.c:374

7152 msgid "Finishing SQUASH_MSG"

7153 msgstr "Finition de SQUASH_MSG"

7154

7152 -#: builtin/merge.c:396

7155 +#: builtin/merge.c:397

7156 #, c-format

7157 msgid "No merge message -- not updating HEAD\n"

7158 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"

7159

7157 -#: builtin/merge.c:446

7160 +#: builtin/merge.c:447

7161 #, c-format

7162 msgid "'%s' does not point to a commit"

7163 msgstr "'%s' ne pointe pas sur un commit"

7164

7162 -#: builtin/merge.c:558

7165 +#: builtin/merge.c:559

7166 #, c-format

7167 msgid "Bad branch.%s.mergeoptions string: %s"

7168 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"

7169

7167 -#: builtin/merge.c:653

7170 +#: builtin/merge.c:654

7171 msgid "git write-tree failed to write a tree"

7172 msgstr "git write-tree a échoué à écrire un arbre"

7173

7171 -#: builtin/merge.c:677

7174 +#: builtin/merge.c:678

7175 msgid "Not handling anything other than two heads merge."

7176 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."

7177

7175 -#: builtin/merge.c:691

7178 +#: builtin/merge.c:692

7179 #, c-format

7180 msgid "Unknown option for merge-recursive: -X%s"

7181 msgstr "Options inconnue pour merge-recursive : -X%s"

7182

7180 -#: builtin/merge.c:704

7183 +#: builtin/merge.c:705

7184 #, c-format

7185 msgid "unable to write %s"

7186 msgstr "impossible d'écrire %s"

7187

7185 -#: builtin/merge.c:793

7188 +#: builtin/merge.c:794

7189 #, c-format

7190 msgid "Could not read from '%s'"

7191 msgstr "Impossible de lire depuis '%s'"

7192

7190 -#: builtin/merge.c:802

7193 +#: builtin/merge.c:803

7194 #, c-format

7195 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

7196 msgstr ""

7197 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "

7198 "fusion.\n"

7199

7197 -#: builtin/merge.c:808

7200 +#: builtin/merge.c:809

7201 #, c-format

7202 msgid ""

7203 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -7211,49 +7214,49 @@ msgstr ""

7214 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"

7215 "abandonne la validation.\n"

7216

7214 -#: builtin/merge.c:832

7217 +#: builtin/merge.c:833

7218 msgid "Empty commit message."

7219 msgstr "Message de validation vide."

7220

7218 -#: builtin/merge.c:844

7221 +#: builtin/merge.c:845

7222 #, c-format

7223 msgid "Wonderful.\n"

7224 msgstr "Merveilleux.\n"

7225

7223 -#: builtin/merge.c:907

7226 +#: builtin/merge.c:900

7227 #, c-format

7228 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

7229 msgstr ""

7230 "La fusion automatique a échoué ; réglez les conflits et validez le "

7231 "résultat.\n"

7232

7230 -#: builtin/merge.c:923

7233 +#: builtin/merge.c:916

7234 #, c-format

7235 msgid "'%s' is not a commit"

7236 msgstr "'%s' n'est pas une validation"

7237

7235 -#: builtin/merge.c:964

7238 +#: builtin/merge.c:957

7239 msgid "No current branch."

7240 msgstr "Pas de branche courante."

7241

7239 -#: builtin/merge.c:966

7242 +#: builtin/merge.c:959

7243 msgid "No remote for the current branch."

7244 msgstr "Pas de branche distante pour la branche courante."

7245

7243 -#: builtin/merge.c:968

7246 +#: builtin/merge.c:961

7247 msgid "No default upstream defined for the current branch."

7248 msgstr "Pas de branche amont par défaut définie pour la branche courante."

7249

7247 -#: builtin/merge.c:973

7250 +#: builtin/merge.c:966

7251 #, c-format

7252 msgid "No remote-tracking branch for %s from %s"

7253 msgstr "Pas de branche de suivi pour %s depuis %s"

7254

7252 -#: builtin/merge.c:1129

7255 +#: builtin/merge.c:1122

7256 msgid "There is no merge to abort (MERGE_HEAD missing)."

7257 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."

7258

7256 -#: builtin/merge.c:1145

7259 +#: builtin/merge.c:1138

7260 msgid ""

7261 "You have not concluded your merge (MERGE_HEAD exists).\n"

7262 "Please, commit your changes before you merge."

@@ -7261,11 +7264,11 @@ msgstr ""

7264 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"

7265 "Veuillez valider vos modifications avant de pouvoir fusionner."

7266

7264 -#: builtin/merge.c:1148 git-pull.sh:34

7267 +#: builtin/merge.c:1141 git-pull.sh:34

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

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

7270

7268 -#: builtin/merge.c:1152

7271 +#: builtin/merge.c:1145

7272 msgid ""

7273 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

7274 "Please, commit your changes before you merge."

@@ -7273,102 +7276,102 @@ msgstr ""

7276 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"

7277 "Veuillez valider vos modifications avant de pouvoir fusionner."

7278

7276 -#: builtin/merge.c:1155

7279 +#: builtin/merge.c:1148

7280 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

7281 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."

7282

7280 -#: builtin/merge.c:1164

7283 +#: builtin/merge.c:1157

7284 msgid "You cannot combine --squash with --no-ff."

7285 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."

7286

7284 -#: builtin/merge.c:1173

7287 +#: builtin/merge.c:1166

7288 msgid "No commit specified and merge.defaultToUpstream not set."

7289 msgstr ""

7290 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."

7291

7289 -#: builtin/merge.c:1205

7292 +#: builtin/merge.c:1198

7293 msgid "Can merge only exactly one commit into empty head"

7294 msgstr ""

7295 "Possible de fusionner exactement une seule validation dans une tête vide"

7296

7294 -#: builtin/merge.c:1208

7297 +#: builtin/merge.c:1201

7298 msgid "Squash commit into empty head not supported yet"

7299 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"

7300

7298 -#: builtin/merge.c:1210

7301 +#: builtin/merge.c:1203

7302 msgid "Non-fast-forward commit does not make sense into an empty head"

7303 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"

7304

7302 -#: builtin/merge.c:1215

7305 +#: builtin/merge.c:1208

7306 #, c-format

7307 msgid "%s - not something we can merge"

7308 msgstr "%s - pas possible de fusionner ceci"

7309

7307 -#: builtin/merge.c:1266

7310 +#: builtin/merge.c:1259

7311 #, c-format

7312 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

7313 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."

7314

7312 -#: builtin/merge.c:1269

7315 +#: builtin/merge.c:1262

7316 #, c-format

7317 msgid "Commit %s has a bad GPG signature allegedly by %s."

7318 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."

7319

7317 -#: builtin/merge.c:1272

7320 +#: builtin/merge.c:1265

7321 #, c-format

7322 msgid "Commit %s does not have a GPG signature."

7323 msgstr "La validation %s n'a pas de signature GPG."

7324

7322 -#: builtin/merge.c:1275

7325 +#: builtin/merge.c:1268

7326 #, c-format

7327 msgid "Commit %s has a good GPG signature by %s\n"

7328 msgstr "La validation %s a une signature GPG correcte par %s\n"

7329

7327 -#: builtin/merge.c:1356

7330 +#: builtin/merge.c:1349

7331 #, c-format

7332 msgid "Updating %s..%s\n"

7333 msgstr "Mise à jour %s..%s\n"

7334

7332 -#: builtin/merge.c:1395

7335 +#: builtin/merge.c:1388

7336 #, c-format

7337 msgid "Trying really trivial in-index merge...\n"

7338 msgstr "Essai de fusion vraiment triviale dans l'index...\n"

7339

7337 -#: builtin/merge.c:1402

7340 +#: builtin/merge.c:1395

7341 #, c-format

7342 msgid "Nope.\n"

7343 msgstr "Non.\n"

7344

7342 -#: builtin/merge.c:1434

7345 +#: builtin/merge.c:1427

7346 msgid "Not possible to fast-forward, aborting."

7347 msgstr "Pas possible d'avancer rapidement, abandon."

7348

7346 -#: builtin/merge.c:1457 builtin/merge.c:1536

7349 +#: builtin/merge.c:1450 builtin/merge.c:1529

7350 #, c-format

7351 msgid "Rewinding the tree to pristine...\n"

7352 msgstr "Retour de l'arbre à l'original...\n"

7353

7351 -#: builtin/merge.c:1461

7354 +#: builtin/merge.c:1454

7355 #, c-format

7356 msgid "Trying merge strategy %s...\n"

7357 msgstr "Essai de la stratégie de fusion %s...\n"

7358

7356 -#: builtin/merge.c:1527

7359 +#: builtin/merge.c:1520

7360 #, c-format

7361 msgid "No merge strategy handled the merge.\n"

7362 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"

7363

7361 -#: builtin/merge.c:1529

7364 +#: builtin/merge.c:1522

7365 #, c-format

7366 msgid "Merge with strategy %s failed.\n"

7367 msgstr "La fusion avec la stratégie %s a échoué.\n"

7368

7366 -#: builtin/merge.c:1538

7369 +#: builtin/merge.c:1531

7370 #, c-format

7371 msgid "Using the %s to prepare resolving by hand.\n"

7372 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"

7373

7371 -#: builtin/merge.c:1550

7374 +#: builtin/merge.c:1543

7375 #, c-format

7376 msgid "Automatic merge went well; stopped before committing as requested\n"

7377 msgstr ""

@@ -7559,7 +7562,7 @@ msgstr "%s, source=%s, destination=%s"

7562 msgid "Renaming %s to %s\n"

7563 msgstr "Renommage de %s en %s\n"

7564

7562 -#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358

7565 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7566 #, c-format

7567 msgid "renaming '%s' failed"

7568 msgstr "le renommage de '%s' a échoué"

@@ -7611,11 +7614,9 @@ msgstr "git notes [--ref <références_notes>] [list [<object>]]"

7614

7615 #: builtin/notes.c:25

7616 msgid ""

7614 -"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

7615 -"<object>] [<object>]"

7616 -msgstr ""

7617 -"git notes [--ref <références_notes>] add [-f] [-m <message> | -F <fichier> | "

7618 -"(-c | -C) <objet>] [<objet>]"

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

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

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

7620

7621 #: builtin/notes.c:26

7622 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

@@ -7624,15 +7625,13 @@ msgstr ""

7625

7626 #: builtin/notes.c:27

7627 msgid ""

7627 -"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

7628 -"<object>] [<object>]"

7629 -msgstr ""

7630 -"git notes [--ref <références_notes>] append [-m <message> | -F <fichier> | (-"

7631 -"c | -C) <objet>] [<objet>]"

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

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

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

7631

7632 #: builtin/notes.c:28

7634 -msgid "git notes [--ref <notes_ref>] edit [<object>]"

7635 -msgstr "git notes [--ref <références_notes>] edit [<objet>]"

7633 +msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7634 +msgstr "git notes [--ref <références_notes>] edit [--allow-empty] [<objet>]"

7635

7636 #: builtin/notes.c:29

7637 msgid "git notes [--ref <notes_ref>] show [<object>]"

@@ -7717,118 +7716,117 @@ msgstr "git notes prune [<options>]"

7716 msgid "git notes get-ref"

7717 msgstr "git notes get-ref"

7718

7720 -#: builtin/notes.c:136

7719 +#: builtin/notes.c:146

7720 #, c-format

7721 msgid "unable to start 'show' for object '%s'"

7722 msgstr "impossible de démarrer 'show' pour l'objet '%s'"

7723

7725 -#: builtin/notes.c:140

7724 +#: builtin/notes.c:150

7725 msgid "could not read 'show' output"

7726 msgstr "impossible de lire la sortie de 'show'"

7727

7729 -#: builtin/notes.c:148

7728 +#: builtin/notes.c:158

7729 #, c-format

7730 msgid "failed to finish 'show' for object '%s'"

7731 msgstr "impossible de finir 'show' pour l'objet '%s'"

7732

7734 -#: builtin/notes.c:166 builtin/tag.c:477

7733 +#: builtin/notes.c:173 builtin/tag.c:477

7734 #, c-format

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

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

7737

7739 -#: builtin/notes.c:185

7738 +#: builtin/notes.c:192

7739 msgid "Please supply the note contents using either -m or -F option"

7740 msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F"

7741

7743 -#: builtin/notes.c:206 builtin/notes.c:847

7744 -#, c-format

7745 -msgid "Removing note for object %s\n"

7746 -msgstr "Suppression de la note pour l'objet %s\n"

7747 -

7748 -#: builtin/notes.c:211

7742 +#: builtin/notes.c:201

7743 msgid "unable to write note object"

7744 msgstr "impossible d'écrire l'objet note"

7745

7752 -#: builtin/notes.c:213

7746 +#: builtin/notes.c:203

7747 #, c-format

7748 msgid "The note contents have been left in %s"

7749 msgstr "Le contenu de la note a été laissé dans %s"

7750

7757 -#: builtin/notes.c:247 builtin/tag.c:693

7751 +#: builtin/notes.c:231 builtin/tag.c:693

7752 #, c-format

7753 msgid "cannot read '%s'"

7754 msgstr "impossible de lire '%s'"

7755

7762 -#: builtin/notes.c:249 builtin/tag.c:696

7756 +#: builtin/notes.c:233 builtin/tag.c:696

7757 #, c-format

7758 msgid "could not open or read '%s'"

7759 msgstr "impossible d'ouvrir ou lire '%s'"

7760

7767 -#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321

7768 -#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518

7769 -#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640

7770 -#: builtin/notes.c:842 builtin/tag.c:709

7761 +#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305

7762 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506

7763 +#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652

7764 +#: builtin/notes.c:854 builtin/tag.c:709

7765 #, c-format

7766 msgid "Failed to resolve '%s' as a valid ref."

7767 msgstr "Impossible de résoudre '%s' comme une référence valide."

7768

7775 -#: builtin/notes.c:271

7769 +#: builtin/notes.c:255

7770 #, c-format

7771 msgid "Failed to read object '%s'."

7772 msgstr "Impossible de lire l'objet '%s'."

7773

7780 -#: builtin/notes.c:275

7774 +#: builtin/notes.c:259

7775 #, c-format

7776 msgid "Cannot read note data from non-blob object '%s'."

7777 msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'."

7778

7785 -#: builtin/notes.c:315

7779 +#: builtin/notes.c:299

7780 #, c-format

7781 msgid "Malformed input line: '%s'."

7782 msgstr "Ligne en entrée malformée : '%s'."

7783

7790 -#: builtin/notes.c:330

7784 +#: builtin/notes.c:314

7785 #, c-format

7786 msgid "Failed to copy notes from '%s' to '%s'"

7787 msgstr "Impossible de copier les notes de '%s' vers '%s'"

7788

7795 -#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501

7796 -#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633

7797 -#: builtin/notes.c:907

7789 +#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489

7790 +#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645

7791 +#: builtin/notes.c:919

7792 msgid "too many parameters"

7793 msgstr "trop de paramètres"

7794

7801 -#: builtin/notes.c:387 builtin/notes.c:646

7795 +#: builtin/notes.c:371 builtin/notes.c:658

7796 #, c-format

7797 msgid "No note found for object %s."

7798 msgstr "Pas de note trouvée pour l'objet %s."

7799

7806 -#: builtin/notes.c:409 builtin/notes.c:566

7800 +#: builtin/notes.c:392 builtin/notes.c:555

7801 msgid "note contents as a string"

7802 msgstr "contenu de la note sous forme de chaîne"

7803

7810 -#: builtin/notes.c:412 builtin/notes.c:569

7804 +#: builtin/notes.c:395 builtin/notes.c:558

7805 msgid "note contents in a file"

7806 msgstr "contenu de la note dans un fichier"

7807

7814 -#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571

7815 -#: builtin/notes.c:574 builtin/tag.c:628

7808 +#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560

7809 +#: builtin/notes.c:563 builtin/tag.c:628

7810 msgid "object"

7811 msgstr "objet"

7812

7819 -#: builtin/notes.c:415 builtin/notes.c:572

7813 +#: builtin/notes.c:398 builtin/notes.c:561

7814 msgid "reuse and edit specified note object"

7815 msgstr "réutiliser et éditer l'objet de note spécifié"

7816

7823 -#: builtin/notes.c:418 builtin/notes.c:575

7817 +#: builtin/notes.c:401 builtin/notes.c:564

7818 msgid "reuse specified note object"

7819 msgstr "réutiliser l'objet de note spécifié"

7820

7827 -#: builtin/notes.c:420 builtin/notes.c:488

7821 +#: builtin/notes.c:404 builtin/notes.c:567

7822 +msgid "allow storing empty note"

7823 +msgstr "permettre de stocker une note vide"

7824 +

7825 +#: builtin/notes.c:405 builtin/notes.c:476

7826 msgid "replace existing notes"

7827 msgstr "remplacer les notes existantes"

7828

7831 -#: builtin/notes.c:454

7829 +#: builtin/notes.c:430

7830 #, c-format

7831 msgid ""

7832 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7837,25 +7835,30 @@ msgstr ""

7835 "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "

7836 "Utilisez '-f' pour écraser les notes existantes"

7837

7840 -#: builtin/notes.c:459 builtin/notes.c:536

7838 +#: builtin/notes.c:445 builtin/notes.c:524

7839 #, c-format

7840 msgid "Overwriting existing notes for object %s\n"

7841 msgstr "Écrasement des notes existantes pour l'objet %s\n"

7842

7845 -#: builtin/notes.c:489

7843 +#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859

7844 +#, c-format

7845 +msgid "Removing note for object %s\n"

7846 +msgstr "Suppression de la note pour l'objet %s\n"

7847 +

7848 +#: builtin/notes.c:477

7849 msgid "read objects from stdin"

7850 msgstr "lire les objets depuis l'entrée standard"

7851

7849 -#: builtin/notes.c:491

7852 +#: builtin/notes.c:479

7853 msgid "load rewriting config for <command> (implies --stdin)"

7854 msgstr ""

7855 "charger la configuration de réécriture pour <commande> (implique --stdin)"

7856

7854 -#: builtin/notes.c:509

7857 +#: builtin/notes.c:497

7858 msgid "too few parameters"

7859 msgstr "pas assez de paramètres"

7860

7858 -#: builtin/notes.c:530

7861 +#: builtin/notes.c:518

7862 #, c-format

7863 msgid ""

7864 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -7864,12 +7867,12 @@ msgstr ""

7867 "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "

7868 "Utilisez '-f' pour écraser les notes existantes"

7869

7867 -#: builtin/notes.c:542

7870 +#: builtin/notes.c:530

7871 #, c-format

7872 msgid "Missing notes on source object %s. Cannot copy."

7873 msgstr "Notes manquantes sur l'objet source %s. Impossible de copier."

7874

7872 -#: builtin/notes.c:591

7875 +#: builtin/notes.c:582

7876 #, c-format

7877 msgid ""

7878 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7878,15 +7881,15 @@ msgstr ""

7881 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"

7882 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"

7883

7881 -#: builtin/notes.c:738

7884 +#: builtin/notes.c:750

7885 msgid "General options"

7886 msgstr "Options générales"

7887

7885 -#: builtin/notes.c:740

7888 +#: builtin/notes.c:752

7889 msgid "Merge options"

7890 msgstr "Options de fusion"

7891

7889 -#: builtin/notes.c:742

7892 +#: builtin/notes.c:754

7893 msgid ""

7894 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7895 "cat_sort_uniq)"

@@ -7894,45 +7897,45 @@ msgstr ""

7897 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"

7898 "theirs/union/cat_sort_uniq)"

7899

7897 -#: builtin/notes.c:744

7900 +#: builtin/notes.c:756

7901 msgid "Committing unmerged notes"

7902 msgstr "Validation des notes non fusionnées"

7903

7901 -#: builtin/notes.c:746

7904 +#: builtin/notes.c:758

7905 msgid "finalize notes merge by committing unmerged notes"

7906 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"

7907

7905 -#: builtin/notes.c:748

7908 +#: builtin/notes.c:760

7909 msgid "Aborting notes merge resolution"

7910 msgstr "Abandon de la résolution de fusion des notes"

7911

7909 -#: builtin/notes.c:750

7912 +#: builtin/notes.c:762

7913 msgid "abort notes merge"

7914 msgstr "abandonner la fusion de notes"

7915

7913 -#: builtin/notes.c:845

7916 +#: builtin/notes.c:857

7917 #, c-format

7918 msgid "Object %s has no note\n"

7919 msgstr "L'objet %s n'a pas de note\n"

7920

7918 -#: builtin/notes.c:857

7921 +#: builtin/notes.c:869

7922 msgid "attempt to remove non-existent note is not an error"

7923 msgstr ""

7924 "la tentative de suppression d'une note non existante n'est pas une erreur"

7925

7923 -#: builtin/notes.c:860

7926 +#: builtin/notes.c:872

7927 msgid "read object names from the standard input"

7928 msgstr "lire les noms d'objet depuis l'entrée standard"

7929

7927 -#: builtin/notes.c:941

7930 +#: builtin/notes.c:953

7931 msgid "notes-ref"

7932 msgstr "références-notes"

7933

7931 -#: builtin/notes.c:942

7934 +#: builtin/notes.c:954

7935 msgid "use notes from <notes_ref>"

7936 msgstr "utiliser les notes depuis <références_notes>"

7937

7935 -#: builtin/notes.c:977 builtin/remote.c:1624

7938 +#: builtin/notes.c:989 builtin/remote.c:1619

7939 #, c-format

7940 msgid "Unknown subcommand: %s"

7941 msgstr "Sous-commande inconnue : %s"

@@ -7986,147 +7989,151 @@ msgstr "l'option %s n'accepte pas de valeur négative"

7989 msgid "unable to parse value '%s' for option %s"

7990 msgstr "impossible d'analyser la valeur '%s' pour l'option %s"

7991

7989 -#: builtin/pack-objects.c:2622

7992 +#: builtin/pack-objects.c:2623

7993 msgid "do not show progress meter"

7994 msgstr "ne pas afficher la barre de progression"

7995

7993 -#: builtin/pack-objects.c:2624

7996 +#: builtin/pack-objects.c:2625

7997 msgid "show progress meter"

7998 msgstr "afficher la barre de progression"

7999

7997 -#: builtin/pack-objects.c:2626

8000 +#: builtin/pack-objects.c:2627

8001 msgid "show progress meter during object writing phase"

8002 msgstr "afficher la barre de progression durant la phase d'écrite des objets"

8003

8001 -#: builtin/pack-objects.c:2629

8004 +#: builtin/pack-objects.c:2630

8005 msgid "similar to --all-progress when progress meter is shown"

8006 msgstr "similaire à --all-progress quand la barre de progression est affichée"

8007

8005 -#: builtin/pack-objects.c:2630

8008 +#: builtin/pack-objects.c:2631

8009 msgid "version[,offset]"

8010 msgstr "version[,offset]"

8011

8009 -#: builtin/pack-objects.c:2631

8012 +#: builtin/pack-objects.c:2632

8013 msgid "write the pack index file in the specified idx format version"

8014 msgstr ""

8015 "écrire le fichier d'index du paquet dans le format d'index de version "

8016 "spécifié"

8017

8015 -#: builtin/pack-objects.c:2634

8018 +#: builtin/pack-objects.c:2635

8019 msgid "maximum size of each output pack file"

8020 msgstr "taille maximum de chaque fichier paquet en sortie"

8021

8019 -#: builtin/pack-objects.c:2636

8022 +#: builtin/pack-objects.c:2637

8023 msgid "ignore borrowed objects from alternate object store"

8024 msgstr "ignorer les objets empruntés à un autre magasin d'objets"

8025

8023 -#: builtin/pack-objects.c:2638

8026 +#: builtin/pack-objects.c:2639

8027 msgid "ignore packed objects"

8028 msgstr "ignorer les objets empaquetés"

8029

8027 -#: builtin/pack-objects.c:2640

8030 +#: builtin/pack-objects.c:2641

8031 msgid "limit pack window by objects"

8032 msgstr "limiter la fenêtre d'empaquetage par objets"

8033

8031 -#: builtin/pack-objects.c:2642

8034 +#: builtin/pack-objects.c:2643

8035 msgid "limit pack window by memory in addition to object limit"

8036 msgstr ""

8037 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"

8038

8036 -#: builtin/pack-objects.c:2644

8039 +#: builtin/pack-objects.c:2645

8040 msgid "maximum length of delta chain allowed in the resulting pack"

8041 msgstr ""

8042 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"

8043

8041 -#: builtin/pack-objects.c:2646

8044 +#: builtin/pack-objects.c:2647

8045 msgid "reuse existing deltas"

8046 msgstr "réutiliser les deltas existants"

8047

8045 -#: builtin/pack-objects.c:2648

8048 +#: builtin/pack-objects.c:2649

8049 msgid "reuse existing objects"

8050 msgstr "réutiliser les objets existants"

8051

8049 -#: builtin/pack-objects.c:2650

8052 +#: builtin/pack-objects.c:2651

8053 msgid "use OFS_DELTA objects"

8054 msgstr "utiliser les objets OFS_DELTA"

8055

8053 -#: builtin/pack-objects.c:2652

8056 +#: builtin/pack-objects.c:2653

8057 msgid "use threads when searching for best delta matches"

8058 msgstr ""

8059 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "

8060 "deltas"

8061

8059 -#: builtin/pack-objects.c:2654

8062 +#: builtin/pack-objects.c:2655

8063 msgid "do not create an empty pack output"

8064 msgstr "ne pas créer un paquet vide"

8065

8063 -#: builtin/pack-objects.c:2656

8066 +#: builtin/pack-objects.c:2657

8067 msgid "read revision arguments from standard input"

8068 msgstr "lire les paramètres de révision depuis l'entrée standard"

8069

8067 -#: builtin/pack-objects.c:2658

8070 +#: builtin/pack-objects.c:2659

8071 msgid "limit the objects to those that are not yet packed"

8072 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"

8073

8071 -#: builtin/pack-objects.c:2661

8074 +#: builtin/pack-objects.c:2662

8075 msgid "include objects reachable from any reference"

8076 msgstr "inclure les objets accessibles depuis toute référence"

8077

8075 -#: builtin/pack-objects.c:2664

8078 +#: builtin/pack-objects.c:2665

8079 msgid "include objects referred by reflog entries"

8080 msgstr "inclure les objets référencés par les éléments de reflog"

8081

8079 -#: builtin/pack-objects.c:2667

8082 +#: builtin/pack-objects.c:2668

8083 msgid "include objects referred to by the index"

8084 msgstr "inclure les objets référencés par l'index"

8085

8083 -#: builtin/pack-objects.c:2670

8086 +#: builtin/pack-objects.c:2671

8087 msgid "output pack to stdout"

8088 msgstr "afficher l'empaquetage sur la sortie standard"

8089

8087 -#: builtin/pack-objects.c:2672

8090 +#: builtin/pack-objects.c:2673

8091 msgid "include tag objects that refer to objects to be packed"

8092 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"

8093

8091 -#: builtin/pack-objects.c:2674

8094 +#: builtin/pack-objects.c:2675

8095 msgid "keep unreachable objects"

8096 msgstr "garder les objets inaccessibles"

8097

8095 -#: builtin/pack-objects.c:2675 parse-options.h:140

8098 +#: builtin/pack-objects.c:2676 parse-options.h:140

8099 msgid "time"

8100 msgstr "heure"

8101

8099 -#: builtin/pack-objects.c:2676

8102 +#: builtin/pack-objects.c:2677

8103 msgid "unpack unreachable objects newer than <time>"

8104 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"

8105

8103 -#: builtin/pack-objects.c:2679

8106 +#: builtin/pack-objects.c:2680

8107 msgid "create thin packs"

8108 msgstr "créer des paquets légers"

8109

8107 -#: builtin/pack-objects.c:2681

8110 +#: builtin/pack-objects.c:2682

8111 +msgid "create packs suitable for shallow fetches"

8112 +msgstr "créer des paquets permettant des récupérations superficielles"

8113 +

8114 +#: builtin/pack-objects.c:2684

8115 msgid "ignore packs that have companion .keep file"

8116 msgstr "ignorer les paquets qui ont un fichier .keep"

8117

8111 -#: builtin/pack-objects.c:2683

8118 +#: builtin/pack-objects.c:2686

8119 msgid "pack compression level"

8120 msgstr "niveau de compression du paquet"

8121

8115 -#: builtin/pack-objects.c:2685

8122 +#: builtin/pack-objects.c:2688

8123 msgid "do not hide commits by grafts"

8124 msgstr "ne pas cacher les validations par greffes"

8125

8119 -#: builtin/pack-objects.c:2687

8126 +#: builtin/pack-objects.c:2690

8127 msgid "use a bitmap index if available to speed up counting objects"

8128 msgstr ""

8129 "utiliser un index en bitmap si disponible pour accélerer le décompte des "

8130 "objets"

8131

8125 -#: builtin/pack-objects.c:2689

8132 +#: builtin/pack-objects.c:2692

8133 msgid "write a bitmap index together with the pack index"

8134 msgstr "écrire un index en bitmap associé à l'index de paquet"

8135

8129 -#: builtin/pack-objects.c:2778

8136 +#: builtin/pack-objects.c:2783

8137 msgid "Counting objects"

8138 msgstr "Décompte des objets"

8139

@@ -8773,7 +8780,7 @@ msgstr "(supprimer)"

8780 msgid "Could not append '%s' to '%s'"

8781 msgstr "Impossible d'ajouter '%s' à '%s'"

8782

8776 -#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898

8783 +#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893

8784 #, c-format

8785 msgid "No such remote: %s"

8786 msgstr "Distante inconnue : %s"

@@ -8783,7 +8790,7 @@ msgstr "Distante inconnue : %s"

8790 msgid "Could not rename config section '%s' to '%s'"

8791 msgstr "Impossible de renommer la section de configuration '%s' en '%s'"

8792

8786 -#: builtin/remote.c:657 builtin/remote.c:850

8793 +#: builtin/remote.c:657 builtin/remote.c:845

8794 #, c-format

8795 msgid "Could not remove config section '%s'"

8796 msgstr "Impossible de supprimer la section de configuration '%s'"

@@ -8819,12 +8826,12 @@ msgstr "échec de suppression de '%s'"

8826 msgid "creating '%s' failed"

8827 msgstr "échec de création de '%s'"

8828

8822 -#: builtin/remote.c:769

8829 +#: builtin/remote.c:764

8830 #, c-format

8831 msgid "Could not remove branch %s"

8832 msgstr "Impossible de supprimer la branche %s"

8833

8827 -#: builtin/remote.c:836

8834 +#: builtin/remote.c:831

8835 msgid ""

8836 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8837 "to delete it, use:"

@@ -8839,120 +8846,120 @@ msgstr[1] ""

8846 "supprimées ;\n"

8847 "pour les supprimer, utilisez :"

8848

8842 -#: builtin/remote.c:951

8849 +#: builtin/remote.c:946

8850 #, c-format

8851 msgid " new (next fetch will store in remotes/%s)"

8852 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"

8853

8847 -#: builtin/remote.c:954

8854 +#: builtin/remote.c:949

8855 msgid " tracked"

8856 msgstr " suivi"

8857

8851 -#: builtin/remote.c:956

8858 +#: builtin/remote.c:951

8859 msgid " stale (use 'git remote prune' to remove)"

8860 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"

8861

8855 -#: builtin/remote.c:958

8862 +#: builtin/remote.c:953

8863 msgid " ???"

8864 msgstr " ???"

8865

8859 -#: builtin/remote.c:999

8866 +#: builtin/remote.c:994

8867 #, c-format

8868 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8869 msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"

8870

8864 -#: builtin/remote.c:1006

8871 +#: builtin/remote.c:1001

8872 #, c-format

8873 msgid "rebases onto remote %s"

8874 msgstr "rebase sur la distante %s"

8875

8869 -#: builtin/remote.c:1009

8876 +#: builtin/remote.c:1004

8877 #, c-format

8878 msgid " merges with remote %s"

8879 msgstr " fusionne avec la distante %s"

8880

8874 -#: builtin/remote.c:1010

8881 +#: builtin/remote.c:1005

8882 msgid " and with remote"

8883 msgstr " et avec la distante"

8884

8878 -#: builtin/remote.c:1012

8885 +#: builtin/remote.c:1007

8886 #, c-format

8887 msgid "merges with remote %s"

8888 msgstr "fusionne avec la distante %s"

8889

8883 -#: builtin/remote.c:1013

8890 +#: builtin/remote.c:1008

8891 msgid " and with remote"

8892 msgstr " et avec la distante"

8893

8887 -#: builtin/remote.c:1059

8894 +#: builtin/remote.c:1054

8895 msgid "create"

8896 msgstr "créer"

8897

8891 -#: builtin/remote.c:1062

8898 +#: builtin/remote.c:1057

8899 msgid "delete"

8900 msgstr "supprimer"

8901

8895 -#: builtin/remote.c:1066

8902 +#: builtin/remote.c:1061

8903 msgid "up to date"

8904 msgstr "à jour"

8905

8899 -#: builtin/remote.c:1069

8906 +#: builtin/remote.c:1064

8907 msgid "fast-forwardable"

8908 msgstr "peut être mis à jour en avance rapide"

8909

8903 -#: builtin/remote.c:1072

8910 +#: builtin/remote.c:1067

8911 msgid "local out of date"

8912 msgstr "le local n'est pas à jour"

8913

8907 -#: builtin/remote.c:1079

8914 +#: builtin/remote.c:1074

8915 #, c-format

8916 msgid " %-*s forces to %-*s (%s)"

8917 msgstr " %-*s force vers %-*s (%s)"

8918

8912 -#: builtin/remote.c:1082

8919 +#: builtin/remote.c:1077

8920 #, c-format

8921 msgid " %-*s pushes to %-*s (%s)"

8922 msgstr " %-*s pousse vers %-*s (%s)"

8923

8917 -#: builtin/remote.c:1086

8924 +#: builtin/remote.c:1081

8925 #, c-format

8926 msgid " %-*s forces to %s"

8927 msgstr " %-*s force vers %s"

8928

8922 -#: builtin/remote.c:1089

8929 +#: builtin/remote.c:1084

8930 #, c-format

8931 msgid " %-*s pushes to %s"

8932 msgstr " %-*s pousse vers %s"

8933

8927 -#: builtin/remote.c:1157

8934 +#: builtin/remote.c:1152

8935 msgid "do not query remotes"

8936 msgstr "ne pas interroger les distantes"

8937

8931 -#: builtin/remote.c:1184

8938 +#: builtin/remote.c:1179

8939 #, c-format

8940 msgid "* remote %s"

8941 msgstr "* distante %s"

8942

8936 -#: builtin/remote.c:1185

8943 +#: builtin/remote.c:1180

8944 #, c-format

8945 msgid " Fetch URL: %s"

8946 msgstr " URL de rapatriement : %s"

8947

8941 -#: builtin/remote.c:1186 builtin/remote.c:1333

8948 +#: builtin/remote.c:1181 builtin/remote.c:1332

8949 msgid "(no URL)"

8950 msgstr "(pas d'URL)"

8951

8945 -#: builtin/remote.c:1195 builtin/remote.c:1197

8952 +#: builtin/remote.c:1190 builtin/remote.c:1192

8953 #, c-format

8954 msgid " Push URL: %s"

8955 msgstr " URL push : %s"

8956

8950 -#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203

8957 +#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198

8958 #, c-format

8959 msgid " HEAD branch: %s"

8960 msgstr " Branche HEAD : %s"

8961

8955 -#: builtin/remote.c:1205

8962 +#: builtin/remote.c:1200

8963 #, c-format

8964 msgid ""

8965 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

@@ -8960,145 +8967,145 @@ msgstr ""

8967 " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "

8968 "suivantes) :\n"

8969

8963 -#: builtin/remote.c:1217

8970 +#: builtin/remote.c:1212

8971 #, c-format

8972 msgid " Remote branch:%s"

8973 msgid_plural " Remote branches:%s"

8974 msgstr[0] " Branche distante :%s"

8975 msgstr[1] " Branches distantes :%s"

8976

8970 -#: builtin/remote.c:1220 builtin/remote.c:1247

8977 +#: builtin/remote.c:1215 builtin/remote.c:1242

8978 msgid " (status not queried)"

8979 msgstr " (statut non demandé)"

8980

8974 -#: builtin/remote.c:1229

8981 +#: builtin/remote.c:1224

8982 msgid " Local branch configured for 'git pull':"

8983 msgid_plural " Local branches configured for 'git pull':"

8984 msgstr[0] " Branche locale configurée pour 'git pull' :"

8985 msgstr[1] " Branches locales configurées pour 'git pull' :"

8986

8980 -#: builtin/remote.c:1237

8987 +#: builtin/remote.c:1232

8988 msgid " Local refs will be mirrored by 'git push'"

8989 msgstr " Les références locales seront reflétées par 'git push'"

8990

8984 -#: builtin/remote.c:1244

8991 +#: builtin/remote.c:1239

8992 #, c-format

8993 msgid " Local ref configured for 'git push'%s:"

8994 msgid_plural " Local refs configured for 'git push'%s:"

8995 msgstr[0] " Référence locale configurée pour 'git push'%s :"

8996 msgstr[1] " Références locales configurées pour 'git push'%s :"

8997

8991 -#: builtin/remote.c:1265

8998 +#: builtin/remote.c:1260

8999 msgid "set refs/remotes/<name>/HEAD according to remote"

9000 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"

9001

8995 -#: builtin/remote.c:1267

9002 +#: builtin/remote.c:1262

9003 msgid "delete refs/remotes/<name>/HEAD"

9004 msgstr "supprimer refs/remotes/<nom>/HEAD"

9005

8999 -#: builtin/remote.c:1282

9006 +#: builtin/remote.c:1277

9007 msgid "Cannot determine remote HEAD"

9008 msgstr "Impossible de déterminer la HEAD distante"

9009

9003 -#: builtin/remote.c:1284

9010 +#: builtin/remote.c:1279

9011 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

9012 msgstr ""

9013 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "

9014 "explicitement avec :"

9015

9009 -#: builtin/remote.c:1294

9016 +#: builtin/remote.c:1289

9017 #, c-format

9018 msgid "Could not delete %s"

9019 msgstr "Impossible de supprimer %s"

9020

9014 -#: builtin/remote.c:1302

9021 +#: builtin/remote.c:1297

9022 #, c-format

9023 msgid "Not a valid ref: %s"

9024 msgstr "Référence non valide : %s"

9025

9019 -#: builtin/remote.c:1304

9026 +#: builtin/remote.c:1299

9027 #, c-format

9028 msgid "Could not setup %s"

9029 msgstr "Impossible de paramétrer %s"

9030

9024 -#: builtin/remote.c:1322

9031 +#: builtin/remote.c:1317

9032 #, c-format

9033 msgid " %s will become dangling!"

9034 msgstr " %s se retrouvera en suspens !"

9035

9029 -#: builtin/remote.c:1323

9036 +#: builtin/remote.c:1318

9037 #, c-format

9038 msgid " %s has become dangling!"

9039 msgstr " %s se retrouve en suspens !"

9040

9034 -#: builtin/remote.c:1329

9041 +#: builtin/remote.c:1328

9042 #, c-format

9043 msgid "Pruning %s"

9044 msgstr "Élimination de %s"

9045

9039 -#: builtin/remote.c:1330

9046 +#: builtin/remote.c:1329

9047 #, c-format

9048 msgid "URL: %s"

9049 msgstr "URL : %s"

9050

9044 -#: builtin/remote.c:1357

9051 +#: builtin/remote.c:1352

9052 #, c-format

9053 msgid " * [would prune] %s"

9054 msgstr " * [serait éliminé] %s"

9055

9049 -#: builtin/remote.c:1360

9056 +#: builtin/remote.c:1355

9057 #, c-format

9058 msgid " * [pruned] %s"

9059 msgstr " * [éliminé] %s"

9060

9054 -#: builtin/remote.c:1405

9061 +#: builtin/remote.c:1400

9062 msgid "prune remotes after fetching"

9063 msgstr "éliminer les distants après le rapatriement"

9064

9058 -#: builtin/remote.c:1471 builtin/remote.c:1545

9065 +#: builtin/remote.c:1466 builtin/remote.c:1540

9066 #, c-format

9067 msgid "No such remote '%s'"

9068 msgstr "Pas de serveur remote '%s'"

9069

9063 -#: builtin/remote.c:1491

9070 +#: builtin/remote.c:1486

9071 msgid "add branch"

9072 msgstr "ajouter une branche"

9073

9067 -#: builtin/remote.c:1498

9074 +#: builtin/remote.c:1493

9075 msgid "no remote specified"

9076 msgstr "pas de serveur distant spécifié"

9077

9071 -#: builtin/remote.c:1520

9078 +#: builtin/remote.c:1515

9079 msgid "manipulate push URLs"

9080 msgstr "manipuler les URLs push"

9081

9075 -#: builtin/remote.c:1522

9082 +#: builtin/remote.c:1517

9083 msgid "add URL"

9084 msgstr "ajouter une URL"

9085

9079 -#: builtin/remote.c:1524

9086 +#: builtin/remote.c:1519

9087 msgid "delete URLs"

9088 msgstr "supprimer des URLs"

9089

9083 -#: builtin/remote.c:1531

9090 +#: builtin/remote.c:1526

9091 msgid "--add --delete doesn't make sense"

9092 msgstr "--add --delete n'a aucun sens"

9093

9087 -#: builtin/remote.c:1571

9094 +#: builtin/remote.c:1566

9095 #, c-format

9096 msgid "Invalid old URL pattern: %s"

9097 msgstr "Motif d'URL ancien invalide : %s"

9098

9092 -#: builtin/remote.c:1579

9099 +#: builtin/remote.c:1574

9100 #, c-format

9101 msgid "No such URL found: %s"

9102 msgstr "Pas d'URL trouvée : %s"

9103

9097 -#: builtin/remote.c:1581

9104 +#: builtin/remote.c:1576

9105 msgid "Will not delete all non-push URLs"

9106 msgstr "Pas de suppression de toutes les URLs non-push"

9107

9101 -#: builtin/remote.c:1595

9108 +#: builtin/remote.c:1590

9109 msgid "be verbose; must be placed before a subcommand"

9110 msgstr "être verbeux : doit être placé avant une sous-commande"

9111

@@ -9106,72 +9113,72 @@ msgstr "être verbeux : doit être placé avant une sous-commande"

9113 msgid "git repack [options]"

9114 msgstr "git repack [options]"

9115

9109 -#: builtin/repack.c:160

9116 +#: builtin/repack.c:159

9117 msgid "pack everything in a single pack"

9118 msgstr "empaqueter tout dans un seul paquet"

9119

9113 -#: builtin/repack.c:162

9120 +#: builtin/repack.c:161

9121 msgid "same as -a, and turn unreachable objects loose"

9122 msgstr "identique à -a et transformer les objets inaccessibles en suspens"

9123

9117 -#: builtin/repack.c:165

9124 +#: builtin/repack.c:164

9125 msgid "remove redundant packs, and run git-prune-packed"

9126 msgstr "supprimer les paquets redondants et lancer git-prune-packed"

9127

9121 -#: builtin/repack.c:167

9128 +#: builtin/repack.c:166

9129 msgid "pass --no-reuse-delta to git-pack-objects"

9130 msgstr "passer --no-reuse-delta à git-pack-objects"

9131

9125 -#: builtin/repack.c:169

9132 +#: builtin/repack.c:168

9133 msgid "pass --no-reuse-object to git-pack-objects"

9134 msgstr "passer --no-reuse-object à git-pack-objects"

9135

9129 -#: builtin/repack.c:171

9136 +#: builtin/repack.c:170

9137 msgid "do not run git-update-server-info"

9138 msgstr "ne pas lancer git update-server-info"

9139

9133 -#: builtin/repack.c:174

9140 +#: builtin/repack.c:173

9141 msgid "pass --local to git-pack-objects"

9142 msgstr "passer --local à git-pack-objects"

9143

9137 -#: builtin/repack.c:176

9144 +#: builtin/repack.c:175

9145 msgid "write bitmap index"

9146 msgstr "écrire un index en bitmap"

9147

9141 -#: builtin/repack.c:177

9148 +#: builtin/repack.c:176

9149 msgid "approxidate"

9150 msgstr "date approximative"

9151

9145 -#: builtin/repack.c:178

9152 +#: builtin/repack.c:177

9153 msgid "with -A, do not loosen objects older than this"

9154 msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"

9155

9149 -#: builtin/repack.c:180

9156 +#: builtin/repack.c:179

9157 msgid "size of the window used for delta compression"

9158 msgstr "taille de la fenêtre utilisée pour la compression des deltas"

9159

9153 -#: builtin/repack.c:181 builtin/repack.c:185

9160 +#: builtin/repack.c:180 builtin/repack.c:184

9161 msgid "bytes"

9162 msgstr "octets"

9163

9157 -#: builtin/repack.c:182

9164 +#: builtin/repack.c:181

9165 msgid "same as the above, but limit memory size instead of entries count"

9166 msgstr ""

9167 "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"

9168

9162 -#: builtin/repack.c:184

9169 +#: builtin/repack.c:183

9170 msgid "limits the maximum delta depth"

9171 msgstr "limite la profondeur maximale des deltas"

9172

9166 -#: builtin/repack.c:186

9173 +#: builtin/repack.c:185

9174 msgid "maximum size of each packfile"

9175 msgstr "taille maximum de chaque fichier paquet"

9176

9170 -#: builtin/repack.c:188

9177 +#: builtin/repack.c:187

9178 msgid "repack objects in packs marked with .keep"

9179 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"

9180

9174 -#: builtin/repack.c:374

9181 +#: builtin/repack.c:371

9182 #, c-format

9183 msgid "removing '%s' failed"

9184 msgstr "la suppression de '%s' a échoué"

@@ -9813,11 +9820,11 @@ msgstr "supprimer la référence symbolique"

9820 msgid "shorten ref output"

9821 msgstr "raccourcir l'affichage de la référence"

9822

9816 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9823 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9824 msgid "reason"

9825 msgstr "raison"

9826

9820 -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362

9827 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358

9828 msgid "reason of the update"

9829 msgstr "raison de la mise à jour"

9830

@@ -10182,19 +10189,19 @@ msgstr ""

10189 msgid "git update-ref [options] --stdin [-z]"

10190 msgstr "git update-ref [options] --stdin [-z]"

10191

10185 -#: builtin/update-ref.c:363

10192 +#: builtin/update-ref.c:359

10193 msgid "delete the reference"

10194 msgstr "supprimer la référence"

10195

10189 -#: builtin/update-ref.c:365

10196 +#: builtin/update-ref.c:361

10197 msgid "update <refname> not the one it points to"

10198 msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"

10199

10193 -#: builtin/update-ref.c:366

10200 +#: builtin/update-ref.c:362

10201 msgid "stdin has NUL-terminated arguments"

10202 msgstr "l'entrée standard a des arguments qui se terminent par NUL"

10203

10197 -#: builtin/update-ref.c:367

10204 +#: builtin/update-ref.c:363

10205 msgid "read updates from stdin"

10206 msgstr "lire les mises à jour depuis l'entrée standard"

10207

@@ -10377,11 +10384,11 @@ msgid "update the index with reused conflict resolution if possible"

10384 msgstr ""

10385 "met à jour l'index avec les résolutions de conflit réutilisées si possible"

10386

10380 -#: git-am.sh:52

10387 +#: git-am.sh:53

10388 msgid "You need to set your committer info first"

10389 msgstr "Vous devez d'abord définir vos informations de validateur"

10390

10384 -#: git-am.sh:97

10391 +#: git-am.sh:98

10392 msgid ""

10393 "You seem to have moved HEAD since the last 'am' failure.\n"

10394 "Not rewinding to ORIG_HEAD"

@@ -10389,7 +10396,7 @@ msgstr ""

10396 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

10397 "Pas de retour à ORIG_HEAD"

10398

10392 -#: git-am.sh:107

10399 +#: git-am.sh:108

10400 #, sh-format

10401 msgid ""

10402 "When you have resolved this problem, run \"$cmdline --continue\".\n"

@@ -10401,22 +10408,22 @@ msgstr ""

10408 "Pour restaurer la branche d'origine et stopper le patchage, lancez "

10409 "\"$cmdline --abort\"."

10410

10404 -#: git-am.sh:123

10411 +#: git-am.sh:124

10412 msgid "Cannot fall back to three-way merge."

10413 msgstr "Impossible de retourner à une fusion à 3 points."

10414

10408 -#: git-am.sh:139

10415 +#: git-am.sh:140

10416 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

10417 msgstr ""

10418 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "

10419 "points."

10420

10414 -#: git-am.sh:141

10421 +#: git-am.sh:142

10422 msgid "Using index info to reconstruct a base tree..."

10423 msgstr ""

10424 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

10425

10419 -#: git-am.sh:156

10426 +#: git-am.sh:157

10427 msgid ""

10428 "Did you hand edit your patch?\n"

10429 "It does not apply to blobs recorded in its index."

@@ -10424,28 +10431,28 @@ msgstr ""

10431 "Avez-vous édité le patch à la main ?\n"

10432 "Il ne s'applique pas aux blobs enregistrés dans son index."

10433

10427 -#: git-am.sh:165

10434 +#: git-am.sh:166

10435 msgid "Falling back to patching base and 3-way merge..."

10436 msgstr "Retour à un patch de la base et fusion à 3 points..."

10437

10431 -#: git-am.sh:181

10438 +#: git-am.sh:182

10439 msgid "Failed to merge in the changes."

10440 msgstr "Échec d'intégration des modifications."

10441

10435 -#: git-am.sh:276

10442 +#: git-am.sh:277

10443 msgid "Only one StGIT patch series can be applied at once"

10444 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

10445

10439 -#: git-am.sh:363

10446 +#: git-am.sh:364

10447 #, sh-format

10448 msgid "Patch format $patch_format is not supported."

10449 msgstr "Le format de patch $patch_format n'est pas supporté."

10450

10444 -#: git-am.sh:365

10451 +#: git-am.sh:366

10452 msgid "Patch format detection failed."

10453 msgstr "Échec de détection du format du patch."

10454

10448 -#: git-am.sh:392

10455 +#: git-am.sh:398

10456 msgid ""

10457 "The -b/--binary option has been a no-op for long time, and\n"

10458 "it will be removed. Please do not use it anymore."

@@ -10453,17 +10460,17 @@ msgstr ""

10460 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

10461 "et elle sera supprimée. Veuillez ne plus l'utiliser."

10462

10456 -#: git-am.sh:486

10463 +#: git-am.sh:496

10464 #, sh-format

10465 msgid "previous rebase directory $dotest still exists but mbox given."

10466 msgstr ""

10467 "le répertoire précédent de rebasage $dotest existe toujours mais mbox donnée."

10468

10462 -#: git-am.sh:491

10469 +#: git-am.sh:501

10470 msgid "Please make up your mind. --skip or --abort?"

10471 msgstr "Décidez-vous. --skip ou --abort ?"

10472

10466 -#: git-am.sh:527

10473 +#: git-am.sh:537

10474 #, sh-format

10475 msgid ""

10476 "Stray $dotest directory found.\n"

@@ -10472,18 +10479,18 @@ msgstr ""

10479 "Répertoire abandonné $dotest trouvé.\n"

10480 "Utilisez \"git am --abort\" pour le supprimer."

10481

10475 -#: git-am.sh:535

10482 +#: git-am.sh:545

10483 msgid "Resolve operation not in progress, we are not resuming."

10484 msgstr ""

10485 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

10486 "reprise."

10487

10481 -#: git-am.sh:601

10488 +#: git-am.sh:612

10489 #, sh-format

10490 msgid "Dirty index: cannot apply patches (dirty: $files)"

10491 msgstr "Index sale : impossible d'appliquer des patchs (sales : $files)"

10492

10486 -#: git-am.sh:705

10493 +#: git-am.sh:722

10494 #, sh-format

10495 msgid ""

10496 "Patch is empty. Was it split wrong?\n"

@@ -10495,32 +10502,32 @@ msgstr ""

10502 "Pour restaurer la branche d'origine et stopper le patchage, lancez "

10503 "\"$cmdline --abort\"."

10504

10498 -#: git-am.sh:732

10505 +#: git-am.sh:749

10506 msgid "Patch does not have a valid e-mail address."

10507 msgstr "Le patch n'a pas d'adresse e-mail valide."

10508

10502 -#: git-am.sh:779

10509 +#: git-am.sh:796

10510 msgid "cannot be interactive without stdin connected to a terminal."

10511 msgstr ""

10512 "impossible d'être interactif sans entrée standard connectée à un terminal."

10513

10507 -#: git-am.sh:783

10514 +#: git-am.sh:800

10515 msgid "Commit Body is:"

10516 msgstr "Le corps de la validation est :"

10517

10518 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

10519 #. in your translation. The program will only accept English

10520 #. input at this point.

10514 -#: git-am.sh:790

10521 +#: git-am.sh:807

10522 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

10523 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

10524

10518 -#: git-am.sh:826

10525 +#: git-am.sh:843

10526 #, sh-format

10527 msgid "Applying: $FIRSTLINE"

10528 msgstr "Application : $FIRSTLINE"

10529

10523 -#: git-am.sh:847

10530 +#: git-am.sh:864

10531 msgid ""

10532 "No changes - did you forget to use 'git add'?\n"

10533 "If there is nothing left to stage, chances are that something else\n"

@@ -10531,7 +10538,7 @@ msgstr ""

10538 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

10539 "patch."

10540

10534 -#: git-am.sh:855

10541 +#: git-am.sh:872

10542 msgid ""

10543 "You still have unmerged paths in your index\n"

10544 "did you forget to use 'git add'?"

@@ -10539,16 +10546,16 @@ msgstr ""

10546 "Vous avez toujours des chemins non fusionnés dans votre index\n"

10547 "auriez-vous oublié de faire 'git add' ?"

10548

10542 -#: git-am.sh:871

10549 +#: git-am.sh:888

10550 msgid "No changes -- Patch already applied."

10551 msgstr "Pas de changement -- Patch déjà appliqué."

10552

10546 -#: git-am.sh:881

10553 +#: git-am.sh:898

10554 #, sh-format

10555 msgid "Patch failed at $msgnum $FIRSTLINE"

10556 msgstr "Le patch a échoué à $msgnum $FIRSTLINE"

10557

10551 -#: git-am.sh:884

10558 +#: git-am.sh:901

10559 #, sh-format

10560 msgid ""

10561 "The copy of the patch that failed is found in:\n"

@@ -10557,7 +10564,7 @@ msgstr ""

10564 "La copie du patch qui a échoué se trouve dans :\n"

10565 " $dotest/patch"

10566

10560 -#: git-am.sh:902

10567 +#: git-am.sh:919

10568 msgid "applying to an empty history"

10569 msgstr "application à un historique vide"

10570

@@ -10621,22 +10628,22 @@ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument."

10628 msgid "Bad rev input: $rev"

10629 msgstr "Mauvaise révision en entrée : $rev"

10630

10624 -#: git-bisect.sh:250

10631 +#: git-bisect.sh:253

10632 msgid "'git bisect bad' can take only one argument."

10633 msgstr "'git bisect bad' n'accepte qu'un seul argument."

10634

10628 -#: git-bisect.sh:273

10635 +#: git-bisect.sh:276

10636 msgid "Warning: bisecting only with a bad commit."

10637 msgstr "Attention : bissection avec seulement une mauvaise validation."

10638

10639 #. TRANSLATORS: Make sure to include [Y] and [n] in your

10640 #. translation. The program will only accept English input

10641 #. at this point.

10635 -#: git-bisect.sh:279

10642 +#: git-bisect.sh:282

10643 msgid "Are you sure [Y/n]? "

10644 msgstr "Êtes-vous sûr [Y/n] ? "

10645

10639 -#: git-bisect.sh:289

10646 +#: git-bisect.sh:292

10647 msgid ""

10648 "You need to give me at least one good and one bad revision.\n"

10649 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"

@@ -10644,7 +10651,7 @@ msgstr ""

10651 "Vous devez me donner au moins une bonne et une mauvaise révision.\n"

10652 "(Vous pouvez utiliser \"git bisect bad\" et \"git bisect good\" pour cela.)"

10653

10647 -#: git-bisect.sh:292

10654 +#: git-bisect.sh:295

10655 msgid ""

10656 "You need to start by \"git bisect start\".\n"

10657 "You then need to give me at least one good and one bad revision.\n"

@@ -10654,16 +10661,16 @@ msgstr ""

10661 "Puis vous devez me donner au moins une bonne et une mauvaise révision.\n"

10662 "(Vous pouvez utiliser \"git bisect bad\" et \"git bisect good\" pour cela.)"

10663

10657 -#: git-bisect.sh:363 git-bisect.sh:490

10664 +#: git-bisect.sh:366 git-bisect.sh:493

10665 msgid "We are not bisecting."

10666 msgstr "Pas de bissection en cours."

10667

10661 -#: git-bisect.sh:370

10668 +#: git-bisect.sh:373

10669 #, sh-format

10670 msgid "'$invalid' is not a valid commit"

10671 msgstr "'$invalid' n'est pas une validation valide"

10672

10666 -#: git-bisect.sh:379

10673 +#: git-bisect.sh:382

10674 #, sh-format

10675 msgid ""

10676 "Could not check out original HEAD '$branch'.\n"

@@ -10672,25 +10679,25 @@ msgstr ""

10679 "Échec d'extraction de la HEAD d'origine '$branch'.\n"

10680 "Essayez 'git bisect reset <commit>'."

10681

10675 -#: git-bisect.sh:406

10682 +#: git-bisect.sh:409

10683 msgid "No logfile given"

10684 msgstr "Pas de fichier de log donné"

10685

10679 -#: git-bisect.sh:407

10686 +#: git-bisect.sh:410

10687 #, sh-format

10688 msgid "cannot read $file for replaying"

10689 msgstr "impossible de lire $file pour rejouer"

10690

10684 -#: git-bisect.sh:424

10691 +#: git-bisect.sh:427

10692 msgid "?? what are you talking about?"

10693 msgstr "?? de quoi parlez-vous ?"

10694

10688 -#: git-bisect.sh:436

10695 +#: git-bisect.sh:439

10696 #, sh-format

10697 msgid "running $command"

10698 msgstr "lancement de $command"

10699

10693 -#: git-bisect.sh:443

10700 +#: git-bisect.sh:446

10701 #, sh-format

10702 msgid ""

10703 "bisect run failed:\n"

@@ -10699,11 +10706,11 @@ msgstr ""

10706 "la bissection a échoué :\n"

10707 "le code retour $res de '$command' est < 0 ou >= 128"

10708

10702 -#: git-bisect.sh:469

10709 +#: git-bisect.sh:472

10710 msgid "bisect run cannot continue any more"

10711 msgstr "la bissection ne peut plus continuer"

10712

10706 -#: git-bisect.sh:475

10713 +#: git-bisect.sh:478

10714 #, sh-format

10715 msgid ""

10716 "bisect run failed:\n"

@@ -10712,7 +10719,7 @@ msgstr ""

10719 "la bissection a échoué :\n"

10720 "'bisect_state $state' a retourné le code erreur $res"

10721

10715 -#: git-bisect.sh:482

10722 +#: git-bisect.sh:485

10723 msgid "bisect run success"

10724 msgstr "succès de la bissection"

10725

@@ -11370,6 +11377,18 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"

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

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

11379

11380 +#~ msgid "no files added"

11381 +#~ msgstr "aucun fichier ajouté"

11382 +

11383 +#~ msgid "force creation (when already exists)"

11384 +#~ msgstr "forcer la création (même si la cible existe)"

11385 +

11386 +#~ msgid "Malformed ident string: '%s'"

11387 +#~ msgstr "Chaîne ident mal formée : '%s'"

11388 +

11389 +#~ msgid "slot"

11390 +#~ msgstr "emplacement"

11391 +

11392 #~ msgid "Failed to lock ref for update"

11393 #~ msgstr "Échec du verrouillage de la référence pour mise à jour"

11394

l10n: fr.po v2.3.0 round 1