@matheusbsbs / matheus-bagliano / commits / 2104663c7b

l10n: fr.po v2.19.0 rnd 2

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>

Jean-Noël Avila committed Sep 5, 2018 at 22:19 UTC 2104663c7ba114d485cd8d3a316b532b576cee01
1 file changed +328 -283
po/fr.po
+328 -283
@@ -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-08-21 08:28+0800\n"
78 -"PO-Revision-Date: 2018-08-23 22:48+0200\n"
77 +"POT-Creation-Date: 2018-09-04 08:50+0800\n"
78 +"PO-Revision-Date: 2018-09-05 22:18+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"
@@ -767,7 +767,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
767
768 #: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95
769 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
770 -#: builtin/pack-objects.c:3205
770 +#: builtin/pack-objects.c:3202
771 msgid "action"
772 msgstr "action"
773
@@ -1119,46 +1119,46 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1119 msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
1120 msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
1121
1122 -#: blame.c:1786
1122 +#: blame.c:1784
1123 msgid "--contents and --reverse do not blend well."
1124 msgstr "--contents et --reverse ne font pas bon ménage."
1125
1126 -#: blame.c:1800
1126 +#: blame.c:1798
1127 msgid "cannot use --contents with final commit object name"
1128 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
1129
1130 -#: blame.c:1821
1130 +#: blame.c:1819
1131 msgid "--reverse and --first-parent together require specified latest commit"
1132 msgstr ""
1133 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
1134 "dernier commit"
1135
1136 -#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
1136 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874
1137 #: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926
1138 #: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404
1139 -#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047
1139 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044
1140 #: builtin/shortlog.c:192
1141 msgid "revision walk setup failed"
1142 msgstr "échec de la préparation du parcours des révisions"
1143
1144 -#: blame.c:1848
1144 +#: blame.c:1846
1145 msgid ""
1146 "--reverse --first-parent together require range along first-parent chain"
1147 msgstr ""
1148 "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
1149 "premier parent"
1150
1151 -#: blame.c:1859
1151 +#: blame.c:1857
1152 #, c-format
1153 msgid "no such path %s in %s"
1154 msgstr "pas de chemin %s dans %s"
1155
1156 -#: blame.c:1870
1156 +#: blame.c:1868
1157 #, c-format
1158 msgid "cannot read blob %s for path %s"
1159 msgstr "impossible de lire le blob %s pour le chemin %s"
1160
1161 -#: branch.c:54
1161 +#: branch.c:52
1162 #, c-format
1163 msgid ""
1164 "\n"
@@ -1171,97 +1171,97 @@ msgstr ""
1171 "l'information de suivi distant en invoquant\n"
1172 "\"git branch --setup-upstream-to=%s%s%s\"."
1173
1174 -#: branch.c:68
1174 +#: branch.c:66
1175 #, c-format
1176 msgid "Not setting branch %s as its own upstream."
1177 msgstr "La branche %s ne peut pas être sa propre branche amont."
1178
1179 -#: branch.c:94
1179 +#: branch.c:92
1180 #, c-format
1181 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1182 msgstr ""
1183 "La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' "
1184 "en rebasant."
1185
1186 -#: branch.c:95
1186 +#: branch.c:93
1187 #, c-format
1188 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1189 msgstr ""
1190 "La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis "
1191 "'%s'."
1192
1193 -#: branch.c:99
1193 +#: branch.c:97
1194 #, c-format
1195 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1196 msgstr ""
1197 "La branche '%s' est paramétrée pour suivre la branche locale '%'s en "
1198 "rebasant."
1199
1200 -#: branch.c:100
1200 +#: branch.c:98
1201 #, c-format
1202 msgid "Branch '%s' set up to track local branch '%s'."
1203 msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
1204
1205 -#: branch.c:105
1205 +#: branch.c:103
1206 #, c-format
1207 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1208 msgstr ""
1209 "La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
1210 "rebasant."
1211
1212 -#: branch.c:106
1212 +#: branch.c:104
1213 #, c-format
1214 msgid "Branch '%s' set up to track remote ref '%s'."
1215 msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'."
1216
1217 -#: branch.c:110
1217 +#: branch.c:108
1218 #, c-format
1219 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1220 msgstr ""
1221 "La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
1222 "rebasant."
1223
1224 -#: branch.c:111
1224 +#: branch.c:109
1225 #, c-format
1226 msgid "Branch '%s' set up to track local ref '%s'."
1227 msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'."
1228
1229 -#: branch.c:120
1229 +#: branch.c:118
1230 msgid "Unable to write upstream branch configuration"
1231 msgstr "Échec de l'écriture de la configuration de branche amont"
1232
1233 -#: branch.c:157
1233 +#: branch.c:155
1234 #, c-format
1235 msgid "Not tracking: ambiguous information for ref %s"
1236 msgstr "Pas de suivi : information ambiguë pour la référence %s"
1237
1238 -#: branch.c:190
1238 +#: branch.c:188
1239 #, c-format
1240 msgid "'%s' is not a valid branch name."
1241 msgstr "'%s' n'est pas un nom de branche valide."
1242
1243 -#: branch.c:209
1243 +#: branch.c:207
1244 #, c-format
1245 msgid "A branch named '%s' already exists."
1246 msgstr "Une branche nommée '%s' existe déjà."
1247
1248 -#: branch.c:214
1248 +#: branch.c:212
1249 msgid "Cannot force update the current branch."
1250 msgstr "Impossible de forcer la mise à jour de la branche courante."
1251
1252 -#: branch.c:234
1252 +#: branch.c:232
1253 #, c-format
1254 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1255 msgstr ""
1256 "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
1257 "pas une branche."
1258
1259 -#: branch.c:236
1259 +#: branch.c:234
1260 #, c-format
1261 msgid "the requested upstream branch '%s' does not exist"
1262 msgstr "la branche amont demandée '%s' n'existe pas"
1263
1264 -#: branch.c:238
1264 +#: branch.c:236
1265 msgid ""
1266 "\n"
1267 "If you are planning on basing your work on an upstream\n"
@@ -1281,27 +1281,27 @@ msgstr ""
1281 "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n"
1282 "pour paramétrer le suivi distant en même temps que vous poussez."
1283
1284 -#: branch.c:281
1284 +#: branch.c:279
1285 #, c-format
1286 msgid "Not a valid object name: '%s'."
1287 msgstr "Nom d'objet invalide : '%s'."
1288
1289 -#: branch.c:301
1289 +#: branch.c:299
1290 #, c-format
1291 msgid "Ambiguous object name: '%s'."
1292 msgstr "Nom d'objet ambigu : '%s'."
1293
1294 -#: branch.c:306
1294 +#: branch.c:304
1295 #, c-format
1296 msgid "Not a valid branch point: '%s'."
1297 msgstr "Point d'embranchement invalide : '%s'."
1298
1299 -#: branch.c:360
1299 +#: branch.c:358
1300 #, c-format
1301 msgid "'%s' is already checked out at '%s'"
1302 msgstr "'%s' est déjà extrait dans '%s'"
1303
1304 -#: branch.c:383
1304 +#: branch.c:381
1305 #, c-format
1306 msgid "HEAD of working tree %s is not updated"
1307 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -1462,7 +1462,7 @@ msgstr "l'id de bloc %08x apparaît des multiples fois"
1462 msgid "could not find commit %s"
1463 msgstr "impossible de trouver le commit %s"
1464
1465 -#: commit-graph.c:565 builtin/pack-objects.c:2571
1465 +#: commit-graph.c:565 builtin/pack-objects.c:2568
1466 #, c-format
1467 msgid "unable to get type of object %s"
1468 msgstr "impossible d'obtenir le type de l'objet %s"
@@ -1493,7 +1493,9 @@ msgstr "impossible de créer les répertoires de premier niveau de %s"
1493
1494 #: commit-graph.c:904
1495 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
1496 -msgstr "le graphe de commit a une somme de contrôle incorrecte et est vraisemblablement corrompu"
1496 +msgstr ""
1497 +"le graphe de commit a une somme de contrôle incorrecte et est "
1498 +"vraisemblablement corrompu"
1499
1500 #: compat/obstack.c:405 compat/obstack.c:407
1501 msgid "memory exhausted"
@@ -1506,7 +1508,7 @@ msgid ""
1508 "\t%s\n"
1509 "from\n"
1510 "\t%s\n"
1509 -"Do you have circular includes?"
1511 +"This might be due to circular includes."
1512 msgstr ""
1513 "profondeur d'inclusion maximum (%d) dépassée à l'inclusion de\n"
1514 "\t%s\n"
@@ -1525,7 +1527,9 @@ msgstr "les inclusions de configuration relatives doivent venir de fichiers"
1527
1528 #: config.c:190
1529 msgid "relative config include conditionals must come from files"
1528 -msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers"
1530 +msgstr ""
1531 +"les conditions d'inclusion de configuration relative doivent venir de "
1532 +"fichiers"
1533
1534 #: config.c:348
1535 #, c-format
@@ -1684,7 +1688,7 @@ msgstr "valeur mal formée pour %s : %s"
1688 msgid "must be one of nothing, matching, simple, upstream or current"
1689 msgstr "doit être parmi nothing, matching, simple, upstream ou current"
1690
1687 -#: config.c:1489 builtin/pack-objects.c:3282
1691 +#: config.c:1489 builtin/pack-objects.c:3279
1692 #, c-format
1693 msgid "bad pack compression level %d"
1694 msgstr "niveau de compression du paquet %d"
@@ -1964,7 +1968,9 @@ msgstr "impossible de démarrer un proxy %s"
1968
1969 #: connect.c:927
1970 msgid "no path specified; see 'git help pull' for valid url syntax"
1967 -msgstr "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe d'URL valide"
1971 +msgstr ""
1972 +"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
1973 +"d'URL valide"
1974
1975 #: connect.c:1122
1976 msgid "ssh variant 'simple' does not support -4"
@@ -2115,7 +2121,9 @@ msgstr "nom de chemin trop long pour un filtre externe"
2121 msgid ""
2122 "external filter '%s' is not available anymore although not all paths have "
2123 "been filtered"
2118 -msgstr "le filtre externe '%s' n'est plus disponible bien que tous les chemins n'aient pas été filtrés"
2124 +msgstr ""
2125 +"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
2126 +"n'aient pas été filtrés"
2127
2128 #: convert.c:1228
2129 msgid "true/false are no valid working-tree-encodings"
@@ -2228,7 +2236,9 @@ msgstr " Paramètre dirstat inconnu '%s'\n"
2236 msgid ""
2237 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2238 "'dimmed-zebra', 'plain'"
2231 -msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"
2239 +msgstr ""
2240 +"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
2241 +"'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"
2242
2243 #: diff.c:316
2244 #, c-format
@@ -2239,7 +2249,9 @@ msgstr "mode color-moved-ws inconnu '%s' ignoré"
2249 msgid ""
2250 "color-moved-ws: allow-indentation-change cannot be combined with other white "
2251 "space modes"
2242 -msgstr "color-moved-ws : allow-indentation-change ne peut pas être combiné avec d'autres modes d'espace"
2252 +msgstr ""
2253 +"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
2254 +"d'autres modes d'espace"
2255
2256 #: diff.c:394
2257 #, c-format
@@ -2310,7 +2322,8 @@ msgstr ""
2322 #: dir.c:569
2323 #, c-format
2324 msgid "pathspec '%s' did not match any file(s) known to git"
2313 -msgstr "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
2325 +msgstr ""
2326 +"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
2327
2328 #: dir.c:958
2329 #, c-format
@@ -3260,7 +3273,8 @@ msgid ""
3273 "Your local changes to the following files would be overwritten by merge:\n"
3274 " %s"
3275 msgstr ""
3263 -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
3276 +"Vos modifications locales aux fichiers suivants seraient écrasées par la "
3277 +"fusion :\n"
3278 " %s"
3279
3280 #: merge-recursive.c:3314
@@ -3509,7 +3523,9 @@ msgstr "échec de l'écriture d'un paquet avec format"
3523
3524 #: pkt-line.c:192
3525 msgid "packet write failed - data exceeds max packet size"
3512 -msgstr "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale d'un paquet"
3526 +msgstr ""
3527 +"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "
3528 +"d'un paquet"
3529
3530 #: pkt-line.c:199 pkt-line.c:206
3531 msgid "packet write failed"
@@ -4270,9 +4286,9 @@ msgstr "impossible de mettre à jour l'arbre de cache"
4286 msgid "could not resolve HEAD commit"
4287 msgstr "impossible de résoudre le commit HEAD"
4288
4273 -#: sequencer.c:723
4289 +#: sequencer.c:723 sequencer.c:740
4290 #, c-format
4275 -msgid "could not parse '%s' (looking for '%s'"
4291 +msgid "could not parse '%s' (looking for '%s')"
4292 msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
4293
4294 #: sequencer.c:731
@@ -4280,11 +4296,6 @@ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
4296 msgid "bad quoting on %s value in '%s'"
4297 msgstr "Mauvaise citation sur la valeur %s dans '%s'"
4298
4283 -#: sequencer.c:740
4284 -#, c-format
4285 -msgid "could not parse '%s' (looking for '%s')"
4286 -msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
4287 -
4299 #: sequencer.c:747
4300 #, c-format
4301 msgid "invalid date format '%s' in '%s'"
@@ -4798,7 +4809,8 @@ msgstr "rien à fusionner : '%.*s'"
4809
4810 #: sequencer.c:2964
4811 msgid "octopus merge cannot be executed on top of a [new root]"
4801 -msgstr "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
4812 +msgstr ""
4813 +"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
4814
4815 #: sequencer.c:2979
4816 #, c-format
@@ -5168,7 +5180,8 @@ msgstr "échec du setsid"
5180 #: sha1-file.c:381
5181 #, c-format
5182 msgid "object directory %s does not exist; check .git/objects/info/alternates"
5171 -msgstr "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
5183 +msgstr ""
5184 +"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
5185
5186 #: sha1-file.c:432
5187 #, c-format
@@ -5313,7 +5326,8 @@ msgstr "erreur en fermeture du fichier sha1"
5326 #: sha1-file.c:1635
5327 #, c-format
5328 msgid "insufficient permission for adding an object to repository database %s"
5316 -msgstr "droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
5329 +msgstr ""
5330 +"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
5331
5332 #: sha1-file.c:1637
5333 msgid "unable to create temporary file"
@@ -5491,7 +5505,7 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
5505 msgid "submodule entry '%s' (%s) is a %s, not a commit"
5506 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
5507
5494 -#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888
5508 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888
5509 msgid "Failed to resolve HEAD as a valid ref."
5510 msgstr "Échec de résolution de HEAD comme référence valide."
5511
@@ -5738,14 +5752,17 @@ msgstr "Impossible de trouver un assistant distant pour '%s'"
5752
5753 #: transport-helper.c:148 transport-helper.c:557
5754 msgid "can't dup helper output fd"
5741 -msgstr "impossible de dupliquer le descripteur de flux de sortie de l'assistant"
5755 +msgstr ""
5756 +"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
5757
5758 #: transport-helper.c:199
5759 #, c-format
5760 msgid ""
5761 "unknown mandatory capability %s; this remote helper probably needs newer "
5762 "version of Git"
5748 -msgstr "capacité obligatoire inconnue %s ; cet assistant distant requiert probablement une une nouvelle version de Git"
5763 +msgstr ""
5764 +"capacité obligatoire inconnue %s ; cet assistant distant requiert "
5765 +"probablement une une nouvelle version de Git"
5766
5767 #: transport-helper.c:205
5768 msgid "this remote helper should implement refspec capability"
@@ -5781,7 +5798,9 @@ msgstr "réponse inconnue à connect : %s"
5798
5799 #: transport-helper.c:598
5800 msgid "setting remote service path not supported by protocol"
5784 -msgstr "la spécification du chemin de service distant n'est pas supportée par le protocole"
5801 +msgstr ""
5802 +"la spécification du chemin de service distant n'est pas supportée par le "
5803 +"protocole"
5804
5805 #: transport-helper.c:600
5806 msgid "invalid remote service path"
@@ -5824,7 +5843,9 @@ msgstr "l'assistant %s ne gère pas 'push-option'"
5843
5844 #: transport-helper.c:932
5845 msgid "remote-helper doesn't support push; refspec needed"
5827 -msgstr "l'assistant %s ne gère pas push ; un spécificateur de référence est nécessaire"
5846 +msgstr ""
5847 +"l'assistant %s ne gère pas push ; un spécificateur de référence est "
5848 +"nécessaire"
5849
5850 #: transport-helper.c:937
5851 #, c-format
@@ -7222,7 +7243,7 @@ msgstr "le passer jusqu'à git-apply"
7243 msgid "n"
7244 msgstr "n"
7245
7225 -#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38
7246 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38
7247 #: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39
7248 msgid "format"
7249 msgstr "format"
@@ -7611,7 +7632,7 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]"
7632 msgid "git branch [<options>] [-r | -a] [--format]"
7633 msgstr "git branch [<options>] [-r | -a] [--format]"
7634
7614 -#: builtin/branch.c:143
7635 +#: builtin/branch.c:151
7636 #, c-format
7637 msgid ""
7638 "deleting branch '%s' that has been merged to\n"
@@ -7620,7 +7641,7 @@ msgstr ""
7641 "suppression de la branche '%s' qui a été fusionnée dans\n"
7642 " '%s', mais pas dans HEAD."
7643
7623 -#: builtin/branch.c:147
7644 +#: builtin/branch.c:155
7645 #, c-format
7646 msgid ""
7647 "not deleting branch '%s' that is not yet merged to\n"
@@ -7629,12 +7650,12 @@ msgstr ""
7650 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
7651 " '%s', même si elle est fusionnée dans HEAD."
7652
7632 -#: builtin/branch.c:161
7653 +#: builtin/branch.c:169
7654 #, c-format
7655 msgid "Couldn't look up commit object for '%s'"
7656 msgstr "Impossible de rechercher l'objet commit pour '%s'"
7657
7637 -#: builtin/branch.c:165
7658 +#: builtin/branch.c:173
7659 #, c-format
7660 msgid ""
7661 "The branch '%s' is not fully merged.\n"
@@ -7643,116 +7664,116 @@ msgstr ""
7664 "La branche '%s' n'est pas totalement fusionnée.\n"
7665 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
7666
7646 -#: builtin/branch.c:178
7667 +#: builtin/branch.c:186
7668 msgid "Update of config-file failed"
7669 msgstr "Échec de la mise à jour du fichier de configuration"
7670
7650 -#: builtin/branch.c:209
7671 +#: builtin/branch.c:217
7672 msgid "cannot use -a with -d"
7673 msgstr "impossible d'utiliser -a avec -d"
7674
7654 -#: builtin/branch.c:215
7675 +#: builtin/branch.c:223
7676 msgid "Couldn't look up commit object for HEAD"
7677 msgstr "Impossible de rechercher l'objet commit pour HEAD"
7678
7658 -#: builtin/branch.c:229
7679 +#: builtin/branch.c:237
7680 #, c-format
7681 msgid "Cannot delete branch '%s' checked out at '%s'"
7682 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
7683
7663 -#: builtin/branch.c:244
7684 +#: builtin/branch.c:252
7685 #, c-format
7686 msgid "remote-tracking branch '%s' not found."
7687 msgstr "branche de suivi '%s' non trouvée."
7688
7668 -#: builtin/branch.c:245
7689 +#: builtin/branch.c:253
7690 #, c-format
7691 msgid "branch '%s' not found."
7692 msgstr "branche '%s' non trouvée."
7693
7673 -#: builtin/branch.c:260
7694 +#: builtin/branch.c:268
7695 #, c-format
7696 msgid "Error deleting remote-tracking branch '%s'"
7697 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
7698
7678 -#: builtin/branch.c:261
7699 +#: builtin/branch.c:269
7700 #, c-format
7701 msgid "Error deleting branch '%s'"
7702 msgstr "Erreur lors de la suppression de la branche '%s'"
7703
7683 -#: builtin/branch.c:268
7704 +#: builtin/branch.c:276
7705 #, c-format
7706 msgid "Deleted remote-tracking branch %s (was %s).\n"
7707 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
7708
7688 -#: builtin/branch.c:269
7709 +#: builtin/branch.c:277
7710 #, c-format
7711 msgid "Deleted branch %s (was %s).\n"
7712 msgstr "Branche %s supprimée (précédemment %s).\n"
7713
7693 -#: builtin/branch.c:413 builtin/tag.c:59
7714 +#: builtin/branch.c:421 builtin/tag.c:59
7715 msgid "unable to parse format string"
7716 msgstr "impossible d'analyser la chaîne de format"
7717
7697 -#: builtin/branch.c:450
7718 +#: builtin/branch.c:458
7719 #, c-format
7720 msgid "Branch %s is being rebased at %s"
7721 msgstr "La branche %s est en cours de rebasage sur %s"
7722
7702 -#: builtin/branch.c:454
7723 +#: builtin/branch.c:462
7724 #, c-format
7725 msgid "Branch %s is being bisected at %s"
7726 msgstr "La branche %s est en cours de bissection sur %s"
7727
7707 -#: builtin/branch.c:471
7728 +#: builtin/branch.c:479
7729 msgid "cannot copy the current branch while not on any."
7730 msgstr "impossible de copier la branche actuelle, il n'y en a pas."
7731
7711 -#: builtin/branch.c:473
7732 +#: builtin/branch.c:481
7733 msgid "cannot rename the current branch while not on any."
7734 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
7735
7715 -#: builtin/branch.c:484
7736 +#: builtin/branch.c:492
7737 #, c-format
7738 msgid "Invalid branch name: '%s'"
7739 msgstr "Nom de branche invalide : '%s'"
7740
7720 -#: builtin/branch.c:511
7741 +#: builtin/branch.c:519
7742 msgid "Branch rename failed"
7743 msgstr "Échec de renommage de la branche"
7744
7724 -#: builtin/branch.c:513
7745 +#: builtin/branch.c:521
7746 msgid "Branch copy failed"
7747 msgstr "Échec de copie de la branche"
7748
7728 -#: builtin/branch.c:517
7749 +#: builtin/branch.c:525
7750 #, c-format
7751 msgid "Created a copy of a misnamed branch '%s'"
7752 msgstr "Création d'une copie d'une branche mal nommée '%s'"
7753
7733 -#: builtin/branch.c:520
7754 +#: builtin/branch.c:528
7755 #, c-format
7756 msgid "Renamed a misnamed branch '%s' away"
7757 msgstr "Renommage d'une branche mal nommée '%s'"
7758
7738 -#: builtin/branch.c:526
7759 +#: builtin/branch.c:534
7760 #, c-format
7761 msgid "Branch renamed to %s, but HEAD is not updated!"
7762 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
7763
7743 -#: builtin/branch.c:535
7764 +#: builtin/branch.c:543
7765 msgid "Branch is renamed, but update of config-file failed"
7766 msgstr ""
7767 "La branche est renommée, mais la mise à jour du fichier de configuration a "
7768 "échoué"
7769
7749 -#: builtin/branch.c:537
7770 +#: builtin/branch.c:545
7771 msgid "Branch is copied, but update of config-file failed"
7772 msgstr ""
7773 "La branche est copiée, mais la mise à jour du fichier de configuration a "
7774 "échoué"
7775
7755 -#: builtin/branch.c:553
7776 +#: builtin/branch.c:561
7777 #, c-format
7778 msgid ""
7779 "Please edit the description for the branch\n"
@@ -7763,190 +7784,190 @@ msgstr ""
7784 " %s\n"
7785 "Les lignes commençant par '%c' seront ignorées.\n"
7786
7766 -#: builtin/branch.c:594
7787 +#: builtin/branch.c:602
7788 msgid "Generic options"
7789 msgstr "Options génériques"
7790
7770 -#: builtin/branch.c:596
7791 +#: builtin/branch.c:604
7792 msgid "show hash and subject, give twice for upstream branch"
7793 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
7794
7774 -#: builtin/branch.c:597
7795 +#: builtin/branch.c:605
7796 msgid "suppress informational messages"
7797 msgstr "supprimer les messages d'information"
7798
7778 -#: builtin/branch.c:598
7799 +#: builtin/branch.c:606
7800 msgid "set up tracking mode (see git-pull(1))"
7801 msgstr "régler le mode de suivi (voir git-pull(1))"
7802
7782 -#: builtin/branch.c:600
7803 +#: builtin/branch.c:608
7804 msgid "do not use"
7805 msgstr "ne pas utiliser"
7806
7786 -#: builtin/branch.c:602
7807 +#: builtin/branch.c:610
7808 msgid "upstream"
7809 msgstr "amont"
7810
7790 -#: builtin/branch.c:602
7811 +#: builtin/branch.c:610
7812 msgid "change the upstream info"
7813 msgstr "modifier l'information amont"
7814
7794 -#: builtin/branch.c:603
7815 +#: builtin/branch.c:611
7816 msgid "Unset the upstream info"
7817 msgstr "Désactiver l'information amont"
7818
7798 -#: builtin/branch.c:604
7819 +#: builtin/branch.c:612
7820 msgid "use colored output"
7821 msgstr "utiliser la coloration dans la sortie"
7822
7802 -#: builtin/branch.c:605
7823 +#: builtin/branch.c:613
7824 msgid "act on remote-tracking branches"
7825 msgstr "agir sur les branches de suivi distantes"
7826
7806 -#: builtin/branch.c:607 builtin/branch.c:609
7827 +#: builtin/branch.c:615 builtin/branch.c:617
7828 msgid "print only branches that contain the commit"
7829 msgstr "afficher seulement les branches qui contiennent le commit"
7830
7810 -#: builtin/branch.c:608 builtin/branch.c:610
7831 +#: builtin/branch.c:616 builtin/branch.c:618
7832 msgid "print only branches that don't contain the commit"
7833 msgstr "afficher seulement les branches qui ne contiennent pas le commit"
7834
7814 -#: builtin/branch.c:613
7835 +#: builtin/branch.c:621
7836 msgid "Specific git-branch actions:"
7837 msgstr "Actions spécifiques à git-branch :"
7838
7818 -#: builtin/branch.c:614
7839 +#: builtin/branch.c:622
7840 msgid "list both remote-tracking and local branches"
7841 msgstr "afficher à la fois les branches de suivi et les branches locales"
7842
7822 -#: builtin/branch.c:616
7843 +#: builtin/branch.c:624
7844 msgid "delete fully merged branch"
7845 msgstr "supprimer une branche totalement fusionnée"
7846
7826 -#: builtin/branch.c:617
7847 +#: builtin/branch.c:625
7848 msgid "delete branch (even if not merged)"
7849 msgstr "supprimer une branche (même non fusionnée)"
7850
7830 -#: builtin/branch.c:618
7851 +#: builtin/branch.c:626
7852 msgid "move/rename a branch and its reflog"
7853 msgstr "déplacer/renommer une branche et son reflog"
7854
7834 -#: builtin/branch.c:619
7855 +#: builtin/branch.c:627
7856 msgid "move/rename a branch, even if target exists"
7857 msgstr "déplacer/renommer une branche, même si la cible existe"
7858
7838 -#: builtin/branch.c:620
7859 +#: builtin/branch.c:628
7860 msgid "copy a branch and its reflog"
7861 msgstr "copier une branche et son reflog"
7862
7842 -#: builtin/branch.c:621
7863 +#: builtin/branch.c:629
7864 msgid "copy a branch, even if target exists"
7865 msgstr "copier une branche, même si la cible existe"
7866
7846 -#: builtin/branch.c:622
7867 +#: builtin/branch.c:630
7868 msgid "list branch names"
7869 msgstr "afficher les noms des branches"
7870
7850 -#: builtin/branch.c:623
7871 +#: builtin/branch.c:631
7872 msgid "create the branch's reflog"
7873 msgstr "créer le reflog de la branche"
7874
7854 -#: builtin/branch.c:626
7875 +#: builtin/branch.c:634
7876 msgid "deprecated synonym for --create-reflog"
7877 msgstr "synonyme déconseillé de --create-reflog"
7878
7858 -#: builtin/branch.c:631
7879 +#: builtin/branch.c:639
7880 msgid "edit the description for the branch"
7881 msgstr "éditer la description de la branche"
7882
7862 -#: builtin/branch.c:632
7883 +#: builtin/branch.c:640
7884 msgid "force creation, move/rename, deletion"
7885 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
7886
7866 -#: builtin/branch.c:633
7887 +#: builtin/branch.c:641
7888 msgid "print only branches that are merged"
7889 msgstr "afficher seulement les branches qui sont fusionnées"
7890
7870 -#: builtin/branch.c:634
7891 +#: builtin/branch.c:642
7892 msgid "print only branches that are not merged"
7893 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
7894
7874 -#: builtin/branch.c:635
7895 +#: builtin/branch.c:643
7896 msgid "list branches in columns"
7897 msgstr "afficher les branches en colonnes"
7898
7878 -#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
7899 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
7900 #: builtin/tag.c:413
7901 msgid "key"
7902 msgstr "clé"
7903
7883 -#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
7904 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
7905 #: builtin/tag.c:414
7906 msgid "field name to sort on"
7907 msgstr "nom du champ servant à trier"
7908
7888 -#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410
7909 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410
7910 #: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576
7911 #: builtin/tag.c:416
7912 msgid "object"
7913 msgstr "objet"
7914
7894 -#: builtin/branch.c:640
7915 +#: builtin/branch.c:648
7916 msgid "print only branches of the object"
7917 msgstr "afficher seulement les branches de l'objet"
7918
7898 -#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423
7919 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423
7920 msgid "sorting and filtering are case insensitive"
7921 msgstr "le tri et le filtrage sont non-sensibles à la casse"
7922
7902 -#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421
7923 +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421
7924 #: builtin/verify-tag.c:39
7925 msgid "format to use for the output"
7926 msgstr "format à utiliser pour la sortie"
7927
7907 -#: builtin/branch.c:666 builtin/clone.c:739
7928 +#: builtin/branch.c:674 builtin/clone.c:739
7929 msgid "HEAD not found below refs/heads!"
7930 msgstr "HEAD non trouvée sous refs/heads !"
7931
7911 -#: builtin/branch.c:689
7932 +#: builtin/branch.c:697
7933 msgid "--column and --verbose are incompatible"
7934 msgstr "--column et --verbose sont incompatibles"
7935
7915 -#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770
7936 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778
7937 msgid "branch name required"
7938 msgstr "le nom de branche est requis"
7939
7919 -#: builtin/branch.c:737
7940 +#: builtin/branch.c:745
7941 msgid "Cannot give description to detached HEAD"
7942 msgstr "Impossible de décrire une HEAD détachée"
7943
7923 -#: builtin/branch.c:742
7944 +#: builtin/branch.c:750
7945 msgid "cannot edit description of more than one branch"
7946 msgstr "impossible d'éditer la description de plus d'une branche"
7947
7927 -#: builtin/branch.c:749
7948 +#: builtin/branch.c:757
7949 #, c-format
7950 msgid "No commit on branch '%s' yet."
7951 msgstr "Aucun commit sur la branche '%s'."
7952
7932 -#: builtin/branch.c:752
7953 +#: builtin/branch.c:760
7954 #, c-format
7955 msgid "No branch named '%s'."
7956 msgstr "Aucune branche nommée '%s'."
7957
7937 -#: builtin/branch.c:767
7958 +#: builtin/branch.c:775
7959 msgid "too many branches for a copy operation"
7960 msgstr "trop de branches pour une opération de copie"
7961
7941 -#: builtin/branch.c:776
7962 +#: builtin/branch.c:784
7963 msgid "too many arguments for a rename operation"
7964 msgstr "trop d'arguments pour une opération de renommage"
7965
7945 -#: builtin/branch.c:781
7966 +#: builtin/branch.c:789
7967 msgid "too many arguments to set new upstream"
7968 msgstr "trop d'arguments pour spécifier une branche amont"
7969
7949 -#: builtin/branch.c:785
7970 +#: builtin/branch.c:793
7971 #, c-format
7972 msgid ""
7973 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -7954,37 +7975,37 @@ msgstr ""
7975 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
7976 "aucune branche."
7977
7957 -#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826
7978 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834
7979 #, c-format
7980 msgid "no such branch '%s'"
7981 msgstr "pas de branche '%s'"
7982
7962 -#: builtin/branch.c:792
7983 +#: builtin/branch.c:800
7984 #, c-format
7985 msgid "branch '%s' does not exist"
7986 msgstr "la branche '%s' n'existe pas"
7987
7967 -#: builtin/branch.c:804
7988 +#: builtin/branch.c:812
7989 msgid "too many arguments to unset upstream"
7990 msgstr "trop d'arguments pour désactiver un amont"
7991
7971 -#: builtin/branch.c:808
7992 +#: builtin/branch.c:816
7993 msgid "could not unset upstream of HEAD when it does not point to any branch."
7994 msgstr ""
7995 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
7996 "aucune branche."
7997
7977 -#: builtin/branch.c:814
7998 +#: builtin/branch.c:822
7999 #, c-format
8000 msgid "Branch '%s' has no upstream information"
8001 msgstr "La branche '%s' n'a aucune information de branche amont"
8002
7982 -#: builtin/branch.c:829
8003 +#: builtin/branch.c:837
8004 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
8005 msgstr ""
8006 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
8007
7987 -#: builtin/branch.c:832
8008 +#: builtin/branch.c:840
8009 msgid ""
8010 "the '--set-upstream' option is no longer supported. Please use '--track' or "
8011 "'--set-upstream-to' instead."
@@ -8114,6 +8135,7 @@ msgstr ""
8135 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
8136
8137 #: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503
8138 +#: builtin/worktree.c:447
8139 msgid "suppress progress reporting"
8140 msgstr "supprimer l'état d'avancement"
8141
@@ -8207,7 +8229,7 @@ msgstr "écrire le contenu dans des fichiers temporaires"
8229 #: builtin/checkout-index.c:173 builtin/column.c:31
8230 #: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364
8231 #: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736
8210 -#: builtin/worktree.c:610
8232 +#: builtin/worktree.c:620
8233 msgid "string"
8234 msgstr "chaîne"
8235
@@ -8396,7 +8418,7 @@ msgstr "Vous êtes sur une branche qui doit encore naître"
8418 msgid "only one reference expected, %d given."
8419 msgstr "une seule référence attendue, %d fournies."
8420
8399 -#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389
8421 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396
8422 #, c-format
8423 msgid "invalid reference: %s"
8424 msgstr "référence invalide : %s"
@@ -8427,8 +8449,8 @@ msgid "Cannot switch branch to a non-commit '%s'"
8449 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
8450
8451 #: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119
8430 -#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433
8431 -#: builtin/worktree.c:435
8452 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440
8453 +#: builtin/worktree.c:442
8454 msgid "branch"
8455 msgstr "branche"
8456
@@ -8444,7 +8466,7 @@ msgstr "créer/réinitialiser et extraire une branche"
8466 msgid "create reflog for new branch"
8467 msgstr "créer un reflog pour une nouvelle branche"
8468
8447 -#: builtin/checkout.c:1126 builtin/worktree.c:437
8469 +#: builtin/checkout.c:1126 builtin/worktree.c:444
8470 msgid "detach HEAD at named commit"
8471 msgstr "détacher la HEAD au commit nommé"
8472
@@ -8817,7 +8839,7 @@ msgid "use --reference only while cloning"
8839 msgstr "utiliser seulement --reference pour cloner"
8840
8841 #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44
8820 -#: builtin/pack-objects.c:3194 builtin/repack.c:320
8842 +#: builtin/pack-objects.c:3191 builtin/repack.c:320
8843 msgid "name"
8844 msgstr "nom"
8845
@@ -8842,7 +8864,7 @@ msgstr "profondeur"
8864 msgid "create a shallow clone of that depth"
8865 msgstr "créer un clone superficiel de cette profondeur"
8866
8845 -#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185
8867 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182
8868 #: parse-options.h:154
8869 msgid "time"
8870 msgstr "heure"
@@ -9024,7 +9046,7 @@ msgid "working tree '%s' already exists."
9046 msgstr "la copie de travail '%s' existe déjà."
9047
9048 #: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271
9027 -#: builtin/worktree.c:246 builtin/worktree.c:276
9049 +#: builtin/worktree.c:247 builtin/worktree.c:277
9050 #, c-format
9051 msgid "could not create leading directories of '%s'"
9052 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
@@ -9441,7 +9463,7 @@ msgid "version"
9463 msgstr "version"
9464
9465 #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
9444 -#: builtin/worktree.c:581
9466 +#: builtin/worktree.c:591
9467 msgid "machine-readable output"
9468 msgstr "sortie pour traitement automatique"
9469
@@ -9700,7 +9722,9 @@ msgstr "git commit-graph verify [--object-dir <objdir>]"
9722 msgid ""
9723 "git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
9724 "stdin-packs|--stdin-commits]"
9703 -msgstr "git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
9725 +msgstr ""
9726 +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
9727 +"stdin-packs|--stdin-commits]"
9728
9729 #: builtin/commit-graph.c:48 builtin/commit-graph.c:77
9730 #: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150
@@ -9982,7 +10006,9 @@ msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
10006 msgid ""
10007 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
10008 "list"
9985 -msgstr "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --list"
10009 +msgstr ""
10010 +"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
10011 +"list"
10012
10013 #: builtin/config.c:700
10014 msgid "--default is only applicable to --get"
@@ -10950,7 +10976,7 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
10976 #. grep.threads
10977 #.
10978 #: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728
10953 -#: builtin/pack-objects.c:2639
10979 +#: builtin/pack-objects.c:2636
10980 #, c-format
10981 msgid "no threads support, ignoring %s"
10982 msgstr "pas de support des fils, ignore %s"
@@ -11175,12 +11201,12 @@ msgstr ""
11201 msgid "unable to resolve revision: %s"
11202 msgstr "impossible de résoudre la révision : %s"
11203
11178 -#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635
11204 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632
11205 #, c-format
11206 msgid "invalid number of threads specified (%d)"
11207 msgstr "nombre de fils spécifié invalide (%d)"
11208
11183 -#: builtin/grep.c:1049 builtin/pack-objects.c:3289
11209 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286
11210 msgid "no threads support, ignoring --threads"
11211 msgstr "pas de support des fils, ignore --threads"
11212
@@ -11523,7 +11549,7 @@ msgstr "confusion extrême dans parse_pack_objects()"
11549 msgid "Resolving deltas"
11550 msgstr "Résolution des deltas"
11551
11526 -#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410
11552 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407
11553 #, c-format
11554 msgid "unable to create thread: %s"
11555 msgstr "impossible de créer le fil : %s"
@@ -11589,7 +11615,7 @@ msgstr "impossible de stocker le fichier paquet"
11615 msgid "cannot store index file"
11616 msgstr "impossible de stocker le fichier d'index"
11617
11592 -#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648
11618 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645
11619 #, c-format
11620 msgid "bad pack.indexversion=%<PRIu32>"
11621 msgstr "mauvais pack.indexversion=%<PRIu32>"
@@ -13430,7 +13456,7 @@ msgstr ""
13456 msgid "read object names from the standard input"
13457 msgstr "lire les noms d'objet depuis l'entrée standard"
13458
13433 -#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151
13459 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152
13460 msgid "do not remove, show only"
13461 msgstr "ne pas supprimer, afficher seulement"
13462
@@ -13568,25 +13594,25 @@ msgstr "longueur inconsistante de l'objet %s (%lu contre %lu)"
13594 msgid "suboptimal pack - out of memory"
13595 msgstr "paquet sous-optimal - mémoire insuffisante"
13596
13571 -#: builtin/pack-objects.c:2369
13597 +#: builtin/pack-objects.c:2366
13598 #, c-format
13599 msgid "Delta compression using up to %d threads"
13600 msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
13601
13576 -#: builtin/pack-objects.c:2505
13602 +#: builtin/pack-objects.c:2502
13603 #, c-format
13604 msgid "unable to pack objects reachable from tag %s"
13605 msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
13606
13581 -#: builtin/pack-objects.c:2589
13607 +#: builtin/pack-objects.c:2586
13608 msgid "Compressing objects"
13609 msgstr "Compression des objets"
13610
13585 -#: builtin/pack-objects.c:2595
13611 +#: builtin/pack-objects.c:2592
13612 msgid "inconsistency with delta count"
13613 msgstr "inconsistance dans le compte de delta"
13614
13589 -#: builtin/pack-objects.c:2674
13615 +#: builtin/pack-objects.c:2671
13616 #, c-format
13617 msgid ""
13618 "expected edge object ID, got garbage:\n"
@@ -13595,7 +13621,7 @@ msgstr ""
13621 "ID d'objet de bord attendu, reçu des données illisibles :\n"
13622 "%s"
13623
13598 -#: builtin/pack-objects.c:2680
13624 +#: builtin/pack-objects.c:2677
13625 #, c-format
13626 msgid ""
13627 "expected object ID, got garbage:\n"
@@ -13604,241 +13630,244 @@ msgstr ""
13630 "ID d'objet attendu, reçu des données illisibles :\n"
13631 "%s"
13632
13607 -#: builtin/pack-objects.c:2760
13633 +#: builtin/pack-objects.c:2757
13634 msgid "invalid value for --missing"
13635 msgstr "valeur invalide pour --missing"
13636
13611 -#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927
13637 +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924
13638 msgid "cannot open pack index"
13639 msgstr "impossible d'ouvrir l'index de paquet"
13640
13615 -#: builtin/pack-objects.c:2850
13641 +#: builtin/pack-objects.c:2847
13642 #, c-format
13643 msgid "loose object at %s could not be examined"
13644 msgstr "l'objet libre à %s n'a pas pu être examiné"
13645
13620 -#: builtin/pack-objects.c:2935
13646 +#: builtin/pack-objects.c:2932
13647 msgid "unable to force loose object"
13648 msgstr "impossible de forcer l'objet libre"
13649
13624 -#: builtin/pack-objects.c:3022
13650 +#: builtin/pack-objects.c:3019
13651 #, c-format
13652 msgid "not a rev '%s'"
13653 msgstr "'%s' n'est pas une révision"
13654
13629 -#: builtin/pack-objects.c:3025
13655 +#: builtin/pack-objects.c:3022
13656 #, c-format
13657 msgid "bad revision '%s'"
13658 msgstr "mauvaise révision '%s'"
13659
13634 -#: builtin/pack-objects.c:3045
13660 +#: builtin/pack-objects.c:3042
13661 msgid "unable to add recent objects"
13662 msgstr "impossible d'ajouter les objets récents"
13663
13638 -#: builtin/pack-objects.c:3095
13664 +#: builtin/pack-objects.c:3092
13665 #, c-format
13666 msgid "unsupported index version %s"
13667 msgstr "version d'index non supportée %s"
13668
13643 -#: builtin/pack-objects.c:3099
13669 +#: builtin/pack-objects.c:3096
13670 #, c-format
13671 msgid "bad index version '%s'"
13672 msgstr "mauvaise version d'index '%s'"
13673
13648 -#: builtin/pack-objects.c:3130
13674 +#: builtin/pack-objects.c:3127
13675 msgid "do not show progress meter"
13676 msgstr "ne pas afficher la barre de progression"
13677
13652 -#: builtin/pack-objects.c:3132
13678 +#: builtin/pack-objects.c:3129
13679 msgid "show progress meter"
13680 msgstr "afficher la barre de progression"
13681
13656 -#: builtin/pack-objects.c:3134
13682 +#: builtin/pack-objects.c:3131
13683 msgid "show progress meter during object writing phase"
13684 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
13685
13660 -#: builtin/pack-objects.c:3137
13686 +#: builtin/pack-objects.c:3134
13687 msgid "similar to --all-progress when progress meter is shown"
13688 msgstr "similaire à --all-progress quand la barre de progression est affichée"
13689
13664 -#: builtin/pack-objects.c:3138
13690 +#: builtin/pack-objects.c:3135
13691 msgid "<version>[,<offset>]"
13692 msgstr "<version>[,<décalage>]"
13693
13668 -#: builtin/pack-objects.c:3139
13694 +#: builtin/pack-objects.c:3136
13695 msgid "write the pack index file in the specified idx format version"
13696 msgstr ""
13697 "écrire le fichier d'index du paquet dans le format d'index de version "
13698 "spécifié"
13699
13674 -#: builtin/pack-objects.c:3142
13700 +#: builtin/pack-objects.c:3139
13701 msgid "maximum size of each output pack file"
13702 msgstr "taille maximum de chaque fichier paquet en sortie"
13703
13678 -#: builtin/pack-objects.c:3144
13704 +#: builtin/pack-objects.c:3141
13705 msgid "ignore borrowed objects from alternate object store"
13706 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
13707
13682 -#: builtin/pack-objects.c:3146
13708 +#: builtin/pack-objects.c:3143
13709 msgid "ignore packed objects"
13710 msgstr "ignorer les objets empaquetés"
13711
13686 -#: builtin/pack-objects.c:3148
13712 +#: builtin/pack-objects.c:3145
13713 msgid "limit pack window by objects"
13714 msgstr "limiter la fenêtre d'empaquetage par objets"
13715
13690 -#: builtin/pack-objects.c:3150
13716 +#: builtin/pack-objects.c:3147
13717 msgid "limit pack window by memory in addition to object limit"
13718 msgstr ""
13719 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
13720
13695 -#: builtin/pack-objects.c:3152
13721 +#: builtin/pack-objects.c:3149
13722 msgid "maximum length of delta chain allowed in the resulting pack"
13723 msgstr ""
13724 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
13725
13700 -#: builtin/pack-objects.c:3154
13726 +#: builtin/pack-objects.c:3151
13727 msgid "reuse existing deltas"
13728 msgstr "réutiliser les deltas existants"
13729
13704 -#: builtin/pack-objects.c:3156
13730 +#: builtin/pack-objects.c:3153
13731 msgid "reuse existing objects"
13732 msgstr "réutiliser les objets existants"
13733
13708 -#: builtin/pack-objects.c:3158
13734 +#: builtin/pack-objects.c:3155
13735 msgid "use OFS_DELTA objects"
13736 msgstr "utiliser les objets OFS_DELTA"
13737
13712 -#: builtin/pack-objects.c:3160
13738 +#: builtin/pack-objects.c:3157
13739 msgid "use threads when searching for best delta matches"
13740 msgstr ""
13741 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "
13742 "deltas"
13743
13718 -#: builtin/pack-objects.c:3162
13744 +#: builtin/pack-objects.c:3159
13745 msgid "do not create an empty pack output"
13746 msgstr "ne pas créer un paquet vide"
13747
13722 -#: builtin/pack-objects.c:3164
13748 +#: builtin/pack-objects.c:3161
13749 msgid "read revision arguments from standard input"
13750 msgstr "lire les paramètres de révision depuis l'entrée standard"
13751
13726 -#: builtin/pack-objects.c:3166
13752 +#: builtin/pack-objects.c:3163
13753 msgid "limit the objects to those that are not yet packed"
13754 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
13755
13730 -#: builtin/pack-objects.c:3169
13756 +#: builtin/pack-objects.c:3166
13757 msgid "include objects reachable from any reference"
13758 msgstr "inclure les objets accessibles depuis toute référence"
13759
13734 -#: builtin/pack-objects.c:3172
13760 +#: builtin/pack-objects.c:3169
13761 msgid "include objects referred by reflog entries"
13762 msgstr "inclure les objets référencés par les éléments de reflog"
13763
13738 -#: builtin/pack-objects.c:3175
13764 +#: builtin/pack-objects.c:3172
13765 msgid "include objects referred to by the index"
13766 msgstr "inclure les objets référencés par l'index"
13767
13742 -#: builtin/pack-objects.c:3178
13768 +#: builtin/pack-objects.c:3175
13769 msgid "output pack to stdout"
13770 msgstr "afficher l'empaquetage sur la sortie standard"
13771
13746 -#: builtin/pack-objects.c:3180
13772 +#: builtin/pack-objects.c:3177
13773 msgid "include tag objects that refer to objects to be packed"
13774 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
13775
13750 -#: builtin/pack-objects.c:3182
13776 +#: builtin/pack-objects.c:3179
13777 msgid "keep unreachable objects"
13778 msgstr "garder les objets inaccessibles"
13779
13754 -#: builtin/pack-objects.c:3184
13780 +#: builtin/pack-objects.c:3181
13781 msgid "pack loose unreachable objects"
13782 msgstr "empaqueter les objets inaccessibles détachés"
13783
13758 -#: builtin/pack-objects.c:3186
13784 +#: builtin/pack-objects.c:3183
13785 msgid "unpack unreachable objects newer than <time>"
13786 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
13787
13762 -#: builtin/pack-objects.c:3189
13788 +#: builtin/pack-objects.c:3186
13789 msgid "create thin packs"
13790 msgstr "créer des paquets légers"
13791
13766 -#: builtin/pack-objects.c:3191
13792 +#: builtin/pack-objects.c:3188
13793 msgid "create packs suitable for shallow fetches"
13794 msgstr "créer des paquets permettant des récupérations superficielles"
13795
13770 -#: builtin/pack-objects.c:3193
13796 +#: builtin/pack-objects.c:3190
13797 msgid "ignore packs that have companion .keep file"
13798 msgstr "ignorer les paquets qui ont un fichier .keep"
13799
13774 -#: builtin/pack-objects.c:3195
13800 +#: builtin/pack-objects.c:3192
13801 msgid "ignore this pack"
13802 msgstr "ignorer ce paquet"
13803
13778 -#: builtin/pack-objects.c:3197
13804 +#: builtin/pack-objects.c:3194
13805 msgid "pack compression level"
13806 msgstr "niveau de compression du paquet"
13807
13782 -#: builtin/pack-objects.c:3199
13808 +#: builtin/pack-objects.c:3196
13809 msgid "do not hide commits by grafts"
13810 msgstr "ne pas cacher les validations par greffes"
13811
13786 -#: builtin/pack-objects.c:3201
13812 +#: builtin/pack-objects.c:3198
13813 msgid "use a bitmap index if available to speed up counting objects"
13814 msgstr ""
13815 "utiliser un index en bitmap si disponible pour accélerer le décompte des "
13816 "objets"
13817
13792 -#: builtin/pack-objects.c:3203
13818 +#: builtin/pack-objects.c:3200
13819 msgid "write a bitmap index together with the pack index"
13820 msgstr "écrire un index en bitmap associé à l'index de paquet"
13821
13796 -#: builtin/pack-objects.c:3206
13822 +#: builtin/pack-objects.c:3203
13823 msgid "handling for missing objects"
13824 msgstr "gestion des objets manquants"
13825
13800 -#: builtin/pack-objects.c:3209
13826 +#: builtin/pack-objects.c:3206
13827 msgid "do not pack objects in promisor packfiles"
13828 msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
13829
13804 -#: builtin/pack-objects.c:3233
13830 +#: builtin/pack-objects.c:3230
13831 #, c-format
13832 msgid "delta chain depth %d is too deep, forcing %d"
13833 msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
13834
13809 -#: builtin/pack-objects.c:3238
13835 +#: builtin/pack-objects.c:3235
13836 #, c-format
13837 msgid "pack.deltaCacheLimit is too high, forcing %d"
13838 msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
13839
13814 -#: builtin/pack-objects.c:3294
13840 +#: builtin/pack-objects.c:3291
13841 msgid "--max-pack-size cannot be used to build a pack for transfer"
13816 -msgstr "--max-pack-size ne peut pas être utilisé pour construire un paquet à transférer"
13842 +msgstr ""
13843 +"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
13844 +"transférer"
13845
13818 -#: builtin/pack-objects.c:3296
13846 +#: builtin/pack-objects.c:3293
13847 msgid "minimum pack size limit is 1 MiB"
13848 msgstr "la taille limite minimale d'un paquet est 1 MiB"
13849
13822 -#: builtin/pack-objects.c:3301
13850 +#: builtin/pack-objects.c:3298
13851 msgid "--thin cannot be used to build an indexable pack"
13852 msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
13853
13826 -#: builtin/pack-objects.c:3304
13854 +#: builtin/pack-objects.c:3301
13855 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
13856 msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
13857
13830 -#: builtin/pack-objects.c:3310
13858 +#: builtin/pack-objects.c:3307
13859 msgid "cannot use --filter without --stdout"
13860 msgstr "impossible d'utiliser --filter sans --stdout"
13861
13834 -#: builtin/pack-objects.c:3366
13862 +#: builtin/pack-objects.c:3363
13863 msgid "Enumerating objects"
13864 msgstr "Énumération des objets"
13865
13838 -#: builtin/pack-objects.c:3385
13866 +#: builtin/pack-objects.c:3382
13867 #, c-format
13868 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
13841 -msgstr "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)"
13869 +msgstr ""
13870 +"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)"
13871
13872 #: builtin/pack-refs.c:7
13873 msgid "git pack-refs [<options>]"
@@ -14376,7 +14405,9 @@ msgstr ""
14405
14406 #: builtin/range-diff.c:8
14407 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
14379 -msgstr "git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>..<nouveau-sommet>"
14408 +msgstr ""
14409 +"git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.."
14410 +"<nouveau-sommet>"
14411
14412 #: builtin/range-diff.c:9
14413 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
@@ -14391,8 +14422,9 @@ msgid "Percentage by which creation is weighted"
14422 msgstr "Pourcentage par lequel la création est pondérée"
14423
14424 #: builtin/range-diff.c:28
14394 -msgid "color both diff and diff-between-diffs"
14395 -msgstr "colorer à la fois les diffs et le diff-between-diffs"
14425 +#, fuzzy
14426 +msgid "use simple diff colors"
14427 +msgstr "utiliser des couleurs de diff simples"
14428
14429 #: builtin/range-diff.c:75 builtin/range-diff.c:79
14430 #, c-format
@@ -14731,10 +14763,6 @@ msgstr "branche(s) à suivre"
14763 msgid "master branch"
14764 msgstr "branche maîtresse"
14765
14734 -#: builtin/remote.c:171
14735 -msgid "push|fetch"
14736 -msgstr "push|fetch"
14737 -
14766 #: builtin/remote.c:172
14767 msgid "set up remote as a mirror to push to or fetch from"
14768 msgstr ""
@@ -15229,7 +15257,7 @@ msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
15257 msgid "--keep-unreachable and -A are incompatible"
15258 msgstr "--keep-unreachable et -A sont incompatibles"
15259
15232 -#: builtin/repack.c:510 builtin/worktree.c:139
15260 +#: builtin/repack.c:510 builtin/worktree.c:140
15261 #, c-format
15262 msgid "failed to remove '%s'"
15263 msgstr "échec de la suppression de '%s'"
@@ -15822,7 +15850,9 @@ msgstr "sortir avec un état zéro même si rien ne correspondait"
15850
15851 #: builtin/rm.c:288
15852 msgid "please stage your changes to .gitmodules or stash them to proceed"
15825 -msgstr "veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer"
15853 +msgstr ""
15854 +"veuillez indexer vos modifications de .gitmodules ou les remiser pour "
15855 +"continuer"
15856
15857 #: builtin/rm.c:306
15858 #, c-format
@@ -16173,8 +16203,8 @@ msgstr ""
16203 #: builtin/submodule--helper.c:545
16204 #, c-format
16205 msgid ""
16176 -"run_command returned non-zero status whilerecursing in the nested submodules "
16177 -"of %s\n"
16206 +"run_command returned non-zero status while recursing in the nested "
16207 +"submodules of %s\n"
16208 "."
16209 msgstr ""
16210 "run_command a retourné un statut non-nul pendant la récursion dans les sous-modules inclus de %s\n"
@@ -16182,7 +16212,8 @@ msgstr ""
16212
16213 #: builtin/submodule--helper.c:561
16214 msgid "Suppress output of entering each submodule command"
16185 -msgstr "Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
16215 +msgstr ""
16216 +"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
16217
16218 #: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040
16219 msgid "Recurse into nested submodules"
@@ -17133,23 +17164,23 @@ msgstr "git worktree remove [<options>] <arbre-de-travail>"
17164 msgid "git worktree unlock <path>"
17165 msgstr "git worktree unlock <chemin>"
17166
17136 -#: builtin/worktree.c:58
17167 +#: builtin/worktree.c:59
17168 #, c-format
17169 msgid "Removing worktrees/%s: not a valid directory"
17170 msgstr "Suppression de worktrees/%s : répertoire invalide"
17171
17141 -#: builtin/worktree.c:64
17172 +#: builtin/worktree.c:65
17173 #, c-format
17174 msgid "Removing worktrees/%s: gitdir file does not exist"
17175 msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
17176
17146 -#: builtin/worktree.c:69 builtin/worktree.c:78
17177 +#: builtin/worktree.c:70 builtin/worktree.c:79
17178 #, c-format
17179 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
17180 msgstr ""
17181 "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
17182
17152 -#: builtin/worktree.c:88
17183 +#: builtin/worktree.c:89
17184 #, c-format
17185 msgid ""
17186 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
@@ -17158,205 +17189,205 @@ msgstr ""
17189 "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
17190 "attendus, %<PRIuMAX> octets lus)"
17191
17161 -#: builtin/worktree.c:96
17192 +#: builtin/worktree.c:97
17193 #, c-format
17194 msgid "Removing worktrees/%s: invalid gitdir file"
17195 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
17196
17166 -#: builtin/worktree.c:105
17197 +#: builtin/worktree.c:106
17198 #, c-format
17199 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
17200 msgstr ""
17201 "Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
17202 "inexistant"
17203
17173 -#: builtin/worktree.c:152
17204 +#: builtin/worktree.c:153
17205 msgid "report pruned working trees"
17206 msgstr "afficher les arbres de travail éliminés"
17207
17177 -#: builtin/worktree.c:154
17208 +#: builtin/worktree.c:155
17209 msgid "expire working trees older than <time>"
17210 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
17211
17181 -#: builtin/worktree.c:229
17212 +#: builtin/worktree.c:230
17213 #, c-format
17214 msgid "'%s' already exists"
17215 msgstr "'%s' existe déjà"
17216
17186 -#: builtin/worktree.c:260
17217 +#: builtin/worktree.c:261
17218 #, c-format
17219 msgid "could not create directory of '%s'"
17220 msgstr "impossible de créer le répertoire de '%s'"
17221
17191 -#: builtin/worktree.c:373 builtin/worktree.c:379
17222 +#: builtin/worktree.c:380 builtin/worktree.c:386
17223 #, c-format
17224 msgid "Preparing worktree (new branch '%s')"
17225 msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
17226
17196 -#: builtin/worktree.c:375
17227 +#: builtin/worktree.c:382
17228 #, c-format
17229 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
17230 msgstr ""
17231 "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
17232 "précédemment sur %s)"
17233
17203 -#: builtin/worktree.c:384
17234 +#: builtin/worktree.c:391
17235 #, c-format
17236 msgid "Preparing worktree (checking out '%s')"
17237 msgstr "Préparation de l'arbre de travail (extraction de '%s')"
17238
17208 -#: builtin/worktree.c:390
17239 +#: builtin/worktree.c:397
17240 #, c-format
17241 msgid "Preparing worktree (detached HEAD %s)"
17242 msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
17243
17213 -#: builtin/worktree.c:431
17244 +#: builtin/worktree.c:438
17245 msgid "checkout <branch> even if already checked out in other worktree"
17246 msgstr ""
17247 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "
17248 "travail"
17249
17219 -#: builtin/worktree.c:434
17250 +#: builtin/worktree.c:441
17251 msgid "create a new branch"
17252 msgstr "créer une nouvelle branche"
17253
17223 -#: builtin/worktree.c:436
17254 +#: builtin/worktree.c:443
17255 msgid "create or reset a branch"
17256 msgstr "créer ou réinitialiser une branche"
17257
17227 -#: builtin/worktree.c:438
17258 +#: builtin/worktree.c:445
17259 msgid "populate the new working tree"
17260 msgstr "remplissage de la nouvelle copie de travail"
17261
17231 -#: builtin/worktree.c:439
17262 +#: builtin/worktree.c:446
17263 msgid "keep the new working tree locked"
17264 msgstr "conserver le verrou sur le nouvel arbre de travail"
17265
17235 -#: builtin/worktree.c:441
17266 +#: builtin/worktree.c:449
17267 msgid "set up tracking mode (see git-branch(1))"
17268 msgstr "régler le mode de suivi (voir git-branch(1))"
17269
17239 -#: builtin/worktree.c:444
17270 +#: builtin/worktree.c:452
17271 msgid "try to match the new branch name with a remote-tracking branch"
17272 msgstr "essayer de nommer la nouvelle branche comme la branche amont"
17273
17243 -#: builtin/worktree.c:452
17274 +#: builtin/worktree.c:460
17275 msgid "-b, -B, and --detach are mutually exclusive"
17276 msgstr "-b, -B et --detach sont mutuellement exclusifs"
17277
17247 -#: builtin/worktree.c:511
17278 +#: builtin/worktree.c:521
17279 msgid "--[no-]track can only be used if a new branch is created"
17280 msgstr ""
17281 "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
17282
17252 -#: builtin/worktree.c:611
17283 +#: builtin/worktree.c:621
17284 msgid "reason for locking"
17285 msgstr "raison du verrouillage"
17286
17256 -#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
17257 -#: builtin/worktree.c:850
17287 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720
17288 +#: builtin/worktree.c:860
17289 #, c-format
17290 msgid "'%s' is not a working tree"
17291 msgstr "'%s' n'est pas une copie de travail"
17292
17262 -#: builtin/worktree.c:625 builtin/worktree.c:658
17293 +#: builtin/worktree.c:635 builtin/worktree.c:668
17294 msgid "The main working tree cannot be locked or unlocked"
17295 msgstr ""
17296 "La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
17297
17267 -#: builtin/worktree.c:630
17298 +#: builtin/worktree.c:640
17299 #, c-format
17300 msgid "'%s' is already locked, reason: %s"
17301 msgstr "'%s' est déjà verrouillé, car '%s'"
17302
17272 -#: builtin/worktree.c:632
17303 +#: builtin/worktree.c:642
17304 #, c-format
17305 msgid "'%s' is already locked"
17306 msgstr "'%s' est déjà verrouillé"
17307
17277 -#: builtin/worktree.c:660
17308 +#: builtin/worktree.c:670
17309 #, c-format
17310 msgid "'%s' is not locked"
17311 msgstr "'%s' n'est pas verrouillé"
17312
17282 -#: builtin/worktree.c:685
17313 +#: builtin/worktree.c:695
17314 msgid "working trees containing submodules cannot be moved or removed"
17315 msgstr ""
17316 "les arbres de travail contenant des sous-modules ne peuvent pas être "
17317 "déplacés ou supprimés"
17318
17288 -#: builtin/worktree.c:712 builtin/worktree.c:852
17319 +#: builtin/worktree.c:722 builtin/worktree.c:862
17320 #, c-format
17321 msgid "'%s' is a main working tree"
17322 msgstr "'%s' est un arbre de travail principal"
17323
17293 -#: builtin/worktree.c:717
17324 +#: builtin/worktree.c:727
17325 #, c-format
17326 msgid "could not figure out destination name from '%s'"
17327 msgstr "impossible de trouver le nom de la destination à partir de '%s'"
17328
17298 -#: builtin/worktree.c:723
17329 +#: builtin/worktree.c:733
17330 #, c-format
17331 msgid "target '%s' already exists"
17332 msgstr "la cible '%s' existe déjà"
17333
17303 -#: builtin/worktree.c:730
17334 +#: builtin/worktree.c:740
17335 #, c-format
17336 msgid "cannot move a locked working tree, lock reason: %s"
17337 msgstr ""
17338 "impossible de déplacer un arbre de travail verrouillé, raison du "
17339 "verrouillage : %s"
17340
17310 -#: builtin/worktree.c:732
17341 +#: builtin/worktree.c:742
17342 msgid "cannot move a locked working tree"
17343 msgstr "impossible de déplacer un arbre de travail verrouillé"
17344
17314 -#: builtin/worktree.c:735
17345 +#: builtin/worktree.c:745
17346 #, c-format
17347 msgid "validation failed, cannot move working tree: %s"
17348 msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
17349
17319 -#: builtin/worktree.c:740
17350 +#: builtin/worktree.c:750
17351 #, c-format
17352 msgid "failed to move '%s' to '%s'"
17353 msgstr "échec au déplacement de '%s' vers '%s'"
17354
17324 -#: builtin/worktree.c:788
17355 +#: builtin/worktree.c:798
17356 #, c-format
17357 msgid "failed to run 'git status' on '%s'"
17358 msgstr "échec du lancement de 'git status' sur '%s'"
17359
17329 -#: builtin/worktree.c:792
17360 +#: builtin/worktree.c:802
17361 #, c-format
17362 msgid "'%s' is dirty, use --force to delete it"
17363 msgstr "'%s' est sale, utilisez --force pour le supprimer"
17364
17334 -#: builtin/worktree.c:797
17365 +#: builtin/worktree.c:807
17366 #, c-format
17367 msgid "failed to run 'git status' on '%s', code %d"
17368 msgstr "impossible de lancer 'git status' sur '%s', code %d"
17369
17339 -#: builtin/worktree.c:808 builtin/worktree.c:822
17370 +#: builtin/worktree.c:818 builtin/worktree.c:832
17371 #, c-format
17372 msgid "failed to delete '%s'"
17373 msgstr "échec de la suppression de '%s'"
17374
17344 -#: builtin/worktree.c:834
17375 +#: builtin/worktree.c:844
17376 msgid "force removing even if the worktree is dirty"
17377 msgstr "forcer la suppression même si l'arbre de travail est sale"
17378
17348 -#: builtin/worktree.c:856
17379 +#: builtin/worktree.c:866
17380 #, c-format
17381 msgid "cannot remove a locked working tree, lock reason: %s"
17382 msgstr ""
17383 "impossible de supprimer un arbre de travail verrouillé, raison du "
17384 "verrouillage : %s"
17385
17355 -#: builtin/worktree.c:858
17386 +#: builtin/worktree.c:868
17387 msgid "cannot remove a locked working tree"
17388 msgstr "impossible de supprimer un arbre de travail verrouillé"
17389
17359 -#: builtin/worktree.c:861
17390 +#: builtin/worktree.c:871
17391 #, c-format
17392 msgid "validation failed, cannot remove working tree: %s"
17393 msgstr ""
@@ -17925,7 +17956,8 @@ msgstr "Appliquer un patchset quilt sur la branche courante"
17956
17957 #: command-list.h:144
17958 msgid "Compare two commit ranges (e.g. two versions of a branch)"
17928 -msgstr "Comparer deux plages de commits (par exemple deux versions d'une branche)"
17959 +msgstr ""
17960 +"Comparer deux plages de commits (par exemple deux versions d'une branche)"
17961
17962 #: command-list.h:145
17963 msgid "Reads tree information into the index"
@@ -19093,7 +19125,8 @@ msgstr ""
19125 " p, pick <commit> = utiliser le commit\n"
19126 " r, reword <commit> = utiliser le commit, mais reformuler son message\n"
19127 " e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"
19096 -" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n"
19128 +" s, squash <commit> = utiliser le commit, mais le fusionner avec le "
19129 +"précédent\n"
19130 " f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"
19131 " x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
19132 " d, drop <commit> = supprimer le commit\n"
@@ -19339,7 +19372,10 @@ msgid ""
19372 "\n"
19373 "However, if you remove everything, the rebase will be aborted.\n"
19374 "\n"
19342 -msgstr "\nCependant, si vous effacez tout, le rebasage sera annulé.\n\n"
19375 +msgstr ""
19376 +"\n"
19377 +"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
19378 +"\n"
19379
19380 #: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
19381 msgid "Could not init rewritten commits"
@@ -20312,6 +20348,15 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
20348 msgid "Do you really want to send %s? [y|N]: "
20349 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
20350
20351 +#~ msgid "could not parse '%s' (looking for '%s'"
20352 +#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')"
20353 +
20354 +#~ msgid "color both diff and diff-between-diffs"
20355 +#~ msgstr "colorer à la fois les diffs et le diff-between-diffs"
20356 +
20357 +#~ msgid "push|fetch"
20358 +#~ msgstr "push|fetch"
20359 +
20360 #~ msgid "Dirty index: cannot merge (dirty: %s)"
20361 #~ msgstr "Index sale : fusion impossible (sales : %s)"
20362