f29a2d82f4 · matheusbsbs/matheus-bagliano

@@ -74,8 +74,8 @@ msgid ""

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2018-03-16 07:29+0800\n"

78 -"PO-Revision-Date: 2018-03-23 23:03+0100\n"

77 +"POT-Creation-Date: 2018-05-31 23:32+0800\n"

78 +"PO-Revision-Date: 2018-06-03 16:32+0200\n"

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

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

81 "Language: fr\n"

@@ -84,37 +84,37 @@ msgstr ""

84 "Content-Transfer-Encoding: 8bit\n"

85 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"

86

87 -#: advice.c:62

87 +#: advice.c:92

88 #, c-format

89 -msgid "hint: %.*s\n"

90 -msgstr "astuce: %.*s\n"

89 +msgid "%shint: %.*s%s\n"

90 +msgstr "%sastuce: %.*s%s\n"

91

92 -#: advice.c:90

92 +#: advice.c:137

93 msgid "Cherry-picking is not possible because you have unmerged files."

94 msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."

95

96 -#: advice.c:92

96 +#: advice.c:139

97 msgid "Committing is not possible because you have unmerged files."

98 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."

99

100 -#: advice.c:94

100 +#: advice.c:141

101 msgid "Merging is not possible because you have unmerged files."

102 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."

103

104 -#: advice.c:96

104 +#: advice.c:143

105 msgid "Pulling is not possible because you have unmerged files."

106 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."

107

108 -#: advice.c:98

108 +#: advice.c:145

109 msgid "Reverting is not possible because you have unmerged files."

110 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."

111

112 -#: advice.c:100

112 +#: advice.c:147

113 #, c-format

114 msgid "It is not possible to %s because you have unmerged files."

115 msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."

116

117 -#: advice.c:108

117 +#: advice.c:155

118 msgid ""

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

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

@@ -122,23 +122,23 @@ msgstr ""

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

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

124

125 -#: advice.c:116

125 +#: advice.c:163

126 msgid "Exiting because of an unresolved conflict."

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

128

129 -#: advice.c:121 builtin/merge.c:1251

129 +#: advice.c:168 builtin/merge.c:1249

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

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

132

133 -#: advice.c:123

133 +#: advice.c:170

134 msgid "Please, commit your changes before merging."

135 msgstr "Veuillez valider vos changements avant de fusionner."

136

137 -#: advice.c:124

137 +#: advice.c:171

138 msgid "Exiting because of unfinished merge."

139 msgstr "Abandon à cause d'une fusion non terminée."

140

141 -#: advice.c:130

141 +#: advice.c:177

142 #, c-format

143 msgid ""

144 "Note: checking out '%s'.\n"

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

419 msgid "cannot checkout %s"

420 msgstr "extraction de %s impossible"

421

422 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

422 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

423 #, c-format

424 msgid "failed to read %s"

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

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

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

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

626

627 -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

627 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

628 #, c-format

629 msgid "cannot open %s"

630 msgstr "impossible d'ouvrir %s"

@@ -678,15 +678,15 @@ msgid_plural "%d lines applied after fixing whitespace errors."

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

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

680

681 -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

681 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

682 msgid "Unable to write new index file"

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

684

685 #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

686 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

687 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

688 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

689 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

686 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

687 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

688 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

689 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

690 #: git-add--interactive.perl:197

691 msgid "path"

692 msgstr "chemin"

@@ -763,7 +763,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"

763

764 #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

765 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

766 -#: builtin/pack-objects.c:3035

766 +#: builtin/pack-objects.c:3177

767 msgid "action"

768 msgstr "action"

769

@@ -793,9 +793,9 @@ msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"

793 msgid "allow overlapping hunks"

794 msgstr "accepter les recouvrements de sections"

795

796 -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

797 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

798 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

796 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21

797 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

798 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

799 msgid "be verbose"

800 msgstr "mode verbeux"

801

@@ -836,7 +836,7 @@ msgstr ""

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

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

838

839 -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

839 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

840 #, c-format

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

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

@@ -857,10 +857,10 @@ msgstr "préfixe"

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

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

859

860 -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

861 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

860 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

861 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

862 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

863 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

863 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

864 #: parse-options.h:165

865 msgid "file"

866 msgstr "fichier"

@@ -893,8 +893,8 @@ msgstr "compression efficace"

893 msgid "list supported archive formats"

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

895

896 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

897 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

896 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

897 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

898 msgid "repo"

899 msgstr "dépôt"

900

@@ -945,22 +945,22 @@ msgstr ""

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

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

947

948 -#: bisect.c:460

948 +#: bisect.c:461

949 #, c-format

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

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

952

953 -#: bisect.c:668

953 +#: bisect.c:669

954 #, c-format

955 msgid "We cannot bisect more!\n"

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

957

958 -#: bisect.c:722

958 +#: bisect.c:723

959 #, c-format

960 msgid "Not a valid commit name %s"

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

962

963 -#: bisect.c:746

963 +#: bisect.c:747

964 #, c-format

965 msgid ""

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

@@ -969,7 +969,7 @@ msgstr ""

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

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

971

972 -#: bisect.c:751

972 +#: bisect.c:752

973 #, c-format

974 msgid ""

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

@@ -978,7 +978,7 @@ msgstr ""

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

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

980

981 -#: bisect.c:756

981 +#: bisect.c:757

982 #, c-format

983 msgid ""

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

@@ -987,7 +987,7 @@ msgstr ""

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

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

989

990 -#: bisect.c:764

990 +#: bisect.c:765

991 #, c-format

992 msgid ""

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

@@ -998,7 +998,7 @@ msgstr ""

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

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

1000

1001 -#: bisect.c:777

1001 +#: bisect.c:778

1002 #, c-format

1003 msgid ""

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

@@ -1010,36 +1010,36 @@ msgstr ""

1010 "et %s.\n"

1011 "On continue tout de même."

1012

1013 -#: bisect.c:810

1013 +#: bisect.c:811

1014 #, c-format

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

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

1017

1018 -#: bisect.c:850

1018 +#: bisect.c:851

1019 #, c-format

1020 msgid "a %s revision is needed"

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

1022

1023 -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

1023 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

1024 #, c-format

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

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

1027

1028 -#: bisect.c:920

1028 +#: bisect.c:921

1029 #, c-format

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

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

1032

1033 -#: bisect.c:950

1033 +#: bisect.c:951

1034 msgid "reading bisect refs failed"

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

1036

1037 -#: bisect.c:969

1037 +#: bisect.c:970

1038 #, c-format

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

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

1041

1042 -#: bisect.c:977

1042 +#: bisect.c:978

1043 #, c-format

1044 msgid ""

1045 "No testable commit found.\n"

@@ -1048,7 +1048,7 @@ msgstr ""

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

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

1050

1051 -#: bisect.c:996

1051 +#: bisect.c:997

1052 #, c-format

1053 msgid "(roughly %d step)"

1054 msgid_plural "(roughly %d steps)"

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

1058 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1059 #. steps)" translation.

1060 #.

1061 -#: bisect.c:1002

1061 +#: bisect.c:1003

1062 #, c-format

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

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

1065 msgstr[0] "Bissection : %d révision à tester après cette %s\n"

1066 msgstr[1] "Bissection : %d révisions à tester après cette %s\n"

1067

1068 -#: blame.c:1758

1068 +#: blame.c:1756

1069 msgid "--contents and --reverse do not blend well."

1070 msgstr "--contents et --reverse ne font pas bon ménage."

1071

1072 -#: blame.c:1769

1072 +#: blame.c:1767

1073 msgid "cannot use --contents with final commit object name"

1074 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"

1075

1076 -#: blame.c:1789

1076 +#: blame.c:1787

1077 msgid "--reverse and --first-parent together require specified latest commit"

1078 msgstr ""

1079 "--reverse et --first-parent ensemble nécessitent la spécification d'un "

1080 "dernier commit"

1081

1082 -#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1083 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1084 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1085 -#: builtin/shortlog.c:191

1082 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

1083 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1084 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371

1085 +#: builtin/shortlog.c:192

1086 msgid "revision walk setup failed"

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

1088

1089 -#: blame.c:1816

1089 +#: blame.c:1814

1090 msgid ""

1091 "--reverse --first-parent together require range along first-parent chain"

1092 msgstr ""

1093 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "

1094 "premier parent"

1095

1096 -#: blame.c:1827

1096 +#: blame.c:1825

1097 #, c-format

1098 msgid "no such path %s in %s"

1099 msgstr "pas de chemin %s dans %s"

1100

1101 -#: blame.c:1838

1101 +#: blame.c:1836

1102 #, c-format

1103 msgid "cannot read blob %s for path %s"

1104 msgstr "impossible de lire le blob %s pour le chemin %s"

1105

1106 -#: branch.c:53

1106 +#: branch.c:54

1107 #, c-format

1108 msgid ""

1109 "\n"

@@ -1116,97 +1116,97 @@ msgstr ""

1116 "l'information de suivi distant en invoquant\n"

1117 "\"git branch --setup-upstream-to=%s%s%s\"."

1118

1119 -#: branch.c:67

1119 +#: branch.c:68

1120 #, c-format

1121 msgid "Not setting branch %s as its own upstream."

1122 msgstr "La branche %s ne peut pas être sa propre branche amont."

1123

1124 -#: branch.c:93

1124 +#: branch.c:94

1125 #, c-format

1126 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1127 msgstr ""

1128 "La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "

1129 "en rebasant."

1130

1131 -#: branch.c:94

1131 +#: branch.c:95

1132 #, c-format

1133 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1134 msgstr ""

1135 "La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "

1136 "'%s'."

1137

1138 -#: branch.c:98

1138 +#: branch.c:99

1139 #, c-format

1140 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1141 msgstr ""

1142 "La branche '%s' est paramétrée pour suivre la branche locale '%'s en "

1143 "rebasant."

1144

1145 -#: branch.c:99

1145 +#: branch.c:100

1146 #, c-format

1147 msgid "Branch '%s' set up to track local branch '%s'."

1148 msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."

1149

1150 -#: branch.c:104

1150 +#: branch.c:105

1151 #, c-format

1152 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1153 msgstr ""

1154 "La branche '%s' est paramétrée pour suivre la référence distante '%s' en "

1155 "rebasant."

1156

1157 -#: branch.c:105

1157 +#: branch.c:106

1158 #, c-format

1159 msgid "Branch '%s' set up to track remote ref '%s'."

1160 msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."

1161

1162 -#: branch.c:109

1162 +#: branch.c:110

1163 #, c-format

1164 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1165 msgstr ""

1166 "La branche '%s' est paramétrée pour suivre la référence locale '%s' en "

1167 "rebasant."

1168

1169 -#: branch.c:110

1169 +#: branch.c:111

1170 #, c-format

1171 msgid "Branch '%s' set up to track local ref '%s'."

1172 msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."

1173

1174 -#: branch.c:119

1174 +#: branch.c:120

1175 msgid "Unable to write upstream branch configuration"

1176 msgstr "Échec de l'écriture de la configuration de branche amont"

1177

1178 -#: branch.c:156

1178 +#: branch.c:157

1179 #, c-format

1180 msgid "Not tracking: ambiguous information for ref %s"

1181 msgstr "Pas de suivi : information ambiguë pour la référence %s"

1182

1183 -#: branch.c:189

1183 +#: branch.c:190

1184 #, c-format

1185 msgid "'%s' is not a valid branch name."

1186 msgstr "'%s' n'est pas un nom de branche valide."

1187

1188 -#: branch.c:208

1188 +#: branch.c:209

1189 #, c-format

1190 msgid "A branch named '%s' already exists."

1191 msgstr "Une branche nommée '%s' existe déjà."

1192

1193 -#: branch.c:213

1193 +#: branch.c:214

1194 msgid "Cannot force update the current branch."

1195 msgstr "Impossible de forcer la mise à jour de la branche courante."

1196

1197 -#: branch.c:233

1197 +#: branch.c:234

1198 #, c-format

1199 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1200 msgstr ""

1201 "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "

1202 "pas une branche."

1203

1204 -#: branch.c:235

1204 +#: branch.c:236

1205 #, c-format

1206 msgid "the requested upstream branch '%s' does not exist"

1207 msgstr "la branche amont demandée '%s' n'existe pas"

1208

1209 -#: branch.c:237

1209 +#: branch.c:238

1210 msgid ""

1211 "\n"

1212 "If you are planning on basing your work on an upstream\n"

@@ -1226,27 +1226,27 @@ msgstr ""

1226 "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"

1227 "pour paramétrer le suivi distant en même temps que vous poussez."

1228

1229 -#: branch.c:280

1229 +#: branch.c:281

1230 #, c-format

1231 msgid "Not a valid object name: '%s'."

1232 msgstr "Nom d'objet invalide : '%s'."

1233

1234 -#: branch.c:300

1234 +#: branch.c:301

1235 #, c-format

1236 msgid "Ambiguous object name: '%s'."

1237 msgstr "Nom d'objet ambigu : '%s'."

1238

1239 -#: branch.c:305

1239 +#: branch.c:306

1240 #, c-format

1241 msgid "Not a valid branch point: '%s'."

1242 msgstr "Point d'embranchement invalide : '%s'."

1243

1244 -#: branch.c:359

1244 +#: branch.c:360

1245 #, c-format

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

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

1248

1249 -#: branch.c:382

1249 +#: branch.c:383

1250 #, c-format

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

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

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

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

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

1263

1264 -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1264 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1265 #, c-format

1266 msgid "could not open '%s'"

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

@@ -1305,7 +1305,7 @@ msgstr "rev-list a disparu"

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

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

1307

1308 -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1308 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303

1309 #, c-format

1310 msgid "unrecognized argument: %s"

1311 msgstr "argument non reconnu : %s"

@@ -1328,18 +1328,39 @@ msgstr "l'index de groupe a disparu"

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

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

1330

1331 -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1332 -#: builtin/am.c:1436 builtin/am.c:2072

1331 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465

1332 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1333 +#: builtin/replace.c:448

1334 #, c-format

1335 msgid "could not parse %s"

1336 msgstr "impossible d'analyser %s"

1337

1337 -#: commit.c:43

1338 +#: commit.c:45

1339 #, c-format

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

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

1342

1342 -#: commit.c:1506

1343 +#: commit.c:182

1344 +msgid ""

1345 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

1346 +"and will be removed in a future Git version.\n"

1347 +"\n"

1348 +"Please use \"git replace --convert-graft-file\"\n"

1349 +"to convert the grafts into replace refs.\n"

1350 +"\n"

1351 +"Turn this message off by running\n"

1352 +"\"git config advice.graftFileDeprecated false\""

1353 +msgstr ""

1354 +"Le support de <GIT_DIR>/info/grafts est déconseillé\n"

1355 +"et sera supprimé dans une version future de Git.\n"

1356 +"\n"

1357 +"Veuillez utiliser \"git replace --convert-graft-file\"\n"

1358 +"pour convertir les grafts en référence de remplacement.\n"

1359 +"\n"

1360 +"Supprimez ce message en lançant\n"

1361 +"\"git config advice.graftFileDeprecated false\""

1362 +

1363 +#: commit.c:1537

1364 msgid ""

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

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

@@ -1351,189 +1372,203 @@ msgstr ""

1372 "variable de configuration i18n.commitencoding à l'encodage utilisé par votre "

1373 "projet.\n"

1374

1375 +#: commit-graph.c:669

1376 +#, c-format

1377 +msgid "the commit graph format cannot write %d commits"

1378 +msgstr "le graphe de commits ne peut pas écrire %d commits"

1379 +

1380 +#: commit-graph.c:696

1381 +msgid "too many commits to write graph"

1382 +msgstr "trop de commits pour écrire un graphe"

1383 +

1384 +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1385 +#, c-format

1386 +msgid "cannot mkdir %s"

1387 +msgstr "impossible de créer le répertoire (mkdir) %s"

1388 +

1389 #: compat/obstack.c:405 compat/obstack.c:407

1390 msgid "memory exhausted"

1391 msgstr "plus de mémoire"

1392

1358 -#: config.c:186

1393 +#: config.c:187

1394 msgid "relative config include conditionals must come from files"

1395 msgstr ""

1396 "les conditions d'inclusion de configuration relative doivent venir de "

1397 "fichiers"

1398

1364 -#: config.c:720

1399 +#: config.c:788

1400 #, c-format

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

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

1403

1369 -#: config.c:724

1404 +#: config.c:792

1405 #, c-format

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

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

1408

1374 -#: config.c:728

1409 +#: config.c:796

1410 #, c-format

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

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

1413

1379 -#: config.c:732

1414 +#: config.c:800

1415 #, c-format

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

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

1418

1384 -#: config.c:736

1419 +#: config.c:804

1420 #, c-format

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

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

1423

1389 -#: config.c:740

1424 +#: config.c:808

1425 #, c-format

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

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

1428

1394 -#: config.c:868

1429 +#: config.c:936

1430 msgid "out of range"

1431 msgstr "hors plage"

1432

1398 -#: config.c:868

1433 +#: config.c:936

1434 msgid "invalid unit"

1435 msgstr "unité invalide"

1436

1402 -#: config.c:874

1437 +#: config.c:942

1438 #, c-format

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

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

1441

1407 -#: config.c:879

1442 +#: config.c:947

1443 #, c-format

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

1445 msgstr ""

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

1447 "%s : %s"

1448

1414 -#: config.c:882

1449 +#: config.c:950

1450 #, c-format

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

1452 msgstr ""

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

1454 "%s : %s"

1455

1421 -#: config.c:885

1456 +#: config.c:953

1457 #, c-format

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

1459 msgstr ""

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

1461 "standard : %s"

1462

1428 -#: config.c:888

1463 +#: config.c:956

1464 #, c-format

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

1466 msgstr ""

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

1468 "sous-module %s : %s"

1469

1435 -#: config.c:891

1470 +#: config.c:959

1471 #, c-format

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

1473 msgstr ""

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

1475 "commande %s : %s"

1476

1442 -#: config.c:894

1477 +#: config.c:962

1478 #, c-format

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

1480 msgstr ""

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

1482

1448 -#: config.c:989

1483 +#: config.c:1057

1484 #, c-format

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

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

1487

1453 -#: config.c:998

1488 +#: config.c:1066

1489 #, c-format

1490 msgid "'%s' for '%s' is not a valid timestamp"

1491 msgstr "'%s' pour '%s' n'est pas un horodatage valide"

1492

1458 -#: config.c:1094 config.c:1105

1493 +#: config.c:1171 config.c:1182

1494 #, c-format

1495 msgid "bad zlib compression level %d"

1496 msgstr "niveau de compression zlib incorrect %d"

1497

1463 -#: config.c:1225

1498 +#: config.c:1307

1499 #, c-format

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

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

1502

1468 -#: config.c:1386

1503 +#: config.c:1473

1504 #, c-format

1505 msgid "bad pack compression level %d"

1506 msgstr "niveau de compression du paquet %d"

1507

1473 -#: config.c:1582

1508 +#: config.c:1681

1509 msgid "unable to parse command-line config"

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

1511

1477 -#: config.c:1914

1512 +#: config.c:2013

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

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

1515

1481 -#: config.c:2101

1516 +#: config.c:2200

1517 #, c-format

1518 msgid "Invalid %s: '%s'"

1519 msgstr "%s invalide : '%s'"

1520

1486 -#: config.c:2144

1521 +#: config.c:2243

1522 #, c-format

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

1524 msgstr ""

1525 "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "

1526 "défaut"

1527

1493 -#: config.c:2170

1528 +#: config.c:2269

1529 #, c-format

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

1531 msgstr ""

1532 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "

1533 "100"

1534

1500 -#: config.c:2195

1535 +#: config.c:2294

1536 #, c-format

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

1538 msgstr ""

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

1540

1506 -#: config.c:2197

1541 +#: config.c:2296

1542 #, c-format

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

1544 msgstr ""

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

1546

1512 -#: config.c:2256

1547 +#: config.c:2402

1548 #, c-format

1549 msgid "%s has multiple values"

1550 msgstr "%s a des valeurs multiples"

1551

1517 -#: config.c:2599 config.c:2816

1552 +#: config.c:2766 config.c:3019

1553 #, c-format

1554 msgid "fstat on %s failed"

1555 msgstr "échec de fstat sur %s"

1556

1522 -#: config.c:2706

1557 +#: config.c:2905

1558 #, c-format

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

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

1561

1527 -#: config.c:2708 builtin/remote.c:776

1562 +#: config.c:2907 builtin/remote.c:779

1563 #, c-format

1564 msgid "could not unset '%s'"

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

1566

1532 -#: connect.c:52

1567 +#: connect.c:60

1568 msgid "The remote end hung up upon initial contact"

1569 msgstr "L'hôte distant a fermé la connexion lors du contact initial"

1570

1536 -#: connect.c:54

1571 +#: connect.c:62

1572 msgid ""

1573 "Could not read from remote repository.\n"

1574 "\n"

@@ -1545,7 +1580,7 @@ msgstr ""

1580 "Veuillez vérifier que vous avez les droits d'accès\n"

1581 "et que le dépôt existe."

1582

1548 -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1583 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1584 msgid "Checking connectivity"

1585 msgstr "Vérification de la connectivité"

1586

@@ -1561,12 +1596,12 @@ msgstr "impossible d'écrire dans la rev-list"

1596 msgid "failed to close rev-list's stdin"

1597 msgstr "impossible de fermer l'entrée standard du rev-list"

1598

1564 -#: convert.c:205

1599 +#: convert.c:206

1600 #, c-format

1601 msgid "CRLF would be replaced by LF in %s."

1602 msgstr "Les CRLF seraient remplacés par des LF dans %s."

1603

1569 -#: convert.c:207

1604 +#: convert.c:208

1605 #, c-format

1606 msgid ""

1607 "CRLF will be replaced by LF in %s.\n"

@@ -1576,12 +1611,12 @@ msgstr ""

1611 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1612 "travail."

1613

1579 -#: convert.c:215

1614 +#: convert.c:216

1615 #, c-format

1616 msgid "LF would be replaced by CRLF in %s"

1617 msgstr "Les LF seraient remplacés par des CRLF dans %s"

1618

1584 -#: convert.c:217

1619 +#: convert.c:218

1620 #, c-format

1621 msgid ""

1622 "LF will be replaced by CRLF in %s.\n"

@@ -1591,6 +1626,44 @@ msgstr ""

1626 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "

1627 "travail."

1628

1629 +#: convert.c:279

1630 +#, c-format

1631 +msgid "BOM is prohibited in '%s' if encoded as %s"

1632 +msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"

1633 +

1634 +#: convert.c:286

1635 +#, c-format

1636 +msgid ""

1637 +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1638 +"tree-encoding."

1639 +msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%s comme encodage d'arbre de travail."

1640 +

1641 +#: convert.c:304

1642 +#, c-format

1643 +msgid "BOM is required in '%s' if encoded as %s"

1644 +msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"

1645 +

1646 +#: convert.c:306

1647 +#, c-format

1648 +msgid ""

1649 +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1650 +"%sLE (depending on the byte order) as working-tree-encoding."

1651 +msgstr "Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre de travail."

1652 +

1653 +#: convert.c:424

1654 +#, c-format

1655 +msgid "failed to encode '%s' from %s to %s"

1656 +msgstr "échec de l'encodage de '%s' de %s vers %s"

1657 +

1658 +#: convert.c:467

1659 +#, c-format

1660 +msgid "encoding '%s' from %s to %s and back is not the same"

1661 +msgstr "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même contenu"

1662 +

1663 +#: convert.c:1225

1664 +msgid "true/false are no valid working-tree-encodings"

1665 +msgstr "true/false ne sont pas des encodages d'arbre de travail valides"

1666 +

1667 #: date.c:116

1668 msgid "in the future"

1669 msgstr "dans le futur"

@@ -1707,24 +1780,24 @@ msgstr ""

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

1781 "%s"

1782

1710 -#: diff.c:3822

1783 +#: diff.c:3823

1784 #, c-format

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

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

1787

1715 -#: diff.c:4146

1788 +#: diff.c:4153

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

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

1791

1719 -#: diff.c:4149

1792 +#: diff.c:4156

1793 msgid "-G, -S and --find-object are mutually exclusive"

1794 msgstr "-G, -S et --find-object sont mutuellement exclusifs"

1795

1723 -#: diff.c:4237

1796 +#: diff.c:4244

1797 msgid "--follow requires exactly one pathspec"

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

1799

1727 -#: diff.c:4403

1800 +#: diff.c:4410

1801 #, c-format

1802 msgid ""

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

@@ -1733,24 +1806,24 @@ msgstr ""

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

1807 "%s"

1808

1736 -#: diff.c:4417

1809 +#: diff.c:4424

1810 #, c-format

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

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

1813

1741 -#: diff.c:5493

1814 +#: diff.c:5500

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

1816 msgstr ""

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

1818 "fichiers."

1819

1747 -#: diff.c:5496

1820 +#: diff.c:5503

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

1822 msgstr ""

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

1824 "grand nombre de fichiers."

1825

1753 -#: diff.c:5499

1826 +#: diff.c:5506

1827 #, c-format

1828 msgid ""

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

@@ -1758,25 +1831,25 @@ msgstr ""

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

1832 "commande."

1833

1761 -#: dir.c:1866

1834 +#: dir.c:1867

1835 #, c-format

1836 msgid "could not open directory '%s'"

1837 msgstr "impossible d'ouvrir le répertoire '%s'"

1838

1766 -#: dir.c:2108

1839 +#: dir.c:2109

1840 msgid "failed to get kernel name and information"

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

1842

1770 -#: dir.c:2232

1843 +#: dir.c:2233

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

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

1846

1774 -#: dir.c:3024 dir.c:3029

1847 +#: dir.c:3075 dir.c:3080

1848 #, c-format

1849 msgid "could not create directories for %s"

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

1851

1779 -#: dir.c:3054

1852 +#: dir.c:3109

1853 #, c-format

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

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

@@ -1801,201 +1874,205 @@ msgstr "impossible de stat le fichier '%s'"

1874 msgid "Remote with no URL"

1875 msgstr "Dépôt distant sans URL"

1876

1804 -#: fetch-pack.c:253

1877 +#: fetch-pack.c:254

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

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

1880

1808 -#: fetch-pack.c:265

1881 +#: fetch-pack.c:266

1882 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

1883 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"

1884

1812 -#: fetch-pack.c:284 builtin/archive.c:63

1885 +#: fetch-pack.c:285 builtin/archive.c:63

1886 #, c-format

1887 msgid "remote error: %s"

1888 msgstr "erreur distante : %s"

1889

1817 -#: fetch-pack.c:285

1890 +#: fetch-pack.c:286

1891 #, c-format

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

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

1894

1822 -#: fetch-pack.c:337

1895 +#: fetch-pack.c:338

1896 msgid "--stateless-rpc requires multi_ack_detailed"

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

1898

1826 -#: fetch-pack.c:428

1899 +#: fetch-pack.c:429 fetch-pack.c:1310

1900 #, c-format

1901 msgid "invalid shallow line: %s"

1902 msgstr "ligne de superficiel invalide : %s"

1903

1831 -#: fetch-pack.c:434

1904 +#: fetch-pack.c:435 fetch-pack.c:1316

1905 #, c-format

1906 msgid "invalid unshallow line: %s"

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

1908

1836 -#: fetch-pack.c:436

1909 +#: fetch-pack.c:437 fetch-pack.c:1318

1910 #, c-format

1911 msgid "object not found: %s"

1912 msgstr "objet non trouvé : %s"

1913

1841 -#: fetch-pack.c:439

1914 +#: fetch-pack.c:440 fetch-pack.c:1321

1915 #, c-format

1916 msgid "error in object: %s"

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

1918

1846 -#: fetch-pack.c:441

1919 +#: fetch-pack.c:442 fetch-pack.c:1323

1920 #, c-format

1921 msgid "no shallow found: %s"

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

1923

1851 -#: fetch-pack.c:444

1924 +#: fetch-pack.c:445 fetch-pack.c:1326

1925 #, c-format

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

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

1928

1856 -#: fetch-pack.c:485

1929 +#: fetch-pack.c:486

1930 #, c-format

1931 msgid "got %s %d %s"

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

1933

1861 -#: fetch-pack.c:499

1934 +#: fetch-pack.c:500

1935 #, c-format

1936 msgid "invalid commit %s"

1937 msgstr "commit invalide %s"

1938

1866 -#: fetch-pack.c:532

1939 +#: fetch-pack.c:533

1940 msgid "giving up"

1941 msgstr "abandon"

1942

1870 -#: fetch-pack.c:542 progress.c:229

1943 +#: fetch-pack.c:543 progress.c:229

1944 msgid "done"

1945 msgstr "fait"

1946

1874 -#: fetch-pack.c:554

1947 +#: fetch-pack.c:555

1948 #, c-format

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

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

1951

1879 -#: fetch-pack.c:600

1952 +#: fetch-pack.c:601

1953 #, c-format

1954 msgid "Marking %s as complete"

1955 msgstr "Marquage de %s comme terminé"

1956

1884 -#: fetch-pack.c:788

1957 +#: fetch-pack.c:828

1958 #, c-format

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

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

1961

1889 -#: fetch-pack.c:829

1962 +#: fetch-pack.c:869

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

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

1965

1893 -#: fetch-pack.c:837

1966 +#: fetch-pack.c:877

1967 msgid "protocol error: bad pack header"

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

1969

1897 -#: fetch-pack.c:895

1970 +#: fetch-pack.c:944

1971 #, c-format

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

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

1974

1902 -#: fetch-pack.c:911

1975 +#: fetch-pack.c:960

1976 #, c-format

1977 msgid "%s failed"

1978 msgstr "échec de %s"

1979

1907 -#: fetch-pack.c:913

1980 +#: fetch-pack.c:962

1981 msgid "error in sideband demultiplexer"

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

1983

1911 -#: fetch-pack.c:940

1984 +#: fetch-pack.c:989

1985 msgid "Server does not support shallow clients"

1986 msgstr "Le serveur ne supporte les clients superficiels"

1987

1915 -#: fetch-pack.c:944

1988 +#: fetch-pack.c:993

1989 msgid "Server supports multi_ack_detailed"

1990 msgstr "Le serveur supporte multi_ack_detailed"

1991

1919 -#: fetch-pack.c:947

1992 +#: fetch-pack.c:996

1993 msgid "Server supports no-done"

1994 msgstr "Le serveur support no-done"

1995

1923 -#: fetch-pack.c:953

1996 +#: fetch-pack.c:1002

1997 msgid "Server supports multi_ack"

1998 msgstr "Le serveur supporte multi_ack"

1999

1927 -#: fetch-pack.c:957

2000 +#: fetch-pack.c:1006

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

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

2003

1931 -#: fetch-pack.c:961

2004 +#: fetch-pack.c:1010

2005 msgid "Server supports side-band"

2006 msgstr "Le serveru supporte side-band"

2007

1935 -#: fetch-pack.c:965

2008 +#: fetch-pack.c:1014

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

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

2011

1939 -#: fetch-pack.c:969

2012 +#: fetch-pack.c:1018

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

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

2015

1943 -#: fetch-pack.c:979

2016 +#: fetch-pack.c:1028

2017 msgid "Server supports ofs-delta"

2018 msgstr "Le serveur supporte ofs-delta"

2019

1947 -#: fetch-pack.c:985

2020 +#: fetch-pack.c:1034 fetch-pack.c:1204

2021 msgid "Server supports filter"

2022 msgstr "Le serveur supporte filter"

2023

1951 -#: fetch-pack.c:993

2024 +#: fetch-pack.c:1042

2025 #, c-format

2026 msgid "Server version is %.*s"

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

2028

1956 -#: fetch-pack.c:999

2029 +#: fetch-pack.c:1048

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

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

2032

1960 -#: fetch-pack.c:1003

2033 +#: fetch-pack.c:1052

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

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

2036

1964 -#: fetch-pack.c:1005

2037 +#: fetch-pack.c:1054

2038 msgid "Server does not support --deepen"

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

2040

1968 -#: fetch-pack.c:1016

2041 +#: fetch-pack.c:1065

2042 msgid "no common commits"

2043 msgstr "pas de commit commun"

2044

1972 -#: fetch-pack.c:1028

2045 +#: fetch-pack.c:1077 fetch-pack.c:1414

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

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

2048

1976 -#: fetch-pack.c:1190

2049 +#: fetch-pack.c:1199

2050 +msgid "Server does not support shallow requests"

2051 +msgstr "Le serveur ne supporte les requêtes superficielles"

2052 +

2053 +#: fetch-pack.c:1584

2054 msgid "no matching remote head"

2055 msgstr "pas de HEAD distante correspondante"

2056

1980 -#: fetch-pack.c:1212

2057 +#: fetch-pack.c:1610

2058 #, c-format

2059 msgid "no such remote ref %s"

2060 msgstr "référence distante inconnue %s"

2061

1985 -#: fetch-pack.c:1215

2062 +#: fetch-pack.c:1613

2063 #, c-format

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

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

2066

1990 -#: gpg-interface.c:181

2067 +#: gpg-interface.c:185

2068 msgid "gpg failed to sign the data"

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

2070

1994 -#: gpg-interface.c:211

2071 +#: gpg-interface.c:210

2072 msgid "could not create temporary file"

2073 msgstr "impossible de créer un fichier temporaire"

2074

1998 -#: gpg-interface.c:214

2075 +#: gpg-interface.c:213

2076 #, c-format

2077 msgid "failed writing detached signature to '%s'"

2078 msgstr "impossible d'écrire la signature détachée dans '%s'"

@@ -2005,18 +2082,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'"

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

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

2084

2008 -#: grep.c:2022

2085 +#: grep.c:2020

2086 #, c-format

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

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

2089

2013 -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

2090 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

2091 #: builtin/rm.c:134

2092 #, c-format

2093 msgid "failed to stat '%s'"

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

2095

2019 -#: grep.c:2050

2096 +#: grep.c:2048

2097 #, c-format

2098 msgid "'%s': short read"

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

@@ -2160,7 +2237,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"

2237 msgid "name consists only of disallowed characters: %s"

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

2239

2163 -#: ident.c:416 builtin/commit.c:582

2240 +#: ident.c:416 builtin/commit.c:587

2241 #, c-format

2242 msgid "invalid date format: %s"

2243 msgstr "format de date invalide : %s"

@@ -2197,82 +2274,158 @@ msgstr ""

2274 msgid "Unable to create '%s.lock': %s"

2275 msgstr "Impossible de créer '%s.lock' : %s"

2276

2200 -#: merge.c:74

2277 +#: merge.c:71

2278 msgid "failed to read the cache"

2279 msgstr "impossible de lire le cache"

2280

2204 -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2205 -#: builtin/checkout.c:599 builtin/clone.c:759

2281 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2282 +#: builtin/checkout.c:606 builtin/clone.c:761

2283 msgid "unable to write new index file"

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

2285

2209 -#: merge-recursive.c:235

2286 +#: merge-recursive.c:298

2287 msgid "(bad commit)\n"

2288 msgstr "(mauvais commit)\n"

2289

2213 -#: merge-recursive.c:257 merge-recursive.c:265

2290 +#: merge-recursive.c:320

2291 +#, c-format

2292 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

2293 +msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

2294 +

2295 +#: merge-recursive.c:328

2296 #, c-format

2215 -msgid "addinfo_cache failed for path '%s'"

2216 -msgstr "échec de addinfo_cache pour le chemin '%s'"

2297 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2298 +msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."

2299

2218 -#: merge-recursive.c:329

2300 +#: merge-recursive.c:410

2301 msgid "error building trees"

2302 msgstr "erreur de construction des arbres"

2303

2222 -#: merge-recursive.c:771

2304 +#: merge-recursive.c:881

2305 #, c-format

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

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

2308

2227 -#: merge-recursive.c:782

2309 +#: merge-recursive.c:892

2310 #, c-format

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

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

2313

2232 -#: merge-recursive.c:796 merge-recursive.c:815

2314 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

2317

2236 -#: merge-recursive.c:805

2318 +#: merge-recursive.c:915

2319 #, c-format

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

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

2322

2241 -#: merge-recursive.c:847 builtin/cat-file.c:37

2323 +#: merge-recursive.c:957 builtin/cat-file.c:37

2324 #, c-format

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

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

2327

2246 -#: merge-recursive.c:849

2328 +#: merge-recursive.c:959

2329 #, c-format

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

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

2332

2251 -#: merge-recursive.c:873

2333 +#: merge-recursive.c:983

2334 #, c-format

2335 msgid "failed to open '%s': %s"

2336 msgstr "échec à l'ouverture de '%s' : %s"

2337

2256 -#: merge-recursive.c:884

2338 +#: merge-recursive.c:994

2339 #, c-format

2340 msgid "failed to symlink '%s': %s"

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

2342

2261 -#: merge-recursive.c:889

2343 +#: merge-recursive.c:999

2344 #, c-format

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

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

2347

2266 -#: merge-recursive.c:1029

2348 +#: merge-recursive.c:1186

2349 +#, c-format

2350 +msgid "Failed to merge submodule %s (not checked out)"

2351 +msgstr "Échec de la fusion du sous-module %s (non extrait)"

2352 +

2353 +#: merge-recursive.c:1193

2354 +#, c-format

2355 +msgid "Failed to merge submodule %s (commits not present)"

2356 +msgstr "Échec de fusion du sous-module %s (commits non présents)"

2357 +

2358 +#: merge-recursive.c:1200

2359 +#, c-format

2360 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2361 +msgstr "Échec de la fusion du sous-module %s (les commits ne descendent pas de la base de fusion)"

2362 +

2363 +#: merge-recursive.c:1208 merge-recursive.c:1220

2364 +#, c-format

2365 +msgid "Fast-forwarding submodule %s to the following commit:"

2366 +msgstr "Avance rapide du sous-module %s au commit suivant :"

2367 +

2368 +#: merge-recursive.c:1211 merge-recursive.c:1223

2369 +#, c-format

2370 +msgid "Fast-forwarding submodule %s to %s"

2371 +msgstr "Avance rapide du sous-module %s à %s"

2372 +

2373 +#: merge-recursive.c:1245

2374 +#, c-format

2375 +msgid "Failed to merge submodule %s (merge following commits not found)"

2376 +msgstr "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"

2377 +

2378 +#: merge-recursive.c:1249

2379 +#, c-format

2380 +msgid "Failed to merge submodule %s (not fast-forward)"

2381 +msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"

2382 +

2383 +#: merge-recursive.c:1250

2384 +msgid "Found a possible merge resolution for the submodule:\n"

2385 +msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"

2386 +

2387 +#: merge-recursive.c:1253

2388 +#, c-format

2389 +msgid ""

2390 +"If this is correct simply add it to the index for example\n"

2391 +"by using:\n"

2392 +"\n"

2393 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2394 +"\n"

2395 +"which will accept this suggestion.\n"

2396 +msgstr ""

2397 +"Si c'est correct, ajoutez le simplement à l'index\n"

2398 +"en utilisant par exemple :\n"

2399 +"\n"

2400 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2401 +"\n"

2402 +"qui acceptera cette suggestion.\n"

2403 +

2404 +#: merge-recursive.c:1262

2405 +#, c-format

2406 +msgid "Failed to merge submodule %s (multiple merges found)"

2407 +msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"

2408 +

2409 +#: merge-recursive.c:1321

2410 msgid "Failed to execute internal merge"

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

2412

2270 -#: merge-recursive.c:1034

2413 +#: merge-recursive.c:1326

2414 #, c-format

2415 msgid "Unable to add %s to database"

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

2417

2275 -#: merge-recursive.c:1146

2418 +#: merge-recursive.c:1358

2419 +#, c-format

2420 +msgid "Auto-merging %s"

2421 +msgstr "Fusion automatique de %s"

2422 +

2423 +#: merge-recursive.c:1423

2424 +#, c-format

2425 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2426 +msgstr "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la place."

2427 +

2428 +#: merge-recursive.c:1475

2429 #, c-format

2430 msgid ""

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

@@ -2281,7 +2434,7 @@ msgstr ""

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

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

2436

2284 -#: merge-recursive.c:1151

2437 +#: merge-recursive.c:1480

2438 #, c-format

2439 msgid ""

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

@@ -2290,7 +2443,7 @@ msgstr ""

2443 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

2444 "%s de %s laissée dans l'arbre."

2445

2293 -#: merge-recursive.c:1158

2446 +#: merge-recursive.c:1487

2447 #, c-format

2448 msgid ""

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

@@ -2299,7 +2452,7 @@ msgstr ""

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

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

2454

2302 -#: merge-recursive.c:1163

2455 +#: merge-recursive.c:1492

2456 #, c-format

2457 msgid ""

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

@@ -2308,20 +2461,31 @@ msgstr ""

2461 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "

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

2463

2311 -#: merge-recursive.c:1197

2464 +#: merge-recursive.c:1526

2465 msgid "rename"

2466 msgstr "renommage"

2467

2315 -#: merge-recursive.c:1197

2468 +#: merge-recursive.c:1526

2469 msgid "renamed"

2470 msgstr "renommé"

2471

2319 -#: merge-recursive.c:1254

2472 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2473 +#: merge-recursive.c:3086

2474 +#, c-format

2475 +msgid "Refusing to lose dirty file at %s"

2476 +msgstr "Refus de perdre le fichier modifié %s"

2477 +

2478 +#: merge-recursive.c:1594

2479 #, c-format

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

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

2482

2324 -#: merge-recursive.c:1279

2483 +#: merge-recursive.c:1599

2484 +#, c-format

2485 +msgid "Refusing to lose untracked file at %s; adding as %s instead"

2486 +msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"

2487 +

2488 +#: merge-recursive.c:1625

2489 #, c-format

2490 msgid ""

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

@@ -2330,142 +2494,178 @@ msgstr ""

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

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

2496

2333 -#: merge-recursive.c:1284

2497 +#: merge-recursive.c:1630

2498 msgid " (left unresolved)"

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

2500

2337 -#: merge-recursive.c:1346

2501 +#: merge-recursive.c:1694

2502 #, c-format

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

2504 msgstr ""

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

2506 ">'%s' dans %s"

2507

2344 -#: merge-recursive.c:1379

2508 +#: merge-recursive.c:1733

2509 #, c-format

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

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

2512

2349 -#: merge-recursive.c:1582

2513 +#: merge-recursive.c:1745

2514 +#, c-format

2515 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2516 +msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."

2517 +

2518 +#: merge-recursive.c:1951

2519 +#, c-format

2520 +msgid ""

2521 +"CONFLICT (directory rename split): Unclear where to place %s because "

2522 +"directory %s was renamed to multiple other directories, with no destination "

2523 +"getting a majority of the files."

2524 +msgstr "CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire parce que le répertoire %s a été renommé en plusieurs autres répertoires, sans aucune destination récupérant la majorité des fichiers."

2525 +

2526 +#: merge-recursive.c:1983

2527 +#, c-format

2528 +msgid ""

2529 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2530 +"implicit directory rename(s) putting the following path(s) there: %s."

2531 +msgstr "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne des renommages implicites de répertoire déplaçant les chemins suivants : %s."

2532 +

2533 +#: merge-recursive.c:1993

2534 +#, c-format

2535 +msgid ""

2536 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2537 +"implicit directory renames tried to put these paths there: %s"

2538 +msgstr "CONFLIT (renommage implicite de répertoire) : impossible de transformer plusieurs chemins sur %s ; les chemins concernés sont : %s"

2539 +

2540 +#: merge-recursive.c:2085

2541 +#, c-format

2542 +msgid ""

2543 +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2544 +">%s in %s"

2545 +msgstr "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. Renommage de répertoire %s->%s dans %s"

2546 +

2547 +#: merge-recursive.c:2330

2548 +#, c-format

2549 +msgid ""

2550 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2551 +"renamed."

2552 +msgstr "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été renommé."

2553 +

2554 +#: merge-recursive.c:2736

2555 #, c-format

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

2557 msgstr ""

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

2559

2355 -#: merge-recursive.c:1597

2560 +#: merge-recursive.c:2751

2561 #, c-format

2562 msgid "Adding merged %s"

2563 msgstr "Ajout de %s fusionné"

2564

2360 -#: merge-recursive.c:1604 merge-recursive.c:1834

2565 +#: merge-recursive.c:2758 merge-recursive.c:3089

2566 #, c-format

2567 msgid "Adding as %s instead"

2568 msgstr "Ajout plutôt comme %s"

2569

2365 -#: merge-recursive.c:1661

2570 +#: merge-recursive.c:2914

2571 #, c-format

2572 msgid "cannot read object %s"

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

2574

2370 -#: merge-recursive.c:1664

2575 +#: merge-recursive.c:2917

2576 #, c-format

2577 msgid "object %s is not a blob"

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

2579

2375 -#: merge-recursive.c:1733

2580 +#: merge-recursive.c:2986

2581 msgid "modify"

2582 msgstr "modification"

2583

2379 -#: merge-recursive.c:1733

2584 +#: merge-recursive.c:2986

2585 msgid "modified"

2586 msgstr "modifié"

2587

2383 -#: merge-recursive.c:1743

2588 +#: merge-recursive.c:2997

2589 msgid "content"

2590 msgstr "contenu"

2591

2387 -#: merge-recursive.c:1750

2592 +#: merge-recursive.c:3004

2593 msgid "add/add"

2594 msgstr "ajout/ajout"

2595

2391 -#: merge-recursive.c:1786

2596 +#: merge-recursive.c:3046

2597 #, c-format

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

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

2600

2396 -#: merge-recursive.c:1800

2397 -#, c-format

2398 -msgid "Auto-merging %s"

2399 -msgstr "Fusion automatique de %s"

2400 -

2401 -#: merge-recursive.c:1804 git-submodule.sh:879

2601 +#: merge-recursive.c:3055 git-submodule.sh:895

2602 msgid "submodule"

2603 msgstr "sous-module"

2604

2405 -#: merge-recursive.c:1805

2605 +#: merge-recursive.c:3056

2606 #, c-format

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

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

2609

2410 -#: merge-recursive.c:1899

2610 +#: merge-recursive.c:3178

2611 #, c-format

2612 msgid "Removing %s"

2613 msgstr "Suppression de %s"

2614

2415 -#: merge-recursive.c:1925

2615 +#: merge-recursive.c:3204

2616 msgid "file/directory"

2617 msgstr "fichier/répertoire"

2618

2419 -#: merge-recursive.c:1931

2619 +#: merge-recursive.c:3210

2620 msgid "directory/file"

2621 msgstr "répertoire/fichier"

2622

2423 -#: merge-recursive.c:1938

2623 +#: merge-recursive.c:3217

2624 #, c-format

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

2626 msgstr ""

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

2628

2429 -#: merge-recursive.c:1947

2629 +#: merge-recursive.c:3226

2630 #, c-format

2631 msgid "Adding %s"

2632 msgstr "Ajout de %s"

2633

2434 -#: merge-recursive.c:1987

2634 +#: merge-recursive.c:3267

2635 #, c-format

2636 msgid "Dirty index: cannot merge (dirty: %s)"

2637 msgstr "Index sale : fusion impossible (sales : %s)"

2638

2439 -#: merge-recursive.c:1991

2639 +#: merge-recursive.c:3271

2640 msgid "Already up to date!"

2641 msgstr "Déjà à jour !"

2642

2443 -#: merge-recursive.c:2000

2643 +#: merge-recursive.c:3280

2644 #, c-format

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

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

2647

2448 -#: merge-recursive.c:2097

2648 +#: merge-recursive.c:3379

2649 msgid "Merging:"

2650 msgstr "Fusion :"

2651

2452 -#: merge-recursive.c:2110

2652 +#: merge-recursive.c:3392

2653 #, c-format

2654 msgid "found %u common ancestor:"

2655 msgid_plural "found %u common ancestors:"

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

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

2658

2459 -#: merge-recursive.c:2149

2659 +#: merge-recursive.c:3431

2660 msgid "merge returned no commit"

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

2662

2463 -#: merge-recursive.c:2212

2663 +#: merge-recursive.c:3495

2664 #, c-format

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

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

2667

2468 -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2668 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

2669 msgid "Unable to write index."

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

2671

@@ -2508,31 +2708,31 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"

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

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

2710

2511 -#: object.c:239

2711 +#: object.c:242

2712 #, c-format

2713 msgid "unable to parse object: %s"

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

2715

2516 -#: packfile.c:561

2716 +#: packfile.c:563

2717 msgid "offset before end of packfile (broken .idx?)"

2718 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

2719

2520 -#: packfile.c:1694

2720 +#: packfile.c:1742

2721 #, c-format

2722 msgid "offset before start of pack index for %s (corrupt index?)"

2723 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

2724

2525 -#: packfile.c:1698

2725 +#: packfile.c:1746

2726 #, c-format

2727 msgid "offset beyond end of pack index for %s (truncated index?)"

2728 msgstr ""

2729 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"

2730

2531 -#: parse-options.c:619

2731 +#: parse-options.c:621

2732 msgid "..."

2733 msgstr "..."

2734

2535 -#: parse-options.c:638

2735 +#: parse-options.c:640

2736 #, c-format

2737 msgid "usage: %s"

2738 msgstr "usage : %s"

@@ -2540,26 +2740,31 @@ msgstr "usage : %s"

2740 #. TRANSLATORS: the colon here should align with the

2741 #. one in "usage: %s" translation.

2742 #.

2543 -#: parse-options.c:644

2743 +#: parse-options.c:646

2744 #, c-format

2745 msgid " or: %s"

2746 msgstr " ou : %s"

2747

2548 -#: parse-options.c:647

2748 +#: parse-options.c:649

2749 #, c-format

2750 msgid " %s"

2751 msgstr " %s"

2752

2553 -#: parse-options.c:686

2753 +#: parse-options.c:688

2754 msgid "-NUM"

2755 msgstr "-NUM"

2756

2557 -#: parse-options-cb.c:108

2757 +#: parse-options-cb.c:44

2758 +#, c-format

2759 +msgid "malformed expiration date '%s'"

2760 +msgstr "date d'expiration malformée : '%s'"

2761 +

2762 +#: parse-options-cb.c:112

2763 #, c-format

2764 msgid "malformed object name '%s'"

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

2766

2562 -#: path.c:891

2767 +#: path.c:892

2768 #, c-format

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

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

@@ -2647,7 +2852,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique"

2852 msgid "unable to parse --pretty format"

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

2854

2650 -#: read-cache.c:1473

2855 +#: read-cache.c:1500

2856 #, c-format

2857 msgid ""

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

@@ -2656,7 +2861,7 @@ msgstr ""

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

2862 "Utilisation de la version %i"

2863

2659 -#: read-cache.c:1483

2864 +#: read-cache.c:1510

2865 #, c-format

2866 msgid ""

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

@@ -2665,53 +2870,54 @@ msgstr ""

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

2871 "Utilisation de la version %i"

2872

2668 -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2873 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

2874 #, c-format

2875 msgid "could not close '%s'"

2876 msgstr "impossible de fermer '%s'"

2877

2673 -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2878 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

2879 #, c-format

2880 msgid "could not stat '%s'"

2881 msgstr "stat impossible de '%s'"

2882

2678 -#: read-cache.c:2461

2883 +#: read-cache.c:2490

2884 #, c-format

2885 msgid "unable to open git dir: %s"

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

2887

2683 -#: read-cache.c:2473

2888 +#: read-cache.c:2502

2889 #, c-format

2890 msgid "unable to unlink: %s"

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

2892

2688 -#: refs.c:706

2893 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2894 +#: builtin/am.c:779

2895 #, c-format

2690 -msgid "Could not open '%s' for writing"

2691 -msgstr "Impossible d'ouvrir '%s' en écriture"

2896 +msgid "could not open '%s' for writing"

2897 +msgstr "impossible d'ouvrir '%s' en écriture"

2898

2693 -#: refs.c:1850

2899 +#: refs.c:1880

2900 msgid "ref updates forbidden inside quarantine environment"

2901 msgstr "mises à jour des références interdites en environnement de quarantaine"

2902

2697 -#: refs/files-backend.c:1189

2903 +#: refs/files-backend.c:1191

2904 #, c-format

2905 msgid "could not remove reference %s"

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

2907

2702 -#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2703 -#: refs/packed-backend.c:1538

2908 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2909 +#: refs/packed-backend.c:1541

2910 #, c-format

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

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

2913

2708 -#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2914 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544

2915 #, c-format

2916 msgid "could not delete references: %s"

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

2918

2919 # à priori on parle d'une branche ici

2714 -#: ref-filter.c:35 wt-status.c:1842

2920 +#: ref-filter.c:35 wt-status.c:1850

2921 msgid "gone"

2922 msgstr "disparue"

2923

@@ -2730,157 +2936,162 @@ msgstr "en retard de %d"

2936 msgid "ahead %d, behind %d"

2937 msgstr "en avance de %d, en retard de %d"

2938

2733 -#: ref-filter.c:107

2939 +#: ref-filter.c:121

2940 #, c-format

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

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

2943

2738 -#: ref-filter.c:109

2944 +#: ref-filter.c:123

2945 #, c-format

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

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

2948

2743 -#: ref-filter.c:129

2949 +#: ref-filter.c:145

2950 #, c-format

2951 msgid "Integer value expected refname:lstrip=%s"

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

2953

2748 -#: ref-filter.c:133

2954 +#: ref-filter.c:149

2955 #, c-format

2956 msgid "Integer value expected refname:rstrip=%s"

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

2958

2753 -#: ref-filter.c:135

2959 +#: ref-filter.c:151

2960 #, c-format

2961 msgid "unrecognized %%(%s) argument: %s"

2962 msgstr "argument %%(%s) non reconnu : %s"

2963

2758 -#: ref-filter.c:184

2964 +#: ref-filter.c:206

2965 #, c-format

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

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

2968

2763 -#: ref-filter.c:191

2969 +#: ref-filter.c:215

2970 #, c-format

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

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

2973

2768 -#: ref-filter.c:209

2974 +#: ref-filter.c:235

2975 #, c-format

2976 msgid "unknown %%(trailers) argument: %s"

2977 msgstr "argument %%(trailers) inconnu : %s"

2978

2773 -#: ref-filter.c:232

2979 +#: ref-filter.c:264

2980 #, c-format

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

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

2983

2778 -#: ref-filter.c:234

2984 +#: ref-filter.c:266

2985 #, c-format

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

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

2988

2783 -#: ref-filter.c:247

2989 +#: ref-filter.c:281

2990 #, c-format

2991 msgid "positive value expected objectname:short=%s"

2992 msgstr "valeur positive attendue objectname:short=%s"

2993

2788 -#: ref-filter.c:251

2994 +#: ref-filter.c:285

2995 #, c-format

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

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

2998

2793 -#: ref-filter.c:278

2999 +#: ref-filter.c:315

3000 #, c-format

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

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

3003

2798 -#: ref-filter.c:290

3004 +#: ref-filter.c:327

3005 #, c-format

3006 msgid "unrecognized position:%s"

3007 msgstr "position non reconnue : %s"

3008

2803 -#: ref-filter.c:294

3009 +#: ref-filter.c:334

3010 #, c-format

3011 msgid "unrecognized width:%s"

3012 msgstr "largeur non reconnue : %s"

3013

2808 -#: ref-filter.c:300

3014 +#: ref-filter.c:343

3015 #, c-format

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

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

3018

2813 -#: ref-filter.c:304

3019 +#: ref-filter.c:351

3020 #, c-format

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

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

3023

2818 -#: ref-filter.c:319

3024 +#: ref-filter.c:369

3025 #, c-format

3026 msgid "unrecognized %%(if) argument: %s"

3027 msgstr "argument %%(if) non reconnu : %s"

3028

2823 -#: ref-filter.c:409

3029 +#: ref-filter.c:464

3030 #, c-format

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

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

3033

2828 -#: ref-filter.c:435

3034 +#: ref-filter.c:491

3035 #, c-format

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

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

3038

2833 -#: ref-filter.c:547

3039 +#: ref-filter.c:608

3040 #, c-format

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

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

3043

2838 -#: ref-filter.c:607

3044 +#: ref-filter.c:671

3045 #, c-format

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

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

3048

2843 -#: ref-filter.c:609

3049 +#: ref-filter.c:673

3050 #, c-format

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

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

3053

2848 -#: ref-filter.c:611

3054 +#: ref-filter.c:675

3055 #, c-format

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

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

3058

2853 -#: ref-filter.c:637

3059 +#: ref-filter.c:703

3060 #, c-format

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

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

3063

2858 -#: ref-filter.c:639

3064 +#: ref-filter.c:705

3065 #, c-format

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

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

3068

2863 -#: ref-filter.c:641

3069 +#: ref-filter.c:707

3070 #, c-format

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

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

3073

2868 -#: ref-filter.c:654

3074 +#: ref-filter.c:722

3075 #, c-format

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

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

3078

2873 -#: ref-filter.c:709

3079 +#: ref-filter.c:779

3080 #, c-format

3081 msgid "malformed format string %s"

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

3083

2878 -#: ref-filter.c:1313

3084 +#: ref-filter.c:1387

3085 #, c-format

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

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

3088

2883 -#: ref-filter.c:1316

3089 +#: ref-filter.c:1390

3090 +#, c-format

3091 +msgid "(no branch, rebasing detached HEAD %s)"

3092 +msgstr "(aucune branche, rebasage de la HEAD détachée %s)"

3093 +

3094 +#: ref-filter.c:1393

3095 #, c-format

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

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

@@ -2888,7 +3099,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)"

3099 #. TRANSLATORS: make sure this matches "HEAD

3100 #. detached at " in wt-status.c

3101 #.

2891 -#: ref-filter.c:1324

3102 +#: ref-filter.c:1401

3103 #, c-format

3104 msgid "(HEAD detached at %s)"

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

@@ -2896,150 +3107,150 @@ msgstr "(HEAD détachée sur %s)"

3107 #. TRANSLATORS: make sure this matches "HEAD

3108 #. detached from " in wt-status.c

3109 #.

2899 -#: ref-filter.c:1331

3110 +#: ref-filter.c:1408

3111 #, c-format

3112 msgid "(HEAD detached from %s)"

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

3114

2904 -#: ref-filter.c:1335

3115 +#: ref-filter.c:1412

3116 msgid "(no branch)"

3117 msgstr "(aucune branche)"

3118

2908 -#: ref-filter.c:1364

3119 +#: ref-filter.c:1442

3120 #, c-format

3121 msgid "missing object %s for %s"

3122 msgstr "objet manquant %s pour %s"

3123

2913 -#: ref-filter.c:1367

3124 +#: ref-filter.c:1445

3125 #, c-format

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

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

3128

2918 -#: ref-filter.c:1819

3129 +#: ref-filter.c:1902

3130 #, c-format

3131 msgid "malformed object at '%s'"

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

3133

2923 -#: ref-filter.c:1886

3134 +#: ref-filter.c:1984

3135 #, c-format

3136 msgid "ignoring ref with broken name %s"

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

3138

2928 -#: ref-filter.c:1891

3139 +#: ref-filter.c:1989

3140 #, c-format

3141 msgid "ignoring broken ref %s"

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

3143

2933 -#: ref-filter.c:2152

3144 +#: ref-filter.c:2261

3145 #, c-format

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

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

3148

2938 -#: ref-filter.c:2246

3149 +#: ref-filter.c:2365

3150 #, c-format

3151 msgid "malformed object name %s"

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

3153

2943 -#: remote.c:795

3154 +#: remote.c:605

3155 #, c-format

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

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

3158

2948 -#: remote.c:799

3159 +#: remote.c:609

3160 #, c-format

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

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

3163

2953 -#: remote.c:803

3164 +#: remote.c:613

3165 #, c-format

3166 msgid "%s tracks both %s and %s"

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

3168

2958 -#: remote.c:811

3169 +#: remote.c:621

3170 msgid "Internal error"

3171 msgstr "Erreur interne"

3172

2962 -#: remote.c:1726 remote.c:1828

3173 +#: remote.c:1534 remote.c:1635

3174 msgid "HEAD does not point to a branch"

3175 msgstr "HEAD ne pointe pas sur une branche"

3176

2966 -#: remote.c:1735

3177 +#: remote.c:1543

3178 #, c-format

3179 msgid "no such branch: '%s'"

3180 msgstr "pas de branche '%s'"

3181

2971 -#: remote.c:1738

3182 +#: remote.c:1546

3183 #, c-format

3184 msgid "no upstream configured for branch '%s'"

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

3186

2976 -#: remote.c:1744

3187 +#: remote.c:1552

3188 #, c-format

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

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

3191

2981 -#: remote.c:1759

3192 +#: remote.c:1567

3193 #, c-format

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

3195 msgstr ""

3196 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

3197 "branche locale de suivi"

3198

2988 -#: remote.c:1771

3199 +#: remote.c:1579

3200 #, c-format

3201 msgid "branch '%s' has no remote for pushing"

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

3203

2993 -#: remote.c:1782

3204 +#: remote.c:1589

3205 #, c-format

3206 msgid "push refspecs for '%s' do not include '%s'"

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

3208

2998 -#: remote.c:1795

3209 +#: remote.c:1602

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

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

3212

3002 -#: remote.c:1817

3213 +#: remote.c:1624

3214 msgid "cannot resolve 'simple' push to a single destination"

3215 msgstr ""

3216 "impossible de résoudre une poussée 'simple' pour une destination unique"

3217

3007 -#: remote.c:2132

3218 +#: remote.c:1939

3219 #, c-format

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

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

3222

3012 -#: remote.c:2136

3223 +#: remote.c:1943

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

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

3226

3016 -#: remote.c:2139

3227 +#: remote.c:1946

3228 #, c-format

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

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

3231

3021 -#: remote.c:2143

3232 +#: remote.c:1950

3233 #, c-format

3234 msgid "Your branch and '%s' refer to different commits.\n"

3235 msgstr "Votre branche et '%s' font référence à des commits différents.\n"

3236

3026 -#: remote.c:2146

3237 +#: remote.c:1953

3238 #, c-format

3239 msgid " (use \"%s\" for details)\n"

3240 msgstr " (utilisez \"%s\" pour plus de détails)\n"

3241

3031 -#: remote.c:2150

3242 +#: remote.c:1957

3243 #, c-format

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

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

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

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

3248

3038 -#: remote.c:2156

3249 +#: remote.c:1963

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

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

3252

3042 -#: remote.c:2159

3253 +#: remote.c:1966

3254 #, c-format

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

3256 msgid_plural ""

@@ -3051,11 +3262,11 @@ msgstr[1] ""

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

3263 "en avance rapide.\n"

3264

3054 -#: remote.c:2167

3265 +#: remote.c:1974

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

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

3268

3058 -#: remote.c:2170

3269 +#: remote.c:1977

3270 #, c-format

3271 msgid ""

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

@@ -3070,29 +3281,29 @@ msgstr[1] ""

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

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

3283

3073 -#: remote.c:2180

3284 +#: remote.c:1987

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

3286 msgstr ""

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

3288

3078 -#: revision.c:2277

3289 +#: revision.c:2289

3290 msgid "your current branch appears to be broken"

3291 msgstr "votre branche actuelle semble cassée"

3292

3082 -#: revision.c:2280

3293 +#: revision.c:2292

3294 #, c-format

3295 msgid "your current branch '%s' does not have any commits yet"

3296 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

3297

3087 -#: revision.c:2477

3298 +#: revision.c:2489

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

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

3301

3091 -#: run-command.c:731

3302 +#: run-command.c:728

3303 msgid "open /dev/null failed"

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

3305

3095 -#: run-command.c:1274

3306 +#: run-command.c:1271

3307 #, c-format

3308 msgid ""

3309 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -3104,7 +3315,9 @@ msgstr ""

3315

3316 #: send-pack.c:141

3317 msgid "unexpected flush packet while reading remote unpack status"

3107 -msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant"

3318 +msgstr ""

3319 +"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "

3320 +"distant"

3321

3322 #: send-pack.c:143

3323 #, c-format

@@ -3140,29 +3353,34 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic"

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

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

3355

3143 -#: sequencer.c:158

3356 +#: sequencer.c:174

3357 #, c-format

3358 msgid "invalid commit message cleanup mode '%s'"

3359 msgstr "mode de nettoyage invalide de message de validation '%s'"

3360

3148 -#: sequencer.c:267

3361 +#: sequencer.c:274

3362 +#, c-format

3363 +msgid "could not delete '%s'"

3364 +msgstr "Impossible de supprimer '%s'"

3365 +

3366 +#: sequencer.c:300

3367 msgid "revert"

3368 msgstr "revert"

3369

3152 -#: sequencer.c:269

3370 +#: sequencer.c:302

3371 msgid "cherry-pick"

3372 msgstr "cherry-pick"

3373

3156 -#: sequencer.c:271

3374 +#: sequencer.c:304

3375 msgid "rebase -i"

3376 msgstr "rebase -i"

3377

3160 -#: sequencer.c:273

3378 +#: sequencer.c:306

3379 #, c-format

3380 msgid "Unknown action: %d"

3381 msgstr "Action inconnue : %d"

3382

3165 -#: sequencer.c:330

3383 +#: sequencer.c:363

3384 msgid ""

3385 "after resolving the conflicts, mark the corrected paths\n"

3386 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3170,7 +3388,7 @@ msgstr ""

3388 "après résolution des conflits, marquez les chemins corrigés\n"

3389 "avec 'git add <chemins>' ou 'git rm <chemins>'"

3390

3173 -#: sequencer.c:333

3391 +#: sequencer.c:366

3392 msgid ""

3393 "after resolving the conflicts, mark the corrected paths\n"

3394 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3180,43 +3398,45 @@ msgstr ""

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

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

3400

3183 -#: sequencer.c:346 sequencer.c:2245

3401 +#: sequencer.c:379 sequencer.c:2467

3402 #, c-format

3403 msgid "could not lock '%s'"

3404 msgstr "impossible de verrouiller '%s'"

3405

3188 -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3189 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3406 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3407 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3408 #, c-format

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

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

3411

3194 -#: sequencer.c:353

3412 +#: sequencer.c:386

3413 #, c-format

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

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

3416

3199 -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3417 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3418 +#: sequencer.c:2701

3419 #, c-format

3420 msgid "failed to finalize '%s'"

3421 msgstr "échec lors de la finalisation de '%s'"

3422

3204 -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3205 -#: builtin/commit.c:722 builtin/merge.c:1047

3423 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3424 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3425 +#: builtin/merge.c:1045

3426 #, c-format

3427 msgid "could not read '%s'"

3428 msgstr "impossible de lire '%s'"

3429

3210 -#: sequencer.c:405

3430 +#: sequencer.c:440

3431 #, c-format

3432 msgid "your local changes would be overwritten by %s."

3433 msgstr "vos modifications locales seraient écrasées par %s."

3434

3215 -#: sequencer.c:409

3435 +#: sequencer.c:444

3436 msgid "commit your changes or stash them to proceed."

3437 msgstr "validez vos modifications ou les remiser pour continuer."

3438

3219 -#: sequencer.c:438

3439 +#: sequencer.c:473

3440 #, c-format

3441 msgid "%s: fast-forward"

3442 msgstr "%s : avance rapide"

@@ -3224,20 +3444,20 @@ msgstr "%s : avance rapide"

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

3445 #. "rebase -i".

3446 #.

3227 -#: sequencer.c:526

3447 +#: sequencer.c:562

3448 #, c-format

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

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

3451

3232 -#: sequencer.c:542

3233 -msgid "could not resolve HEAD commit"

3234 -msgstr "impossible de résoudre le commit HEAD"

3235 -

3236 -#: sequencer.c:562

3452 +#: sequencer.c:578

3453 msgid "unable to update cache tree"

3454 msgstr "impossible de mettre à jour l'arbre de cache"

3455

3240 -#: sequencer.c:658

3456 +#: sequencer.c:591

3457 +msgid "could not resolve HEAD commit"

3458 +msgstr "impossible de résoudre le commit HEAD"

3459 +

3460 +#: sequencer.c:748

3461 #, c-format

3462 msgid ""

3463 "you have staged changes in your working tree\n"

@@ -3266,11 +3486,15 @@ msgstr ""

3486 "\n"

3487 " git rebase --continue\n"

3488

3269 -#: sequencer.c:915

3489 +#: sequencer.c:817

3490 +msgid "writing root commit"

3491 +msgstr "écriture du commit racine"

3492 +

3493 +#: sequencer.c:1042

3494 msgid "'prepare-commit-msg' hook failed"

3495 msgstr "échec du crochet 'prepare-commit-msg'"

3496

3273 -#: sequencer.c:922

3497 +#: sequencer.c:1049

3498 msgid ""

3499 "Your name and email address were configured automatically based\n"

3500 "on your username and hostname. Please check that they are accurate.\n"

@@ -3298,7 +3522,7 @@ msgstr ""

3522 "\n"

3523 " git commit --amend --reset-author\n"

3524

3301 -#: sequencer.c:935

3525 +#: sequencer.c:1062

3526 msgid ""

3527 "Your name and email address were configured automatically based\n"

3528 "on your username and hostname. Please check that they are accurate.\n"

@@ -3324,330 +3548,316 @@ msgstr ""

3548 "\n"

3549 " git commit --amend --reset-author\n"

3550

3327 -#: sequencer.c:975

3551 +#: sequencer.c:1102

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

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

3554

3331 -#: sequencer.c:977

3555 +#: sequencer.c:1104

3556 msgid "could not parse newly created commit"

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

3558

3335 -#: sequencer.c:1023

3559 +#: sequencer.c:1150

3560 msgid "unable to resolve HEAD after creating commit"

3561 msgstr "impossible de résoudre HEAD après création du commit"

3562

3339 -#: sequencer.c:1025

3563 +#: sequencer.c:1152

3564 msgid "detached HEAD"

3565 msgstr "HEAD détachée"

3566

3343 -#: sequencer.c:1029

3567 +#: sequencer.c:1156

3568 msgid " (root-commit)"

3569 msgstr " (commit racine)"

3570

3347 -#: sequencer.c:1050

3571 +#: sequencer.c:1177

3572 msgid "could not parse HEAD"

3573 msgstr "impossible de lire HEAD"

3574

3351 -#: sequencer.c:1052

3575 +#: sequencer.c:1179

3576 #, c-format

3577 msgid "HEAD %s is not a commit!"

3578 msgstr "HEAD %s n'est pas un commit !"

3579

3356 -#: sequencer.c:1056 builtin/commit.c:1491

3580 +#: sequencer.c:1183 builtin/commit.c:1528

3581 msgid "could not parse HEAD commit"

3582 msgstr "impossible d'analyser le commit HEAD"

3583

3360 -#: sequencer.c:1107 sequencer.c:1673

3584 +#: sequencer.c:1234 sequencer.c:1831

3585 msgid "unable to parse commit author"

3586 msgstr "impossible d'analyser l'auteur du commit"

3587

3364 -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3588 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

3589 msgid "git write-tree failed to write a tree"

3590 msgstr "git write-tree a échoué à écrire un arbre"

3591

3368 -#: sequencer.c:1134 sequencer.c:1186

3592 +#: sequencer.c:1261 sequencer.c:1316

3593 #, c-format

3594 msgid "unable to read commit message from '%s'"

3595 msgstr "impossible de lire le message de validation de '%s'"

3596

3373 -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3374 -#: builtin/merge.c:851

3597 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3598 +#: builtin/merge.c:849

3599 msgid "failed to write commit object"

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

3601

3378 -#: sequencer.c:1213

3602 +#: sequencer.c:1343

3603 #, c-format

3604 msgid "could not parse commit %s"

3605 msgstr "impossible d'analyser le commit %s"

3606

3383 -#: sequencer.c:1218

3607 +#: sequencer.c:1348

3608 #, c-format

3609 msgid "could not parse parent commit %s"

3610 msgstr "impossible d'analyser le commit parent %s"

3611

3388 -#: sequencer.c:1347

3389 -#, c-format

3390 -msgid ""

3391 -"unexpected 1st line of squash message:\n"

3392 -"\n"

3393 -"\t%.*s"

3394 -msgstr ""

3395 -"première ligne de message de compression inattendue :\n"

3396 -"\n"

3397 -"\t%.*s"

3398 -

3399 -#: sequencer.c:1353

3400 -#, c-format

3401 -msgid ""

3402 -"invalid 1st line of squash message:\n"

3403 -"\n"

3404 -"\t%.*s"

3405 -msgstr ""

3406 -"première ligne de message de compression invalide :\n"

3407 -"\n"

3408 -"\t%.*s"

3409 -

3410 -#: sequencer.c:1359 sequencer.c:1384

3612 +#: sequencer.c:1499 sequencer.c:1524

3613 #, c-format

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

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

3616

3415 -#: sequencer.c:1368 sequencer.c:3265

3617 +#: sequencer.c:1509 sequencer.c:4354

3618 msgid "need a HEAD to fixup"

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

3620

3419 -#: sequencer.c:1370

3621 +#: sequencer.c:1511 sequencer.c:2728

3622 msgid "could not read HEAD"

3623 msgstr "Impossible de lire HEAD"

3624

3423 -#: sequencer.c:1372

3625 +#: sequencer.c:1513

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

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

3628

3427 -#: sequencer.c:1378

3629 +#: sequencer.c:1519

3630 #, c-format

3631 msgid "cannot write '%s'"

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

3633

3432 -#: sequencer.c:1387 git-rebase--interactive.sh:452

3634 +#: sequencer.c:1526 git-rebase--interactive.sh:457

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

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

3637

3436 -#: sequencer.c:1395

3638 +#: sequencer.c:1534

3639 #, c-format

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

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

3642

3441 -#: sequencer.c:1402

3643 +#: sequencer.c:1541

3644 #, c-format

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

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

3647

3446 -#: sequencer.c:1407

3648 +#: sequencer.c:1547

3649 #, c-format

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

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

3652

3451 -#: sequencer.c:1412

3653 +#: sequencer.c:1552

3654 #, c-format

3655 msgid "unknown command: %d"

3656 msgstr "commande inconnue : %d"

3657

3456 -#: sequencer.c:1479

3658 +#: sequencer.c:1630

3659 msgid "your index file is unmerged."

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

3661

3460 -#: sequencer.c:1498

3662 +#: sequencer.c:1637

3663 +msgid "cannot fixup root commit"

3664 +msgstr "impossible de réparer le commit racine"

3665 +

3666 +#: sequencer.c:1656

3667 #, c-format

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

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

3670

3465 -#: sequencer.c:1506

3671 +#: sequencer.c:1664

3672 #, c-format

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

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

3675

3470 -#: sequencer.c:1510

3676 +#: sequencer.c:1668

3677 #, c-format

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

3679 msgstr ""

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

3681 "fusion."

3682

3477 -#: sequencer.c:1516

3683 +#: sequencer.c:1674

3684 #, c-format

3685 msgid "cannot get commit message for %s"

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

3687

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

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

3484 -#: sequencer.c:1535

3690 +#: sequencer.c:1693

3691 #, c-format

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

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

3694

3489 -#: sequencer.c:1600 sequencer.c:2397

3695 +#: sequencer.c:1758

3696 #, c-format

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

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

3699

3494 -#: sequencer.c:1654

3700 +#: sequencer.c:1812

3701 #, c-format

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

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

3704

3499 -#: sequencer.c:1655

3705 +#: sequencer.c:1813

3706 #, c-format

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

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

3709

3504 -#: sequencer.c:1702

3710 +#: sequencer.c:1863

3711 msgid "empty commit set passed"

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

3713

3508 -#: sequencer.c:1712

3714 +#: sequencer.c:1873

3715 #, c-format

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

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

3718

3513 -#: sequencer.c:1718

3719 +#: sequencer.c:1880

3720 #, c-format

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

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

3723

3518 -#: sequencer.c:1792

3724 +#: sequencer.c:1960

3725 #, c-format

3726 msgid "%s does not accept arguments: '%s'"

3727 msgstr "%s n'accepte pas d'argument : '%s'"

3728

3523 -#: sequencer.c:1801

3729 +#: sequencer.c:1969

3730 #, c-format

3731 msgid "missing arguments for %s"

3732 msgstr "argument manquant pour %s"

3733

3528 -#: sequencer.c:1844

3734 +#: sequencer.c:2028

3735 #, c-format

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

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

3738

3533 -#: sequencer.c:1852

3739 +#: sequencer.c:2036

3740 #, c-format

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

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

3743

3538 -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3744 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3745 #, c-format

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

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

3748

3543 -#: sequencer.c:1906

3749 +#: sequencer.c:2107

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

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

3752

3547 -#: sequencer.c:1908

3753 +#: sequencer.c:2109

3754 #, c-format

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

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

3757

3552 -#: sequencer.c:1913

3758 +#: sequencer.c:2114

3759 msgid "no commits parsed."

3760 msgstr "aucun commit analysé."

3761

3556 -#: sequencer.c:1924

3762 +#: sequencer.c:2125

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

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

3765

3560 -#: sequencer.c:1926

3766 +#: sequencer.c:2127

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

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

3769

3564 -#: sequencer.c:1993

3770 +#: sequencer.c:2194

3771 #, c-format

3772 msgid "invalid key: %s"

3773 msgstr "clé invalide : %s"

3774

3569 -#: sequencer.c:1996

3775 +#: sequencer.c:2197

3776 #, c-format

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

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

3779

3574 -#: sequencer.c:2062

3780 +#: sequencer.c:2268

3781 +msgid "unusable squash-onto"

3782 +msgstr "\"écrase-sur\" inutilisable"

3783 +

3784 +#: sequencer.c:2284

3785 #, c-format

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

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

3788

3579 -#: sequencer.c:2100

3789 +#: sequencer.c:2322

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

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

3792

3583 -#: sequencer.c:2101

3793 +#: sequencer.c:2323

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

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

3796

3587 -#: sequencer.c:2104

3797 +#: sequencer.c:2326

3798 #, c-format

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

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

3801

3592 -#: sequencer.c:2118

3802 +#: sequencer.c:2340

3803 msgid "could not lock HEAD"

3804 msgstr "impossible de verrouiller HEAD"

3805

3596 -#: sequencer.c:2173 sequencer.c:2761

3806 +#: sequencer.c:2395 sequencer.c:3402

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

3808 msgstr "aucun picorage ou retour en cours"

3809

3600 -#: sequencer.c:2175

3810 +#: sequencer.c:2397

3811 msgid "cannot resolve HEAD"

3812 msgstr "impossible de résoudre HEAD"

3813

3604 -#: sequencer.c:2177 sequencer.c:2212

3814 +#: sequencer.c:2399 sequencer.c:2434

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

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

3817

3608 -#: sequencer.c:2198 builtin/grep.c:720

3818 +#: sequencer.c:2420 builtin/grep.c:720

3819 #, c-format

3820 msgid "cannot open '%s'"

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

3822

3613 -#: sequencer.c:2200

3823 +#: sequencer.c:2422

3824 #, c-format

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

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

3827

3618 -#: sequencer.c:2201

3828 +#: sequencer.c:2423

3829 msgid "unexpected end of file"

3830 msgstr "fin de fichier inattendue"

3831

3622 -#: sequencer.c:2207

3832 +#: sequencer.c:2429

3833 #, c-format

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

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

3836

3627 -#: sequencer.c:2218

3837 +#: sequencer.c:2440

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

3839 msgstr ""

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

3841

3632 -#: sequencer.c:2324 sequencer.c:2679

3842 +#: sequencer.c:2544 sequencer.c:3320

3843 #, c-format

3844 msgid "could not update %s"

3845 msgstr "impossible de mettre à jour %s"

3846

3637 -#: sequencer.c:2362 sequencer.c:2659

3847 +#: sequencer.c:2582 sequencer.c:3300

3848 msgid "cannot read HEAD"

3849 msgstr "impossible de lire HEAD"

3850

3641 -#: sequencer.c:2402 builtin/difftool.c:639

3851 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3852 #, c-format

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

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

3855

3646 -#: sequencer.c:2421

3856 +#: sequencer.c:2640

3857 msgid "could not read index"

3858 msgstr "impossible de lire l'index"

3859

3650 -#: sequencer.c:2426

3860 +#: sequencer.c:2645

3861 #, c-format

3862 msgid ""

3863 "execution failed: %s\n"

@@ -3662,11 +3872,11 @@ msgstr ""

3872 "git rebase --continue\n"

3873 "\n"

3874

3665 -#: sequencer.c:2432

3875 +#: sequencer.c:2651

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

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

3878

3669 -#: sequencer.c:2438

3879 +#: sequencer.c:2657

3880 #, c-format

3881 msgid ""

3882 "execution succeeded: %s\n"

@@ -3683,17 +3893,62 @@ msgstr ""

3893 " git rebase --continue\n"

3894 "\n"

3895

3686 -#: sequencer.c:2497

3896 +#: sequencer.c:2770

3897 +msgid "writing fake root commit"

3898 +msgstr "écriture d'un commit racine bidon"

3899 +

3900 +#: sequencer.c:2775

3901 +msgid "writing squash-onto"

3902 +msgstr "écriture de 'écraser-sur'"

3903 +

3904 +#: sequencer.c:2810

3905 +#, c-format

3906 +msgid "failed to find tree of %s"

3907 +msgstr "impossible de trouver l'arbre de %s"

3908 +

3909 +#: sequencer.c:2828

3910 +msgid "could not write index"

3911 +msgstr "impossible d'écrire l'index"

3912 +

3913 +#: sequencer.c:2860

3914 +msgid "cannot merge without a current revision"

3915 +msgstr "impossible de fusionner avec une révision courante"

3916 +

3917 +#: sequencer.c:2883

3918 +#, c-format

3919 +msgid "could not resolve '%s'"

3920 +msgstr "impossible de résoudre '%s'"

3921 +

3922 +#: sequencer.c:2905

3923 +#, c-format

3924 +msgid "could not get commit message of '%s'"

3925 +msgstr "impossible de lire le message de validation de '%s'"

3926 +

3927 +#: sequencer.c:2915 sequencer.c:2940

3928 +#, c-format

3929 +msgid "could not write '%s'"

3930 +msgstr "impossible d'écrire '%s'"

3931 +

3932 +#: sequencer.c:3004

3933 +#, c-format

3934 +msgid "could not even attempt to merge '%.*s'"

3935 +msgstr "impossible de seulement essayer de fusionner '%.*s'"

3936 +

3937 +#: sequencer.c:3020

3938 +msgid "merge: Unable to write new index file"

3939 +msgstr "fusion : Impossible d'écrire le nouveau fichier index"

3940 +

3941 +#: sequencer.c:3087

3942 #, c-format

3943 msgid "Applied autostash.\n"

3944 msgstr "Autoremisage appliqué.\n"

3945

3691 -#: sequencer.c:2509

3946 +#: sequencer.c:3099

3947 #, c-format

3948 msgid "cannot store %s"

3949 msgstr "impossible de stocker %s"

3950

3696 -#: sequencer.c:2512 git-rebase.sh:178

3951 +#: sequencer.c:3102 git-rebase.sh:188

3952 #, c-format

3953 msgid ""

3954 "Applying autostash resulted in conflicts.\n"

@@ -3704,52 +3959,69 @@ msgstr ""

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

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

3961

3707 -#: sequencer.c:2595

3962 +#: sequencer.c:3133

3963 +#, c-format

3964 +msgid ""

3965 +"Could not execute the todo command\n"

3966 +"\n"

3967 +" %.*s\n"

3968 +"It has been rescheduled; To edit the command before continuing, please\n"

3969 +"edit the todo list first:\n"

3970 +"\n"

3971 +" git rebase --edit-todo\n"

3972 +" git rebase --continue\n"

3973 +msgstr ""

3974 +"Impossible d'exécuter la commande\n"

3975 +"\n"

3976 +" %.*s\n"

3977 +"Elle a été reprogrammée ; pour éditer la commande avant de poursuivre,\n"

3978 +"veuillez éditer la liste de commandes en premier :\n"

3979 +"\n"

3980 +" git rebase --edit-todo\n"

3981 +" git rebase --continue\n"

3982 +

3983 +#: sequencer.c:3201

3984 #, c-format

3985 msgid "Stopped at %s... %.*s\n"

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

3987

3712 -#: sequencer.c:2637

3988 +#: sequencer.c:3263

3989 #, c-format

3990 msgid "unknown command %d"

3991 msgstr "commande inconnue %d"

3992

3717 -#: sequencer.c:2667

3993 +#: sequencer.c:3308

3994 msgid "could not read orig-head"

3995 msgstr "impossible de lire orig-head"

3996

3721 -#: sequencer.c:2672 sequencer.c:3262

3997 +#: sequencer.c:3313 sequencer.c:4351

3998 msgid "could not read 'onto'"

3999 msgstr "impossible de lire 'onto'"

4000

3725 -#: sequencer.c:2686

4001 +#: sequencer.c:3327

4002 #, c-format

4003 msgid "could not update HEAD to %s"

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

4005

3730 -#: sequencer.c:2770

4006 +#: sequencer.c:3413

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

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

4009

3734 -#: sequencer.c:2775

3735 -msgid "could not remove CHERRY_PICK_HEAD"

3736 -msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3737 -

3738 -#: sequencer.c:2784

4010 +#: sequencer.c:3422

4011 msgid "cannot amend non-existing commit"

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

4013

3742 -#: sequencer.c:2786

4014 +#: sequencer.c:3424

4015 #, c-format

4016 msgid "invalid file: '%s'"

4017 msgstr "fichier invalide : '%s'"

4018

3747 -#: sequencer.c:2788

4019 +#: sequencer.c:3426

4020 #, c-format

4021 msgid "invalid contents: '%s'"

4022 msgstr "contenu invalide : '%s'"

4023

3752 -#: sequencer.c:2791

4024 +#: sequencer.c:3429

4025 msgid ""

4026 "\n"

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

@@ -3759,45 +4031,54 @@ msgstr ""

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

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

4033

3762 -#: sequencer.c:2801

4034 +#: sequencer.c:3454 sequencer.c:3492

4035 +#, c-format

4036 +msgid "could not write file: '%s'"

4037 +msgstr "impossible d'écrire le fichier : '%s'"

4038 +

4039 +#: sequencer.c:3507

4040 +msgid "could not remove CHERRY_PICK_HEAD"

4041 +msgstr "impossible de supprimer CHERRY_PICK_HEAD"

4042 +

4043 +#: sequencer.c:3514

4044 msgid "could not commit staged changes."

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

4046

3766 -#: sequencer.c:2881

4047 +#: sequencer.c:3611

4048 #, c-format

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

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

4051

3771 -#: sequencer.c:2885

4052 +#: sequencer.c:3615

4053 #, c-format

4054 msgid "%s: bad revision"

4055 msgstr "%s : mauvaise révision"

4056

3776 -#: sequencer.c:2918

4057 +#: sequencer.c:3648

4058 msgid "can't revert as initial commit"

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

4060

3780 -#: sequencer.c:3023

4061 +#: sequencer.c:4097

4062 msgid "make_script: unhandled options"

4063 msgstr "make_script : options non gérées"

4064

3784 -#: sequencer.c:3026

4065 +#: sequencer.c:4100

4066 msgid "make_script: error preparing revisions"

4067 msgstr "make_script : erreur lors de la préparation des révisions"

4068

3788 -#: sequencer.c:3060 sequencer.c:3095

4069 +#: sequencer.c:4141 sequencer.c:4176

4070 #, c-format

4071 msgid "unusable todo list: '%s'"

4072 msgstr "liste à faire inutilisable : '%s'"

4073

3793 -#: sequencer.c:3146

4074 +#: sequencer.c:4235

4075 #, c-format

4076 msgid ""

4077 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4078 msgstr ""

4079 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

4080

3800 -#: sequencer.c:3212

4081 +#: sequencer.c:4301

4082 #, c-format

4083 msgid ""

4084 "Warning: some commits may have been dropped accidentally.\n"

@@ -3806,7 +4087,7 @@ msgstr ""

4087 "Attention : certains commits ont pu être accidentellement supprimés.\n"

4088 "Commits supprimés (du plus jeune au plus vieux) :\n"

4089

3809 -#: sequencer.c:3219

4090 +#: sequencer.c:4308

4091 #, c-format

4092 msgid ""

4093 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3824,7 +4105,7 @@ msgstr ""

4105 "Les comportements disponibles sont : ignore, warn, error.\n"

4106 "\n"

4107

3827 -#: sequencer.c:3231

4108 +#: sequencer.c:4320

4109 #, c-format

4110 msgid ""

4111 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3835,27 +4116,21 @@ msgstr ""

4116 "rebase --continue'.\n"

4117 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

4118

3838 -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3839 -#: builtin/am.c:779

3840 -#, c-format

3841 -msgid "could not open '%s' for writing"

3842 -msgstr "impossible d'ouvrir '%s' en écriture"

3843 -

3844 -#: sequencer.c:3285

4119 +#: sequencer.c:4374

4120 #, c-format

4121 msgid "could not parse commit '%s'"

4122 msgstr "impossible d'analyser le commit '%s'"

4123

3849 -#: sequencer.c:3401

4124 +#: sequencer.c:4489

4125 msgid "the script was already rearranged."

4126 msgstr "le script a déjà été réarrangé."

4127

3853 -#: setup.c:122

4128 +#: setup.c:123

4129 #, c-format

4130 msgid "'%s' is outside repository"

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

4132

3858 -#: setup.c:171

4133 +#: setup.c:172

4134 #, c-format

4135 msgid ""

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

@@ -3865,7 +4140,7 @@ msgstr ""

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

4141 "n'existent pas localement."

4142

3868 -#: setup.c:184

4143 +#: setup.c:185

4144 #, c-format

4145 msgid ""

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

@@ -3876,12 +4151,14 @@ msgstr ""

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

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

4153

3879 -#: setup.c:233

4154 +#: setup.c:234

4155 #, c-format

4156 msgid "option '%s' must come before non-option arguments"

3882 -msgstr "l'option '%s' doit être présente avant les arguments qui ne sont pas des options"

4157 +msgstr ""

4158 +"l'option '%s' doit être présente avant les arguments qui ne sont pas des "

4159 +"options"

4160

3884 -#: setup.c:252

4161 +#: setup.c:253

4162 #, c-format

4163 msgid ""

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

@@ -3892,158 +4169,163 @@ msgstr ""

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

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

4171

3895 -#: setup.c:388

4172 +#: setup.c:389

4173 msgid "unable to set up work tree using invalid config"

3897 -msgstr "impossible de mettre en place le répertoire de travail en utilisant une configuration invalide"

4174 +msgstr ""

4175 +"impossible de mettre en place le répertoire de travail en utilisant une "

4176 +"configuration invalide"

4177

3899 -#: setup.c:395

4178 +#: setup.c:393

4179 msgid "this operation must be run in a work tree"

4180 msgstr "Cette opération doit être effectuée dans un arbre de travail"

4181

3903 -#: setup.c:506

4182 +#: setup.c:503

4183 #, c-format

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

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

4186

3908 -#: setup.c:514

4187 +#: setup.c:511

4188 msgid "unknown repository extensions found:"

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

4190

3912 -#: setup.c:533

4191 +#: setup.c:530

4192 #, c-format

4193 msgid "error opening '%s'"

4194 msgstr "erreur à l'ouverture de '%s'"

4195

3917 -#: setup.c:535

4196 +#: setup.c:532

4197 #, c-format

4198 msgid "too large to be a .git file: '%s'"

4199 msgstr "trop gros pour être une fichier .git : '%s'"

4200

3922 -#: setup.c:537

4201 +#: setup.c:534

4202 #, c-format

4203 msgid "error reading %s"

4204 msgstr "erreur à la lecture de %s"

4205

3927 -#: setup.c:539

4206 +#: setup.c:536

4207 #, c-format

4208 msgid "invalid gitfile format: %s"

4209 msgstr "format de fichier git invalide : %s"

4210

3932 -#: setup.c:541

4211 +#: setup.c:538

4212 #, c-format

4213 msgid "no path in gitfile: %s"

4214 msgstr "aucun chemin dans le fichier git : %s"

4215

3937 -#: setup.c:543

4216 +#: setup.c:540

4217 #, c-format

4218 msgid "not a git repository: %s"

4219 msgstr "ce n'est pas un dépôt git : %s"

4220

3942 -#: setup.c:642

4221 +#: setup.c:639

4222 #, c-format

4223 msgid "'$%s' too big"

4224 msgstr "'$%s' trop gros"

4225

3947 -#: setup.c:656

4226 +#: setup.c:653

4227 #, c-format

4228 msgid "not a git repository: '%s'"

4229 msgstr "ce n'est pas un dépôt git : '%s'"

4230

3952 -#: setup.c:685 setup.c:687 setup.c:718

4231 +#: setup.c:682 setup.c:684 setup.c:715

4232 #, c-format

4233 msgid "cannot chdir to '%s'"

4234 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"

4235

3957 -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

4236 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

4237 msgid "cannot come back to cwd"

4238 msgstr "impossible de revenir au répertoire de travail courant"

4239

3961 -#: setup.c:816

4240 +#: setup.c:813

4241 #, c-format

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

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

4244

3966 -#: setup.c:827

4245 +#: setup.c:824

4246 #, c-format

4247 msgid "failed to stat '%*s%s%s'"

4248 msgstr "échec du stat de '%*s%s%s'"

4249

3971 -#: setup.c:1057

4250 +#: setup.c:1054

4251 msgid "Unable to read current working directory"

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

4253

3975 -#: setup.c:1069 setup.c:1075

4254 +#: setup.c:1066 setup.c:1072

4255 #, c-format

4256 msgid "cannot change to '%s'"

4257 msgstr "impossible de modifier en '%s'"

4258

3980 -#: setup.c:1088

4259 +#: setup.c:1085

4260 #, c-format

4261 msgid ""

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

4263 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

4264 msgstr ""

3986 -"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n"

3987 -"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)."

4265 +"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "

4266 +"n'est un dépôt git\n"

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

4268 +"n'est pas défini)."

4269

3989 -#: setup.c:1172

4270 +#: setup.c:1168

4271 #, c-format

4272 msgid ""

4273 "problem with core.sharedRepository filemode value (0%.3o).\n"

4274 "The owner of files must always have read and write permissions."

4275 msgstr ""

4276 "problème avec la valeur de core.sharedRepository (0%.3o).\n"

3996 -"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture."

4277 +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "

4278 +"écriture."

4279

3998 -#: setup.c:1215

4280 +#: setup.c:1211

4281 msgid "open /dev/null or dup failed"

4282 msgstr "échec de l'ouverture ou au dup de /dev/null"

4283

4002 -#: setup.c:1230

4284 +#: setup.c:1226

4285 msgid "fork failed"

4286 msgstr "échec de la bifurcation"

4287

4006 -#: setup.c:1235

4288 +#: setup.c:1231

4289 msgid "setsid failed"

4290 msgstr "échec du setsid"

4291

4010 -#: sha1_file.c:592

4292 +#: sha1-file.c:625

4293 #, c-format

4294 msgid "path '%s' does not exist"

4295 msgstr "le chemin '%s' n'existe pas"

4296

4015 -#: sha1_file.c:618

4297 +#: sha1-file.c:651

4298 #, c-format

4299 msgid "reference repository '%s' as a linked checkout is not supported yet."

4300 msgstr ""

4301 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

4302 "encore supporté."

4303

4022 -#: sha1_file.c:624

4304 +#: sha1-file.c:657

4305 #, c-format

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

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

4308

4027 -#: sha1_file.c:630

4309 +#: sha1-file.c:663

4310 #, c-format

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

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

4313

4032 -#: sha1_file.c:638

4314 +#: sha1-file.c:671

4315 #, c-format

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

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

4318

4037 -#: sha1_name.c:422

4319 +#: sha1-name.c:442

4320 #, c-format

4321 msgid "short SHA1 %s is ambiguous"

4322 msgstr "le SHA1 court %s est ambigu"

4323

4042 -#: sha1_name.c:433

4324 +#: sha1-name.c:453

4325 msgid "The candidates are:"

4326 msgstr "Les candidats sont :"

4327

4046 -#: sha1_name.c:693

4328 +#: sha1-name.c:695

4329 msgid ""

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

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

@@ -4068,72 +4350,72 @@ msgstr ""

4350 "message\n"

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

4352

4071 -#: submodule.c:96 submodule.c:130

4353 +#: submodule.c:97 submodule.c:131

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

4355 msgstr ""

4356 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

4357 "d'abord"

4358

4077 -#: submodule.c:100 submodule.c:134

4359 +#: submodule.c:101 submodule.c:135

4360 #, c-format

4361 msgid "Could not find section in .gitmodules where path=%s"

4362 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

4363

4082 -#: submodule.c:108

4364 +#: submodule.c:109

4365 #, c-format

4366 msgid "Could not update .gitmodules entry %s"

4367 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

4368

4369 # ici %s est un chemin

4088 -#: submodule.c:141

4370 +#: submodule.c:142

4371 #, c-format

4372 msgid "Could not remove .gitmodules entry for %s"

4373 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

4374

4093 -#: submodule.c:152

4375 +#: submodule.c:153

4376 msgid "staging updated .gitmodules failed"

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

4378

4097 -#: submodule.c:312

4379 +#: submodule.c:315

4380 #, c-format

4381 msgid "in unpopulated submodule '%s'"

4382 msgstr "dans le sous-module '%s' non populé"

4383

4102 -#: submodule.c:343

4384 +#: submodule.c:346

4385 #, c-format

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

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

4388

4107 -#: submodule.c:833

4389 +#: submodule.c:837

4390 #, c-format

4391 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4392 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

4393

4112 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

4394 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

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

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

4397

4116 -#: submodule.c:1370

4398 +#: submodule.c:1373

4399 #, c-format

4400 msgid "'%s' not recognized as a git repository"

4401 msgstr "'%s' n'est pas reconnu comme dépôt git"

4402

4121 -#: submodule.c:1508

4403 +#: submodule.c:1511

4404 #, c-format

4405 msgid "could not start 'git status' in submodule '%s'"

4406 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"

4407

4126 -#: submodule.c:1521

4408 +#: submodule.c:1524

4409 #, c-format

4410 msgid "could not run 'git status' in submodule '%s'"

4411 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"

4412

4131 -#: submodule.c:1614

4413 +#: submodule.c:1617

4414 #, c-format

4415 msgid "submodule '%s' has dirty index"

4416 msgstr "le sous-module '%s' a un index sale"

4417

4136 -#: submodule.c:1878

4418 +#: submodule.c:1716

4419 #, c-format

4420 msgid ""

4421 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -4141,18 +4423,18 @@ msgstr ""

4423 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "

4424 "n'est pas supporté"

4425

4144 -#: submodule.c:1890 submodule.c:1946

4426 +#: submodule.c:1728 submodule.c:1784

4427 #, c-format

4428 msgid "could not lookup name for submodule '%s'"

4429 msgstr "impossible de trouve le nom pour le sous-module '%s'"

4430

4149 -#: submodule.c:1894 builtin/submodule--helper.c:1246

4150 -#: builtin/submodule--helper.c:1256

4431 +#: submodule.c:1732 builtin/submodule--helper.c:1261

4432 +#: builtin/submodule--helper.c:1271

4433 #, c-format

4434 msgid "could not create directory '%s'"

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

4436

4155 -#: submodule.c:1897

4437 +#: submodule.c:1735

4438 #, c-format

4439 msgid ""

4440 "Migrating git directory of '%s%s' from\n"

@@ -4163,29 +4445,30 @@ msgstr ""

4445 "'%s' sur\n"

4446 "'%s'\n"

4447

4166 -#: submodule.c:1981

4448 +#: submodule.c:1819

4449 #, c-format

4450 msgid "could not recurse into submodule '%s'"

4451 msgstr "récursion impossible dans le sous-module '%s'"

4452

4171 -#: submodule.c:2025

4453 +#: submodule.c:1863

4454 msgid "could not start ls-files in .."

4455 msgstr "impossible de démarrer ls-files dans .."

4456

4175 -#: submodule.c:2045

4176 -msgid "BUG: returned path string doesn't match cwd?"

4177 -msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"

4178 -

4179 -#: submodule.c:2064

4457 +#: submodule.c:1902

4458 #, c-format

4459 msgid "ls-tree returned unexpected return code %d"

4460 msgstr "ls-tree a renvoyé un code de retour inattendu %d"

4461

4184 -#: submodule-config.c:263

4462 +#: submodule-config.c:230

4463 +#, c-format

4464 +msgid "ignoring suspicious submodule name: %s"

4465 +msgstr "nom de sous-module suspicieux %s ignoré"

4466 +

4467 +#: submodule-config.c:294

4468 msgid "negative values not allowed for submodule.fetchjobs"

4469 msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

4470

4188 -#: submodule-config.c:436

4471 +#: submodule-config.c:467

4472 #, c-format

4473 msgid "invalid value for %s"

4474 msgstr "Valeur invalide pour %s"

@@ -4201,7 +4484,7 @@ msgstr "échec de la commande trailer '%s'"

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

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

4486

4204 -#: trailer.c:539 trailer.c:544 builtin/remote.c:290

4487 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293

4488 #, c-format

4489 msgid "more than one %s"

4490 msgstr "plus d'un %s"

@@ -4244,17 +4527,21 @@ msgstr "impossible de créer un fichier temporaire"

4527 msgid "could not rename temporary file to %s"

4528 msgstr "impossible de renommer un fichier temporaire en %s"

4529

4247 -#: transport.c:63

4530 +#: transport.c:116

4531 #, c-format

4532 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4533 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"

4534

4252 -#: transport.c:152

4535 +#: transport.c:208

4536 #, c-format

4537 msgid "transport: invalid depth option '%s'"

4538 msgstr "transport : option de profondeur invalide '%s'"

4539

4257 -#: transport.c:916

4540 +#: transport.c:584

4541 +msgid "could not parse transport.color.* config"

4542 +msgstr "impossible d'analyser la configuration transport.color.*"

4543 +

4544 +#: transport.c:996

4545 #, c-format

4546 msgid ""

4547 "The following submodule paths contain changes that can\n"

@@ -4263,7 +4550,7 @@ msgstr ""

4550 "Les chemins suivant de sous-module contiennent des modifications\n"

4551 "qui ne peuvent être trouvées sur aucun distant :\n"

4552

4266 -#: transport.c:920

4553 +#: transport.c:1000

4554 #, c-format

4555 msgid ""

4556 "\n"

@@ -4290,11 +4577,11 @@ msgstr ""

4577 "pour les pousser vers un serveur distant.\n"

4578 "\n"

4579

4293 -#: transport.c:928

4580 +#: transport.c:1008

4581 msgid "Aborting."

4582 msgstr "Abandon."

4583

4297 -#: transport-helper.c:1079

4584 +#: transport-helper.c:1087

4585 #, c-format

4586 msgid "Could not read ref %s"

4587 msgstr "impossible de lire la réf %s"

@@ -4311,11 +4598,11 @@ msgstr "mode invalide dans l'entrée d'arbre"

4598 msgid "empty filename in tree entry"

4599 msgstr "nom de fichier vide dans une entrée de l'arbre"

4600

4314 -#: tree-walk.c:114

4601 +#: tree-walk.c:113

4602 msgid "too-short tree file"

4603 msgstr "fichier arbre trop court"

4604

4318 -#: unpack-trees.c:108

4605 +#: unpack-trees.c:111

4606 #, c-format

4607 msgid ""

4608 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4326,7 +4613,7 @@ msgstr ""

4613 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "

4614 "branche."

4615

4329 -#: unpack-trees.c:110

4616 +#: unpack-trees.c:113

4617 #, c-format

4618 msgid ""

4619 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -4336,7 +4623,7 @@ msgstr ""

4623 "l'extraction :\n"

4624 "%%s"

4625

4339 -#: unpack-trees.c:113

4626 +#: unpack-trees.c:116

4627 #, c-format

4628 msgid ""

4629 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4346,7 +4633,7 @@ msgstr ""

4633 "fusion :\n"

4634 "%%sVeuillez valider ou remiser vos modifications avant la fusion."

4635

4349 -#: unpack-trees.c:115

4636 +#: unpack-trees.c:118

4637 #, c-format

4638 msgid ""

4639 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4356,7 +4643,7 @@ msgstr ""

4643 "fusion :\n"

4644 "%%s"

4645

4359 -#: unpack-trees.c:118

4646 +#: unpack-trees.c:121

4647 #, c-format

4648 msgid ""

4649 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4365,7 +4652,7 @@ msgstr ""

4652 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4653 "%%sVeuillez valider ou remiser vos modifications avant %s."

4654

4368 -#: unpack-trees.c:120

4655 +#: unpack-trees.c:123

4656 #, c-format

4657 msgid ""

4658 "Your local changes to the following files would be overwritten by %s:\n"

@@ -4374,7 +4661,7 @@ msgstr ""

4661 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

4662 "%%s"

4663

4377 -#: unpack-trees.c:125

4664 +#: unpack-trees.c:128

4665 #, c-format

4666 msgid ""

4667 "Updating the following directories would lose untracked files in them:\n"

@@ -4384,7 +4671,7 @@ msgstr ""

4671 "contenus :\n"

4672 "%s"

4673

4387 -#: unpack-trees.c:129

4674 +#: unpack-trees.c:132

4675 #, c-format

4676 msgid ""

4677 "The following untracked working tree files would be removed by checkout:\n"

@@ -4394,7 +4681,7 @@ msgstr ""

4681 "l'extraction :\n"

4682 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4683

4397 -#: unpack-trees.c:131

4684 +#: unpack-trees.c:134

4685 #, c-format

4686 msgid ""

4687 "The following untracked working tree files would be removed by checkout:\n"

@@ -4403,7 +4690,7 @@ msgstr ""

4690 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

4691 "%%s"

4692

4406 -#: unpack-trees.c:134

4693 +#: unpack-trees.c:137

4694 #, c-format

4695 msgid ""

4696 "The following untracked working tree files would be removed by merge:\n"

@@ -4413,7 +4700,7 @@ msgstr ""

4700 "la fusion :\n"

4701 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4702

4416 -#: unpack-trees.c:136

4703 +#: unpack-trees.c:139

4704 #, c-format

4705 msgid ""

4706 "The following untracked working tree files would be removed by merge:\n"

@@ -4422,7 +4709,7 @@ msgstr ""

4709 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"

4710 "%%s"

4711

4425 -#: unpack-trees.c:139

4712 +#: unpack-trees.c:142

4713 #, c-format

4714 msgid ""

4715 "The following untracked working tree files would be removed by %s:\n"

@@ -4432,7 +4719,7 @@ msgstr ""

4719 "%s :\n"

4720 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4721

4435 -#: unpack-trees.c:141

4722 +#: unpack-trees.c:144

4723 #, c-format

4724 msgid ""

4725 "The following untracked working tree files would be removed by %s:\n"

@@ -4441,7 +4728,7 @@ msgstr ""

4728 "Les fichiers suivants non suivis seraient effacés par %s :\n"

4729 "%%s"

4730

4444 -#: unpack-trees.c:146

4731 +#: unpack-trees.c:150

4732 #, c-format

4733 msgid ""

4734 "The following untracked working tree files would be overwritten by "

@@ -4452,7 +4739,7 @@ msgstr ""

4739 "l'extraction :\n"

4740 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

4741

4455 -#: unpack-trees.c:148

4742 +#: unpack-trees.c:152

4743 #, c-format

4744 msgid ""

4745 "The following untracked working tree files would be overwritten by "

@@ -4462,7 +4749,7 @@ msgstr ""

4749 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

4750 "%%s"

4751

4465 -#: unpack-trees.c:151

4752 +#: unpack-trees.c:155

4753 #, c-format

4754 msgid ""

4755 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4472,7 +4759,7 @@ msgstr ""

4759 "la fusion :\n"

4760 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

4761

4475 -#: unpack-trees.c:153

4762 +#: unpack-trees.c:157

4763 #, c-format

4764 msgid ""

4765 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4481,7 +4768,7 @@ msgstr ""

4768 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

4769 "%%s"

4770

4484 -#: unpack-trees.c:156

4771 +#: unpack-trees.c:160

4772 #, c-format

4773 msgid ""

4774 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4491,7 +4778,7 @@ msgstr ""

4778 "%s :\n"

4779 "%%sVeuillez renommer ou effacer ces fichiers avant %s."

4780

4494 -#: unpack-trees.c:158

4781 +#: unpack-trees.c:162

4782 #, c-format

4783 msgid ""

4784 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4500,12 +4787,12 @@ msgstr ""

4787 "Les fichiers suivants non suivis seraient écrasés par %s :\n"

4788 "%%s"

4789

4503 -#: unpack-trees.c:165

4790 +#: unpack-trees.c:170

4791 #, c-format

4792 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4793 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

4794

4508 -#: unpack-trees.c:168

4795 +#: unpack-trees.c:173

4796 #, c-format

4797 msgid ""

4798 "Cannot update sparse checkout: the following entries are not up to date:\n"

@@ -4515,7 +4802,7 @@ msgstr ""

4802 "pas à jour :\n"

4803 "%s"

4804

4518 -#: unpack-trees.c:170

4805 +#: unpack-trees.c:175

4806 #, c-format

4807 msgid ""

4808 "The following working tree files would be overwritten by sparse checkout "

@@ -4526,7 +4813,7 @@ msgstr ""

4813 "jour par l'extraction creuse :\n"

4814 "%s"

4815

4529 -#: unpack-trees.c:172

4816 +#: unpack-trees.c:177

4817 #, c-format

4818 msgid ""

4819 "The following working tree files would be removed by sparse checkout "

@@ -4537,7 +4824,7 @@ msgstr ""

4824 "à jour par extraction creuse :\n"

4825 "%s"

4826

4540 -#: unpack-trees.c:174

4827 +#: unpack-trees.c:179

4828 #, c-format

4829 msgid ""

4830 "Cannot update submodule:\n"

@@ -4546,12 +4833,12 @@ msgstr ""

4833 "Mise à jour impossible pour le sous-module :\n"

4834 "%s"

4835

4549 -#: unpack-trees.c:251

4836 +#: unpack-trees.c:262

4837 #, c-format

4838 msgid "Aborting\n"

4839 msgstr "Abandon\n"

4840

4554 -#: unpack-trees.c:333

4841 +#: unpack-trees.c:344

4842 msgid "Checking out files"

4843 msgstr "Extraction des fichiers"

4844

@@ -4592,12 +4879,15 @@ msgstr "échec de la lecture de '%s'"

4879 #: worktree.c:291

4880 #, c-format

4881 msgid "'%s' at main working tree is not the repository directory"

4595 -msgstr "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"

4882 +msgstr ""

4883 +"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"

4884

4885 #: worktree.c:302

4886 #, c-format

4887 msgid "'%s' file does not contain absolute path to the working tree location"

4600 -msgstr "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre de travail"

4888 +msgstr ""

4889 +"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "

4890 +"de travail"

4891

4892 #: worktree.c:314

4893 #, c-format

@@ -4620,7 +4910,7 @@ msgid "could not open '%s' for reading and writing"

4910 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

4911

4912 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4623 -#: builtin/am.c:862 builtin/merge.c:1044

4913 +#: builtin/am.c:862 builtin/merge.c:1042

4914 #, c-format

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

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

@@ -4634,158 +4924,158 @@ msgstr "impossible d'accéder à '%s'"

4924 msgid "unable to get current working directory"

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

4926

4637 -#: wt-status.c:151

4927 +#: wt-status.c:154

4928 msgid "Unmerged paths:"

4929 msgstr "Chemins non fusionnés :"

4930

4641 -#: wt-status.c:178 wt-status.c:205

4931 +#: wt-status.c:181 wt-status.c:208

4932 #, c-format

4933 msgid " (use \"git reset %s <file>...\" to unstage)"

4934 msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"

4935

4646 -#: wt-status.c:180 wt-status.c:207

4936 +#: wt-status.c:183 wt-status.c:210

4937 msgid " (use \"git rm --cached <file>...\" to unstage)"

4938 msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"

4939

4650 -#: wt-status.c:184

4940 +#: wt-status.c:187

4941 msgid " (use \"git add <file>...\" to mark resolution)"

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

4943

4654 -#: wt-status.c:186 wt-status.c:190

4944 +#: wt-status.c:189 wt-status.c:193

4945 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4946 msgstr ""

4947 " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "

4948 "résolu)"

4949

4660 -#: wt-status.c:188

4950 +#: wt-status.c:191

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

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

4953

4664 -#: wt-status.c:199 wt-status.c:1007

4954 +#: wt-status.c:202 wt-status.c:1015

4955 msgid "Changes to be committed:"

4956 msgstr "Modifications qui seront validées :"

4957

4668 -#: wt-status.c:217 wt-status.c:1016

4958 +#: wt-status.c:220 wt-status.c:1024

4959 msgid "Changes not staged for commit:"

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

4961

4672 -#: wt-status.c:221

4962 +#: wt-status.c:224

4963 msgid " (use \"git add <file>...\" to update what will be committed)"

4964 msgstr ""

4965 " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"

4966

4677 -#: wt-status.c:223

4967 +#: wt-status.c:226

4968 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4969 msgstr ""

4970 " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "

4971 "validé)"

4972

4683 -#: wt-status.c:224

4973 +#: wt-status.c:227

4974 msgid ""

4975 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4976 msgstr ""

4977 " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "

4978 "dans la copie de travail)"

4979

4690 -#: wt-status.c:226

4980 +#: wt-status.c:229

4981 msgid " (commit or discard the untracked or modified content in submodules)"

4982 msgstr ""

4983 " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"

4984

4695 -#: wt-status.c:238

4985 +#: wt-status.c:241

4986 #, c-format

4987 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4988 msgstr ""

4989 " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"

4990

4701 -#: wt-status.c:253

4991 +#: wt-status.c:256

4992 msgid "both deleted:"

4993 msgstr "supprimé des deux côtés :"

4994

4705 -#: wt-status.c:255

4995 +#: wt-status.c:258

4996 msgid "added by us:"

4997 msgstr "ajouté par nous :"

4998

4709 -#: wt-status.c:257

4999 +#: wt-status.c:260

5000 msgid "deleted by them:"

5001 msgstr "supprimé par eux :"

5002

4713 -#: wt-status.c:259

5003 +#: wt-status.c:262

5004 msgid "added by them:"

5005 msgstr "ajouté par eux :"

5006

4717 -#: wt-status.c:261

5007 +#: wt-status.c:264

5008 msgid "deleted by us:"

5009 msgstr "supprimé par nous :"

5010

4721 -#: wt-status.c:263

5011 +#: wt-status.c:266

5012 msgid "both added:"

5013 msgstr "ajouté de deux côtés :"

5014

4725 -#: wt-status.c:265

5015 +#: wt-status.c:268

5016 msgid "both modified:"

5017 msgstr "modifié des deux côtés :"

5018

4729 -#: wt-status.c:275

5019 +#: wt-status.c:278

5020 msgid "new file:"

5021 msgstr "nouveau fichier :"

5022

4733 -#: wt-status.c:277

5023 +#: wt-status.c:280

5024 msgid "copied:"

5025 msgstr "copié :"

5026

4737 -#: wt-status.c:279

5027 +#: wt-status.c:282

5028 msgid "deleted:"

5029 msgstr "supprimé :"

5030

4741 -#: wt-status.c:281

5031 +#: wt-status.c:284

5032 msgid "modified:"

5033 msgstr "modifié :"

5034

4745 -#: wt-status.c:283

5035 +#: wt-status.c:286

5036 msgid "renamed:"

5037 msgstr "renommé :"

5038

4749 -#: wt-status.c:285

5039 +#: wt-status.c:288

5040 msgid "typechange:"

5041 msgstr "modif. type :"

5042

4753 -#: wt-status.c:287

5043 +#: wt-status.c:290

5044 msgid "unknown:"

5045 msgstr "inconnu :"

5046

4757 -#: wt-status.c:289

5047 +#: wt-status.c:292

5048 msgid "unmerged:"

5049 msgstr "non fusionné :"

5050

4761 -#: wt-status.c:369

5051 +#: wt-status.c:372

5052 msgid "new commits, "

5053 msgstr "nouveaux commits, "

5054

4765 -#: wt-status.c:371

5055 +#: wt-status.c:374

5056 msgid "modified content, "

5057 msgstr "contenu modifié, "

5058

4769 -#: wt-status.c:373

5059 +#: wt-status.c:376

5060 msgid "untracked content, "

5061 msgstr "contenu non suivi, "

5062

4773 -#: wt-status.c:847

5063 +#: wt-status.c:853

5064 #, c-format

5065 msgid "Your stash currently has %d entry"

5066 msgid_plural "Your stash currently has %d entries"

5067 msgstr[0] "Votre remisage contient actuellement %d entrée"

5068 msgstr[1] "Votre remisage contient actuellement %d entrées"

5069

4780 -#: wt-status.c:879

5070 +#: wt-status.c:885

5071 msgid "Submodules changed but not updated:"

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

5073

4784 -#: wt-status.c:881

5074 +#: wt-status.c:887

5075 msgid "Submodule changes to be committed:"

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

5077

4788 -#: wt-status.c:963

5078 +#: wt-status.c:969

5079 msgid ""

5080 "Do not modify or remove the line above.\n"

5081 "Everything below it will be ignored."

@@ -4793,107 +5083,107 @@ msgstr ""

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

5084 "Tout ce qui suit sera éliminé."

5085

4796 -#: wt-status.c:1076

5086 +#: wt-status.c:1084

5087 msgid "You have unmerged paths."

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

5089

4800 -#: wt-status.c:1079

5090 +#: wt-status.c:1087

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

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

5093

4804 -#: wt-status.c:1081

5094 +#: wt-status.c:1089

5095 msgid " (use \"git merge --abort\" to abort the merge)"

5096 msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"

5097

4808 -#: wt-status.c:1086

5098 +#: wt-status.c:1094

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

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

5101

4812 -#: wt-status.c:1089

5102 +#: wt-status.c:1097

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

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

5105

4816 -#: wt-status.c:1099

5106 +#: wt-status.c:1107

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

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

5109

4820 -#: wt-status.c:1102

5110 +#: wt-status.c:1110

5111 msgid "The current patch is empty."

5112 msgstr "Le patch actuel est vide."

5113

4824 -#: wt-status.c:1106

5114 +#: wt-status.c:1114

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

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

5117

4828 -#: wt-status.c:1108

5118 +#: wt-status.c:1116

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

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

5121

4832 -#: wt-status.c:1110

5122 +#: wt-status.c:1118

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

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

5125

4836 -#: wt-status.c:1242

5126 +#: wt-status.c:1250

5127 msgid "git-rebase-todo is missing."

5128 msgstr "git-rebase-todo est manquant."

5129

4840 -#: wt-status.c:1244

5130 +#: wt-status.c:1252

5131 msgid "No commands done."

5132 msgstr "Aucune commande réalisée."

5133

4844 -#: wt-status.c:1247

5134 +#: wt-status.c:1255

5135 #, c-format

5136 msgid "Last command done (%d command done):"

5137 msgid_plural "Last commands done (%d commands done):"

5138 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"

5139 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"

5140

4851 -#: wt-status.c:1258

5141 +#: wt-status.c:1266

5142 #, c-format

5143 msgid " (see more in file %s)"

5144 msgstr " (voir plus dans le fichier %s)"

5145

4856 -#: wt-status.c:1263

5146 +#: wt-status.c:1271

5147 msgid "No commands remaining."

5148 msgstr "Aucune commande restante."

5149

4860 -#: wt-status.c:1266

5150 +#: wt-status.c:1274

5151 #, c-format

5152 msgid "Next command to do (%d remaining command):"

5153 msgid_plural "Next commands to do (%d remaining commands):"

5154 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"

5155 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"

5156

4867 -#: wt-status.c:1274

5157 +#: wt-status.c:1282

5158 msgid " (use \"git rebase --edit-todo\" to view and edit)"

5159 msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"

5160

4871 -#: wt-status.c:1287

5161 +#: wt-status.c:1295

5162 #, c-format

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

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

5165

4876 -#: wt-status.c:1292

5166 +#: wt-status.c:1300

5167 msgid "You are currently rebasing."

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

5169

4880 -#: wt-status.c:1306

5170 +#: wt-status.c:1314

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

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

5173

4884 -#: wt-status.c:1308

5174 +#: wt-status.c:1316

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

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

5177

4888 -#: wt-status.c:1310

5178 +#: wt-status.c:1318

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

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

5181

4892 -#: wt-status.c:1316

5182 +#: wt-status.c:1324

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

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

5185

4896 -#: wt-status.c:1320

5186 +#: wt-status.c:1328

5187 #, c-format

5188 msgid ""

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

@@ -4901,128 +5191,128 @@ msgstr ""

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

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

5193

4904 -#: wt-status.c:1325

5194 +#: wt-status.c:1333

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

5196 msgstr ""

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

5198

4909 -#: wt-status.c:1328

5199 +#: wt-status.c:1336

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

5201 msgstr ""

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

5203

4914 -#: wt-status.c:1332

5204 +#: wt-status.c:1340

5205 #, c-format

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

5207 msgstr ""

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

5209 "branche '%s' sur '%s'."

5210

4921 -#: wt-status.c:1337

5211 +#: wt-status.c:1345

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

5213 msgstr ""

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

5215

4926 -#: wt-status.c:1340

5216 +#: wt-status.c:1348

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

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

5219

4930 -#: wt-status.c:1342

5220 +#: wt-status.c:1350

5221 msgid ""

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

5223 msgstr ""

5224 " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "

5225 "modifications)"

5226

4937 -#: wt-status.c:1352

5227 +#: wt-status.c:1360

5228 #, c-format

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

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

5231

4942 -#: wt-status.c:1357

5232 +#: wt-status.c:1365

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

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

5235

4946 -#: wt-status.c:1360

5236 +#: wt-status.c:1368

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

5238 msgstr ""

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

5240

4951 -#: wt-status.c:1362

5241 +#: wt-status.c:1370

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

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

5244

4955 -#: wt-status.c:1371

5245 +#: wt-status.c:1379

5246 #, c-format

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

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

5249

4960 -#: wt-status.c:1376

5250 +#: wt-status.c:1384

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

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

5253

4964 -#: wt-status.c:1379

5254 +#: wt-status.c:1387

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

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

5257

4968 -#: wt-status.c:1381

5258 +#: wt-status.c:1389

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

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

5261

4972 -#: wt-status.c:1392

5262 +#: wt-status.c:1400

5263 #, c-format

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

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

5266

4977 -#: wt-status.c:1396

5267 +#: wt-status.c:1404

5268 msgid "You are currently bisecting."

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

5270

4981 -#: wt-status.c:1399

5271 +#: wt-status.c:1407

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

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

5274

4985 -#: wt-status.c:1596

5275 +#: wt-status.c:1604

5276 msgid "On branch "

5277 msgstr "Sur la branche "

5278

4989 -#: wt-status.c:1602

5279 +#: wt-status.c:1610

5280 msgid "interactive rebase in progress; onto "

5281 msgstr "rebasage interactif en cours ; sur "

5282

4993 -#: wt-status.c:1604

5283 +#: wt-status.c:1612

5284 msgid "rebase in progress; onto "

5285 msgstr "rebasage en cours ; sur "

5286

4997 -#: wt-status.c:1609

5287 +#: wt-status.c:1617

5288 msgid "HEAD detached at "

5289 msgstr "HEAD détachée sur "

5290

5001 -#: wt-status.c:1611

5291 +#: wt-status.c:1619

5292 msgid "HEAD detached from "

5293 msgstr "HEAD détachée depuis "

5294

5005 -#: wt-status.c:1614

5295 +#: wt-status.c:1622

5296 msgid "Not currently on any branch."

5297 msgstr "Actuellement sur aucun branche."

5298

5009 -#: wt-status.c:1634

5299 +#: wt-status.c:1642

5300 msgid "Initial commit"

5301 msgstr "Validation initiale"

5302

5013 -#: wt-status.c:1635

5303 +#: wt-status.c:1643

5304 msgid "No commits yet"

5305 msgstr "Aucun commit"

5306

5017 -#: wt-status.c:1649

5307 +#: wt-status.c:1657

5308 msgid "Untracked files"

5309 msgstr "Fichiers non suivis"

5310

5021 -#: wt-status.c:1651

5311 +#: wt-status.c:1659

5312 msgid "Ignored files"

5313 msgstr "Fichiers ignorés"

5314

5025 -#: wt-status.c:1655

5315 +#: wt-status.c:1663

5316 #, c-format

5317 msgid ""

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

@@ -5034,32 +5324,32 @@ msgstr ""

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

5325 "status')."

5326

5037 -#: wt-status.c:1661

5327 +#: wt-status.c:1669

5328 #, c-format

5329 msgid "Untracked files not listed%s"

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

5331

5042 -#: wt-status.c:1663

5332 +#: wt-status.c:1671

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

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

5335

5046 -#: wt-status.c:1669

5336 +#: wt-status.c:1677

5337 msgid "No changes"

5338 msgstr "Aucune modification"

5339

5050 -#: wt-status.c:1674

5340 +#: wt-status.c:1682

5341 #, c-format

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

5343 msgstr ""

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

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

5346

5057 -#: wt-status.c:1677

5347 +#: wt-status.c:1685

5348 #, c-format

5349 msgid "no changes added to commit\n"

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

5351

5062 -#: wt-status.c:1680

5352 +#: wt-status.c:1688

5353 #, c-format

5354 msgid ""

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

@@ -5068,71 +5358,71 @@ msgstr ""

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

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

5360

5071 -#: wt-status.c:1683

5361 +#: wt-status.c:1691

5362 #, c-format

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

5364 msgstr ""

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

5366 "sont présents\n"

5367

5078 -#: wt-status.c:1686

5368 +#: wt-status.c:1694

5369 #, c-format

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

5371 msgstr ""

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

5373 "suivre)\n"

5374

5085 -#: wt-status.c:1689 wt-status.c:1694

5375 +#: wt-status.c:1697 wt-status.c:1702

5376 #, c-format

5377 msgid "nothing to commit\n"

5378 msgstr "rien à valider\n"

5379

5090 -#: wt-status.c:1692

5380 +#: wt-status.c:1700

5381 #, c-format

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

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

5384

5095 -#: wt-status.c:1696

5385 +#: wt-status.c:1704

5386 #, c-format

5387 msgid "nothing to commit, working tree clean\n"

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

5389

5100 -#: wt-status.c:1809

5390 +#: wt-status.c:1817

5391 msgid "No commits yet on "

5392 msgstr "Encore aucun commit sur "

5393

5104 -#: wt-status.c:1813

5394 +#: wt-status.c:1821

5395 msgid "HEAD (no branch)"

5396 msgstr "HEAD (aucune branche)"

5397

5108 -#: wt-status.c:1844

5398 +#: wt-status.c:1852

5399 msgid "different"

5400 msgstr "différent"

5401

5112 -#: wt-status.c:1846 wt-status.c:1854

5402 +#: wt-status.c:1854 wt-status.c:1862

5403 msgid "behind "

5404 msgstr "derrière "

5405

5116 -#: wt-status.c:1849 wt-status.c:1852

5406 +#: wt-status.c:1857 wt-status.c:1860

5407 msgid "ahead "

5408 msgstr "devant "

5409

5410 #. TRANSLATORS: the action is e.g. "pull with rebase"

5121 -#: wt-status.c:2358

5411 +#: wt-status.c:2366

5412 #, c-format

5413 msgid "cannot %s: You have unstaged changes."

5414 msgstr "Impossible de %s : vous avez des modifications non indexées."

5415

5126 -#: wt-status.c:2364

5416 +#: wt-status.c:2372

5417 msgid "additionally, your index contains uncommitted changes."

5418 msgstr "de plus, votre index contient des modifications non validées."

5419

5130 -#: wt-status.c:2366

5420 +#: wt-status.c:2374

5421 #, c-format

5422 msgid "cannot %s: Your index contains uncommitted changes."

5423 msgstr "%s impossible : votre index contient des modifications non validées."

5424

5135 -#: compat/precompose_utf8.c:58 builtin/clone.c:440

5425 +#: compat/precompose_utf8.c:58 builtin/clone.c:442

5426 #, c-format

5427 msgid "failed to unlink '%s'"

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

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

5436 msgid "unexpected diff status %c"

5437 msgstr "état de diff inattendu %c"

5438

5149 -#: builtin/add.c:88 builtin/commit.c:257

5439 +#: builtin/add.c:88 builtin/commit.c:266

5440 msgid "updating files failed"

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

5442

@@ -5190,82 +5480,82 @@ msgstr "Patch vide. Abandon."

5480 msgid "Could not apply '%s'"

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

5482

5193 -#: builtin/add.c:271

5483 +#: builtin/add.c:269

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

5485 msgstr ""

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

5487

5198 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5199 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5200 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5488 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123

5489 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557

5490 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

5491 msgid "dry run"

5492 msgstr "simuler l'action"

5493

5204 -#: builtin/add.c:294

5494 +#: builtin/add.c:292

5495 msgid "interactive picking"

5496 msgstr "sélection interactive"

5497

5208 -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5498 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

5499 msgid "select hunks interactively"

5500 msgstr "sélection interactive des sections"

5501

5212 -#: builtin/add.c:296

5502 +#: builtin/add.c:294

5503 msgid "edit current diff and apply"

5504 msgstr "édition du diff actuel et application"

5505

5216 -#: builtin/add.c:297

5506 +#: builtin/add.c:295

5507 msgid "allow adding otherwise ignored files"

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

5509

5220 -#: builtin/add.c:298

5510 +#: builtin/add.c:296

5511 msgid "update tracked files"

5512 msgstr "mettre à jour les fichiers suivis"

5513

5224 -#: builtin/add.c:299

5514 +#: builtin/add.c:297

5515 msgid "renormalize EOL of tracked files (implies -u)"

5516 msgstr ""

5517 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"

5518

5229 -#: builtin/add.c:300

5519 +#: builtin/add.c:298

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

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

5522

5233 -#: builtin/add.c:301

5523 +#: builtin/add.c:299

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

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

5526

5237 -#: builtin/add.c:304

5527 +#: builtin/add.c:302

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

5529 msgstr ""

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

5531

5242 -#: builtin/add.c:306

5532 +#: builtin/add.c:304

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

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

5535

5246 -#: builtin/add.c:307

5536 +#: builtin/add.c:305

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

5538 msgstr ""

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

5540 "d'erreurs"

5541

5252 -#: builtin/add.c:308

5542 +#: builtin/add.c:306

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

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

5545

5256 -#: builtin/add.c:309 builtin/update-index.c:964

5546 +#: builtin/add.c:307 builtin/update-index.c:974

5547 msgid "(+/-)x"

5548 msgstr "(+/-)x"

5549

5260 -#: builtin/add.c:309 builtin/update-index.c:965

5550 +#: builtin/add.c:307 builtin/update-index.c:975

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

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

5553

5264 -#: builtin/add.c:311

5554 +#: builtin/add.c:309

5555 msgid "warn when adding an embedded repository"

5556 msgstr "avertir lors de l'ajout d'un dépôt embarqué"

5557

5268 -#: builtin/add.c:326

5558 +#: builtin/add.c:324

5559 #, c-format

5560 msgid ""

5561 "You've added another git repository inside your current repository.\n"

@@ -5296,48 +5586,48 @@ msgstr ""

5586 "\n"

5587 "Référez-vous à \"git help submodule\" pour plus d'information."

5588

5299 -#: builtin/add.c:354

5589 +#: builtin/add.c:352

5590 #, c-format

5591 msgid "adding embedded git repository: %s"

5592 msgstr "dépôt git embarqué ajouté : %s"

5593

5304 -#: builtin/add.c:372

5594 +#: builtin/add.c:370

5595 #, c-format

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

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

5598

5309 -#: builtin/add.c:380

5599 +#: builtin/add.c:378

5600 msgid "adding files failed"

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

5602

5313 -#: builtin/add.c:417

5603 +#: builtin/add.c:416

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

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

5606

5317 -#: builtin/add.c:424

5607 +#: builtin/add.c:423

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

5609 msgstr ""

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

5611

5322 -#: builtin/add.c:428

5612 +#: builtin/add.c:427

5613 #, c-format

5614 msgid "--chmod param '%s' must be either -x or +x"

5615 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

5616

5327 -#: builtin/add.c:443

5617 +#: builtin/add.c:442

5618 #, c-format

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

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

5621

5332 -#: builtin/add.c:444

5622 +#: builtin/add.c:443

5623 #, c-format

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

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

5626

5337 -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5338 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5627 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280

5628 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

5629 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5340 -#: builtin/rm.c:271 builtin/submodule--helper.c:326

5630 +#: builtin/rm.c:270 builtin/submodule--helper.c:328

5631 msgid "index file corrupt"

5632 msgstr "fichier d'index corrompu"

5633

@@ -5389,7 +5679,7 @@ msgstr "décalage horaire invalide"

5679 msgid "Patch format detection failed."

5680 msgstr "Échec de détection du format du patch."

5681

5392 -#: builtin/am.c:1013 builtin/clone.c:405

5682 +#: builtin/am.c:1013 builtin/clone.c:407

5683 #, c-format

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

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

@@ -5398,7 +5688,7 @@ msgstr "échec de la création du répertoire '%s'"

5688 msgid "Failed to split patches."

5689 msgstr "Échec de découpage des patchs."

5690

5401 -#: builtin/am.c:1148 builtin/commit.c:342

5691 +#: builtin/am.c:1148 builtin/commit.c:351

5692 msgid "unable to write index file"

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

5694

@@ -5507,7 +5797,8 @@ msgstr "le patch a échoué à %s %.*s"

5797

5798 #: builtin/am.c:1838

5799 msgid "Use 'git am --show-current-patch' to see the failed patch"

5510 -msgstr "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"

5800 +msgstr ""

5801 +"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"

5802

5803 #: builtin/am.c:1882

5804 msgid ""

@@ -5577,7 +5868,7 @@ msgid "allow fall back on 3way merging if needed"

5868 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

5869

5870 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5580 -#: builtin/repack.c:182

5871 +#: builtin/repack.c:192

5872 msgid "be quiet"

5873 msgstr "être silencieux"

5874

@@ -5620,16 +5911,17 @@ msgstr "retirer tout le contenu avant la ligne des ciseaux"

5911 msgid "pass it through git-apply"

5912 msgstr "le passer jusqu'à git-apply"

5913

5623 -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5624 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5625 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5626 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5627 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5914 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5915 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207

5916 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5917 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5918 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

5919 +#: parse-options.h:146 parse-options.h:258

5920 msgid "n"

5921 msgstr "n"

5922

5631 -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5632 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5923 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38

5924 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

5925 msgid "format"

5926 msgstr "format"

5927

@@ -5674,8 +5966,8 @@ msgstr "mentir sur la date de validation"

5966 msgid "use current timestamp for author date"

5967 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

5968

5677 -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5678 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5969 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238

5970 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5971 msgid "key-id"

5972 msgstr "id-clé"

5973

@@ -5817,121 +6109,147 @@ msgstr "--write-terms exige deux arguments"

6109 msgid "--bisect-clean-state requires no arguments"

6110 msgstr "--bisect-clean-state ne supporte aucun argument"

6111

5820 -#: builtin/blame.c:27

6112 +#: builtin/blame.c:29

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

6114 msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"

6115

5824 -#: builtin/blame.c:32

6116 +#: builtin/blame.c:34

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

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

6119

5828 -#: builtin/blame.c:677

5829 -msgid "Show blame entries as we find them, incrementally"

5830 -msgstr ""

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

6120 +#: builtin/blame.c:404

6121 +#, c-format

6122 +msgid "expecting a color: %s"

6123 +msgstr "couleur attendue : %s"

6124 +

6125 +#: builtin/blame.c:411

6126 +msgid "must end with a color"

6127 +msgstr "doit finir avec une couleur"

6128 +

6129 +#: builtin/blame.c:697

6130 +#, c-format

6131 +msgid "invalid color '%s' in color.blame.repeatedLines"

6132 +msgstr "couleur invalide '%s' dans color.blame.repeatedlines"

6133 +

6134 +#: builtin/blame.c:715

6135 +msgid "invalid value for blame.coloring"

6136 +msgstr "valeur invalide pour blame.coloring"

6137 +

6138 +#: builtin/blame.c:786

6139 +msgid "Show blame entries as we find them, incrementally"

6140 +msgstr ""

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

6142 "manière incrémentale"

6143

5834 -#: builtin/blame.c:678

6144 +#: builtin/blame.c:787

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

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

6147

5838 -#: builtin/blame.c:679

6148 +#: builtin/blame.c:788

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

6150 msgstr ""

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

6152

5843 -#: builtin/blame.c:680

6153 +#: builtin/blame.c:789

6154 msgid "Show work cost statistics"

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

6156

5847 -#: builtin/blame.c:681

6157 +#: builtin/blame.c:790

6158 msgid "Force progress reporting"

6159 msgstr "Forcer l'affichage de l'état d'avancement"

6160

5851 -#: builtin/blame.c:682

6161 +#: builtin/blame.c:791

6162 msgid "Show output score for blame entries"

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

6164

5855 -#: builtin/blame.c:683

6165 +#: builtin/blame.c:792

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

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

6168

5859 -#: builtin/blame.c:684

6169 +#: builtin/blame.c:793

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

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

6172

5863 -#: builtin/blame.c:685

6173 +#: builtin/blame.c:794

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

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

6176

5867 -#: builtin/blame.c:686

6177 +#: builtin/blame.c:795

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

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

6180

5871 -#: builtin/blame.c:687

6181 +#: builtin/blame.c:796

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

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

6184

5875 -#: builtin/blame.c:688

6185 +#: builtin/blame.c:797

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

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

6188

5879 -#: builtin/blame.c:689

6189 +#: builtin/blame.c:798

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

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

6192

5883 -#: builtin/blame.c:690

6193 +#: builtin/blame.c:799

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

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

6196

5887 -#: builtin/blame.c:691

6197 +#: builtin/blame.c:800

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

6199 msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"

6200

5891 -#: builtin/blame.c:692

6201 +#: builtin/blame.c:801

6202 msgid "Ignore whitespace differences"

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

6204

5895 -#: builtin/blame.c:699

6205 +#: builtin/blame.c:802

6206 +msgid "color redundant metadata from previous line differently"

6207 +msgstr "colorer différemment les métadonnées redondantes avec la ligne précédente"

6208 +

6209 +#: builtin/blame.c:803

6210 +msgid "color lines by age"

6211 +msgstr "colorier les lignes par âge"

6212 +

6213 +#: builtin/blame.c:810

6214 msgid "Use an experimental heuristic to improve diffs"

6215 msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"

6216

5899 -#: builtin/blame.c:701

6217 +#: builtin/blame.c:812

6218 msgid "Spend extra cycles to find better match"

6219 msgstr ""

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

6221

5904 -#: builtin/blame.c:702

6222 +#: builtin/blame.c:813

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

6224 msgstr ""

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

6226

5909 -#: builtin/blame.c:703

6227 +#: builtin/blame.c:814

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

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

6230

5913 -#: builtin/blame.c:704 builtin/blame.c:705

6231 +#: builtin/blame.c:815 builtin/blame.c:816

6232 msgid "score"

6233 msgstr "score"

6234

5917 -#: builtin/blame.c:704

6235 +#: builtin/blame.c:815

6236 msgid "Find line copies within and across files"

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

6238

5921 -#: builtin/blame.c:705

6239 +#: builtin/blame.c:816

6240 msgid "Find line movements within and across files"

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

6242

5925 -#: builtin/blame.c:706

6243 +#: builtin/blame.c:817

6244 msgid "n,m"

6245 msgstr "n,m"

6246

5929 -#: builtin/blame.c:706

6247 +#: builtin/blame.c:817

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

6249 msgstr ""

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

6251

5934 -#: builtin/blame.c:753

6252 +#: builtin/blame.c:866

6253 msgid "--progress can't be used with --incremental or porcelain formats"

6254 msgstr ""

6255 "--progress ne peut pas être utilisé avec --incremental ou les formats "

@@ -5945,18 +6263,18 @@ msgstr ""

6263 #. your language may need more or fewer display

6264 #. columns.

6265 #.

5948 -#: builtin/blame.c:804

6266 +#: builtin/blame.c:917

6267 msgid "4 years, 11 months ago"

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

6269

5952 -#: builtin/blame.c:890

6270 +#: builtin/blame.c:1003

6271 #, c-format

6272 msgid "file %s has only %lu line"

6273 msgid_plural "file %s has only %lu lines"

6274 msgstr[0] "le fichier %s n'a qu'%lu ligne"

6275 msgstr[1] "le fichier %s n'a que %lu lignes"

6276

5959 -#: builtin/blame.c:936

6277 +#: builtin/blame.c:1049

6278 msgid "Blaming lines"

6279 msgstr "Assignation de blâme aux lignes"

6280

@@ -6069,69 +6387,69 @@ msgstr "Branche de suivi %s supprimée (précédemment %s).\n"

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

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

6389

6072 -#: builtin/branch.c:417 builtin/tag.c:58

6390 +#: builtin/branch.c:416 builtin/tag.c:58

6391 msgid "unable to parse format string"

6392 msgstr "impossible d'analyser la chaîne de format"

6393

6076 -#: builtin/branch.c:450

6394 +#: builtin/branch.c:453

6395 #, c-format

6396 msgid "Branch %s is being rebased at %s"

6397 msgstr "La branche %s est en cours de rebasage sur %s"

6398

6081 -#: builtin/branch.c:454

6399 +#: builtin/branch.c:457

6400 #, c-format

6401 msgid "Branch %s is being bisected at %s"

6402 msgstr "La branche %s est en cours de bissection sur %s"

6403

6086 -#: builtin/branch.c:471

6404 +#: builtin/branch.c:474

6405 msgid "cannot copy the current branch while not on any."

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

6407

6090 -#: builtin/branch.c:473

6408 +#: builtin/branch.c:476

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

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

6411

6094 -#: builtin/branch.c:484

6412 +#: builtin/branch.c:487

6413 #, c-format

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

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

6416

6099 -#: builtin/branch.c:511

6417 +#: builtin/branch.c:514

6418 msgid "Branch rename failed"

6419 msgstr "Échec de renommage de la branche"

6420

6103 -#: builtin/branch.c:513

6421 +#: builtin/branch.c:516

6422 msgid "Branch copy failed"

6423 msgstr "Échec de copie de la branche"

6424

6107 -#: builtin/branch.c:517

6425 +#: builtin/branch.c:520

6426 #, c-format

6427 msgid "Created a copy of a misnamed branch '%s'"

6428 msgstr "Création d'une copie d'une branche mal nommée '%s'"

6429

6112 -#: builtin/branch.c:520

6430 +#: builtin/branch.c:523

6431 #, c-format

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

6433 msgstr "Renommage d'une branche mal nommée '%s'"

6434

6117 -#: builtin/branch.c:526

6435 +#: builtin/branch.c:529

6436 #, c-format

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

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

6439

6122 -#: builtin/branch.c:535

6440 +#: builtin/branch.c:538

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

6442 msgstr ""

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

6444 "échoué"

6445

6128 -#: builtin/branch.c:537

6446 +#: builtin/branch.c:540

6447 msgid "Branch is copied, but update of config-file failed"

6448 msgstr ""

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

6450 "échoué"

6451

6134 -#: builtin/branch.c:553

l10n: fr.po v2.18 round 1